Merge pull request #1214 from greenart7c3/main

Move relay dialog to a route
vitorpamplona · Dec 9, 2024 · 95966e5 · 95966e5
2 parents 723979f + a93910f
commit 95966e5
Show file tree

Hide file tree

Showing 6 changed files with 179 additions and 167 deletions.
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt
@@ -37,6 +37,7 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.setValue
@@ -45,8 +46,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
@@ -66,20 +65,25 @@ import com.vitorpamplona.amethyst.ui.theme.grayText
 import com.vitorpamplona.ammolite.relays.Constants
 import com.vitorpamplona.ammolite.relays.RelayStat
 
+object RelayToAdd {
+    var relayToAdd: String = ""
+}
+
 @Composable
 fun AllRelayListView(
-    onClose: () -> Unit,
-    relayToAdd: String = "",
     accountViewModel: AccountViewModel,
     nav: INav,
 ) {
-    MappedAllRelayListView(onClose, relayToAdd, accountViewModel, rememberExtendedNav(nav, onClose))
+    DisposableEffect(Unit) {
+        onDispose { RelayToAdd.relayToAdd = "" }
+    }
+
+    MappedAllRelayListView(RelayToAdd.relayToAdd, accountViewModel, rememberExtendedNav(nav, {}))
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MappedAllRelayListView(
-    onClose: () -> Unit,
     relayToAdd: String = "",
     accountViewModel: AccountViewModel,
     newNav: INav,
@@ -113,154 +117,149 @@ fun MappedAllRelayListView(
         privateOutboxViewModel.load(accountViewModel.account)
     }
 
-    Dialog(
-        onDismissRequest = onClose,
-        properties = DialogProperties(usePlatformDefaultWidth = false),
-    ) {
-        Scaffold(
-            topBar = {
-                TopAppBar(
-                    title = {
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            Spacer(modifier = MinHorzSpacer)
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Spacer(modifier = MinHorzSpacer)
 
-                            Text(
-                                text = stringRes(R.string.relay_settings),
-                                modifier = Modifier.weight(1f),
-                                textAlign = TextAlign.Center,
-                                style = MaterialTheme.typography.titleLarge,
-                                overflow = TextOverflow.Ellipsis,
-                                maxLines = 1,
-                            )
+                        Text(
+                            text = stringRes(R.string.relay_settings),
+                            modifier = Modifier.weight(1f),
+                            textAlign = TextAlign.Center,
+                            style = MaterialTheme.typography.titleLarge,
+                            overflow = TextOverflow.Ellipsis,
+                            maxLines = 1,
+                        )
 
-                            SaveButton(
-                                onPost = {
-                                    kind3ViewModel.create()
-                                    dmViewModel.create()
-                                    nip65ViewModel.create()
-                                    searchViewModel.create()
-                                    localViewModel.create()
-                                    privateOutboxViewModel.create()
-                                    onClose()
-                                },
-                                true,
-                            )
-                        }
-                    },
-                    navigationIcon = {
-                        Row {
-                            Spacer(modifier = StdHorzSpacer)
-                            CloseButton(
-                                onPress = {
-                                    kind3ViewModel.clear()
-                                    dmViewModel.clear()
-                                    nip65ViewModel.clear()
-                                    searchViewModel.clear()
-                                    localViewModel.clear()
-                                    privateOutboxViewModel.clear()
-                                    onClose()
-                                },
-                            )
-                        }
+                        SaveButton(
+                            onPost = {
+                                kind3ViewModel.create()
+                                dmViewModel.create()
+                                nip65ViewModel.create()
+                                searchViewModel.create()
+                                localViewModel.create()
+                                privateOutboxViewModel.create()
+                                newNav.popBack()
+                            },
+                            true,
+                        )
+                    }
+                },
+                navigationIcon = {
+                    Row {
+                        Spacer(modifier = StdHorzSpacer)
+                        CloseButton(
+                            onPress = {
+                                kind3ViewModel.clear()
+                                dmViewModel.clear()
+                                nip65ViewModel.clear()
+                                searchViewModel.clear()
+                                localViewModel.clear()
+                                privateOutboxViewModel.clear()
+                                newNav.popBack()
+                            },
+                        )
+                    }
+                },
+                colors =
+                    TopAppBarDefaults.topAppBarColors(
+                        containerColor = MaterialTheme.colorScheme.surface,
+                    ),
+            )
+        },
+    ) { pad ->
+        LazyColumn(
+            contentPadding = FeedPadding,
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .padding(
+                        start = 10.dp,
+                        end = 10.dp,
+                        top = pad.calculateTopPadding(),
+                        bottom = pad.calculateBottomPadding(),
+                    ).consumeWindowInsets(pad),
+        ) {
+            item {
+                SettingsCategory(
+                    stringRes(R.string.public_home_section),
+                    stringRes(R.string.public_home_section_explainer),
+                    Modifier.padding(bottom = 8.dp),
+                )
+            }
+            renderNip65HomeItems(homeFeedState, nip65ViewModel, accountViewModel, newNav)
+
+            item {
+                SettingsCategory(
+                    stringRes(R.string.public_notif_section),
+                    stringRes(R.string.public_notif_section_explainer),
+                )
+            }
+            renderNip65NotifItems(notifFeedState, nip65ViewModel, accountViewModel, newNav)
+
+            item {
+                SettingsCategoryWithButton(
+                    stringRes(R.string.private_inbox_section),
+                    stringRes(R.string.private_inbox_section_explainer),
+                    action = {
+                        ResetDMRelays(dmViewModel)
                     },
-                    colors =
-                        TopAppBarDefaults.topAppBarColors(
-                            containerColor = MaterialTheme.colorScheme.surface,
-                        ),
                 )
-            },
-        ) { pad ->
-            LazyColumn(
-                contentPadding = FeedPadding,
-                modifier =
-                    Modifier
-                        .fillMaxSize()
-                        .padding(
-                            start = 10.dp,
-                            end = 10.dp,
-                            top = pad.calculateTopPadding(),
-                            bottom = pad.calculateBottomPadding(),
-                        ).consumeWindowInsets(pad),
-            ) {
-                item {
-                    SettingsCategory(
-                        stringRes(R.string.public_home_section),
-                        stringRes(R.string.public_home_section_explainer),
-                        Modifier.padding(bottom = 8.dp),
-                    )
-                }
-                renderNip65HomeItems(homeFeedState, nip65ViewModel, accountViewModel, newNav)
+            }
+            renderDMItems(dmFeedState, dmViewModel, accountViewModel, newNav)
 
-                item {
-                    SettingsCategory(
-                        stringRes(R.string.public_notif_section),
-                        stringRes(R.string.public_notif_section_explainer),
-                    )
-                }
-                renderNip65NotifItems(notifFeedState, nip65ViewModel, accountViewModel, newNav)
+            item {
+                SettingsCategory(
+                    stringRes(R.string.private_outbox_section),
+                    stringRes(R.string.private_outbox_section_explainer),
+                )
+            }
+            renderPrivateOutboxItems(privateOutboxFeedState, privateOutboxViewModel, accountViewModel, newNav)
 
-                item {
-                    SettingsCategoryWithButton(
-                        stringRes(R.string.private_inbox_section),
-                        stringRes(R.string.private_inbox_section_explainer),
-                        action = {
-                            ResetDMRelays(dmViewModel)
-                        },
-                    )
-                }
-                renderDMItems(dmFeedState, dmViewModel, accountViewModel, newNav)
+            item {
+                SettingsCategoryWithButton(
+                    stringRes(R.string.search_section),
+                    stringRes(R.string.search_section_explainer),
+                    action = {
+                        ResetSearchRelays(searchViewModel)
+                    },
+                )
+            }
+            renderSearchItems(searchFeedState, searchViewModel, accountViewModel, newNav)
 
-                item {
-                    SettingsCategory(
-                        stringRes(R.string.private_outbox_section),
-                        stringRes(R.string.private_outbox_section_explainer),
-                    )
-                }
-                renderPrivateOutboxItems(privateOutboxFeedState, privateOutboxViewModel, accountViewModel, newNav)
+            item {
+                SettingsCategory(
+                    stringRes(R.string.local_section),
+                    stringRes(R.string.local_section_explainer),
+                )
+            }
+            renderLocalItems(localFeedState, localViewModel, accountViewModel, newNav)
 
-                item {
-                    SettingsCategoryWithButton(
-                        stringRes(R.string.search_section),
-                        stringRes(R.string.search_section_explainer),
-                        action = {
-                            ResetSearchRelays(searchViewModel)
-                        },
-                    )
-                }
-                renderSearchItems(searchFeedState, searchViewModel, accountViewModel, newNav)
+            item {
+                SettingsCategoryWithButton(
+                    stringRes(R.string.kind_3_section),
+                    stringRes(R.string.kind_3_section_description),
+                    action = {
+                        ResetKind3Relays(kind3ViewModel)
+                    },
+                )
+            }
+            renderKind3Items(kind3FeedState, kind3ViewModel, accountViewModel, newNav, relayToAdd)
 
+            if (kind3Proposals.isNotEmpty()) {
                 item {
                     SettingsCategory(
-                        stringRes(R.string.local_section),
-                        stringRes(R.string.local_section_explainer),
-                    )
-                }
-                renderLocalItems(localFeedState, localViewModel, accountViewModel, newNav)
-
-                item {
-                    SettingsCategoryWithButton(
-                        stringRes(R.string.kind_3_section),
-                        stringRes(R.string.kind_3_section_description),
-                        action = {
-                            ResetKind3Relays(kind3ViewModel)
-                        },
+                        stringRes(R.string.kind_3_recommended_section),
+                        stringRes(R.string.kind_3_recommended_section_description),
                     )
                 }
-                renderKind3Items(kind3FeedState, kind3ViewModel, accountViewModel, newNav, relayToAdd)
-
-                if (kind3Proposals.isNotEmpty()) {
-                    item {
-                        SettingsCategory(
-                            stringRes(R.string.kind_3_recommended_section),
-                            stringRes(R.string.kind_3_recommended_section_description),
-                        )
-                    }
-                    renderKind3ProposalItems(kind3Proposals, kind3ViewModel, accountViewModel, newNav)
-                }
+                renderKind3ProposalItems(kind3Proposals, kind3ViewModel, accountViewModel, newNav)
             }
         }
     }

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt
@@ -49,6 +49,7 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.MainActivity
+import com.vitorpamplona.amethyst.ui.actions.relays.AllRelayListView
 import com.vitorpamplona.amethyst.ui.components.DisplayErrorMessages
 import com.vitorpamplona.amethyst.ui.components.DisplayNotifyMessages
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
@@ -320,6 +321,16 @@ fun AppNavigation(
                     nav = nav,
                 )
             }
+
+            composable(
+                Route.EditRelays.route,
+                content = {
+                    AllRelayListView(
+                        accountViewModel = accountViewModel,
+                        nav = nav,
+                    )
+                },
+            )
         }
     }
 

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt
@@ -89,7 +89,6 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.FeatureSetType
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.MediaServersListView
-import com.vitorpamplona.amethyst.ui.actions.relays.AllRelayListView
 import com.vitorpamplona.amethyst.ui.components.ClickableText
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
@@ -437,7 +436,6 @@ fun ListContent(
 ) {
     val route = remember(accountViewModel) { "User/${accountViewModel.userProfile().pubkeyHex}" }
 
-    var wantsToEditRelays by remember { mutableStateOf(false) }
     var editMediaServers by remember { mutableStateOf(false) }
 
     var backupDialogOpen by remember { mutableStateOf(false) }
@@ -475,7 +473,7 @@ fun ListContent(
             accountViewModel = accountViewModel,
             onClick = {
                 nav.closeDrawer()
-                wantsToEditRelays = true
+                nav.nav(Route.EditRelays.route)
             },
         )
 
@@ -537,9 +535,6 @@ fun ListContent(
         )
     }
 
-    if (wantsToEditRelays) {
-        AllRelayListView({ wantsToEditRelays = false }, accountViewModel = accountViewModel, nav = nav)
-    }
     if (editMediaServers) {
         MediaServersListView({ editMediaServers = false }, accountViewModel = accountViewModel, nav = nav)
     }