Render the draw vertex to be open to prevent occluding the target poi…

…nt. (#2241)
google · Feb 23, 2024 · ec64292 · ec64292
1 parent c5a130e
commit ec64292
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 16 deletions.
diff --git a/...n/java/com/google/android/ground/ui/datacollection/tasks/polygon/DrawAreaTaskViewModel.kt b/...n/java/com/google/android/ground/ui/datacollection/tasks/polygon/DrawAreaTaskViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/ground/src/main/java/com/google/android/ground/ui/map/Feature.kt b/ground/src/main/java/com/google/android/ground/ui/map/Feature.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,6 +62,6 @@ data class Feature(
 
   enum class VertexStyle {
     NONE,
-    CIRCLE
+    CIRCLE,
   }
 }
diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/features/LineStringRenderer.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/features/LineStringRenderer.kt
@@ -40,7 +40,7 @@ constructor(private val resources: Resources, private val bitmapUtil: BitmapUtil
   // initialization.
   private val defaultStrokeWidth by lazy { resources.getDimension(R.dimen.line_geometry_width) }
   private val circleCap by lazy {
-    val bitmap = bitmapUtil.fromVector(R.drawable.ic_endpoint)
+    val bitmap = bitmapUtil.fromVector(R.drawable.ic_circle_marker)
     CustomCap(BitmapDescriptorFactory.fromBitmap(bitmap))
   }
 
@@ -65,6 +65,7 @@ constructor(private val resources: Resources, private val bitmapUtil: BitmapUtil
         startCap = circleCap
         endCap = circleCap
       }
+
       val strokeScale = if (selected) 2f else 1f
       width = defaultStrokeWidth * strokeScale
       color = style.color

diff --git a/ground/src/main/res/drawable/ic_endpoint.xml → ...rc/main/res/drawable/ic_circle_marker.xml b/ground/src/main/res/drawable/ic_endpoint.xml → ...rc/main/res/drawable/ic_circle_marker.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright 2021 Google LLC
+  ~ Copyright 2024 Google LLC
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -17,13 +17,14 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
       android:pathData="M12,12m-10.5,0a10.5,10.5 0,1 1,21 0a10.5,10.5 0,1 1,-21 0"
       android:strokeWidth="3"
       android:fillColor="#ffffff"
-      android:strokeColor="#E59810"/>
+      android:strokeColor="@color/drawAreaLineStringStrokeColor"/>
 </vector>
+
diff --git a/ground/src/main/res/drawable/ic_plus_sign.xml b/ground/src/main/res/drawable/ic_plus_sign.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2024 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="25dp"
+  android:height="25dp"
+  android:viewportWidth="8"
+  android:viewportHeight="8">
+  <path
+    android:fillAlpha="0"
+    android:pathData="M4 1L4 7"
+    android:strokeWidth="2"
+    android:strokeColor="@color/drawAreaLineStringStrokeColor"
+    android:strokeLineCap="round" />
+  <path
+    android:fillAlpha="0"
+    android:pathData="M7 4L1 4"
+    android:strokeWidth="2"
+    android:strokeColor="@color/drawAreaLineStringStrokeColor"
+    android:strokeLineCap="round"/>
+</vector>
+
diff --git a/ground/src/main/res/layout/map_task_frag.xml b/ground/src/main/res/layout/map_task_frag.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright 2018 Google LLC
+  ~ Copyright 2024 Google LLC
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -38,15 +38,15 @@
       layout="@layout/basemap_layout"
       app:fragment="@{fragment}"
       app:viewModel="@{viewModel}" />
-
     <androidx.constraintlayout.utils.widget.ImageFilterView
       android:id="@+id/centerMarker"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center"
-      android:src="@drawable/ic_gps_lock"
-      android:tint="@android:color/white" />
-
+      android:scaleType="centerInside"
+      android:scaleX="0.5"
+      android:scaleY="0.5"
+      android:src="@drawable/ic_plus_sign" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/hintIcon"
       android:layout_width="wrap_content"

diff --git a/ground/src/main/res/values/colors.xml b/ground/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright 2018 Google LLC
+  ~ Copyright 2024 Google LLC
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@
   <color name="clusterBalloonStrokeColor">#4B6DDD81</color>
   <color name="textOverMap">#FCFDF7</color>
   <color name="blackOverlay">#000000</color>
+  <!-- DrawArea color palette -->
+  <color name="drawAreaLineStringStrokeColor">#EDAE3D</color>
 
   <!-- Updated Color palette -->
   <color name="md_theme_primary">#006E2C</color>

diff --git a/ground/src/main/res/values/dimens.xml b/ground/src/main/res/values/dimens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright 2018 Google LLC
+  ~ Copyright 2024 Google LLC
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 
 <resources>
   <!-- Map -->
-  <dimen name="line_geometry_width">4dp</dimen>
+  <dimen name="line_geometry_width">2dp</dimen>
   <item name="default_marker_scale_factor" format="float" type="dimen">2</item>
   <item name="selected_marker_scale_factor" format="float" type="dimen">1.5</item>