feat(MyKSuiteBlockSignature): Block the "no signature" settings if user has my KSuite Free

Author: FabianDevel

app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt

@@ -68,6 +68,7 @@ class SettingRadioButtonView @JvmOverloads constructor(
     override fun check() = with(binding) {
         root.isEnabled = false
         checkMark.isVisible = true
+        myKSuitePlusChip.isGone = true
     }
 
     override fun uncheck() = with(binding) {
@@ -90,6 +91,10 @@ class SettingRadioButtonView @JvmOverloads constructor(
         }
     }
 
+    fun setMyKSuiteChipVisibility(isVisible: Boolean) {
+        binding.myKSuitePlusChip.isVisible = isVisible
+    }
+
     override fun setOnClickListener(listener: OnClickListener?) {
         onClickListener = listener
     }

app/src/main/java/com/infomaniak/mail/ui/main/settings/mailbox/SignatureSettingAdapter.kt

@@ -26,10 +26,11 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.infomaniak.mail.data.models.signature.Signature
 import com.infomaniak.mail.databinding.ItemSettingsSignatureBinding
 import com.infomaniak.mail.ui.main.settings.mailbox.SignatureSettingAdapter.SettingsSignatureViewHolder
+import com.infomaniak.mail.utils.MyKSuiteDataUtils
 
 class SignatureSettingAdapter(
     private val canManageSignature: Boolean,
-    private val onSignatureSelected: (Signature) -> Unit,
+    private val onSignatureSelected: (Signature, Boolean) -> Unit,
 ) : Adapter<SettingsSignatureViewHolder>() {
 
     private var signatures: List<Signature> = emptyList()
@@ -44,8 +45,12 @@ class SignatureSettingAdapter(
         val signature = signatures[position]
         setText(signature.name)
         if (signature.isDefault) check() else uncheck()
-        setOnClickListener { onSignatureSelected(signature) }
         isEnabled = canManageSignature
+
+        val shouldBlockSignature = signature.isDummy && !signature.isDefault && MyKSuiteDataUtils.myKSuite?.isMyKSuite == true
+        setMyKSuiteChipVisibility(shouldBlockSignature)
+
+        setOnClickListener { onSignatureSelected(signature, shouldBlockSignature) }
     }
 
     override fun getItemCount(): Int = signatures.count()

app/src/main/java/com/infomaniak/mail/ui/main/settings/mailbox/SignatureSettingFragment.kt

@@ -23,10 +23,14 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import com.infomaniak.core.myksuite.ui.screens.KSuiteApp
+import com.infomaniak.core.myksuite.ui.views.MyKSuiteUpgradeBottomSheetDialogArgs
 import com.infomaniak.lib.core.utils.SnackbarUtils.showSnackbar
 import com.infomaniak.lib.core.utils.UtilsUi.openUrl
 import com.infomaniak.lib.core.utils.safeBinding
+import com.infomaniak.lib.core.utils.safeNavigate
 import com.infomaniak.mail.BuildConfig
+import com.infomaniak.mail.R
 import com.infomaniak.mail.data.models.mailbox.Mailbox
 import com.infomaniak.mail.data.models.signature.Signature
 import com.infomaniak.mail.databinding.FragmentSignatureSettingBinding
@@ -81,7 +85,13 @@ class SignatureSettingFragment : Fragment() {
         }
     }
 
-    private fun onSignatureClicked(signature: Signature) = with(signatureSettingViewModel) {
+    private fun onSignatureClicked(signature: Signature, shouldBlockDummySignature: Boolean) = with(signatureSettingViewModel) {
+        if (signature.isDummy && shouldBlockDummySignature) {
+            val args = MyKSuiteUpgradeBottomSheetDialogArgs(kSuiteApp = KSuiteApp.Mail)
+            safeNavigate(R.id.myKSuiteUpgradeBottomSheet, args = args.toBundle())
+            return@with
+        }
+
         val newDefaultSignature = if (signature.isDummy) {
             null
         } else {

app/src/main/res/layout/view_setting_radio_button.xml

@@ -40,14 +40,25 @@
         android:layout_weight="1"
         tools:text="Simple messages" />
 
-    <ImageView
-        android:id="@+id/checkMark"
-        android:layout_width="@dimen/mediumIconSize"
-        android:layout_height="@dimen/mediumIconSize"
-        android:layout_marginStart="@dimen/marginStandardMedium"
-        android:contentDescription="@string/contentDescriptionSelectedItem"
-        android:src="@drawable/ic_check"
-        android:visibility="invisible"
-        app:tint="?android:attr/colorPrimary" />
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/checkMark"
+            android:layout_width="@dimen/mediumIconSize"
+            android:layout_height="@dimen/mediumIconSize"
+            android:layout_marginStart="@dimen/marginStandardMedium"
+            android:contentDescription="@string/contentDescriptionSelectedItem"
+            android:src="@drawable/ic_check"
+            android:visibility="invisible"
+            app:tint="?android:attr/colorPrimary" />
 
+        <com.infomaniak.core.myksuite.ui.views.MyKSuitePlusChipView
+            android:id="@+id/myKSuitePlusChip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            tools:visibility="visible" />
+    </FrameLayout>
 </LinearLayout>

app/src/main/res/navigation/main_navigation.xml

@@ -703,4 +703,13 @@
             app:argType="string" />
     </fragment>
 
+    <dialog
+        android:id="@+id/myKSuiteUpgradeBottomSheet"
+        android:name="com.infomaniak.core.myksuite.ui.views.MyKSuiteUpgradeBottomSheetDialog"
+        android:label="MyKSuiteUpgradeBottomSheet">
+        <argument
+            android:name="kSuiteApp"
+            app:argType="com.infomaniak.core.myksuite.ui.screens.KSuiteApp" />
+    </dialog>
+
 </navigation>