From f8448f02b6991a3d576b6a9a55ccd19d748b2298 Mon Sep 17 00:00:00 2001 From: "Tzouvaras, Stilianos" Date: Thu, 18 Jul 2024 22:03:16 +0300 Subject: [PATCH] Ui corrections for Pre-Auth Flow --- .../ui/document/code/DocumentOfferCodeScreen.kt | 9 +-------- .../src/main/res/drawable/ic_message.xml | 14 +++++++------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/issuance-feature/src/main/java/eu/europa/ec/issuancefeature/ui/document/code/DocumentOfferCodeScreen.kt b/issuance-feature/src/main/java/eu/europa/ec/issuancefeature/ui/document/code/DocumentOfferCodeScreen.kt index c3e4794e..6abbdffb 100644 --- a/issuance-feature/src/main/java/eu/europa/ec/issuancefeature/ui/document/code/DocumentOfferCodeScreen.kt +++ b/issuance-feature/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 index b03e6033..09fb70bf 100644 --- a/resources-logic/src/main/res/drawable/ic_message.xml +++ b/resources-logic/src/main/res/drawable/ic_message.xml @@ -15,11 +15,11 @@ --> - + android:width="80dp" + android:height="80dp" + android:viewportWidth="80" + android:viewportHeight="80"> +