From e42846313bebe1372ff6dc97f5cd10102a2bdbb6 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Wed, 31 Jan 2024 17:57:16 -0500 Subject: [PATCH] Move contentComposed to the end --- .../kotlin/com/slack/circuit/star/home/HomeScreen.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/samples/star/src/commonMain/kotlin/com/slack/circuit/star/home/HomeScreen.kt b/samples/star/src/commonMain/kotlin/com/slack/circuit/star/home/HomeScreen.kt index d7bf382d0..e1c9d37c1 100644 --- a/samples/star/src/commonMain/kotlin/com/slack/circuit/star/home/HomeScreen.kt +++ b/samples/star/src/commonMain/kotlin/com/slack/circuit/star/home/HomeScreen.kt @@ -15,9 +15,11 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveableStateHolder import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import com.slack.circuit.backstack.rememberSaveableBackStack import com.slack.circuit.codegen.annotations.CircuitInject import com.slack.circuit.foundation.CircuitContent import com.slack.circuit.foundation.NavEvent @@ -70,6 +72,7 @@ fun HomePresenter(navigator: Navigator): HomeScreen.State { @Composable fun HomeContent(state: HomeScreen.State, modifier: Modifier = Modifier) { var contentComposed by rememberRetained { mutableStateOf(false) } + Scaffold( modifier = modifier.fillMaxWidth(), contentWindowInsets = WindowInsets(0, 0, 0, 0), @@ -82,13 +85,13 @@ fun HomeContent(state: HomeScreen.State, modifier: Modifier = Modifier) { } }, ) { paddingValues -> - contentComposed = true val screen = state.navItems[state.selectedIndex].screen CircuitContent( screen, modifier = Modifier.padding(paddingValues), onNavEvent = { event -> state.eventSink(ChildNav(event)) }, ) + contentComposed = true } Platform.ReportDrawnWhen { contentComposed } }