Rename BrandTobAppBarScaffold into PhoneTopAppBarScaffold

Infomaniak · Sep 23, 2024 · 4ced0ad · 4ced0ad
1 parent 2b61bb0
commit 4ced0ad
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
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
@@ -47,7 +47,7 @@ fun MainScreen() {
         navController = navController,
         currentDestination = currentDestination,
         windowAdaptiveInfo = windowAdaptiveInfo,
-        tabletTopBar = { BrandTobAppBar() },
+        tabletTopAppBar = { BrandTobAppBar() },
         content = { MainNavHost(navController, currentDestination, windowAdaptiveInfo) },
     )
 }

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
@@ -40,13 +40,13 @@ fun MainScaffold(
     navController: NavHostController,
     currentDestination: MainNavigation,
     windowAdaptiveInfo: WindowAdaptiveInfo,
-    tabletTopBar: @Composable () -> Unit = {},
+    tabletTopAppBar: @Composable () -> Unit = {},
     content: @Composable () -> Unit = {},
 ) {
     val navType by rememberNavType(currentDestination, windowAdaptiveInfo)
 
     CompositionLocalProvider(LocalNavType provides navType) {
-        MainScaffold(navType, currentDestination, navController::navigateToSelectedItem, tabletTopBar, content)
+        MainScaffold(navType, currentDestination, navController::navigateToSelectedItem, tabletTopAppBar, content)
     }
 }
 
@@ -55,11 +55,11 @@ private fun MainScaffold(
     navType: NavigationSuiteType,
     currentDestination: MainNavigation,
     navigateToSelectedItem: (MainNavigation) -> Unit,
-    tabletTopBar: @Composable () -> Unit,
+    tabletTopAppBar: @Composable () -> Unit,
     content: @Composable () -> Unit,
 ) {
     Column {
-        if (navType == NavigationSuiteType.NavigationRail) tabletTopBar()
+        if (navType == NavigationSuiteType.NavigationRail) tabletTopAppBar()
         AppNavigationSuiteScaffold(navType, NavigationItem.entries, currentDestination, navigateToSelectedItem) {
             if (navType == NavigationSuiteType.None) {
                 content()
@@ -119,7 +119,7 @@ private fun NavigationMobilePreview() {
             currentDestination = MainNavigation.SentDestination,
             navigateToSelectedItem = {},
             navType = NavigationSuiteType.NavigationBar,
-            tabletTopBar = {},
+            tabletTopAppBar = {},
             content = {},
         )
     }
@@ -133,7 +133,7 @@ private fun NavigationTabletPreview() {
             currentDestination = MainNavigation.SentDestination,
             navigateToSelectedItem = {},
             navType = NavigationSuiteType.NavigationRail,
-            tabletTopBar = {},
+            tabletTopAppBar = {},
             content = {},
         )
     }

diff --git a/...main/components/BrandTobAppBarScaffold.kt → ...main/components/PhoneTopAppBarScaffold.kt b/...main/components/BrandTobAppBarScaffold.kt → ...main/components/PhoneTopAppBarScaffold.kt
@@ -24,7 +24,7 @@ import androidx.compose.runtime.Composable
 import com.infomaniak.swisstransfer.ui.components.BrandTobAppBar
 
 @Composable
-fun BrandTobAppBarScaffold(
+fun PhoneTopAppBarScaffold(
     floatingActionButton: @Composable () -> Unit = {},
     content: @Composable (PaddingValues) -> Unit,
 ) {

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
@@ -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.PhoneTopAppBarScaffold
 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(
+    PhoneTopAppBarScaffold(
         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
@@ -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.PhoneTopAppBarScaffold
 import com.infomaniak.swisstransfer.ui.screen.main.components.LocalNavType
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
@@ -48,7 +48,7 @@ fun SentScreen(
 private fun SentScreen(navType: NavigationSuiteType, transfers: List<Any>?) {
     if (transfers == null) return
 
-    BrandTobAppBarScaffold(
+    PhoneTopAppBarScaffold(
         floatingActionButton = {
             if (navType == NavigationSuiteType.NavigationBar && !transfers.isNullOrEmpty()) {
                 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
@@ -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.PhoneTopAppBarScaffold
 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 ->
+    PhoneTopAppBarScaffold { paddingsValue ->
         Column(
             modifier = Modifier
                 .verticalScroll(rememberScrollState())