chore: Move both kSuite modules into a common parent module

KevinBoulongne · KevinBoulongne · commit f03393598451 · 2025-08-07T06:06:26.000+02:00
diff --git a/Core b/Core
@@ -1 +1 @@
-Subproject commit 612fde6356aa38ef4576d66f76aa2d9dc1718f54
+Subproject commit e8fe1c9790c1dbab1d0d48a05842591ea90c214a
diff --git a/app/build.gradle b/app/build.gradle
@@ -111,7 +111,8 @@ dependencies {
     implementation project(':Core:Legacy:Confetti')
     implementation project(':Core:Legacy:Stores')
     implementation project(':Core:Matomo')
-    implementation project(':Core:MyKSuite')
+    implementation project(':Core:kSuite:kSuitePro')
+    implementation project(':Core:kSuite:MyKSuite')
     implementation project(':Core:Network')
     implementation project(':Core:Sentry')
     implementation project(':EmojiComponents')
diff --git a/app/src/main/java/com/infomaniak/mail/MatomoMail.kt b/app/src/main/java/com/infomaniak/mail/MatomoMail.kt
@@ -23,7 +23,7 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.NavDestination
 import com.infomaniak.core.matomo.Matomo
 import com.infomaniak.core.matomo.Matomo.TrackerAction
-import com.infomaniak.core.myksuite.ui.utils.MatomoMyKSuite
+import com.infomaniak.core.ksuite.myksuite.ui.utils.MatomoMyKSuite
 import com.infomaniak.lib.core.utils.capitalizeFirstChar
 import com.infomaniak.mail.data.models.correspondent.Recipient
 import com.infomaniak.mail.data.models.draft.Draft.DraftAction
diff --git a/app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt b/app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt
@@ -18,7 +18,7 @@
 package com.infomaniak.mail.data.api
 
 import com.infomaniak.core.cancellable
-import com.infomaniak.core.myksuite.ui.data.MyKSuiteData
+import com.infomaniak.core.ksuite.myksuite.ui.data.MyKSuiteData
 import com.infomaniak.core.utils.FORMAT_FULL_DATE_WITH_HOUR
 import com.infomaniak.core.utils.FORMAT_ISO_8601_WITH_TIMEZONE_SEPARATOR
 import com.infomaniak.core.utils.format
@@ -92,7 +92,7 @@ import okhttp3.RequestBody.Companion.asRequestBody
 import okhttp3.Response
 import java.io.File
 import java.util.Date
-import com.infomaniak.core.myksuite.ui.network.ApiRoutes as MyKSuiteApiRoutes
+import com.infomaniak.core.ksuite.myksuite.ui.network.ApiRoutes as MyKSuiteApiRoutes
 
 object ApiRepository : ApiRepositoryCore() {
 
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
@@ -20,14 +20,14 @@ package com.infomaniak.mail.ui.main.settings
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.viewModels
-import com.infomaniak.core.myksuite.ui.views.MyKSuiteDashboardFragment
+import com.infomaniak.core.ksuite.myksuite.ui.views.MyKSuiteDashboardFragment
 import com.infomaniak.mail.R
 import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.extensions.observeNotNull
 import com.infomaniak.mail.utils.extensions.setSystemBarsColors
 import com.infomaniak.mail.utils.getDashboardData
 import dagger.hilt.android.AndroidEntryPoint
-import com.infomaniak.core.myksuite.R as RMyKSuite
+import com.infomaniak.core.ksuite.myksuite.R as RMyKSuite
 
 @AndroidEntryPoint
 class KSuiteDashboardFragment : MyKSuiteDashboardFragment() {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/MykSuiteViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/MykSuiteViewModel.kt
@@ -19,7 +19,7 @@ package com.infomaniak.mail.ui.main.settings
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.infomaniak.core.myksuite.ui.data.MyKSuiteData
+import com.infomaniak.core.ksuite.myksuite.ui.data.MyKSuiteData
 import com.infomaniak.lib.core.utils.SingleLiveEvent
 import com.infomaniak.mail.data.cache.mailboxInfo.MailboxController
 import com.infomaniak.mail.data.models.mailbox.Mailbox
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
@@ -26,9 +26,9 @@ 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.data.MyKSuiteData
-import com.infomaniak.core.myksuite.ui.utils.MatomoMyKSuite
-import com.infomaniak.core.myksuite.ui.views.MyKSuiteDashboardFragmentArgs
+import com.infomaniak.core.ksuite.myksuite.ui.data.MyKSuiteData
+import com.infomaniak.core.ksuite.myksuite.ui.utils.MatomoMyKSuite
+import com.infomaniak.core.ksuite.myksuite.ui.views.MyKSuiteDashboardFragmentArgs
 import com.infomaniak.lib.applock.LockActivity
 import com.infomaniak.lib.applock.Utils.silentlyReverseSwitch
 import com.infomaniak.lib.core.utils.openAppNotificationSettings
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/ActionItemView.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/ActionItemView.kt
@@ -29,7 +29,7 @@ import androidx.annotation.StyleableRes
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import com.infomaniak.core.myksuite.ui.views.MyKSuitePlusChipView
+import com.infomaniak.core.ksuite.myksuite.ui.views.MyKSuitePlusChipView
 import com.infomaniak.lib.core.utils.getAttributes
 import com.infomaniak.lib.core.utils.setMarginsRelative
 import com.infomaniak.lib.core.utils.setPaddingRelative
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -45,7 +45,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.infomaniak.core.fragmentnavigation.safelyNavigate
-import com.infomaniak.core.myksuite.ui.utils.MatomoMyKSuite
+import com.infomaniak.core.ksuite.myksuite.ui.utils.MatomoMyKSuite
 import com.infomaniak.lib.core.utils.FilePicker
 import com.infomaniak.lib.core.utils.SnackbarUtils.showSnackbar
 import com.infomaniak.lib.core.utils.getBackNavigationResult
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MyKSuiteDataUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MyKSuiteDataUtils.kt
@@ -18,8 +18,8 @@
 package com.infomaniak.mail.utils
 
 import com.infomaniak.core.cancellable
-import com.infomaniak.core.myksuite.ui.data.MyKSuiteData
-import com.infomaniak.core.myksuite.ui.data.MyKSuiteDataManager
+import com.infomaniak.core.ksuite.myksuite.ui.data.MyKSuiteData
+import com.infomaniak.core.ksuite.myksuite.ui.data.MyKSuiteDataManager
 import com.infomaniak.lib.core.networking.HttpClient
 import com.infomaniak.lib.core.utils.SentryLog
 import com.infomaniak.mail.data.api.ApiRepository
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MyKSuiteNavUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MyKSuiteNavUtils.kt
@@ -23,11 +23,11 @@ import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
 import com.infomaniak.core.avatar.getBackgroundColorResBasedOnId
 import com.infomaniak.core.fragmentnavigation.isAtInitialDestination
-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.utils.MyKSuiteUiUtils
-import com.infomaniak.core.myksuite.ui.utils.MyKSuiteUiUtils.openMyKSuiteUpgradeBottomSheet
+import com.infomaniak.core.ksuite.myksuite.ui.data.MyKSuiteData
+import com.infomaniak.core.ksuite.myksuite.ui.screens.KSuiteApp
+import com.infomaniak.core.ksuite.myksuite.ui.screens.MyKSuiteDashboardScreenData
+import com.infomaniak.core.ksuite.myksuite.ui.utils.MyKSuiteUiUtils
+import com.infomaniak.core.ksuite.myksuite.ui.utils.MyKSuiteUiUtils.openMyKSuiteUpgradeBottomSheet
 import com.infomaniak.lib.core.models.user.User
 import com.infomaniak.mail.MatomoMail.trackMyKSuiteUpgradeBottomSheetEvent
 import com.infomaniak.mail.R
diff --git a/app/src/main/res/layout/view_setting_radio_button.xml b/app/src/main/res/layout/view_setting_radio_button.xml
@@ -50,7 +50,7 @@
         android:visibility="invisible"
         app:tint="?android:attr/colorPrimary" />
 
-    <com.infomaniak.core.myksuite.ui.views.MyKSuitePlusChipView
+    <com.infomaniak.core.ksuite.myksuite.ui.views.MyKSuitePlusChipView
         android:id="@+id/myKSuitePlusChip"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/navigation/main_navigation.xml b/app/src/main/res/navigation/main_navigation.xml
@@ -736,6 +736,6 @@
         android:label="MyKSuiteDashboardFragment">
         <argument
             android:name="dashboardData"
-            app:argType="com.infomaniak.core.myksuite.ui.screens.MyKSuiteDashboardScreenData" />
+            app:argType="com.infomaniak.core.ksuite.myksuite.ui.screens.MyKSuiteDashboardScreenData" />
     </fragment>
 </navigation>
diff --git a/settings.gradle b/settings.gradle
@@ -36,7 +36,8 @@ include ':app',
         ':Core:Legacy:Confetti',
         ':Core:Legacy:Stores',
         ':Core:Matomo',
-        ':Core:MyKSuite',
+        ':Core:kSuite:kSuitePro',
+        ':Core:kSuite:MyKSuite',
         ':Core:Network',
         ':Core:Network:Models',
         ':Core:Sentry',
