From 87c242e2bb66e7e916238da4325ab74b3912107b Mon Sep 17 00:00:00 2001 From: Koitharu Date: Thu, 20 Feb 2025 17:51:47 +0200 Subject: [PATCH] Dim navbar in details screen --- .../org/koitharu/kotatsu/details/ui/DetailsActivity.kt | 5 +++-- .../kotatsu/details/ui/DetailsBottomSheetCallback.kt | 6 +++++- app/src/main/res/layout/activity_details.xml | 9 +++++++++ app/src/main/res/values-night/colors.xml | 1 + app/src/main/res/values/colors.xml | 1 + 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt index ecb2809af..8d5cbd1ff 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt @@ -152,8 +152,9 @@ class DetailsActivity : TitleScrollCoordinator(viewBinding.textViewTitle).attach(viewBinding.scrollView) viewBinding.containerBottomSheet?.let { sheet -> onBackPressedDispatcher.addCallback(BottomSheetCollapseCallback(sheet)) - BottomSheetBehavior.from(sheet) - .addBottomSheetCallback(DetailsBottomSheetCallback(viewBinding.swipeRefreshLayout)) + BottomSheetBehavior.from(sheet).addBottomSheetCallback( + DetailsBottomSheetCallback(viewBinding.swipeRefreshLayout, checkNotNull(viewBinding.navbarDim)), + ) } TitleExpandListener(viewBinding.textViewTitle).attach() diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsBottomSheetCallback.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsBottomSheetCallback.kt index d351a9b15..33576c064 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsBottomSheetCallback.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsBottomSheetCallback.kt @@ -3,14 +3,18 @@ package org.koitharu.kotatsu.details.ui import android.view.View import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.google.android.material.bottomsheet.BottomSheetBehavior +import org.koitharu.kotatsu.core.ui.widgets.WindowInsetHolder class DetailsBottomSheetCallback( private val swipeRefreshLayout: SwipeRefreshLayout, + private val navbarDimView: WindowInsetHolder, ) : BottomSheetBehavior.BottomSheetCallback() { override fun onStateChanged(bottomSheet: View, newState: Int) { swipeRefreshLayout.isEnabled = newState == BottomSheetBehavior.STATE_COLLAPSED } - override fun onSlide(bottomSheet: View, slideOffset: Float) = Unit + override fun onSlide(bottomSheet: View, slideOffset: Float) { + navbarDimView.alpha = 1f - slideOffset.coerceAtLeast(0f) + } } diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml index 1c878b2d2..dc32df6c2 100644 --- a/app/src/main/res/layout/activity_details.xml +++ b/app/src/main/res/layout/activity_details.xml @@ -317,4 +317,13 @@ app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" tools:layout="@layout/sheet_chapters_pages" /> + + diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 3bb43556e..8b306ab21 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -9,6 +9,7 @@ #222222 #81C784 #E57373 + #C8000000 #191C1C diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1f6abee57..61c1d843c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -15,6 +15,7 @@ #1976D2 #424242 #99000000 + #C8FFFFFF #E65100 #FFFFFF #388E3C