Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Create pin : fix some spacing

Browse source
This commit is contained in:
ganfra 2023-10-19 22:23:19 +02:00
parent 1c1db6a444
commit 6dfba0f0c4
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/create/CreatePinView.kt
View file

@ -25,12 +25,16 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.BasicTextField
import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Lock import androidx.compose.material.icons.filled.Lock
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
@ -49,7 +53,6 @@ import io.element.android.features.lockscreen.impl.create.model.PinDigit
import io.element.android.features.lockscreen.impl.create.model.PinEntry import io.element.android.features.lockscreen.impl.create.model.PinEntry
import io.element.android.features.lockscreen.impl.create.validation.CreatePinFailure import io.element.android.features.lockscreen.impl.create.validation.CreatePinFailure
import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
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
import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.ElementPreview
@ -77,13 +80,18 @@ fun CreatePinView(
) )
}, },
content = { padding -> content = { padding ->
HeaderFooterPage( val scrollState = rememberScrollState()
Column(
modifier = Modifier modifier = Modifier
.imePadding()
.padding(padding) .padding(padding)
.consumeWindowInsets(padding), .consumeWindowInsets(padding)
header = { CreatePinHeader(state.isConfirmationStep, state.pinSize) }, .verticalScroll(state = scrollState)
content = { CreatePinContent(state) } .padding(vertical = 16.dp, horizontal = 20.dp),
) ) {
CreatePinHeader(state.isConfirmationStep, state.pinSize)
CreatePinContent(state)
}
} }
) )
} }
@ -99,7 +107,6 @@ private fun CreatePinHeader(
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
) { ) {
IconTitleSubtitleMolecule( IconTitleSubtitleMolecule(
modifier = Modifier.padding(top = 60.dp, bottom = 12.dp),
title = if (isValidationStep) { title = if (isValidationStep) {
stringResource(id = R.string.screen_app_lock_setup_confirm_pin) stringResource(id = R.string.screen_app_lock_setup_confirm_pin)
} else { } else {
@ -110,7 +117,7 @@ private fun CreatePinHeader(
) )
Text( Text(
text = stringResource(id = R.string.screen_app_lock_setup_pin_context_warning), text = stringResource(id = R.string.screen_app_lock_setup_pin_context_warning),
modifier = Modifier.padding(8.dp), modifier = Modifier.padding(top = 24.dp),
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
style = ElementTheme.typography.fontBodyMdRegular, style = ElementTheme.typography.fontBodyMdRegular,
color = MaterialTheme.colorScheme.secondary, color = MaterialTheme.colorScheme.secondary,