Merge pull request #183 from niscy-eudiw/main

Fixed Pin Input duplicate results, fixed various ui issues after compose update
eu-digital-identity-wallet · Sep 13, 2024 · 4ddb186 · 4ddb186
2 parents 96bc4fa + dac16ea
commit 4ddb186
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/biometric/BiometricViewModel.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/biometric/BiometricViewModel.kt
@@ -178,6 +178,7 @@ class BiometricViewModel(
             }
 
             is Event.OnQuickPinEntered -> {
+                println("Stelios" + event.quickPin)
                 setState {
                     copy(quickPin = event.quickPin, quickPinError = null)
                 }

diff --git a/ui-logic/src/main/java/eu/europa/ec/uilogic/component/wrap/WrapExpandableCard.kt b/ui-logic/src/main/java/eu/europa/ec/uilogic/component/wrap/WrapExpandableCard.kt
@@ -28,6 +28,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import eu.europa.ec.resourceslogic.theme.values.backgroundDefault
 import eu.europa.ec.resourceslogic.theme.values.textPrimaryDark
 import eu.europa.ec.uilogic.component.preview.PreviewTheme
 import eu.europa.ec.uilogic.component.preview.ThemeModePreviews
@@ -52,7 +53,8 @@ fun WrapExpandableCard(
         onClick = onCardClick,
         throttleClicks = throttleClicks,
         colors = cardColors ?: CardDefaults.cardColors(
-            contentColor = MaterialTheme.colorScheme.textPrimaryDark
+            contentColor = MaterialTheme.colorScheme.textPrimaryDark,
+            containerColor = MaterialTheme.colorScheme.backgroundDefault
         ),
         enabled = enabled
     ) {

diff --git a/ui-logic/src/main/java/eu/europa/ec/uilogic/component/wrap/WrapModalBottomSheet.kt b/ui-logic/src/main/java/eu/europa/ec/uilogic/component/wrap/WrapModalBottomSheet.kt
@@ -21,6 +21,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
@@ -71,7 +72,8 @@ fun WrapModalBottomSheet(
         sheetState = sheetState,
         shape = shape,
         dragHandle = dragHandle,
-        content = sheetContent
+        content = sheetContent,
+        contentWindowInsets = { WindowInsets(0, 0, 0, 0) }
     )
 }
 

diff --git a/ui-logic/src/main/java/eu/europa/ec/uilogic/component/wrap/WrapPinTextField.kt b/ui-logic/src/main/java/eu/europa/ec/uilogic/component/wrap/WrapPinTextField.kt
@@ -186,7 +186,8 @@ fun WrapPinTextField(
 
                                 if (
                                     !newText.isDigitsOnly()
-                                    || (textFieldStateList.all { textField -> textField.value.isEmpty() }
+                                    || ((textFieldStateList.all { textField -> textField.value.isEmpty() }
+                                            || textFieldStateList.all { textField -> textField.value.isNotEmpty() })
                                             && currentTextField == fieldsRange.last
                                             && newText.isNotEmpty())
                                 ) {