From 8f506a835cc8ea209c0fec6e200d8d31d0894b42 Mon Sep 17 00:00:00 2001
From: Gino Miceli <gmiceli@google.com>
Date: Sun, 10 Sep 2023 18:20:34 -0400
Subject: [PATCH 1/6] Disable download button while estimating size

---
 .../ui/offlinebasemap/selector/OfflineAreaSelectorViewModel.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ground/src/main/java/com/google/android/ground/ui/offlinebasemap/selector/OfflineAreaSelectorViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/offlinebasemap/selector/OfflineAreaSelectorViewModel.kt
index 2786ddde75..2a0d4b00fa 100644
--- a/ground/src/main/java/com/google/android/ground/ui/offlinebasemap/selector/OfflineAreaSelectorViewModel.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/offlinebasemap/selector/OfflineAreaSelectorViewModel.kt
@@ -125,6 +125,7 @@ internal constructor(
   }
 
   private fun onStartEstimatingDownloadSize() {
+    downloadButtonEnabled.postValue(false)
     sizeOnDisk.postValue(resources.getString(R.string.offline_area_size_loading_symbol))
     visibleBottomTextViewId.postValue(R.id.size_on_disk_text_view)
   }

From fd4a33b147105bf4f14f6a43959136b51a5e0096 Mon Sep 17 00:00:00 2001
From: Gino Miceli <gmiceli@google.com>
Date: Sun, 10 Sep 2023 18:50:51 -0400
Subject: [PATCH 2/6] Disable download button while estimating size

---
 .../ground/ui/common/BaseMapViewModel.kt      |  2 +-
 .../selector/OfflineAreaSelectorViewModel.kt  |  7 ++++++-
 .../res/color/color_states_primary_button.xml | 21 +++++++++++++++++++
 .../layout/offline_base_map_selector_frag.xml | 10 +++++----
 ground/src/main/res/values/styles.xml         |  2 +-
 5 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 ground/src/main/res/color/color_states_primary_button.xml

diff --git a/ground/src/main/java/com/google/android/ground/ui/common/BaseMapViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/common/BaseMapViewModel.kt
index a426fe5444..aa4854f8ec 100644
--- a/ground/src/main/java/com/google/android/ground/ui/common/BaseMapViewModel.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/common/BaseMapViewModel.kt
@@ -180,7 +180,7 @@ constructor(
   }
 
   /** Called when the map starts to move by the user. */
-  fun onMapDragged() {
+  open fun onMapDragged() {
     if (locationLock.value.getOrDefault(false)) {
       Timber.d("User dragged map. Disabling location lock")
       viewModelScope.launch { disableLocationLock() }
diff --git a/ground/src/main/java/com/google/android/ground/ui/offlinebasemap/selector/OfflineAreaSelectorViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/offlinebasemap/selector/OfflineAreaSelectorViewModel.kt
index 2a0d4b00fa..56a88678ba 100644
--- a/ground/src/main/java/com/google/android/ground/ui/offlinebasemap/selector/OfflineAreaSelectorViewModel.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/offlinebasemap/selector/OfflineAreaSelectorViewModel.kt
@@ -111,8 +111,14 @@ internal constructor(
     disposeOnClear(cameraBoundUpdates.subscribe { viewport = it })
   }
 
+  override fun onMapDragged() {
+    onStartEstimatingDownloadSize()
+    super.onMapDragged()
+  }
+
   override fun onMapCameraMoved(newCameraPosition: CameraPosition) {
     super.onMapCameraMoved(newCameraPosition)
+
     val bounds = newCameraPosition.bounds
     val zoomLevel = newCameraPosition.zoomLevel
     if (bounds == null || zoomLevel == null) return
@@ -131,7 +137,6 @@ internal constructor(
   }
 
   private suspend fun updateDownloadSize(bounds: Bounds) {
-    onStartEstimatingDownloadSize()
     val sizeInMb = offlineAreaRepository.estimateSizeOnDisk(bounds) / (1024f * 1024f)
     if (sizeInMb > MAX_AREA_DOWNLOAD_SIZE_MB) {
       onLargeAreaSelected()
diff --git a/ground/src/main/res/color/color_states_primary_button.xml b/ground/src/main/res/color/color_states_primary_button.xml
new file mode 100644
index 0000000000..68dcf54f69
--- /dev/null
+++ b/ground/src/main/res/color/color_states_primary_button.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@color/material_dynamic_neutral50" android:state_enabled="false" />
+  <item android:color="?attr/colorPrimary" />
+</selector>
\ No newline at end of file
diff --git a/ground/src/main/res/layout/offline_base_map_selector_frag.xml b/ground/src/main/res/layout/offline_base_map_selector_frag.xml
index 2ec2d50246..d16c100b51 100644
--- a/ground/src/main/res/layout/offline_base_map_selector_frag.xml
+++ b/ground/src/main/res/layout/offline_base_map_selector_frag.xml
@@ -101,7 +101,7 @@
         app:layout_constraintTop_toBottomOf="@id/top_mask"
         app:layout_constraintBottom_toTopOf="@id/bottom_mask"
         app:layout_constraintLeft_toRightOf="@id/left_mask"
-        app:layout_constraintRight_toLeftOf="@id/right_mask"/>
+        app:layout_constraintRight_toLeftOf="@id/right_mask" />
 
       <FrameLayout
         android:id="@+id/bottom_mask"
@@ -113,7 +113,7 @@
           android:layout_width="match_parent"
           android:layout_height="match_parent"
           android:background="@color/blackMapOverlay"
-          android:alpha="0.4"/>
+          android:alpha="0.4" />
 
         <TextView
           android:id="@+id/size_on_disk_text_view"
@@ -125,7 +125,7 @@
           android:textColor="@color/textOverMap"
           android:layout_marginHorizontal="64dp"
           android:visibility="@{viewModel.visibleBottomTextViewId == R.id.size_on_disk_text_view ? View.VISIBLE : View.GONE}"
-          android:text="@{@string/selected_offline_area_size(viewModel.sizeOnDisk)}"/>
+          android:text="@{@string/selected_offline_area_size(viewModel.sizeOnDisk)}" />
 
         <TextView
           android:id="@+id/area_too_large_text_view"
@@ -137,7 +137,7 @@
           android:textColor="@color/textOverMap"
           android:layout_marginHorizontal="64dp"
           android:visibility="@{viewModel.visibleBottomTextViewId == R.id.area_too_large_text_view ? View.VISIBLE : View.GONE}"
-          android:text="@string/selected_offline_area_too_large"/>
+          android:text="@string/selected_offline_area_too_large" />
       </FrameLayout>
 
       <LinearLayout
@@ -170,6 +170,8 @@
           android:layout_marginStart="8dp"
           android:layout_marginEnd="16dp"
           android:layout_marginTop="16dp"
+          android:enabled="@{viewModel.downloadButtonEnabled}"
+          android:clickable="@{viewModel.downloadButtonEnabled}"
           android:onClick="@{() -> viewModel.onDownloadClick()}" />
       </LinearLayout>
 
diff --git a/ground/src/main/res/values/styles.xml b/ground/src/main/res/values/styles.xml
index 5e7b2c367e..9c6310b723 100644
--- a/ground/src/main/res/values/styles.xml
+++ b/ground/src/main/res/values/styles.xml
@@ -139,7 +139,7 @@
   </style>
 
   <style name="ChipButton" parent="Widget.MaterialComponents.Chip.Action">
-    <item name="chipBackgroundColor">?attr/colorPrimary</item>
+    <item name="chipBackgroundColor">@color/color_states_primary_button</item>
     <item name="chipCornerRadius">@dimen/chip_button_corner_radius</item>
     <item name="chipStartPadding">@dimen/chip_button_padding</item>
     <item name="chipEndPadding">@dimen/chip_button_padding</item>

From 538596ab70cfce127b6ebd522349160754dc7358 Mon Sep 17 00:00:00 2001
From: Gino Miceli <gmiceli@google.com>
Date: Sun, 10 Sep 2023 19:09:24 -0400
Subject: [PATCH 3/6] Add color for older Droids

---
 ground/src/main/res/values/colors.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ground/src/main/res/values/colors.xml b/ground/src/main/res/values/colors.xml
index b286c74a31..ad5961cd66 100644
--- a/ground/src/main/res/values/colors.xml
+++ b/ground/src/main/res/values/colors.xml
@@ -23,6 +23,7 @@
   <color name="textOverMap">#FCFDF7</color>
   <color name="blackMapOverlay">#000000</color>
   <color name="lightBackground">#EDEEE9</color>
+  <color name="material_dynamic_neutral50">#747679</color>
 
   <!-- Updated Color palette -->
   <color name="md_theme_primary">#006E2C</color>

From 97cb44d84b67a64a9657d94229a0d45de743ff46 Mon Sep 17 00:00:00 2001
From: Gino Miceli <gmiceli@google.com>
Date: Mon, 11 Sep 2023 15:46:27 -0400
Subject: [PATCH 4/6] Fix merge issues

---
 .../ui/offlineareas/selector/OfflineAreaSelectorViewModel.kt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ground/src/main/java/com/google/android/ground/ui/offlineareas/selector/OfflineAreaSelectorViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/offlineareas/selector/OfflineAreaSelectorViewModel.kt
index 20c5c1d05e..3bc0331e0f 100644
--- a/ground/src/main/java/com/google/android/ground/ui/offlineareas/selector/OfflineAreaSelectorViewModel.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/offlineareas/selector/OfflineAreaSelectorViewModel.kt
@@ -110,11 +110,6 @@ internal constructor(
     navigator.navigateUp()
   }
 
-  fun onMapReady(map: Map) {
-    remoteTileSources.forEach { map.addTileOverlay(it) }
-    disposeOnClear(cameraBoundUpdates.subscribe { viewport = it })
-  }
-
   override fun onMapDragged() {
     onStartEstimatingDownloadSize()
     super.onMapDragged()

From b11a019cc3cd5065aeba03b9704b526a41027832 Mon Sep 17 00:00:00 2001
From: Gino Miceli <gmiceli@google.com>
Date: Mon, 11 Sep 2023 17:56:42 -0400
Subject: [PATCH 5/6] Use correct disabled surface color

---
 ground/src/main/res/color/color_states_primary_button.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ground/src/main/res/color/color_states_primary_button.xml b/ground/src/main/res/color/color_states_primary_button.xml
index 68dcf54f69..9c77c73887 100644
--- a/ground/src/main/res/color/color_states_primary_button.xml
+++ b/ground/src/main/res/color/color_states_primary_button.xml
@@ -16,6 +16,6 @@
   ~ limitations under the License.
   -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/material_dynamic_neutral50" android:state_enabled="false" />
+  <item android:color="@color/md_theme_on_surface_disabled" android:state_enabled="false"/>
   <item android:color="?attr/colorPrimary" />
 </selector>
\ No newline at end of file

From 37d1c94a07b663927ac28b2a0a91b246c97352d6 Mon Sep 17 00:00:00 2001
From: Gino Miceli <gmiceli@google.com>
Date: Mon, 11 Sep 2023 22:49:05 -0400
Subject: [PATCH 6/6] Remove unused color

---
 ground/src/main/res/values/colors.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ground/src/main/res/values/colors.xml b/ground/src/main/res/values/colors.xml
index 9b4641b82b..21bf294b90 100644
--- a/ground/src/main/res/values/colors.xml
+++ b/ground/src/main/res/values/colors.xml
@@ -22,7 +22,6 @@
   <color name="polyLineColor">#55ffffff</color>
   <color name="textOverMap">#FCFDF7</color>
   <color name="blackMapOverlay">#000000</color>
-  <color name="material_dynamic_neutral50">#747679</color>
 
   <!-- Updated Color palette -->
   <color name="md_theme_primary">#006E2C</color>