From 2c0d593ca6083d95cbffde991ba7aa0ab4777b7c Mon Sep 17 00:00:00 2001
From: Chris Smith <csmith@lunarian.uk>
Date: Thu, 1 Jun 2023 16:48:27 +0100
Subject: [PATCH] Outlined button tweaks

Force the height in InviteSummaryRow as compose defaults to a min
height of 40dp

Change the button text style to ignore font padding so the text
aligns properly
---
 .../invitelist/impl/components/InviteSummaryRow.kt     | 10 +++++-----
 .../libraries/designsystem/ElementTextStyles.kt        |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt
index 9b3ebaa4ec..abd6109094 100644
--- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt
+++ b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt
@@ -145,8 +145,8 @@ internal fun DefaultInviteSummaryRow(
                 OutlinedButton(
                     content = { Text(stringResource(StringR.string.action_decline), style = ElementTextStyles.Button) },
                     onClick = onDeclineClicked,
-                    modifier = Modifier.weight(1f),
-                    contentPadding = PaddingValues(horizontal = 24.dp, vertical = 7.dp),
+                    modifier = Modifier.weight(1f).heightIn(max = 36.dp),
+                    contentPadding = PaddingValues(horizontal = 24.dp, vertical = 0.dp),
                 )
 
                 Spacer(modifier = Modifier.width(12.dp))
@@ -154,8 +154,8 @@ internal fun DefaultInviteSummaryRow(
                 Button(
                     content = { Text(stringResource(StringR.string.action_accept), style = ElementTextStyles.Button) },
                     onClick = onAcceptClicked,
-                    modifier = Modifier.weight(1f),
-                    contentPadding = PaddingValues(horizontal = 24.dp, vertical = 7.dp),
+                    modifier = Modifier.weight(1f).heightIn(max = 36.dp),
+                    contentPadding = PaddingValues(horizontal = 24.dp, vertical = 0.dp),
                 )
             }
         }
@@ -175,7 +175,7 @@ internal fun DefaultInviteSummaryRow(
 private fun SenderRow(sender: InviteSender) {
     Row(
         horizontalArrangement = Arrangement.spacedBy(4.dp),
-        modifier = Modifier.padding(top = 12.dp),
+        modifier = Modifier.padding(top = 6.dp),
     ) {
         Avatar(
             avatarData = sender.avatarData.copy(size = AvatarSize.Custom(16.dp)),
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ElementTextStyles.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ElementTextStyles.kt
index 8623d0fb6b..ba4882d115 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ElementTextStyles.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ElementTextStyles.kt
@@ -16,6 +16,7 @@
 
 package io.element.android.libraries.designsystem
 
+import androidx.compose.ui.text.PlatformTextStyle
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -25,12 +26,14 @@ import androidx.compose.ui.unit.sp
 // TODO Remove
 object ElementTextStyles {
 
+    @Suppress("DEPRECATION")
     val Button = TextStyle(
         fontSize = 16.sp,
         fontWeight = FontWeight.Medium,
         lineHeight = 22.sp,
         fontStyle = FontStyle.Normal,
         textAlign = TextAlign.Center,
+        platformStyle = PlatformTextStyle(includeFontPadding = false)
     )
 
     object Bold {