From 48e2ec770c10f77890a2f9393fd079d92adbe02c Mon Sep 17 00:00:00 2001
From: Gino Miceli <gmiceli@google.com>
Date: Thu, 9 Nov 2023 17:32:06 -0500
Subject: [PATCH 1/7] Tweak menu text and icons

---
 .../main/res/drawable-anydpi/ic_history.xml   | 29 +++++++++++++++
 .../main/res/drawable-anydpi/ic_satellite.xml | 29 +++++++++++++++
 .../main/res/drawable/ic_content_paste.xml    | 28 +++++++++++++++
 ground/src/main/res/menu/nav_drawer_menu.xml  | 36 +++++++++----------
 ground/src/main/res/values/strings.xml        |  4 +--
 5 files changed, 104 insertions(+), 22 deletions(-)
 create mode 100644 ground/src/main/res/drawable-anydpi/ic_history.xml
 create mode 100644 ground/src/main/res/drawable-anydpi/ic_satellite.xml
 create mode 100644 ground/src/main/res/drawable/ic_content_paste.xml

diff --git a/ground/src/main/res/drawable-anydpi/ic_history.xml b/ground/src/main/res/drawable-anydpi/ic_history.xml
new file mode 100644
index 0000000000..5a67459353
--- /dev/null
+++ b/ground/src/main/res/drawable-anydpi/ic_history.xml
@@ -0,0 +1,29 @@
+<?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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#424940"
+    android:alpha="1.0">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
+</vector>
diff --git a/ground/src/main/res/drawable-anydpi/ic_satellite.xml b/ground/src/main/res/drawable-anydpi/ic_satellite.xml
new file mode 100644
index 0000000000..fa059f6463
--- /dev/null
+++ b/ground/src/main/res/drawable-anydpi/ic_satellite.xml
@@ -0,0 +1,29 @@
+<?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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#424940"
+    android:alpha="1.0">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM8.57,6L6,6v2.58c1.42,0 2.57,-1.16 2.57,-2.58zM12,6h-1.71c0,2.36 -1.92,4.29 -4.29,4.29L6,12c3.32,0 6,-2.69 6,-6zM14.14,11.86l-3,3.87L9,13.15 6,17h12z"/>
+</vector>
diff --git a/ground/src/main/res/drawable/ic_content_paste.xml b/ground/src/main/res/drawable/ic_content_paste.xml
new file mode 100644
index 0000000000..4dc66be686
--- /dev/null
+++ b/ground/src/main/res/drawable/ic_content_paste.xml
@@ -0,0 +1,28 @@
+<?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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="24dp"
+  android:height="24dp"
+  android:tint="#424940"
+  android:viewportWidth="24"
+  android:viewportHeight="24">
+  <path
+    android:fillColor="@android:color/white"
+    android:pathData="M19,2h-4.18C14.4,0.84 13.3,0 12,0S9.6,0.84 9.18,2L5,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,2c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM19,20L5,20L5,4h2v3h10L17,4h2v16z" />
+</vector>
diff --git a/ground/src/main/res/menu/nav_drawer_menu.xml b/ground/src/main/res/menu/nav_drawer_menu.xml
index a309ddc1e7..f005e81428 100644
--- a/ground/src/main/res/menu/nav_drawer_menu.xml
+++ b/ground/src/main/res/menu/nav_drawer_menu.xml
@@ -21,24 +21,20 @@
     android:id="@+id/nav_change_survey"
     android:icon="@drawable/ic_add"
     android:title="@string/change_survey" />
-  <group
-    android:id="@+id/group_other"
-    android:checkableBehavior="none">
-    <item
-      android:id="@+id/sync_status"
-      android:icon="@drawable/ic_sync"
-      android:title="@string/sync_status" />
-    <item
-      android:id="@+id/nav_offline_areas"
-      android:icon="@drawable/ic_cloud_offline"
-      android:title="@string/offline_map_imagery" />
-    <item
-      android:id="@+id/nav_settings"
-      android:icon="@drawable/ic_settings"
-      android:title="@string/settings" />
-    <item
-      android:id="@+id/nav_sign_out"
-      android:icon="@drawable/ic_sign_out"
-      android:title="@string/sign_out" />
-  </group>
+  <item
+    android:id="@+id/sync_status"
+    android:icon="@drawable/ic_history"
+    android:title="@string/sync_status" />
+  <item
+    android:id="@+id/nav_offline_areas"
+    android:icon="@drawable/ic_satellite"
+    android:title="@string/offline_map_imagery" />
+  <item
+    android:id="@+id/nav_settings"
+    android:icon="@drawable/ic_settings"
+    android:title="@string/settings" />
+  <item
+    android:id="@+id/nav_sign_out"
+    android:icon="@drawable/ic_sign_out"
+    android:title="@string/sign_out" />
 </menu>
diff --git a/ground/src/main/res/values/strings.xml b/ground/src/main/res/values/strings.xml
index 95af0c18c9..3e50c00ebd 100644
--- a/ground/src/main/res/values/strings.xml
+++ b/ground/src/main/res/values/strings.xml
@@ -74,7 +74,7 @@
   <string name="saving">Saving&#8230;</string>
   <string name="google_api_install_failed">Google Play Services installation failed</string>
   <string name="sign_out">Sign out</string>
-  <string name="change_survey">Change survey</string>
+  <string name="change_survey">Surveys</string>
   <string name="collect_data">Collect data</string>
 
   <!-- Untranslated strings -->
@@ -101,7 +101,7 @@
   <string name="date">Date</string>
   <string name="time">Time</string>
   <!-- Other strings (to be organized) -->
-  <string name="sync_status">Sync status</string>
+  <string name="sync_status">History and sync status</string>
   <string name="layer_label_format">Job: %s</string>
 
   <string name="add_point">Add point</string>

From 665cfc56f41fe049d12a03897417e416fad3d67b Mon Sep 17 00:00:00 2001
From: Gino Miceli <gmiceli@google.com>
Date: Fri, 10 Nov 2023 17:28:31 -0500
Subject: [PATCH 2/7] Nav drawer styles

---
 ground/src/main/res/menu/nav_drawer_menu.xml | 2 +-
 ground/src/main/res/values/styles.xml        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ground/src/main/res/menu/nav_drawer_menu.xml b/ground/src/main/res/menu/nav_drawer_menu.xml
index f005e81428..02817cf0f5 100644
--- a/ground/src/main/res/menu/nav_drawer_menu.xml
+++ b/ground/src/main/res/menu/nav_drawer_menu.xml
@@ -19,7 +19,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
   <item
     android:id="@+id/nav_change_survey"
-    android:icon="@drawable/ic_add"
+    android:icon="@drawable/ic_content_paste"
     android:title="@string/change_survey" />
   <item
     android:id="@+id/sync_status"
diff --git a/ground/src/main/res/values/styles.xml b/ground/src/main/res/values/styles.xml
index 3b6dcc267e..e618af69ab 100644
--- a/ground/src/main/res/values/styles.xml
+++ b/ground/src/main/res/values/styles.xml
@@ -73,8 +73,12 @@
     <item name="android:letterSpacing">0.01</item>
   </style>
 
+  <style name="Widget.App.DrawerLayout" parent="Widget.Material3.DrawerLayout">
+    <item name="android:textColor">?attr/colorOnSurfaceVariant</item>
+  </style>
+
   <style name="EditSubmission.Task.Text" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
-    <item name="boxStrokeColor">?attr/colorPrimary</item>
+    <item name="boxStrokeColor">?attr/colorPrimary</item>F5F5F0
   </style>
 
   <!-- NavDrawer Header -->

From 0142a4c6e3dfaba7d149d48feed1b52cc42ca7a6 Mon Sep 17 00:00:00 2001
From: Gino Miceli <gmiceli@google.com>
Date: Fri, 10 Nov 2023 17:37:35 -0500
Subject: [PATCH 3/7] Fix accidental paste

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

diff --git a/ground/src/main/res/values/styles.xml b/ground/src/main/res/values/styles.xml
index e618af69ab..c02ba91741 100644
--- a/ground/src/main/res/values/styles.xml
+++ b/ground/src/main/res/values/styles.xml
@@ -78,7 +78,7 @@
   </style>
 
   <style name="EditSubmission.Task.Text" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
-    <item name="boxStrokeColor">?attr/colorPrimary</item>F5F5F0
+    <item name="boxStrokeColor">?attr/colorPrimary</item>
   </style>
 
   <!-- NavDrawer Header -->

From 7b220108a40a70016b0858f8fa33ec2e54494b89 Mon Sep 17 00:00:00 2001
From: Gino Miceli <gmiceli@google.com>
Date: Mon, 13 Nov 2023 08:50:23 -0500
Subject: [PATCH 4/7] Remove unused

---
 .../res/drawable-anydpi/ic_cloud_offline.xml  | 28 -------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 ground/src/main/res/drawable-anydpi/ic_cloud_offline.xml

diff --git a/ground/src/main/res/drawable-anydpi/ic_cloud_offline.xml b/ground/src/main/res/drawable-anydpi/ic_cloud_offline.xml
deleted file mode 100644
index c53075fc93..0000000000
--- a/ground/src/main/res/drawable-anydpi/ic_cloud_offline.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2020 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="24dp"
-  android:height="24dp"
-  android:tint="?attr/colorOnSurface"
-  android:viewportWidth="24"
-  android:viewportHeight="24">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4c-1.48,0 -2.85,0.43 -4.01,1.17l1.46,1.46C10.21,6.23 11.08,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3 0,1.13 -0.64,2.11 -1.56,2.62l1.45,1.45C23.16,18.16 24,16.68 24,15c0,-2.64 -2.05,-4.78 -4.65,-4.96zM3,5.27l2.75,2.74C2.56,8.15 0,10.77 0,14c0,3.31 2.69,6 6,6h11.73l2,2L21,20.73 4.27,4 3,5.27zM7.73,10l8,8H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h1.73z" />
-</vector>

From 8d7ba3f297c20f117e1239437a0801f7e0924716 Mon Sep 17 00:00:00 2001
From: Gino Miceli <gmiceli@google.com>
Date: Mon, 13 Nov 2023 09:15:56 -0500
Subject: [PATCH 5/7] Tweak styling

---
 ground/src/main/res/layout/home_screen_frag.xml | 1 +
 ground/src/main/res/values/styles.xml           | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/ground/src/main/res/layout/home_screen_frag.xml b/ground/src/main/res/layout/home_screen_frag.xml
index a9e3ebb734..e5b1f4f441 100644
--- a/ground/src/main/res/layout/home_screen_frag.xml
+++ b/ground/src/main/res/layout/home_screen_frag.xml
@@ -55,6 +55,7 @@
       android:layout_width="wrap_content"
       android:layout_height="match_parent"
       android:layout_gravity="start"
+      app:itemTextAppearance="@style/TextAppearance.App.TitleSmall.OnSurfaceContainer"
       app:headerLayout="@layout/nav_drawer_header"
       app:itemBackground="@android:color/transparent"
       app:itemIconTint="@color/nav_drawer_item"
diff --git a/ground/src/main/res/values/styles.xml b/ground/src/main/res/values/styles.xml
index c02ba91741..07bedde149 100644
--- a/ground/src/main/res/values/styles.xml
+++ b/ground/src/main/res/values/styles.xml
@@ -149,6 +149,14 @@
     <item name="iconTint">?attr/colorPrimary</item>
   </style>
 
+  <style name="TextAppearance.App.TitleSmall" parent="TextAppearance.Material3.TitleSmall">
+    <item name="fontFamily">@font/text_700</item>
+  </style>
+
+  <style name="TextAppearance.App.TitleSmall.OnSurfaceContainer">
+    <item name="android:textColor">?attr/colorOnSurfaceVariant</item>
+  </style>
+
   <style name="TextAppearance.App.TitleMedium" parent="TextAppearance.Material3.TitleMedium">
     <item name="fontFamily">@font/text_700</item>
     <item name="android:textColor">?attr/colorOnSurface</item>

From 3ca7c233773054208733d0fcebaf0b90cb07d13e Mon Sep 17 00:00:00 2001
From: Gino Miceli <gmiceli@google.com>
Date: Mon, 13 Nov 2023 10:09:34 -0500
Subject: [PATCH 6/7] Fix tests

---
 .../google/android/ground/ui/home/HomeScreenFragmentTest.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ground/src/test/java/com/google/android/ground/ui/home/HomeScreenFragmentTest.kt b/ground/src/test/java/com/google/android/ground/ui/home/HomeScreenFragmentTest.kt
index 6664c35f05..339d2ec795 100644
--- a/ground/src/test/java/com/google/android/ground/ui/home/HomeScreenFragmentTest.kt
+++ b/ground/src/test/java/com/google/android/ground/ui/home/HomeScreenFragmentTest.kt
@@ -179,10 +179,10 @@ class NavigationDrawerItemClickTest(
     fun data() =
       listOf(
         arrayOf(
-          "Change survey",
+          "Surveys",
           HomeScreenFragmentDirections.actionHomeScreenFragmentToSurveySelectorFragment(false)
         ),
-        arrayOf("Sync status", HomeScreenFragmentDirections.showSyncStatus()),
+        arrayOf("History and sync status", HomeScreenFragmentDirections.showSyncStatus()),
         arrayOf("Offline map imagery", HomeScreenFragmentDirections.showOfflineAreas()),
         arrayOf(
           "Settings",

From d566a6457aa875874c71d536856d83e24f802220 Mon Sep 17 00:00:00 2001
From: Gino Miceli <gmiceli@google.com>
Date: Tue, 21 Nov 2023 15:32:02 -0500
Subject: [PATCH 7/7] Remove unused style

---
 ground/src/main/res/values/styles.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ground/src/main/res/values/styles.xml b/ground/src/main/res/values/styles.xml
index 07bedde149..9191f7019d 100644
--- a/ground/src/main/res/values/styles.xml
+++ b/ground/src/main/res/values/styles.xml
@@ -73,10 +73,6 @@
     <item name="android:letterSpacing">0.01</item>
   </style>
 
-  <style name="Widget.App.DrawerLayout" parent="Widget.Material3.DrawerLayout">
-    <item name="android:textColor">?attr/colorOnSurfaceVariant</item>
-  </style>
-
   <style name="EditSubmission.Task.Text" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
     <item name="boxStrokeColor">?attr/colorPrimary</item>
   </style>