refactor(MyKSuiteNavigation): Use the module helper function to deeplink

Infomaniak · Feb 21, 2025 · 5819bff · 5819bff
1 parent ee26f97
commit 5819bff
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 19 deletions.
diff --git a/Core b/Core
diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainActivity.kt b/app/src/main/java/com/infomaniak/mail/ui/MainActivity.kt
@@ -37,6 +37,8 @@ import androidx.navigation.NavDestination
 import androidx.navigation.fragment.NavHostFragment
 import androidx.work.Data
 import com.airbnb.lottie.LottieAnimationView
+import com.infomaniak.core.myksuite.ui.screens.KSuiteApp
+import com.infomaniak.core.myksuite.ui.utils.MyKSuiteUiUtils.openMyKSuiteUpgradeBottomSheet
 import com.infomaniak.lib.core.MatomoCore.TrackerAction
 import com.infomaniak.lib.core.utils.*
 import com.infomaniak.lib.core.utils.Utils
@@ -282,7 +284,7 @@ class MainActivity : BaseActivity() {
 
             if (mainViewModel.currentMailbox.value?.isFreeMailbox == true && hasLimitBeenReached) {
                 snackbarManager.setValue(getString(errorRes), buttonTitle = R.string.buttonUpgrade) {
-                    MyKSuiteUiUtils.openMyKSuiteUpgradeBottomSheet(navController)
+                    navController.openMyKSuiteUpgradeBottomSheet(KSuiteApp.Mail)
                 }
             } else {
                 snackbarManager.setValue(getString(errorRes))

diff --git a/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/ScheduleSendBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/ScheduleSendBottomSheetDialog.kt
@@ -28,14 +28,15 @@ import androidx.core.view.isVisible
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.infomaniak.core.myksuite.ui.screens.KSuiteApp
+import com.infomaniak.core.myksuite.ui.utils.MyKSuiteUiUtils.openMyKSuiteUpgradeBottomSheet
 import com.infomaniak.lib.core.utils.*
 import com.infomaniak.mail.MatomoMail.trackScheduleSendEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.databinding.BottomSheetScheduleSendBinding
 import com.infomaniak.mail.ui.alertDialogs.SelectDateAndTimeForScheduledDraftDialog.Companion.MIN_SCHEDULE_DELAY_MINUTES
 import com.infomaniak.mail.ui.main.thread.actions.ActionItemView
 import com.infomaniak.mail.ui.main.thread.actions.ActionItemView.TrailingContent
-import com.infomaniak.mail.utils.MyKSuiteUiUtils.openMyKSuiteUpgradeBottomSheet
 import com.infomaniak.mail.utils.date.DateFormatUtils.dayOfWeekDateWithoutYear
 import dagger.hilt.android.AndroidEntryPoint
 import java.util.Date
@@ -94,7 +95,7 @@ class ScheduleSendBottomSheetDialog @Inject constructor() : BottomSheetDialogFra
 
         setOnClickListener {
             if (navigationArgs.isCurrentMailboxFree) {
-                openMyKSuiteUpgradeBottomSheet(findNavController())
+                findNavController().openMyKSuiteUpgradeBottomSheet(KSuiteApp.Mail)
             } else {
                 setBackNavigationResult(OPEN_DATE_AND_TIME_SCHEDULE_DIALOG, true)
             }

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/mailbox/SignatureSettingFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/mailbox/SignatureSettingFragment.kt
@@ -24,14 +24,15 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
+import com.infomaniak.core.myksuite.ui.screens.KSuiteApp
+import com.infomaniak.core.myksuite.ui.utils.MyKSuiteUiUtils.openMyKSuiteUpgradeBottomSheet
 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.mail.BuildConfig
 import com.infomaniak.mail.data.models.mailbox.Mailbox
 import com.infomaniak.mail.data.models.signature.Signature
 import com.infomaniak.mail.databinding.FragmentSignatureSettingBinding
-import com.infomaniak.mail.utils.MyKSuiteUiUtils.openMyKSuiteUpgradeBottomSheet
 import com.infomaniak.mail.utils.extensions.setSystemBarsColors
 import dagger.hilt.android.AndroidEntryPoint
 import io.realm.kotlin.ext.copyFromRealm
@@ -86,7 +87,7 @@ class SignatureSettingFragment : Fragment() {
 
     private fun onSignatureClicked(signature: Signature, shouldBlockDummySignature: Boolean) = with(signatureSettingViewModel) {
         if (signature.isDummy && shouldBlockDummySignature) {
-            openMyKSuiteUpgradeBottomSheet(findNavController())
+            findNavController().openMyKSuiteUpgradeBottomSheet(KSuiteApp.Mail)
             return@with
         }
 

diff --git a/app/src/main/java/com/infomaniak/mail/utils/MyKSuiteUiUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MyKSuiteUiUtils.kt
@@ -18,29 +18,17 @@
 package com.infomaniak.mail.utils
 
 import android.content.Context
-import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
-import androidx.navigation.NavController
-import androidx.navigation.NavDeepLinkRequest
 import com.infomaniak.core.myksuite.ui.data.MyKSuiteData
-import com.infomaniak.core.myksuite.ui.screens.KSuiteApp
 import com.infomaniak.core.myksuite.ui.screens.MyKSuiteDashboardScreenData
 import com.infomaniak.core.myksuite.ui.screens.components.KSuiteProductsWithQuotas
 import com.infomaniak.core.myksuite.ui.views.MyKSuiteDashboardFragmentArgs
-import com.infomaniak.core.myksuite.ui.views.MyKSuiteUpgradeBottomSheetDialog
 import com.infomaniak.lib.core.utils.FormatterFileSize.formatShortFileSize
 import com.infomaniak.mail.R
 import com.infomaniak.mail.utils.extensions.animatedNavigation
 
 object MyKSuiteUiUtils {
 
-    fun openMyKSuiteUpgradeBottomSheet(navController: NavController) {
-        NavDeepLinkRequest.Builder
-            .fromUri(MyKSuiteUpgradeBottomSheetDialog.getDeeplink(KSuiteApp.Mail).toUri())
-            .build()
-            .also(navController::navigate)
-    }
-
     fun Fragment.openMyKSuiteDashboard(myKSuiteData: MyKSuiteData) {
         val args = MyKSuiteDashboardFragmentArgs(dashboardData = getDashboardData(requireContext(), myKSuiteData))
         animatedNavigation(resId = R.id.myKSuiteDashboardFragment, args = args.toBundle())

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 androidGradlePlugin = "8.7.2"
 coilSvg = "2.7.0"
-compose = "1.7.6"
+compose = "1.7.8"
 dotsindicator = "5.1.0"
 dragdropswipeRecyclerview = "1.2.0"
 firebaseMessagingKtx = "24.1.0"