From 4f61d0bac4557ece2083a6c15dd2cb6943431cd4 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Sun, 13 Feb 2022 14:46:31 +0100
Subject: [PATCH 01/10] Initial changes to Material 3

---
 app/src/main/res/values/shape.xml  | 6 +++---
 app/src/main/res/values/styles.xml | 4 ++--
 app/src/main/res/values/themes.xml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values/shape.xml b/app/src/main/res/values/shape.xml
index f9a2ce4f..6acd1be0 100644
--- a/app/src/main/res/values/shape.xml
+++ b/app/src/main/res/values/shape.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="ShapeAppearance.Findroid.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+    <style name="ShapeAppearance.Findroid.SmallComponent" parent="ShapeAppearance.Material3.SmallComponent">
         <item name="cornerSize">10dp</item>
     </style>
 
-    <style name="ShapeAppearance.Findroid.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
+    <style name="ShapeAppearance.Findroid.MediumComponent" parent="ShapeAppearance.Material3.MediumComponent">
         <item name="cornerSize">10dp</item>
     </style>
 
-    <style name="ShapeAppearance.Findroid.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
+    <style name="ShapeAppearance.Findroid.LargeComponent" parent="ShapeAppearance.Material3.LargeComponent">
         <item name="cornerSize">10dp</item>
     </style>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b31d15c2..ef3afc31 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="ErrorDialogStyle" parent="MaterialAlertDialog.MaterialComponents">
+    <style name="ErrorDialogStyle" parent="MaterialAlertDialog.Material3">
         <item name="materialAlertDialogBodyTextStyle">@style/AlertDialogBodyText</item>
     </style>
 
-    <style name="AlertDialogBodyText" parent="MaterialAlertDialog.MaterialComponents.Body.Text">
+    <style name="AlertDialogBodyText" parent="MaterialAlertDialog.Material3.Body.Text">
         <item name="android:fontFamily">monospace</item>
     </style>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 597bb742..13956450 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,7 +2,7 @@
     <!-- Base application theme. -->
     <style name="Theme.Findroid" parent="Base.Theme.Findroid" />
 
-    <style name="Base.Theme.Findroid" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Base.Theme.Findroid" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Main colors -->
         <item name="colorPrimary">@color/blue_600</item>
         <item name="colorPrimaryVariant">@color/blue_800</item>

From 92af281b7baddb0b180dbbe9674ed367ce8d0c9e Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Sat, 12 Mar 2022 16:27:39 +0100
Subject: [PATCH 02/10] Update typography to Material 3

---
 app/src/main/res/layout/base_item.xml         |  2 +-
 app/src/main/res/layout/collection_item.xml   |  2 +-
 app/src/main/res/layout/download_section.xml  |  2 +-
 .../main/res/layout/episode_bottom_sheet.xml  | 14 +++----
 app/src/main/res/layout/episode_item.xml      |  4 +-
 app/src/main/res/layout/error_panel.xml       |  7 ++--
 .../res/layout/exo_player_control_view.xml    |  2 +-
 app/src/main/res/layout/favorite_section.xml  |  2 +-
 .../main/res/layout/fragment_add_server.xml   |  4 +-
 app/src/main/res/layout/fragment_login.xml    |  6 +--
 .../main/res/layout/fragment_media_info.xml   | 38 +++++++++----------
 .../res/layout/fragment_person_detail.xml     | 10 ++---
 .../res/layout/fragment_server_select.xml     |  2 +-
 app/src/main/res/layout/home_episode_item.xml |  4 +-
 app/src/main/res/layout/next_up_section.xml   |  2 +-
 app/src/main/res/layout/person_item.xml       |  6 +--
 app/src/main/res/layout/season_header.xml     |  4 +-
 app/src/main/res/layout/server_item.xml       |  2 +-
 app/src/main/res/layout/view_item.xml         |  4 +-
 19 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/app/src/main/res/layout/base_item.xml b/app/src/main/res/layout/base_item.xml
index d52f408a..b4b0a10d 100644
--- a/app/src/main/res/layout/base_item.xml
+++ b/app/src/main/res/layout/base_item.xml
@@ -42,7 +42,7 @@
             android:layout_marginTop="4dp"
             android:ellipsize="end"
             android:maxLines="2"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/item_image"
             tools:text="Movie title" />
diff --git a/app/src/main/res/layout/collection_item.xml b/app/src/main/res/layout/collection_item.xml
index 20c0b5d3..fffcb01b 100644
--- a/app/src/main/res/layout/collection_item.xml
+++ b/app/src/main/res/layout/collection_item.xml
@@ -38,7 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:text="@{collection.name}"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/collection_image"
diff --git a/app/src/main/res/layout/download_section.xml b/app/src/main/res/layout/download_section.xml
index 55fcdc86..58aecd9d 100644
--- a/app/src/main/res/layout/download_section.xml
+++ b/app/src/main/res/layout/download_section.xml
@@ -23,7 +23,7 @@
             android:layout_marginStart="24dp"
             android:layout_marginBottom="12dp"
             android:text="@{section.name}"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
             android:textSize="18sp"
             tools:text="Movies" />
 
diff --git a/app/src/main/res/layout/episode_bottom_sheet.xml b/app/src/main/res/layout/episode_bottom_sheet.xml
index d1980b91..90fe870f 100644
--- a/app/src/main/res/layout/episode_bottom_sheet.xml
+++ b/app/src/main/res/layout/episode_bottom_sheet.xml
@@ -77,7 +77,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:layout_marginEnd="24dp"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/episode_image"
         app:layout_constraintTop_toTopOf="@id/episode_image"
@@ -99,7 +99,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
             tools:text="4/6/2013" />
 
         <TextView
@@ -107,7 +107,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
             tools:text="26 min" />
 
         <TextView
@@ -116,7 +116,7 @@
             android:layout_height="wrap_content"
             android:drawablePadding="4dp"
             android:gravity="bottom"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
             app:drawableStartCompat="@drawable/ic_star"
             app:drawableTint="@color/yellow"
             tools:text="8.8" />
@@ -242,7 +242,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
             android:text="@string/error_preparing_player_items"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
             android:textColor="?attr/colorError" />
 
         <TextView
@@ -250,7 +250,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/view_details_underlined"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
             android:textColor="?attr/colorError" />
     </LinearLayout>
 
@@ -260,7 +260,7 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="24dp"
         android:layout_marginTop="12dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/player_items_error"
diff --git a/app/src/main/res/layout/episode_item.xml b/app/src/main/res/layout/episode_item.xml
index 994fd225..28e91259 100644
--- a/app/src/main/res/layout/episode_item.xml
+++ b/app/src/main/res/layout/episode_item.xml
@@ -88,7 +88,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
             android:text="@{String.format(@string/episode_name, episode.indexNumber, episode.name)}"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
             app:layout_constraintBottom_toTopOf="@id/episode_desc"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/episode_image"
@@ -101,7 +101,7 @@
             android:layout_height="0dp"
             android:scrollbars="none"
             android:text="@{episode.overview}"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/episode_title"
diff --git a/app/src/main/res/layout/error_panel.xml b/app/src/main/res/layout/error_panel.xml
index 33ea0c78..59ef673a 100644
--- a/app/src/main/res/layout/error_panel.xml
+++ b/app/src/main/res/layout/error_panel.xml
@@ -26,16 +26,17 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:text="@string/error_loading_data"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium" />
 
     <LinearLayout
         android:layout_width="wrap_content"
+        style="?android:attr/buttonBarStyle"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
         <Button
             android:id="@+id/error_details_button"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="?android:attr/buttonBarButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
@@ -43,7 +44,7 @@
 
         <Button
             android:id="@+id/error_retry_button"
-            style="@style/Widget.MaterialComponents.Button"
+            style="?android:attr/buttonBarButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/retry" />
diff --git a/app/src/main/res/layout/exo_player_control_view.xml b/app/src/main/res/layout/exo_player_control_view.xml
index 63300572..4667c681 100644
--- a/app/src/main/res/layout/exo_player_control_view.xml
+++ b/app/src/main/res/layout/exo_player_control_view.xml
@@ -42,7 +42,7 @@
                 android:layout_marginEnd="16dp"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
                 android:textColor="@color/white"
                 tools:text="The Dawn of Despair" />
 
diff --git a/app/src/main/res/layout/favorite_section.xml b/app/src/main/res/layout/favorite_section.xml
index c8a67162..7b4e9a87 100644
--- a/app/src/main/res/layout/favorite_section.xml
+++ b/app/src/main/res/layout/favorite_section.xml
@@ -23,7 +23,7 @@
             android:layout_marginStart="24dp"
             android:layout_marginBottom="12dp"
             android:text="@{section.name}"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
             android:textSize="18sp"
             tools:text="Movies" />
 
diff --git a/app/src/main/res/layout/fragment_add_server.xml b/app/src/main/res/layout/fragment_add_server.xml
index 4e8c293d..e7142360 100644
--- a/app/src/main/res/layout/fragment_add_server.xml
+++ b/app/src/main/res/layout/fragment_add_server.xml
@@ -41,12 +41,12 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="32dp"
                 android:text="@string/add_server"
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
+                android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
                 android:textColor="?android:textColorPrimary" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/edit_text_server_address_layout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="8dp"
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index f8ad3d6e..2e5c20ea 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -41,12 +41,12 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="32dp"
                 android:text="@string/login"
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
+                android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
                 android:textColor="?android:textColorPrimary" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/edit_text_username_layout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="12dp"
@@ -64,7 +64,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/edit_text_password_layout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="24dp"
diff --git a/app/src/main/res/layout/fragment_media_info.xml b/app/src/main/res/layout/fragment_media_info.xml
index 6ba27c81..16c93204 100644
--- a/app/src/main/res/layout/fragment_media_info.xml
+++ b/app/src/main/res/layout/fragment_media_info.xml
@@ -54,7 +54,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="24dp"
-                    android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
+                    android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
                     app:layout_constraintBottom_toTopOf="@id/original_title"
                     app:layout_constraintStart_toStartOf="parent"
                     tools:text="Alita: Battle Angel" />
@@ -64,7 +64,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="24dp"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -81,7 +81,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                     tools:text="2019" />
 
                 <TextView
@@ -89,7 +89,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                     tools:text="122 min" />
 
                 <TextView
@@ -97,7 +97,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                     tools:text="PG-13" />
 
                 <TextView
@@ -106,7 +106,7 @@
                     android:layout_height="wrap_content"
                     android:drawablePadding="4dp"
                     android:gravity="bottom"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                     app:drawableStartCompat="@drawable/ic_star"
                     app:drawableTint="@color/yellow"
                     tools:text="7.3" />
@@ -217,7 +217,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
                     android:text="@string/error_preparing_player_items"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                     android:textColor="?attr/colorError" />
 
                 <TextView
@@ -225,7 +225,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/view_details_underlined"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                     android:textColor="?attr/colorError" />
             </LinearLayout>
 
@@ -249,7 +249,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/genres"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
@@ -258,7 +258,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="64dp"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -276,7 +276,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/director"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
@@ -285,7 +285,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="64dp"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -303,7 +303,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/writers"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
@@ -312,7 +312,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="64dp"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -327,7 +327,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginBottom="24dp"
-                android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                 tools:text="An angel falls. A warrior rises. When Alita awakens with no memory of who she is in a future world she does not recognize, she is taken in by Ido, a compassionate doctor who realizes that somewhere in this abandoned cyborg shell is the heart and soul of a young woman with an extraordinary past." />
 
             <LinearLayout
@@ -343,7 +343,7 @@
                     android:layout_marginHorizontal="24dp"
                     android:layout_marginBottom="12dp"
                     android:text="@string/next_up"
-                    android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                     android:textSize="18sp" />
 
                 <androidx.constraintlayout.widget.ConstraintLayout
@@ -372,7 +372,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4dp"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/next_up_image"
@@ -394,7 +394,7 @@
                     android:layout_marginHorizontal="24dp"
                     android:layout_marginBottom="12dp"
                     android:text="@string/seasons"
-                    android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                     android:textSize="18sp" />
 
                 <androidx.recyclerview.widget.RecyclerView
@@ -423,7 +423,7 @@
                     android:layout_marginHorizontal="24dp"
                     android:layout_marginBottom="12dp"
                     android:text="@string/cast_amp_crew"
-                    android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                     android:textSize="18sp" />
 
                 <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_person_detail.xml b/app/src/main/res/layout/fragment_person_detail.xml
index 87b689a9..a534ea88 100644
--- a/app/src/main/res/layout/fragment_person_detail.xml
+++ b/app/src/main/res/layout/fragment_person_detail.xml
@@ -45,7 +45,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="24dp"
-                    android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
+                    android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/person_image"
                     app:layout_constraintTop_toTopOf="parent"
@@ -58,7 +58,7 @@
                     android:layout_marginHorizontal="24dp"
                     android:layout_marginTop="8dp"
                     android:ellipsize="end"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                     app:layout_constraintBottom_toTopOf="@id/read_all"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/person_image"
@@ -75,7 +75,7 @@
 
                 <Button
                     android:id="@+id/read_all"
-                    style="@style/Widget.MaterialComponents.Button.TextButton"
+                    style="@style/Widget.Material3.Button.TextButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="24dp"
@@ -99,7 +99,7 @@
                     android:layout_marginHorizontal="24dp"
                     android:layout_marginBottom="12dp"
                     android:text="@string/movies_label"
-                    android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                     android:visibility="gone" />
 
                 <androidx.recyclerview.widget.RecyclerView
@@ -121,7 +121,7 @@
                     android:layout_marginHorizontal="24dp"
                     android:layout_marginBottom="12dp"
                     android:text="@string/shows_label"
-                    android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                     android:visibility="gone" />
 
                 <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_server_select.xml b/app/src/main/res/layout/fragment_server_select.xml
index b79d2c45..15d3f419 100644
--- a/app/src/main/res/layout/fragment_server_select.xml
+++ b/app/src/main/res/layout/fragment_server_select.xml
@@ -41,7 +41,7 @@
 
             <TextView
                 android:id="@+id/text_add_server"
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
+                android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="12dp"
diff --git a/app/src/main/res/layout/home_episode_item.xml b/app/src/main/res/layout/home_episode_item.xml
index aaf32dfe..90c936c7 100644
--- a/app/src/main/res/layout/home_episode_item.xml
+++ b/app/src/main/res/layout/home_episode_item.xml
@@ -37,7 +37,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/episode_image"
@@ -49,7 +49,7 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:text="@{String.format(@string/episode_name_extended, episode.parentIndexNumber, episode.indexNumber, episode.name)}"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/primary_name"
diff --git a/app/src/main/res/layout/next_up_section.xml b/app/src/main/res/layout/next_up_section.xml
index 8d253aea..3f7372e4 100644
--- a/app/src/main/res/layout/next_up_section.xml
+++ b/app/src/main/res/layout/next_up_section.xml
@@ -23,7 +23,7 @@
             android:layout_marginStart="24dp"
             android:layout_marginBottom="12dp"
             android:text="@{section.name}"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
             android:textSize="18sp"
             tools:text="Next Up" />
 
diff --git a/app/src/main/res/layout/person_item.xml b/app/src/main/res/layout/person_item.xml
index c145987e..fe1843fc 100644
--- a/app/src/main/res/layout/person_item.xml
+++ b/app/src/main/res/layout/person_item.xml
@@ -36,7 +36,7 @@
             android:ellipsize="end"
             android:maxLines="2"
             android:text="@{person.name}"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
             tools:text="Rosa Salazar" />
 
         <TextView
@@ -46,7 +46,7 @@
             android:ellipsize="end"
             android:maxLines="2"
             android:text="@{person.role}"
-            android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-            tools:text="as Alita" />
+            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+            tools:text="Alita" />
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/season_header.xml b/app/src/main/res/layout/season_header.xml
index e25f2180..1de01a70 100644
--- a/app/src/main/res/layout/season_header.xml
+++ b/app/src/main/res/layout/season_header.xml
@@ -65,7 +65,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="24dp"
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                 app:layout_constraintBottom_toTopOf="@id/season_name"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/season_poster"
@@ -76,7 +76,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="24dp"
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
+                android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/season_poster"
diff --git a/app/src/main/res/layout/server_item.xml b/app/src/main/res/layout/server_item.xml
index e40043e8..eac0d261 100644
--- a/app/src/main/res/layout/server_item.xml
+++ b/app/src/main/res/layout/server_item.xml
@@ -49,7 +49,7 @@
             android:layout_height="wrap_content"
             android:text="@{server.name}"
             android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/view_item.xml b/app/src/main/res/layout/view_item.xml
index 6d7800b1..faf422c8 100644
--- a/app/src/main/res/layout/view_item.xml
+++ b/app/src/main/res/layout/view_item.xml
@@ -20,7 +20,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
             android:textSize="18sp"
             app:layout_constraintBaseline_toBaselineOf="@id/view_all"
             app:layout_constraintStart_toStartOf="parent"
@@ -28,7 +28,7 @@
 
         <Button
             android:id="@+id/view_all"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.Material3.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="24dp"

From 64d053de4c41bd1cb0a2d8c8437fb6c2fa3312f5 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Sat, 9 Apr 2022 16:05:00 +0200
Subject: [PATCH 03/10] Switch from Toolbar to MaterialToolbar

---
 app/src/main/res/layout/activity_main_app.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_main_app.xml b/app/src/main/res/layout/activity_main_app.xml
index e88397ed..ab84762f 100644
--- a/app/src/main/res/layout/activity_main_app.xml
+++ b/app/src/main/res/layout/activity_main_app.xml
@@ -38,7 +38,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.Toolbar
+            <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/main_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize" />

From 6bbb78643082465a94510ef221ee60f5e98b7387 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Sat, 9 Apr 2022 16:07:34 +0200
Subject: [PATCH 04/10] Fix some hardcoded colors, make them use color
 attributes

---
 app/src/main/res/layout/base_item.xml            | 7 ++++---
 app/src/main/res/layout/episode_bottom_sheet.xml | 2 +-
 app/src/main/res/layout/episode_item.xml         | 3 ++-
 app/src/main/res/layout/fragment_media_info.xml  | 2 +-
 app/src/main/res/layout/server_item.xml          | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/base_item.xml b/app/src/main/res/layout/base_item.xml
index b4b0a10d..f6bbaf55 100644
--- a/app/src/main/res/layout/base_item.xml
+++ b/app/src/main/res/layout/base_item.xml
@@ -56,8 +56,8 @@
             android:background="@drawable/circle_background"
             android:gravity="center"
             android:text="@{item.userData.unplayedItemCount.toString()}"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
-            android:textColor="@color/white"
+            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+            android:textColor="?attr/colorOnPrimary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="9" />
@@ -74,6 +74,7 @@
             android:src="@drawable/ic_check"
             android:visibility="@{item.userData.played == true ? View.VISIBLE : View.GONE}"
             app:layout_constraintEnd_toEndOf="@id/item_image"
-            app:layout_constraintTop_toTopOf="@id/item_image" />
+            app:layout_constraintTop_toTopOf="@id/item_image"
+            app:tint="?attr/colorOnPrimary" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/episode_bottom_sheet.xml b/app/src/main/res/layout/episode_bottom_sheet.xml
index 90fe870f..fe91bc2b 100644
--- a/app/src/main/res/layout/episode_bottom_sheet.xml
+++ b/app/src/main/res/layout/episode_bottom_sheet.xml
@@ -149,7 +149,7 @@
                 android:paddingHorizontal="24dp"
                 android:paddingVertical="12dp"
                 android:src="@drawable/ic_play"
-                app:tint="@android:color/white" />
+                app:tint="?attr/colorOnPrimary" />
 
             <ProgressBar
                 android:id="@+id/progress_circular"
diff --git a/app/src/main/res/layout/episode_item.xml b/app/src/main/res/layout/episode_item.xml
index 28e91259..dbc2adb4 100644
--- a/app/src/main/res/layout/episode_item.xml
+++ b/app/src/main/res/layout/episode_item.xml
@@ -46,7 +46,8 @@
             android:src="@drawable/ic_check"
             android:visibility="@{episode.userData.played == true ? View.VISIBLE : View.GONE}"
             app:layout_constraintEnd_toEndOf="@id/episode_image"
-            app:layout_constraintTop_toTopOf="@id/episode_image" />
+            app:layout_constraintTop_toTopOf="@id/episode_image"
+            app:tint="?attr/colorOnPrimary" />
 
         <FrameLayout
             android:id="@+id/missing_icon"
diff --git a/app/src/main/res/layout/fragment_media_info.xml b/app/src/main/res/layout/fragment_media_info.xml
index 16c93204..dcd4d526 100644
--- a/app/src/main/res/layout/fragment_media_info.xml
+++ b/app/src/main/res/layout/fragment_media_info.xml
@@ -133,7 +133,7 @@
                         android:paddingHorizontal="24dp"
                         android:paddingVertical="12dp"
                         android:src="@drawable/ic_play"
-                        app:tint="@android:color/white" />
+                        app:tint="?attr/colorOnPrimary" />
 
                     <ProgressBar
                         android:id="@+id/progress_circular"
diff --git a/app/src/main/res/layout/server_item.xml b/app/src/main/res/layout/server_item.xml
index eac0d261..9ad427b6 100644
--- a/app/src/main/res/layout/server_item.xml
+++ b/app/src/main/res/layout/server_item.xml
@@ -39,7 +39,7 @@
                 android:layout_gravity="center"
                 android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_server"
-                app:tint="@color/white" />
+                app:tint="?attr/colorOnPrimary" />
 
         </FrameLayout>
 

From 0333cc7a56cd67e53b7e446c2c7bbdc922777ed8 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Sat, 9 Apr 2022 16:33:19 +0200
Subject: [PATCH 05/10] Use more colors from theme instead of hardcoded

---
 .../main/res/drawable/button_accent_background.xml |  2 +-
 app/src/main/res/layout/episode_bottom_sheet.xml   |  8 +++++---
 app/src/main/res/layout/fragment_media_info.xml    | 14 +++++++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/drawable/button_accent_background.xml b/app/src/main/res/drawable/button_accent_background.xml
index d64219d4..6b45cdc9 100644
--- a/app/src/main/res/drawable/button_accent_background.xml
+++ b/app/src/main/res/drawable/button_accent_background.xml
@@ -3,7 +3,7 @@
     android:color="?attr/colorControlHighlight">
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
-            <solid android:color="@color/neutral_700" />
+            <solid android:color="?attr/colorSecondaryContainer" />
             <corners
                 android:radius="10dp" />
         </shape>
diff --git a/app/src/main/res/layout/episode_bottom_sheet.xml b/app/src/main/res/layout/episode_bottom_sheet.xml
index fe91bc2b..6dc3b012 100644
--- a/app/src/main/res/layout/episode_bottom_sheet.xml
+++ b/app/src/main/res/layout/episode_bottom_sheet.xml
@@ -170,7 +170,8 @@
             android:background="@drawable/button_accent_background"
             android:contentDescription="@string/check_button_description"
             android:padding="12dp"
-            android:src="@drawable/ic_check" />
+            android:src="@drawable/ic_check"
+            app:tint="?attr/colorOnSecondaryContainer" />
 
         <ImageButton
             android:id="@+id/favorite_button"
@@ -180,7 +181,8 @@
             android:background="@drawable/button_accent_background"
             android:contentDescription="@string/favorite_button_description"
             android:padding="12dp"
-            android:src="@drawable/ic_heart" />
+            android:src="@drawable/ic_heart"
+            app:tint="?attr/colorOnSecondaryContainer" />
 
         <RelativeLayout
             android:id="@+id/download_button_wrapper"
@@ -197,7 +199,7 @@
                 android:contentDescription="@string/download_button_description"
                 android:padding="12dp"
                 android:src="@drawable/ic_download"
-                app:tint="@android:color/white" />
+                app:tint="?attr/colorOnSecondaryContainer" />
 
             <ProgressBar
                 android:id="@+id/progress_download"
diff --git a/app/src/main/res/layout/fragment_media_info.xml b/app/src/main/res/layout/fragment_media_info.xml
index dcd4d526..7ecff46e 100644
--- a/app/src/main/res/layout/fragment_media_info.xml
+++ b/app/src/main/res/layout/fragment_media_info.xml
@@ -154,7 +154,8 @@
                     android:background="@drawable/button_accent_background"
                     android:contentDescription="@string/trailer_button_description"
                     android:padding="12dp"
-                    android:src="@drawable/ic_film" />
+                    android:src="@drawable/ic_film"
+                    app:tint="?attr/colorOnSecondaryContainer" />
 
                 <ImageButton
                     android:id="@+id/check_button"
@@ -164,7 +165,8 @@
                     android:background="@drawable/button_accent_background"
                     android:contentDescription="@string/check_button_description"
                     android:padding="12dp"
-                    android:src="@drawable/ic_check" />
+                    android:src="@drawable/ic_check"
+                    app:tint="?attr/colorOnSecondaryContainer" />
 
                 <ImageButton
                     android:id="@+id/favorite_button"
@@ -174,7 +176,8 @@
                     android:background="@drawable/button_accent_background"
                     android:contentDescription="@string/download_button_description"
                     android:padding="12dp"
-                    android:src="@drawable/ic_heart" />
+                    android:src="@drawable/ic_heart"
+                    app:tint="?attr/colorOnSecondaryContainer" />
 
                 <ImageButton
                     android:id="@+id/download_button"
@@ -186,7 +189,7 @@
                     android:padding="12dp"
                     android:src="@drawable/ic_download"
                     android:visibility="gone"
-                    app:tint="@android:color/white" />
+                    app:tint="?attr/colorOnSecondaryContainer" />
 
                 <ImageButton
                     android:id="@+id/delete_button"
@@ -197,7 +200,8 @@
                     android:contentDescription="@string/delete_button_description"
                     android:padding="12dp"
                     android:src="@drawable/ic_trash"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    app:tint="?attr/colorOnSecondaryContainer" />
             </LinearLayout>
 
             <LinearLayout

From 1d3cc319b59e37d3fddbd14b19278a9fca6427aa Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Sat, 9 Apr 2022 16:35:00 +0200
Subject: [PATCH 06/10] Remove API 31 specific themes

Dynamic colors will come in a later update.
This was a bad way to implement them.
---
 app/src/main/res/values-night-v31/themes.xml | 28 --------------------
 app/src/main/res/values-v31/themes.xml       | 14 ----------
 2 files changed, 42 deletions(-)
 delete mode 100644 app/src/main/res/values-night-v31/themes.xml
 delete mode 100644 app/src/main/res/values-v31/themes.xml

diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
deleted file mode 100644
index 4a152feb..00000000
--- a/app/src/main/res/values-night-v31/themes.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.Findroid" parent="Base.Theme.Findroid">
-        <!-- Main colors -->
-        <item name="colorPrimary">@android:color/system_accent1_400</item>
-        <item name="colorPrimaryVariant">@android:color/system_accent1_800</item>
-        <item name="colorSecondary">@android:color/system_accent2_400</item>
-        <item name="colorSecondaryVariant">@android:color/system_accent2_800</item>
-
-        <!-- Background colors and error state color -->
-        <item name="android:colorBackground">@color/black</item>
-        <item name="colorSurface">@android:color/system_neutral1_900</item>
-        <item name="colorError">@color/red</item>
-
-        <!-- Text, icons and strokes in relation to the surface -->
-        <item name="colorOnPrimary">@color/white</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <item name="colorOnBackground">@color/white</item>
-        <item name="colorOnSurface">@color/white</item>
-        <item name="colorOnError">@color/white</item>
-
-        <!-- Navigation bar -->
-        <item name="android:navigationBarColor">?attr/colorSurface</item>
-        <item name="android:windowLightNavigationBar">?attr/isLightTheme</item>
-
-        <item name="elevationOverlayEnabled">false</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
deleted file mode 100644
index 5c909153..00000000
--- a/app/src/main/res/values-v31/themes.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.Findroid" parent="Base.Theme.Findroid">
-        <!-- Main colors -->
-        <item name="colorPrimary">@android:color/system_accent1_500</item>
-        <item name="colorPrimaryVariant">@android:color/system_accent1_800</item>
-        <item name="colorSecondary">@android:color/system_accent2_500</item>
-        <item name="colorSecondaryVariant">@android:color/system_accent2_800</item>
-
-        <!-- Navigation bar -->
-        <item name="android:navigationBarColor">?attr/colorSurface</item>
-        <item name="android:windowLightNavigationBar">?attr/isLightTheme</item>
-    </style>
-</resources>
\ No newline at end of file

From faeff374c8b5eeb4653e372274f68201111b560c Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Sat, 9 Apr 2022 18:39:38 +0200
Subject: [PATCH 07/10] Fix shadow clipping in season header

---
 app/src/main/res/layout/fragment_season.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_season.xml b/app/src/main/res/layout/fragment_season.xml
index a20ad5eb..447bf5ed 100644
--- a/app/src/main/res/layout/fragment_season.xml
+++ b/app/src/main/res/layout/fragment_season.xml
@@ -21,7 +21,8 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:itemCount="4"
-        tools:listitem="@layout/episode_item" />
+        tools:listitem="@layout/episode_item"
+        android:clipChildren="false"/>
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/loading_indicator"

From e965dd3bffc83f33c2696d12f020d637215f9e53 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Sat, 9 Apr 2022 19:19:15 +0200
Subject: [PATCH 08/10] Rework the light and dark themes

---
 app/src/main/res/values-night/themes.xml | 30 +++++++++----------
 app/src/main/res/values/colors.xml       | 23 +++++++++++++++
 app/src/main/res/values/themes.xml       | 37 ++++++++++++++----------
 3 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index e6a595eb..26f3ae9d 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,24 +1,20 @@
 <resources>
     <style name="Theme.Findroid" parent="Base.Theme.Findroid">
-        <!-- Main colors -->
-        <item name="colorPrimary">@color/blue_600</item>
-        <item name="colorPrimaryVariant">@color/blue_800</item>
-        <item name="colorSecondary">@color/green_300</item>
-        <item name="colorSecondaryVariant">@color/green_800</item>
+        <!-- Primary -->
+        <item name="colorPrimary">@color/primary_dark</item>
+        <item name="colorOnPrimary">@color/on_primary_dark</item>
+        <item name="colorPrimaryContainer">@color/primary_container_dark</item>
+        <item name="colorOnPrimaryContainer">@color/on_primary_container_dark</item>
 
-        <!-- Background colors and error state color -->
-        <item name="android:colorBackground">@color/black</item>
+        <!-- Secondary -->
+        <item name="colorSecondary">@color/secondary_dark</item>
+        <item name="colorOnSecondary">@color/on_secondary_dark</item>
+        <item name="colorSecondaryContainer">@color/secondary_container_dark</item>
+        <item name="colorOnSecondaryContainer">@color/on_secondary_container_dark</item>
+
+        <!-- Surface -->
+        <item name="android:colorBackground">@color/neutral_1000</item>
         <item name="colorSurface">@color/neutral_900</item>
-        <item name="colorError">@color/red</item>
-
-        <!-- Text, icons and strokes in relation to the surface -->
-        <item name="colorOnPrimary">@color/white</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <item name="colorOnBackground">@color/white</item>
-        <item name="colorOnSurface">@color/white</item>
-        <item name="colorOnError">@color/white</item>
-
-        <item name="elevationOverlayEnabled">false</item>
     </style>
 
     <style name="Theme.FindroidSplashScreen" parent="Theme.SplashScreen">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 37aaa762..a55b22db 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,11 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Primary -->
+    <color name="primary_light">#0060ac</color>
+    <color name="primary_container_light">#d3e4ff</color>
+    <color name="on_primary_container_light">#001c3a</color>
+
+    <color name="primary_dark">#a1c9ff</color>
+    <color name="on_primary_dark">#00315e</color>
+    <color name="primary_container_dark">#004884</color>
+    <color name="on_primary_container_dark">#d3e4ff</color>
+
+    <!-- Secondary -->
+    <color name="secondary_light">#545f70</color>
+    <color name="secondary_container_light">#d8e3f8</color>
+    <color name="on_secondary_container_light">#111c2b</color>
+
+    <color name="secondary_dark">#bcc7db</color>
+    <color name="on_secondary_dark">#263141</color>
+    <color name="secondary_container_dark">#3c4758</color>
+    <color name="on_secondary_container_dark">#d8e3f8</color>
+
+
     <color name="blue_300">#67b0ed</color>
     <color name="blue_600">#2B82D9</color>
     <color name="blue_800">#2060b4</color>
     <color name="green_300">#71ca92</color>
     <color name="green_500">#24B364</color>
     <color name="green_800">#038043</color>
+    <color name="neutral_1000">#0E141A</color>
     <color name="neutral_900">#121A21</color>
     <color name="neutral_800">#243342</color>
     <color name="neutral_700">#374F67</color>
@@ -13,6 +35,7 @@
     <color name="neutral_300">#A9BDD1</color>
     <color name="neutral_200">#D7E0E9</color>
     <color name="neutral_100">#EEF2F6</color>
+    <color name="neutral_50">#F7FBFF</color>
     <color name="transparent_white_300">#4DFFFFFF</color>
     <color name="transparent_black_300">#4D000000</color>
     <color name="black">#FF000000</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 13956450..0394263e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,22 +3,24 @@
     <style name="Theme.Findroid" parent="Base.Theme.Findroid" />
 
     <style name="Base.Theme.Findroid" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Main colors -->
-        <item name="colorPrimary">@color/blue_600</item>
-        <item name="colorPrimaryVariant">@color/blue_800</item>
-        <item name="colorSecondary">@color/green_500</item>
-        <item name="colorSecondaryVariant">@color/green_800</item>
-
-        <!-- Background colors and error state color -->
-        <item name="android:colorBackground">@color/white</item>
-        <item name="colorSurface">@color/white</item>
-        <item name="colorError">@color/red</item>
-
-        <!-- Text, icons and strokes in relation to the surface -->
+        <!-- Primary -->
+        <item name="colorPrimary">@color/primary_light</item>
         <item name="colorOnPrimary">@color/white</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <item name="colorOnBackground">@color/black</item>
-        <item name="colorOnSurface">@color/black</item>
+        <item name="colorPrimaryContainer">@color/primary_container_light</item>
+        <item name="colorOnPrimaryContainer">@color/on_primary_container_light</item>
+
+        <!-- Secondary -->
+        <item name="colorSecondary">@color/secondary_light</item>
+        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorSecondaryContainer">@color/secondary_container_light</item>
+        <item name="colorOnSecondaryContainer">@color/on_secondary_container_light</item>
+
+        <!-- Surface -->
+        <item name="android:colorBackground">@color/neutral_50</item>
+        <item name="colorSurface">@color/neutral_100</item>
+
+        <!-- Error -->
+        <item name="colorError">@color/red</item>
         <item name="colorOnError">@color/white</item>
 
         <!-- Status bar -->
@@ -31,7 +33,10 @@
         <item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.Findroid.LargeComponent</item>
 
         <!-- Toolbar -->
-        <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
+        <item name="toolbarStyle">@style/Widget.Material3.Toolbar.Surface</item>
+
+        <!-- Extra -->
+        <item name="elevationOverlayEnabled">false</item>
     </style>
 
     <style name="Theme.FindroidSplashScreen" parent="Theme.SplashScreen">

From d36ec1eb62bcb3cb6e4cc09f21f068963f8d9763 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Sat, 9 Apr 2022 20:46:07 +0200
Subject: [PATCH 09/10] Fix played and favorite button changing color

---
 .../fragments/EpisodeBottomSheetFragment.kt   | 59 ++++++++++++++++--
 .../jellyfin/fragments/MediaInfoFragment.kt   | 61 +++++++++++++++++--
 .../jellyfin/tv/ui/MediaDetailFragment.kt     | 61 +++++++++++++++++--
 app/src/main/res/drawable/ic_check_filled.xml | 13 ----
 4 files changed, 163 insertions(+), 31 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_check_filled.xml

diff --git a/app/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt
index bdeaf39d..851420a5 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt
@@ -84,11 +84,23 @@ class EpisodeBottomSheetFragment : BottomSheetDialogFragment() {
                 when (viewModel.played) {
                     true -> {
                         viewModel.markAsUnplayed(episodeId)
-                        binding.checkButton.setImageResource(R.drawable.ic_check)
+                        val typedValue = TypedValue()
+                        requireActivity().theme.resolveAttribute(R.attr.colorOnSecondaryContainer, typedValue, true)
+                        binding.checkButton.imageTintList = ColorStateList.valueOf(
+                            resources.getColor(
+                                typedValue.resourceId,
+                                requireActivity().theme
+                            )
+                        )
                     }
                     false -> {
                         viewModel.markAsPlayed(episodeId)
-                        binding.checkButton.setImageResource(R.drawable.ic_check_filled)
+                        binding.checkButton.imageTintList = ColorStateList.valueOf(
+                            resources.getColor(
+                                R.color.red,
+                                requireActivity().theme
+                            )
+                        )
                     }
                 }
             }
@@ -98,10 +110,24 @@ class EpisodeBottomSheetFragment : BottomSheetDialogFragment() {
                     true -> {
                         viewModel.unmarkAsFavorite(episodeId)
                         binding.favoriteButton.setImageResource(R.drawable.ic_heart)
+                        val typedValue = TypedValue()
+                        requireActivity().theme.resolveAttribute(R.attr.colorOnSecondaryContainer, typedValue, true)
+                        binding.favoriteButton.imageTintList = ColorStateList.valueOf(
+                            resources.getColor(
+                                typedValue.resourceId,
+                                requireActivity().theme
+                            )
+                        )
                     }
                     false -> {
                         viewModel.markAsFavorite(episodeId)
                         binding.favoriteButton.setImageResource(R.drawable.ic_heart_filled)
+                        binding.favoriteButton.imageTintList = ColorStateList.valueOf(
+                            resources.getColor(
+                                R.color.red,
+                                requireActivity().theme
+                            )
+                        )
                     }
                 }
             }
@@ -160,11 +186,26 @@ class EpisodeBottomSheetFragment : BottomSheetDialogFragment() {
             binding.playButton.alpha = if (!available) 0.5F else 1.0F
 
             // Check icon
-            val checkDrawable = when (played) {
-                true -> R.drawable.ic_check_filled
-                false -> R.drawable.ic_check
+            when (played) {
+                true -> {
+                    binding.checkButton.imageTintList = ColorStateList.valueOf(
+                        resources.getColor(
+                            R.color.red,
+                            requireActivity().theme
+                        )
+                    )
+                }
+                false -> {
+                    val typedValue = TypedValue()
+                    requireActivity().theme.resolveAttribute(R.attr.colorOnSecondaryContainer, typedValue, true)
+                    binding.checkButton.imageTintList = ColorStateList.valueOf(
+                        resources.getColor(
+                            typedValue.resourceId,
+                            requireActivity().theme
+                        )
+                    )
+                }
             }
-            binding.checkButton.setImageResource(checkDrawable)
 
             // Favorite icon
             val favoriteDrawable = when (favorite) {
@@ -172,6 +213,12 @@ class EpisodeBottomSheetFragment : BottomSheetDialogFragment() {
                 false -> R.drawable.ic_heart
             }
             binding.favoriteButton.setImageResource(favoriteDrawable)
+            if (favorite) binding.favoriteButton.imageTintList = ColorStateList.valueOf(
+                resources.getColor(
+                    R.color.red,
+                    requireActivity().theme
+                )
+            )
 
             when (canDownload) {
                 true -> {
diff --git a/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt
index c20cf9d4..766f61f3 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.content.res.ColorStateList
 import android.net.Uri
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -147,11 +148,23 @@ class MediaInfoFragment : Fragment() {
                 when (viewModel.played) {
                     true -> {
                         viewModel.markAsUnplayed(args.itemId)
-                        binding.checkButton.setImageResource(R.drawable.ic_check)
+                        val typedValue = TypedValue()
+                        requireActivity().theme.resolveAttribute(R.attr.colorOnSecondaryContainer, typedValue, true)
+                        binding.checkButton.imageTintList = ColorStateList.valueOf(
+                            resources.getColor(
+                                typedValue.resourceId,
+                                requireActivity().theme
+                            )
+                        )
                     }
                     false -> {
                         viewModel.markAsPlayed(args.itemId)
-                        binding.checkButton.setImageResource(R.drawable.ic_check_filled)
+                        binding.checkButton.imageTintList = ColorStateList.valueOf(
+                            resources.getColor(
+                                R.color.red,
+                                requireActivity().theme
+                            )
+                        )
                     }
                 }
             }
@@ -161,10 +174,24 @@ class MediaInfoFragment : Fragment() {
                     true -> {
                         viewModel.unmarkAsFavorite(args.itemId)
                         binding.favoriteButton.setImageResource(R.drawable.ic_heart)
+                        val typedValue = TypedValue()
+                        requireActivity().theme.resolveAttribute(R.attr.colorOnSecondaryContainer, typedValue, true)
+                        binding.favoriteButton.imageTintList = ColorStateList.valueOf(
+                            resources.getColor(
+                                typedValue.resourceId,
+                                requireActivity().theme
+                            )
+                        )
                     }
                     false -> {
                         viewModel.markAsFavorite(args.itemId)
                         binding.favoriteButton.setImageResource(R.drawable.ic_heart_filled)
+                        binding.favoriteButton.imageTintList = ColorStateList.valueOf(
+                            resources.getColor(
+                                R.color.red,
+                                requireActivity().theme
+                            )
+                        )
                     }
                 }
             }
@@ -206,11 +233,27 @@ class MediaInfoFragment : Fragment() {
             binding.playButton.alpha = if (!available) 0.5F else 1.0F
 
             // Check icon
-            val checkDrawable = when (played) {
-                true -> R.drawable.ic_check_filled
-                false -> R.drawable.ic_check
+            when (played) {
+                true -> {
+                    if (played) binding.checkButton.imageTintList = ColorStateList.valueOf(
+                        resources.getColor(
+                            R.color.red,
+                            requireActivity().theme
+                        )
+                    )
+                }
+                false -> {
+                    val typedValue = TypedValue()
+                    requireActivity().theme.resolveAttribute(R.attr.colorOnSecondaryContainer, typedValue, true)
+                    binding.checkButton.imageTintList = ColorStateList.valueOf(
+                        resources.getColor(
+                            typedValue.resourceId,
+                            requireActivity().theme
+                        )
+                    )
+                }
             }
-            binding.checkButton.setImageResource(checkDrawable)
+
 
             // Favorite icon
             val favoriteDrawable = when (favorite) {
@@ -218,6 +261,12 @@ class MediaInfoFragment : Fragment() {
                 false -> R.drawable.ic_heart
             }
             binding.favoriteButton.setImageResource(favoriteDrawable)
+            if (favorite) binding.favoriteButton.imageTintList = ColorStateList.valueOf(
+                resources.getColor(
+                    R.color.red,
+                    requireActivity().theme
+                )
+            )
 
             binding.downloadButton.isEnabled = !downloaded
 
diff --git a/app/src/main/java/dev/jdtech/jellyfin/tv/ui/MediaDetailFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/tv/ui/MediaDetailFragment.kt
index f12fee34..c5c79a40 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/tv/ui/MediaDetailFragment.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/tv/ui/MediaDetailFragment.kt
@@ -1,8 +1,10 @@
 package dev.jdtech.jellyfin.tv.ui
 
 import android.content.Intent
+import android.content.res.ColorStateList
 import android.net.Uri
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -119,11 +121,23 @@ internal class MediaDetailFragment : Fragment() {
             when (viewModel.played) {
                 true -> {
                     viewModel.markAsUnplayed(args.itemId)
-                    binding.checkButton.setImageResource(R.drawable.ic_check)
+                    val typedValue = TypedValue()
+                    requireActivity().theme.resolveAttribute(R.attr.colorOnSecondaryContainer, typedValue, true)
+                    binding.checkButton.imageTintList = ColorStateList.valueOf(
+                        resources.getColor(
+                            typedValue.resourceId,
+                            requireActivity().theme
+                        )
+                    )
                 }
                 false -> {
                     viewModel.markAsPlayed(args.itemId)
-                    binding.checkButton.setImageResource(R.drawable.ic_check_filled)
+                    binding.checkButton.imageTintList = ColorStateList.valueOf(
+                        resources.getColor(
+                            R.color.red,
+                            requireActivity().theme
+                        )
+                    )
                 }
             }
         }
@@ -133,10 +147,24 @@ internal class MediaDetailFragment : Fragment() {
                 true -> {
                     viewModel.unmarkAsFavorite(args.itemId)
                     binding.favoriteButton.setImageResource(R.drawable.ic_heart)
+                    val typedValue = TypedValue()
+                    requireActivity().theme.resolveAttribute(R.attr.colorOnSecondaryContainer, typedValue, true)
+                    binding.favoriteButton.imageTintList = ColorStateList.valueOf(
+                        resources.getColor(
+                            typedValue.resourceId,
+                            requireActivity().theme
+                        )
+                    )
                 }
                 false -> {
                     viewModel.markAsFavorite(args.itemId)
                     binding.favoriteButton.setImageResource(R.drawable.ic_heart_filled)
+                    binding.favoriteButton.imageTintList = ColorStateList.valueOf(
+                        resources.getColor(
+                            R.color.red,
+                            requireActivity().theme
+                        )
+                    )
                 }
             }
         }
@@ -154,11 +182,26 @@ internal class MediaDetailFragment : Fragment() {
             actorsAdapter.submitList(actors)
 
             // Check icon
-            val checkDrawable = when (played) {
-                true -> R.drawable.ic_check_filled
-                false -> R.drawable.ic_check
+            when (played) {
+                true -> {
+                    if (played) binding.checkButton.imageTintList = ColorStateList.valueOf(
+                        resources.getColor(
+                            R.color.red,
+                            requireActivity().theme
+                        )
+                    )
+                }
+                false -> {
+                    val typedValue = TypedValue()
+                    requireActivity().theme.resolveAttribute(R.attr.colorOnSecondaryContainer, typedValue, true)
+                    binding.checkButton.imageTintList = ColorStateList.valueOf(
+                        resources.getColor(
+                            typedValue.resourceId,
+                            requireActivity().theme
+                        )
+                    )
+                }
             }
-            binding.checkButton.setImageResource(checkDrawable)
 
             // Favorite icon
             val favoriteDrawable = when (favorite) {
@@ -166,6 +209,12 @@ internal class MediaDetailFragment : Fragment() {
                 false -> R.drawable.ic_heart
             }
             binding.favoriteButton.setImageResource(favoriteDrawable)
+            if (favorite) binding.favoriteButton.imageTintList = ColorStateList.valueOf(
+                resources.getColor(
+                    R.color.red,
+                    requireActivity().theme
+                )
+            )
 
             binding.title.text = item.name
             binding.subtitle.text = item.seriesName
diff --git a/app/src/main/res/drawable/ic_check_filled.xml b/app/src/main/res/drawable/ic_check_filled.xml
deleted file mode 100644
index 6c19c50c..00000000
--- a/app/src/main/res/drawable/ic_check_filled.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M20,6l-11,11l-5,-5"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/red"
-      android:strokeLineCap="round"/>
-</vector>

From 287ed6423605e0ded8160542ba2234606204bd11 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Sat, 9 Apr 2022 20:50:47 +0200
Subject: [PATCH 10/10] Fix spinner color in play button

---
 app/src/main/res/layout/episode_bottom_sheet.xml | 2 +-
 app/src/main/res/layout/fragment_media_info.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/episode_bottom_sheet.xml b/app/src/main/res/layout/episode_bottom_sheet.xml
index 6dc3b012..017d1628 100644
--- a/app/src/main/res/layout/episode_bottom_sheet.xml
+++ b/app/src/main/res/layout/episode_bottom_sheet.xml
@@ -157,7 +157,7 @@
                 android:layout_height="48dp"
                 android:layout_centerHorizontal="true"
                 android:elevation="8dp"
-                android:indeterminateTint="@color/white"
+                android:indeterminateTint="?attr/colorOnPrimary"
                 android:padding="8dp"
                 android:visibility="invisible" />
         </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_media_info.xml b/app/src/main/res/layout/fragment_media_info.xml
index 7ecff46e..814f6f7c 100644
--- a/app/src/main/res/layout/fragment_media_info.xml
+++ b/app/src/main/res/layout/fragment_media_info.xml
@@ -141,7 +141,7 @@
                         android:layout_height="48dp"
                         android:layout_centerHorizontal="true"
                         android:elevation="8dp"
-                        android:indeterminateTint="@color/white"
+                        android:indeterminateTint="?attr/colorOnPrimary"
                         android:padding="8dp"
                         android:visibility="invisible" />
                 </RelativeLayout>