Merge pull request #50 from Infomaniak/missing-commas

Add some missing commas
Infomaniak · Sep 4, 2024 · 625e4cf · 625e4cf
2 parents 4a4fb17 + 492ad24
commit 625e4cf
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 40 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -60,15 +60,15 @@ private fun VerticallyStackedButtons(
         topButton(
             Modifier
                 .fillMaxWidth()
-                .padding(horizontal = Margin.Medium)
+                .padding(horizontal = Margin.Medium),
         )
 
         Spacer(modifier = Modifier.height(Margin.Medium))
 
         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
@@ -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
@@ -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/...java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt b/...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
@@ -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
@@ -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/...va/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDurationValidityScreen.kt b/...va/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/.../java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt b/.../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)
 
@@ -60,7 +60,7 @@ fun SettingsEmailLanguageScreen(navigateBack: (() -> Unit)?) {
 enum class EmailLanguage(
     override val title: @Composable () -> String,
     override val imageVector: ImageVector? = null,
-    override val imageVectorResId: Int? = null
+    override val imageVectorResId: Int? = null,
 ) : SettingOption {
     ENGLISH({ stringResource(R.string.settingsEmailLanguageValueEnglish) }, imageVectorResId = R.drawable.flag_gb),
     FRENCH({ stringResource(R.string.settingsEmailLanguageValueFrench) }, imageVectorResId = R.drawable.flag_fr),

diff --git a/...in/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingDivider.kt b/...in/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/...java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferTypeScreen.kt b/...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,
     ),
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ fun BrandTobAppBar() { @@
                     Spacer(modifier = Modifier.width(Margin.Small))
                     Text(text = stringResource(id = R.string.appName), color = SwissTransferTheme.colors.toolbarTextColor)
                 }
-            }
+            },
         )
     }
@@ Expand Down @@