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 e9b67a933..e593e26d3 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 @@ -35,7 +35,11 @@ import com.infomaniak.swisstransfer.ui.utils.PreviewTablet @Composable @OptIn(ExperimentalMaterial3Api::class) -fun SwissTransferTobAppBar(@StringRes titleRes: Int, navigationMenu: TopAppBarMenu? = null, vararg actionMenus: TopAppBarMenu) { +fun SwissTransferTobAppBar( + @StringRes titleRes: Int, + navigationMenu: TopAppBarButton? = null, + vararg actionMenus: TopAppBarButton +) { TopAppBar( colors = TopAppBarDefaults.topAppBarColors( containerColor = SwissTransferTheme.materialColors.tertiary, @@ -52,24 +56,24 @@ fun SwissTransferTobAppBar(@StringRes titleRes: Int, navigationMenu: TopAppBarMe } @Composable -private fun MenuButton(navigationMenu: TopAppBarMenu) { +private fun MenuButton(navigationMenu: TopAppBarButton) { IconButton(onClick = navigationMenu.onClick) { Icon(imageVector = navigationMenu.icon, contentDescription = stringResource(navigationMenu.contentDescription)) } } @Immutable -data class TopAppBarMenu( +data class TopAppBarButton( val icon: ImageVector, @StringRes val contentDescription: Int, val onClick: () -> Unit, ) { companion object { - val backButton: (onClick: () -> Unit) -> TopAppBarMenu = { - TopAppBarMenu(AppIcons.ArrowLeft, R.string.contentDescriptionButtonBack, it) + val backButton: (onClick: () -> Unit) -> TopAppBarButton = { + TopAppBarButton(AppIcons.ArrowLeft, R.string.contentDescriptionButtonBack, it) } - val closeButton: (onClick: () -> Unit) -> TopAppBarMenu = { - TopAppBarMenu(AppIcons.Cross, R.string.contentDescriptionButtonClose, it) + val closeButton: (onClick: () -> Unit) -> TopAppBarButton = { + TopAppBarButton(AppIcons.Cross, R.string.contentDescriptionButtonClose, it) } } } @@ -80,10 +84,10 @@ data class TopAppBarMenu( private fun SwissTransferTobAppBarPreview() { SwissTransferTheme { SwissTransferTobAppBar( - R.string.appName, - TopAppBarMenu.backButton {}, - TopAppBarMenu(AppIcons.Add, R.string.appName) {}, - TopAppBarMenu.closeButton {} + titleRes = R.string.appName, + navigationMenu = TopAppBarButton.backButton {}, + TopAppBarButton(AppIcons.Add, R.string.appName) {}, + TopAppBarButton.closeButton {} ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt index f59931479..840552dc7 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt @@ -49,7 +49,7 @@ fun ImportFilesScreen() { SwissTransferTobAppBar( titleRes = R.string.importFilesScreenTitle, navigationMenu = null, - TopAppBarMenu.closeButton { /*TODO*/ } + TopAppBarButton.closeButton { /*TODO*/ } ) }, topButton = { modifier ->