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' 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(), 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 @@ - - - - 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 @@ - - - - - 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 @@ - - - - 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 @@ - - - - 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 @@ - - - - - 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 @@ - - - - diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml index a445ab275..06886d109 100644 --- a/app/src/main/res/values-night-v31/themes.xml +++ b/app/src/main/res/values-night-v31/themes.xml @@ -3,12 +3,13 @@ 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 @@ + - + + 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'