diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageBookmarkFragment.java b/android/src/app/organicmaps/widget/placepage/PlacePageBookmarkFragment.java index 664839dacf..1814ece7a8 100644 --- a/android/src/app/organicmaps/widget/placepage/PlacePageBookmarkFragment.java +++ b/android/src/app/organicmaps/widget/placepage/PlacePageBookmarkFragment.java @@ -37,7 +37,7 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL @Nullable private WebView mWvBookmarkNote; - private PlacePageViewModel viewModel; + private PlacePageViewModel mViewModel; private Bookmark currentBookmark; @@ -45,6 +45,7 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + mViewModel = new ViewModelProvider(requireActivity()).get(PlacePageViewModel.class); return inflater.inflate(R.layout.place_page_bookmark_fragment, container, false); } @@ -59,8 +60,7 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL final View editBookmarkBtn = mFrame.findViewById(R.id.tv__bookmark_edit); editBookmarkBtn.setOnClickListener(this); - viewModel = new ViewModelProvider(requireActivity()).get(PlacePageViewModel.class); - viewModel.getMapObject().observe(requireActivity(), this); + mViewModel.getMapObject().observe(requireActivity(), this); } private void initWebView() @@ -75,10 +75,10 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL } @Override - public void onDestroy() + public void onDestroyView() { - super.onDestroy(); - viewModel.getMapObject().removeObserver(this); + super.onDestroyView(); + mViewModel.getMapObject().removeObserver(this); } private void updateBookmarkDetails() @@ -154,6 +154,6 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL Bookmark updatedBookmark = BookmarkManager.INSTANCE.updateBookmarkPlacePage(bookmarkId); if (updatedBookmark == null) return; - viewModel.setMapObject(updatedBookmark); + mViewModel.setMapObject(updatedBookmark); } } diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageButtons.java b/android/src/app/organicmaps/widget/placepage/PlacePageButtons.java index 4c093ea529..abecaa59b9 100644 --- a/android/src/app/organicmaps/widget/placepage/PlacePageButtons.java +++ b/android/src/app/organicmaps/widget/placepage/PlacePageButtons.java @@ -30,12 +30,13 @@ public final class PlacePageButtons extends Fragment implements Observer, private final AppCompatActivity mMwmActivity; private final int mButtonsHeight; private final int mMaxButtons; - private final PlacePageViewModel viewModel; + private final PlacePageViewModel mViewModel; private int mPreviewHeight; private int mFrameHeight; private boolean mDeactivateMapSelection = true; @@ -135,7 +135,7 @@ public class PlacePageController implements Initializable, mButtonsHeight = (int) mMwmActivity.getResources() .getDimension(R.dimen.place_page_buttons_height); mMaxButtons = mMwmActivity.getResources().getInteger(R.integer.pp_buttons_max); - viewModel = new ViewModelProvider(mMwmActivity).get(PlacePageViewModel.class); + mViewModel = new ViewModelProvider(mMwmActivity).get(PlacePageViewModel.class); ViewCompat.setOnApplyWindowInsetsListener(mPlacePage, (view, windowInsets) -> { mCurrentWindowInsets = windowInsets; @@ -186,7 +186,7 @@ public class PlacePageController implements Initializable, @Nullable public ArrayList getMenuBottomSheetItems(String id) { - final List currentItems = viewModel.getCurrentButtons().getValue(); + final List currentItems = mViewModel.getCurrentButtons().getValue(); if (currentItems == null || currentItems.size() <= mMaxButtons) return null; ArrayList items = new ArrayList<>(); @@ -206,10 +206,10 @@ public class PlacePageController implements Initializable, { mDeactivateMapSelection = true; MapObject mapObject = (MapObject) data; - final MapObject previousMapObject = viewModel.getMapObject().getValue(); + final MapObject previousMapObject = mViewModel.getMapObject().getValue(); // Only collapse the place page if the data is different from the one already available mShouldCollapse = PlacePageUtils.isHiddenState(mPlacePageBehavior.getState()) || !MapObject.same(previousMapObject, mapObject); - viewModel.setMapObject(mapObject); + mViewModel.setMapObject(mapObject); } private void resetPlacePageHeightBounds() @@ -401,7 +401,7 @@ public class PlacePageController implements Initializable, .remove(placePageFragment) .commitNow(); } - viewModel.setMapObject(null); + mViewModel.setMapObject(null); } private void createPlacePageFragments() @@ -459,7 +459,7 @@ public class PlacePageController implements Initializable, } buttons.add(PlacePageButtons.ButtonType.SHARE); } - viewModel.setCurrentButtons(buttons); + mViewModel.setCurrentButtons(buttons); } @Override @@ -480,13 +480,13 @@ public class PlacePageController implements Initializable, public void initialize(@Nullable Activity activity) { Objects.requireNonNull(activity); - viewModel.getMapObject().observe((MwmActivity) activity, this); + mViewModel.getMapObject().observe((MwmActivity) activity, this); } @Override public void destroy() { - viewModel.getMapObject().removeObserver(this); + mViewModel.getMapObject().removeObserver(this); } public interface SlideListener diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageLinksFragment.java b/android/src/app/organicmaps/widget/placepage/PlacePageLinksFragment.java index 57b14c071c..68fd25ecf7 100644 --- a/android/src/app/organicmaps/widget/placepage/PlacePageLinksFragment.java +++ b/android/src/app/organicmaps/widget/placepage/PlacePageLinksFragment.java @@ -56,7 +56,7 @@ public class PlacePageLinksFragment extends Fragment implements Observer openUrl(Metadata.MetadataType.FMD_CONTACT_LINE)); mLinePage.setOnLongClickListener((v) -> copyUrl(mLinePage, Metadata.MetadataType.FMD_CONTACT_LINE)); - viewModel = new ViewModelProvider(requireActivity()).get(PlacePageViewModel.class); - viewModel.getMapObject().observe(requireActivity(), this); + mViewModel.getMapObject().observe(requireActivity(), this); } private boolean isSocialUsername(Metadata.MetadataType type) @@ -218,10 +218,10 @@ public class PlacePageLinksFragment extends Fragment implements Observer showDescriptionScreen()); mWiki = view.findViewById(R.id.ll__place_wiki); - viewModel = new ViewModelProvider(requireActivity()).get(PlacePageViewModel.class); - viewModel.getMapObject().observe(requireActivity(), this); + mViewModel.getMapObject().observe(requireActivity(), this); } private void showDescriptionScreen() @@ -97,10 +97,10 @@ public class PlacePageWikipediaFragment extends Fragment implements Observer