From 0d1cfb309e38e2872ea59b854cd5ee62affe0ede Mon Sep 17 00:00:00 2001 From: Fabian DEVEL Date: Tue, 4 Feb 2025 14:10:26 +0100 Subject: [PATCH] refactor(MykSuiteModule): Mark as internal the functions and class that doesn't need to be exposed --- .../myksuite/ui/components/MyKSuitePrimaryButton.kt | 12 +++++------- .../ui/screens/MyKSuiteUpgradeBottomSheet.kt | 12 +++++++----- .../ui/screens/components/AppStorageQuotas.kt | 2 +- .../ui/screens/components/ExpandableItemView.kt | 2 +- .../ui/screens/components/LimitedFunctionnalities.kt | 2 +- .../{ButtonType.kt => MyKSuiteButtonType.kt} | 2 +- .../myksuite/ui/screens/components/UpgradeFeature.kt | 2 +- .../myksuite/ui/screens/components/UserAvatar.kt | 2 +- .../com/infomaniak/core/myksuite/ui/theme/Theme.kt | 4 +--- .../ui/views/MyKSuiteUpgradeBottomSheetDialog.kt | 4 ++-- 10 files changed, 21 insertions(+), 23 deletions(-) rename MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/{ButtonType.kt => MyKSuiteButtonType.kt} (95%) diff --git a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/components/MyKSuitePrimaryButton.kt b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/components/MyKSuitePrimaryButton.kt index a5f0b2e3..86988cd9 100644 --- a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/components/MyKSuitePrimaryButton.kt +++ b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/components/MyKSuitePrimaryButton.kt @@ -20,7 +20,6 @@ package com.infomaniak.core.myksuite.ui.components import android.content.res.Configuration import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.material3.Button import androidx.compose.material3.Surface @@ -29,9 +28,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Shape import androidx.compose.ui.tooling.preview.Preview -import com.infomaniak.core.myksuite.R -import com.infomaniak.core.myksuite.ui.screens.components.ButtonType import com.infomaniak.core.myksuite.ui.screens.components.MyKSuiteButtonColors +import com.infomaniak.core.myksuite.ui.screens.components.MyKSuiteButtonType import com.infomaniak.core.myksuite.ui.theme.Dimens import com.infomaniak.core.myksuite.ui.theme.Margin import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme @@ -64,14 +62,14 @@ private fun Preview() { Column(verticalArrangement = Arrangement.spacedBy(Margin.Large)) { MyKSuitePrimaryButton( text = "Lorem", - shape = ButtonType.Mail.shape, - colors = ButtonType.Mail.colors, + shape = MyKSuiteButtonType.Mail.shape, + colors = MyKSuiteButtonType.Mail.colors, onClick = {}, ) MyKSuitePrimaryButton( text = "Close", - shape = ButtonType.Drive.shape, - colors = ButtonType.Drive.colors, + shape = MyKSuiteButtonType.Drive.shape, + colors = MyKSuiteButtonType.Drive.colors, onClick = {}, ) } diff --git a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/MyKSuiteUpgradeBottomSheet.kt b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/MyKSuiteUpgradeBottomSheet.kt index a62a3f3a..5168babf 100644 --- a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/MyKSuiteUpgradeBottomSheet.kt +++ b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/MyKSuiteUpgradeBottomSheet.kt @@ -34,16 +34,18 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import com.infomaniak.core.myksuite.R import com.infomaniak.core.myksuite.ui.components.MyKSuitePrimaryButton -import com.infomaniak.core.myksuite.ui.screens.components.ButtonType +import com.infomaniak.core.myksuite.ui.screens.components.MyKSuiteButtonType import com.infomaniak.core.myksuite.ui.screens.components.UpgradeFeature -import com.infomaniak.core.myksuite.ui.theme.* +import com.infomaniak.core.myksuite.ui.theme.LocalMyKSuiteColors +import com.infomaniak.core.myksuite.ui.theme.Margin +import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme import com.infomaniak.core.myksuite.ui.theme.Typography @OptIn(ExperimentalMaterial3Api::class) @Composable fun MyKSuiteUpgradeBottomSheet( modifier: Modifier = Modifier, - style: ButtonType, + style: MyKSuiteButtonType, sheetState: SheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true), onDismissRequest: () -> Unit, customFeatures: (() -> List)?, @@ -58,7 +60,7 @@ fun MyKSuiteUpgradeBottomSheet( @Composable private fun UpgradeBottomSheetContent( customFeatures: (() -> List)?, - style: ButtonType, + style: MyKSuiteButtonType, onButtonClicked: () -> Unit, ) { val localColors = LocalMyKSuiteColors.current @@ -133,7 +135,7 @@ private fun Preview() { customFeatures = { listOf(MyKSuiteUpgradeFeatures(title = R.string.myKSuiteUpgradeLabel, icon = R.drawable.ic_gift)) }, - style = ButtonType.Mail, + style = MyKSuiteButtonType.Mail, onButtonClicked = {} ) } diff --git a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/AppStorageQuotas.kt b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/AppStorageQuotas.kt index 3299afdc..78dbab0c 100644 --- a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/AppStorageQuotas.kt +++ b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/AppStorageQuotas.kt @@ -36,7 +36,7 @@ import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme import com.infomaniak.core.myksuite.ui.theme.Typography @Composable -fun AppStorageQuotas(modifier: Modifier) { +internal fun AppStorageQuotas(modifier: Modifier) { Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(Margin.Medium)) { KSuiteApp.entries.forEach { AppStorageQuota(app = it) } } diff --git a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/ExpandableItemView.kt b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/ExpandableItemView.kt index 958f71a3..e775b2fe 100644 --- a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/ExpandableItemView.kt +++ b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/ExpandableItemView.kt @@ -38,7 +38,7 @@ import com.infomaniak.core.myksuite.R import com.infomaniak.core.myksuite.ui.theme.* @Composable -fun ExpendableActionItem( +internal fun ExpendableActionItem( @DrawableRes iconRes: Int, @StringRes textRes: Int, expendedView: (@Composable () -> Unit)? = null, diff --git a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/LimitedFunctionnalities.kt b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/LimitedFunctionnalities.kt index 0a646913..37b3adcd 100644 --- a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/LimitedFunctionnalities.kt +++ b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/LimitedFunctionnalities.kt @@ -34,7 +34,7 @@ import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme import com.infomaniak.core.myksuite.ui.theme.Typography @Composable -fun LimitedFunctionalities(paddedModifier: Modifier, dailySendingLimit: String) { +internal fun LimitedFunctionalities(paddedModifier: Modifier, dailySendingLimit: String) { Column( modifier = paddedModifier.padding(top = Margin.Mini), verticalArrangement = Arrangement.spacedBy(Margin.Mini), diff --git a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/ButtonType.kt b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/MyKSuiteButtonType.kt similarity index 95% rename from MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/ButtonType.kt rename to MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/MyKSuiteButtonType.kt index 6d0f616f..d31fbf23 100644 --- a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/ButtonType.kt +++ b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/MyKSuiteButtonType.kt @@ -27,7 +27,7 @@ import androidx.compose.ui.unit.dp import com.infomaniak.core.myksuite.ui.theme.Dimens import com.infomaniak.core.myksuite.ui.theme.LocalMyKSuiteColors -enum class ButtonType(val colors: @Composable () -> MyKSuiteButtonColors, val shape: Shape) { +enum class MyKSuiteButtonType(val colors: @Composable () -> MyKSuiteButtonColors, val shape: Shape) { Mail( colors = { val localColors = LocalMyKSuiteColors.current diff --git a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/UpgradeFeature.kt b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/UpgradeFeature.kt index dc34315c..1011db6a 100644 --- a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/UpgradeFeature.kt +++ b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/UpgradeFeature.kt @@ -33,7 +33,7 @@ import com.infomaniak.core.myksuite.ui.screens.MyKSuiteUpgradeFeatures import com.infomaniak.core.myksuite.ui.theme.* @Composable -fun ColumnScope.UpgradeFeature(customFeature: MyKSuiteUpgradeFeatures, modifier: Modifier = Modifier) { +internal fun ColumnScope.UpgradeFeature(customFeature: MyKSuiteUpgradeFeatures, modifier: Modifier = Modifier) { val localColors = LocalMyKSuiteColors.current Row( modifier = modifier diff --git a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/UserAvatar.kt b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/UserAvatar.kt index 2463580c..010f9b3f 100644 --- a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/UserAvatar.kt +++ b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/UserAvatar.kt @@ -43,7 +43,7 @@ import com.infomaniak.core.myksuite.ui.theme.LocalMyKSuiteColors import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme @Composable -fun UserAvatar(avatarUri: String) { +internal fun UserAvatar(avatarUri: String) { val context = LocalContext.current var shouldDisplayPreview by rememberSaveable(avatarUri) { mutableStateOf(true) } diff --git a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/theme/Theme.kt b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/theme/Theme.kt index 0aa8d03f..fb1648b8 100644 --- a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/theme/Theme.kt +++ b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/theme/Theme.kt @@ -26,9 +26,7 @@ import androidx.compose.ui.graphics.Color internal val LocalMyKSuiteColors: ProvidableCompositionLocal = staticCompositionLocalOf { MyKSuiteColors() } @Composable -internal fun MyKSuiteTheme( - content: @Composable () -> Unit, -) { +internal fun MyKSuiteTheme(content: @Composable () -> Unit) { val isDarkTheme = isSystemInDarkTheme() val customColors = if (isDarkTheme) MyKSuiteDarkColors else MyKSuiteLightColors diff --git a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/views/MyKSuiteUpgradeBottomSheetDialog.kt b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/views/MyKSuiteUpgradeBottomSheetDialog.kt index dbe545d2..40c69b31 100644 --- a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/views/MyKSuiteUpgradeBottomSheetDialog.kt +++ b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/views/MyKSuiteUpgradeBottomSheetDialog.kt @@ -28,7 +28,7 @@ import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.infomaniak.core.myksuite.ui.screens.MyKSuiteUpgradeBottomSheet -import com.infomaniak.core.myksuite.ui.screens.components.ButtonType +import com.infomaniak.core.myksuite.ui.screens.components.MyKSuiteButtonType @OptIn(ExperimentalMaterial3Api::class) class MyKSuiteUpgradeBottomSheetDialog : BottomSheetDialogFragment() { @@ -40,7 +40,7 @@ class MyKSuiteUpgradeBottomSheetDialog : BottomSheetDialogFragment() { setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) setContent { MyKSuiteUpgradeBottomSheet( - style = ButtonType.Mail, + style = MyKSuiteButtonType.Mail, onDismissRequest = this@MyKSuiteUpgradeBottomSheetDialog.findNavController()::popBackStack, customFeatures = { navigationArgs.upgradeFeatures.toList() } )