1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-02-20 05:49:57 +03:00

Update generator item spacing, remove vertical arrangement ()

This commit is contained in:
joshua-livefront 2023-11-28 18:48:00 -05:00 committed by Álison Fernandes
parent 3a17462ad8
commit f8f89a5903

View file

@ -2,11 +2,12 @@
package com.x8bit.bitwarden.ui.tools.feature.generator package com.x8bit.bitwarden.ui.tools.feature.generator
import androidx.compose.foundation.layout.Arrangement
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.Spacer
import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.foundation.layout.wrapContentWidth
@ -170,7 +171,6 @@ private fun ScrollContent(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
Column( Column(
verticalArrangement = Arrangement.spacedBy(16.dp),
modifier = modifier modifier = modifier
.fillMaxHeight() .fillMaxHeight()
.verticalScroll(rememberScrollState()), .verticalScroll(rememberScrollState()),
@ -182,12 +182,16 @@ private fun ScrollContent(
onRegenerateClick = onRegenerateClick, onRegenerateClick = onRegenerateClick,
) )
Spacer(modifier = Modifier.height(8.dp))
MainStateOptionsItem( MainStateOptionsItem(
selectedType = state.selectedType, selectedType = state.selectedType,
possibleMainStates = state.typeOptions, possibleMainStates = state.typeOptions,
onMainStateOptionClicked = onMainStateOptionClicked, onMainStateOptionClicked = onMainStateOptionClicked,
) )
Spacer(modifier = Modifier.height(16.dp))
BitwardenListHeaderText( BitwardenListHeaderText(
label = stringResource(id = R.string.options), label = stringResource(id = R.string.options),
modifier = Modifier modifier = Modifier
@ -195,6 +199,8 @@ private fun ScrollContent(
.padding(horizontal = 16.dp), .padding(horizontal = 16.dp),
) )
Spacer(modifier = Modifier.height(8.dp))
when (val selectedType = state.selectedType) { when (val selectedType = state.selectedType) {
is GeneratorState.MainType.Passcode -> { is GeneratorState.MainType.Passcode -> {
PasscodeTypeItems( PasscodeTypeItems(
@ -328,11 +334,16 @@ private fun PasswordTypeContent(
passwordTypeState: GeneratorState.MainType.Passcode.PasscodeType.Password, passwordTypeState: GeneratorState.MainType.Passcode.PasscodeType.Password,
passwordHandlers: PasswordHandlers, passwordHandlers: PasswordHandlers,
) { ) {
Spacer(modifier = Modifier.height(8.dp))
PasswordLengthSliderItem( PasswordLengthSliderItem(
length = passwordTypeState.length, length = passwordTypeState.length,
onPasswordSliderLengthChange = onPasswordSliderLengthChange =
passwordHandlers.onPasswordSliderLengthChange, passwordHandlers.onPasswordSliderLengthChange,
) )
Spacer(modifier = Modifier.height(8.dp))
Column( Column(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
) { ) {
@ -358,16 +369,25 @@ private fun PasswordTypeContent(
passwordHandlers.onPasswordToggleSpecialCharactersChange, passwordHandlers.onPasswordToggleSpecialCharactersChange,
) )
} }
Spacer(modifier = Modifier.height(8.dp))
PasswordMinNumbersCounterItem( PasswordMinNumbersCounterItem(
minNumbers = passwordTypeState.minNumbers, minNumbers = passwordTypeState.minNumbers,
onPasswordMinNumbersCounterChange = onPasswordMinNumbersCounterChange =
passwordHandlers.onPasswordMinNumbersCounterChange, passwordHandlers.onPasswordMinNumbersCounterChange,
) )
Spacer(modifier = Modifier.height(8.dp))
PasswordMinSpecialCharactersCounterItem( PasswordMinSpecialCharactersCounterItem(
minSpecial = passwordTypeState.minSpecial, minSpecial = passwordTypeState.minSpecial,
onPasswordMinSpecialCharactersChange = onPasswordMinSpecialCharactersChange =
passwordHandlers.onPasswordMinSpecialCharactersChange, passwordHandlers.onPasswordMinSpecialCharactersChange,
) )
Spacer(modifier = Modifier.height(16.dp))
PasswordAvoidAmbiguousCharsToggleItem( PasswordAvoidAmbiguousCharsToggleItem(
avoidAmbiguousChars = passwordTypeState.avoidAmbiguousChars, avoidAmbiguousChars = passwordTypeState.avoidAmbiguousChars,
onPasswordToggleAvoidAmbiguousCharsChange = onPasswordToggleAvoidAmbiguousCharsChange =
@ -544,16 +564,24 @@ private fun PassphraseTypeContent(
passphraseTypeState: GeneratorState.MainType.Passcode.PasscodeType.Passphrase, passphraseTypeState: GeneratorState.MainType.Passcode.PasscodeType.Passphrase,
passphraseHandlers: PassphraseHandlers, passphraseHandlers: PassphraseHandlers,
) { ) {
Spacer(modifier = Modifier.height(8.dp))
PassphraseNumWordsCounterItem( PassphraseNumWordsCounterItem(
numWords = passphraseTypeState.numWords, numWords = passphraseTypeState.numWords,
onPassphraseNumWordsCounterChange = onPassphraseNumWordsCounterChange =
passphraseHandlers.onPassphraseNumWordsCounterChange, passphraseHandlers.onPassphraseNumWordsCounterChange,
) )
Spacer(modifier = Modifier.height(8.dp))
PassphraseWordSeparatorInputItem( PassphraseWordSeparatorInputItem(
wordSeparator = passphraseTypeState.wordSeparator, wordSeparator = passphraseTypeState.wordSeparator,
onPassphraseWordSeparatorChange = onPassphraseWordSeparatorChange =
passphraseHandlers.onPassphraseWordSeparatorChange, passphraseHandlers.onPassphraseWordSeparatorChange,
) )
Spacer(modifier = Modifier.height(16.dp))
Column( Column(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
) { ) {