From 8e3761064547c120112384796d1a83e103b4df65 Mon Sep 17 00:00:00 2001
From: TwistedUmbrellaX <twistedumbrella@gmail.com>
Date: Sun, 10 Mar 2024 00:23:30 -0500
Subject: [PATCH] feat: match theme color with navbar

---
 app/src/main/java/ani/dantotsu/Functions.kt              | 9 +++++++++
 app/src/main/java/ani/dantotsu/MainActivity.kt           | 5 +++++
 .../java/ani/dantotsu/media/manga/MangaReadFragment.kt   | 1 +
 app/src/main/res/values/themes.xml                       | 2 +-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ani/dantotsu/Functions.kt b/app/src/main/java/ani/dantotsu/Functions.kt
index 48940c37..b8333b6a 100644
--- a/app/src/main/java/ani/dantotsu/Functions.kt
+++ b/app/src/main/java/ani/dantotsu/Functions.kt
@@ -184,6 +184,15 @@ fun Activity.hideSystemBars() {
     }
 }
 
+fun Activity.setNavigationTheme() {
+    val a = TypedValue()
+    theme.resolveAttribute(android.R.attr.colorBackground, a, true)
+    if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && a.isColorType)
+        || (a.type >= TypedValue.TYPE_FIRST_COLOR_INT && a.type <= TypedValue.TYPE_LAST_COLOR_INT)) {
+        window.navigationBarColor = a.data
+    }
+}
+
 open class BottomSheetDialogFragment : BottomSheetDialogFragment() {
     override fun onStart() {
         super.onStart()
diff --git a/app/src/main/java/ani/dantotsu/MainActivity.kt b/app/src/main/java/ani/dantotsu/MainActivity.kt
index 582bf986..ff8c1e32 100644
--- a/app/src/main/java/ani/dantotsu/MainActivity.kt
+++ b/app/src/main/java/ani/dantotsu/MainActivity.kt
@@ -357,6 +357,11 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        window.navigationBarColor = getColor(android.R.color.transparent)
+    }
+
     //ViewPager
     private class ViewPagerAdapter(fragmentManager: FragmentManager, lifecycle: Lifecycle) :
         FragmentStateAdapter(fragmentManager, lifecycle) {
diff --git a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt
index 2d570043..6b979319 100644
--- a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt
+++ b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt
@@ -601,6 +601,7 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener {
         super.onResume()
         binding.mediaInfoProgressBar.visibility = progress
         binding.animeSourceRecycler.layoutManager?.onRestoreInstanceState(state)
+        requireActivity().setNavigationTheme()
     }
 
     override fun onPause() {
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a2182672..87eb6f03 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,10 +1,10 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="Theme.Base" parent="Theme.Material3.DayNight">
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">?android:colorBackground</item>
         <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:windowTranslucentNavigation">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="elevationOverlayEnabled">false</item>
         <item name="windowActionBar">false</item>