Disable download button on pan/zoom and while estimating size (#1863)

* Disable download button while estimating size * Disable download button while estimating size * Add color for older Droids * Fix merge issues * Use correct disabled surface color * Remove unused color
google · Sep 12, 2023 · 30fd1a1 · 30fd1a1
1 parent 3fe2275
commit 30fd1a1
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 7 deletions.
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
@@ -171,7 +171,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/...n/java/com/google/android/ground/ui/offlineareas/selector/OfflineAreaSelectorViewModel.kt b/...n/java/com/google/android/ground/ui/offlineareas/selector/OfflineAreaSelectorViewModel.kt
@@ -110,8 +110,14 @@ internal constructor(
     navigator.navigateUp()
   }
 
+  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
@@ -125,12 +131,12 @@ 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)
   }
 
   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
@@ -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/md_theme_on_surface_disabled" android:state_enabled="false"/>
+  <item android:color="?attr/colorPrimary" />
+</selector>
diff --git a/ground/src/main/res/layout/offline_area_selector_frag.xml b/ground/src/main/res/layout/offline_area_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
@@ -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>