From 0d3ce695c711188a1993f17c2d108bb273f39ada Mon Sep 17 00:00:00 2001 From: Marco Antonio Alvarez Date: Thu, 11 Jan 2024 18:30:10 +0100 Subject: [PATCH] Adjusted the login flow buttons a little bit They were slightly smaller on the onboarding page so I used that everywhere Signed-off-by: Marco Antonio Alvarez --- .../loginpassword/LoginPasswordView.kt | 29 ++++++++++++------- .../onboarding/impl/OnBoardingView.kt | 2 +- .../atomic/pages/HeaderFooterPage.kt | 4 ++- .../atomic/pages/OnBoardingPage.kt | 3 +- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt index 2a6a752154..2a5fbe8657 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt @@ -16,6 +16,7 @@ package io.element.android.features.login.impl.screens.loginpassword +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.consumeWindowInsets @@ -55,6 +56,7 @@ import io.element.android.features.login.impl.R import io.element.android.features.login.impl.error.isWaitListError import io.element.android.features.login.impl.error.loginError import io.element.android.libraries.architecture.AsyncData +import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog @@ -114,7 +116,7 @@ fun LoginPasswordView( .padding(padding) .consumeWindowInsets(padding) .verticalScroll(state = scrollState) - .padding(horizontal = 16.dp), + .padding(start = 20.dp, end = 20.dp, bottom = 20.dp), ) { // Title IconTitleSubtitleMolecule( @@ -137,16 +139,23 @@ fun LoginPasswordView( // Flexible spacing to keep the submit button at the bottom Spacer(modifier = Modifier.weight(1f)) // Submit - Button( - text = stringResource(CommonStrings.action_continue), - showProgress = isLoading, - onClick = ::submit, - enabled = state.submitEnabled || isLoading, + Box( modifier = Modifier - .fillMaxWidth() - .testTag(TestTags.loginContinue) - ) - Spacer(modifier = Modifier.height(60.dp)) + .padding(horizontal = 16.dp) + ) { + ButtonColumnMolecule { + Button( + text = stringResource(CommonStrings.action_continue), + showProgress = isLoading, + onClick = ::submit, + enabled = state.submitEnabled || isLoading, + modifier = Modifier + .fillMaxWidth() + .testTag(TestTags.loginContinue) + ) + Spacer(modifier = Modifier.height(48.dp)) + } + } if (state.loginAction is AsyncData.Failure) { when { diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt index a0d2e2ce7f..8ecef02b0e 100644 --- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt +++ b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt @@ -186,7 +186,7 @@ private fun OnBoardingButtons( .fillMaxWidth() ) } - Spacer(modifier = Modifier.height(16.dp)) + Spacer(modifier = Modifier.height(48.dp)) } } diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterPage.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterPage.kt index c08eb5149a..6b99537dc9 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterPage.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterPage.kt @@ -68,7 +68,9 @@ fun HeaderFooterPage( content() } // Footer - footer() + Box(modifier = Modifier.padding(horizontal = 16.dp)) { + footer() + } } } } diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/OnBoardingPage.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/OnBoardingPage.kt index 1b8aed72c2..9f028f5c5a 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/OnBoardingPage.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/OnBoardingPage.kt @@ -67,13 +67,12 @@ fun OnBoardingPage( modifier = Modifier .fillMaxSize() .systemBarsPadding() - .padding(vertical = 16.dp), + .padding(all = 20.dp), ) { // Content Column( modifier = Modifier .weight(1f) - .padding(horizontal = 24.dp) .fillMaxWidth(), horizontalAlignment = contentAlignment, ) {