diff --git a/Core b/Core index b91f24cf50..b73b931413 160000 --- a/Core +++ b/Core @@ -1 +1 @@ -Subproject commit b91f24cf509933a5af4fff84a2ddb64e164d5009 +Subproject commit b73b9314138d2a6dc181118b5277c71de1f28eae diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt index 086c2cde82..ea30fcceb3 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt @@ -26,6 +26,7 @@ import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels +import com.infomaniak.core.myksuite.ui.components.MyKSuiteTier import com.infomaniak.core.myksuite.ui.data.MyKSuiteData import com.infomaniak.core.myksuite.ui.screens.components.KSuiteProductsWithQuotas import com.infomaniak.core.myksuite.ui.views.MyKSuiteDashboardFragmentArgs @@ -102,10 +103,12 @@ class SettingsFragment : Fragment() { myKSuiteSubscription.setOnClickListener { val args = MyKSuiteDashboardFragmentArgs( + myKSuiteTier = if (myKSuiteData.isMyKSuitePlus) MyKSuiteTier.Plus else MyKSuiteTier.Free, email = myKSuiteData.mail.email, avatarUri = AccountUtils.currentUser?.avatar ?: "", dailySendLimit = myKSuiteData.mail.dailyLimitSent.toString(), kSuiteAppsWithQuotas = getKSuiteQuotasApp(myKSuiteData), + trialExpiryDate = myKSuiteData.trialExpiryDate, ) animatedNavigation(resId = R.id.myKSuiteDashboardFragment, args = args.toBundle()) } @@ -129,17 +132,13 @@ class SettingsFragment : Fragment() { } private fun getKSuiteQuotasApp(myKSuite: MyKSuiteData): Array { - val mailProduct = if (myKSuite.isMyKSuitePlus) { - // TODO: Management for My kSuite Plus (and pack check name like in kDrive) - null - } else { - with(myKSuite.mail) { - KSuiteProductsWithQuotas.Mail( - usedSize = requireContext().formatShortFileSize(usedSize), - maxSize = requireContext().formatShortFileSize(storageSizeLimit), - progress = (usedSize.toDouble() / storageSizeLimit.toDouble()).toFloat(), - ) - } + + val mailProduct = with(myKSuite.mail) { + KSuiteProductsWithQuotas.Mail( + usedSize = requireContext().formatShortFileSize(usedSize), + maxSize = requireContext().formatShortFileSize(storageSizeLimit), + progress = (usedSize.toDouble() / storageSizeLimit.toDouble()).toFloat(), + ) } val driveProduct = with(myKSuite.drive) { @@ -150,7 +149,7 @@ class SettingsFragment : Fragment() { ) } - return if (mailProduct == null) arrayOf(driveProduct) else arrayOf(mailProduct, driveProduct) + return arrayOf(mailProduct, driveProduct) } override fun onResume() { diff --git a/app/src/main/res/navigation/main_navigation.xml b/app/src/main/res/navigation/main_navigation.xml index 649c238443..236f44ccbc 100644 --- a/app/src/main/res/navigation/main_navigation.xml +++ b/app/src/main/res/navigation/main_navigation.xml @@ -695,6 +695,9 @@ android:id="@+id/myKSuiteDashboardFragment" android:name="com.infomaniak.mail.ui.main.settings.KSuiteDashboardFragment" android:label="MyKSuiteDashboardFragment"> + @@ -707,5 +710,9 @@ +