Skip to content

chore: Move both kSuite modules into a common parent module #2524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2025
Merged

chore: Move both kSuite modules into a common parent module #2524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core
Open in desktop
Submodule Core updated 68 files
+1 −1 kSuite/MykSuite/build.gradle.kts
+0 −0 kSuite/MykSuite/consumer-rules.pro
+0 −0 kSuite/MykSuite/proguard-rules.pro
+0 −0 kSuite/MykSuite/schemas/com.infomaniak.core.ksuite.myksuite.ui.data.MyKSuiteDatabase/1.json
+4 −4 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/components/MyKSuiteChips.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/components/MyKSuiteGradient.kt
+4 −4 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/components/MyKSuitePrimaryButton.kt
+5 −5 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/components/TextWithIcon.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/components/WeightOneSpacer.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/data/AvatarData.kt
+3 −3 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/data/MyKSuiteData.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/data/MyKSuiteDataDao.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/data/MyKSuiteDataManager.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/data/MyKSuiteDatabase.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/data/kSuiteDrive.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/data/kSuiteMail.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/network/ApiRoutes.kt
+20 −20 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/screens/MyKSuiteDashboardScreen.kt
+7 −7 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/screens/MyKSuiteUpgradeBottomSheet.kt
+2 −2 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/screens/MyKSuiteUpgradeFeature.kt
+6 −6 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/screens/components/ExpandableItemView.kt
+7 −7 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/screens/components/InformationBlock.kt
+5 −5 ...MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/screens/components/LimitedFunctionnalities.kt
+5 −5 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/screens/components/MyKSuiteTextItem.kt
+6 −6 ...e/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/screens/components/ProductsStorageQuotas.kt
+9 −9 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/screens/components/UpgradeFeature.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/theme/ColorsDark.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/theme/ColorsLight.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/theme/Dimens.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/theme/Theme.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/theme/Type.kt
+1 −1 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/utils/MatomoMyKSuite.kt
+8 −8 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/utils/MyKSuiteUiUtils.kt
+5 −5 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/views/BaseMyKSuiteChipView.kt
+2 −2 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/views/MyKSuiteChipView.kt
+4 −4 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/views/MyKSuiteDashboardFragment.kt
+2 −2 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/views/MyKSuitePlusChipView.kt
+5 −5 kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/views/MyKSuiteUpgradeBottomSheetDialog.kt
+0 −0 kSuite/MykSuite/src/main/res/drawable-night/ic_logo_my_ksuite.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable-night/ic_logo_my_ksuite_plus.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable-night/illu_banner.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable-night/illu_dashboard_background.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/ic_chevron_down.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/ic_chevron_up.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/ic_circle_i.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/ic_cross_thick.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/ic_drive_cloud.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/ic_envelope_bold.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/ic_enveloppe_italic.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/ic_folder_circle_filled_arrow_up.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/ic_gift.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/ic_logo_my_ksuite.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/ic_logo_my_ksuite_plus.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/ic_padlock.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/ic_paperplane.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/illu_banner.xml
+0 −0 kSuite/MykSuite/src/main/res/drawable/illu_dashboard_background.xml
+4 −4 kSuite/MykSuite/src/main/res/navigation/my_ksuite_navigation.xml
+0 −0 kSuite/MykSuite/src/main/res/values-de/strings.xml
+0 −0 kSuite/MykSuite/src/main/res/values-es/strings.xml
+0 −0 kSuite/MykSuite/src/main/res/values-fr/strings.xml
+0 −0 kSuite/MykSuite/src/main/res/values-it/strings.xml
+0 −0 kSuite/MykSuite/src/main/res/values-night/colors.xml
+0 −0 kSuite/MykSuite/src/main/res/values/attrs.xml
+0 −0 kSuite/MykSuite/src/main/res/values/colors.xml
+0 −0 kSuite/MykSuite/src/main/res/values/strings.xml
+45 −0 kSuite/build.gradle.kts
+45 −0 kSuite/kSuitePro/build.gradle.kts
3 changes: 2 additions & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/mail/MatomoMail.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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() {

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/infomaniak/mail/ui/main/settings/KSuiteDashboardFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/mail/ui/main/settings/MykSuiteViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/ActionItemView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/infomaniak/mail/utils/MyKSuiteDataUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/infomaniak/mail/utils/MyKSuiteNavUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/view_setting_radio_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/navigation/main_navigation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 2 additions & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down