From 275051ed308b4bfeb960bcf859248424579a1573 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 6 Oct 2023 16:37:55 -0400
Subject: [PATCH] Fixes visibility of the bottom and top bar when the user
 comes back to the app.

---
 .../amethyst/ui/screen/loggedIn/MainScreen.kt        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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 df6cec710..d767fe7fc 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
@@ -23,7 +23,6 @@ import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
@@ -265,7 +264,10 @@ fun MainScreen(
         }
     }
 
-    WatchNavStateToUpdateBarVisibility(navState, bottomBarOffsetHeightPx)
+    WatchNavStateToUpdateBarVisibility(navState) {
+        bottomBarOffsetHeightPx.value = 0f
+        shouldShow.value = true
+    }
 
     ModalNavigationDrawer(
         drawerState = drawerState,
@@ -393,16 +395,16 @@ private fun DisplayErrorMessages(accountViewModel: AccountViewModel) {
 }
 
 @Composable
-fun WatchNavStateToUpdateBarVisibility(navState: State<NavBackStackEntry?>, bottomBarOffsetHeightPx: MutableState<Float>) {
+fun WatchNavStateToUpdateBarVisibility(navState: State<NavBackStackEntry?>, onReset: () -> Unit) {
     LaunchedEffect(key1 = navState.value) {
-        bottomBarOffsetHeightPx.value = 0f
+        onReset()
     }
 
     val lifeCycleOwner = LocalLifecycleOwner.current
     DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
-                bottomBarOffsetHeightPx.value = 0f
+                onReset()
             }
         }