feat(MyKSuite): Clean code

Infomaniak · Feb 19, 2025 · 97c5a57 · 97c5a57
1 parent 6ef0422
commit 97c5a57
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 36 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/MainApplication.kt b/app/src/main/java/com/infomaniak/mail/MainApplication.kt
@@ -125,7 +125,7 @@ open class MainApplication : Application(), ImageLoaderFactory, DefaultLifecycle
         if (BuildConfig.DEBUG) configureDebugMode()
         configureSentry()
         enforceAppTheme()
-        configureRoomDatabase()
+        configureRoomDatabases()
         configureAppReloading()
         configureInfomaniakCore()
         notificationUtils.initNotificationChannel()
@@ -217,7 +217,7 @@ open class MainApplication : Application(), ImageLoaderFactory, DefaultLifecycle
         AppCompatDelegate.setDefaultNightMode(localSettings.theme.mode)
     }
 
-    private fun configureRoomDatabase() {
+    private fun configureRoomDatabases() {
         AccountUtils.init(this)
         MyKSuiteDataUtils.initDatabase(this)
     }

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
@@ -50,6 +50,7 @@ import com.infomaniak.mail.utils.extensions.observeNotNull
 import com.infomaniak.mail.utils.extensions.setSystemBarsColors
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
+import com.infomaniak.core.myksuite.R as RMyKSuite
 
 @AndroidEntryPoint
 class SettingsFragment : Fragment() {
@@ -83,7 +84,7 @@ class SettingsFragment : Fragment() {
     }
 
     private fun setupMyKSuite() {
-        binding.myKSuitelayout.isGone = MyKSuiteDataUtils.myKSuite == null
+        binding.myKSuiteLayout.isGone = MyKSuiteDataUtils.myKSuite == null
         MyKSuiteDataUtils.myKSuite?.let { setupMyKSuiteLayout(it) } ?: fetchMyKSuite()
     }
 
@@ -104,7 +105,7 @@ class SettingsFragment : Fragment() {
                     avatarUri = user.avatar ?: "",
                     dailySendLimit = "500",
                 )
-                animatedNavigation(resId = R.id.myKSuiteDashboardFragment, args = args.toBundle())
+                animatedNavigation(resId = RMyKSuite.id.myKSuiteDashboardFragment, args = args.toBundle())
             }
         }
     }
@@ -114,14 +115,13 @@ class SettingsFragment : Fragment() {
             binding.myKSuiteMailAddress.apply {
                 isVisible = mailbox != null
 
-                setTitle(mailbox?.email ?: "")
+                if (mailbox == null) return@observe
 
-                if (mailbox != null) {
-                    setOnClickListener {
-                        animatedNavigation(
-                            SettingsFragmentDirections.actionSettingsToMailboxSettings(mailbox.objectId, mailbox.email)
-                        )
-                    }
+                setTitle(mailbox.email)
+                setOnClickListener {
+                    animatedNavigation(
+                        SettingsFragmentDirections.actionSettingsToMailboxSettings(mailbox.objectId, mailbox.email)
+                    )
                 }
             }
         }

diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
@@ -38,7 +38,7 @@
             android:orientation="vertical">
 
             <LinearLayout
-                android:id="@+id/myKSuitelayout"
+                android:id="@+id/myKSuiteLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"

diff --git a/app/src/main/res/navigation/main_navigation.xml b/app/src/main/res/navigation/main_navigation.xml
@@ -688,28 +688,4 @@
         android:label="UpgradeProductBottomSheetDialog"
         tools:layout="@layout/bottom_sheet_upgrade_product" />
 
-    <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>
-
-    <fragment
-        android:id="@+id/myKSuiteDashboardFragment"
-        android:name="com.infomaniak.mail.ui.main.settings.KSuiteDashboardFragment"
-        android:label="MyKSuiteDashboardFragment">
-        <argument
-            android:name="userName"
-            app:argType="string" />
-        <argument
-            android:name="avatarUri"
-            app:argType="string" />
-        <argument
-            android:name="dailySendLimit"
-            app:argType="string" />
-    </fragment>
-
 </navigation>