refactor(MykSuiteModule): Mark as internal the functions and class th…

…at doesn't need to be exposed
Infomaniak · Feb 5, 2025 · 0d1cfb3 · 0d1cfb3
1 parent 65c29d0
commit 0d1cfb3
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 23 deletions.
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
@@ -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
@@ -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<MyKSuiteUpgradeFeatures>)?,
@@ -58,7 +60,7 @@ fun MyKSuiteUpgradeBottomSheet(
 @Composable
 private fun UpgradeBottomSheetContent(
     customFeatures: (() -> List<MyKSuiteUpgradeFeatures>)?,
-    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/...uite/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/AppStorageQuotas.kt b/...uite/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/...te/src/main/java/com/infomaniak/core/myksuite/ui/screens/components/ExpandableItemView.kt b/...te/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/...c/main/java/com/infomaniak/core/myksuite/ui/screens/components/LimitedFunctionnalities.kt b/...c/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/...suite/ui/screens/components/ButtonType.kt → .../screens/components/MyKSuiteButtonType.kt b/...suite/ui/screens/components/ButtonType.kt → .../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
@@ -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
@@ -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
@@ -26,9 +26,7 @@ import androidx.compose.ui.graphics.Color
 internal val LocalMyKSuiteColors: ProvidableCompositionLocal<MyKSuiteColors> = 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/...e/src/main/java/com/infomaniak/core/myksuite/ui/views/MyKSuiteUpgradeBottomSheetDialog.kt b/...e/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() }
                 )