From 95dd97aca0084db01139ab3abb6aa1ffe1ee6aca Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Mon, 20 May 2019 17:21:59 +0300 Subject: [PATCH] Add missing methods for NearbyMap --- .../mvp/contract/NearbyMapContract.java | 31 ++++++ .../mvp/fragments/NearbyMapFragment.java | 105 ++++++++++++++++++ .../mvp/presenter/NearbyMapPresenter.java | 25 +++++ 3 files changed, 161 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyMapContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyMapContract.java index d5ef811be..35dbb5f19 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyMapContract.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyMapContract.java @@ -1,5 +1,11 @@ package fr.free.nrw.commons.nearby.mvp.contract; +import android.net.Uri; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; + +import fr.free.nrw.commons.nearby.Place; + /** * This interface defines specific View and UserActions for map * part of the nearby. On the other hand both extends methods @@ -11,11 +17,36 @@ public interface NearbyMapContract { interface View extends NearbyElementContract.View{ void showSearchThisAreaButton(); void showInformationBottomSheet(); + void initViews(); + void updateMapMarkers(); + void updateMapToTrackPosition(); + void setListeners(); + void setupMapView(); + void addCurrentLocationMarker(); + void setSearchThisAreaButtonVisibility(boolean visible); + boolean isCurrentLocationMarkerVisible(); + void addNearbyMarkersToMapBoxMap(); + void prepareViewsForSheetPosition(); + void hideFABs(); void showFABs(); + void addAnchorToBigFABs(FloatingActionButton floatingActionButton, int anchorID); + void removeAnchorFromFABs(FloatingActionButton fab); + void addAnchorToSmallFABs(FloatingActionButton floatingActionButton, int anchorID); + void passInfoToSheet(Place place); + void updateBookmarkButtonImage(Place place); + void openWebView(Uri link); + void animateFABs(boolean isFabOpen); + void closeFabs ( boolean isFabOpen); + void updateMarker(boolean isBookmarked, Place place); } interface UserActions extends NearbyElementContract.UserActions { void searchThisArea(); + void storeSharedPrefs(); void recenterMap(); + void updateMapMarkers(); + void updateMapToTrackPosition(); + void getBundleContent(); + boolean addMapMovementListener(); } } diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java index fc0a33398..631c85548 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java @@ -1,6 +1,11 @@ package fr.free.nrw.commons.nearby.mvp.fragments; +import android.net.Uri; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; +import fr.free.nrw.commons.nearby.Place; import fr.free.nrw.commons.nearby.mvp.contract.NearbyMapContract; public class NearbyMapFragment extends CommonsDaggerSupportFragment implements NearbyMapContract.View { @@ -14,11 +19,111 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment implements N } + @Override + public void initViews() { + + } + + @Override + public void updateMapMarkers() { + + } + + @Override + public void updateMapToTrackPosition() { + + } + + @Override + public void setListeners() { + + } + + @Override + public void setupMapView() { + + } + + @Override + public void addCurrentLocationMarker() { + + } + + @Override + public void setSearchThisAreaButtonVisibility(boolean visible) { + + } + + @Override + public boolean isCurrentLocationMarkerVisible() { + return false; + } + + @Override + public void addNearbyMarkersToMapBoxMap() { + + } + + @Override + public void prepareViewsForSheetPosition() { + + } + + @Override + public void hideFABs() { + + } + @Override public void showFABs() { } + @Override + public void addAnchorToBigFABs(FloatingActionButton floatingActionButton, int anchorID) { + + } + + @Override + public void removeAnchorFromFABs(FloatingActionButton fab) { + + } + + @Override + public void addAnchorToSmallFABs(FloatingActionButton floatingActionButton, int anchorID) { + + } + + @Override + public void passInfoToSheet(Place place) { + + } + + @Override + public void updateBookmarkButtonImage(Place place) { + + } + + @Override + public void openWebView(Uri link) { + + } + + @Override + public void animateFABs(boolean isFabOpen) { + + } + + @Override + public void closeFabs(boolean isFabOpen) { + + } + + @Override + public void updateMarker(boolean isBookmarked, Place place) { + + } + @Override public void showPlaces() { diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyMapPresenter.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyMapPresenter.java index 9e37b024a..d65755aba 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyMapPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyMapPresenter.java @@ -8,11 +8,36 @@ public class NearbyMapPresenter implements NearbyMapContract.UserActions { } + @Override + public void storeSharedPrefs() { + + } + @Override public void recenterMap() { } + @Override + public void updateMapMarkers() { + + } + + @Override + public void updateMapToTrackPosition() { + + } + + @Override + public void getBundleContent() { + + } + + @Override + public boolean addMapMovementListener() { + return false; + } + @Override public void uploadImageGallery() {