From 80597bf48a1d1b860057f04e15194846397730c4 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Wed, 4 Mar 2020 12:12:56 -0800
Subject: [PATCH] don't use Crossfade because it kinda breaks onCommit

---
 .../java/com/geeksville/mesh/ui/MeshApp.kt    | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt b/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
index fdd0f905f..3ab6a3eaa 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
@@ -2,7 +2,6 @@ package com.geeksville.mesh.ui
 
 import androidx.compose.Composable
 import androidx.compose.state
-import androidx.ui.animation.Crossfade
 import androidx.ui.core.ContextAmbient
 import androidx.ui.core.Text
 import androidx.ui.layout.Column
@@ -124,29 +123,30 @@ fun previewView() {
 
 @Composable
 private fun AppContent(openDrawer: () -> Unit) {
-    Crossfade(AppStatus.currentScreen) { screen ->
-        Surface(color = (MaterialTheme.colors()).background) {
+    // crossfade breaks onCommit behavior because it keeps old views around
+    //Crossfade(AppStatus.currentScreen) { screen ->
+    Surface(color = (MaterialTheme.colors()).background) {
 
-            Column {
-                TopAppBar(
-                    title = { Text(text = "Meshtastic") },
-                    navigationIcon = {
-                        Container(LayoutSize(40.dp, 40.dp)) {
-                            VectorImageButton(R.drawable.ic_launcher_new_foreground) {
-                                openDrawer()
-                            }
+        Column {
+            TopAppBar(
+                title = { Text(text = "Meshtastic") },
+                navigationIcon = {
+                    Container(LayoutSize(40.dp, 40.dp)) {
+                        VectorImageButton(R.drawable.ic_launcher_new_foreground) {
+                            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()
             }
         }
     }
+    //}
 }