Used retain for navigations, updated insets for debug and pro screens

Author: jbsession

app/src/main/java/org/thoughtcrime/securesms/debugmenu/DebugMenu.kt

@@ -11,11 +11,15 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.calculateEndPadding
+import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
@@ -46,6 +50,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.input.KeyboardType
@@ -121,7 +126,8 @@ fun DebugMenu(
         },
         snackbarHost = {
             SnackbarHost(hostState = snackbarHostState)
-        }
+        },
+        contentWindowInsets = WindowInsets.safeDrawing,
     ) { contentPadding ->
         // display a snackbar when required
         LaunchedEffect(uiState.snackMessage) {
@@ -173,13 +179,21 @@ fun DebugMenu(
             LoadingDialog(title = "Applying changes...")
         }
 
+        val layoutDirection = LocalLayoutDirection.current
+        val safeInsetsPadding = PaddingValues(
+            start = contentPadding.calculateStartPadding(layoutDirection) + LocalDimensions.current.spacing,
+            end = contentPadding.calculateEndPadding(layoutDirection) + LocalDimensions.current.spacing,
+            top = contentPadding.calculateTopPadding(),
+            bottom = contentPadding.calculateBottomPadding(),
+        )
+
         Column(
             modifier = Modifier
                 .background(LocalColors.current.background)
-                .padding(horizontal = LocalDimensions.current.spacing)
+                .padding(safeInsetsPadding)
                 .verticalScroll(rememberScrollState())
         ) {
-            Spacer(modifier = Modifier.height(contentPadding.calculateTopPadding()))
+            Spacer(modifier = Modifier.height(LocalDimensions.current.spacing))
 
             // Info pane
             val clipboardManager = LocalClipboardManager.current
@@ -284,7 +298,8 @@ fun DebugMenu(
                             style = LocalType.current.base
                         )
                         DropDown(
-                            modifier = Modifier.fillMaxWidth()
+                            modifier = Modifier
+                                .fillMaxWidth()
                                 .padding(top = LocalDimensions.current.xxsSpacing),
                             selectedText = uiState.selectedDebugSubscriptionStatus.label,
                             values = uiState.debugSubscriptionStatuses.map { it.label },
@@ -315,7 +330,8 @@ fun DebugMenu(
                     style = LocalType.current.base
                 )
                 DropDown(
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier
+                        .fillMaxWidth()
                         .padding(top = LocalDimensions.current.xxsSpacing),
                     selectedText = uiState.selectedDebugProPlanStatus.label,
                     values = uiState.debugProPlanStatus.map { it.label },

app/src/main/java/org/thoughtcrime/securesms/debugmenu/DebugMenuNavHost.kt

@@ -5,6 +5,7 @@ import android.os.Parcelable
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.retain.retain
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.compose.NavHost
@@ -40,7 +41,7 @@ fun DebugMenuNavHost(
     onBack: () -> Unit
 ){
     val navController = rememberNavController()
-    val navigator: UINavigator<DebugMenuDestination> = remember {
+    val navigator: UINavigator<DebugMenuDestination> = retain {
         UINavigator<DebugMenuDestination>()
     }
 

app/src/main/java/org/thoughtcrime/securesms/home/startconversation/StartConversationSheet.kt

@@ -23,6 +23,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.retain.retain
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -135,7 +136,7 @@ fun StartConversationNavHost(
 ){
     val navController = rememberNavController()
     val navigator: UINavigator<StartConversationDestination> =
-        remember { UINavigator() }
+        retain { UINavigator() }
 
     ObserveAsEvents(flow = navigator.navigationActions) { action ->
         when (action) {

app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsScreen.kt

@@ -542,7 +542,7 @@ fun Buttons(
 
         Cell {
             Column {
-                if(postPro){
+                if(!postPro){
                    ItemButton(
                         text = annotatedStringResource(
                             when (proDataState.type) {

app/src/main/java/org/thoughtcrime/securesms/preferences/prosettings/BaseProSettingsScreens.kt

@@ -12,10 +12,13 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.calculateEndPadding
+import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.widthIn
@@ -36,6 +39,7 @@ import androidx.compose.ui.Alignment.Companion.Center
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -103,20 +107,24 @@ fun BaseProSettingsScreen(
                     onBack = onBack,
                 )
             }} else {{}},
-        contentWindowInsets = WindowInsets.systemBars,
+        contentWindowInsets = WindowInsets.safeDrawing,
     ) { paddings ->
+
+        val layoutDirection = LocalLayoutDirection.current
+        val safeInsetsPadding = PaddingValues(
+            start = paddings.calculateStartPadding(layoutDirection) + LocalDimensions.current.spacing,
+            end = paddings.calculateEndPadding(layoutDirection)+ LocalDimensions.current.spacing,
+            top = (paddings.calculateTopPadding() - LocalDimensions.current.appBarHeight)
+                    .coerceAtLeast(0.dp) + 46.dp,
+            bottom = paddings.calculateBottomPadding() + LocalDimensions.current.spacing
+        )
+
         LazyColumn(
             modifier = Modifier
                 .fillMaxWidth()
                 .consumeWindowInsets(paddings),
             state = listState,
-            contentPadding = PaddingValues(
-                start = LocalDimensions.current.spacing,
-                end = LocalDimensions.current.spacing,
-                top = (paddings.calculateTopPadding() - LocalDimensions.current.appBarHeight)
-                    .coerceAtLeast(0.dp) + 46.dp,
-                bottom = paddings.calculateBottomPadding() + LocalDimensions.current.spacing
-            ),
+            contentPadding = safeInsetsPadding,
             horizontalAlignment = CenterHorizontally
         ) {
             item {

app/src/main/java/org/thoughtcrime/securesms/preferences/prosettings/ProSettingsNavHost.kt

@@ -7,6 +7,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.retain.retain
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.compose.NavHost
@@ -66,7 +67,7 @@ fun ProSettingsNavHost(
     onBack: () -> Unit
 ){
     val navController = rememberNavController()
-    val navigator: UINavigator<ProSettingsDestination> = remember {
+    val navigator: UINavigator<ProSettingsDestination> = retain {
         UINavigator<ProSettingsDestination>()
     }