From bf3c401c373d458e0feca0362ad4beecf3a20e15 Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Mon, 26 Oct 2020 23:11:59 +0100
Subject: [PATCH] add map scale (fixes #38)

---
 app/build.gradle                                   |  3 ++-
 .../net/vonforst/evmap/fragment/MapFragment.kt     |  4 ++++
 app/src/main/res/layout/fragment_map.xml           | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index eec2b48b..093d572b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -117,9 +117,10 @@ dependencies {
     implementation 'io.michaelrocks:bimap:1.0.2'
     implementation 'com.mapzen.android:lost:3.0.2'
     implementation 'com.google.guava:guava:29.0-android'
+    implementation 'com.github.pengrad:mapscaleview:1.6.0'
 
     // AnyMaps
-    def anyMapsVersion = '1bc0174e7c'
+    def anyMapsVersion = '631708a156'
     implementation "com.github.johan12345.AnyMaps:anymaps-base:$anyMapsVersion"
     googleImplementation "com.github.johan12345.AnyMaps:anymaps-google:$anyMapsVersion"
     implementation "com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion"
diff --git a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
index 5bd7776f..c80ada12 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -607,6 +607,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             vm.mapPosition.value = MapPosition(
                 map.projection.visibleRegion.latLngBounds, map.cameraPosition.zoom
             )
+            scaleView.update(map.cameraPosition.zoom, map.cameraPosition.target.latitude)
+        }
+        map.setOnCameraMoveListener {
+            scaleView.update(map.cameraPosition.zoom, map.cameraPosition.target.latitude)
         }
         map.setOnMarkerClickListener { marker ->
             when (marker) {
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
index 9b81930c..3b4d8fc8 100644
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -24,6 +24,20 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
+        <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_anchor="@id/fab_locate"
+            app:layout_anchorGravity="start|center_vertical"
+            android:layout_gravity="start|center_vertical">
+
+            <com.github.pengrad.mapscaleview.MapScaleView
+                android:id="@+id/scaleView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp" />
+        </FrameLayout>
+
         <FrameLayout
             android:id="@+id/toolbar_container"
             android:layout_width="match_parent"