mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

don't use Crossfade because it kinda breaks onCommit

pull/8/head
geeksville 2020-03-04 12:12:56 -08:00
rodzic fd17dcefe1
commit 80597bf48a
1 zmienionych plików z 19 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
Wyświetl plik

@ -2,7 +2,6 @@ package com.geeksville.mesh.ui
import androidx.compose.Composable import androidx.compose.Composable
import androidx.compose.state import androidx.compose.state
import androidx.ui.animation.Crossfade
import androidx.ui.core.ContextAmbient import androidx.ui.core.ContextAmbient
import androidx.ui.core.Text import androidx.ui.core.Text
import androidx.ui.layout.Column import androidx.ui.layout.Column
@ -124,7 +123,8 @@ fun previewView() {
@Composable @Composable
private fun AppContent(openDrawer: () -> Unit) { private fun AppContent(openDrawer: () -> Unit) {
Crossfade(AppStatus.currentScreen) { screen -> // crossfade breaks onCommit behavior because it keeps old views around
//Crossfade(AppStatus.currentScreen) { screen ->
Surface(color = (MaterialTheme.colors()).background) { Surface(color = (MaterialTheme.colors()).background) {
Column { Column {
@ -139,7 +139,7 @@ private fun AppContent(openDrawer: () -> Unit) {
} }
) )
when (screen) { when (AppStatus.currentScreen) {
Screen.messages -> MessagesContent() Screen.messages -> MessagesContent()
Screen.settings -> SettingsContent() Screen.settings -> SettingsContent()
Screen.users -> HomeContent() Screen.users -> HomeContent()
@ -148,5 +148,5 @@ private fun AppContent(openDrawer: () -> Unit) {
} }
} }
} }
} //}
} }