Limit width of landing screen buttons on tablets

Author: ovitrif

WordPress/src/jetpack/java/org/wordpress/android/ui/accounts/login/components/PrimaryButton.kt

@@ -8,6 +8,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -31,7 +32,7 @@ fun PrimaryButton(
                     contentColor = colorResource(R.color.text_color_jetpack_login_splash_primary_button),
             ),
             modifier = modifier
-                    .padding(horizontal = 20.dp)
+                    .padding(horizontal = dimensionResource(R.dimen.login_prologue_revamped_buttons_padding))
                     .padding(top = Margin.ExtraLarge.value)
                     .fillMaxWidth(),
     ) {

WordPress/src/jetpack/java/org/wordpress/android/ui/accounts/login/components/SecondaryButton.kt

@@ -9,6 +9,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -31,7 +32,7 @@ fun SecondaryButton(
                     backgroundColor = Color.Transparent,
             ),
             modifier = modifier
-                    .padding(horizontal = 20.dp)
+                    .padding(horizontal = dimensionResource(R.dimen.login_prologue_revamped_buttons_padding))
                     .padding(bottom = 60.dp)
                     .fillMaxWidth(),
     ) {

WordPress/src/main/res/values-w600dp/dimens.xml

@@ -12,4 +12,6 @@
     <dimen name="post_list_content_margin_standard">@dimen/content_margin_tablet</dimen>
     <dimen name="interests_content_margin">@dimen/margin_extra_extra_large</dimen>
 
+    <!-- Login Prologue -->
+    <dimen name="login_prologue_revamped_buttons_padding">@dimen/login_prologue_revamped_buttons_padding_tablet</dimen>
 </resources>

WordPress/src/main/res/values/dimens.xml

@@ -677,6 +677,8 @@
     <dimen name="login_prologue_content_area">320dp</dimen>
     <dimen name="login_prologue_background_circle_size">140dp</dimen>
     <dimen name="login_prologue_background_circle_size_large">160dp</dimen>
+    <dimen name="login_prologue_revamped_buttons_padding">32dp</dimen>
+    <dimen name="login_prologue_revamped_buttons_padding_tablet">250dp</dimen>
 
     <!-- edit text with chips view -->
     <dimen name="edit_text_with_chips_margin_top">5dp</dimen>

WordPress/src/wordpress/java/org/wordpress/android/ui/accounts/login/compose/components/PrimaryButton.kt

@@ -12,13 +12,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.font.FontWeight.Companion
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.wordpress.android.R.color
+import org.wordpress.android.R.dimen
 import org.wordpress.android.ui.compose.theme.AppTheme
 import org.wordpress.android.ui.compose.unit.Margin
 
@@ -46,7 +47,7 @@ fun PrimaryButton(
                     .fillMaxWidth()
                     .padding(
                             vertical = Margin.Small.value,
-                            horizontal = Margin.ExtraExtraMediumLarge.value,
+                            horizontal = dimensionResource(dimen.login_prologue_revamped_buttons_padding),
                     )
     ) {
         Text(
@@ -58,6 +59,7 @@ fun PrimaryButton(
         )
     }
 }
+
 @Preview(showBackground = true)
 @Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Composable

WordPress/src/wordpress/java/org/wordpress/android/ui/accounts/login/compose/components/SecondaryButton.kt

@@ -10,10 +10,12 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import org.wordpress.android.R.dimen
 import org.wordpress.android.ui.compose.theme.AppTheme
 import org.wordpress.android.ui.compose.unit.Margin
 
@@ -39,7 +41,7 @@ fun SecondaryButton(
                     .fillMaxWidth()
                     .padding(
                             vertical = Margin.Small.value,
-                            horizontal = Margin.ExtraExtraMediumLarge.value,
+                            horizontal = dimensionResource(dimen.login_prologue_revamped_buttons_padding),
                     )
     ) {
         Text(