From 5b0fc7982b86575ee5cad012fb346de63aaa45b4 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Mon, 23 Oct 2023 11:30:33 -0400 Subject: [PATCH] Moves Relay and User Metadata update buttons from Post to Save. --- .../com/vitorpamplona/amethyst/ui/actions/NewPostView.kt | 7 ++----- .../vitorpamplona/amethyst/ui/actions/NewRelayListView.kt | 5 ++--- .../amethyst/ui/actions/NewUserMetadataView.kt | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt index 15e14dd95..f308a72b4 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt @@ -1279,12 +1279,9 @@ fun PostButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Button( modifier = modifier, enabled = isActive, - onClick = { - onPost() - }, - shape = ButtonBorder + onClick = onPost ) { - Text(text = stringResource(R.string.post), color = Color.White) + Text(text = stringResource(R.string.post)) } } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt index 5b4317c78..c861c6bbe 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt @@ -103,8 +103,7 @@ fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, re title = { Row( modifier = Modifier - .fillMaxWidth() - .padding(end = 10.dp), + .fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically ) { @@ -122,7 +121,7 @@ fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, re Text(stringResource(R.string.default_relays)) } - PostButton( + SaveButton( onPost = { postViewModel.create() onClose() diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt index 08589e114..0fb372d12 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt @@ -72,7 +72,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) { onClose() }) - PostButton( + SaveButton( onPost = { postViewModel.create() onClose()