From 7252bccea8cfd3c819599094d933cf0fe0300d56 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Tue, 24 Sep 2024 16:37:22 +0200 Subject: [PATCH] Rename `BrandTobAppBar` into `BrandTopAppBar` --- .../ui/components/{BrandTobAppBar.kt => BrandTopAppBar.kt} | 6 +++--- .../infomaniak/swisstransfer/ui/screen/main/MainScreen.kt | 4 ++-- ...{BrandTobAppBarScaffold.kt => BrandTopAppBarScaffold.kt} | 6 +++--- .../swisstransfer/ui/screen/main/components/MainScaffold.kt | 6 +++--- .../swisstransfer/ui/screen/main/received/ReceivedScreen.kt | 4 ++-- .../swisstransfer/ui/screen/main/sent/SentScreen.kt | 4 ++-- .../swisstransfer/ui/screen/main/settings/SettingsScreen.kt | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) rename app/src/main/java/com/infomaniak/swisstransfer/ui/components/{BrandTobAppBar.kt => BrandTopAppBar.kt} (97%) rename app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/{BrandTobAppBarScaffold.kt => BrandTopAppBarScaffold.kt} (88%) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTobAppBar.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTopAppBar.kt similarity index 97% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTobAppBar.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTopAppBar.kt index 33b647127d..be9aebe955 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTobAppBar.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTopAppBar.kt @@ -38,7 +38,7 @@ import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow @Composable @OptIn(ExperimentalMaterial3Api::class) -fun BrandTobAppBar() { +fun BrandTopAppBar() { CenterAlignedTopAppBar( colors = TopAppBarDefaults.topAppBarColors( containerColor = SwissTransferTheme.materialColors.tertiary, @@ -61,8 +61,8 @@ fun BrandTobAppBar() { @PreviewSmallWindow @PreviewLargeWindow @Composable -private fun BrandTobAppBarPreview() { +private fun BrandTopAppBarPreview() { SwissTransferTheme { - BrandTobAppBar() + BrandTopAppBar() } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScreen.kt index cad424f3e8..04d01406d4 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScreen.kt @@ -24,7 +24,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController -import com.infomaniak.swisstransfer.ui.components.BrandTobAppBar +import com.infomaniak.swisstransfer.ui.components.BrandTopAppBar import com.infomaniak.swisstransfer.ui.navigation.MainNavigation import com.infomaniak.swisstransfer.ui.navigation.NavigationDestination.Companion.toDestination import com.infomaniak.swisstransfer.ui.screen.main.components.MainScaffold @@ -47,7 +47,7 @@ fun MainScreen() { navController = navController, currentDestination = currentDestination, windowAdaptiveInfo = windowAdaptiveInfo, - largeWindowTopAppBar = { BrandTobAppBar() }, + largeWindowTopAppBar = { BrandTopAppBar() }, content = { MainNavHost(navController, currentDestination, windowAdaptiveInfo) }, ) } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/BrandTobAppBarScaffold.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/BrandTopAppBarScaffold.kt similarity index 88% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/BrandTobAppBarScaffold.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/BrandTopAppBarScaffold.kt index 37129cc048..9e208e0275 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/BrandTobAppBarScaffold.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/BrandTopAppBarScaffold.kt @@ -19,15 +19,15 @@ package com.infomaniak.swisstransfer.ui.screen.main.components import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable -import com.infomaniak.swisstransfer.ui.components.BrandTobAppBar +import com.infomaniak.swisstransfer.ui.components.BrandTopAppBar @Composable -fun BrandTobAppBarScaffold( +fun BrandTopAppBarScaffold( floatingActionButton: @Composable () -> Unit = {}, content: @Composable (PaddingValues) -> Unit, ) { SmallWindowTopAppBarScaffold( - smallWindowTopAppBar = { BrandTobAppBar() }, + smallWindowTopAppBar = { BrandTopAppBar() }, floatingActionButton = floatingActionButton, content = content, ) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/MainScaffold.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/MainScaffold.kt index 0ae51efc9f..ad5feb1ebc 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/MainScaffold.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/components/MainScaffold.kt @@ -27,7 +27,7 @@ import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.navigation.NavGraph.Companion.findStartDestination import androidx.navigation.NavHostController -import com.infomaniak.swisstransfer.ui.components.BrandTobAppBar +import com.infomaniak.swisstransfer.ui.components.BrandTopAppBar import com.infomaniak.swisstransfer.ui.navigation.MainNavigation import com.infomaniak.swisstransfer.ui.navigation.NavigationItem import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme @@ -120,7 +120,7 @@ private fun NavigationSmallWindowPreview() { currentDestination = MainNavigation.SentDestination, navigateToSelectedItem = {}, navType = NavigationSuiteType.NavigationBar, - largeWindowTopAppBar = { BrandTobAppBar() }, + largeWindowTopAppBar = { BrandTopAppBar() }, content = {}, ) } @@ -134,7 +134,7 @@ private fun NavigationLargeWindowPreview() { currentDestination = MainNavigation.SentDestination, navigateToSelectedItem = {}, navType = NavigationSuiteType.NavigationRail, - largeWindowTopAppBar = { BrandTobAppBar() }, + largeWindowTopAppBar = { BrandTopAppBar() }, content = {}, ) } 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 0531ea81d1..04165bdf45 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 @@ -30,7 +30,7 @@ import com.infomaniak.swisstransfer.R import com.infomaniak.swisstransfer.ui.components.EmptyState import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus import com.infomaniak.swisstransfer.ui.images.illus.MascotSearching -import com.infomaniak.swisstransfer.ui.screen.main.components.BrandTobAppBarScaffold +import com.infomaniak.swisstransfer.ui.screen.main.components.BrandTopAppBarScaffold import com.infomaniak.swisstransfer.ui.screen.main.received.components.ReceivedEmptyFab import com.infomaniak.swisstransfer.ui.screen.main.sent.SentViewModel import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme @@ -50,7 +50,7 @@ fun ReceivedScreen( @Composable private fun ReceivedScreen(areTransfersEmpty: () -> Boolean) { - BrandTobAppBarScaffold( + BrandTopAppBarScaffold( floatingActionButton = { ReceivedEmptyFab(areTransfersEmpty) }, ) { contentPadding -> EmptyState( 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 558263855b..8d768c61a3 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 @@ -27,7 +27,7 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.infomaniak.swisstransfer.ui.components.NewTransferFab import com.infomaniak.swisstransfer.ui.components.NewTransferFabType -import com.infomaniak.swisstransfer.ui.screen.main.components.BrandTobAppBarScaffold +import com.infomaniak.swisstransfer.ui.screen.main.components.BrandTopAppBarScaffold import com.infomaniak.swisstransfer.ui.screen.main.components.LocalNavType import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.PreviewLargeWindow @@ -48,7 +48,7 @@ fun SentScreen( private fun SentScreen(navType: NavigationSuiteType, transfers: List?) { if (transfers == null) return - BrandTobAppBarScaffold( + BrandTopAppBarScaffold( floatingActionButton = { if (navType == NavigationSuiteType.NavigationBar && transfers.isNotEmpty()) { NewTransferFab(newTransferFabType = NewTransferFabType.BOTTOM_BAR) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt index f99382358e..f13586d4cb 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt @@ -38,7 +38,7 @@ import com.infomaniak.swisstransfer.BuildConfig import com.infomaniak.swisstransfer.R import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons import com.infomaniak.swisstransfer.ui.images.icons.* -import com.infomaniak.swisstransfer.ui.screen.main.components.BrandTobAppBarScaffold +import com.infomaniak.swisstransfer.ui.screen.main.components.BrandTopAppBarScaffold import com.infomaniak.swisstransfer.ui.screen.main.settings.SettingsOptionScreens.* import com.infomaniak.swisstransfer.ui.screen.main.settings.components.EndIconType.CHEVRON import com.infomaniak.swisstransfer.ui.screen.main.settings.components.EndIconType.OPEN_OUTSIDE @@ -57,7 +57,7 @@ fun SettingsScreen( ) { val selectedSetting = getSelectedSetting() - BrandTobAppBarScaffold { paddingsValue -> + BrandTopAppBarScaffold { paddingsValue -> Column( modifier = Modifier .verticalScroll(rememberScrollState())