Skip to content

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

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 #470

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 MyKSuite/build.gradle.kts → kSuite/MykSuite/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ val javaVersion: JavaVersion by rootProject.extra

android {

namespace = "com.infomaniak.core.myksuite"
namespace = "com.infomaniak.core.ksuite.myksuite"
compileSdk = coreCompileSdk

defaultConfig {
Expand Down
0 MyKSuite/consumer-rules.pro → kSuite/MykSuite/consumer-rules.pro
View file
Open in desktop
File renamed without changes.
0 MyKSuite/proguard-rules.pro → kSuite/MykSuite/proguard-rules.pro
View file
Open in desktop
File renamed without changes.
0 ....myksuite.ui.data.MyKSuiteDatabase/1.json → ....myksuite.ui.data.MyKSuiteDatabase/1.json
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...e/myksuite/ui/components/MyKSuiteChips.kt → ...e/myksuite/ui/components/MyKSuiteChips.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.components
package com.infomaniak.core.ksuite.myksuite.ui.components

import android.content.res.Configuration
import androidx.annotation.ColorInt
Expand All @@ -36,9 +36,9 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.tooling.preview.Preview
import com.infomaniak.core.compose.margin.Margin
import com.infomaniak.core.myksuite.R
import com.infomaniak.core.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.ksuite.myksuite.R
import com.infomaniak.core.ksuite.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.ksuite.myksuite.ui.theme.MyKSuiteTheme

@Composable
fun MyKSuiteChip(modifier: Modifier = Modifier, tier: MyKSuiteTier, @ColorInt backgroundColor: Int? = null) {
Expand Down
2 changes: 1 addition & 1 deletion ...yksuite/ui/components/MyKSuiteGradient.kt → ...yksuite/ui/components/MyKSuiteGradient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.components
package com.infomaniak.core.ksuite.myksuite.ui.components

import androidx.compose.foundation.BorderStroke
import androidx.compose.ui.geometry.Offset
Expand Down
8 changes: 4 additions & 4 deletions ...te/ui/components/MyKSuitePrimaryButton.kt → ...te/ui/components/MyKSuitePrimaryButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.components
package com.infomaniak.core.ksuite.myksuite.ui.components

import android.content.res.Configuration
import androidx.compose.foundation.layout.Arrangement
Expand All @@ -32,9 +32,9 @@ import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.tooling.preview.Preview
import com.infomaniak.core.compose.basics.ButtonType
import com.infomaniak.core.compose.margin.Margin
import com.infomaniak.core.myksuite.ui.theme.Dimens
import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.myksuite.ui.theme.Typography
import com.infomaniak.core.ksuite.myksuite.ui.theme.Dimens
import com.infomaniak.core.ksuite.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.ksuite.myksuite.ui.theme.Typography

@Composable
internal fun MyKSuitePrimaryButton(
Expand Down
10 changes: 5 additions & 5 deletions ...re/myksuite/ui/components/TextWithIcon.kt → ...te/myksuite/ui/components/TextWithIcon.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.components
package com.infomaniak.core.ksuite.myksuite.ui.components

import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Surface
Expand All @@ -37,10 +37,10 @@ import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.infomaniak.core.compose.margin.Margin
import com.infomaniak.core.myksuite.R
import com.infomaniak.core.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.myksuite.ui.theme.Typography
import com.infomaniak.core.ksuite.myksuite.R
import com.infomaniak.core.ksuite.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.ksuite.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.ksuite.myksuite.ui.theme.Typography

/** This component allows to put an icon on any line of the text, thanks to the [iconLine] parameter
* This code comes from [here](https://stackoverflow.com/questions/70708056/how-to-centrally-align-icon-to-first-line-of-a-text-component-in-compose/71312465#71312465)
Expand Down
2 changes: 1 addition & 1 deletion ...myksuite/ui/components/WeightOneSpacer.kt → ...myksuite/ui/components/WeightOneSpacer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.components
package com.infomaniak.core.ksuite.myksuite.ui.components

import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.RowScope
Expand Down
2 changes: 1 addition & 1 deletion ...aniak/core/myksuite/ui/data/AvatarData.kt → ...ore/ksuite/myksuite/ui/data/AvatarData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.data
package com.infomaniak.core.ksuite.myksuite.ui.data

import android.os.Parcelable
import androidx.annotation.ColorInt
Expand Down
6 changes: 3 additions & 3 deletions ...iak/core/myksuite/ui/data/MyKSuiteData.kt → ...e/ksuite/myksuite/ui/data/MyKSuiteData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.data
package com.infomaniak.core.ksuite.myksuite.ui.data

import androidx.room.ColumnInfo
import androidx.room.Embedded
import androidx.room.Entity
import androidx.room.PrimaryKey
import com.infomaniak.core.myksuite.R
import com.infomaniak.core.myksuite.ui.components.MyKSuiteTier
import com.infomaniak.core.ksuite.myksuite.R
import com.infomaniak.core.ksuite.myksuite.ui.components.MyKSuiteTier
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import kotlinx.serialization.Transient
Expand Down
2 changes: 1 addition & 1 deletion .../core/myksuite/ui/data/MyKSuiteDataDao.kt → ...suite/myksuite/ui/data/MyKSuiteDataDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.data
package com.infomaniak.core.ksuite.myksuite.ui.data

import androidx.room.Dao
import androidx.room.Delete
Expand Down
2 changes: 1 addition & 1 deletion ...e/myksuite/ui/data/MyKSuiteDataManager.kt → ...e/myksuite/ui/data/MyKSuiteDataManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.data
package com.infomaniak.core.ksuite.myksuite.ui.data

import android.content.Context

Expand Down
2 changes: 1 addition & 1 deletion ...core/myksuite/ui/data/MyKSuiteDatabase.kt → ...uite/myksuite/ui/data/MyKSuiteDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.data
package com.infomaniak.core.ksuite.myksuite.ui.data

import android.content.Context
import androidx.room.Database
Expand Down
2 changes: 1 addition & 1 deletion ...niak/core/myksuite/ui/data/kSuiteDrive.kt → ...re/ksuite/myksuite/ui/data/kSuiteDrive.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.data
package com.infomaniak.core.ksuite.myksuite.ui.data

import androidx.room.ColumnInfo
import kotlinx.serialization.SerialName
Expand Down
2 changes: 1 addition & 1 deletion ...aniak/core/myksuite/ui/data/kSuiteMail.kt → ...ore/ksuite/myksuite/ui/data/kSuiteMail.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.data
package com.infomaniak.core.ksuite.myksuite.ui.data

import androidx.room.ColumnInfo
import kotlinx.serialization.SerialName
Expand Down
2 changes: 1 addition & 1 deletion ...iak/core/myksuite/ui/network/ApiRoutes.kt → ...e/ksuite/myksuite/ui/network/ApiRoutes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.network
package com.infomaniak.core.ksuite.myksuite.ui.network

object ApiRoutes {

Expand Down
40 changes: 20 additions & 20 deletions ...ite/ui/screens/MyKSuiteDashboardScreen.kt → ...ite/ui/screens/MyKSuiteDashboardScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.screens
package com.infomaniak.core.ksuite.myksuite.ui.screens

import android.annotation.SuppressLint
import android.content.res.Configuration
Expand Down Expand Up @@ -68,25 +68,25 @@ import androidx.compose.ui.unit.dp
import com.infomaniak.core.avatar.components.Avatar
import com.infomaniak.core.compose.margin.Margin
import com.infomaniak.core.extensions.openUrl
import com.infomaniak.core.myksuite.R
import com.infomaniak.core.myksuite.ui.components.MyKSuiteChip
import com.infomaniak.core.myksuite.ui.components.MyKSuitePrimaryButton
import com.infomaniak.core.myksuite.ui.components.MyKSuiteTier
import com.infomaniak.core.myksuite.ui.components.WeightOneSpacer
import com.infomaniak.core.myksuite.ui.components.myKSuiteGradient
import com.infomaniak.core.myksuite.ui.data.AvatarData
import com.infomaniak.core.myksuite.ui.network.ApiRoutes
import com.infomaniak.core.myksuite.ui.screens.components.ExpandableActionItem
import com.infomaniak.core.myksuite.ui.screens.components.InformationBlock
import com.infomaniak.core.myksuite.ui.screens.components.KSuiteProductsWithQuotas
import com.infomaniak.core.myksuite.ui.screens.components.LimitedFunctionalities
import com.infomaniak.core.myksuite.ui.screens.components.MyKSuiteTextItem
import com.infomaniak.core.myksuite.ui.screens.components.ProductsStorageQuotas
import com.infomaniak.core.myksuite.ui.screens.components.UpgradeFeature
import com.infomaniak.core.myksuite.ui.theme.Dimens
import com.infomaniak.core.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.myksuite.ui.theme.Typography
import com.infomaniak.core.ksuite.myksuite.R
import com.infomaniak.core.ksuite.myksuite.ui.components.MyKSuiteChip
import com.infomaniak.core.ksuite.myksuite.ui.components.MyKSuitePrimaryButton
import com.infomaniak.core.ksuite.myksuite.ui.components.MyKSuiteTier
import com.infomaniak.core.ksuite.myksuite.ui.components.WeightOneSpacer
import com.infomaniak.core.ksuite.myksuite.ui.components.myKSuiteGradient
import com.infomaniak.core.ksuite.myksuite.ui.data.AvatarData
import com.infomaniak.core.ksuite.myksuite.ui.network.ApiRoutes
import com.infomaniak.core.ksuite.myksuite.ui.screens.components.ExpandableActionItem
import com.infomaniak.core.ksuite.myksuite.ui.screens.components.InformationBlock
import com.infomaniak.core.ksuite.myksuite.ui.screens.components.KSuiteProductsWithQuotas
import com.infomaniak.core.ksuite.myksuite.ui.screens.components.LimitedFunctionalities
import com.infomaniak.core.ksuite.myksuite.ui.screens.components.MyKSuiteTextItem
import com.infomaniak.core.ksuite.myksuite.ui.screens.components.ProductsStorageQuotas
import com.infomaniak.core.ksuite.myksuite.ui.screens.components.UpgradeFeature
import com.infomaniak.core.ksuite.myksuite.ui.theme.Dimens
import com.infomaniak.core.ksuite.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.ksuite.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.ksuite.myksuite.ui.theme.Typography
import com.infomaniak.core.utils.FORMAT_DATE_SIMPLE
import com.infomaniak.core.utils.format
import kotlinx.parcelize.Parcelize
Expand Down
14 changes: 7 additions & 7 deletions .../ui/screens/MyKSuiteUpgradeBottomSheet.kt → .../ui/screens/MyKSuiteUpgradeBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.screens
package com.infomaniak.core.ksuite.myksuite.ui.screens

import android.content.res.Configuration
import android.os.Parcelable
Expand Down Expand Up @@ -45,12 +45,12 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import com.infomaniak.core.compose.basics.ButtonType
import com.infomaniak.core.compose.margin.Margin
import com.infomaniak.core.myksuite.R
import com.infomaniak.core.myksuite.ui.components.MyKSuitePrimaryButton
import com.infomaniak.core.myksuite.ui.screens.components.UpgradeFeature
import com.infomaniak.core.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.myksuite.ui.theme.Typography
import com.infomaniak.core.ksuite.myksuite.R
import com.infomaniak.core.ksuite.myksuite.ui.components.MyKSuitePrimaryButton
import com.infomaniak.core.ksuite.myksuite.ui.screens.components.UpgradeFeature
import com.infomaniak.core.ksuite.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.ksuite.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.ksuite.myksuite.ui.theme.Typography
import kotlinx.parcelize.Parcelize

@OptIn(ExperimentalMaterial3Api::class)
Expand Down
4 changes: 2 additions & 2 deletions ...uite/ui/screens/MyKSuiteUpgradeFeature.kt → ...uite/ui/screens/MyKSuiteUpgradeFeature.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.screens
package com.infomaniak.core.ksuite.myksuite.ui.screens

import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import com.infomaniak.core.myksuite.R
import com.infomaniak.core.ksuite.myksuite.R

internal enum class MyKSuiteUpgradeFeatures(@StringRes val title: Int, @DrawableRes val icon: Int) {

Expand Down
12 changes: 6 additions & 6 deletions .../screens/components/ExpandableItemView.kt → .../screens/components/ExpandableItemView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.screens.components
package com.infomaniak.core.ksuite.myksuite.ui.screens.components

import android.content.res.Configuration
import androidx.annotation.DrawableRes
Expand Down Expand Up @@ -44,11 +44,11 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.tooling.preview.Preview
import com.infomaniak.core.compose.margin.Margin
import com.infomaniak.core.myksuite.R
import com.infomaniak.core.myksuite.ui.theme.Dimens
import com.infomaniak.core.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.myksuite.ui.theme.Typography
import com.infomaniak.core.ksuite.myksuite.R
import com.infomaniak.core.ksuite.myksuite.ui.theme.Dimens
import com.infomaniak.core.ksuite.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.ksuite.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.ksuite.myksuite.ui.theme.Typography

@Composable
internal fun ExpandableActionItem(
Expand Down
14 changes: 7 additions & 7 deletions ...ui/screens/components/InformationBlock.kt → ...ui/screens/components/InformationBlock.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.screens.components
package com.infomaniak.core.ksuite.myksuite.ui.screens.components

import android.content.res.Configuration
import androidx.compose.foundation.background
Expand All @@ -34,12 +34,12 @@ import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
import com.infomaniak.core.compose.margin.Margin
import com.infomaniak.core.myksuite.R
import com.infomaniak.core.myksuite.ui.components.TextWithIcon
import com.infomaniak.core.myksuite.ui.theme.Dimens
import com.infomaniak.core.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.myksuite.ui.theme.Typography
import com.infomaniak.core.ksuite.myksuite.R
import com.infomaniak.core.ksuite.myksuite.ui.components.TextWithIcon
import com.infomaniak.core.ksuite.myksuite.ui.theme.Dimens
import com.infomaniak.core.ksuite.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.ksuite.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.ksuite.myksuite.ui.theme.Typography

@Composable
internal fun InformationBlock(modifier: Modifier = Modifier, text: String, buttonText: String, onClick: () -> Unit) {
Expand Down
10 changes: 5 additions & 5 deletions ...ens/components/LimitedFunctionnalities.kt → ...ens/components/LimitedFunctionnalities.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.screens.components
package com.infomaniak.core.ksuite.myksuite.ui.screens.components

import android.content.res.Configuration
import androidx.annotation.StringRes
Expand All @@ -32,10 +32,10 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import com.infomaniak.core.compose.margin.Margin
import com.infomaniak.core.myksuite.R
import com.infomaniak.core.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.myksuite.ui.theme.Typography
import com.infomaniak.core.ksuite.myksuite.R
import com.infomaniak.core.ksuite.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.ksuite.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.ksuite.myksuite.ui.theme.Typography

@Composable
internal fun LimitedFunctionalities(modifier: Modifier, dailySendingLimit: () -> String) {
Expand Down
10 changes: 5 additions & 5 deletions ...ui/screens/components/MyKSuiteTextItem.kt → ...ui/screens/components/MyKSuiteTextItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.screens.components
package com.infomaniak.core.ksuite.myksuite.ui.screens.components

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
Expand All @@ -30,10 +30,10 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.tooling.preview.Preview
import com.infomaniak.core.compose.margin.Margin
import com.infomaniak.core.myksuite.R
import com.infomaniak.core.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.myksuite.ui.theme.Typography
import com.infomaniak.core.ksuite.myksuite.R
import com.infomaniak.core.ksuite.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.ksuite.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.ksuite.myksuite.ui.theme.Typography
import com.infomaniak.core.utils.FORMAT_DATE_SIMPLE
import com.infomaniak.core.utils.format
import java.util.Date
Expand Down
12 changes: 6 additions & 6 deletions ...reens/components/ProductsStorageQuotas.kt → ...reens/components/ProductsStorageQuotas.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.core.myksuite.ui.screens.components
package com.infomaniak.core.ksuite.myksuite.ui.screens.components

import android.content.res.Configuration
import android.os.Parcelable
Expand All @@ -34,11 +34,11 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.infomaniak.core.compose.margin.Margin
import com.infomaniak.core.myksuite.R
import com.infomaniak.core.myksuite.ui.components.MyKSuiteTier
import com.infomaniak.core.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.myksuite.ui.theme.Typography
import com.infomaniak.core.ksuite.myksuite.R
import com.infomaniak.core.ksuite.myksuite.ui.components.MyKSuiteTier
import com.infomaniak.core.ksuite.myksuite.ui.theme.LocalMyKSuiteColors
import com.infomaniak.core.ksuite.myksuite.ui.theme.MyKSuiteTheme
import com.infomaniak.core.ksuite.myksuite.ui.theme.Typography
import kotlinx.parcelize.Parcelize

@Composable
Expand Down
Loading