prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix window insets and search closing

Browse Source
This commit is contained in:
Koitharu
2025-07-09 21:38:51 +03:00
parent d0084e50e7
commit 37f9c4b9f6
3 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
View File

@@ -131,6 +131,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
onBackPressedDispatcher.addCallback(exitCallback) onBackPressedDispatcher.addCallback(exitCallback)
onBackPressedDispatcher.addCallback(navigationDelegate) onBackPressedDispatcher.addCallback(navigationDelegate)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
val legacySearchCallback = SearchViewLegacyBackCallback(viewBinding.searchView)
viewBinding.searchView.addTransitionListener(legacySearchCallback)
onBackPressedDispatcher.addCallback(legacySearchCallback)
}
if (savedInstanceState == null) { if (savedInstanceState == null) {
onFirstStart() onFirstStart()
} }

24
app/src/main/kotlin/org/koitharu/kotatsu/main/ui/SearchViewLegacyBackCallback.kt Normal file
View File

@@ -0,0 +1,24 @@
package org.koitharu.kotatsu.main.ui
import android.os.Build
import androidx.activity.OnBackPressedCallback
import androidx.annotation.DeprecatedSinceApi
import com.google.android.material.search.SearchView
@DeprecatedSinceApi(Build.VERSION_CODES.TIRAMISU)
class SearchViewLegacyBackCallback(
private val searchView: SearchView
) : OnBackPressedCallback(searchView.isShowing), SearchView.TransitionListener {
override fun handleOnBackPressed() {
searchView.hide()
}
override fun onStateChanged(
searchView: SearchView,
previousState: SearchView.TransitionState,
newState: SearchView.TransitionState
) {
isEnabled = newState >= SearchView.TransitionState.SHOWING
}
}

10
app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
View File

@@ -351,11 +351,11 @@ class ReaderActivity :
override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat { override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
gestureInsets = insets.getInsets(WindowInsetsCompat.Type.systemGestures()) gestureInsets = insets.getInsets(WindowInsetsCompat.Type.systemGestures())
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
viewBinding.appbarTop.updatePadding( viewBinding.toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
top = systemBars.top, topMargin = systemBars.top
right = systemBars.right, rightMargin = systemBars.right
left = systemBars.left, leftMargin = systemBars.left
) }
if (viewBinding.toolbarDocked != null) { if (viewBinding.toolbarDocked != null) {
viewBinding.actionsView.updateLayoutParams<ViewGroup.MarginLayoutParams> { viewBinding.actionsView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
bottomMargin = systemBars.bottom bottomMargin = systemBars.bottom