fix: join call button height not matching design (#2072)

Co-authored-by: Mohamad Jaara <mohamad.jaara@wire.com> Co-authored-by: Oussama Hassine <oussama.has100@gmail.com>
wireapp · Aug 9, 2023 · b741209 · b741209
1 parent 0e52509
commit b741209
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/controlbuttons/JoinButton.kt b/app/src/main/kotlin/com/wire/android/ui/calling/controlbuttons/JoinButton.kt
@@ -57,7 +57,6 @@ fun JoinButton(
         minHeight = minHeight,
         minWidth = minWidth,
         modifier = modifier.padding(
-            vertical = dimensions().spacing12x,
             horizontal = dimensions().spacing8x
         ),
         contentPadding = PaddingValues(

diff --git a/app/src/main/kotlin/com/wire/android/ui/debug/DebugDataOptions.kt b/app/src/main/kotlin/com/wire/android/ui/debug/DebugDataOptions.kt
@@ -45,6 +45,7 @@ import com.wire.android.ui.common.dimensions
 import com.wire.android.ui.home.conversationslist.common.FolderHeader
 import com.wire.android.ui.home.settings.SettingsItem
 import com.wire.android.ui.theme.wireColorScheme
+import com.wire.android.ui.theme.wireDimensions
 import com.wire.android.ui.theme.wireTypography
 import com.wire.android.util.getDeviceId
 import com.wire.android.util.getGitBuildId
@@ -264,6 +265,8 @@ private fun ManualMigrationOptions(
         },
         actions = {
             WirePrimaryButton(
+                minHeight = MaterialTheme.wireDimensions.buttonMinSize.height,
+                minWidth = MaterialTheme.wireDimensions.buttonMinSize.width,
                 onClick = onManualMigrationClicked,
                 text = stringResource(R.string.start_manual_migration),
                 fillMaxWidth = false
@@ -291,6 +294,8 @@ private fun DevelopmentApiVersioningOptions(
         },
         actions = {
             WirePrimaryButton(
+                minHeight = MaterialTheme.wireDimensions.buttonMinSize.height,
+                minWidth = MaterialTheme.wireDimensions.buttonMinSize.width,
                 onClick = onForceLatestDevelopmentApiChange,
                 text = stringResource(R.string.debug_settings_force_api_versioning_update_button_text),
                 fillMaxWidth = false

diff --git a/app/src/main/kotlin/com/wire/android/ui/theme/WireDimensions.kt b/app/src/main/kotlin/com/wire/android/ui/theme/WireDimensions.kt
@@ -91,6 +91,7 @@ data class WireDimensions(
     // Buttons
     val buttonMinSize: DpSize,
     val buttonSmallMinSize: DpSize,
+    val buttonMediumMinSize: DpSize,
     val buttonHorizontalContentPadding: Dp,
     val buttonVerticalContentPadding: Dp,
     val buttonCornerSize: Dp,
@@ -239,6 +240,7 @@ private val DefaultPhonePortraitWireDimensions: WireDimensions = WireDimensions(
     codeFieldItemHeight = 60.dp,
     buttonMinSize = DpSize(60.dp, 48.dp),
     buttonSmallMinSize = DpSize(40.dp, 32.dp),
+    buttonMediumMinSize = DpSize(32.dp, 51.dp),
     buttonHorizontalContentPadding = 16.dp,
     buttonVerticalContentPadding = 8.dp,
     buttonCornerSize = 12.dp,