Skip to content

Commit

Permalink
UI updates to Proximity Sharing and issuance completion screens.
Browse files Browse the repository at this point in the history
Minor updates to the text and layout to bring them closer to the specs provided
by our UX designer.

In the case of the completion screen, the title used to mention scanning, but
many paths that reach the completion screen didn't scan anything, so I've
adjusted the text a bit.

Tested by:
- Manual testing.

Signed-off-by: Kevin Deus <[email protected]>
  • Loading branch information
kdeus committed Nov 20, 2024
1 parent 18d2b96 commit 0df1745
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<string name="consent_modal_bottom_sheet_button_cancel">Cancel</string>
<string name="consent_modal_bottom_sheet_button_more">More</string>
<string name="consent_modal_bottom_sheet_button_share">Share</string>
<string name="consent_modal_bottom_sheet_headline_share_with_known_requester">Share with %1$s</string>
<string name="consent_modal_bottom_sheet_headline_share_with_unknown_requester">Share with Unknown requester</string>
<string name="consent_modal_bottom_sheet_share_with_known_requester">The following information will be shared with %1$s:</string>
<string name="consent_modal_bottom_sheet_share_with_unknown_requester">The following information will be shared:</string>
<string name="consent_modal_bottom_sheet_share_and_stored_by_known_requester">The following information will be shared with and stored by %1$s:</string>
<string name="consent_modal_bottom_sheet_share_and_stored_by_unknown_requester">The following information will be shared with and stored by the requester:</string>
<string name="consent_modal_bottom_sheet_headline_share_with_known_requester">%1$s requests info from this document</string>
<string name="consent_modal_bottom_sheet_headline_share_with_unknown_requester">An unknown requester requests info from this document</string>
<string name="consent_modal_bottom_sheet_share_with_known_requester">According to %1$s, this info will be shared:</string>
<string name="consent_modal_bottom_sheet_share_with_unknown_requester">According to the requester, this info will be shared:</string>
<string name="consent_modal_bottom_sheet_share_and_stored_by_known_requester">According to %1$s, this info will be shared and stored:</string>
<string name="consent_modal_bottom_sheet_share_and_stored_by_unknown_requester">According to the requester, this info will be shared and stored:</string>
<string name="consent_modal_bottom_sheet_wallet_privacy_policy">The OWF Identity Credential Website describes how your data is being handled</string>
<string name="consent_modal_bottom_sheet_warning_verifier_not_in_trust_list">The verifier requesting this data is not in a trust list. Make sure you are comfortable sharing this data with them.</string>
<string name="consent_modal_bottom_sheet_card_art_description">Card Art</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.unit.dp
import com.android.identity.appsupport.ui.getOutlinedImageVector
Expand Down Expand Up @@ -188,7 +189,11 @@ private fun RelyingPartySection(relyingParty: ConsentRelyingParty) {
}
if (relyingParty.trustPoint.displayName != null) {
Text(
text = relyingParty.trustPoint.displayName!!,
text = stringResource(
Res.string.consent_modal_bottom_sheet_headline_share_with_known_requester,
relyingParty.trustPoint.displayName!!
),
textAlign = TextAlign.Center,
style = MaterialTheme.typography.titleLarge,
fontWeight = FontWeight.Bold,
)
Expand All @@ -199,12 +204,14 @@ private fun RelyingPartySection(relyingParty: ConsentRelyingParty) {
Res.string.consent_modal_bottom_sheet_headline_share_with_known_requester,
relyingParty.websiteOrigin
),
textAlign = TextAlign.Center,
style = MaterialTheme.typography.titleLarge,
fontWeight = FontWeight.Bold,
)
} else {
Text(
text = stringResource(Res.string.consent_modal_bottom_sheet_headline_share_with_unknown_requester),
textAlign = TextAlign.Center,
style = MaterialTheme.typography.titleLarge,
fontWeight = FontWeight.Bold,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ fun defaultGraph(
}
completionMessage(
id = "detailedMessage",
messageTitle = "Document Scanning Complete",
message = "Your application is now under ID issuer verification. This process might take a few hours.",
messageTitle = "Document Submission Complete",
message = "Your application is now being verified by the issuer. This process might take a few hours.",
assets = mapOf(),
acceptButtonText = "Done",
rejectButtonText = null
Expand Down
6 changes: 3 additions & 3 deletions server/src/main/resources/resources/generic/tos.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h2>Provisioning $ID_NAME credential</h2>
<p>In the following screens, information will be collected for provisioning of $ID_NAME
from $ISSUER_NAME.</p>
<p>The created $ID_NAME will be bound to this device.</p>
<p>In the following screens, information will be collected to provision <b>$ID_NAME</b>
from <b>$ISSUER_NAME</b>.</p>
<p>The created <b>$ID_NAME</b> will be bound to this device.</p>
34 changes: 17 additions & 17 deletions wallet/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@

<!-- Presentation screen -->
<string name="presentation_credential_usage_warning">Reused Credential</string>
<string name="presentation_biometric_prompt_title">Use your screen lock</string>
<string name="presentation_biometric_prompt_title">Verify it\'s you</string>
<string name="presentation_biometric_prompt_subtitle">Authentication is required to share this information</string>
<string name="presentation_lskf_warning_dismiss_btn">Ok</string>
<string name="presentation_lskf_warning_dialog_title">Unable to Present Document</string>
Expand Down Expand Up @@ -418,8 +418,8 @@
<img src=\'utopia_logo.png\' style=\'height: 150px; display: block; margin: auto\'
alt=\'State of Utopia Department of Motor Vehicles\'/>
<h2>Provisioning a Mobile Driving License (mDL)</h2>
<p>In the following screens, information will be collected for provisioning of a mDL.</p>
<p>The mDL can either contain hard-coded data for fictional person or
<p>In the following screens, information will be collected to provision an mDL.</p>
<p>The mDL can either contain hard-coded data for a fictional person or
data derived from the chip in an ePassport or eID document.</p>
<p>In this version of the application the mDL is generated and signed on-device. In future
versions the collected evidence will be conveyed securely and privately to an issuance
Expand All @@ -443,11 +443,11 @@
<img src=\'logo.png\' style=\'height: 150px; display: block; margin: auto\'
alt=\'State of Utopia Department of Motor Vehicles\'/>
<h2>Provisioning a Mobile Driving License (mDL)</h2>
<p>In the following screens, information will be collected for provisioning of a mDL.</p>
<p>The mDL can either contain hard-coded data for fictional person or
<p>In the following screens, information will be collected to provision an mDL.</p>
<p>The mDL can either contain hard-coded data for a fictional person or
data derived from the chip in an ePassport or eID document.</p>
<p>In this version of the Issuing Authority the mDL is generated and signed on-device.
In other versions the collected evidence are conveyed securely and privately to an issuance
In other versions the collected evidence is conveyed securely and privately to an issuance
server for evaluation and signing of the mDL.</p>
<p>The created mDL will be bound to this device.</p>
]]>
Expand All @@ -457,11 +457,11 @@
<img src=\'logo.png\' style=\'height: 150px; display: block; margin: auto\'
alt=\'State of Utopia Government\'/>
<h2>Provisioning a Personal ID (PID)</h2>
<p>In the following screens, information will be collected for provisioning of a PID.</p>
<p>The PID can either contain hard-coded data for fictional person or
<p>In the following screens, information will be collected to provision a PID.</p>
<p>The PID can either contain hard-coded data for a fictional person or
data derived from the chip in an ePassport or eID document.</p>
<p>In this version of the Issuing Authority the PID is generated and signed on-device.
In other versions the collected evidence are conveyed securely and privately to an issuance
In other versions the collected evidence is conveyed securely and privately to an issuance
server for evaluation and signing of the PID.</p>
<p>The created PID will be bound to this device.</p>
]]>
Expand All @@ -471,11 +471,11 @@
<img src=\'logo.png\' style=\'height: 150px; display: block; margin: auto\'
alt=\'State of Utopia Government\'/>
<h2>Provisioning a Photo ID</h2>
<p>In the following screens, information will be collected for provisioning of a Photo ID.</p>
<p>The Photo ID can either contain hard-coded data for fictional person or
<p>In the following screens, information will be collected to provision a Photo ID.</p>
<p>The Photo ID can either contain hard-coded data for a fictional person or
data derived from the chip in an ePassport or eID document.</p>
<p>In this version of the Issuing Authority the Photo ID is generated and signed on-device.
In other versions the collected evidence are conveyed securely and privately to an issuance
In other versions the collected evidence is conveyed securely and privately to an issuance
server for evaluation and signing of the Photo ID.</p>
<p>The created Photo ID will be bound to this device.</p>
]]>
Expand All @@ -488,7 +488,7 @@
![State of Utopia Central Registry seal](utopia_logo.png){
style=height:150px;display:block;margin:auto}\n\n
## Provisioning a Personal Information Document (PID)\n\n
In the following screens, information will be collected for provisioning of a PID.\n\n
In the following screens, information will be collected to provision a PID.\n\n
The PID can either contain hard-coded data for fictional person or
data derived from the chip in an ePassport or eID document.\n\n
In this version of the application the PID is generated and signed on-device. In future
Expand All @@ -514,7 +514,7 @@
<!-- Funke issuing authority TOS -->
<string name="funke_issuing_authority_tos"><![CDATA[
<h2>Provisioning a Personal Identification Data (PID) credential</h2>
<p>In the following screens, information will be collected for provisioning of a PID for
<p>In the following screens, information will be collected to provision a PID for
a fictional person used for testing only.</p>
<p>The PID is generated and signed on the government server. The created PID will be bound to
this device.</p>
Expand All @@ -523,9 +523,9 @@
<!-- Generic issuing authority TOS -->
<string name="generic_issuing_authority_tos"><![CDATA[
<h2>Provisioning $ID_NAME credential</h2>
<p>In the following screens, information will be collected for provisioning of $ID_NAME
from $ISSUER_NAME.</p>
<p>The created $ID_NAME will be bound to this device.</p>
<p>In the following screens, information will be collected to provision
<b>$ID_NAME</b> from <b>$ISSUER_NAME</b>.</p>
<p>The created <b>$ID_NAME</b> will be bound to this device.</p>
]]></string>

<!-- Credential Offer -->
Expand Down

0 comments on commit 0df1745

Please sign in to comment.