Migrate style to Material3

lucasrafagnin · Sep 8, 2022 · f54ede0 · f54ede0
1 parent 82848d3
commit f54ede0
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 37 deletions.
diff --git a/app/src/main/java/com/rafagnin/tvshowcase/App.kt b/app/src/main/java/com/rafagnin/tvshowcase/App.kt
@@ -12,7 +12,7 @@ class App : Application() {
 
         // To apply the dark theme when the system hasn't theme option
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
         }
     }
 }
diff --git a/app/src/main/res/color-night/bottom_icon_color.xml b/app/src/main/res/color-night/bottom_icon_color.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/red" android:state_checked="true"/>
+    <item android:color="@color/gray"/>
+</selector>
diff --git a/app/src/main/res/color/bottom_icon_color.xml b/app/src/main/res/color/bottom_icon_color.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/red" android:state_checked="true"/>
+    <item android:color="@color/blue"/>
+</selector>
diff --git a/app/src/main/res/layout/activity_character_detail.xml b/app/src/main/res/layout/activity_character_detail.xml
@@ -14,7 +14,8 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
-            style="@style/ToolbarStyle" />
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

diff --git a/app/src/main/res/layout/activity_episode_detail.xml b/app/src/main/res/layout/activity_episode_detail.xml
@@ -7,7 +7,8 @@
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
-        style="@style/ToolbarStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -13,8 +13,9 @@
         app:layout_constraintTop_toTopOf="parent" >
 
         <androidx.appcompat.widget.Toolbar
-            style="@style/ToolbarStyle"
-            android:id="@+id/toolbar" />
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -31,7 +32,6 @@
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottom_navigation"
-        android:theme="@style/BottomNavigationStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
@@ -10,8 +10,9 @@
         android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.Toolbar
-            style="@style/ToolbarStyle"
-            android:id="@+id/toolbar" />
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

diff --git a/app/src/main/res/layout/activity_show_detail.xml b/app/src/main/res/layout/activity_show_detail.xml
@@ -14,7 +14,8 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
-            style="@style/ToolbarStyle" />
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="ItemSchedule">
+        <item name="android:background">@color/blue_medium</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="Theme.TvShowcase" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Theme.TvShowcase" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/red</item>
         <item name="colorPrimaryVariant">@color/blue</item>
         <item name="colorOnPrimary">@color/white</item>
@@ -11,24 +11,30 @@
         <item name="android:textColor">@color/gray</item>
         <item name="android:statusBarColor">@color/status_bar</item>
         <item name="android:windowBackground">@color/blue_dark</item>
-    </style>
 
-    <style name="ItemSchedule">
-        <item name="android:background">@color/blue_medium</item>
+        <item name="toolbarStyle">@style/Theme.Toolbar</item>
+        <item name="bottomNavigationStyle">@style/Theme.BottomNavigation</item>
     </style>
 
-    <style name="BottomNavigationStyle">
+    <style name="Theme.Toolbar" parent="Widget.Material3.Toolbar">
         <item name="android:background">@color/blue</item>
+        <item name="titleTextAppearance">@style/Theme.ToolbarTitle</item>
     </style>
 
-    <style name="ToolbarStyle">
-        <item name="android:background">@color/blue</item>
-        <item name="titleTextAppearance">@style/ToolbarTitle</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
+    <style name="Theme.ToolbarTitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:textColor">@color/white</item>
     </style>
 
-    <style name="ToolbarTitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
-        <item name="android:textColor">@color/white</item>
+    <style name="Theme.BottomNavigation" parent="Widget.Material3.BottomNavigationView">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.BottomNavigation</item>
+        <item name="backgroundTint">@color/blue</item>
+        <item name="itemRippleColor">@color/blue_medium</item>
+        <item name="itemIconTint">@color/bottom_icon_color</item>
+    </style>
+
+    <style name="ThemeOverlay.BottomNavigation" parent="">
+        <item name="colorOnSurface">@color/gray</item>
+        <item name="colorOnSurfaceVariant">@color/gray</item>
+        <item name="colorSecondaryContainer">@color/gray</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -4,21 +4,6 @@
         <item name="android:background">@color/white</item>
     </style>
 
-    <style name="BottomNavigationStyle">
-        <item name="android:background">@color/white</item>
-    </style>
-
-    <style name="ToolbarStyle">
-        <item name="android:background">@color/white</item>
-        <item name="titleTextAppearance">@style/ToolbarTitle</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-    </style>
-
-    <style name="ToolbarTitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
-        <item name="android:textColor">@color/blue_dark</item>
-    </style>
-
     <style name="ProgressBar" parent="Widget.AppCompat.ProgressBar">
         <item name="android:layout_width">40dp</item>
         <item name="android:layout_height">40dp</item>

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="Theme.TvShowcase" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Theme.TvShowcase" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/red</item>
         <item name="colorPrimaryVariant">@color/blue</item>
         <item name="colorOnPrimary">@color/black</item>
@@ -11,5 +11,30 @@
         <item name="android:textColor">@color/black_light</item>
         <item name="android:statusBarColor">@color/status_bar</item>
         <item name="android:windowBackground">@color/gray_light</item>
+
+        <item name="toolbarStyle">@style/Theme.Toolbar</item>
+        <item name="bottomNavigationStyle">@style/Theme.BottomNavigation</item>
+    </style>
+
+    <style name="Theme.Toolbar" parent="Widget.Material3.Toolbar">
+        <item name="android:background">@color/white</item>
+        <item name="titleTextAppearance">@style/Theme.ToolbarTitle</item>
+    </style>
+
+    <style name="Theme.ToolbarTitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:textColor">@color/blue_dark</item>
+    </style>
+
+    <style name="Theme.BottomNavigation" parent="Widget.Material3.BottomNavigationView">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.BottomNavigation</item>
+        <item name="backgroundTint">@color/white</item>
+        <item name="itemRippleColor">@color/gray_light</item>
+        <item name="itemIconTint">@color/bottom_icon_color</item>
+    </style>
+
+    <style name="ThemeOverlay.BottomNavigation" parent="">
+        <item name="colorOnSurface">@color/red</item>
+        <item name="colorOnSurfaceVariant">@color/blue_medium</item>
+        <item name="colorSecondaryContainer">@color/gray_light</item>
     </style>
 </resources>