From b158bc62222d0ca2802a5d9aed79dddfa398b082 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Sat, 10 Apr 2021 14:43:46 -0400
Subject: [PATCH] More fixes to blue theme

Some of these have existed for a while.. guess no one really uses this theme
---
 .../java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt | 1 +
 app/src/main/res/color/tint_color_secondary.xml          | 4 ++++
 app/src/main/res/layout/reader_activity.xml              | 2 ++
 app/src/main/res/layout/reader_nav.xml                   | 9 +++++----
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/color/tint_color_secondary.xml

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index 53ba4afe67..8e08b4a9a7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -470,6 +470,7 @@ class ReaderActivity :
         binding.appBar.setBackgroundColor(primaryColor)
         window.statusBarColor = Color.TRANSPARENT
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        binding.toolbar.navigationIcon?.setTint(ContextCompat.getColor(this, R.color.tint_color_secondary))
         binding.toolbar.setNavigationOnClickListener {
             popToMain()
         }
diff --git a/app/src/main/res/color/tint_color_secondary.xml b/app/src/main/res/color/tint_color_secondary.xml
new file mode 100644
index 0000000000..8e20b70b39
--- /dev/null
+++ b/app/src/main/res/color/tint_color_secondary.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha=".54" android:color="?actionBarTintColor"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/reader_activity.xml b/app/src/main/res/layout/reader_activity.xml
index 0c8840d3ac..0713bc5c62 100644
--- a/app/src/main/res/layout/reader_activity.xml
+++ b/app/src/main/res/layout/reader_activity.xml
@@ -58,6 +58,8 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                app:titleTextColor="?actionBarTintColor"
+                app:subtitleTextColor="@color/tint_color_secondary"
                 android:background="@drawable/reader_toolbar_ripple" />
 
         </FrameLayout>
diff --git a/app/src/main/res/layout/reader_nav.xml b/app/src/main/res/layout/reader_nav.xml
index 5c6563db99..103d73c781 100644
--- a/app/src/main/res/layout/reader_nav.xml
+++ b/app/src/main/res/layout/reader_nav.xml
@@ -36,7 +36,7 @@
         android:layout_marginEnd="8dp"
         android:contentDescription="@string/previous_chapter"
         android:padding="@dimen/material_layout_keylines_screen_edge_margin"
-        app:tint="@color/textColorPrimary"
+        app:tint="?actionBarTintColor"
         app:srcCompat="@drawable/ic_skip_previous_24" />
 
     <LinearLayout
@@ -49,7 +49,7 @@
             android:layout_width="48dp"
             android:layout_height="match_parent"
             android:gravity="center"
-            android:textColor="@color/textColorPrimary"
+            android:textColor="?actionBarTintColor"
             android:textSize="15sp"
             tools:text="12-14" />
 
@@ -58,6 +58,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:progressBackgroundTint="?actionBarTintColor"
             android:maxHeight="?attr/actionBarSize"
             android:minHeight="?attr/actionBarSize" />
 
@@ -66,7 +67,7 @@
             android:layout_width="48dp"
             android:layout_height="match_parent"
             android:gravity="center"
-            android:textColor="@color/textColorPrimary"
+            android:textColor="?actionBarTintColor"
             android:textSize="15sp"
             tools:text="15" />
 
@@ -82,7 +83,7 @@
         android:background="?selectableItemBackgroundBorderless"
         android:contentDescription="@string/next_chapter"
         android:padding="@dimen/material_layout_keylines_screen_edge_margin"
-        app:tint="@color/textColorPrimary"
+        app:tint="?actionBarTintColor"
         app:srcCompat="@drawable/ic_skip_next_24" />
 
     <ProgressBar