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

Wire up nav rail fabs and fix animation playing on leaving a tab.

Browse Source
This commit is contained in:
Alex Hart
2025-04-17 13:14:50 -03:00
committed by Cody Henthorne
parent 8b7b184224
commit c5e795b176
5 changed files with 170 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ import androidx.window.core.layout.WindowHeightSizeClass
import androidx.window.core.layout.WindowWidthSizeClass
import org.signal.core.ui.compose.Previews
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.main.MainFloatingActionButtonsCallback
import org.thoughtcrime.securesms.main.MainNavigationBar
import org.thoughtcrime.securesms.main.MainNavigationRail
import org.thoughtcrime.securesms.main.MainNavigationState
@@ -45,7 +46,16 @@ import org.thoughtcrime.securesms.util.RemoteConfig
enum class Navigation {
RAIL,
BAR
BAR;
companion object {
@Composable
fun rememberNavigation(): Navigation {
val windowSizeClass = WindowSizeClass.rememberWindowSizeClass()
return remember(windowSizeClass) { windowSizeClass.navigation }
}
}
}
/**
@@ -275,6 +285,7 @@ private fun AppScaffoldPreview() {
navRailContent = {
MainNavigationRail(
state = MainNavigationState(),
mainFloatingActionButtonsCallback = MainFloatingActionButtonsCallback.Empty,
onDestinationSelected = {}
)
},