From 3fa58778407a77d93fe232d709f27382dfd528bc Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Thu, 20 Jun 2024 17:39:20 -0400 Subject: [PATCH] Fixes formatting --- .../amethyst/ui/actions/relays/AllRelayListView.kt | 5 +++-- .../java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt | 4 +--- .../amethyst/ui/note/UpdateReactionTypeDialog.kt | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt index 2d4bdbf45..3db105155 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt @@ -27,7 +27,6 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme @@ -41,6 +40,7 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +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 @@ -113,7 +113,8 @@ fun AllRelayListView( Text( text = stringRes(R.string.relay_settings), style = MaterialTheme.typography.titleLarge, - modifier = Modifier.widthIn(max = 200.dp), + overflow = TextOverflow.Ellipsis, + maxLines = 1, ) SaveButton( diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt index ce5ff730e..e75103ce7 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt @@ -56,8 +56,6 @@ import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.CardDefaults import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ElevatedCard -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ProgressIndicatorDefaults @@ -1410,7 +1408,7 @@ private fun ActionableReactionButton( when (reactionType) { "+" -> { LikedIcon(modifier = thisModifier.size(16.dp), tint = Color.White) - + Text( text = removeSymbol, color = Color.White, diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateReactionTypeDialog.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateReactionTypeDialog.kt index bae00dcd3..ce474e245 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateReactionTypeDialog.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateReactionTypeDialog.kt @@ -299,7 +299,7 @@ private fun RenderReactionOption( when (reactionType) { "+" -> { LikedIcon(modifier = Modifier.size(16.dp), tint = MaterialTheme.colorScheme.onBackground) - + Text( text = " ✖", color = MaterialTheme.colorScheme.onBackground,