Merge pull request #151 from niscy-eudiw/main

Ui corrections for Pre-Auth Flow
eu-digital-identity-wallet · Jul 18, 2024 · 30334bd · 30334bd
2 parents f017622 + f8448f0
commit 30334bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/...re/src/main/java/eu/europa/ec/issuancefeature/ui/document/code/DocumentOfferCodeScreen.kt b/...re/src/main/java/eu/europa/ec/issuancefeature/ui/document/code/DocumentOfferCodeScreen.kt
@@ -21,12 +21,10 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.unit.dp
@@ -53,7 +51,7 @@ fun DocumentOfferCodeScreen(
     ContentScreen(
         loadingType = state.isLoading,
         contentErrorConfig = state.error,
-        navigatableAction = ScreenNavigateAction.BACKABLE,
+        navigatableAction = ScreenNavigateAction.CANCELABLE,
         onBack = { viewModel.setEvent(Event.Pop) },
     ) { paddingValues ->
         Content(
@@ -78,10 +76,6 @@ private fun Content(
     onNavigationRequested: (Effect.Navigation) -> Unit,
     paddingValues: PaddingValues
 ) {
-
-    val configuration = LocalConfiguration.current
-    val messageIconSize = (configuration.screenWidthDp / 4).dp
-
     Column(
         modifier = Modifier
             .fillMaxSize()
@@ -93,7 +87,6 @@ private fun Content(
         )
 
         WrapIcon(
-            modifier = Modifier.size(messageIconSize),
             iconData = AppIcons.Message,
             customTint = MaterialTheme.colorScheme.primary
         )

diff --git a/resources-logic/src/main/res/drawable/ic_message.xml b/resources-logic/src/main/res/drawable/ic_message.xml
@@ -15,11 +15,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#2a5ed9"
-      android:pathData="M20,2A2,2 0,0 1,22 4V16A2,2 0,0 1,20 18H6L2,22V4C2,2.89 2.9,2 4,2H20M4,4V17.17L5.17,16H20V4H4M6,7H18V9H6V7M6,11H15V13H6V11Z"/>
+    android:width="80dp"
+    android:height="80dp"
+    android:viewportWidth="80"
+    android:viewportHeight="80">
+    <path
+        android:fillColor="#2A5ED9"
+        android:pathData="M79.96,8C79.96,3.6 76.4,0 72,0H8C3.6,0 0,3.6 0,8V56C0,60.4 3.6,64 8,64H64L80,80L79.96,8ZM64,48H16V40H64V48ZM64,36H16V28H64V36ZM64,24H16V16H64V24Z" />
 </vector>