From 982153115974fd6870e103d3579a4a92b25000bb Mon Sep 17 00:00:00 2001
From: Fabian DEVEL <fabian.devel@infomaniak.com>
Date: Wed, 19 Feb 2025 14:18:28 +0100
Subject: [PATCH] feat(MyKSuite): Clean code

---
 app/build.gradle                              |  3 ---
 .../com/infomaniak/mail/MainApplication.kt    |  4 ++--
 .../mail/ui/main/settings/SettingsFragment.kt | 15 +++++++-------
 app/src/main/res/layout/fragment_settings.xml |  2 +-
 .../main/res/navigation/main_navigation.xml   | 20 +++++++++----------
 gradle/libs.versions.toml                     |  2 --
 6 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b5d72540c4..b5f5a337ed 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -121,9 +121,6 @@ dependencies {
 
     implementation libs.coil.svg
 
-    // Compose
-    implementation libs.compose.ui.android
-
     // Test
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit
diff --git a/app/src/main/java/com/infomaniak/mail/MainApplication.kt b/app/src/main/java/com/infomaniak/mail/MainApplication.kt
index 73fe9738fc..0132ccba5b 100644
--- 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
index cc48af9388..70239fd0f5 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
@@ -83,7 +83,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()
     }
 
@@ -114,14 +114,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
index 0c7ed8267b..56522c2d0f 100644
--- 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
index 15e72ec934..96213e8e89 100644
--- a/app/src/main/res/navigation/main_navigation.xml
+++ b/app/src/main/res/navigation/main_navigation.xml
@@ -688,18 +688,9 @@
         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:name="com.infomaniak.core.myksuite.ui.views.MyKSuiteDashboardFragment"
         android:label="MyKSuiteDashboardFragment">
         <argument
             android:name="userName"
@@ -712,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>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f383a23708..2183df2464 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 androidGradlePlugin = "8.7.2"
 coilSvg = "2.7.0"
-compose = "1.7.6"
 dotsindicator = "5.1.0"
 dragdropswipeRecyclerview = "1.2.0"
 firebaseMessagingKtx = "24.1.0"
@@ -29,7 +28,6 @@ workRuntimeKtx = "2.9.1" # Doesn't build when bumped (waiting for Android SDK 35
 
 [libraries]
 coil-svg = { module = "io.coil-kt:coil-svg", version.ref = "coilSvg" }
-compose-ui-android = { group = "androidx.compose.ui", name = "ui-android", version.ref = "compose" }
 dotsindicator = { module = "com.tbuonomo:dotsindicator", version.ref = "dotsindicator" }
 dragdropswipe-recyclerview = { module = "com.ernestoyaquello.dragdropswiperecyclerview:drag-drop-swipe-recyclerview", version.ref = "dragdropswipeRecyclerview" }
 firebase-messaging-ktx = { module = "com.google.firebase:firebase-messaging-ktx", version.ref = "firebaseMessagingKtx" }