From 25e70132cef71401b1fbe4f151f82f4ec728b5df Mon Sep 17 00:00:00 2001
From: HotarunIchijou <hotarunichijou@ik.me>
Date: Thu, 14 Dec 2023 23:09:53 +0300
Subject: [PATCH 1/5] Transparent navigation bar

---
 app/src/main/res/values-night-v31/themes.xml | 1 +
 app/src/main/res/values-night/themes.xml     | 4 +++-
 app/src/main/res/values-v23/themes.xml       | 1 +
 app/src/main/res/values-v27/themes.xml       | 1 -
 app/src/main/res/values-v31/themes.xml       | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
index a445ab275..583aa060e 100644
--- a/app/src/main/res/values-night-v31/themes.xml
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -9,6 +9,7 @@
 
 	<!-- From ThemeOverlay.Material3.DynamicColors.Dark -->
 	<style name="Theme.Kotatsu.Monet">
+		<item name="android:navigationBarColor">@android:color/transparent</item>
 		<item name="isMaterial3DynamicColorApplied">true</item>
 		<!-- Color palettes -->
 		<item name="colorPrimary">@color/m3_sys_color_dynamic_dark_primary</item>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 1a216ca3c..1a64db229 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-	<style name="ThemeOverlay.Kotatsu" parent="ThemeOverlay.Material3.Dark" />
+	<style name="ThemeOverlay.Kotatsu" parent="ThemeOverlay.Material3.Dark">
+		<item name="android:navigationBarColor">@android:color/transparent</item>
+	</style>
 
 	<style name="ThemeOverlay.Kotatsu.Amoled" parent="">
 		<item name="colorSurface">@color/surface_amoled</item>
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
index a0b9e171e..a0dee6943 100644
--- a/app/src/main/res/values-v23/themes.xml
+++ b/app/src/main/res/values-v23/themes.xml
@@ -3,6 +3,7 @@
 
 	<style name="Base.V23.Kotatsu" parent="Base.Theme.Kotatsu">
 		<item name="android:statusBarColor">@android:color/transparent</item>
+		<item name="android:navigationBarColor">@android:color/transparent</item>
 	</style>
 
 	<style name="Theme.Kotatsu" parent="Base.V23.Kotatsu" />
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
index 94d572af9..f621d3cbb 100644
--- a/app/src/main/res/values-v27/themes.xml
+++ b/app/src/main/res/values-v27/themes.xml
@@ -2,7 +2,6 @@
 <resources>
 
 	<style name="Base.V27.Kotatsu" parent="Base.V23.Kotatsu">
-		<item name="android:navigationBarColor">@color/navigation_bar_scrim</item>
 		<item name="android:windowLightNavigationBar">@bool/light_navigation_bar</item>
 	</style>
 
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index 158f46710..07e1e60c6 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -11,6 +11,7 @@
 
 	<!-- From ThemeOverlay.Material3.DynamicColors.Light -->
 	<style name="Theme.Kotatsu.Monet">
+		<item name="android:navigationBarColor">@android:color/transparent</item>
 		<item name="isMaterial3DynamicColorApplied">true</item>
 		<!-- Color palettes -->
 		<item name="colorPrimary">@color/m3_sys_color_dynamic_light_primary</item>
-- 
2.40.1


From de27139d1f0fbde29c3024d4a70ec1e33d8cf101 Mon Sep 17 00:00:00 2001
From: HotarunIchijou <hotarunichijou@ik.me>
Date: Thu, 14 Dec 2023 23:48:22 +0300
Subject: [PATCH 2/5] bump com.android.material to 1.11.0 and androidx.activity
 to 1.8.2

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7cb8df61d..4360b1e6e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -92,7 +92,7 @@ dependencies {
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
 	implementation 'androidx.core:core-ktx:1.12.0'
-	implementation 'androidx.activity:activity-ktx:1.8.1'
+	implementation 'androidx.activity:activity-ktx:1.8.2'
 	implementation 'androidx.fragment:fragment-ktx:1.6.2'
 	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
 	implementation 'androidx.lifecycle:lifecycle-service:2.6.2'
@@ -103,7 +103,7 @@ dependencies {
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
 	implementation 'androidx.preference:preference-ktx:1.2.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
-	implementation 'com.google.android.material:material:1.10.0'
+	implementation 'com.google.android.material:material:1.11.0'
 	implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
 
 	implementation 'androidx.work:work-runtime:2.9.0'
-- 
2.40.1


From 7bd198ebe8419e47a143bc28a7829a1bd894ebe4 Mon Sep 17 00:00:00 2001
From: HotarunIchijou <hotarunichijou@ik.me>
Date: Thu, 14 Dec 2023 23:53:31 +0300
Subject: [PATCH 3/5] bunp gradle to 8.2.0

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index da65f3c35..cc5e79f50 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:8.1.4'
+		classpath 'com.android.tools.build:gradle:8.2.0'
 		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21'
 		classpath 'com.google.dagger:hilt-android-gradle-plugin:2.49'
 		classpath 'com.google.devtools.ksp:symbol-processing-gradle-plugin:1.9.21-1.0.15'
-- 
2.40.1


From c489b57fb03265f57bf7c4eadbb19dabf461a0dd Mon Sep 17 00:00:00 2001
From: HotarunIchijou <hotarunichijou@ik.me>
Date: Thu, 14 Dec 2023 23:55:18 +0300
Subject: [PATCH 4/5] color changes for dynamic theme

---
 app/src/main/res/values-night-v31/themes.xml | 12 ++++++------
 app/src/main/res/values/styles.xml           | 18 +++---------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
index 583aa060e..06886d109 100644
--- a/app/src/main/res/values-night-v31/themes.xml
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -3,7 +3,7 @@
 
 	<style name="Base.V31.Kotatsu" parent="Base.V27.Kotatsu">
 		<item name="android:windowSplashScreenAnimatedIcon">@drawable/avd_splash</item>
-		<item name="android:windowSplashScreenBackground">@android:color/system_neutral2_900</item>
+		<item name="android:windowSplashScreenBackground">@color/m3_sys_color_dynamic_dark_surface</item>
 		<item name="android:windowSplashScreenAnimationDuration">800</item>
 	</style>
 
@@ -62,11 +62,11 @@
 		<item name="colorOnErrorContainer">@color/m3_sys_color_dark_on_error_container</item>
 		<item name="colorOutline">@color/m3_sys_color_dynamic_dark_outline</item>
 		<item name="colorOutlineVariant">@color/m3_sys_color_dynamic_dark_outline_variant</item>
-		<item name="android:colorBackground">@android:color/system_neutral2_900</item>
-		<item name="m3ColorBackground">@android:color/system_neutral2_900</item>
-		<item name="m3ColorExploreButton">@android:color/system_neutral2_800</item>
-		<item name="m3ColorCardBackground">@android:color/system_neutral2_700</item>
-		<item name="m3ColorBottomMenuBackground">@android:color/system_neutral2_800</item>
+		<item name="android:colorBackground">@color/m3_sys_color_dynamic_dark_surface</item>
+		<item name="m3ColorBackground">@color/m3_sys_color_dynamic_dark_surface</item>
+		<item name="m3ColorExploreButton">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
+		<item name="m3ColorCardBackground">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
+		<item name="m3ColorBottomMenuBackground">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
 		<!-- Default Framework Text Colors. -->
 		<item name="android:textColorPrimary">@color/m3_dynamic_dark_default_color_primary_text
 		</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 72a8a8c73..d57d5efbc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,9 +2,7 @@
 
 	<!--Toolbars-->
 
-	<style name="Widget.Kotatsu.CollapsingToolbar" parent="@style/Widget.Material3.CollapsingToolbar.Medium">
-		<item name="contentScrim">?attr/m3ColorBottomMenuBackground</item>
-	</style>
+	<style name="Widget.Kotatsu.CollapsingToolbar" parent="@style/Widget.Material3.CollapsingToolbar.Medium" />
 
 	<style name="Widget.Kotatsu.AppBarLayout" parent="@style/Widget.Material3.AppBarLayout">
 		<item name="android:background">?attr/m3ColorBackground</item>
@@ -14,19 +12,11 @@
 
 	<style name="Widget.Kotatsu.BottomNavigationView" parent="Widget.Material3.BottomNavigationView">
 		<item name="labelVisibilityMode">labeled</item>
-		<item name="android:background">?attr/m3ColorBottomMenuBackground</item>
-		<item name="itemActiveIndicatorStyle">@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator</item>
-		<item name="itemIconTint">@color/bottom_menu_active_item</item>
 	</style>
 
-	<style name="Widget.Kotatsu.BottomNavigationView.ColoredIndicators">
-		<item name="itemActiveIndicatorStyle">@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator</item>
-		<item name="itemIconTint">@color/bottom_menu_active_item</item>
-	</style>
+	<style name="Widget.Kotatsu.BottomNavigationView.ColoredIndicators" />
 
-	<style name="Widget.Kotatsu.BottomNavigationView.ActiveIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
-		<item name="android:color">@color/bottom_menu_active_indicator</item>
-	</style>
+	<style name="Widget.Kotatsu.BottomNavigationView.ActiveIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator" />
 
 	<style name="Widget.Kotatsu.ActionMode" parent="Base.Widget.Material3.ActionMode">
 		<!--<item name="titleTextStyle">@style/TextAppearance.Kotatsu.ActionBar.Title</item>-->
@@ -44,12 +34,10 @@
 	<!-- Bottom sheet -->
 
 	<style name="ThemeOverlay.Kotatsu.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
-		<item name="bottomSheetStyle">@style/Widget.Kotatsu.BottomSheet.Modal</item>
 		<item name="android:windowAnimationStyle">@style/Animation.Kotatsu.BottomSheetDialog</item>
 	</style>
 
 	<style name="Widget.Kotatsu.BottomSheet.Modal" parent="Widget.Material3.BottomSheet.Modal">
-		<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Kotatsu.BottomSheet</item>
 		<item name="backgroundTint">?attr/m3ColorBottomMenuBackground</item>
 	</style>
 
-- 
2.40.1


From d8d89c3730b8ee7802cc754d84f5482a5493d07a Mon Sep 17 00:00:00 2001
From: HotarunIchijou <hotarunichijou@ik.me>
Date: Fri, 15 Dec 2023 21:56:58 +0300
Subject: [PATCH 5/5] removed unused things

---
 .../org/koitharu/kotatsu/main/ui/MainActivity.kt   | 14 --------------
 .../res/color-v23/bottom_menu_active_indicator.xml |  4 ----
 .../main/res/color-v23/bottom_menu_active_item.xml |  5 -----
 .../main/res/color-v23/bottom_menu_background.xml  |  4 ----
 .../res/color/bottom_menu_active_indicator.xml     |  4 ----
 app/src/main/res/color/bottom_menu_active_item.xml |  5 -----
 app/src/main/res/color/bottom_menu_background.xml  |  4 ----
 7 files changed, 40 deletions(-)
 delete mode 100644 app/src/main/res/color-v23/bottom_menu_active_indicator.xml
 delete mode 100644 app/src/main/res/color-v23/bottom_menu_active_item.xml
 delete mode 100644 app/src/main/res/color-v23/bottom_menu_background.xml
 delete mode 100644 app/src/main/res/color/bottom_menu_active_indicator.xml
 delete mode 100644 app/src/main/res/color/bottom_menu_active_item.xml
 delete mode 100644 app/src/main/res/color/bottom_menu_background.xml

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
index 1e0c356a0..b140fe2bd 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -13,8 +13,6 @@ import androidx.appcompat.view.ActionMode
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.inputmethod.EditorInfoCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
@@ -47,7 +45,6 @@ import org.koitharu.kotatsu.core.util.ext.hideKeyboard
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
-import org.koitharu.kotatsu.core.util.ext.setNavigationBarTransparentCompat
 import org.koitharu.kotatsu.databinding.ActivityMainBinding
 import org.koitharu.kotatsu.details.service.MangaPrefetchService
 import org.koitharu.kotatsu.details.ui.DetailsActivity
@@ -98,17 +95,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityMainBinding.inflate(layoutInflater))
 
-		if (bottomNav != null) {
-			ViewCompat.setOnApplyWindowInsetsListener(viewBinding.root) { _, insets ->
-				if (insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom > 0) {
-					val elevation = bottomNav?.elevation ?: 0f
-					window.setNavigationBarTransparentCompat(this@MainActivity, elevation)
-				}
-				insets
-			}
-			ViewCompat.requestApplyInsets(viewBinding.root)
-		}
-
 		with(viewBinding.searchView) {
 			onFocusChangeListener = this@MainActivity
 			searchSuggestionListener = this@MainActivity
diff --git a/app/src/main/res/color-v23/bottom_menu_active_indicator.xml b/app/src/main/res/color-v23/bottom_menu_active_indicator.xml
deleted file mode 100644
index bbd22d907..000000000
--- a/app/src/main/res/color-v23/bottom_menu_active_indicator.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.2" android:color="?attr/colorPrimary" />
-</selector>
diff --git a/app/src/main/res/color-v23/bottom_menu_active_item.xml b/app/src/main/res/color-v23/bottom_menu_active_item.xml
deleted file mode 100644
index 6b6938f5e..000000000
--- a/app/src/main/res/color-v23/bottom_menu_active_item.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/colorOnSecondaryContainer" android:state_checked="true" />
-	<item android:color="?attr/colorOnSurfaceVariant" android:state_checked="false" />
-</selector>
diff --git a/app/src/main/res/color-v23/bottom_menu_background.xml b/app/src/main/res/color-v23/bottom_menu_background.xml
deleted file mode 100644
index 1a8aa582c..000000000
--- a/app/src/main/res/color-v23/bottom_menu_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?attr/m3ColorBottomMenuBackground" />
-</selector>
diff --git a/app/src/main/res/color/bottom_menu_active_indicator.xml b/app/src/main/res/color/bottom_menu_active_indicator.xml
deleted file mode 100644
index 3dd89e625..000000000
--- a/app/src/main/res/color/bottom_menu_active_indicator.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.2" android:color="@color/kotatsu_primary" />
-</selector>
diff --git a/app/src/main/res/color/bottom_menu_active_item.xml b/app/src/main/res/color/bottom_menu_active_item.xml
deleted file mode 100644
index 715da6df6..000000000
--- a/app/src/main/res/color/bottom_menu_active_item.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="@color/kotatsu_onSecondaryContainer" android:state_checked="true" />
-	<item android:color="@color/kotatsu_onSurfaceVariant" android:state_checked="false" />
-</selector>
diff --git a/app/src/main/res/color/bottom_menu_background.xml b/app/src/main/res/color/bottom_menu_background.xml
deleted file mode 100644
index a43c25c04..000000000
--- a/app/src/main/res/color/bottom_menu_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/kotatsu_m3_bottom_menu" />
-</selector>
-- 
2.40.1