refactor(DynamicDashboard): Directly pass the DashboardData class to …

…navArgs
Infomaniak · Feb 20, 2025 · eccbb6e · eccbb6e
1 parent a4df8ec
commit eccbb6e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 33 deletions.
diff --git a/Core b/Core
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/KSuiteDashboardFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/KSuiteDashboardFragment.kt
@@ -21,8 +21,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.viewModels
 import com.infomaniak.core.myksuite.ui.views.MyKSuiteDashboardFragment
-import com.infomaniak.mail.utils.AccountUtils
-import com.infomaniak.mail.utils.MyKSuiteUiUtils.getKSuiteQuotasApp
+import com.infomaniak.mail.utils.MyKSuiteUiUtils.getDashboardData
 import com.infomaniak.mail.utils.extensions.setSystemBarsColors
 import dagger.hilt.android.AndroidEntryPoint
 import com.infomaniak.core.myksuite.R as RMyKSuite
@@ -39,13 +38,7 @@ class KSuiteDashboardFragment : MyKSuiteDashboardFragment() {
 
         myKSuiteViewModel.refreshMyKSuite()
         myKSuiteViewModel.myKSuiteDataResult.observe(viewLifecycleOwner) { myKSuiteData ->
-            myKSuiteData?.let { data ->
-                resetContent(
-                    myKSuiteData = data,
-                    avatarUri = AccountUtils.currentUser?.avatar ?: "",
-                    products = requireContext().getKSuiteQuotasApp(myKSuiteData).toList(),
-                )
-            }
+            myKSuiteData?.let { data -> resetContent(dashboardData = getDashboardData(requireContext(), data)) }
         }
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MyKSuiteUiUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MyKSuiteUiUtils.kt
@@ -23,6 +23,7 @@ import androidx.navigation.NavController
 import com.infomaniak.core.myksuite.ui.components.MyKSuiteTier
 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.MyKSuiteUpgradeBottomSheetDialogArgs
@@ -44,18 +45,22 @@ object MyKSuiteUiUtils {
     }
 
     fun Fragment.openMyKSuiteDashboard(myKSuiteData: MyKSuiteData) {
-        val args = MyKSuiteDashboardFragmentArgs(
+        val args = MyKSuiteDashboardFragmentArgs(dashboardData = getDashboardData(requireContext(), myKSuiteData))
+        animatedNavigation(resId = R.id.myKSuiteDashboardFragment, args = args.toBundle())
+    }
+
+    fun getDashboardData(context: Context, myKSuiteData: MyKSuiteData): MyKSuiteDashboardScreenData {
+        return MyKSuiteDashboardScreenData(
             myKSuiteTier = if (myKSuiteData.isMyKSuitePlus) MyKSuiteTier.Plus else MyKSuiteTier.Free,
             email = myKSuiteData.mail.email,
             avatarUri = AccountUtils.currentUser?.avatar ?: "",
-            dailySendLimit = myKSuiteData.mail.dailyLimitSent.toString(),
-            kSuiteAppsWithQuotas = requireContext().getKSuiteQuotasApp(myKSuiteData),
+            dailySendingLimit = myKSuiteData.mail.dailyLimitSent.toString(),
+            kSuiteProductsWithQuotas = context.getKSuiteQuotasApp(myKSuiteData).toList(),
             trialExpiryDate = myKSuiteData.trialExpiryDate,
         )
-        animatedNavigation(resId = R.id.myKSuiteDashboardFragment, args = args.toBundle())
     }
 
-    fun Context.getKSuiteQuotasApp(myKSuite: MyKSuiteData): Array<KSuiteProductsWithQuotas> {
+    private fun Context.getKSuiteQuotasApp(myKSuite: MyKSuiteData): Array<KSuiteProductsWithQuotas> {
 
         val mailProduct = with(myKSuite.mail) {
             KSuiteProductsWithQuotas.Mail(

diff --git a/app/src/main/res/navigation/main_navigation.xml b/app/src/main/res/navigation/main_navigation.xml
@@ -696,23 +696,7 @@
         android:name="com.infomaniak.mail.ui.main.settings.KSuiteDashboardFragment"
         android:label="MyKSuiteDashboardFragment">
         <argument
-            android:name="myKSuiteTier"
-            app:argType="com.infomaniak.core.myksuite.ui.components.MyKSuiteTier" />
-        <argument
-            android:name="email"
-            app:argType="string" />
-        <argument
-            android:name="avatarUri"
-            app:argType="string" />
-        <argument
-            android:name="dailySendLimit"
-            app:argType="string" />
-        <argument
-            android:name="kSuiteAppsWithQuotas"
-            app:argType="com.infomaniak.core.myksuite.ui.screens.components.KSuiteProductsWithQuotas[]" />
-        <argument
-            android:name="trialExpiryDate"
-            app:argType="java.util.Date"
-            app:nullable="true" />
+            android:name="dashboardData"
+            app:argType="com.infomaniak.core.myksuite.ui.screens.MyKSuiteDashboardScreenData" />
     </fragment>
 </navigation>
+12 −15		MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/components/TextWithIcon.kt
+1 −1		MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/data/MyKSuiteData.kt
+0 −1		MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/network/ApiRoutes.kt
+71 −62		MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/MyKSuiteDashboardScreen.kt
+4 −2		MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/MyKSuiteUpgradeBottomSheet.kt
+9 −10		MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/ExpandableItemView.kt
+7 −9		MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/InformationBlock.kt
+2 −2		MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/LimitedFunctionnalities.kt
+17 −9		MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/MyKSuiteTextItem.kt
+10 −25		MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/ProductsStorageQuotas.kt
+1 −1		MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/theme/ColorsDark.kt
+3 −1		MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/theme/Dimens.kt
+6 −30		MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/views/MyKSuiteDashboardFragment.kt
+2 −18		MykSuite/src/main/res/navigation/my_ksuite_navigation.xml