From fb7a5cf3ec36f07bce3cd744d0f05c2df1463eb4 Mon Sep 17 00:00:00 2001 From: Tommy DI LUNA Date: Fri, 7 Jun 2024 15:06:57 +0200 Subject: [PATCH] Apply suggestions --- .../LockedMailboxBottomSheetDialog.kt | 4 +- .../ui/newMessage/AiEngineChoiceFragment.kt | 4 +- .../ui/newMessage/AiPropositionFragment.kt | 2 +- .../NoValidMailboxesFragment.kt | 4 -- .../mail/views/InformationBlockView.kt | 48 +++++++++++-------- .../layout/fragment_no_valid_mailboxes.xml | 6 +-- .../res/layout/layout_ai_engine_choice.xml | 4 +- .../res/layout/view_information_block.xml | 23 +++++---- app/src/main/res/values-es/strings.xml | 2 +- 9 files changed, 50 insertions(+), 47 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 ce156c63a33..1c0f1a1e5c5 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,13 +29,13 @@ class LockedMailboxBottomSheetDialog : InformationBottomSheetDialog() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding) { super.onViewCreated(view, savedInstanceState) - + title.text = getString(R.string.lockedMailboxBottomSheetTitle, navigationArgs.lockedMailboxName) description.text = getString(R.string.lockedMailboxBottomSheetDescription) infoIllustration.setBackgroundResource(R.drawable.ic_invalid_mailbox) actionButton.apply { - setText(R.string.buttonClose) + setText(R.string.externalDialogConfirmButton) setOnClickListener { dismiss() } } 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 81d393b1f01..0e6f0334f43 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 @@ -50,9 +50,7 @@ class AiEngineChoiceFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { 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 e6cb4cbddd0..8e54a37b462 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.setDescription(status.errorRes!!) + binding.errorBlock.description = getString(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 1777e29e381..3f9b2e80e35 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 @@ -58,10 +58,6 @@ class NoValidMailboxesFragment : Fragment(), MailboxListFragment { override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding) { super.onViewCreated(view, savedInstanceState) - noValidMailboxesBlock.setTitle(R.string.lockedMailboxScreenTitle) - noValidMailboxesBlock.setDescription(R.string.lockedMailboxScreenDescription) - noValidMailboxesBlock.setButton(R.string.readFAQ) - setupAdapters() setupListeners() 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 19039f68b30..e0ebaaa0c21 100644 --- a/app/src/main/java/com/infomaniak/mail/views/InformationBlockView.kt +++ b/app/src/main/java/com/infomaniak/mail/views/InformationBlockView.kt @@ -22,7 +22,6 @@ import android.graphics.drawable.Drawable import android.util.AttributeSet import android.view.LayoutInflater import android.widget.FrameLayout -import androidx.annotation.StringRes import androidx.core.view.isVisible import com.infomaniak.lib.core.utils.getAttributes import com.infomaniak.mail.R @@ -39,11 +38,26 @@ class InformationBlockView @JvmOverloads constructor( private var onActionClicked: (() -> Unit)? = null private var onCloseClicked: (() -> Unit)? = null - var title: CharSequence? by binding.informationTitle::text + var title: CharSequence? + get() = binding.informationTitle.text + set(value) { + binding.informationTitle.text = value + binding.informationTitle.isVisible = true + } - var description: CharSequence? by binding.informationDescription::text + var description: CharSequence? + get() = binding.informationDescription.text + set(value) { + binding.informationDescription.text = value + binding.informationDescription.isVisible = true + } - var button: CharSequence? by binding.informationButton::text + var buttonLabel: CharSequence? + get() = binding.informationButton.text + set(value) { + binding.informationButton.text = value + binding.informationButton.isVisible = true + } var icon: Drawable? get() = binding.icon.compoundDrawablesRelative[0] @@ -53,7 +67,18 @@ class InformationBlockView @JvmOverloads constructor( init { attrs?.getAttributes(context, R.styleable.InformationBlockView) { + binding.informationTitle.apply { + val text = getString(R.styleable.InformationBlockView_title) + if (!text.isNullOrBlank()) title = text + } + binding.informationDescription.apply { + val text = getString(R.styleable.InformationBlockView_description) + if (!text.isNullOrBlank()) description = text + } binding.informationButton.apply { + val text = getString(R.styleable.InformationBlockView_button) + if (!text.isNullOrBlank()) buttonLabel = text + setOnClickListener { onActionClicked?.invoke() } } icon = getDrawable(R.styleable.InformationBlockView_icon) @@ -71,19 +96,4 @@ class InformationBlockView @JvmOverloads constructor( fun setOnCloseListener(listener: () -> Unit) { onCloseClicked = listener } - - 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_no_valid_mailboxes.xml b/app/src/main/res/layout/fragment_no_valid_mailboxes.xml index 6196b8b9eca..cd6db9e056b 100644 --- a/app/src/main/res/layout/fragment_no_valid_mailboxes.xml +++ b/app/src/main/res/layout/fragment_no_valid_mailboxes.xml @@ -49,12 +49,12 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/marginStandard" android:layout_marginTop="@dimen/marginLarge" + app:button="@string/readFAQ" + app:description="@string/lockedMailboxScreenDescription" app:icon="@drawable/ic_warning" app:layout_constraintTop_toBottomOf="@id/logo" app:showCloseIcon="false" - tools:button="@string/readFAQ" - tools:description="@string/lockedMailboxScreenDescription" - tools:title="@string/lockedMailboxScreenTitle" /> + app:title="@string/lockedMailboxScreenTitle" /> + app:description="@string/aiEngineWarning" + app:icon="@drawable/ic_external_information" /> diff --git a/app/src/main/res/layout/view_information_block.xml b/app/src/main/res/layout/view_information_block.xml index ca27a8efabd..ae05214b9f9 100644 --- a/app/src/main/res/layout/view_information_block.xml +++ b/app/src/main/res/layout/view_information_block.xml @@ -47,37 +47,36 @@ + android:orientation="vertical" + android:showDividers="middle"> + tools:text="@string/aiErrorTooManyRequests" + tools:visibility="visible" /> + tools:text="@string/aiErrorTooManyRequests" + tools:visibility="visible" /> + tools:text="@string/buttonLogInDifferentAccount" + tools:visibility="visible" /> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8a5e1bcf587..628fb2e3a31 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -297,7 +297,7 @@ 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 + Algunas de sus direcciones de correo electrónico están bloqueadas Dirección de correo electrónico bloqueada Buzones de correo bloqueados