From 043245cdc49fb71423948b1c41aaa0fc38eb9abf Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 24 Mar 2023 11:04:20 +0800
Subject: [PATCH] [mobile] update to Material3 - part 1

---
 app/build.gradle                                  |  4 ++--
 app/src/main/res/color/nav.xml                    |  5 +++++
 app/src/main/res/values/styles.xml                |  8 +++-----
 app/src/mobile/res/drawable/shape_item_round.xml  | 15 +++++++++++++++
 .../res/drawable/shape_item_round_activated.xml   |  6 +++---
 .../res/drawable/shape_item_round_normal.xml      |  6 +++---
 app/src/mobile/res/drawable/shape_text_round.xml  | 15 +++++++++++++++
 app/src/mobile/res/drawable/shape_widget.xml      |  4 ++--
 app/src/mobile/res/layout/activity_main.xml       |  7 +++++--
 app/src/mobile/res/layout/adapter_config.xml      |  4 ++--
 app/src/mobile/res/layout/adapter_site.xml        |  6 +++---
 app/src/mobile/res/values/styles.xml              |  7 ++++---
 12 files changed, 62 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/res/color/nav.xml
 create mode 100644 app/src/mobile/res/drawable/shape_item_round.xml
 create mode 100644 app/src/mobile/res/drawable/shape_text_round.xml

diff --git a/app/build.gradle b/app/build.gradle
index 844ab8b24..b6ffb367c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -73,7 +73,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
     implementation 'androidx.preference:preference:1.2.0'
-    implementation 'androidx.room:room-runtime:2.5.0'
+    implementation 'androidx.room:room-runtime:2.5.1'
     implementation 'cat.ereza:customactivityoncrash:2.4.0'
     implementation 'com.github.bassaer:materialdesigncolors:1.0.0'
     implementation 'com.github.bumptech.glide:glide:4.14.2'
@@ -92,6 +92,6 @@ dependencies {
     leanbackImplementation 'androidx.leanback:leanback:1.2.0-alpha02'
     leanbackImplementation 'me.jessyan:autosize:1.2.1'
     mobileImplementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    annotationProcessor 'androidx.room:room-compiler:2.5.0'
+    annotationProcessor 'androidx.room:room-compiler:2.5.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.14.2'
 }
\ No newline at end of file
diff --git a/app/src/main/res/color/nav.xml b/app/src/main/res/color/nav.xml
new file mode 100644
index 000000000..e8c22ee27
--- /dev/null
+++ b/app/src/main/res/color/nav.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/accent" android:state_checked="true" />
+    <item android:color="@color/white" android:state_checked="false" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 62c1db706..bc6967652 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -30,16 +30,14 @@
         <item name="keep_content_on_player_reset">true</item>
     </style>
 
-    <style name="BottomSheetModal" parent="Widget.Design.BottomSheet.Modal">
+    <style name="ModalBottomSheetDialog" parent="Widget.Design.BottomSheet.Modal">
         <item name="android:background">@drawable/shape_bottom_sheet</item>
     </style>
 
-    <style name="BottomSheetDialog.Base" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
-        <item name="bottomSheetStyle">@style/BottomSheetModal</item>
+    <style name="ThemeOverlay.App.BottomSheetDialog" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/ModalBottomSheetDialog</item>
         <item name="android:backgroundDimEnabled">false</item>
         <item name="android:windowIsFloating">false</item>
     </style>
 
-    <style name="BottomSheetDialog" parent="BottomSheetDialog.Base" />
-
 </resources>
diff --git a/app/src/mobile/res/drawable/shape_item_round.xml b/app/src/mobile/res/drawable/shape_item_round.xml
new file mode 100644
index 000000000..d0cedcdfa
--- /dev/null
+++ b/app/src/mobile/res/drawable/shape_item_round.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/ripple_material_light">
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/black_20" />
+            <corners android:radius="28dp" />
+            <padding
+                android:bottom="8dp"
+                android:left="16dp"
+                android:right="16dp"
+                android:top="8dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/mobile/res/drawable/shape_item_round_activated.xml b/app/src/mobile/res/drawable/shape_item_round_activated.xml
index 65f476d67..066c973b8 100644
--- a/app/src/mobile/res/drawable/shape_item_round_activated.xml
+++ b/app/src/mobile/res/drawable/shape_item_round_activated.xml
@@ -4,12 +4,12 @@
 
     <solid android:color="@color/black_40" />
 
-    <corners android:radius="20dp" />
+    <corners android:radius="28dp" />
 
     <padding
         android:bottom="6dp"
-        android:left="12dp"
-        android:right="12dp"
+        android:left="16dp"
+        android:right="16dp"
         android:top="6dp" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/mobile/res/drawable/shape_item_round_normal.xml b/app/src/mobile/res/drawable/shape_item_round_normal.xml
index 468adb022..6c1f5874c 100644
--- a/app/src/mobile/res/drawable/shape_item_round_normal.xml
+++ b/app/src/mobile/res/drawable/shape_item_round_normal.xml
@@ -4,12 +4,12 @@
 
     <solid android:color="@color/black_20" />
 
-    <corners android:radius="20dp" />
+    <corners android:radius="28dp" />
 
     <padding
         android:bottom="6dp"
-        android:left="12dp"
-        android:right="12dp"
+        android:left="16dp"
+        android:right="16dp"
         android:top="6dp" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/mobile/res/drawable/shape_text_round.xml b/app/src/mobile/res/drawable/shape_text_round.xml
new file mode 100644
index 000000000..fdc253393
--- /dev/null
+++ b/app/src/mobile/res/drawable/shape_text_round.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/ripple_material_light">
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/black_50" />
+            <corners android:radius="28dp" />
+            <padding
+                android:bottom="8dp"
+                android:left="16dp"
+                android:right="16dp"
+                android:top="8dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/mobile/res/drawable/shape_widget.xml b/app/src/mobile/res/drawable/shape_widget.xml
index 508af671f..1d1cdec8c 100644
--- a/app/src/mobile/res/drawable/shape_widget.xml
+++ b/app/src/mobile/res/drawable/shape_widget.xml
@@ -4,11 +4,11 @@
 
     <solid android:color="@color/black_50" />
 
-    <corners android:radius="40dp" />
+    <corners android:radius="28dp" />
 
     <padding
         android:bottom="6dp"
-        android:left="12dp"
+        android:left="16dp"
         android:right="16dp"
         android:top="6dp" />
 
diff --git a/app/src/mobile/res/layout/activity_main.xml b/app/src/mobile/res/layout/activity_main.xml
index 769dd911f..71d5af32a 100644
--- a/app/src/mobile/res/layout/activity_main.xml
+++ b/app/src/mobile/res/layout/activity_main.xml
@@ -14,10 +14,13 @@
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/navigation"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="56dp"
         android:layout_alignParentBottom="true"
-        android:background="@color/white_80"
+        android:background="@color/transparent"
         app:elevation="0dp"
+        app:itemIconTint="@color/nav"
+        app:itemTextColor="@color/white"
+        app:labelVisibilityMode="unlabeled"
         app:menu="@menu/menu_nav" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/adapter_config.xml b/app/src/mobile/res/layout/adapter_config.xml
index 08f0e7ecf..7d5e7e230 100644
--- a/app/src/mobile/res/layout/adapter_config.xml
+++ b/app/src/mobile/res/layout/adapter_config.xml
@@ -10,7 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:background="@drawable/shape_text"
+        android:background="@drawable/shape_text_round"
         android:ellipsize="middle"
         android:gravity="center"
         android:singleLine="true"
@@ -23,7 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_marginStart="12dp"
-        android:background="@drawable/shape_text"
+        android:background="@drawable/shape_text_round"
         android:padding="8dp"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_setting_delete" />
diff --git a/app/src/mobile/res/layout/adapter_site.xml b/app/src/mobile/res/layout/adapter_site.xml
index a03cc6f8a..a666a35ba 100644
--- a/app/src/mobile/res/layout/adapter_site.xml
+++ b/app/src/mobile/res/layout/adapter_site.xml
@@ -11,7 +11,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:background="@drawable/shape_text"
+        android:background="@drawable/shape_text_round"
         android:gravity="center"
         android:singleLine="true"
         android:textColor="@color/text"
@@ -23,7 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_marginStart="12dp"
-        android:background="@drawable/shape_text"
+        android:background="@drawable/shape_text_round"
         android:padding="8dp"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_site_search_on"
@@ -34,7 +34,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_marginStart="12dp"
-        android:background="@drawable/shape_text"
+        android:background="@drawable/shape_text_round"
         android:padding="8dp"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_site_change_on"
diff --git a/app/src/mobile/res/values/styles.xml b/app/src/mobile/res/values/styles.xml
index 431481952..b143bc1e1 100644
--- a/app/src/mobile/res/values/styles.xml
+++ b/app/src/mobile/res/values/styles.xml
@@ -9,13 +9,14 @@
         <item name="android:windowTranslucentStatus">false</item>
     </style>
 
-    <style name="BaseTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="BaseTheme" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primaryDark</item>
         <item name="colorAccent">@color/accent</item>
-        <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowBackground">@null</item>
-        <item name="bottomSheetDialogTheme">@style/BottomSheetDialog</item>
+        <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:navigationBarColor">@color/transparent</item>
+        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>
     </style>
 
     <style name="Control" />