From ebbd95dac146f8851b8ca6259ee8bb12bf13201d Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 27 Jun 2024 00:08:31 +0930 Subject: [PATCH] Fix new message next button color --- .../securesms/conversation/start/newmessage/NewMessage.kt | 3 ++- .../java/org/thoughtcrime/securesms/ui/components/Button.kt | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt index 0f89b097c5..6afa5158bb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt @@ -33,6 +33,7 @@ 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.PrimaryOutlineButton import org.thoughtcrime.securesms.ui.components.SessionOutlinedTextField import org.thoughtcrime.securesms.ui.components.SessionTabRow import org.thoughtcrime.securesms.ui.contentDescription @@ -110,7 +111,7 @@ private fun EnterAccountId( Spacer(Modifier.weight(2f)) - OutlineButton( + PrimaryOutlineButton( modifier = Modifier .align(Alignment.CenterHorizontally) .padding(horizontal = LocalDimensions.current.largeMargin) 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 5784b22fbd..23aee8c011 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 @@ -129,6 +129,10 @@ fun Button( Button(text, onClick, ButtonType.Outline(LocalColors.current.primaryButtonFill), modifier, enabled) } +@Composable fun PrimaryOutlineButton(onClick: () -> Unit, modifier: Modifier = Modifier, enabled: Boolean = true, content: @Composable RowScope.() -> Unit) { + Button(onClick, ButtonType.Outline(LocalColors.current.primaryButtonFill), modifier, enabled, content = content) +} + @Composable fun SlimOutlineButton(onClick: () -> Unit, modifier: Modifier = Modifier, color: Color = LocalColors.current.text, enabled: Boolean = true, content: @Composable RowScope.() -> Unit) { Button(onClick, ButtonType.Outline(color), modifier, enabled, ButtonStyle.Slim, content = content) }