Merge pull request #13 from vshkl/map_activity_refactoring

map_activity_refactoring to master
vshkl · May 22, 2017 · 3e36638 · 3e36638
2 parents f30825a + ead1e5d
commit 3e36638
Show file tree

Hide file tree

Showing 8 changed files with 162 additions and 93 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "by.vshkl.translate2"
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 3
-        versionName "0.5.1"
+        versionCode 4
+        versionName "0.5.2"
         vectorDrawables.useSupportLibrary = true
         resConfigs "en", "ru", "be"
         buildConfigField("String", "ENCRYPTED_PREFERENCES_PWD", ENCRYPTED_PREFERENCES_PWD)

diff --git a/app/src/main/java/by/vshkl/translate2/mvp/presenter/MapPresenter.java b/app/src/main/java/by/vshkl/translate2/mvp/presenter/MapPresenter.java
@@ -8,6 +8,7 @@
 import com.arellomobile.mvp.InjectViewState;
 import com.arellomobile.mvp.MvpPresenter;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
+import com.google.android.gms.maps.model.LatLng;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -268,4 +269,12 @@ public String getSelectedStopBookmarkName() {
         }
         return stopBookmarkName;
     }
+
+    public void setupGoogleMap() {
+        getViewState().setupGoogleMap();
+    }
+
+    public void animateMapCamera(LatLng latLng, float zoomLevel) {
+        getViewState().animateMapCamera(latLng, zoomLevel);
+    }
 }
diff --git a/app/src/main/java/by/vshkl/translate2/mvp/view/MapView.java b/app/src/main/java/by/vshkl/translate2/mvp/view/MapView.java
@@ -1,6 +1,7 @@
 package by.vshkl.translate2.mvp.view;
 
 import com.arellomobile.mvp.MvpView;
+import com.google.android.gms.maps.model.LatLng;
 
 import java.util.List;
 
@@ -10,25 +11,27 @@
 
 public interface MapView extends MvpView {
 
+    void showProgressBar();
+
+    void hideProgressBar();
+
     void showUpdateStopsSnackbar();
 
     void showNewVersionAvailable(Version version);
 
-    void initializeMap();
-
     void showMessage(int messageId);
 
     void showToast(int messageId);
 
+    void setupGoogleMap();
+
+    void animateMapCamera(LatLng latLng, float zoomLevel);
+
     void placeMarkers(List<Stop> stops);
 
     void showSelectedStop(Stop stop, boolean bookmarked, boolean fromNavDrawer);
 
     void showSearchResult(List<Stop> stops);
 
     void showStopBookmarks(List<StopBookmark> stopBookmarks);
-
-    void showProgressBar();
-
-    void hideProgressBar();
 }