Merge pull request #1750 from vitorpamplona/claude/convert-dialog-to-route-9lrlG

Convert UpdateZapAmountDialog to full-screen navigation route

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt

@@ -109,6 +109,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.search.SearchScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.keyBackup.AccountBackupScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.AllSettingsScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.NIP47SetupScreen
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.UpdateZapAmountScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.SecurityFiltersScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.SettingsScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.UserSettingsScreen
@@ -175,6 +176,7 @@ fun AppNavigation(
             composableFromEnd<Route.Settings> { SettingsScreen(accountViewModel, nav) }
             composableFromEnd<Route.UserSettings> { UserSettingsScreen(accountViewModel, nav) }
             composableFromBottomArgs<Route.Nip47NWCSetup> { NIP47SetupScreen(accountViewModel, nav, it.nip47) }
+            composableFromBottomArgs<Route.UpdateZapAmount> { UpdateZapAmountScreen(accountViewModel, nav, it.nip47) }
             composableFromEndArgs<Route.EditRelays> { AllRelayListScreen(accountViewModel, nav) }
             composableFromEndArgs<Route.EditMediaServers> { AllMediaServersScreen(accountViewModel, nav) }
             composableFromBottom<Route.UpdateReactionType> { UpdateReactionTypeScreen(accountViewModel, nav) }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/routes/Routes.kt

@@ -121,6 +121,10 @@ sealed class Route {
         val nip47: String? = null,
     ) : Route()
 
+    @Serializable data class UpdateZapAmount(
+        val nip47: String? = null,
+    ) : Route()
+
     @Serializable data class Profile(
         val id: String,
     ) : Route()
@@ -358,6 +362,7 @@ fun getRouteWithArguments(navController: NavHostController): Route? {
         dest.hasRoute<Route.EditMediaServers>() -> entry.toRoute<Route.EditMediaServers>()
         dest.hasRoute<Route.UpdateReactionType>() -> entry.toRoute<Route.UpdateReactionType>()
         dest.hasRoute<Route.Nip47NWCSetup>() -> entry.toRoute<Route.Nip47NWCSetup>()
+        dest.hasRoute<Route.UpdateZapAmount>() -> entry.toRoute<Route.UpdateZapAmount>()
         dest.hasRoute<Route.Room>() -> entry.toRoute<Route.Room>()
         dest.hasRoute<Route.NewShortNote>() -> entry.toRoute<Route.NewShortNote>()
         dest.hasRoute<Route.VoiceReply>() -> entry.toRoute<Route.VoiceReply>()

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt

@@ -1030,7 +1030,6 @@ fun ZapReaction(
     nav: INav,
 ) {
     var wantsToZap by remember { mutableStateOf(false) }
-    var wantsToChangeZapAmount by remember { mutableStateOf(false) }
     var wantsToSetCustomZap by remember { mutableStateOf(false) }
 
     val context = LocalContext.current
@@ -1081,7 +1080,7 @@ fun ZapReaction(
                         )
                     }
                 },
-                onLongClick = { wantsToChangeZapAmount = true },
+                onLongClick = { nav.nav(Route.UpdateZapAmount()) },
                 onDoubleClick = { wantsToSetCustomZap = true },
             ),
     ) {
@@ -1098,7 +1097,7 @@ fun ZapReaction(
                 onChangeAmount = {
                     scope.launch {
                         wantsToZap = false
-                        wantsToChangeZapAmount = true
+                        nav.nav(Route.UpdateZapAmount())
                     }
                 },
                 onError = { _, message, user ->
@@ -1124,13 +1123,6 @@ fun ZapReaction(
             )
         }
 
-        if (wantsToChangeZapAmount) {
-            UpdateZapAmountDialog(
-                onClose = { wantsToChangeZapAmount = false },
-                accountViewModel = accountViewModel,
-            )
-        }
-
         if (wantsToSetCustomZap) {
             ZapCustomDialog(
                 onZapStarts = { zapStartingTime = TimeUtils.now() },

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt

@@ -57,7 +57,6 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -78,14 +77,9 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.components.TextSpinner
 import com.vitorpamplona.amethyst.ui.components.TitleExplainer
-import com.vitorpamplona.amethyst.ui.note.buttons.CloseButton
-import com.vitorpamplona.amethyst.ui.note.buttons.SaveButton
 import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.keyBackup.getFragmentActivity
@@ -99,70 +93,6 @@ import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
 import kotlinx.collections.immutable.toImmutableList
 
-@Composable
-fun UpdateZapAmountDialog(
-    onClose: () -> Unit,
-    nip47uri: String? = null,
-    accountViewModel: AccountViewModel,
-) {
-    val postViewModel: UpdateZapAmountViewModel = viewModel()
-    postViewModel.init(accountViewModel)
-
-    LaunchedEffect(accountViewModel, postViewModel) {
-        postViewModel.load()
-    }
-    UpdateZapAmountDialog(postViewModel, onClose, nip47uri, accountViewModel)
-}
-
-@Composable
-fun UpdateZapAmountDialog(
-    postViewModel: UpdateZapAmountViewModel,
-    onClose: () -> Unit,
-    nip47uri: String? = null,
-    accountViewModel: AccountViewModel,
-) {
-    Dialog(
-        onDismissRequest = { onClose() },
-        properties =
-            DialogProperties(
-                usePlatformDefaultWidth = false,
-                dismissOnClickOutside = false,
-                decorFitsSystemWindows = false,
-            ),
-    ) {
-        Surface(
-            modifier = Modifier.fillMaxWidth(),
-        ) {
-            Column {
-                Row(
-                    modifier = Modifier.fillMaxWidth().padding(10.dp),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    CloseButton(
-                        onPress = {
-                            postViewModel.cancel()
-                            onClose()
-                        },
-                    )
-
-                    SaveButton(
-                        onPost = {
-                            postViewModel.sendPost()
-                            onClose()
-                        },
-                        isActive = postViewModel.hasChanged(),
-                    )
-                }
-
-                Spacer(modifier = Modifier.height(10.dp))
-
-                UpdateZapAmountContent(postViewModel, onClose, nip47uri, accountViewModel)
-            }
-        }
-    }
-}
-
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun UpdateZapAmountContent(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AllSettingsScreen.kt

@@ -57,7 +57,6 @@ import com.vitorpamplona.amethyst.ui.navigation.navs.EmptyNav
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
 import com.vitorpamplona.amethyst.ui.navigation.topbars.TopBarWithBackButton
-import com.vitorpamplona.amethyst.ui.note.UpdateZapAmountDialog
 import com.vitorpamplona.amethyst.ui.painterRes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.mockAccountViewModel
@@ -82,15 +81,6 @@ fun AllSettingsScreen(
 ) {
     val tint = MaterialTheme.colorScheme.onBackground
 
-    var wantsToChangeZapAmount by remember { mutableStateOf(false) }
-
-    if (wantsToChangeZapAmount) {
-        UpdateZapAmountDialog(
-            onClose = { wantsToChangeZapAmount = false },
-            accountViewModel = accountViewModel,
-        )
-    }
-
     Scaffold(
         topBar = {
             TopBarWithBackButton(stringRes(id = R.string.settings), nav::popBack)
@@ -124,7 +114,7 @@ fun AllSettingsScreen(
                 title = R.string.zaps,
                 icon = Icons.Outlined.Bolt,
                 tint = tint,
-                onClick = { wantsToChangeZapAmount = true },
+                onClick = { nav.nav(Route.UpdateZapAmount()) },
             )
             HorizontalDivider()
             SettingsNavigationRow(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/UpdateZapAmountScreen.kt

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.ui.screen.loggedIn.settings
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.navigation.navs.INav
+import com.vitorpamplona.amethyst.ui.navigation.topbars.SavingTopBar
+import com.vitorpamplona.amethyst.ui.note.UpdateZapAmountContent
+import com.vitorpamplona.amethyst.ui.note.UpdateZapAmountViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun UpdateZapAmountScreen(
+    accountViewModel: AccountViewModel,
+    nav: INav,
+    nip47: String? = null,
+) {
+    val postViewModel: UpdateZapAmountViewModel = viewModel()
+    postViewModel.init(accountViewModel)
+
+    LaunchedEffect(accountViewModel, postViewModel) {
+        postViewModel.load()
+    }
+
+    UpdateZapAmountScreen(postViewModel, accountViewModel, nav, nip47)
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun UpdateZapAmountScreen(
+    postViewModel: UpdateZapAmountViewModel,
+    accountViewModel: AccountViewModel,
+    nav: INav,
+    nip47: String? = null,
+) {
+    Scaffold(
+        topBar = {
+            SavingTopBar(
+                titleRes = R.string.zaps,
+                isActive = postViewModel::hasChanged,
+                onCancel = {
+                    postViewModel.cancel()
+                    nav.popBack()
+                },
+                onPost = {
+                    postViewModel.sendPost()
+                    nav.popBack()
+                },
+            )
+        },
+    ) {
+        Column(Modifier.padding(it)) {
+            UpdateZapAmountContent(postViewModel, onClose = {
+                postViewModel.cancel()
+                nav.popBack()
+            }, nip47, accountViewModel)
+        }
+    }
+}