Navigator to survive config changes, collapsible footer inset

Author: jbsession

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/settings/ConversationSettingsNavHost.kt

@@ -155,7 +155,9 @@ fun ConversationSettingsNavHost(
 ){
     SharedTransitionLayout {
         val navController = rememberNavController()
-        val navigator: UINavigator<ConversationSettingsDestination> = remember { UINavigator() }
+
+        val navigatorHolder: ConversationSettingsNavigatorHolder = hiltViewModel()
+        val navigator: UINavigator<ConversationSettingsDestination> = navigatorHolder.navigator
 
         val handleBack: () -> Unit = {
             if (navController.previousBackStackEntry != null) {

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/settings/ConversationSettingsNavHostViewModel.kt

@@ -0,0 +1,11 @@
+package org.thoughtcrime.securesms.conversation.v2.settings
+
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import org.thoughtcrime.securesms.ui.UINavigator
+import javax.inject.Inject
+
+@HiltViewModel
+class ConversationSettingsNavigatorHolder @Inject constructor() : ViewModel() {
+    val navigator = UINavigator<ConversationSettingsDestination>()
+}

app/src/main/java/org/thoughtcrime/securesms/groups/compose/InviteContactsScreen.kt

@@ -121,7 +121,7 @@ fun InviteContacts(
             Box(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom))
+                    .windowInsetsPadding(WindowInsets.safeDrawing)
                     .imePadding()
             ) {
                 CollapsibleFooterAction(

app/src/main/java/org/thoughtcrime/securesms/groups/compose/ManageGroupAdminsScreen.kt

@@ -116,7 +116,7 @@ fun ManageAdmins(
             Box(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom))
+                    .windowInsetsPadding(WindowInsets.safeDrawing)
                     .imePadding()
             ) {
                 CollapsibleFooterAction(

app/src/main/java/org/thoughtcrime/securesms/groups/compose/ManageGroupMembersScreen.kt

@@ -134,7 +134,7 @@ fun ManageMembers(
             Box(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom))
+                    .windowInsetsPadding(WindowInsets.safeDrawing)
                     .imePadding()
             ) {
                 CollapsibleFooterAction(

app/src/main/java/org/thoughtcrime/securesms/groups/compose/PromoteMembersScreen.kt

@@ -116,7 +116,7 @@ fun PromoteMembers(
             Box(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom))
+                    .windowInsetsPadding(WindowInsets.safeDrawing)
                     .imePadding()
             ) {
                 CollapsibleFooterAction(