NFC-83 Cert and Sign view improvements

Author: SanderKondratjevNortal

app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/WebEidScreen.kt

@@ -304,35 +304,11 @@ fun WebEidScreen(
             } else if (signRequest != null) {
                 val responseUri = signRequest.responseUri.lowercase()
                 val isCertificateFlow = responseUri.contains("/certificate") && !responseUri.contains("/signature")
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier.fillMaxWidth(),
-                ) {
-                    Text(
-                        text = stringResource(R.string.web_eid_certificate_consent_text),
-                        style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.8f),
-                        textAlign = TextAlign.Center,
-                        modifier = Modifier.padding(top = XSPadding),
-                    )
-                    Text(
-                        text = signRequest.origin.take(80),
-                        style = MaterialTheme.typography.labelSmall,
-                        color = MaterialTheme.colorScheme.onBackground,
-                        textAlign = TextAlign.Center,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                    Text(
-                        text =
-                            if (isCertificateFlow) {
-                                stringResource(R.string.web_eid_requests_certificate)
-                            } else {
-                                stringResource(R.string.web_eid_requests_signing)
-                            },
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onBackground,
-                        textAlign = TextAlign.Center,
+
+                if (!isWebEidAuthenticating) {
+                    WebEidSignOrCertificateInfo(
+                        origin = signRequest.origin,
+                        isCertificateFlow = isCertificateFlow,
                     )
                 }
 
@@ -372,6 +348,7 @@ fun WebEidScreen(
                         isSigning = false,
                         isDecrypting = false,
                         isWebEidAuthenticating = isWebEidAuthenticating,
+                        canNumberReadOnly = true,
                         onError = {
                             isWebEidAuthenticating = false
                             cancelWebEidSignAction()
@@ -486,7 +463,7 @@ private fun WebEidAuthInfo(authRequest: WebEidAuthRequest) {
         Spacer(modifier = Modifier.height(16.dp))
 
         Text(
-            text = stringResource(R.string.web_eid_auth_details_forwarded),
+            text = stringResource(R.string.web_eid_details_forwarded),
             style = MaterialTheme.typography.labelMedium,
             textAlign = TextAlign.Left,
         )
@@ -511,6 +488,64 @@ private fun WebEidAuthInfo(authRequest: WebEidAuthRequest) {
     }
 }
 
+@Composable
+private fun WebEidSignOrCertificateInfo(
+    origin: String,
+    isCertificateFlow: Boolean,
+) {
+    Column(
+        modifier = Modifier.fillMaxWidth(),
+    ) {
+        Text(
+            text =
+                if (isCertificateFlow) {
+                    stringResource(R.string.web_eid_cert_request_from)
+                } else {
+                    stringResource(R.string.web_eid_sign_request_from)
+                },
+            style = MaterialTheme.typography.labelMedium,
+            textAlign = TextAlign.Left,
+        )
+
+        Spacer(modifier = Modifier.height(2.dp))
+
+        Text(
+            text = origin.take(80),
+            style = MaterialTheme.typography.bodySmall,
+            fontWeight = FontWeight.Medium,
+            textAlign = TextAlign.Left,
+            maxLines = 2,
+            overflow = TextOverflow.Ellipsis,
+        )
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        Text(
+            text = stringResource(R.string.web_eid_details_forwarded),
+            style = MaterialTheme.typography.labelMedium,
+            textAlign = TextAlign.Left,
+        )
+
+        Spacer(modifier = Modifier.height(2.dp))
+
+        Text(
+            text = "NAME, PERSONAL IDENTIFICATION CODE",
+            style = MaterialTheme.typography.bodySmall,
+            textAlign = TextAlign.Left,
+        )
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        Text(
+            text = stringResource(R.string.web_eid_certificate_consent_text),
+            style = MaterialTheme.typography.bodySmall,
+            color = MaterialTheme.colorScheme.onBackground,
+            textAlign = TextAlign.Left,
+            modifier = Modifier.fillMaxWidth(),
+        )
+    }
+}
+
 @Composable
 private fun WebEidRememberMe(
     rememberMe: Boolean,

app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/NFCView.kt

@@ -166,6 +166,7 @@ fun NFCView(
     cancelWebEidSignAction: (() -> Unit) -> Unit = {},
     isAuthenticated: (Boolean, IdCardData) -> Unit,
     webEidViewModel: WebEidViewModel? = null,
+    canNumberReadOnly: Boolean = false,
 ) {
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
@@ -757,6 +758,8 @@ fun NFCView(
                                         )
                                 }
                             },
+                            readOnly = canNumberReadOnly,
+                            enabled = !canNumberReadOnly,
                             modifier =
                                 modifier
                                     .focusRequester(canNumberFocusRequester)
@@ -774,7 +777,7 @@ fun NFCView(
                                         contentDescription = canNumberLocationText
                                     }.testTag("signatureUpdateNFCCAN"),
                             trailingIcon = {
-                                if (!isTalkBackEnabled(context) && canNumber.text.isNotEmpty()) {
+                                if (!isTalkBackEnabled(context) && canNumber.text.isNotEmpty() && !canNumberReadOnly) {
                                     IconButton(onClick = {
                                         canNumber = TextFieldValue("")
                                     }) {

app/src/main/res/values-et/strings.xml

@@ -665,16 +665,15 @@
     <string name="web_eid_auth_no_payload">Autentimispäringut ei saadetud</string>
     <string name="web_eid_auth_consent_text">Autentides nõustun oma nime ja isikukoodi edastamisega teenusepakkujale.</string>
     <string name="web_eid_auth_request_from">Autentimispäring:</string>
-    <string name="web_eid_auth_details_forwarded">Edastatavad andmed:</string>
+    <string name="web_eid_details_forwarded">Edastatavad andmed:</string>
     <string name="web_eid_remember_me_message">Järgmisel kasutamisel on andmeväljad eeltäidetud.</string>
     <string name="web_eid_get_certificate">Kinnita</string>
     <string name="web_eid_certificate_title">Vali sertifikaat</string>
     <string name="web_eid_certificate_consent_text">Sertifikaati valides nõustun oma nime ja isikukoodi edastamisega teenusepakkujale.</string>
     <string name="web_eid_sign">Allkirjastamine</string>
     <string name="web_eid_sign_title">Allkirjasta ID-kaardiga</string>
-    <string name="web_eid_requests_authentication">soovib autentimist</string>
-    <string name="web_eid_requests_certificate">soovib sertifikaati</string>
-    <string name="web_eid_requests_signing">soovib allkirjastamist</string>
+    <string name="web_eid_cert_request_from">Sertifikaadipäring:</string>
+    <string name="web_eid_sign_request_from">Allirjastamispäring:</string>
     <string name="web_eid_ignore">Ignoreeri</string>
     <string name="web_eid_invalid_request_error">Vigane Web eID päring</string>
     <string name="web_eid_request_error">Päringu viga</string>

app/src/main/res/values/strings.xml

@@ -665,16 +665,15 @@
     <string name="web_eid_auth_no_payload">No auth payload received.</string>
     <string name="web_eid_auth_consent_text">By authenticating, I agree to the transfer of my name and personal identification code to the service provider.</string>
     <string name="web_eid_auth_request_from">Authentication request from:</string>
-    <string name="web_eid_auth_details_forwarded">Details forwarded:</string>
+    <string name="web_eid_details_forwarded">Details forwarded:</string>
     <string name="web_eid_remember_me_message">The entered data will be filled the next time you authenticate.</string>
     <string name="web_eid_get_certificate">Confirm</string>
     <string name="web_eid_certificate_title">Select a certificate</string>
     <string name="web_eid_certificate_consent_text">By choosing the certificate, I agree to the transfer of my name and personal identification code to the service provider.</string>
     <string name="web_eid_sign">Sign</string>
     <string name="web_eid_sign_title">Sign with ID-card</string>
-    <string name="web_eid_requests_authentication">requests authentication</string>
-    <string name="web_eid_requests_certificate">requests certificate</string>
-    <string name="web_eid_requests_signing">requests signing</string>
+    <string name="web_eid_cert_request_from">Certificate request from:</string>
+    <string name="web_eid_sign_request_from">Signing request from:</string>
     <string name="web_eid_ignore">Ignore</string>
     <string name="web_eid_invalid_request_error">Invalid Web eID request</string>
     <string name="web_eid_request_error">Request error</string>