Skip to content

Fix moving textfield cursor, refactor textfields #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martenrebane wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix moving textfield cursor, refactor textfields #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
328 changes: 72 additions & 256 deletions app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/EncryptionServicesSettingsScreen.kt
View file
Open in desktop

Large diffs are not rendered by default.

346 changes: 86 additions & 260 deletions app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/ProxyServicesSettingsScreen.kt
View file
Open in desktop

Large diffs are not rendered by default.

104 changes: 20 additions & 84 deletions app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/ValidationServicesSettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,7 @@ import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.OutlinedTextFieldDefaults
import androidx.compose.material3.RadioButton
import androidx.compose.material3.Scaffold
import androidx.compose.material3.SnackbarHost
Expand All @@ -65,15 +61,11 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.heading
import androidx.compose.ui.semantics.semantics
Expand All @@ -88,6 +80,7 @@ import ee.ria.DigiDoc.R
import ee.ria.DigiDoc.network.siva.SivaSetting
import ee.ria.DigiDoc.ui.component.menu.SettingsMenuBottomSheet
import ee.ria.DigiDoc.ui.component.shared.InvisibleElement
import ee.ria.DigiDoc.ui.component.shared.PrimaryTextField
import ee.ria.DigiDoc.ui.component.shared.TopBar
import ee.ria.DigiDoc.ui.component.support.textFieldValueSaver
import ee.ria.DigiDoc.ui.theme.Dimensions.LPadding
Expand All @@ -96,7 +89,6 @@ import ee.ria.DigiDoc.ui.theme.Dimensions.XSBorder
import ee.ria.DigiDoc.ui.theme.Dimensions.XSPadding
import ee.ria.DigiDoc.ui.theme.buttonRoundedCornerShape
import ee.ria.DigiDoc.utils.Route
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.isTalkBackEnabled
import ee.ria.DigiDoc.utils.extensions.notAccessible
import ee.ria.DigiDoc.utils.snackbar.SnackBarManager
import ee.ria.DigiDoc.viewmodel.shared.SharedCertificateViewModel
Expand All @@ -105,7 +97,6 @@ import ee.ria.DigiDoc.viewmodel.shared.SharedSettingsViewModel
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Dispatchers.Main
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext

Expand Down Expand Up @@ -356,81 +347,26 @@ fun ValidationServicesSettingsScreen(
}

if (settingsSivaServiceChoice.value == SivaSetting.MANUAL.name) {
Spacer(modifier = modifier.height(LPadding))

Row(
PrimaryTextField(
modifier =
modifier
.fillMaxWidth(),
horizontalArrangement = Arrangement.Start,
verticalAlignment = Alignment.CenterVertically,
) {
OutlinedTextField(
enabled = settingsSivaServiceChoice.value == SivaSetting.MANUAL.name,
value = settingsSivaServiceUrl,
singleLine = true,
onValueChange = {
settingsSivaServiceUrl = it
setSettingsSivaUrl(it.text)
},
shape = RectangleShape,
label = { Text(stringResource(R.string.main_settings_siva_service_url)) },
modifier =
modifier
.focusRequester(focusRequester)
.weight(1f)
.fillMaxWidth()
.semantics {
testTagsAsResourceId = true
}.testTag("validationServicesComponentTextField"),
trailingIcon = {
if (!isTalkBackEnabled(context) && settingsSivaServiceUrl.text.isNotEmpty()) {
IconButton(onClick = {
settingsSivaServiceUrl = TextFieldValue("")
}) {
Icon(
imageVector = ImageVector.vectorResource(R.drawable.ic_icon_remove),
contentDescription = "$clearButtonText $buttonName",
)
}
}
},
colors =
OutlinedTextFieldDefaults.colors(
focusedBorderColor = MaterialTheme.colorScheme.primary,
unfocusedBorderColor = MaterialTheme.colorScheme.primary,
),
keyboardOptions =
KeyboardOptions.Default.copy(
imeAction = ImeAction.Done,
keyboardType = KeyboardType.Uri,
),
)

if (isTalkBackEnabled(context) && settingsSivaServiceUrl.text.isNotEmpty()) {
IconButton(onClick = {
settingsSivaServiceUrl = TextFieldValue("")
scope.launch(Main) {
focusRequester.requestFocus()
focusManager.clearFocus()
delay(200)
focusRequester.requestFocus()
}
}) {
Icon(
modifier =
modifier
.semantics {
testTagsAsResourceId = true
}.testTag("validationServicesRemoveIconButton"),
imageVector = ImageVector.vectorResource(R.drawable.ic_icon_remove),
contentDescription = "$clearButtonText $buttonName",
)
}
}
}

Spacer(modifier = modifier.height(SPadding))
Modifier
.padding(vertical = LPadding),
value = settingsSivaServiceUrl,
onValueChange = {
settingsSivaServiceUrl = it
setSettingsSivaUrl(it.text)
},
singleLine = true,
label = stringResource(R.string.main_settings_siva_service_url),
enabled = settingsSivaServiceChoice.value == SivaSetting.MANUAL.name,
keyboardOptions =
KeyboardOptions.Default.copy(
imeAction = ImeAction.Done,
keyboardType = KeyboardType.Uri,
),
testTag = "validationServicesComponentTextField",
removeIconTestTag = "validationServicesRemoveIconButton",
)

Text(
modifier =
Expand Down
59 changes: 32 additions & 27 deletions app/src/main/kotlin/ee/ria/DigiDoc/ui/component/myeid/pinandcertificate/MyEidPinScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
Expand Down Expand Up @@ -688,25 +687,22 @@ fun MyEidPinScreen(
testTagsAsResourceId = true
}.testTag("myEidCurrentPinTextField"),
pin = currentPinState,
pinCodeLabel = pinCodeLabel,
pinNumberFocusRequester = currentPinFocusRequester,
previousFocusRequester = pinChangeTitleFocusRequester,
label = pinCodeLabel,
focusRequester = currentPinFocusRequester,
// previousFocusRequester = pinChangeTitleFocusRequester,
pinCodeTextEdited = null,
trailingIconContentDescription = "$clearButtonText $buttonName",
// trailingIconContentDescription = "$clearButtonText $buttonName",
isError = !isCurrentPinValid,
keyboardImeAction = ImeAction.Next,
keyboardActions =
KeyboardActions(
onNext = {
if (isCurrentPinValid) {
showCurrentPinField.value = false
showNewRepeatPinField.value = false
showNewPinField.value = true
} else {
focusManager.clearFocus()
}
},
),
onDone = {
if (isCurrentPinValid) {
showCurrentPinField.value = false
showNewRepeatPinField.value = false
showNewPinField.value = true
} else {
focusManager.clearFocus()
}
},
)
if (isTalkBackEnabled(context) && currentPinState.value.isNotEmpty()) {
IconButton(
Expand Down Expand Up @@ -794,14 +790,23 @@ fun MyEidPinScreen(
testTagsAsResourceId = true
}.testTag("myEidNewPinTextField"),
pin = newPinState,
pinCodeLabel = pinCodeLabel,
pinNumberFocusRequester = newPinFocusRequester,
previousFocusRequester = newPinDescriptionFocusRequester,
label = pinCodeLabel,
focusRequester = newPinFocusRequester,
// previousFocusRequester = newPinDescriptionFocusRequester,
pinCodeTextEdited = null,
trailingIconContentDescription = "$clearButtonText $buttonName",
// trailingIconContentDescription = "$clearButtonText $buttonName",
isError = !isNewPinValid,
keyboardImeAction = ImeAction.Next,
keyboardActions =
onDone = {
if (isNewPinValid) {
showCurrentPinField.value = false
showNewPinField.value = false
showNewRepeatPinField.value = true
} else {
focusManager.clearFocus()
}
},
/*keyboardActions =
KeyboardActions(
onNext = {
if (isNewPinValid) {
Expand All @@ -812,7 +817,7 @@ fun MyEidPinScreen(
focusManager.clearFocus()
}
},
),
),*/
)
if (isTalkBackEnabled(context) && newPinState.value.isNotEmpty()) {
IconButton(
Expand Down Expand Up @@ -929,11 +934,11 @@ fun MyEidPinScreen(
testTagsAsResourceId = true
}.testTag("myEidNewPinRepeatedTextField"),
pin = newPinRepeatedState,
pinCodeLabel = pinCodeLabel,
pinNumberFocusRequester = newPinRepeatedFocusRequester,
previousFocusRequester = newPinRepeatedDescriptionFocusRequester,
label = pinCodeLabel,
focusRequester = newPinRepeatedFocusRequester,
// previousFocusRequester = newPinRepeatedDescriptionFocusRequester,
pinCodeTextEdited = null,
trailingIconContentDescription = "$clearButtonText $buttonName",
// trailingIconContentDescription = "$clearButtonText $buttonName",
isError = !isNewRepeatedPinValid,
)
if (isTalkBackEnabled(context) && newPinRepeatedState.value.isNotEmpty()) {
Expand Down
Loading
Loading