Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-19 08:09:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bottom chrome visibility in landscape split-screen with bottom nav.

Browse Source
This commit is contained in:
jeffrey-signal
2025-10-31 14:56:31 -04:00
parent 303c2ea14a
commit 84c713c2f7
4 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt
View File

@@ -52,13 +52,13 @@ import org.thoughtcrime.securesms.main.MainNavigationRail
import org.thoughtcrime.securesms.main.MainNavigationState
import kotlin.math.max
enum class Navigation {
enum class NavigationType {
RAIL,
BAR;
companion object {
@Composable
fun rememberNavigation(): Navigation {
fun rememberNavigationType(): NavigationType {
val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
return remember(windowSizeClass) {
@@ -246,7 +246,7 @@ private fun ListAndNavigation(
contentWindowInsets: WindowInsets,
modifier: Modifier = Modifier
) {
val navigation = Navigation.rememberNavigation()
val navigationType = NavigationType.rememberNavigationType()
Scaffold(
containerColor = Color.Transparent,
@@ -259,7 +259,7 @@ private fun ListAndNavigation(
modifier = Modifier
.padding(paddingValues)
) {
if (navigation == Navigation.RAIL) {
if (navigationType == NavigationType.RAIL) {
navRailContent()
}
@@ -268,7 +268,7 @@ private fun ListAndNavigation(
listContent()
}
if (navigation == Navigation.BAR) {
if (navigationType == NavigationType.BAR) {
bottomNavContent()
}
}