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 <surakin@gmail.com>
This commit is contained in:
Marco Antonio Alvarez 2024-01-11 18:30:10 +01:00
parent d76ee23514
commit 0d3ce695c7
4 changed files with 24 additions and 14 deletions

View file

@ -16,6 +16,7 @@
package io.element.android.features.login.impl.screens.loginpassword 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.Column
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.consumeWindowInsets 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.isWaitListError
import io.element.android.features.login.impl.error.loginError import io.element.android.features.login.impl.error.loginError
import io.element.android.libraries.architecture.AsyncData 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.atomic.molecules.IconTitleSubtitleMolecule
import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.components.button.BackButton
import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
@ -114,7 +116,7 @@ fun LoginPasswordView(
.padding(padding) .padding(padding)
.consumeWindowInsets(padding) .consumeWindowInsets(padding)
.verticalScroll(state = scrollState) .verticalScroll(state = scrollState)
.padding(horizontal = 16.dp), .padding(start = 20.dp, end = 20.dp, bottom = 20.dp),
) { ) {
// Title // Title
IconTitleSubtitleMolecule( IconTitleSubtitleMolecule(
@ -137,16 +139,23 @@ fun LoginPasswordView(
// Flexible spacing to keep the submit button at the bottom // Flexible spacing to keep the submit button at the bottom
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))
// Submit // Submit
Button( Box(
text = stringResource(CommonStrings.action_continue),
showProgress = isLoading,
onClick = ::submit,
enabled = state.submitEnabled || isLoading,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .padding(horizontal = 16.dp)
.testTag(TestTags.loginContinue) ) {
) ButtonColumnMolecule {
Spacer(modifier = Modifier.height(60.dp)) 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) { if (state.loginAction is AsyncData.Failure) {
when { when {

View file

@ -186,7 +186,7 @@ private fun OnBoardingButtons(
.fillMaxWidth() .fillMaxWidth()
) )
} }
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(48.dp))
} }
} }

View file

@ -68,7 +68,9 @@ fun HeaderFooterPage(
content() content()
} }
// Footer // Footer
footer() Box(modifier = Modifier.padding(horizontal = 16.dp)) {
footer()
}
} }
} }
} }

View file

@ -67,13 +67,12 @@ fun OnBoardingPage(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.systemBarsPadding() .systemBarsPadding()
.padding(vertical = 16.dp), .padding(all = 20.dp),
) { ) {
// Content // Content
Column( Column(
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
.padding(horizontal = 24.dp)
.fillMaxWidth(), .fillMaxWidth(),
horizontalAlignment = contentAlignment, horizontalAlignment = contentAlignment,
) { ) {