From 49cf993e343b8cbb7e989d6bcde9aeaf2012eefb Mon Sep 17 00:00:00 2001
From: yostyle <y.pintas@gmail.com>
Date: Thu, 25 Apr 2024 11:38:23 +0200
Subject: [PATCH 1/4] style: update expired account screen

---
 .../src/main/res/values-fr/strings_tchap.xml     |  8 +++++---
 .../src/main/res/values/strings_tchap.xml        |  6 ++++--
 .../features/expired/ExpiredAccountActivity.kt   |  6 ++++--
 .../main/res/layout/activity_tchap_expired.xml   | 16 +++++++++++++---
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
index 7d15c1b9b6..d53f8a6785 100644
--- a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
+++ b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
@@ -68,10 +68,12 @@
     <string name="tchap_room_settings_room_access_by_link_share">Partager le lien</string>
 
     <!-- tchap account validity -->
-    <string name="tchap_expired_account_msg">La durée de validité de votre compte a expiré. Un e\u2011mail vous a été envoyé pour la renouveler. Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
-    <string name="tchap_expired_account_resume_button">J’ai renouvelé mon compte</string>
-    <string name="tchap_request_renewal_email_button">Demander l’envoi d’un nouvel email</string>
+    <string name="tchap_expired_account_title">Votre compte a expiré</string>
+    <string name="tchap_expired_account_msg">Un e\u2011mail vous a été envoyé pour \"Renouveler votre compte ${app_name}\". Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
+    <string name="tchap_expired_account_resume_button">Continuer</string>
+    <string name="tchap_request_renewal_email_button">Envoyer un nouvel email</string>
     <string name="tchap_expired_account_on_new_sent_email_msg">Un nouvel e\u2011mail vous a été envoyé pour renouveler la validité de votre compte. Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
+    <string name="tchap_expired_account_on_new_sent_email_title">Nouvel e\u2011mail envoyé</string>
 
     <!-- Login/Register Tchap -->
     <string name="tchap_has_account_no">Je n’ai pas\nde compte</string>
diff --git a/library/ui-strings/src/main/res/values/strings_tchap.xml b/library/ui-strings/src/main/res/values/strings_tchap.xml
index 099393bc84..a467fa20dc 100644
--- a/library/ui-strings/src/main/res/values/strings_tchap.xml
+++ b/library/ui-strings/src/main/res/values/strings_tchap.xml
@@ -68,10 +68,12 @@
     <string name="tchap_room_settings_room_access_by_link_share">Share the link</string>
 
     <!-- tchap account validity -->
-    <string name="tchap_expired_account_msg">The validity period of your account has expired. An email has been sent to you in order to renew it. Once you’ve followed the link it contains, click below.</string>
-    <string name="tchap_expired_account_resume_button">I renewed the validity of my account</string>
+    <string name="tchap_expired_account_title">Your account has expired</string>
+    <string name="tchap_expired_account_msg">An email has been sent to you in order \"to renew your ${app_name} account\". Once you’ve followed the link it contains, click below.</string>
+    <string name="tchap_expired_account_resume_button">Continue</string>
     <string name="tchap_request_renewal_email_button">Request a renewal email</string>
     <string name="tchap_expired_account_on_new_sent_email_msg">A new email has been sent to you in order to renew your account validity. Once you’ve followed the link it contains, click below.</string>
+    <string name="tchap_expired_account_on_new_sent_email_title">Email sent</string>
 
     <!-- Login/Register Tchap -->
     <string name="tchap_has_account_no">I do not have\nan account</string>
diff --git a/vector/src/main/java/fr/gouv/tchap/features/expired/ExpiredAccountActivity.kt b/vector/src/main/java/fr/gouv/tchap/features/expired/ExpiredAccountActivity.kt
index 178ea0317d..04742fb7df 100644
--- a/vector/src/main/java/fr/gouv/tchap/features/expired/ExpiredAccountActivity.kt
+++ b/vector/src/main/java/fr/gouv/tchap/features/expired/ExpiredAccountActivity.kt
@@ -65,10 +65,12 @@ class ExpiredAccountActivity : VectorBaseActivity<ActivityTchapExpiredBinding>()
     private fun renderState(state: ExpiredAccountViewState) {
         with(views) {
             if (state.isRenewalEmailSent) {
-                titleView.setText(R.string.tchap_expired_account_on_new_sent_email_msg)
+                titleView.setText(R.string.tchap_expired_account_on_new_sent_email_title)
+                msgView.setText(R.string.tchap_expired_account_on_new_sent_email_msg)
                 renewalEmailButton.isVisible = false
             } else {
-                titleView.setText(R.string.tchap_expired_account_msg)
+                titleView.setText(R.string.tchap_expired_account_title)
+                msgView.setText(R.string.tchap_expired_account_msg)
                 renewalEmailButton.isVisible = true
             }
         }
diff --git a/vector/src/main/res/layout/activity_tchap_expired.xml b/vector/src/main/res/layout/activity_tchap_expired.xml
index a3f89015db..552894eacf 100644
--- a/vector/src/main/res/layout/activity_tchap_expired.xml
+++ b/vector/src/main/res/layout/activity_tchap_expired.xml
@@ -18,9 +18,20 @@
 
             <TextView
                 android:id="@+id/titleView"
+                style="@style/Widget.Vector.TextView.Title.Medium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/tchap_expired_account_title"
+                android:textColor="?colorPrimary" />
+
+            <TextView
+                android:id="@+id/msgView"
                 style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="22dp"
+                android:layout_marginBottom="22dp"
                 android:gravity="start"
                 android:text="@string/tchap_expired_account_msg"
                 android:textColor="?vctr_content_primary" />
@@ -30,8 +41,7 @@
                 style="@style/Widget.Vector.Button.Text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="22dp"
+                android:layout_gravity="center_horizontal"
                 android:text="@string/tchap_expired_account_resume_button" />
 
             <Button
@@ -39,7 +49,7 @@
                 style="@style/Widget.Vector.Button.Text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end"
+                android:layout_gravity="center_horizontal"
                 android:text="@string/tchap_request_renewal_email_button" />
 
         </LinearLayout>

From 484a69dc61241d30e3e17f2dc5314728bed40637 Mon Sep 17 00:00:00 2001
From: yostyle <y.pintas@gmail.com>
Date: Thu, 25 Apr 2024 11:43:08 +0200
Subject: [PATCH 2/4] Add changelog

---
 changelog.d/1035.improvements | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1035.improvements

diff --git a/changelog.d/1035.improvements b/changelog.d/1035.improvements
new file mode 100644
index 0000000000..1f5e1af4cb
--- /dev/null
+++ b/changelog.d/1035.improvements
@@ -0,0 +1 @@
+Mise à jour de l'écran de compte expiré.
\ No newline at end of file

From cb20c8dd06252b763b362cb41c4ed45e9f30cdbc Mon Sep 17 00:00:00 2001
From: yostyle <y.pintas@gmail.com>
Date: Thu, 25 Apr 2024 11:57:19 +0200
Subject: [PATCH 3/4] style: update wording

---
 library/ui-strings/src/main/res/values-fr/strings_tchap.xml | 2 +-
 library/ui-strings/src/main/res/values/strings_tchap.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
index d53f8a6785..e046b3a25d 100644
--- a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
+++ b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
@@ -72,7 +72,7 @@
     <string name="tchap_expired_account_msg">Un e\u2011mail vous a été envoyé pour \"Renouveler votre compte ${app_name}\". Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
     <string name="tchap_expired_account_resume_button">Continuer</string>
     <string name="tchap_request_renewal_email_button">Envoyer un nouvel email</string>
-    <string name="tchap_expired_account_on_new_sent_email_msg">Un nouvel e\u2011mail vous a été envoyé pour renouveler la validité de votre compte. Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
+    <string name="tchap_expired_account_on_new_sent_email_msg">Un nouvel e\u2011mail vous a été envoyé pour \"Renouveler votre compte ${app_name}\". Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
     <string name="tchap_expired_account_on_new_sent_email_title">Nouvel e\u2011mail envoyé</string>
 
     <!-- Login/Register Tchap -->
diff --git a/library/ui-strings/src/main/res/values/strings_tchap.xml b/library/ui-strings/src/main/res/values/strings_tchap.xml
index a467fa20dc..ef6aa6dbf0 100644
--- a/library/ui-strings/src/main/res/values/strings_tchap.xml
+++ b/library/ui-strings/src/main/res/values/strings_tchap.xml
@@ -72,7 +72,7 @@
     <string name="tchap_expired_account_msg">An email has been sent to you in order \"to renew your ${app_name} account\". Once you’ve followed the link it contains, click below.</string>
     <string name="tchap_expired_account_resume_button">Continue</string>
     <string name="tchap_request_renewal_email_button">Request a renewal email</string>
-    <string name="tchap_expired_account_on_new_sent_email_msg">A new email has been sent to you in order to renew your account validity. Once you’ve followed the link it contains, click below.</string>
+    <string name="tchap_expired_account_on_new_sent_email_msg">A new email has been sent to you in order \"to renew your ${app_name} account\". Once you’ve followed the link it contains, click below.</string>
     <string name="tchap_expired_account_on_new_sent_email_title">Email sent</string>
 
     <!-- Login/Register Tchap -->

From 3ef256635f00514f25ccec23ca8c52fb127db960 Mon Sep 17 00:00:00 2001
From: yostyle <y.pintas@gmail.com>
Date: Thu, 25 Apr 2024 15:37:44 +0200
Subject: [PATCH 4/4] style: update wording after review

---
 library/ui-strings/src/main/res/values-fr/strings_tchap.xml | 4 ++--
 library/ui-strings/src/main/res/values/strings_tchap.xml    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
index e046b3a25d..23579117e4 100644
--- a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
+++ b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
@@ -69,10 +69,10 @@
 
     <!-- tchap account validity -->
     <string name="tchap_expired_account_title">Votre compte a expiré</string>
-    <string name="tchap_expired_account_msg">Un e\u2011mail vous a été envoyé pour \"Renouveler votre compte ${app_name}\". Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
+    <string name="tchap_expired_account_msg">Un e\u2011mail vous a été envoyé pour renouveler votre compte. Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
     <string name="tchap_expired_account_resume_button">Continuer</string>
     <string name="tchap_request_renewal_email_button">Envoyer un nouvel email</string>
-    <string name="tchap_expired_account_on_new_sent_email_msg">Un nouvel e\u2011mail vous a été envoyé pour \"Renouveler votre compte ${app_name}\". Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
+    <string name="tchap_expired_account_on_new_sent_email_msg">Un nouvel e\u2011mail vous a été envoyé pour renouveler votre compte. Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
     <string name="tchap_expired_account_on_new_sent_email_title">Nouvel e\u2011mail envoyé</string>
 
     <!-- Login/Register Tchap -->
diff --git a/library/ui-strings/src/main/res/values/strings_tchap.xml b/library/ui-strings/src/main/res/values/strings_tchap.xml
index ef6aa6dbf0..c65803d58e 100644
--- a/library/ui-strings/src/main/res/values/strings_tchap.xml
+++ b/library/ui-strings/src/main/res/values/strings_tchap.xml
@@ -69,10 +69,10 @@
 
     <!-- tchap account validity -->
     <string name="tchap_expired_account_title">Your account has expired</string>
-    <string name="tchap_expired_account_msg">An email has been sent to you in order \"to renew your ${app_name} account\". Once you’ve followed the link it contains, click below.</string>
+    <string name="tchap_expired_account_msg">An email has been sent to you in order to renew your account. Once you’ve followed the link it contains, click below.</string>
     <string name="tchap_expired_account_resume_button">Continue</string>
     <string name="tchap_request_renewal_email_button">Request a renewal email</string>
-    <string name="tchap_expired_account_on_new_sent_email_msg">A new email has been sent to you in order \"to renew your ${app_name} account\". Once you’ve followed the link it contains, click below.</string>
+    <string name="tchap_expired_account_on_new_sent_email_msg">A new email has been sent to you in order to renew your account. Once you’ve followed the link it contains, click below.</string>
     <string name="tchap_expired_account_on_new_sent_email_title">Email sent</string>
 
     <!-- Login/Register Tchap -->