From 068f2ba8b2a752f3ff6b2db66928aeba669354d1 Mon Sep 17 00:00:00 2001
From: Jackson Rosenthal <pwrxpsycho@gmail.com>
Date: Thu, 17 Feb 2022 17:12:17 -0500
Subject: [PATCH] Added "download button" with icon and updated onMapTouch

---
 .../com/geeksville/mesh/ui/MapFragment.kt     |  8 ++-
 .../drawable/baseline_download_white_24dp.xml |  6 +++
 app/src/main/res/layout/map_view.xml          | 49 ++++++++++++-------
 3 files changed, 44 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/res/drawable/baseline_download_white_24dp.xml

diff --git a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
index 5635d20bc..d368081c9 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
@@ -200,7 +200,6 @@ class MapFragment : ScreenFragment("Map"), Logging {
     var mapView: MapView? = null
 
 
-
     private fun showDownloadedRegions() {
         // Get a list of tile regions that are currently available.
         tileStore.getAllTileRegions { expected ->
@@ -265,6 +264,9 @@ class MapFragment : ScreenFragment("Map"), Logging {
             //TODO: Setup Style menu for satellite view, street view, & outdoor view
             // downloadOfflineRegion()
         }
+        binding.downloadRegion.setOnClickListener {
+            downloadOfflineRegion()
+        }
         // We might not have a real mapview if running with analytics
         if ((requireContext().applicationContext as GeeksvilleApplication).isAnalyticsAllowed) {
             val vIn = viewIn.findViewById<MapView>(R.id.mapView)
@@ -478,10 +480,12 @@ class MapFragment : ScreenFragment("Map"), Logging {
     }
 
     private val click = OnMapClickListener {
-        if (binding.fabStyleToggle.isVisible) {
+        if (binding.fabStyleToggle.isVisible && binding.downloadRegion.isVisible) {
             binding.fabStyleToggle.visibility = View.INVISIBLE
+            binding.downloadRegion.visibility = View.INVISIBLE
         } else {
             binding.fabStyleToggle.visibility = View.VISIBLE
+            binding.downloadRegion.visibility = View.VISIBLE
         }
         return@OnMapClickListener true
     }
diff --git a/app/src/main/res/drawable/baseline_download_white_24dp.xml b/app/src/main/res/drawable/baseline_download_white_24dp.xml
new file mode 100644
index 000000000..41ed7875b
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_download_white_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M5,20h14v-2H5V20zM19,9h-4V3H9v6H5l7,7L19,9z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/map_view.xml b/app/src/main/res/layout/map_view.xml
index 1a58a9abc..b1ff6a129 100644
--- a/app/src/main/res/layout/map_view.xml
+++ b/app/src/main/res/layout/map_view.xml
@@ -5,12 +5,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.mapbox.maps.MapView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:mapbox="http://schemas.android.com/apk/res-auto"
+    <com.mapbox.maps.MapView
         android:id="@+id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        mapbox:mapbox_cameraZoom="0" />
+        app:mapbox_cameraZoom="0" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -26,21 +25,37 @@
             android:clickable="false"
             android:indeterminate="false"
             android:max="100"
-            android:visibility="gone"
-            android:progressTint="@color/colorPrimaryDark" />
+            android:progressTint="@color/colorPrimaryDark"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_style_toggle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:backgroundTint="@color/buttonColor"
+            android:contentDescription="@string/style_selection"
+            android:src="@drawable/baseline_layers_white_24dp"
+            tools:background="@color/buttonColor" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/download_region"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:backgroundTint="@color/buttonColor"
+            android:contentDescription="@string/download_region"
+            android:src="@drawable/baseline_download_white_24dp"
+            tools:background="@color/buttonColor" />
     </LinearLayout>
 
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab_style_toggle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:src="@drawable/baseline_layers_white_24dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:backgroundTint="@color/buttonColor"
-        android:contentDescription="@string/style_selection" />
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file