Rename SmallWindowTopAppBarScaffold into PhoneTopAppBarScaffold

Infomaniak · Sep 24, 2024 · fb63a8d · fb63a8d
1 parent 0aa5a57
commit fb63a8d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/...ain/java/com/infomaniak/swisstransfer/ui/screen/main/components/BrandTobAppBarScaffold.kt b/...ain/java/com/infomaniak/swisstransfer/ui/screen/main/components/BrandTobAppBarScaffold.kt
@@ -26,8 +26,8 @@ fun BrandTobAppBarScaffold(
     floatingActionButton: @Composable () -> Unit = {},
     content: @Composable (PaddingValues) -> Unit,
 ) {
-    SmallWindowTopAppBarScaffold(
-        topBar = { BrandTobAppBar() },
+    PhoneTopAppBarScaffold(
+        phoneTopAppBar = { BrandTobAppBar() },
         floatingActionButton = floatingActionButton,
         content = content,
     )

diff --git a/...omponents/SmallWindowTopAppBarScaffold.kt → ...main/components/PhoneTopAppBarScaffold.kt b/...omponents/SmallWindowTopAppBarScaffold.kt → ...main/components/PhoneTopAppBarScaffold.kt
@@ -23,13 +23,13 @@ import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType
 import androidx.compose.runtime.Composable
 
 @Composable
-fun SmallWindowTopAppBarScaffold(
-    topBar: @Composable () -> Unit = {},
+fun PhoneTopAppBarScaffold(
+    phoneTopAppBar: @Composable () -> Unit = {},
     floatingActionButton: @Composable () -> Unit = {},
     content: @Composable (PaddingValues) -> Unit,
 ) {
     Scaffold(
-        topBar = { if (LocalNavType.current == NavigationSuiteType.NavigationBar) topBar() },
+        topBar = { if (LocalNavType.current == NavigationSuiteType.NavigationBar) phoneTopAppBar() },
         floatingActionButton = floatingActionButton,
     ) { contentPadding ->
         content(contentPadding)

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
@@ -50,7 +50,7 @@ private fun SentScreen(navType: NavigationSuiteType, transfers: List<Any>?) {
 
     BrandTobAppBarScaffold(
         floatingActionButton = {
-            if (navType == NavigationSuiteType.NavigationBar && !transfers.isNullOrEmpty()) {
+            if (navType == NavigationSuiteType.NavigationBar && transfers.isNotEmpty()) {
                 NewTransferFab(newTransferFabType = NewTransferFabType.BOTTOM_BAR)
             }
         },

diff --git a/...in/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/OptionScaffold.kt b/...in/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/OptionScaffold.kt
@@ -33,7 +33,7 @@ import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.components.SwissTransferTobAppBar
 import com.infomaniak.swisstransfer.ui.components.TopAppBarButton
 import com.infomaniak.swisstransfer.ui.screen.main.components.LocalNavType
-import com.infomaniak.swisstransfer.ui.screen.main.components.SmallWindowTopAppBarScaffold
+import com.infomaniak.swisstransfer.ui.screen.main.components.PhoneTopAppBarScaffold
 import com.infomaniak.swisstransfer.ui.screen.main.settings.ThemeOption
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
@@ -48,8 +48,8 @@ fun OptionScaffold(
     setSelectedSettingOptionPosition: (Int) -> Unit,
     navigateBack: (() -> Unit)? = null,
 ) {
-    SmallWindowTopAppBarScaffold(
-        topBar = {
+    PhoneTopAppBarScaffold(
+        phoneTopAppBar = {
             val navigationMenu = if (LocalNavType.current == NavigationSuiteType.NavigationBar) {
                 TopAppBarButton.backButton(navigateBack ?: {})
             } else {