From 2fdd770c604fcfb53eeda8e1a9d33434a68a6ab6 Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Fri, 29 Nov 2019 13:44:08 +0300 Subject: [PATCH] Disable current location button during markers load --- .../nearby/contract/NearbyParentFragmentContract.java | 2 ++ .../commons/nearby/fragments/NearbyParentFragment.java | 10 ++++++++++ .../presenter/NearbyParentFragmentPresenter.java | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java index 23987c4254..873e2e2ea3 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java @@ -42,6 +42,8 @@ interface View { void setCheckBoxAction(); void setCheckBoxState(int state); void setFilterState(); + void disableFABRecenter(); + void enableFABRecenter(); } interface NearbyListView { diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java index c2c3172820..4391a105d6 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java @@ -830,6 +830,16 @@ public void setFABRecenterAction(View.OnClickListener onClickListener) { fabRecenter.setOnClickListener(onClickListener); } + @Override + public void disableFABRecenter() { + fabRecenter.setEnabled(false); + } + + @Override + public void enableFABRecenter() { + fabRecenter.setEnabled(true); + } + @Override public void recenterMap(fr.free.nrw.commons.location.LatLng curLatLng) { nearbyMapFragment.removeCurrentLocationMarker(); diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java b/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java index 3dd0bc0fb5..5107f96e30 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java @@ -198,6 +198,11 @@ public void markerSelected(Marker marker) { @Override public void lockUnlockNearby(boolean isNearbyLocked) { this.isNearbyLocked = isNearbyLocked; + if (isNearbyLocked) { + nearbyParentFragmentView.disableFABRecenter(); + } else { + nearbyParentFragmentView.enableFABRecenter(); + } } public void registerUnregisterLocationListener(boolean removeLocationListener) {