Skip to content

[pull] master from gedoor:master #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Oct 30, 2024
Merged

[pull] master from gedoor:master #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class BookInfoEditActivity :

private fun initView() {
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, windowInsets ->
val typeMask = WindowInsetsCompat.Type.navigationBars() or WindowInsetsCompat.Type.ime()
val typeMask = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
val insets = windowInsets.getInsets(typeMask)
binding.root.bottomPadding = insets.bottom
windowInsets
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ abstract class BaseReadBookActivity :
upLayoutInDisplayCutoutMode()
super.onCreate(savedInstanceState)
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, windowInsets ->
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars())
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
binding.navigationBar.run {
layoutParams = layoutParams.apply { height = insets.bottom }
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ class ReadRssActivity : VMBaseActivity<ActivityRssReadBinding, ReadRssViewModel>

private fun initView() {
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, windowInsets ->
val typeMask = WindowInsetsCompat.Type.navigationBars() or WindowInsetsCompat.Type.ime()
val typeMask = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
val insets = windowInsets.getInsets(typeMask)
binding.root.bottomPadding = insets.bottom
windowInsets
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/legado/app/utils/ViewExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ fun View.applyStatusBarPadding(withInitialPadding: Boolean = false) {
fun View.applyNavigationBarPadding(withInitialPadding: Boolean = false) {
val initialPadding = if (withInitialPadding) bottomPadding else 0
ViewCompat.setOnApplyWindowInsetsListener(this) { _, windowInsets ->
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars())
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
bottomPadding = initialPadding + insets.bottom
windowInsets
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/legado/app/utils/WindowInsetsExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package io.legado.app.utils
import androidx.core.view.WindowInsetsCompat

val WindowInsetsCompat.navigationBarHeight
get() = getInsets(WindowInsetsCompat.Type.navigationBars()).bottom
get() = getInsets(WindowInsetsCompat.Type.systemBars()).bottom

val WindowInsetsCompat.imeHeight
get() = getInsets(WindowInsetsCompat.Type.ime()).bottom