Merge pull request #1254 from greenart7c3/main

Move profile edit dialog to a screen

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataScreen.kt

@@ -0,0 +1,357 @@
+/**
+ * Copyright (c) 2024 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.actions
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Scaffold
+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.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.actions.uploads.SelectSingleFromGallery
+import com.vitorpamplona.amethyst.ui.navigation.INav
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.SaveButton
+import com.vitorpamplona.amethyst.ui.stringRes
+import com.vitorpamplona.amethyst.ui.theme.MinHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun NewUserMetadataScreen(
+    nav: INav,
+    accountViewModel: AccountViewModel,
+) {
+    val postViewModel: NewUserMetadataViewModel = viewModel()
+    val context = LocalContext.current
+
+    LaunchedEffect(Unit) {
+        postViewModel.load(accountViewModel.account)
+    }
+
+    DisposableEffect(Unit) {
+        onDispose {
+            postViewModel.clear()
+        }
+    }
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Spacer(modifier = MinHorzSpacer)
+
+                        Text(
+                            text = stringRes(R.string.profile),
+                            modifier = Modifier.weight(1f),
+                            textAlign = TextAlign.Center,
+                            style = MaterialTheme.typography.titleLarge,
+                            overflow = TextOverflow.Ellipsis,
+                            maxLines = 1,
+                        )
+
+                        SaveButton(
+                            onPost = {
+                                postViewModel.create()
+                                nav.popBack()
+                            },
+                            true,
+                        )
+                    }
+                },
+                navigationIcon = {
+                    Row {
+                        Spacer(modifier = StdHorzSpacer)
+                        CloseButton(
+                            onPress = {
+                                postViewModel.clear()
+                                nav.popBack()
+                            },
+                        )
+                    }
+                },
+                colors =
+                    TopAppBarDefaults.topAppBarColors(
+                        containerColor = MaterialTheme.colorScheme.surface,
+                    ),
+            )
+        },
+    ) { pad ->
+        Column(
+            modifier =
+                Modifier
+                    .padding(
+                        start = 10.dp,
+                        end = 10.dp,
+                        top = pad.calculateTopPadding(),
+                        bottom = pad.calculateBottomPadding(),
+                    ).consumeWindowInsets(pad)
+                    .imePadding(),
+        ) {
+            Column(
+                modifier = Modifier.padding(10.dp).verticalScroll(rememberScrollState()),
+            ) {
+                OutlinedTextField(
+                    label = { Text(text = stringRes(R.string.display_name)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.displayName.value,
+                    onValueChange = { postViewModel.displayName.value = it },
+                    placeholder = {
+                        Text(
+                            text = stringRes(R.string.my_display_name),
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                    keyboardOptions =
+                        KeyboardOptions.Default.copy(
+                            capitalization = KeyboardCapitalization.Sentences,
+                        ),
+                    singleLine = true,
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringRes(R.string.about_me)) },
+                    modifier = Modifier.fillMaxWidth().height(100.dp),
+                    value = postViewModel.about.value,
+                    onValueChange = { postViewModel.about.value = it },
+                    placeholder = {
+                        Text(
+                            text = stringRes(id = R.string.about_me),
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                    keyboardOptions =
+                        KeyboardOptions.Default.copy(
+                            capitalization = KeyboardCapitalization.Sentences,
+                        ),
+                    maxLines = 10,
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringRes(R.string.avatar_url)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.picture.value,
+                    onValueChange = { postViewModel.picture.value = it },
+                    placeholder = {
+                        Text(
+                            text = "https://mywebsite.com/me.jpg",
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                    leadingIcon = {
+                        SelectSingleFromGallery(
+                            isUploading = postViewModel.isUploadingImageForPicture,
+                            tint = MaterialTheme.colorScheme.placeholderText,
+                            modifier = Modifier.padding(start = 5.dp),
+                        ) {
+                            postViewModel.uploadForPicture(it, context, onError = accountViewModel::toast)
+                        }
+                    },
+                    singleLine = true,
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringRes(R.string.banner_url)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.banner.value,
+                    onValueChange = { postViewModel.banner.value = it },
+                    placeholder = {
+                        Text(
+                            text = "https://mywebsite.com/mybanner.jpg",
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                    leadingIcon = {
+                        SelectSingleFromGallery(
+                            isUploading = postViewModel.isUploadingImageForBanner,
+                            tint = MaterialTheme.colorScheme.placeholderText,
+                            modifier = Modifier.padding(start = 5.dp),
+                        ) {
+                            postViewModel.uploadForBanner(it, context, onError = accountViewModel::toast)
+                        }
+                    },
+                    singleLine = true,
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringRes(R.string.pronouns)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.pronouns.value,
+                    onValueChange = { postViewModel.pronouns.value = it },
+                    placeholder = {
+                        Text(
+                            text = "they/them, ...",
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                    singleLine = true,
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringRes(R.string.website_url)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.website.value,
+                    onValueChange = { postViewModel.website.value = it },
+                    placeholder = {
+                        Text(
+                            text = "https://mywebsite.com",
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                    singleLine = true,
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringRes(R.string.nip_05)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.nip05.value,
+                    onValueChange = { postViewModel.nip05.value = it },
+                    placeholder = {
+                        Text(
+                            text = "_@mywebsite.com",
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                    singleLine = true,
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+                OutlinedTextField(
+                    label = { Text(text = stringRes(R.string.ln_address)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.lnAddress.value,
+                    onValueChange = { postViewModel.lnAddress.value = it },
+                    placeholder = {
+                        Text(
+                            text = "me@mylightningnode.com",
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                    singleLine = true,
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringRes(R.string.ln_url_outdated)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.lnURL.value,
+                    onValueChange = { postViewModel.lnURL.value = it },
+                    placeholder = {
+                        Text(
+                            text = stringRes(R.string.lnurl),
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringRes(R.string.twitter)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.twitter.value,
+                    onValueChange = { postViewModel.twitter.value = it },
+                    placeholder = {
+                        Text(
+                            text = stringRes(R.string.twitter_proof_url_template),
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringRes(R.string.mastodon)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.mastodon.value,
+                    onValueChange = { postViewModel.mastodon.value = it },
+                    placeholder = {
+                        Text(
+                            text = stringRes(R.string.mastodon_proof_url_template),
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringRes(R.string.github)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.github.value,
+                    onValueChange = { postViewModel.github.value = it },
+                    placeholder = {
+                        Text(
+                            text = stringRes(R.string.github_proof_url_template),
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                )
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt

@@ -1,317 +0,0 @@
-/**
- * Copyright (c) 2024 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.actions
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.verticalScroll
-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
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.input.KeyboardCapitalization
-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.actions.uploads.SelectSingleFromGallery
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.SaveButton
-import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.amethyst.ui.theme.placeholderText
-
-@Composable
-fun NewUserMetadataView(
-    onClose: () -> Unit,
-    accountViewModel: AccountViewModel,
-) {
-    val postViewModel: NewUserMetadataViewModel = viewModel()
-    val context = LocalContext.current
-
-    LaunchedEffect(Unit) {
-        postViewModel.load(accountViewModel.account)
-    }
-
-    Dialog(
-        onDismissRequest = { onClose() },
-        properties =
-            DialogProperties(
-                usePlatformDefaultWidth = false,
-                dismissOnClickOutside = false,
-            ),
-    ) {
-        Surface {
-            Column(
-                modifier = Modifier.padding(10.dp),
-            ) {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    CloseButton(
-                        onPress = {
-                            postViewModel.clear()
-                            onClose()
-                        },
-                    )
-
-                    SaveButton(
-                        onPost = {
-                            postViewModel.create()
-                            onClose()
-                        },
-                        true,
-                    )
-                }
-
-                Column(
-                    modifier = Modifier.padding(10.dp).verticalScroll(rememberScrollState()),
-                ) {
-                    OutlinedTextField(
-                        label = { Text(text = stringRes(R.string.display_name)) },
-                        modifier = Modifier.fillMaxWidth(),
-                        value = postViewModel.displayName.value,
-                        onValueChange = { postViewModel.displayName.value = it },
-                        placeholder = {
-                            Text(
-                                text = stringRes(R.string.my_display_name),
-                                color = MaterialTheme.colorScheme.placeholderText,
-                            )
-                        },
-                        keyboardOptions =
-                            KeyboardOptions.Default.copy(
-                                capitalization = KeyboardCapitalization.Sentences,
-                            ),
-                        singleLine = true,
-                    )
-
-                    Spacer(modifier = Modifier.height(10.dp))
-
-                    OutlinedTextField(
-                        label = { Text(text = stringRes(R.string.about_me)) },
-                        modifier = Modifier.fillMaxWidth().height(100.dp),
-                        value = postViewModel.about.value,
-                        onValueChange = { postViewModel.about.value = it },
-                        placeholder = {
-                            Text(
-                                text = stringRes(id = R.string.about_me),
-                                color = MaterialTheme.colorScheme.placeholderText,
-                            )
-                        },
-                        keyboardOptions =
-                            KeyboardOptions.Default.copy(
-                                capitalization = KeyboardCapitalization.Sentences,
-                            ),
-                        maxLines = 10,
-                    )
-
-                    Spacer(modifier = Modifier.height(10.dp))
-
-                    OutlinedTextField(
-                        label = { Text(text = stringRes(R.string.avatar_url)) },
-                        modifier = Modifier.fillMaxWidth(),
-                        value = postViewModel.picture.value,
-                        onValueChange = { postViewModel.picture.value = it },
-                        placeholder = {
-                            Text(
-                                text = "https://mywebsite.com/me.jpg",
-                                color = MaterialTheme.colorScheme.placeholderText,
-                            )
-                        },
-                        leadingIcon = {
-                            SelectSingleFromGallery(
-                                isUploading = postViewModel.isUploadingImageForPicture,
-                                tint = MaterialTheme.colorScheme.placeholderText,
-                                modifier = Modifier.padding(start = 5.dp),
-                            ) {
-                                postViewModel.uploadForPicture(it, context, onError = accountViewModel::toast)
-                            }
-                        },
-                        singleLine = true,
-                    )
-
-                    Spacer(modifier = Modifier.height(10.dp))
-
-                    OutlinedTextField(
-                        label = { Text(text = stringRes(R.string.banner_url)) },
-                        modifier = Modifier.fillMaxWidth(),
-                        value = postViewModel.banner.value,
-                        onValueChange = { postViewModel.banner.value = it },
-                        placeholder = {
-                            Text(
-                                text = "https://mywebsite.com/mybanner.jpg",
-                                color = MaterialTheme.colorScheme.placeholderText,
-                            )
-                        },
-                        leadingIcon = {
-                            SelectSingleFromGallery(
-                                isUploading = postViewModel.isUploadingImageForBanner,
-                                tint = MaterialTheme.colorScheme.placeholderText,
-                                modifier = Modifier.padding(start = 5.dp),
-                            ) {
-                                postViewModel.uploadForBanner(it, context, onError = accountViewModel::toast)
-                            }
-                        },
-                        singleLine = true,
-                    )
-
-                    Spacer(modifier = Modifier.height(10.dp))
-
-                    OutlinedTextField(
-                        label = { Text(text = stringRes(R.string.pronouns)) },
-                        modifier = Modifier.fillMaxWidth(),
-                        value = postViewModel.pronouns.value,
-                        onValueChange = { postViewModel.pronouns.value = it },
-                        placeholder = {
-                            Text(
-                                text = "they/them, ...",
-                                color = MaterialTheme.colorScheme.placeholderText,
-                            )
-                        },
-                        singleLine = true,
-                    )
-
-                    Spacer(modifier = Modifier.height(10.dp))
-
-                    OutlinedTextField(
-                        label = { Text(text = stringRes(R.string.website_url)) },
-                        modifier = Modifier.fillMaxWidth(),
-                        value = postViewModel.website.value,
-                        onValueChange = { postViewModel.website.value = it },
-                        placeholder = {
-                            Text(
-                                text = "https://mywebsite.com",
-                                color = MaterialTheme.colorScheme.placeholderText,
-                            )
-                        },
-                        singleLine = true,
-                    )
-
-                    Spacer(modifier = Modifier.height(10.dp))
-
-                    OutlinedTextField(
-                        label = { Text(text = stringRes(R.string.nip_05)) },
-                        modifier = Modifier.fillMaxWidth(),
-                        value = postViewModel.nip05.value,
-                        onValueChange = { postViewModel.nip05.value = it },
-                        placeholder = {
-                            Text(
-                                text = "_@mywebsite.com",
-                                color = MaterialTheme.colorScheme.placeholderText,
-                            )
-                        },
-                        singleLine = true,
-                    )
-
-                    Spacer(modifier = Modifier.height(10.dp))
-                    OutlinedTextField(
-                        label = { Text(text = stringRes(R.string.ln_address)) },
-                        modifier = Modifier.fillMaxWidth(),
-                        value = postViewModel.lnAddress.value,
-                        onValueChange = { postViewModel.lnAddress.value = it },
-                        placeholder = {
-                            Text(
-                                text = "me@mylightningnode.com",
-                                color = MaterialTheme.colorScheme.placeholderText,
-                            )
-                        },
-                        singleLine = true,
-                    )
-
-                    Spacer(modifier = Modifier.height(10.dp))
-
-                    OutlinedTextField(
-                        label = { Text(text = stringRes(R.string.ln_url_outdated)) },
-                        modifier = Modifier.fillMaxWidth(),
-                        value = postViewModel.lnURL.value,
-                        onValueChange = { postViewModel.lnURL.value = it },
-                        placeholder = {
-                            Text(
-                                text = stringRes(R.string.lnurl),
-                                color = MaterialTheme.colorScheme.placeholderText,
-                            )
-                        },
-                    )
-
-                    Spacer(modifier = Modifier.height(10.dp))
-
-                    OutlinedTextField(
-                        label = { Text(text = stringRes(R.string.twitter)) },
-                        modifier = Modifier.fillMaxWidth(),
-                        value = postViewModel.twitter.value,
-                        onValueChange = { postViewModel.twitter.value = it },
-                        placeholder = {
-                            Text(
-                                text = stringRes(R.string.twitter_proof_url_template),
-                                color = MaterialTheme.colorScheme.placeholderText,
-                            )
-                        },
-                    )
-
-                    Spacer(modifier = Modifier.height(10.dp))
-
-                    OutlinedTextField(
-                        label = { Text(text = stringRes(R.string.mastodon)) },
-                        modifier = Modifier.fillMaxWidth(),
-                        value = postViewModel.mastodon.value,
-                        onValueChange = { postViewModel.mastodon.value = it },
-                        placeholder = {
-                            Text(
-                                text = stringRes(R.string.mastodon_proof_url_template),
-                                color = MaterialTheme.colorScheme.placeholderText,
-                            )
-                        },
-                    )
-
-                    Spacer(modifier = Modifier.height(10.dp))
-
-                    OutlinedTextField(
-                        label = { Text(text = stringRes(R.string.github)) },
-                        modifier = Modifier.fillMaxWidth(),
-                        value = postViewModel.github.value,
-                        onValueChange = { postViewModel.github.value = it },
-                        placeholder = {
-                            Text(
-                                text = stringRes(R.string.github_proof_url_template),
-                                color = MaterialTheme.colorScheme.placeholderText,
-                            )
-                        },
-                    )
-                }
-            }
-        }
-    }
-}

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.NewUserMetadataScreen
 import com.vitorpamplona.amethyst.ui.actions.relays.AllRelayListView
 import com.vitorpamplona.amethyst.ui.components.DisplayErrorMessages
 import com.vitorpamplona.amethyst.ui.components.DisplayNotifyMessages
@@ -113,6 +114,7 @@ fun AppNavigation(
             composable(Route.Video.route) { VideoScreen(accountViewModel, nav) }
             composable(Route.Discover.route) { DiscoverScreen(accountViewModel, nav) }
             composable(Route.Notification.route) { NotificationScreen(sharedPreferencesViewModel, accountViewModel, nav) }
+            composable(Route.EditProfile.route) { NewUserMetadataScreen(nav, accountViewModel) }
 
             composable(Route.Search.route) { SearchScreen(accountViewModel, nav) }
 

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

@@ -209,6 +209,12 @@ sealed class Route(
             icon = R.drawable.ic_settings,
         )
 
+    object EditProfile :
+        Route(
+            route = "EditProfile",
+            icon = R.drawable.ic_settings,
+        )
+
     object EditRelays :
         Route(
             route = "EditRelays?toAdd={toAdd}",

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt

@@ -125,7 +125,6 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.ui.actions.CrossfadeIfEnabled
 import com.vitorpamplona.amethyst.ui.actions.InformationDialog
-import com.vitorpamplona.amethyst.ui.actions.NewUserMetadataView
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.DisplayNip05ProfileStatus
 import com.vitorpamplona.amethyst.ui.components.InvoiceRequestCard
@@ -137,6 +136,7 @@ import com.vitorpamplona.amethyst.ui.dal.UserProfileReportsFeedFilter
 import com.vitorpamplona.amethyst.ui.feeds.FeedState
 import com.vitorpamplona.amethyst.ui.feeds.ScrollStateKeys
 import com.vitorpamplona.amethyst.ui.navigation.INav
+import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.navigation.routeToMessage
 import com.vitorpamplona.amethyst.ui.note.ClickableUserPicture
 import com.vitorpamplona.amethyst.ui.note.DrawPlayName
@@ -859,7 +859,7 @@ private fun ProfileHeader(
                 ) {
                     MessageButton(baseUser, accountViewModel, nav)
 
-                    ProfileActions(baseUser, accountViewModel)
+                    ProfileActions(baseUser, accountViewModel, nav)
                 }
             }
 
@@ -883,12 +883,13 @@ private fun ProfileHeader(
 private fun ProfileActions(
     baseUser: User,
     accountViewModel: AccountViewModel,
+    nav: INav,
 ) {
     val isMe by
         remember(accountViewModel) { derivedStateOf { accountViewModel.userProfile() == baseUser } }
 
     if (isMe) {
-        EditButton(accountViewModel)
+        EditButton(nav)
     }
 
     WatchIsHiddenUser(baseUser, accountViewModel) { isHidden ->
@@ -1844,14 +1845,8 @@ private fun MessageButton(
 }
 
 @Composable
-private fun EditButton(accountViewModel: AccountViewModel) {
+private fun EditButton(nav: INav) {
-    var wantsToEdit by remember { mutableStateOf(false) }
+    InnerEditButton { nav.nav(Route.EditProfile.route) }
-
-    if (wantsToEdit) {
-        NewUserMetadataView({ wantsToEdit = false }, accountViewModel)
-    }
-
-    InnerEditButton { wantsToEdit = true }
 }
 
 @Preview