Skip to content

Commit

Permalink
Add some missing commas
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinBoulongne committed Sep 4, 2024
1 parent 69ecdd9 commit 3478c67
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff 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
Original file line number Diff line number Diff line change
Expand Up @@ -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),
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) } },
)
}

Expand Down Expand Up @@ -86,7 +84,7 @@ private fun SwissTransferTobAppBarPreview() {
titleRes = R.string.appName,
navigationMenu = TopAppBarButton.backButton {},
TopAppBarButton(AppIcons.Add, R.string.appName) {},
TopAppBarButton.closeButton {}
TopAppBarButton.closeButton {},
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down Expand Up @@ -124,7 +124,7 @@ private fun AppNavigationRail(
newTransferFabType = NewTransferFabType.NAVIGATION_RAIL,
)
},
containerColor = SwissTransferTheme.colors.navigationItemBackground
containerColor = SwissTransferTheme.colors.navigationItemBackground,
) {
navigationItems.forEach { navigationItem ->
NavigationRailItem(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ private fun TransferScreen(
Scaffold(
floatingActionButton = {
if (navType == NavigationSuiteType.NavigationBar) NewTransferFab(newTransferFabType = NewTransferFabType.BOTTOM_BAR)
}
},
) { contentPadding ->
Text(
text = "Sent screen",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ fun SettingsValidityPeriodScreen(navigateBack: (() -> Unit)?) {
Column(
modifier = Modifier
.verticalScroll(rememberScrollState())
.padding(paddingsValue)
.padding(paddingsValue),
) {
SettingTitle(titleRes = R.string.settingsValidityPeriodTitle)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ fun SettingsEmailLanguageScreen(navigateBack: (() -> Unit)?) {
Column(
modifier = Modifier
.verticalScroll(rememberScrollState())
.padding(paddingsValue)
.padding(paddingsValue),
) {
SettingTitle(titleRes = R.string.settingsEmailLanguageTitle)

Expand All @@ -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),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fun SettingDivider() {
HorizontalDivider(
modifier = Modifier.padding(
horizontal = Dimens.SettingHorizontalMargin,
vertical = Dimens.SettingVerticalMargin
)
vertical = Dimens.SettingVerticalMargin,
),
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
),
}

Expand Down

0 comments on commit 3478c67

Please sign in to comment.