kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
don't use Crossfade because it kinda breaks onCommit
rodzic
fd17dcefe1
commit
80597bf48a
|
@ -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,29 +123,30 @@ 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
|
||||||
Surface(color = (MaterialTheme.colors()).background) {
|
//Crossfade(AppStatus.currentScreen) { screen ->
|
||||||
|
Surface(color = (MaterialTheme.colors()).background) {
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
title = { Text(text = "Meshtastic") },
|
title = { Text(text = "Meshtastic") },
|
||||||
navigationIcon = {
|
navigationIcon = {
|
||||||
Container(LayoutSize(40.dp, 40.dp)) {
|
Container(LayoutSize(40.dp, 40.dp)) {
|
||||||
VectorImageButton(R.drawable.ic_launcher_new_foreground) {
|
VectorImageButton(R.drawable.ic_launcher_new_foreground) {
|
||||||
openDrawer()
|
openDrawer()
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
)
|
|
||||||
|
|
||||||
when (screen) {
|
|
||||||
Screen.messages -> MessagesContent()
|
|
||||||
Screen.settings -> SettingsContent()
|
|
||||||
Screen.users -> HomeContent()
|
|
||||||
Screen.channel -> ChannelContent()
|
|
||||||
else -> TODO()
|
|
||||||
}
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
when (AppStatus.currentScreen) {
|
||||||
|
Screen.messages -> MessagesContent()
|
||||||
|
Screen.settings -> SettingsContent()
|
||||||
|
Screen.users -> HomeContent()
|
||||||
|
Screen.channel -> ChannelContent()
|
||||||
|
else -> TODO()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//}
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue