From e38db436ca69aaf9e90310583af3974083daa951 Mon Sep 17 00:00:00 2001 From: Claude Arseneault Date: Mon, 23 Sep 2024 13:30:11 -0400 Subject: [PATCH 1/3] =?UTF-8?q?Ajout=20du=20scrollView=20=C3=A0=20la=20pag?= =?UTF-8?q?e=20D=C3=A9faultNotification?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Claude Arseneault --- app/src/localization/en/index.ts | 15 ++--- app/src/localization/fr/index.ts | 13 +++-- app/src/screens/DefaultNotification.tsx | 77 +++++++++++++++---------- 3 files changed, 61 insertions(+), 44 deletions(-) diff --git a/app/src/localization/en/index.ts b/app/src/localization/en/index.ts index 749c07ba..a4572eb1 100644 --- a/app/src/localization/en/index.ts +++ b/app/src/localization/en/index.ts @@ -156,14 +156,15 @@ const translation = { ButtonTitle: 'Start', }, DefaultNotificationPage: { - Title: 'Demander son ANIG (EN)', + Title: 'Request your Authentication Attestation', Description: - "L'attestation numérique d'identité gouvernemental (ANIG) est une attestation qui vous permettra de vous identifier, en ligne et en personne, en partageant le minimum d'information nécessaire.(EN)", - SAGConnexion: 'Étape 1 - Connexion au SAG(EN)', - SAGConnexionDescription: 'Lorem ipsum dolor amet lorem ipsum dolor set amet lorem ipsum.(EN)', - ANIGAccept: "Étape 2 - Accepter l'offre d'attestation(EN)", - ANIGAcceptDescription: 'Lorem ipsum dolor amet lorem ipsum dolor set amet lorem ipsum.(EN)', - ButtonTitle: 'Recevoir mon attestation', + 'The Authentication Attestation is a attestation that will allow you to identify yourself more quickly with government services using the Government Authentication Service.', + SAGConnexion: 'Step 1 - Log in to the Government Authentication Service', + SAGConnexionDescription: 'You must authenticate yourself with the service.', + ANIGRequest: 'Step 2 - Request the attestation', + ANIGAcceptDescription: + 'From the account management, you will need to scan the QR code that will be presented to you.\r\n\r\nYou will then need to accept the certificate offer that will be proposed to you.', + ButtonTitle: 'Receive my attestation', }, Screens: { Splash: 'Splash', diff --git a/app/src/localization/fr/index.ts b/app/src/localization/fr/index.ts index 0baad7e7..2dbd5577 100644 --- a/app/src/localization/fr/index.ts +++ b/app/src/localization/fr/index.ts @@ -227,13 +227,14 @@ const translation = { ButtonTitle: 'Démarrer', }, DefaultNotificationPage: { - Title: 'Demander son ANIG', + Title: 'Demander son Attestation d’authentification', Description: - "L'attestation numérique d'identité gouvernemental (ANIG) est une attestation qui vous permettra de vous identifier, en ligne et en personne, en partageant le minimum d'information nécessaire.", - SAGConnexion: 'Étape 1 - Connexion au SAG', - SAGConnexionDescription: 'Lorem ipsum dolor amet lorem ipsum dolor set amet lorem ipsum.', - ANIGAccept: "Étape 2 - Accepter l'offre d'attestation", - ANIGAcceptDescription: 'Lorem ipsum dolor amet lorem ipsum dolor set amet lorem ipsum.', + 'L’Attestation d’authentification est une attestation qui vous permettra de vous identifier plus rapidement auprès des services gouvernementaux utilisant le Service d’authentification gouvernementale.', + SAGConnexion: 'Étape 1 - Connexion au Service d’authentication gouvernementale', + SAGConnexionDescription: 'Vous devez vous authentifier auprès du service.', + ANIGRequest: 'Étape 2 - Demander l’attestation', + ANIGAcceptDescription: + 'Depuis la gestion de compte, vous devrez balayer le code QR qui vous sera présenté.\r\n\r\nVous devrez ensuite accepter l’offre d’attestation qui vous sera proposée.', ButtonTitle: 'Recevoir mon attestation', }, StatusMessages: { diff --git a/app/src/screens/DefaultNotification.tsx b/app/src/screens/DefaultNotification.tsx index d3faf9f3..9762b457 100644 --- a/app/src/screens/DefaultNotification.tsx +++ b/app/src/screens/DefaultNotification.tsx @@ -8,9 +8,11 @@ import { } from '@hyperledger/aries-bifold-core' import { StackScreenProps } from '@react-navigation/stack' import { useTranslation } from 'react-i18next' -import { StyleSheet, Text, View } from 'react-native' +import { ScrollView, StyleSheet, Text, View } from 'react-native' import { SafeAreaView } from 'react-native-safe-area-context' +import HeaderText from '../components/HeaderText' + type DefaultProps = StackScreenProps const DefaultNotification: React.FC = () => { @@ -18,60 +20,73 @@ const DefaultNotification: React.FC = () => { const { t } = useTranslation() const styles = StyleSheet.create({ - pageContainer: { - flex: 1, + container: { + height: '100%', + padding: 20, backgroundColor: ColorPallet.brand.primaryBackground, }, + pageContainer: { + marginBottom: 20, + }, textHeaderTitle: { ...TextTheme.headingThree, flexShrink: 1, color: TextTheme.headingThree.color, }, textSectionTitle: { - ...TextTheme.headingFour, + ...TextTheme.title, flexShrink: 1, - color: TextTheme.headingFour.color, + color: TextTheme.bold.color, }, button: { margin: 15, + marginTop: 24, + marginBottom: 20, }, section: { - paddingVertical: 24, - paddingHorizontal: 25, + paddingVertical: 12, + paddingHorizontal: 10, }, sectionDescription: { ...TextTheme.normal, color: TextTheme.normal.color, textAlign: 'left', textDecorationLine: 'none', - paddingTop: 20, + paddingTop: 8, + }, + sectionDescriptionTitle: { + ...TextTheme.normal, + color: TextTheme.normal.color, + textAlign: 'left', + textDecorationLine: 'none', + paddingTop: 32, }, }) return ( - - - - {t('DefaultNotificationPage.Title')} - - {t('DefaultNotificationPage.Description')} - - - {t('DefaultNotificationPage.SAGConnexion')} - {t('DefaultNotificationPage.SAGConnexionDescription')} - - - {t('DefaultNotificationPage.ANIGAccept')} - {t('DefaultNotificationPage.ANIGAcceptDescription')} - - - - + + + + + {t('DefaultNotificationPage.Description')} + + + {t('DefaultNotificationPage.SAGConnexion')} + {t('DefaultNotificationPage.SAGConnexionDescription')} + + + {t('DefaultNotificationPage.ANIGRequest')} + {t('DefaultNotificationPage.ANIGAcceptDescription')} + + + + + ) } From 643558a868977eef563aa0875b5a056144b1fee2 Mon Sep 17 00:00:00 2001 From: Claude Arseneault Date: Mon, 23 Sep 2024 14:06:15 -0400 Subject: [PATCH 2/3] =?UTF-8?q?Ajout=20du=20scrollView=20=C3=A0=20la=20pag?= =?UTF-8?q?e=20D=C3=A9faultNotification?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Claude Arseneault --- app/src/screens/DefaultNotification.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/screens/DefaultNotification.tsx b/app/src/screens/DefaultNotification.tsx index 9762b457..7cbde8eb 100644 --- a/app/src/screens/DefaultNotification.tsx +++ b/app/src/screens/DefaultNotification.tsx @@ -64,11 +64,14 @@ const DefaultNotification: React.FC = () => { }) return ( - + {t('DefaultNotificationPage.Description')} + {t('DefaultNotificationPage.Description')} + {t('DefaultNotificationPage.Description')} + {t('DefaultNotificationPage.Description')} {t('DefaultNotificationPage.SAGConnexion')} From 6383f32a9a163e739b4698d6ce35c14951b1d1f5 Mon Sep 17 00:00:00 2001 From: Claude Arseneault Date: Tue, 24 Sep 2024 10:47:37 -0400 Subject: [PATCH 3/3] =?UTF-8?q?Ajout=20du=20boutton=20retour=20=C3=A0=20l'?= =?UTF-8?q?accueil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Claude Arseneault --- app/src/localization/en/index.ts | 1 + app/src/localization/fr/index.ts | 1 + app/src/screens/DefaultNotification.tsx | 49 ++++++++++++++----------- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/app/src/localization/en/index.ts b/app/src/localization/en/index.ts index a4572eb1..35f8585f 100644 --- a/app/src/localization/en/index.ts +++ b/app/src/localization/en/index.ts @@ -165,6 +165,7 @@ const translation = { ANIGAcceptDescription: 'From the account management, you will need to scan the QR code that will be presented to you.\r\n\r\nYou will then need to accept the certificate offer that will be proposed to you.', ButtonTitle: 'Receive my attestation', + ButtonHome: 'Return to home page', }, Screens: { Splash: 'Splash', diff --git a/app/src/localization/fr/index.ts b/app/src/localization/fr/index.ts index 2dbd5577..5896b2c5 100644 --- a/app/src/localization/fr/index.ts +++ b/app/src/localization/fr/index.ts @@ -236,6 +236,7 @@ const translation = { ANIGAcceptDescription: 'Depuis la gestion de compte, vous devrez balayer le code QR qui vous sera présenté.\r\n\r\nVous devrez ensuite accepter l’offre d’attestation qui vous sera proposée.', ButtonTitle: 'Recevoir mon attestation', + ButtonHome: 'Revenir à l’accueil', }, StatusMessages: { InitAgent: "Initialisation de l'agent ...", diff --git a/app/src/screens/DefaultNotification.tsx b/app/src/screens/DefaultNotification.tsx index 7cbde8eb..8b6b36dc 100644 --- a/app/src/screens/DefaultNotification.tsx +++ b/app/src/screens/DefaultNotification.tsx @@ -5,8 +5,11 @@ import { testIdWithKey, Screens, NotificationStackParams, + TabStacks, } from '@hyperledger/aries-bifold-core' -import { StackScreenProps } from '@react-navigation/stack' +import { HomeStackParams } from '@hyperledger/aries-bifold-core/App/types/navigators' +import { useNavigation } from '@react-navigation/native' +import { StackScreenProps, StackNavigationProp } from '@react-navigation/stack' import { useTranslation } from 'react-i18next' import { ScrollView, StyleSheet, Text, View } from 'react-native' import { SafeAreaView } from 'react-native-safe-area-context' @@ -18,15 +21,14 @@ type DefaultProps = StackScreenProps = () => { const { ColorPallet, TextTheme } = useTheme() const { t } = useTranslation() + const { navigate } = useNavigation>() const styles = StyleSheet.create({ container: { - height: '100%', + height: '77%', padding: 20, - backgroundColor: ColorPallet.brand.primaryBackground, - }, - pageContainer: { marginBottom: 20, + backgroundColor: ColorPallet.brand.primaryBackground, }, textHeaderTitle: { ...TextTheme.headingThree, @@ -39,13 +41,12 @@ const DefaultNotification: React.FC = () => { color: TextTheme.bold.color, }, button: { - margin: 15, - marginTop: 24, - marginBottom: 20, + margin: 20, + marginTop: 10, + marginBottom: 10, }, section: { paddingVertical: 12, - paddingHorizontal: 10, }, sectionDescription: { ...TextTheme.normal, @@ -64,14 +65,11 @@ const DefaultNotification: React.FC = () => { }) return ( - + {t('DefaultNotificationPage.Description')} - {t('DefaultNotificationPage.Description')} - {t('DefaultNotificationPage.Description')} - {t('DefaultNotificationPage.Description')} {t('DefaultNotificationPage.SAGConnexion')} @@ -81,15 +79,24 @@ const DefaultNotification: React.FC = () => { {t('DefaultNotificationPage.ANIGRequest')} {t('DefaultNotificationPage.ANIGAcceptDescription')} - - - + + + + + + ) }