From e4064e4b0b7793b7a6b0a4527e0b75934f591c18 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Wed, 25 Sep 2024 14:12:38 +0200 Subject: [PATCH] Put back `label` in AppNavigationRail --- .../ui/screen/main/components/AppNavigationSuiteScaffold.kt | 1 + .../ui/screen/main/received/components/ReceivedEmptyFab.kt | 2 +- .../ui/screen/main/settings/components/OptionScaffold.kt | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) 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 18d44d5b0..1fcdcb220 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 @@ -128,6 +128,7 @@ private fun AppNavigationRail( navigationItems.forEach { navigationItem -> NavigationRailItem( icon = { NavigationIcon(false, navigationItem) }, + label = {}, // Don't remove this seemingly useless label, it changes the icons background. selected = currentDestination == navigationItem.destination, onClick = { onClick(navigationItem.destination) }, ) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/components/ReceivedEmptyFab.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/components/ReceivedEmptyFab.kt index 2242fad21..28c378387 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/components/ReceivedEmptyFab.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/components/ReceivedEmptyFab.kt @@ -67,7 +67,7 @@ fun ReceivedEmptyFab(isMessageVisible: () -> Boolean) { } NewTransferFab( - modifier = Modifier.constrainAs(fab) { }, + modifier = Modifier.constrainAs(fab) {}, newTransferFabType = NewTransferFabType.BOTTOM_BAR, ) } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/OptionScaffold.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/OptionScaffold.kt index fb7618c01..1db13707f 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/OptionScaffold.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/OptionScaffold.kt @@ -79,8 +79,8 @@ private fun OptionScaffoldPreview() { optionTitleRes = R.string.settingsThemeTitle, enumEntries = ThemeOption.entries, selectedSettingOptionPosition = 0, - setSelectedSettingOptionPosition = { }, - navigateBack = { }, + setSelectedSettingOptionPosition = {}, + navigateBack = {}, ) } }