Merge pull request #75 from Infomaniak/rename-phone-tablet

Rename Phone/Mobile into SmallWindow & Tablet into LargeWindow
Infomaniak · Sep 25, 2024 · e0eecc3 · e0eecc3
2 parents bf1a073 + 89abe55
commit e0eecc3
Show file tree

Hide file tree

Showing 22 changed files with 103 additions and 121 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTobAppBar.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTobAppBar.kt
@@ -33,8 +33,8 @@ import com.infomaniak.swisstransfer.ui.images.illus.LogoInfomaniak
 import com.infomaniak.swisstransfer.ui.images.illus.LogoSwissTransfer
 import com.infomaniak.swisstransfer.ui.theme.Margin
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
-import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
-import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
+import com.infomaniak.swisstransfer.ui.utils.PreviewLargeWindow
+import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
@@ -58,8 +58,8 @@ fun BrandTobAppBar() {
     )
 }
 
-@PreviewMobile
-@PreviewTablet
+@PreviewSmallWindow
+@PreviewLargeWindow
 @Composable
 private fun BrandTobAppBarPreview() {
     SwissTransferTheme {

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferTobAppBar.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferTobAppBar.kt
@@ -29,8 +29,8 @@ import com.infomaniak.swisstransfer.ui.images.icons.Add
 import com.infomaniak.swisstransfer.ui.images.icons.ArrowLeft
 import com.infomaniak.swisstransfer.ui.images.icons.Cross
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
-import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
-import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
+import com.infomaniak.swisstransfer.ui.utils.PreviewLargeWindow
+import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
@@ -75,8 +75,8 @@ data class TopAppBarButton(
     }
 }
 
-@PreviewMobile
-@PreviewTablet
+@PreviewSmallWindow
+@PreviewLargeWindow
 @Composable
 private fun SwissTransferTobAppBarPreview() {
     SwissTransferTheme {

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
@@ -28,8 +28,8 @@ 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
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
-import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
-import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
+import com.infomaniak.swisstransfer.ui.utils.PreviewLargeWindow
+import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow
 
 @Composable
 fun MainScreen() {
@@ -44,13 +44,13 @@ fun MainScreen() {
     MainScaffold(
         navController = navController,
         currentDestination = currentDestination,
-        tabletTopAppBar = { BrandTobAppBar() },
+        largeWindowTopAppBar = { BrandTobAppBar() },
         content = { MainNavHost(navController, currentDestination) },
     )
 }
 
-@PreviewMobile
-@PreviewTablet
+@PreviewSmallWindow
+@PreviewLargeWindow
 @Composable
 private fun MainScreenPreview() {
     SwissTransferTheme {

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,
 ) {
-    PhoneTopAppBarScaffold(
-        phoneTopAppBar = { BrandTobAppBar() },
+    SmallWindowTopAppBarScaffold(
+        smallWindowTopAppBar = { BrandTobAppBar() },
         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
@@ -31,34 +31,34 @@ import com.infomaniak.swisstransfer.ui.navigation.MainNavigation
 import com.infomaniak.swisstransfer.ui.navigation.NavigationItem
 import com.infomaniak.swisstransfer.ui.theme.LocalWindowAdaptiveInfo
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
-import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
-import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
+import com.infomaniak.swisstransfer.ui.utils.PreviewLargeWindow
+import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow
 import com.infomaniak.swisstransfer.ui.utils.isWindowLarge
 import com.infomaniak.swisstransfer.ui.utils.isWindowSmall
 
 @Composable
 fun MainScaffold(
     navController: NavHostController,
     currentDestination: MainNavigation,
-    tabletTopAppBar: @Composable () -> Unit = {},
+    largeWindowTopAppBar: @Composable () -> Unit = {},
     content: @Composable () -> Unit = {},
 ) {
     val navType by rememberNavType(currentDestination)
-    MainScaffold(navType, currentDestination, navController::navigateToSelectedItem, tabletTopAppBar, content)
+    MainScaffold(navType, currentDestination, navController::navigateToSelectedItem, largeWindowTopAppBar, content)
 }
 
 @Composable
 private fun MainScaffold(
     navType: NavigationSuiteType,
     currentDestination: MainNavigation,
     navigateToSelectedItem: (MainNavigation) -> Unit,
-    tabletTopAppBar: @Composable () -> Unit,
+    largeWindowTopAppBar: @Composable () -> Unit,
     content: @Composable () -> Unit,
 ) {
     val windowAdaptiveInfo = LocalWindowAdaptiveInfo.current
 
     Column {
-        if (windowAdaptiveInfo.isWindowLarge()) tabletTopAppBar()
+        if (windowAdaptiveInfo.isWindowLarge()) largeWindowTopAppBar()
         AppNavigationSuiteScaffold(navType, NavigationItem.entries, currentDestination, navigateToSelectedItem) {
             if (windowAdaptiveInfo.isWindowSmall()) {
                 Column {
@@ -114,29 +114,29 @@ private fun NavHostController.navigateToSelectedItem(destination: MainNavigation
     }
 }
 
-@PreviewMobile
+@PreviewSmallWindow
 @Composable
-private fun NavigationMobilePreview() {
+private fun NavigationSmallWindowPreview() {
     SwissTransferTheme {
         MainScaffold(
             currentDestination = MainNavigation.SentDestination,
             navigateToSelectedItem = {},
             navType = NavigationSuiteType.NavigationBar,
-            tabletTopAppBar = { BrandTobAppBar() },
+            largeWindowTopAppBar = { BrandTobAppBar() },
             content = {},
         )
     }
 }
 
-@PreviewTablet
+@PreviewLargeWindow
 @Composable
-private fun NavigationTabletPreview() {
+private fun NavigationLargeWindowPreview() {
     SwissTransferTheme {
         MainScaffold(
             currentDestination = MainNavigation.SentDestination,
             navigateToSelectedItem = {},
             navType = NavigationSuiteType.NavigationRail,
-            tabletTopAppBar = { BrandTobAppBar() },
+            largeWindowTopAppBar = { BrandTobAppBar() },
             content = {},
         )
     }

diff --git a/...main/components/PhoneTopAppBarScaffold.kt → ...omponents/SmallWindowTopAppBarScaffold.kt b/...main/components/PhoneTopAppBarScaffold.kt → ...omponents/SmallWindowTopAppBarScaffold.kt
@@ -25,15 +25,15 @@ import com.infomaniak.swisstransfer.ui.theme.LocalWindowAdaptiveInfo
 import com.infomaniak.swisstransfer.ui.utils.isWindowSmall
 
 @Composable
-fun PhoneTopAppBarScaffold(
-    phoneTopAppBar: @Composable () -> Unit = {},
+fun SmallWindowTopAppBarScaffold(
+    smallWindowTopAppBar: @Composable () -> Unit = {},
     floatingActionButton: @Composable () -> Unit = {},
     content: @Composable (PaddingValues) -> Unit,
 ) {
     val windowAdaptiveInfo = LocalWindowAdaptiveInfo.current
 
     Scaffold(
-        topBar = { if (windowAdaptiveInfo.isWindowSmall()) phoneTopAppBar() },
+        topBar = { if (windowAdaptiveInfo.isWindowSmall()) smallWindowTopAppBar() },
         floatingActionButton = floatingActionButton,
     ) { contentPadding ->
         val paddingValues = if (windowAdaptiveInfo.isWindowSmall()) {

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
@@ -34,8 +34,8 @@ import com.infomaniak.swisstransfer.ui.screen.main.components.BrandTobAppBarScaf
 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
-import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
-import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
+import com.infomaniak.swisstransfer.ui.utils.PreviewLargeWindow
+import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow
 
 @Composable
 fun ReceivedScreen(
@@ -62,19 +62,10 @@ private fun ReceivedScreen(areTransfersEmpty: () -> Boolean) {
     }
 }
 
-@PreviewMobile
+@PreviewSmallWindow
+@PreviewLargeWindow
 @Composable
-private fun ReceivedScreenMobilePreview() {
-    SwissTransferTheme {
-        Surface {
-            ReceivedScreen(areTransfersEmpty = { true })
-        }
-    }
-}
-
-@PreviewTablet
-@Composable
-private fun ReceivedScreenTabletPreview() {
+private fun ReceivedScreenPreview() {
     SwissTransferTheme {
         Surface {
             ReceivedScreen(areTransfersEmpty = { true })

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentEmptyScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentEmptyScreen.kt
@@ -35,8 +35,8 @@ import com.infomaniak.swisstransfer.ui.images.illus.ArrowDownRightCurved
 import com.infomaniak.swisstransfer.ui.theme.Dimens
 import com.infomaniak.swisstransfer.ui.theme.Margin
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
-import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
-import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
+import com.infomaniak.swisstransfer.ui.utils.PreviewLargeWindow
+import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow
 
 @Composable
 fun SentEmptyScreen(modifier: Modifier) {
@@ -85,8 +85,8 @@ fun SentEmptyScreen(modifier: Modifier) {
     }
 }
 
-@PreviewMobile
-@PreviewTablet
+@PreviewSmallWindow
+@PreviewLargeWindow
 @Composable
 private fun SentEmptyScreenPreview() {
     SwissTransferTheme {

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentListScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentListScreen.kt
@@ -24,8 +24,8 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
-import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
-import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
+import com.infomaniak.swisstransfer.ui.utils.PreviewLargeWindow
+import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow
 import java.util.UUID
 
 @Composable
@@ -39,8 +39,8 @@ fun SentListScreen(
         }
     }
 }
-@PreviewMobile
-@PreviewTablet
+@PreviewSmallWindow
+@PreviewLargeWindow
 @Composable
 private fun SentListScreenPreview() {
     SwissTransferTheme {

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
@@ -29,8 +29,8 @@ 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.theme.SwissTransferTheme
-import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
-import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
+import com.infomaniak.swisstransfer.ui.utils.PreviewLargeWindow
+import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow
 import com.infomaniak.swisstransfer.ui.utils.isWindowSmall
 
 @Composable
@@ -65,19 +65,10 @@ private fun SentScreen(transfers: List<Any>?) {
 
 }
 
-@PreviewMobile
+@PreviewSmallWindow
+@PreviewLargeWindow
 @Composable
-private fun SentScreenMobilePreview() {
-    SwissTransferTheme {
-        Surface {
-            SentScreen(transfers = emptyList())
-        }
-    }
-}
-
-@PreviewTablet
-@Composable
-private fun SentScreenTabletPreview() {
+private fun SentScreenPreview() {
     SwissTransferTheme {
         Surface {
             SentScreen(transfers = emptyList())

diff --git a/...java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDownloadsLimitScreen.kt b/...java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDownloadsLimitScreen.kt
@@ -25,7 +25,7 @@ import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.OptionScaffold
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingOption
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
-import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
+import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow
 
 @Composable
 fun SettingsDownloadsLimitScreen(
@@ -54,7 +54,7 @@ enum class DownloadLimitOption(
     ONE({ "1" }),
 }
 
-@PreviewMobile
+@PreviewSmallWindow
 @Composable
 private fun SettingsThemeScreenPreview() {
     SwissTransferTheme {

diff --git a/.../java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt b/.../java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt
@@ -26,7 +26,7 @@ import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.OptionScaffold
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingOption
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
-import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
+import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow
 
 @Composable
 fun SettingsEmailLanguageScreen(
@@ -56,7 +56,7 @@ enum class EmailLanguageOption(
     SPANISH({ stringResource(R.string.settingsEmailLanguageValueSpanish) }, imageVectorResId = R.drawable.flag_es),
 }
 
-@PreviewMobile
+@PreviewSmallWindow
 @Composable
 private fun SettingsThemeScreenPreview() {
     SwissTransferTheme {

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
@@ -47,7 +47,7 @@ import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingIt
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingTitle
 import com.infomaniak.swisstransfer.ui.theme.Margin
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
-import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
+import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow
 
 @Composable
 fun SettingsScreen(
@@ -190,7 +190,7 @@ private class DummyAppSettings(
     override var validityPeriod: ValidityPeriod = ValidityPeriod.THIRTY,
 ) : AppSettings
 
-@PreviewMobile
+@PreviewSmallWindow
 @Composable
 private fun SettingsScreenPreview() {
     SwissTransferTheme {

diff --git a/...c/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreenWrapper.kt b/...c/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreenWrapper.kt
@@ -136,8 +136,8 @@ private fun NoSelectionEmptyState() {
     }
 }
 
-@PreviewMobile
-@PreviewTablet
+@PreviewSmallWindow
+@PreviewLargeWindow
 @Composable
 private fun SettingsScreenWrapperPreview() {
     SwissTransferTheme {

diff --git a/...src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt b/...src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt
@@ -30,7 +30,7 @@ import com.infomaniak.swisstransfer.ui.images.icons.CircleWhite
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.OptionScaffold
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingOption
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
-import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
+import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow
 
 @Composable
 fun SettingsThemeScreen(
@@ -58,7 +58,7 @@ enum class ThemeOption(
     DARK({ stringResource(R.string.settingsOptionThemeDark) }, AppIcons.CircleBlack),
 }
 
-@PreviewMobile
+@PreviewSmallWindow
 @Composable
 private fun SettingsThemeScreenPreview() {
     SwissTransferTheme {

diff --git a/...java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsValidityPeriodScreen.kt b/...java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsValidityPeriodScreen.kt
@@ -26,7 +26,7 @@ import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.OptionScaffold
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingOption
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
-import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
+import com.infomaniak.swisstransfer.ui.utils.PreviewSmallWindow
 
 @Composable
 fun SettingsValidityPeriodScreen(
@@ -55,7 +55,7 @@ enum class ValidityPeriodOption(
     ONE({ pluralStringResource(R.plurals.settingsValidityPeriodValue, 1, 1) }),
 }
 
-@PreviewMobile
+@PreviewSmallWindow
 @Composable
 private fun SettingsThemeScreenPreview() {
     SwissTransferTheme {