Merge remote-tracking branch 'origin/canary' into canary

siavash79 · Feb 27, 2024 · 4b6e82c · 4b6e82c
2 parents 84c9cf0 + 212415f
commit 4b6e82c
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 31 deletions.
diff --git a/app/src/main/res/layout/custom_preference.xml b/app/src/main/res/layout/custom_preference.xml
@@ -8,7 +8,7 @@
 	android:foreground="?android:selectableItemBackgroundBorderless"
 	android:minHeight="?android:attr/listPreferredItemHeight"
 	android:paddingHorizontal="32dp"
-	android:paddingVertical="22dp">
+	android:paddingVertical="12dp">
 
 	<ImageView
 		android:id="@android:id/icon"
@@ -42,7 +42,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_below="@android:id/title"
-			android:alpha="0.8"
+			android:alpha="0.7"
 			android:textColor="?attr/colorOnSurface" />
 
 	</RelativeLayout>

diff --git a/app/src/main/res/layout/custom_preference_category.xml b/app/src/main/res/layout/custom_preference_category.xml
@@ -8,8 +8,7 @@
 	android:foreground="?android:selectableItemBackgroundBorderless"
 	android:minHeight="?android:attr/listPreferredItemHeight"
 	android:paddingHorizontal="32dp"
-	android:paddingTop="22dp"
-	android:paddingBottom="12dp">
+	android:paddingTop="16dp">
 
 	<ImageView
 		android:id="@android:id/icon"
@@ -43,7 +42,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_below="@android:id/title"
-			android:alpha="0.8"
+			android:alpha="0.7"
 			android:textColor="?attr/colorOnSurface" />
 
 	</RelativeLayout>

diff --git a/app/src/main/res/layout/custom_preference_color.xml b/app/src/main/res/layout/custom_preference_color.xml
@@ -8,7 +8,7 @@
 	android:foreground="?android:selectableItemBackgroundBorderless"
 	android:minHeight="?android:attr/listPreferredItemHeight"
 	android:paddingHorizontal="32dp"
-	android:paddingVertical="22dp">
+	android:paddingVertical="12dp">
 
 	<ImageView
 		android:id="@android:id/icon"
@@ -42,7 +42,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_below="@android:id/title"
-			android:alpha="0.8"
+			android:alpha="0.7"
 			android:textColor="?attr/colorOnSurface" />
 
 	</RelativeLayout>

diff --git a/app/src/main/res/layout/custom_preference_edit_text.xml b/app/src/main/res/layout/custom_preference_edit_text.xml
@@ -8,7 +8,7 @@
 	android:foreground="?android:selectableItemBackgroundBorderless"
 	android:minHeight="?android:attr/listPreferredItemHeight"
 	android:paddingHorizontal="32dp"
-	android:paddingVertical="22dp">
+	android:paddingVertical="12dp">
 
 	<ImageView
 		android:id="@android:id/icon"
@@ -42,7 +42,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_below="@android:id/title"
-			android:alpha="0.8"
+			android:alpha="0.7"
 			android:textColor="?attr/colorOnSurface" />
 
 	</RelativeLayout>

diff --git a/app/src/main/res/layout/custom_preference_list.xml b/app/src/main/res/layout/custom_preference_list.xml
@@ -8,7 +8,7 @@
 	android:foreground="?android:selectableItemBackgroundBorderless"
 	android:minHeight="?android:attr/listPreferredItemHeight"
 	android:paddingHorizontal="32dp"
-	android:paddingVertical="22dp">
+	android:paddingVertical="12dp">
 
 	<ImageView
 		android:id="@android:id/icon"
@@ -42,7 +42,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_below="@android:id/title"
-			android:alpha="0.8"
+			android:alpha="0.7"
 			android:textColor="?attr/colorOnSurface" />
 
 	</RelativeLayout>

diff --git a/app/src/main/res/layout/custom_preference_main.xml b/app/src/main/res/layout/custom_preference_main.xml
@@ -56,7 +56,7 @@
 			android:layout_below="@android:id/title"
 			android:layout_alignStart="@android:id/title"
 			android:layout_marginTop="2dp"
-			android:alpha="0.8"
+			android:alpha="0.7"
 			android:fontFamily="sans-serif"
 			android:lineSpacingExtra="3sp"
 			android:maxLines="4"

diff --git a/app/src/main/res/layout/custom_preference_range_slider.xml b/app/src/main/res/layout/custom_preference_range_slider.xml
@@ -8,7 +8,7 @@
 	android:foreground="?android:selectableItemBackgroundBorderless"
 	android:minHeight="?android:attr/listPreferredItemHeight"
 	android:paddingHorizontal="32dp"
-	android:paddingVertical="22dp">
+	android:paddingVertical="12dp">
 
 	<ImageView
 		android:id="@android:id/icon"
@@ -42,7 +42,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_below="@android:id/title"
-			android:alpha="0.8"
+			android:alpha="0.7"
 			android:textColor="?attr/colorOnSurface" />
 
 		<com.google.android.material.textview.MaterialTextView

diff --git a/app/src/main/res/layout/custom_preference_switch.xml b/app/src/main/res/layout/custom_preference_switch.xml
@@ -8,7 +8,7 @@
 	android:foreground="?android:selectableItemBackgroundBorderless"
 	android:minHeight="?android:attr/listPreferredItemHeight"
 	android:paddingHorizontal="32dp"
-	android:paddingVertical="22dp">
+	android:paddingVertical="12dp">
 
 	<ImageView
 		android:id="@android:id/icon"
@@ -42,7 +42,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_below="@android:id/title"
-			android:alpha="0.8"
+			android:alpha="0.7"
 			android:textColor="?attr/colorOnSurface" />
 
 	</RelativeLayout>
@@ -53,7 +53,7 @@
 		android:layout_height="wrap_content"
 		android:layout_alignParentEnd="true"
 		android:layout_centerVertical="true"
-		android:layout_marginStart="10dp"
+		android:layout_marginStart="18dp"
 		android:orientation="vertical" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/custom_preference_time_picker.xml b/app/src/main/res/layout/custom_preference_time_picker.xml
@@ -8,7 +8,7 @@
 	android:foreground="?android:selectableItemBackgroundBorderless"
 	android:minHeight="?android:attr/listPreferredItemHeight"
 	android:paddingHorizontal="32dp"
-	android:paddingVertical="22dp">
+	android:paddingVertical="12dp">
 
 	<ImageView
 		android:id="@android:id/icon"

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -5,8 +5,8 @@
 		<item name="android:windowDrawsSystemBarBackgrounds">true</item>
 
 		<!-- App theme -->
-		<item name="alertDialogTheme">@style/AppTheme.Dialog</item>
-		<item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item>
+		<item name="alertDialogTheme">@style/MaterialComponents.MaterialAlertDialog</item>
+		<item name="materialAlertDialogTheme">@style/MaterialComponents.MaterialAlertDialog</item>
 		<item name="textAppearanceListItem">@style/TextAppearance.App.ListItem.Title</item>
 		<item name="android:windowLightStatusBar">?attr/isLightTheme</item>
 		<item name="android:statusBarColor">@android:color/transparent</item>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -5,11 +5,6 @@
 		<item name="android:textSize">19sp</item> <!-- A12 B2: 20sp -->
 	</style>
 
-	<style name="AppTheme.Dialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
-		<item name="android:dialogCornerRadius">32dp</item>
-		<item name="android:backgroundDimAmount">0.60</item>
-	</style>
-
 	<style name="Material3.SeekBar" parent="Widget.AppCompat.SeekBar">
 		<item name="android:progressBackgroundTint">@color/color_accent_0_80_overlay</item>
 		<item name="android:progressTint">?attr/colorPrimary</item>
@@ -33,7 +28,7 @@
 	</style>
 
 	<style name="MaterialComponents.MaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
-		<item name="android:background">@drawable/container</item>
+		<item name="android:background">?attr/colorSurfaceContainer</item>
 		<item name="android:dialogCornerRadius">@dimen/ui_container_radius</item>
 		<item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialog.Title.Text
 		</item>
@@ -47,19 +42,20 @@
 	</style>
 
 	<style name="MaterialAlertDialog.Title.Text" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
-		<item name="android:background">@drawable/container</item>
+		<item name="android:background">?attr/colorSurfaceContainer</item>
 		<item name="android:textSize">20sp</item>
 		<item name="android:fontFamily">sans-serif-medium</item>
 	</style>
 
 	<style name="MaterialAlertDialog.Body.Text" parent="MaterialAlertDialog.MaterialComponents.Body.Text">
-		<item name="android:background">@drawable/container</item>
+		<item name="android:background">?attr/colorSurfaceContainer</item>
 		<item name="android:textSize">14sp</item>
 		<item name="android:fontFamily">sans-serif</item>
 	</style>
 
 	<style name="MaterialAlertDialog.Button.Text" parent="Widget.Material3.Button.TextButton.Dialog">
-		<item name="android:background">@drawable/container</item>
+		<item name="android:backgroundTint">?attr/colorSurfaceContainer</item>
+		<item name="android:foreground">?attr/selectableItemBackground</item>
 		<item name="android:textSize">16sp</item>
 		<item name="android:fontFamily">sans-serif-medium</item>
 	</style>

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -5,8 +5,8 @@
 		<item name="android:windowDrawsSystemBarBackgrounds">true</item>
 
 		<!-- App theme -->
-		<item name="alertDialogTheme">@style/AppTheme.Dialog</item>
-		<item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item>
+		<item name="alertDialogTheme">@style/MaterialComponents.MaterialAlertDialog</item>
+		<item name="materialAlertDialogTheme">@style/MaterialComponents.MaterialAlertDialog</item>
 		<item name="textAppearanceListItem">@style/TextAppearance.App.ListItem.Title</item>
 		<item name="android:windowLightStatusBar">?attr/isLightTheme</item>
 		<item name="android:statusBarColor">@android:color/transparent</item>