Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update expired account screen #1036

Merged
merged 4 commits into from
Apr 25, 2024
Merged

Update expired account screen #1036

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49cf993
style: update expired account screen
yostyle Apr 25, 2024
484a69d
Add changelog
yostyle Apr 25, 2024
cb20c8d
style: update wording
yostyle Apr 25, 2024
3ef2566
style: update wording after review
yostyle Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/1035.improvements
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Mise à jour de l'écran de compte expiré.
10 changes: 6 additions & 4 deletions library/ui-strings/src/main/res/values-fr/strings_tchap.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_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_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 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 -->
<string name="tchap_has_account_no">Je n’ai pas\nde compte</string>
Expand Down
8 changes: 5 additions & 3 deletions library/ui-strings/src/main/res/values/strings_tchap.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_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 -->
<string name="tchap_has_account_no">I do not have\nan account</string>
Expand Down
6 changes: 4 additions & 2 deletions vector/src/main/java/fr/gouv/tchap/features/expired/ExpiredAccountActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
16 changes: 13 additions & 3 deletions vector/src/main/res/layout/activity_tchap_expired.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -30,16 +41,15 @@
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
android:id="@+id/renewalEmailButton"
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>
Expand Down
Loading