From 78264843206953d94575f765ba42878e6feceac4 Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Tue, 18 Jun 2024 14:55:41 +1000
Subject: [PATCH] Button in new message is not slim but the regular size

---
 .../conversation/newmessage/NewMessage.kt     |  4 +--
 .../securesms/ui/components/Button.kt         | 36 +++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/NewMessage.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/NewMessage.kt
index d262d818fd..065bf16cda 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/NewMessage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/NewMessage.kt
@@ -29,9 +29,9 @@ import org.thoughtcrime.securesms.ui.color.LocalColors
 import org.thoughtcrime.securesms.ui.components.AppBar
 import org.thoughtcrime.securesms.ui.components.BorderlessButtonWithIcon
 import org.thoughtcrime.securesms.ui.components.MaybeScanQrCode
+import org.thoughtcrime.securesms.ui.components.OutlineButton
 import org.thoughtcrime.securesms.ui.components.SessionOutlinedTextField
 import org.thoughtcrime.securesms.ui.components.SessionTabRow
-import org.thoughtcrime.securesms.ui.components.SlimOutlineButton
 import org.thoughtcrime.securesms.ui.contentDescription
 
 private val TITLES = listOf(R.string.enter_account_id, R.string.qrScan)
@@ -95,7 +95,7 @@ private fun EnterAccountId(
                 .fillMaxWidth(),
         ) { onHelp() }
 
-        SlimOutlineButton(
+        OutlineButton(
             modifier = Modifier
                 .align(Alignment.CenterHorizontally)
                 .padding(horizontal = LocalDimensions.current.marginLarge)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt
index 8a1994f9ae..9ac129c67f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.ui.components
 
 import androidx.annotation.DrawableRes
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.AnimatedVisibilityScope
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.BorderStroke
@@ -122,12 +123,23 @@ fun Button(
     Button(text, onClick, color, ButtonType.Outline, modifier, enabled)
 }
 
+@Composable fun OutlineButton(modifier: Modifier = Modifier, color: Color = LocalColors.current.buttonOutline, enabled: Boolean = true, onClick: () -> Unit, content: @Composable RowScope.() -> Unit) {
+    Button(
+        onClick = onClick,
+        color = color,
+        type = ButtonType.Outline,
+        modifier = modifier,
+        enabled = enabled,
+        content = content
+    )
+}
+
 @Composable fun PrimaryOutlineButton(text: String, modifier: Modifier = Modifier, enabled: Boolean = true, onClick: () -> Unit) {
     Button(text, onClick, LocalColors.current.primary, ButtonType.Outline, modifier, enabled)
 }
 
-@Composable fun SlimOutlineButton(onClick: () -> Unit, modifier: Modifier = Modifier, color: Color = LocalColors.current.text, enabled: Boolean = true, content: @Composable () -> Unit) {
-    Button(onClick, color, ButtonType.Outline, modifier, enabled, ButtonStyle.Slim) { content() }
+@Composable fun SlimOutlineButton(onClick: () -> Unit, modifier: Modifier = Modifier, color: Color = LocalColors.current.text, enabled: Boolean = true, content: @Composable RowScope.() -> Unit) {
+    Button(onClick, color, ButtonType.Outline, modifier, enabled, ButtonStyle.Slim, content = content)
 }
 
 /**
@@ -174,8 +186,8 @@ fun OutlineCopyButton(
 @Composable
 fun TemporaryClickedContent(
     interactionSource: MutableInteractionSource,
-    content: @Composable () -> Unit,
-    temporaryContent: @Composable () -> Unit,
+    content: @Composable AnimatedVisibilityScope.() -> Unit,
+    temporaryContent: @Composable AnimatedVisibilityScope.() -> Unit,
     temporaryDelay: Duration = 2.seconds
 ) {
     var clicked by remember { mutableStateOf(false) }
@@ -191,23 +203,18 @@ fun TemporaryClickedContent(
     // Using a Box because the Buttons add children in a Row
     // and they will jank as they are added and removed.
     Box(contentAlignment = Alignment.Center) {
-        AnimatedVisibility(!clicked, enter = fadeIn(), exit = fadeOut()) {
-            content()
-        }
-        AnimatedVisibility(clicked, enter = fadeIn(), exit = fadeOut()) {
-            temporaryContent()
-        }
+        AnimatedVisibility(!clicked, enter = fadeIn(), exit = fadeOut(), content = content)
+        AnimatedVisibility(clicked, enter = fadeIn(), exit = fadeOut(), content = temporaryContent)
     }
 }
 
-
 @Composable
 fun BorderlessButton(
     modifier: Modifier = Modifier,
     contentColor: Color = LocalColors.current.text,
     backgroundColor: Color = Color.Transparent,
     onClick: () -> Unit,
-    content: @Composable () -> Unit
+    content: @Composable RowScope.() -> Unit
 ) {
     TextButton(
         onClick = onClick,
@@ -215,8 +222,9 @@ fun BorderlessButton(
         colors = ButtonDefaults.outlinedButtonColors(
             contentColor = contentColor,
             backgroundColor = backgroundColor
-        )
-    ) { content() }
+        ),
+        content = content
+    )
 }
 
 @Composable