From a98575dc19840fc41de6af63e31177c0e7648c86 Mon Sep 17 00:00:00 2001 From: Tommy DI LUNA Date: Fri, 7 Jun 2024 10:07:41 +0200 Subject: [PATCH] Apply suggestions --- .../LockedMailboxBottomSheetDialog.kt | 6 +-- .../ui/newMessage/AiEngineChoiceFragment.kt | 2 + .../ui/newMessage/AiPropositionFragment.kt | 2 +- .../NoValidMailboxesFragment.kt | 6 ++- .../mail/views/InformationBlockView.kt | 39 +++++-------------- .../res/layout/fragment_ai_proposition.xml | 2 +- .../layout/fragment_no_valid_mailboxes.xml | 11 +++--- .../res/layout/layout_ai_engine_choice.xml | 3 +- .../res/layout/view_information_block.xml | 8 +++- app/src/main/res/values-de/strings.xml | 10 ++--- app/src/main/res/values-es/strings.xml | 10 ++--- app/src/main/res/values-fr/strings.xml | 11 ++---- app/src/main/res/values-it/strings.xml | 10 ++--- app/src/main/res/values/attrs.xml | 3 -- app/src/main/res/values/strings.xml | 10 ++--- 15 files changed, 55 insertions(+), 78 deletions(-) diff --git a/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/LockedMailboxBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/LockedMailboxBottomSheetDialog.kt index 602d1987c35..ce156c63a33 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/LockedMailboxBottomSheetDialog.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/LockedMailboxBottomSheetDialog.kt @@ -29,9 +29,9 @@ class LockedMailboxBottomSheetDialog : InformationBottomSheetDialog() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding) { super.onViewCreated(view, savedInstanceState) - - title.text = getString(R.string.blockedMailboxTitle, navigationArgs.lockedMailboxName) - description.text = resources.getQuantityText(R.plurals.lockedMailboxDescription, 1) + + title.text = getString(R.string.lockedMailboxBottomSheetTitle, navigationArgs.lockedMailboxName) + description.text = getString(R.string.lockedMailboxBottomSheetDescription) infoIllustration.setBackgroundResource(R.drawable.ic_invalid_mailbox) actionButton.apply { diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiEngineChoiceFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiEngineChoiceFragment.kt index b677dd04600..81d393b1f01 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiEngineChoiceFragment.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiEngineChoiceFragment.kt @@ -51,6 +51,8 @@ class AiEngineChoiceFragment : Fragment() { super.onViewCreated(view, savedInstanceState) setSystemBarsColors(statusBarColor = R.color.backgroundColor) + choiceBinding.informationBlock.setDescription(R.string.aiEngineWarning) + binding.toolbar.setNavigationOnClickListener { findNavController().popBackStack() } sharedUtils.manageAiEngineSettings(this, choiceBinding.radioGroup, "promptAiEngine") { diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPropositionFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPropositionFragment.kt index 03ddc9cdd8b..e6cb4cbddd0 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPropositionFragment.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPropositionFragment.kt @@ -296,7 +296,7 @@ class AiPropositionFragment : Fragment() { } private fun displayError(status: PropositionStatus) { - binding.errorBlock.setTitle(status.errorRes!!) + binding.errorBlock.setDescription(status.errorRes!!) setUiVisibilityState(UiState.ERROR) } diff --git a/app/src/main/java/com/infomaniak/mail/ui/noValidMailboxes/NoValidMailboxesFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/noValidMailboxes/NoValidMailboxesFragment.kt index b3896c62c3e..55cb661f90c 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/noValidMailboxes/NoValidMailboxesFragment.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/noValidMailboxes/NoValidMailboxesFragment.kt @@ -60,7 +60,9 @@ class NoValidMailboxesFragment : Fragment(), MailboxListFragment { override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding) { super.onViewCreated(view, savedInstanceState) - noValidMailboxesBlock.description = resources.getQuantityString(R.plurals.lockedMailboxDescription, 2) + noValidMailboxesBlock.setTitle(R.string.lockedMailboxScreenTitle) + noValidMailboxesBlock.setDescription(R.string.lockedMailboxScreenDescription) + noValidMailboxesBlock.setButton(R.string.readFAQ) setupAdapters() setupListeners() @@ -81,7 +83,7 @@ class NoValidMailboxesFragment : Fragment(), MailboxListFragment { } private fun setupListeners() = with(binding) { - noValidMailboxesBlock.setOnInformationClicked { + noValidMailboxesBlock.setOnActionClicked { trackNoValidMailboxesEvent("readFAQ") context?.let { WebViewActivity.startActivity(it, Uri.parse(BuildConfig.FAQ_URL).toString()) } } diff --git a/app/src/main/java/com/infomaniak/mail/views/InformationBlockView.kt b/app/src/main/java/com/infomaniak/mail/views/InformationBlockView.kt index 0be95fc6866..19039f68b30 100644 --- a/app/src/main/java/com/infomaniak/mail/views/InformationBlockView.kt +++ b/app/src/main/java/com/infomaniak/mail/views/InformationBlockView.kt @@ -36,26 +36,14 @@ class InformationBlockView @JvmOverloads constructor( private val binding by lazy { ViewInformationBlockBinding.inflate(LayoutInflater.from(context), this, true) } - private var onInformationClicked: (() -> Unit)? = null + private var onActionClicked: (() -> Unit)? = null private var onCloseClicked: (() -> Unit)? = null - var title: CharSequence? - get() = binding.informationTitle.text - set(value) { - binding.informationTitle.text = value - } + var title: CharSequence? by binding.informationTitle::text - var description: CharSequence? - get() = binding.informationDescription.text - set(value) { - binding.informationDescription.text = value - } + var description: CharSequence? by binding.informationDescription::text - var button: CharSequence? - get() = binding.informationButton.text - set(value) { - binding.informationButton.text = value - } + var button: CharSequence? by binding.informationButton::text var icon: Drawable? get() = binding.icon.compoundDrawablesRelative[0] @@ -65,18 +53,8 @@ class InformationBlockView @JvmOverloads constructor( init { attrs?.getAttributes(context, R.styleable.InformationBlockView) { - binding.informationTitle.apply { - isVisible = getBoolean(R.styleable.InformationBlockView_showTitle, true) - text = getString(R.styleable.InformationBlockView_title) - } - binding.informationDescription.apply { - isVisible = getBoolean(R.styleable.InformationBlockView_showDescription, false) - text = getString(R.styleable.InformationBlockView_description) - } binding.informationButton.apply { - isVisible = getBoolean(R.styleable.InformationBlockView_showButton, false) - text = getString(R.styleable.InformationBlockView_button) - setOnClickListener { onInformationClicked?.invoke() } + setOnClickListener { onActionClicked?.invoke() } } icon = getDrawable(R.styleable.InformationBlockView_icon) binding.closeButton.apply { @@ -86,8 +64,8 @@ class InformationBlockView @JvmOverloads constructor( } } - fun setOnInformationClicked(listener: () -> Unit) { - onInformationClicked = listener + fun setOnActionClicked(listener: () -> Unit) { + onActionClicked = listener } fun setOnCloseListener(listener: () -> Unit) { @@ -96,13 +74,16 @@ class InformationBlockView @JvmOverloads constructor( fun setTitle(@StringRes textRes: Int) { title = context.getText(textRes) + binding.informationTitle.isVisible = true } fun setDescription(@StringRes descriptionRes: Int) { description = context.getText(descriptionRes) + binding.informationDescription.isVisible = true } fun setButton(@StringRes buttonRes: Int) { button = context.getText(buttonRes) + binding.informationButton.isVisible = true } } diff --git a/app/src/main/res/layout/fragment_ai_proposition.xml b/app/src/main/res/layout/fragment_ai_proposition.xml index 945b3d37fe0..17add23251a 100644 --- a/app/src/main/res/layout/fragment_ai_proposition.xml +++ b/app/src/main/res/layout/fragment_ai_proposition.xml @@ -59,7 +59,7 @@ android:visibility="gone" app:icon="@drawable/ic_warning" app:showCloseIcon="true" - tools:title="@string/aiErrorTooManyRequests" + tools:description="@string/aiErrorTooManyRequests" tools:visibility="visible" /> + tools:title="@string/lockedMailboxScreenTitle" + tools:description="@string/lockedMailboxScreenDescription" + tools:button="@string/readFAQ" /> + @@ -151,4 +149,5 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> + diff --git a/app/src/main/res/layout/layout_ai_engine_choice.xml b/app/src/main/res/layout/layout_ai_engine_choice.xml index 75f58a06e85..f4d36c16384 100644 --- a/app/src/main/res/layout/layout_ai_engine_choice.xml +++ b/app/src/main/res/layout/layout_ai_engine_choice.xml @@ -42,9 +42,10 @@ + tools:description="@string/aiEngineWarning" /> diff --git a/app/src/main/res/layout/view_information_block.xml b/app/src/main/res/layout/view_information_block.xml index c1c9ca32a9f..ca27a8efabd 100644 --- a/app/src/main/res/layout/view_information_block.xml +++ b/app/src/main/res/layout/view_information_block.xml @@ -56,21 +56,27 @@ android:id="@+id/informationTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:visibility="gone" style="@style/BodyMedium" + tools:visibility="visible" tools:text="@string/aiErrorTooManyRequests" /> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6188d7235d2..ee3cfe22c35 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -104,7 +104,6 @@ Liste der Teilnehmer (%d) Bcc: - Mailbox %s ist blockiert Passwort blockiert Blockierte Passwörter @@ -294,15 +293,14 @@ Google Play Services sind erforderlich Posteingang Laden… - - Der Zugriff auf Ihre E-Mail-Adresse ist derzeit gesperrt.\nFür weitere Informationen, FAQ lesen. - Für weitere Informationen: - + Der Zugriff auf Ihre E-Mail-Adresse ist derzeit gesperrt.\nFür weitere Informationen, FAQ lesen. + Mailbox %s ist blockiert + Für weitere Informationen: + Einige Ihrer Mailboxen sind blockiert Blockierte E-Mail-Adresse Gesperrte Mailadressen - Einige Ihrer Mailboxen sind blockiert Meine Signaturen verwalten Erweiterte Aktionen %1$s / %2$s verwendet diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 721b0b42b59..af9c9b46656 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -104,7 +104,6 @@ Lista de asistentes (%d) CCO: - La dirección de correo electrónico %s está bloqueada Contraseña bloqueada Contraseñas bloqueadas @@ -294,15 +293,14 @@ Se requieren los servicios de Google Play Bandeja de entrada Cargando… - - El acceso a su dirección de correo electrónico está bloqueado.\nPara más información, lea las preguntas frecuentes. - Para más información: - + El acceso a su dirección de correo electrónico está bloqueado.\nPara más información, lea las preguntas frecuentes. + La dirección de correo electrónico %s está bloqueada + Para más información: + Algunos de sus buzones están bloqueados Dirección de correo electrónico bloqueada Buzones de correo bloqueados - Algunos de sus buzones están bloqueados Gestionar mis firmas Acciones avanzadas %1$s / %2$s usado diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0aef0c157fe..83e42c231f5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -105,7 +105,6 @@ Liste des participants (%d) Cci : - L’adresse %s est bloquée Mot de passe bloqué Mots de passe bloqués @@ -298,17 +297,15 @@ Les Google Play Services sont requis Boîte de réception Chargement… - - L’accès à votre adresse mail est actuellement bloqué.\nPour plus d’informations, consultez les FAQ. - Pour plus d’informations : - L’accès à votre adresse mail est actuellement bloqué. Nous vous invitons à contacter votre administrateur. - + L’accès à votre adresse mail est actuellement bloqué.\nPour plus d’informations, consultez les FAQ. + L’adresse %s est bloquée + Pour plus d’informations : + Certaines de vos adresses mail sont bloquées Adresse mail bloquée Adresses mail bloquées Adresses mail bloquées - Certaines de vos adresses mail sont bloquées Gérer mes signatures Actions avancées %1$s / %2$s utilisés diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 45b0c36828a..3084ef824e3 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -104,7 +104,6 @@ Elenco dei partecipanti (%d) Bcc: - L’indirizzo e-mail %s è bloccato Password bloccata Password bloccate @@ -294,15 +293,14 @@ I servizi Google Play sono necessari Posta in arrivo Caricamento… - - L’accesso al tuo indirizzo e-mail è attualmente bloccato.\nPer ulteriori informazioni, leggi le FAQ. - Per ulteriori informazioni: - + L’accesso al tuo indirizzo e-mail è attualmente bloccato.\nPer ulteriori informazioni, leggi le FAQ. + L’indirizzo e-mail %s è bloccato + Per ulteriori informazioni: + Alcuni indirizzi e-mail bloccati Indirizzo e-mail bloccato Indirizzi e-mail bloccati - Alcuni indirizzi e-mail bloccati Gestisci le mie firme Azioni avanzate %1$s / %2$s usato diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 58c41a5def3..bf45e663e09 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -169,11 +169,8 @@ - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 11d19e5f99a..d632854c4f9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -110,7 +110,6 @@ List of attendees (%d) Bcc: - Mailbox %s is blocked Blocked password Blocked passwords @@ -300,15 +299,14 @@ Google Play Services are required Inbox Loading… - - Access to your mailbox is currently blocked.\nFor further information, please read FAQ. - For further information: - + Access to your mailbox is currently blocked.\nFor further information, please read FAQ. + Mailbox %s is blocked + For further information: + Some of your mailboxes are blocked Blocked mailbox Blocked mailboxes - Some of your mailboxes are blocked Manage my signatures Advanced actions %1$s / %2$s used