diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt index 97d2cf937..7f0a47bcf 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt @@ -57,7 +57,7 @@ fun BottomSheetItem(imageVector: ImageVector, @StringRes titleRes: Int, onClick: modifier = Modifier.size(Margin.Large), imageVector = imageVector, contentDescription = null, - tint = SwissTransferTheme.materialColors.primary + tint = SwissTransferTheme.materialColors.primary, ) Spacer(modifier = Modifier.width(Margin.Large)) Text( diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomStickyButtonScaffold.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomStickyButtonScaffold.kt index 7149bfcb1..bb24f2421 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomStickyButtonScaffold.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomStickyButtonScaffold.kt @@ -34,7 +34,7 @@ fun BottomStickyButtonScaffold( Column( modifier = modifier .fillMaxWidth() - .padding(contentPaddings) + .padding(contentPaddings), ) { Box(modifier = Modifier.weight(1.0f), content = content) DoubleButtonCombo(topButton, bottomButton) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTobAppBar.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTobAppBar.kt index f39c25c20..231ba4d2f 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTobAppBar.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTobAppBar.kt @@ -54,7 +54,7 @@ fun BrandTobAppBar() { Spacer(modifier = Modifier.width(Margin.Small)) Text(text = stringResource(id = R.string.appName), color = SwissTransferTheme.colors.toolbarTextColor) } - } + }, ) } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/DoubleButtonCombo.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/DoubleButtonCombo.kt index a6da616c1..ab3c363d8 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/DoubleButtonCombo.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/DoubleButtonCombo.kt @@ -60,7 +60,7 @@ private fun VerticallyStackedButtons( topButton( Modifier .fillMaxWidth() - .padding(horizontal = Margin.Medium) + .padding(horizontal = Margin.Medium), ) Spacer(modifier = Modifier.height(Margin.Medium)) @@ -68,7 +68,7 @@ private fun VerticallyStackedButtons( bottomButton( Modifier .fillMaxWidth() - .padding(start = Margin.Medium, end = Margin.Medium, bottom = Margin.Large) + .padding(start = Margin.Medium, end = Margin.Medium, bottom = Margin.Large), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferBottomSheet.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferBottomSheet.kt index 85ce4a0e2..5a67b9baf 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferBottomSheet.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferBottomSheet.kt @@ -77,7 +77,7 @@ private fun BottomSheetContent( modifier = Modifier .fillMaxWidth() .verticalScroll(rememberScrollState()), - horizontalAlignment = Alignment.CenterHorizontally + horizontalAlignment = Alignment.CenterHorizontally, ) { imageVector?.let { Icon(imageVector = imageVector, contentDescription = null) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferTobAppBar.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferTobAppBar.kt index 228e47bad..6818d6436 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferTobAppBar.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferTobAppBar.kt @@ -44,13 +44,11 @@ fun SwissTransferTobAppBar( containerColor = SwissTransferTheme.materialColors.tertiary, titleContentColor = SwissTransferTheme.colors.toolbarTextColor, actionIconContentColor = SwissTransferTheme.colors.toolbarIconColor, - navigationIconContentColor = SwissTransferTheme.colors.toolbarIconColor + navigationIconContentColor = SwissTransferTheme.colors.toolbarIconColor, ), title = { Text(stringResource(id = titleRes)) }, navigationIcon = { navigationMenu?.let { MenuButton(navigationMenu) } }, - actions = { - actionMenus.forEach { actionMenu -> MenuButton(actionMenu) } - } + actions = { actionMenus.forEach { actionMenu -> MenuButton(actionMenu) } }, ) } @@ -86,7 +84,7 @@ private fun SwissTransferTobAppBarPreview() { titleRes = R.string.appName, navigationMenu = TopAppBarButton.backButton {}, TopAppBarButton(AppIcons.Add, R.string.appName) {}, - TopAppBarButton.closeButton {} + TopAppBarButton.closeButton {}, ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt index fd4935ac3..7f5930dce 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt @@ -77,15 +77,15 @@ fun AppNavigationSuiteScaffold( layoutType = layoutType, ) { Box( - Modifier.consumeWindowInsets( + modifier = Modifier.consumeWindowInsets( when (layoutType) { NavigationSuiteType.NavigationBar -> NavigationBarDefaults.windowInsets.only(WindowInsetsSides.Bottom) NavigationSuiteType.NavigationRail -> NavigationRailDefaults.windowInsets.only(WindowInsetsSides.Start) else -> WindowInsets(0, 0, 0, 0) - } - ) + }, + ), ) { content() } @@ -124,7 +124,7 @@ private fun AppNavigationRail( newTransferFabType = NewTransferFabType.NAVIGATION_RAIL, ) }, - containerColor = SwissTransferTheme.colors.navigationItemBackground + containerColor = SwissTransferTheme.colors.navigationItemBackground, ) { navigationItems.forEach { navigationItem -> NavigationRailItem( diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/ReceivedScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/ReceivedScreen.kt index c2829e7a8..15eec99a1 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/ReceivedScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/ReceivedScreen.kt @@ -41,7 +41,7 @@ private fun ReceivedScreen(navType: NavigationSuiteType) { Scaffold( floatingActionButton = { if (navType == NavigationSuiteType.NavigationBar) NewTransferFab(newTransferFabType = NewTransferFabType.BOTTOM_BAR) - } + }, ) { contentPadding -> Text( text = "Received screen", diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentScreen.kt index d2f3d0f4f..95a53f9ad 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentScreen.kt @@ -120,7 +120,7 @@ private fun TransferScreen( Scaffold( floatingActionButton = { if (navType == NavigationSuiteType.NavigationBar) NewTransferFab(newTransferFabType = NewTransferFabType.BOTTOM_BAR) - } + }, ) { contentPadding -> Text( text = "Sent screen", diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDurationValidityScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDurationValidityScreen.kt index 5e2e8e5d8..97df99f1f 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDurationValidityScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDurationValidityScreen.kt @@ -47,7 +47,7 @@ fun SettingsValidityPeriodScreen(navigateBack: (() -> Unit)?) { Column( modifier = Modifier .verticalScroll(rememberScrollState()) - .padding(paddingsValue) + .padding(paddingsValue), ) { SettingTitle(titleRes = R.string.settingsValidityPeriodTitle) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt index 99b682598..380154b40 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt @@ -47,7 +47,7 @@ fun SettingsEmailLanguageScreen(navigateBack: (() -> Unit)?) { Column( modifier = Modifier .verticalScroll(rememberScrollState()) - .padding(paddingsValue) + .padding(paddingsValue), ) { SettingTitle(titleRes = R.string.settingsEmailLanguageTitle) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingDivider.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingDivider.kt index 1e846b786..7807ad70d 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingDivider.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingDivider.kt @@ -28,7 +28,7 @@ fun SettingDivider() { HorizontalDivider( modifier = Modifier.padding( horizontal = Dimens.SettingHorizontalMargin, - vertical = Dimens.SettingVerticalMargin - ) + vertical = Dimens.SettingVerticalMargin, + ), ) } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferTypeScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferTypeScreen.kt index 5fd8ac757..390e2d8bf 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferTypeScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferTypeScreen.kt @@ -49,13 +49,13 @@ fun TransferTypeScreen(navigateToTransfer: (TransferType) -> Unit, popBack: () - SwissTransferTobAppBar( titleRes = R.string.transferTypeScreenTitle, navigationMenu = TopAppBarButton.backButton(popBack), - TopAppBarButton.closeButton { /* TODO */ } + TopAppBarButton.closeButton { /* TODO */ }, ) }) { contentPaddings -> Column( modifier = Modifier .fillMaxWidth() - .padding(contentPaddings) + .padding(contentPaddings), ) { Text( modifier = Modifier @@ -78,28 +78,28 @@ enum class TransferType( val icon: ImageVector, ) { LINK( - R.string.transferTypeLink, - { SwissTransferTheme.colors.transferTypeLinkContainer }, - { SwissTransferTheme.colors.transferTypeLinkOnContainer }, - AppIllus.ChainTilted + titleRes = R.string.transferTypeLink, + background = { SwissTransferTheme.colors.transferTypeLinkContainer }, + foreground = { SwissTransferTheme.colors.transferTypeLinkOnContainer }, + icon = AppIllus.ChainTilted, ), EMAIL( - R.string.transferTypeEmail, - { SwissTransferTheme.colors.transferTypeEmailContainer }, - { SwissTransferTheme.colors.transferTypeEmailOnContainer }, - AppIllus.EnvelopeTilted + titleRes = R.string.transferTypeEmail, + background = { SwissTransferTheme.colors.transferTypeEmailContainer }, + foreground = { SwissTransferTheme.colors.transferTypeEmailOnContainer }, + icon = AppIllus.EnvelopeTilted, ), QR_CODE( - R.string.transferTypeQrCode, - { SwissTransferTheme.colors.transferTypeQrContainer }, - { SwissTransferTheme.colors.transferTypeQrOnContainer }, - AppIllus.QrCodeTilted + titleRes = R.string.transferTypeQrCode, + background = { SwissTransferTheme.colors.transferTypeQrContainer }, + foreground = { SwissTransferTheme.colors.transferTypeQrOnContainer }, + icon = AppIllus.QrCodeTilted, ), PROXIMITY( - R.string.transferTypeProximity, - { SwissTransferTheme.colors.transferTypeProximityContainer }, - { SwissTransferTheme.colors.transferTypeProximityOnContainer }, - AppIllus.WaveSignalTilted + titleRes = R.string.transferTypeProximity, + background = { SwissTransferTheme.colors.transferTypeProximityContainer }, + foreground = { SwissTransferTheme.colors.transferTypeProximityOnContainer }, + icon = AppIllus.WaveSignalTilted, ), }