From f6ad33b76ae91f2ff4483583fe496f1296b6ed10 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 25 Jan 2023 19:26:48 -0300 Subject: [PATCH] StateWithLifecycle seems to be the wrong option here. --- .../java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt | 3 ++- .../vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt index c39834823..6cfa471c4 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt @@ -3,13 +3,14 @@ package com.vitorpamplona.amethyst.ui.screen import androidx.compose.animation.Crossfade import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel @Composable fun AccountScreen(accountStateViewModel: AccountStateViewModel, startingPage: String?) { - val accountState by accountStateViewModel.accountContent.collectAsStateWithLifecycle() + val accountState by accountStateViewModel.accountContent.collectAsState() Column() { Crossfade(targetState = accountState) { state -> diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt index b13fd024e..d41aff9de 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt @@ -11,6 +11,7 @@ import androidx.compose.material.Scaffold import androidx.compose.material.rememberDrawerState import androidx.compose.material.rememberScaffoldState import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -57,7 +58,7 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun @Composable fun FloatingButton(navController: NavHostController, accountViewModel: AccountStateViewModel) { - val accountState by accountViewModel.accountContent.collectAsStateWithLifecycle() + val accountState by accountViewModel.accountContent.collectAsState() if (currentRoute(navController) == Route.Home.route) { Crossfade(targetState = accountState) { state ->