Format code

app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomStickyButtonScaffold.kt

@@ -37,7 +37,7 @@ fun BottomStickyButtonScaffold(
                 .fillMaxWidth()
                 .padding(contentPaddings)
         ) {
-            Box(modifier = Modifier.weight(1f), content = content)
+            Box(modifier = Modifier.weight(1.0f), content = content)
             DoubleButtonCombo(topButton, bottomButton)
         }
     }

app/src/main/java/com/infomaniak/swisstransfer/ui/components/Buttons.kt

@@ -69,7 +69,7 @@ private fun CoreButton(
     enabled: Boolean,
     onClick: () -> Unit,
     imageVector: ImageVector?,
-    titleRes: Int
+    titleRes: Int,
 ) {
     Button(
         modifier = modifier.height(buttonSize.height),
@@ -114,7 +114,8 @@ enum class ButtonType(val buttonColors: @Composable () -> ButtonColors) {
 }
 
 private enum class ButtonSize(val height: Dp) {
-    LARGE(56.dp), SMALL(40.dp)
+    LARGE(56.dp),
+    SMALL(40.dp),
 }
 
 @Preview(name = "Light")

app/src/main/java/com/infomaniak/swisstransfer/ui/components/DoubleButtonCombo.kt

@@ -86,8 +86,8 @@ private fun HorizontallyStackedButtons(
         horizontalArrangement = Arrangement.spacedBy(Margin.Medium),
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        topButton(Modifier.weight(1f))
-        bottomButton(Modifier.weight(1f))
+        topButton(Modifier.weight(1.0f))
+        bottomButton(Modifier.weight(1.0f))
     }
 }
 

app/src/main/java/com/infomaniak/swisstransfer/ui/components/TwoPaneScaffold.kt

@@ -61,27 +61,17 @@ fun <T> TwoPaneScaffold(
     val navigator = rememberListDetailPaneScaffoldNavigator<T>(
         scaffoldDirective = paneScaffoldDirective.copy(
             maxHorizontalPartitions = maxHorizontalPartitions,
-            horizontalPartitionSpacerSize = 0.dp
-        )
+            horizontalPartitionSpacerSize = 0.dp,
+        ),
     )
 
-    BackHandler(navigator.canNavigateBack()) {
-        navigator.navigateBack()
-    }
+    BackHandler(navigator.canNavigateBack()) { navigator.navigateBack() }
 
     ListDetailPaneScaffold(
         directive = navigator.scaffoldDirective,
         value = navigator.scaffoldValue,
-        listPane = {
-            AnimatedPane {
-                navigator.listPane()
-            }
-        },
-        detailPane = {
-            AnimatedPane {
-                navigator.detailPane()
-            }
-        },
+        listPane = { AnimatedPane { navigator.listPane() } },
+        detailPane = { AnimatedPane { navigator.detailPane() } },
         modifier = modifier,
     )
 }

app/src/main/java/com/infomaniak/swisstransfer/ui/navigation/NavigationDestination.kt

@@ -51,6 +51,7 @@ sealed class MainNavigation : NavigationDestination() {
  */
 @Serializable
 sealed class NewTransferNavigation : NavigationDestination() {
+
     @Serializable
     data object ImportFilesDestination : NewTransferNavigation()
     @Serializable
@@ -83,6 +84,7 @@ sealed class NavigationDestination {
         }
 
         fun <T : NavigationDestination> toDestination(kClass: KClass<T>, backStackEntry: NavBackStackEntry?): T? {
+
             fun kClassFromRoute(route: String) = kClass.sealedSubclasses.firstOrNull {
                 route.contains(it.qualifiedName.toString())
             }
@@ -98,9 +100,7 @@ sealed class NavigationDestination {
 
         private fun <T : NavigationDestination> createInstance(kClass: KClass<T>, bundle: Bundle?): T? {
             return kClass.primaryConstructor?.let {
-                val args = it.parameters.associateWith { parameter ->
-                    bundle?.get(parameter.name)
-                }
+                val args = it.parameters.associateWith { parameter -> bundle?.get(parameter.name) }
                 it.callBy(args)
             } ?: kClass.objectInstance
         }

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainNavHost.kt

@@ -48,20 +48,14 @@ fun MainNavHost(
         exitTransition = { if (currentDestination.enableTransition) fadeOut() else ExitTransition.None },
     ) {
         composable<SentDestination> {
-            SentScreen(
-                navigateToDetails = { navController.navigate(TransferDetailsDestination(it)) },
-            )
+            SentScreen(navigateToDetails = { navController.navigate(::TransferDetailsDestination) })
         }
         composable<ReceivedDestination> {
-            ReceivedScreen(
-                navigateToDetails = { navController.navigate(TransferDetailsDestination(it)) },
-            )
+            ReceivedScreen(navigateToDetails = { navController.navigate(::TransferDetailsDestination) })
         }
         composable<TransferDetailsDestination> {
             val transferDetails: TransferDetailsDestination = it.toRoute()
-            TransferDetailsScreen(
-                transferId = transferDetails.transferId,
-            )
+            TransferDetailsScreen(transferId = transferDetails.transferId)
         }
         composable<SettingsDestination> {
             SettingsScreenWrapper(windowAdaptiveInfo)

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScaffold.kt

@@ -44,7 +44,6 @@ fun MainScaffold(
     windowAdaptiveInfo: WindowAdaptiveInfo,
     content: @Composable () -> Unit = {},
 ) {
-
     val navType by rememberNavType(currentDestination, windowAdaptiveInfo)
 
     CompositionLocalProvider(LocalNavType provides navType) {
@@ -64,7 +63,7 @@ private fun MainScaffold(
             content()
         } else {
             Column {
-                Box(modifier = Modifier.weight(1f)) {
+                Box(modifier = Modifier.weight(1.0f)) {
                     content()
                 }
                 HorizontalDivider()

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentScreen.kt

@@ -86,7 +86,7 @@ fun EmptyScreen() {
         Text(
             modifier = Modifier.widthIn(max = maxWidth),
             text = stringResource(id = R.string.firstTransferDescription),
-            style = SwissTransferTheme.typography.bodyRegular
+            style = SwissTransferTheme.typography.bodyRegular,
         )
         Spacer(modifier = Modifier.height(Margin.Medium))
         ConstraintLayout {
@@ -95,18 +95,18 @@ fun EmptyScreen() {
             Icon(
                 modifier = Modifier
                     .constrainAs(icon) {
-                        top.linkTo(parent.top)
-                        end.linkTo(fab.start, margin = Margin.Small)
+                        top.linkTo(anchor = parent.top)
+                        end.linkTo(anchor = fab.start, margin = Margin.Small)
                     },
                 imageVector = AppIcons.Illu.ArrowCurvedDownright,
                 contentDescription = null,
             )
             NewTransferFab(
                 modifier = Modifier
                     .constrainAs(fab) {
-                        start.linkTo(parent.start)
-                        end.linkTo(parent.end)
-                        top.linkTo(parent.top, Margin.Large)
+                        start.linkTo(anchor = parent.start)
+                        end.linkTo(anchor = parent.end)
+                        top.linkTo(anchor = parent.top, margin = Margin.Large)
                     },
                 newTransferFabType = NewTransferFabType.EMPTY_STATE,
             )

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDownloadsLimitScreen.kt

@@ -47,7 +47,7 @@ fun SettingsDownloadsLimitScreen(navigateBack: (() -> Unit)?) {
         Column(
             modifier = Modifier
                 .verticalScroll(rememberScrollState())
-                .padding(paddingsValue)
+                .padding(paddingsValue),
         ) {
             SettingTitle(titleRes = R.string.settingsDownloadsLimitTitle)
 
@@ -62,8 +62,8 @@ enum class DownloadsLimit(
     override val imageVector: ImageVector? = null,
     override val imageVectorResId: Int? = null,
 ) : SettingOption {
-    TWOHUNDREDFIFTY({ "250" }),
-    ONEHUNDRED({ "100" }),
+    TWO_HUNDRED_FIFTY({ "250" }),
+    ONE_HUNDRED({ "100" }),
     TWENTY({ "20" }),
     ONE({ "1" }),
 }

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreenWrapper.kt

@@ -47,9 +47,9 @@ import com.infomaniak.swisstransfer.ui.utils.*
 @Composable
 fun SettingsScreenWrapper(windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo()) {
     TwoPaneScaffold<SettingsOptionScreens>(
-        windowAdaptiveInfo,
+        windowAdaptiveInfo = windowAdaptiveInfo,
         listPane = { ListPane(this) },
-        detailPane = { DetailPane(this) }
+        detailPane = { DetailPane(this) },
     )
 }
 

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt

@@ -54,7 +54,7 @@ fun SettingsThemeScreen(navigateBack: (() -> Unit)?) {
         Column(
             modifier = Modifier
                 .verticalScroll(rememberScrollState())
-                .padding(paddingsValue)
+                .padding(paddingsValue),
         ) {
             SettingTitle(titleRes = R.string.settingsThemeTitle)
 
@@ -67,7 +67,7 @@ fun SettingsThemeScreen(navigateBack: (() -> Unit)?) {
 enum class ThemeOption(
     override val title: @Composable () -> String,
     override val imageVector: ImageVector,
-    override val imageVectorResId: Int? = null
+    override val imageVectorResId: Int? = null,
 ) : SettingOption {
     SYSTEM({ stringResource(R.string.settingsOptionThemeSystem) }, AppIcons.BlackAndWhiteCircle),
     LIGHT({ stringResource(R.string.settingsOptionThemeLight) }, AppIcons.WhiteCircle),

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingItem.kt

@@ -78,7 +78,7 @@ private fun SettingItemContent(
     icon: ImageVector?,
     titleRes: Int,
     description: String?,
-    endIcon: EndIconType?
+    endIcon: EndIconType?,
 ) {
     Row(
         modifier = Modifier
@@ -92,7 +92,7 @@ private fun SettingItemContent(
             Spacer(modifier = Modifier.width(Margin.Medium))
         }
 
-        Column(modifier = Modifier.weight(1f)) {
+        Column(modifier = Modifier.weight(1.0f)) {
             Text(text = stringResource(id = titleRes), style = SwissTransferTheme.typography.bodyRegular)
 
             description?.let {
@@ -102,7 +102,6 @@ private fun SettingItemContent(
                     color = SwissTransferTheme.colors.tertiaryTextColor,
                 )
             }
-
         }
 
         endIcon?.let {
@@ -119,15 +118,15 @@ private fun SettingItemPreview() {
         Surface {
             Column(modifier = Modifier.selectableGroup()) {
                 SettingTitle(R.string.appName)
-                SettingItem(R.string.appName, { true }, AppIcons.Add, "Clair", EndIconType.CHEVRON) {}
-                SettingItem(R.string.appName, { false }, AppIcons.Folder, endIcon = EndIconType.OPEN_OUTSIDE) {}
-                SettingItem(R.string.appName, { false }, description = "1.1.2") {}
-                SettingItem(R.string.appName, { false }) {}
+                SettingItem(R.string.appName, isSelected = { true }, AppIcons.Add, "Clair", EndIconType.CHEVRON) {}
+                SettingItem(R.string.appName, isSelected = { false }, AppIcons.Folder, endIcon = EndIconType.OPEN_OUTSIDE) {}
+                SettingItem(R.string.appName, isSelected = { false }, description = "1.1.2") {}
+                SettingItem(R.string.appName, isSelected = { false }) {}
                 SettingDivider()
                 SettingTitle(R.string.appName)
-                SettingItem(R.string.appName, { false }, endIcon = EndIconType.OPEN_OUTSIDE) {}
-                SettingItem(R.string.appName, { false }, endIcon = EndIconType.OPEN_OUTSIDE) {}
-                SettingItem(R.string.appName, { false }, description = "0.0.1", onClick = null)
+                SettingItem(R.string.appName, isSelected = { false }, endIcon = EndIconType.OPEN_OUTSIDE) {}
+                SettingItem(R.string.appName, isSelected = { false }, endIcon = EndIconType.OPEN_OUTSIDE) {}
+                SettingItem(R.string.appName, isSelected = { false }, description = "0.0.1", onClick = null)
             }
         }
     }

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SingleSelectOptions.kt

@@ -59,7 +59,7 @@ fun SingleSelectOptions(items: List<SettingOption>, selectedItem: () -> Int, set
 private fun SettingOptionItem(item: SettingOption, isSelected: Boolean, onClick: () -> Unit) {
     SharpRippleButton(
         modifier = Modifier.selectable(selected = isSelected, onClick = onClick),
-        onClick = onClick
+        onClick = onClick,
     ) {
         Row(
             Modifier
@@ -72,7 +72,7 @@ private fun SettingOptionItem(item: SettingOption, isSelected: Boolean, onClick:
                 Spacer(modifier = Modifier.width(Margin.Medium))
             }
 
-            Text(text = item.title(), Modifier.weight(1f))
+            Text(text = item.title(), Modifier.weight(1.0f))
 
             if (isSelected) Spacer(modifier = Modifier.width(Margin.Medium))
             AnimatedVisibility(
@@ -111,8 +111,8 @@ private fun SettingOptionItemPreview() {
                     override val imageVector: ImageVector = AppIcons.Add
                     override val imageVectorResId = null
                 }
-                SettingOptionItem(item, true) {}
-                SettingOptionItem(item, false) {}
+                SettingOptionItem(item = item, isSelected = true) {}
+                SettingOptionItem(item = item, isSelected = false) {}
             }
         }
     }

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferNavHost.kt

@@ -39,7 +39,7 @@ fun NewTransferNavHost(navController: NavHostController) {
             ImportFilesScreen(navigateToTransferTypeScreen = { navController.navigate(TransferTypeDestination) })
         }
         composable<TransferTypeDestination> {
-            TransferTypeScreen(navigateToTransfer = { /*TODO*/ }, popBack = { navController.navigateUp() })
+            TransferTypeScreen(navigateToTransfer = { /* TODO */ }, popBack = { navController.navigateUp() })
         }
         composable<TransferOptionsDestination> {
             TransferOptionsScreen()
@@ -54,5 +54,4 @@ fun NewTransferNavHost(navController: NavHostController) {
             UploadSuccessScreen()
         }
     }
-
 }

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt

@@ -49,7 +49,7 @@ fun ImportFilesScreen(navigateToTransferTypeScreen: () -> Unit) {
             SwissTransferTobAppBar(
                 titleRes = R.string.importFilesScreenTitle,
                 navigationMenu = null,
-                TopAppBarButton.closeButton { /*TODO*/ }
+                TopAppBarButton.closeButton { /* TODO */ },
             )
         },
         topButton = { modifier ->
@@ -89,11 +89,11 @@ private fun UploadSourceChoiceBottomSheet(
             titleRes = R.string.transferUploadSourceChoiceTitle,
             content = {
                 Column {
-                    BottomSheetItem(AppIcons.Camera, R.string.transferUploadSourceChoiceCamera) { /*TODO*/ }
+                    BottomSheetItem(AppIcons.Camera, R.string.transferUploadSourceChoiceCamera) { /* TODO */ }
                     HorizontalDivider(Modifier.padding(horizontal = Margin.Medium))
-                    BottomSheetItem(AppIcons.PolaroidLandscape, R.string.transferUploadSourceChoiceGallery) { /*TODO*/ }
+                    BottomSheetItem(AppIcons.PolaroidLandscape, R.string.transferUploadSourceChoiceGallery) { /* TODO */ }
                     HorizontalDivider(Modifier.padding(horizontal = Margin.Medium))
-                    BottomSheetItem(AppIcons.Folder, R.string.transferUploadSourceChoiceFiles) { /*TODO*/ }
+                    BottomSheetItem(AppIcons.Folder, R.string.transferUploadSourceChoiceFiles) { /* TODO */ }
                 }
             },
         )
@@ -115,7 +115,7 @@ private fun ImportFilesScreenPreview() {
 private fun ImportChoiceBottomSheetPreview() {
     SwissTransferTheme {
         Surface {
-            UploadSourceChoiceBottomSheet({ true }, {})
+            UploadSourceChoiceBottomSheet(isBottomSheetVisible = { true }, onDismissRequest = {})
         }
     }
 }

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferTypeScreen.kt

@@ -50,7 +50,7 @@ fun TransferTypeScreen(navigateToTransfer: (TransferType) -> Unit, popBack: () -
         SwissTransferTobAppBar(
             titleRes = R.string.transferTypeScreenTitle,
             navigationMenu = TopAppBarButton.backButton(popBack),
-            TopAppBarButton.closeButton { /*TODO*/ }
+            TopAppBarButton.closeButton { /* TODO */ }
         )
     }) { contentPaddings ->
         Column(

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/TransferTypeButtons.kt

@@ -52,7 +52,7 @@ fun TransferTypeButtons(items: List<TransferType>, navigateToTransfer: (Transfer
             TransferTypeButton(
                 modifier = Modifier.aspectRatio(0.87f),
                 item = item,
-                onClick = { navigateToTransfer(item) }
+                onClick = { navigateToTransfer(item) },
             )
         }
     }

app/src/main/java/com/infomaniak/swisstransfer/ui/theme/Theme.kt

@@ -42,7 +42,7 @@ fun SwissTransferTheme(
         MaterialTheme(
             colorScheme = if (darkTheme) DarkColorScheme else LightColorScheme,
             shapes = Shapes,
-            content = content
+            content = content,
         )
     }
 }

app/src/main/java/com/infomaniak/swisstransfer/ui/theme/Type.kt

@@ -136,5 +136,5 @@ data class CustomTypography(
     val specificMedium32: TextStyle,
     val specificMedium22: TextStyle,
     val specificLight22: TextStyle,
-    val specificLight18: TextStyle
+    val specificLight18: TextStyle,
 )