From dbd6693244372c52bfd8a65fc00906187fcfebf1 Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Wed, 2 Oct 2019 16:30:27 +0300 Subject: [PATCH] Do not track users position if user is searching around --- .../mvp/contract/NearbyParentFragmentContract.java | 1 + .../nearby/mvp/fragments/NearbyParentFragment.java | 9 +++++++++ .../mvp/presenter/NearbyParentFragmentPresenter.java | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyParentFragmentContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyParentFragmentContract.java index 2e545dc89..f3001a01e 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyParentFragmentContract.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyParentFragmentContract.java @@ -36,6 +36,7 @@ public interface NearbyParentFragmentContract { void setTabItemContributions(); boolean isDetailsBottomSheetVisible(); void setBottomSheetDetailsSmaller(); + boolean isSearchThisAreaButtonVisible(); } interface NearbyListView { diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyParentFragment.java index 3c7232892..dd0df6b55 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyParentFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyParentFragment.java @@ -554,6 +554,15 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment } } + @Override + public boolean isSearchThisAreaButtonVisible() { + if (searchThisAreaButton.getVisibility() == View.VISIBLE) { + return true; + } else { + return false; + } + } + @Override public void setProgressBarVisibility(boolean isVisible) { if (isVisible) { diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java index 192fdba66..a0d04478b 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java @@ -258,7 +258,9 @@ public class NearbyParentFragmentPresenter } else { // Means location changed slightly, ie user is walking or driving. Timber.d("Means location changed slightly"); - nearbyParentFragmentView.recenterMap(curLatLng); + if (!nearbyParentFragmentView.isSearchThisAreaButtonVisible()) { // Do not track users position if the user is checking around + nearbyParentFragmentView.recenterMap(curLatLng); + } } }