[0.6.x] Cherry pick fixes to 0.6.x (#2357)

* Reduce spacing between icon and title on Confirmation to 8dp (was 12dp) BUG: 352551711 * Update Confirmation layout (#2327) (cherry picked from commit 1ae64ea) * Picker (#2330) * Visual update for pickers. Horizontal padding set to 5.2% Padding above and below picker is 4.dp on smaller screens (less than 225.dp) and 6.dp on bigger screens. --------- Co-authored-by: ssancho14 <ssancho14@users.noreply.github.com> (cherry picked from commit c5f962a) * Dialog 2: Dialog Harder (#2343) * Update dialogs following validation. Top & bottom padding to be percent based (14.56% and 20.83% respectively). Add 4.dp extra below the Title if there is no message. Bug: http://b/352552040 --------- Co-authored-by: ssancho14 <ssancho14@users.noreply.github.com> Co-authored-by: Yuri Schimke <yuri@schimke.ee> (cherry picked from commit 6c92d68) * Update ReponsiveTimeText to 0dp, which simulates 2dp * Cherry pick specific fixes from #2342 --------- Co-authored-by: stevebower <stevebower@google.com> Co-authored-by: ssancho14 <50666481+ssancho14@users.noreply.github.com>
google · Aug 20, 2024 · 5e635b0 · 5e635b0
1 parent e8e3e78
commit 5e635b0
Show file tree

Hide file tree

Showing 554 changed files with 734 additions and 713 deletions.
diff --git a/ai/sample/core/build.gradle.kts b/ai/sample/core/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 21

diff --git a/ai/sample/phone/build.gradle.kts b/ai/sample/phone/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.google.android.horologist.ai.sample"

diff --git a/ai/sample/wear-core/build.gradle.kts b/ai/sample/wear-core/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 30

diff --git a/ai/sample/wear-gemini/build.gradle.kts b/ai/sample/wear-gemini/build.gradle.kts
@@ -37,7 +37,7 @@ plugins {
     kotlin("android")
     id("com.google.devtools.ksp")
     id("dagger.hilt.android.plugin")
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.9.24"
+    kotlin("plugin.serialization")
 }
 
 val localProperties = Properties().apply {
@@ -48,7 +48,7 @@ val localProperties = Properties().apply {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.google.android.horologist.ai.sample.wear.gemini"

diff --git a/ai/sample/wear-prompt-app/build.gradle.kts b/ai/sample/wear-prompt-app/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.google.android.horologist.ai.sample.prompt"

diff --git a/ai/ui/build.gradle.kts b/ai/ui/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 26

diff --git a/....google.android.horologist.ai.composables.components_PromptScreenTest_empty.png b/....google.android.horologist.ai.composables.components_PromptScreenTest_empty.png
diff --git a/auth/composables/build.gradle.kts b/auth/composables/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 26

diff --git a/...logist.auth.composables.screens_SelectAccountScreenTest_selectAccountScreen.png b/...logist.auth.composables.screens_SelectAccountScreenTest_selectAccountScreen.png
diff --git a/...uth.composables.screens_SelectAccountScreenTest_selectAccountScreenNoAvatar.png b/...uth.composables.screens_SelectAccountScreenTest_selectAccountScreenNoAvatar.png
diff --git a/auth/data-phone/build.gradle.kts b/auth/data-phone/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 21

diff --git a/auth/data/build.gradle.kts b/auth/data/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 26

diff --git a/auth/sample/phone/build.gradle.kts b/auth/sample/phone/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.google.android.horologist.auth.sample"

diff --git a/auth/sample/shared/build.gradle.kts b/auth/sample/shared/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 21

diff --git a/auth/sample/wear/build.gradle.kts b/auth/sample/wear/build.gradle.kts
@@ -20,7 +20,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.google.android.horologist.auth.sample"

diff --git a/auth/ui/build.gradle.kts b/auth/ui/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 26

diff --git a/composables/build.gradle.kts b/composables/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 26

diff --git a/composables/src/main/java/com/google/android/horologist/composables/DatePicker.kt b/composables/src/main/java/com/google/android/horologist/composables/DatePicker.kt
@@ -187,6 +187,8 @@ public fun DatePicker(
             }
         }
 
+    val paddingAroundPicker = if (isLargeScreen) 6.dp else 4.dp
+
     ScreenScaffold(
         modifier = modifier
             .fillMaxSize()
@@ -214,7 +216,7 @@ public fun DatePicker(
                     style = MaterialTheme.typography.button,
                     maxLines = 1,
                 )
-                Spacer(Modifier.height(4.dp))
+                Spacer(Modifier.height(paddingAroundPicker))
                 val spacerWidth = if (isLargeScreen) 6.dp else 2.dp
                 val textPadding = 6.dp // Update if UX decides a different value should be used.
 
@@ -333,7 +335,7 @@ public fun DatePicker(
                         )
                     }
                 }
-                Spacer(Modifier.height(4.dp))
+                Spacer(Modifier.height(paddingAroundPicker))
                 Button(
                     onClick = {
                         if (pickerGroupState.selectedIndex >= 2) {

diff --git a/composables/src/main/java/com/google/android/horologist/composables/TimePicker.kt b/composables/src/main/java/com/google/android/horologist/composables/TimePicker.kt
@@ -204,6 +204,8 @@ public fun TimePicker(
             }
         }
 
+    val paddingAroundPicker = if (isLargeScreen) 6.dp else 4.dp
+
     ScreenScaffold(
         modifier = modifier
             .fillMaxSize()
@@ -227,11 +229,11 @@ public fun TimePicker(
                 style = MaterialTheme.typography.button,
                 maxLines = 1,
             )
-            Spacer(Modifier.height(4.dp))
+            Spacer(Modifier.height(paddingAroundPicker))
             Row(
-                // Horizontal padding is 2.08% + 5.2%
+                // Horizontal padding is 5.2%
                 modifier = Modifier
-                    .fillMaxWidth(1 - 2 * 0.0728f)
+                    .fillMaxWidth(1 - 2 * 0.052f)
                     .weight(1f),
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.Center,
@@ -297,7 +299,7 @@ public fun TimePicker(
                     touchExplorationStateProvider = touchExplorationStateProvider,
                 )
             }
-            Spacer(Modifier.height(4.dp))
+            Spacer(Modifier.height(paddingAroundPicker))
             Button(
                 onClick = {
                     val seconds = if (showSeconds) secondState.selectedOption else 0
@@ -432,6 +434,8 @@ public fun TimePickerWith12HourClock(
         }
     }
 
+    val paddingAroundPicker = if (isLargeScreen) 6.dp else 4.dp
+
     ScreenScaffold(
         modifier = modifier
             .fillMaxSize()
@@ -454,7 +458,7 @@ public fun TimePickerWith12HourClock(
                 style = MaterialTheme.typography.button,
                 maxLines = 1,
             )
-            Spacer(Modifier.height(4.dp))
+            Spacer(Modifier.height(paddingAroundPicker))
             FontScaleIndependent {
                 val measurer = rememberTextMeasurer()
                 val density = LocalDensity.current
@@ -479,7 +483,7 @@ public fun TimePickerWith12HourClock(
 
                 Row(
                     modifier = Modifier
-                        .fillMaxWidth(1 - 2 * 0.0728f)
+                        .fillMaxWidth(1 - 2 * 0.052f)
                         .weight(1f),
                     verticalAlignment = Alignment.CenterVertically,
                     horizontalArrangement = Arrangement.Center,
@@ -551,7 +555,7 @@ public fun TimePickerWith12HourClock(
                     )
                 }
             }
-            Spacer(Modifier.height(4.dp))
+            Spacer(Modifier.height(paddingAroundPicker))
             Button(
                 onClick = {
                     val confirmedTime = LocalTime.of(

diff --git a/...om.google.android.horologist.composables_DatePickerA11yTest_interactionTest.png b/...om.google.android.horologist.composables_DatePickerA11yTest_interactionTest.png
diff --git a/....google.android.horologist.composables_DatePickerA11yTest_interactionTest_1.png b/....google.android.horologist.composables_DatePickerA11yTest_interactionTest_1.png
diff --git a/....google.android.horologist.composables_DatePickerA11yTest_interactionTest_2.png b/....google.android.horologist.composables_DatePickerA11yTest_interactionTest_2.png
diff --git a/....google.android.horologist.composables_DatePickerA11yTest_interactionTest_3.png b/....google.android.horologist.composables_DatePickerA11yTest_interactionTest_3.png
diff --git a/...ges/com.google.android.horologist.composables_DatePickerA11yTest_screenshot.png b/...ges/com.google.android.horologist.composables_DatePickerA11yTest_screenshot.png
diff --git a/...ots/images/com.google.android.horologist.composables_DatePickerTest_initial.png b/...ots/images/com.google.android.horologist.composables_DatePickerTest_initial.png
diff --git a/...com.google.android.horologist.composables_DatePickerTest_largestFontScaling.png b/...com.google.android.horologist.composables_DatePickerTest_largestFontScaling.png
diff --git a/...roid.horologist.composables_PickerThemeTest_datePicker[0]_BlueDefaultAECBFA.png b/...roid.horologist.composables_PickerThemeTest_datePicker[0]_BlueDefaultAECBFA.png
diff --git a/...gle.android.horologist.composables_PickerThemeTest_datePicker[1]_Blue7FCFFF.png b/...gle.android.horologist.composables_PickerThemeTest_datePicker[1]_Blue7FCFFF.png
diff --git a/...le.android.horologist.composables_PickerThemeTest_datePicker[2]_LilacD0BCFF.png b/...le.android.horologist.composables_PickerThemeTest_datePicker[2]_LilacD0BCFF.png
diff --git a/...le.android.horologist.composables_PickerThemeTest_datePicker[3]_Green6DD58C.png b/...le.android.horologist.composables_PickerThemeTest_datePicker[3]_Green6DD58C.png
diff --git a/...oid.horologist.composables_PickerThemeTest_datePicker[4]_BluewithText7FCFFF.png b/...oid.horologist.composables_PickerThemeTest_datePicker[4]_BluewithText7FCFFF.png
diff --git a/...google.android.horologist.composables_PickerThemeTest_datePicker[5]_Orangey.png b/...google.android.horologist.composables_PickerThemeTest_datePicker[5]_Orangey.png
diff --git a/...om.google.android.horologist.composables_PickerThemeTest_datePicker[6]_Uamp.png b/...om.google.android.horologist.composables_PickerThemeTest_datePicker[6]_Uamp.png
diff --git a/...d.horologist.composables_PickerThemeTest_timePicker12h[0]_BlueDefaultAECBFA.png b/...d.horologist.composables_PickerThemeTest_timePicker12h[0]_BlueDefaultAECBFA.png
diff --git a/....android.horologist.composables_PickerThemeTest_timePicker12h[1]_Blue7FCFFF.png b/....android.horologist.composables_PickerThemeTest_timePicker12h[1]_Blue7FCFFF.png
diff --git a/...android.horologist.composables_PickerThemeTest_timePicker12h[2]_LilacD0BCFF.png b/...android.horologist.composables_PickerThemeTest_timePicker12h[2]_LilacD0BCFF.png
diff --git a/...android.horologist.composables_PickerThemeTest_timePicker12h[3]_Green6DD58C.png b/...android.horologist.composables_PickerThemeTest_timePicker12h[3]_Green6DD58C.png
diff --git a/....horologist.composables_PickerThemeTest_timePicker12h[4]_BluewithText7FCFFF.png b/....horologist.composables_PickerThemeTest_timePicker12h[4]_BluewithText7FCFFF.png
diff --git a/...gle.android.horologist.composables_PickerThemeTest_timePicker12h[5]_Orangey.png b/...gle.android.horologist.composables_PickerThemeTest_timePicker12h[5]_Orangey.png
diff --git a/...google.android.horologist.composables_PickerThemeTest_timePicker12h[6]_Uamp.png b/...google.android.horologist.composables_PickerThemeTest_timePicker12h[6]_Uamp.png
diff --git a/...roid.horologist.composables_PickerThemeTest_timePicker[0]_BlueDefaultAECBFA.png b/...roid.horologist.composables_PickerThemeTest_timePicker[0]_BlueDefaultAECBFA.png
diff --git a/...gle.android.horologist.composables_PickerThemeTest_timePicker[1]_Blue7FCFFF.png b/...gle.android.horologist.composables_PickerThemeTest_timePicker[1]_Blue7FCFFF.png
diff --git a/...le.android.horologist.composables_PickerThemeTest_timePicker[2]_LilacD0BCFF.png b/...le.android.horologist.composables_PickerThemeTest_timePicker[2]_LilacD0BCFF.png
diff --git a/...le.android.horologist.composables_PickerThemeTest_timePicker[3]_Green6DD58C.png b/...le.android.horologist.composables_PickerThemeTest_timePicker[3]_Green6DD58C.png