Merge pull request #38 from Infomaniak/implementation-app-bar

Implementation app bar
Infomaniak · Aug 27, 2024 · 76c652b · 76c652b
2 parents 64aacf3 + 7e5e5f2
commit 76c652b
Show file tree

Hide file tree

Showing 9 changed files with 293 additions and 196 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -34,6 +34,11 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
+
+    buildFeatures {
+        buildConfig = true
+    }
+
     compileOptions {
         sourceCompatibility = javaVersion
         targetCompatibility = javaVersion

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/TwoPaneScaffold.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/TwoPaneScaffold.kt
@@ -28,6 +28,7 @@ import androidx.compose.material3.adaptive.navigation.ThreePaneScaffoldNavigator
 import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import androidx.window.core.layout.WindowHeightSizeClass
 
 /**
@@ -58,7 +59,10 @@ fun <T> TwoPaneScaffold(
         else -> paneScaffoldDirective.maxHorizontalPartitions
     }
     val navigator = rememberListDetailPaneScaffoldNavigator<T>(
-        scaffoldDirective = paneScaffoldDirective.copy(maxHorizontalPartitions)
+        scaffoldDirective = paneScaffoldDirective.copy(
+            maxHorizontalPartitions = maxHorizontalPartitions,
+            horizontalPartitionSpacerSize = 0.dp
+        )
     )
 
     BackHandler(navigator.canNavigateBack()) {

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainNavHost.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainNavHost.kt
@@ -22,10 +22,8 @@ import androidx.compose.animation.EnterTransition
 import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.material3.adaptive.WindowAdaptiveInfo
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -46,7 +44,6 @@ fun MainNavHost(
     NavHost(
         navController = navController,
         startDestination = MainNavigation.startDestination,
-        modifier = Modifier.safeDrawingPadding(),
         enterTransition = { if (currentDestination.enableTransition) fadeIn() else EnterTransition.None },
         exitTransition = { if (currentDestination.enableTransition) fadeOut() else ExitTransition.None },
     ) {

diff --git a/...java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDownloadsLimitScreen.kt b/...java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDownloadsLimitScreen.kt
@@ -19,29 +19,41 @@
 package com.infomaniak.swisstransfer.ui.screen.main.settings
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 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.settings.components.SettingOption
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingTitle
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SingleSelectOptions
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
-import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
 
 @Composable
-fun SettingsDownloadsLimitScreen() {
-    Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
-        SettingTitle(titleRes = R.string.settingsDownloadsLimitTitle)
+fun SettingsDownloadsLimitScreen(navigateBack: (() -> Unit)?) {
+    Scaffold(topBar = {
+        val canDisplayBackButton = navigateBack?.let { TopAppBarButton.backButton(navigateBack) }
+        SwissTransferTobAppBar(R.string.settingsOptionDownloadLimit, navigationMenu = canDisplayBackButton)
+    }) { paddingsValue ->
+        Column(
+            modifier = Modifier
+                .verticalScroll(rememberScrollState())
+                .padding(paddingsValue)
+        ) {
+            SettingTitle(titleRes = R.string.settingsDownloadsLimitTitle)
 
-        val (selectedItem, setSelectedItem) = rememberSaveable { mutableIntStateOf(0) } // TODO: Use DataStore or Realm
-        SingleSelectOptions(DownloadsLimit.entries, { selectedItem }, setSelectedItem)
+            val (selectedItem, setSelectedItem) = rememberSaveable { mutableIntStateOf(0) } // TODO: Use DataStore or Realm
+            SingleSelectOptions(DownloadsLimit.entries, { selectedItem }, setSelectedItem)
+        }
     }
 }
 
@@ -57,12 +69,11 @@ enum class DownloadsLimit(
 }
 
 @PreviewMobile
-@PreviewTablet
 @Composable
 private fun SettingsThemeScreenPreview() {
     SwissTransferTheme {
         Surface {
-            SettingsDownloadsLimitScreen()
+            SettingsDownloadsLimitScreen {}
         }
     }
 }
diff --git a/...va/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDurationValidityScreen.kt b/...va/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDurationValidityScreen.kt
@@ -19,8 +19,10 @@
 package com.infomaniak.swisstransfer.ui.screen.main.settings
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableIntStateOf
@@ -29,20 +31,30 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.pluralStringResource
 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.settings.components.SettingOption
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingTitle
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SingleSelectOptions
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
-import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
 
 @Composable
-fun SettingsValidityPeriodScreen() {
-    Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
-        SettingTitle(titleRes = R.string.settingsValidityPeriodTitle)
+fun SettingsValidityPeriodScreen(navigateBack: (() -> Unit)?) {
+    Scaffold(topBar = {
+        val canDisplayBackButton = navigateBack?.let { TopAppBarButton.backButton(navigateBack) }
+        SwissTransferTobAppBar(R.string.settingsOptionValidityPeriod, navigationMenu = canDisplayBackButton)
+    }) { paddingsValue ->
+        Column(
+            modifier = Modifier
+                .verticalScroll(rememberScrollState())
+                .padding(paddingsValue)
+        ) {
+            SettingTitle(titleRes = R.string.settingsValidityPeriodTitle)
 
-        val (selectedItem, setSelectedItem) = rememberSaveable { mutableIntStateOf(0) } // TODO: Use DataStore or Realm
-        SingleSelectOptions(ValidityPeriod.entries, { selectedItem }, setSelectedItem)
+            val (selectedItem, setSelectedItem) = rememberSaveable { mutableIntStateOf(0) } // TODO: Use DataStore or Realm
+            SingleSelectOptions(ValidityPeriod.entries, { selectedItem }, setSelectedItem)
+        }
     }
 }
 
@@ -58,12 +70,11 @@ enum class ValidityPeriod(
 }
 
 @PreviewMobile
-@PreviewTablet
 @Composable
 private fun SettingsThemeScreenPreview() {
     SwissTransferTheme {
         Surface {
-            SettingsValidityPeriodScreen()
+            SettingsValidityPeriodScreen {}
         }
     }
 }
diff --git a/.../java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt b/.../java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt
@@ -19,8 +19,10 @@
 package com.infomaniak.swisstransfer.ui.screen.main.settings
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableIntStateOf
@@ -29,20 +31,30 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 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.settings.components.SettingOption
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingTitle
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SingleSelectOptions
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
-import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
 
 @Composable
-fun SettingsEmailLanguageScreen() {
-    Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
-        SettingTitle(titleRes = R.string.settingsEmailLanguageTitle)
+fun SettingsEmailLanguageScreen(navigateBack: (() -> Unit)?) {
+    Scaffold(topBar = {
+        val canDisplayBackButton = navigateBack?.let { TopAppBarButton.backButton(navigateBack) }
+        SwissTransferTobAppBar(R.string.settingsOptionEmailLanguage, navigationMenu = canDisplayBackButton)
+    }) { paddingsValue ->
+        Column(
+            modifier = Modifier
+                .verticalScroll(rememberScrollState())
+                .padding(paddingsValue)
+        ) {
+            SettingTitle(titleRes = R.string.settingsEmailLanguageTitle)
 
-        val (selectedItem, setSelectedItem) = rememberSaveable { mutableIntStateOf(0) } // TODO: Use DataStore or Realm
-        SingleSelectOptions(EmailLanguage.entries, { selectedItem }, setSelectedItem)
+            val (selectedItem, setSelectedItem) = rememberSaveable { mutableIntStateOf(0) } // TODO: Use DataStore or Realm
+            SingleSelectOptions(EmailLanguage.entries, { selectedItem }, setSelectedItem)
+        }
     }
 }
 
@@ -59,12 +71,11 @@ enum class EmailLanguage(
 }
 
 @PreviewMobile
-@PreviewTablet
 @Composable
 private fun SettingsThemeScreenPreview() {
     SwissTransferTheme {
         Surface {
-            SettingsEmailLanguageScreen()
+            SettingsEmailLanguageScreen {}
         }
     }
 }