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 33b647127..be9aebe95 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 7a5f58857..b45e46d88 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 @@ -23,7 +23,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 @@ -44,7 +44,7 @@ fun MainScreen() { MainScaffold( navController = navController, currentDestination = currentDestination, - largeWindowTopAppBar = { BrandTobAppBar() }, + largeWindowTopAppBar = { BrandTopAppBar() }, content = { MainNavHost(navController, currentDestination) }, ) } 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 37129cc04..9e208e027 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 6da65c875..400efe45e 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 @@ -26,7 +26,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.LocalWindowAdaptiveInfo @@ -122,7 +122,7 @@ private fun NavigationSmallWindowPreview() { currentDestination = MainNavigation.SentDestination, navigateToSelectedItem = {}, navType = NavigationSuiteType.NavigationBar, - largeWindowTopAppBar = { BrandTobAppBar() }, + largeWindowTopAppBar = { BrandTopAppBar() }, content = {}, ) } @@ -136,7 +136,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 0531ea81d..04165bdf4 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 ace15fa4d..f638b47b7 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.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.PreviewLargeWindow import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow @@ -48,7 +48,7 @@ private fun SentScreen(transfers: List?) { if (transfers == null) return val windowAdaptiveInfo = currentWindowAdaptiveInfo() - BrandTobAppBarScaffold( + BrandTopAppBarScaffold( floatingActionButton = { if (windowAdaptiveInfo.isWindowSmall() && 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 f99382358..f13586d4c 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())