From a6a23c856079773974b005e9e324193cce64e5a7 Mon Sep 17 00:00:00 2001
From: Jannik <seil0@mosad.xyz>
Date: Sat, 15 Apr 2023 23:46:13 +0200
Subject: [PATCH] fix onboarding colors for light/dark theme

---
 app/src/main/res/color/bottom_nav_item_tint.xml     | 5 -----
 app/src/main/res/drawable/dot_default.xml           | 2 +-
 app/src/main/res/drawable/dot_selected.xml          | 2 +-
 app/src/main/res/drawable/ic_baseline_search_24.xml | 2 +-
 app/src/main/res/drawable/placeholder_image.xml     | 2 +-
 app/src/main/res/drawable/shape_rounded_corner.xml  | 2 +-
 app/src/main/res/layout/fragment_on_login.xml       | 1 +
 app/src/main/res/layout/fragment_on_welcome.xml     | 1 +
 app/src/main/res/layout/item_episode.xml            | 4 ++--
 app/src/main/res/layout/item_episode_player.xml     | 4 ++--
 app/src/main/res/values-night/themes.xml            | 2 ++
 app/src/main/res/values/attrs.xml                   | 8 +-------
 app/src/main/res/values/colors.xml                  | 4 ----
 app/src/main/res/values/themes.xml                  | 2 ++
 14 files changed, 16 insertions(+), 25 deletions(-)
 delete mode 100644 app/src/main/res/color/bottom_nav_item_tint.xml

diff --git a/app/src/main/res/color/bottom_nav_item_tint.xml b/app/src/main/res/color/bottom_nav_item_tint.xml
deleted file mode 100644
index 773daa6..0000000
--- a/app/src/main/res/color/bottom_nav_item_tint.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorPrimary" android:state_checked="true"/>
-    <item android:color="?attr/iconColor"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/dot_default.xml b/app/src/main/res/drawable/dot_default.xml
index cb7aef7..df024d4 100644
--- a/app/src/main/res/drawable/dot_default.xml
+++ b/app/src/main/res/drawable/dot_default.xml
@@ -6,7 +6,7 @@
             android:shape="ring"
             android:thickness="4dp"
             android:useLevel="false">
-            <solid android:color="?iconColor"/>
+            <solid android:color="?colorOutline"/>
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/dot_selected.xml b/app/src/main/res/drawable/dot_selected.xml
index 078fd8f..937159e 100644
--- a/app/src/main/res/drawable/dot_selected.xml
+++ b/app/src/main/res/drawable/dot_selected.xml
@@ -6,7 +6,7 @@
             android:shape="ring"
             android:thickness="4dp"
             android:useLevel="false">
-            <solid android:color="@color/colorAccent" />
+            <solid android:color="?colorSecondary" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_search_24.xml b/app/src/main/res/drawable/ic_baseline_search_24.xml
index 188f893..07b76d6 100644
--- a/app/src/main/res/drawable/ic_baseline_search_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_search_24.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/iconColor">
+    android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
diff --git a/app/src/main/res/drawable/placeholder_image.xml b/app/src/main/res/drawable/placeholder_image.xml
index 9eb8d59..b27b059 100644
--- a/app/src/main/res/drawable/placeholder_image.xml
+++ b/app/src/main/res/drawable/placeholder_image.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?shapeTextBackground"/>
+    <solid android:color="?colorSurfaceVariant"/>
     <size
         android:width="1920px"
         android:height="1080px"/>
diff --git a/app/src/main/res/drawable/shape_rounded_corner.xml b/app/src/main/res/drawable/shape_rounded_corner.xml
index eae1adb..74db0db 100644
--- a/app/src/main/res/drawable/shape_rounded_corner.xml
+++ b/app/src/main/res/drawable/shape_rounded_corner.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/shapeTextBackground"/>
+    <solid android:color="?colorSurfaceVariant"/>
     <corners android:radius="3dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_on_login.xml b/app/src/main/res/layout/fragment_on_login.xml
index f5d11ee..e6a673e 100644
--- a/app/src/main/res/layout/fragment_on_login.xml
+++ b/app/src/main/res/layout/fragment_on_login.xml
@@ -10,6 +10,7 @@
         android:layout_height="128dp"
         android:contentDescription="@string/app_name"
         android:scaleType="fitCenter"
+        android:tint="?colorTeapodIcon"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_on_welcome.xml b/app/src/main/res/layout/fragment_on_welcome.xml
index dbb03f5..2f7e292 100644
--- a/app/src/main/res/layout/fragment_on_welcome.xml
+++ b/app/src/main/res/layout/fragment_on_welcome.xml
@@ -15,6 +15,7 @@
             android:layout_height="128dp"
             android:contentDescription="@string/app_name"
             android:scaleType="fitCenter"
+            android:tint="?colorTeapodIcon"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_episode.xml b/app/src/main/res/layout/item_episode.xml
index 81a83d4..e1bfaa8 100644
--- a/app/src/main/res/layout/item_episode.xml
+++ b/app/src/main/res/layout/item_episode.xml
@@ -24,8 +24,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:contentDescription="@string/component_poster_desc"
-                app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster"
-                app:srcCompat="@color/imagePlaceholder" />
+                android:src="@drawable/placeholder_image"
+                app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster" />
 
             <ImageView
                 android:id="@+id/image_episode_play"
diff --git a/app/src/main/res/layout/item_episode_player.xml b/app/src/main/res/layout/item_episode_player.xml
index f2b16b8..54b4eab 100644
--- a/app/src/main/res/layout/item_episode_player.xml
+++ b/app/src/main/res/layout/item_episode_player.xml
@@ -15,8 +15,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:contentDescription="@string/component_poster_desc"
-            app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster"
-            app:srcCompat="@color/imagePlaceholder" />
+            android:src="@drawable/placeholder_image"
+            app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster" />
 
         <ImageView
             android:id="@+id/image_episode_play"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 0d8ec1f..3796552 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -9,6 +9,7 @@
 
     <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
 <!--        <item name="materialButtonStyle">@style/Widget.App.Button</item>-->
+        <item name="searchViewStyle">@style/SearchViewStyle</item>
         <item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>
 
         <item name="colorPrimary">@color/seed</item>
@@ -37,6 +38,7 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
+        <item name="colorTeapodIcon">@color/button_background_dark</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 4de55db..a923161 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr format="color" name="themePrimary"/>
-    <attr format="color" name="themeSecondary"/>
-    <attr format="color" name="textPrimary"/>
-    <attr format="color" name="textSecondary"/>
-    <attr format="color" name="iconColor"/>
-    <attr format="color" name="buttonBackground"/>
-    <attr format="color" name="shapeTextBackground"/>
+    <attr format="color" name="colorTeapodIcon"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index edb6e9f..6f19e5d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- theme independent colors -->
-    <color name="colorAccent">#607d8b</color>
-    <color name="imagePlaceholder">#c2c2c2</color>
-
     <!-- light theme colors -->
     <color name="button_background_light">#000000</color>
     <color name="button_text_color_light">#ffffff</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7f0b7bd..8eb3621 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -8,6 +8,7 @@
 
     <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
 <!--        <item name="materialButtonStyle">@style/Widget.App.Button</item>-->
+        <item name="searchViewStyle">@style/SearchViewStyle</item>
         <item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>
 
         <item name="colorPrimary">@color/seed</item>
@@ -36,5 +37,6 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
+        <item name="colorTeapodIcon">@color/button_background_light</item>
     </style>
 </resources>
\ No newline at end of file