Add BrandTobAppBar in all screens & tablet mode

Infomaniak · Sep 16, 2024 · 714db8a · 714db8a
1 parent 55b2025
commit 714db8a
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 44 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/MainActivity.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/MainActivity.kt
@@ -21,6 +21,8 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.Column
+import com.infomaniak.swisstransfer.ui.components.BrandTobAppBar
 import com.infomaniak.swisstransfer.ui.screen.main.MainScreen
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import dagger.hilt.android.AndroidEntryPoint
@@ -33,7 +35,10 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             SwissTransferTheme {
-                MainScreen()
+                Column {
+                    BrandTobAppBar()
+                    MainScreen()
+                }
             }
         }
     }

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
@@ -23,7 +23,6 @@ import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.infomaniak.swisstransfer.R
-import com.infomaniak.swisstransfer.ui.components.BrandTobAppBar
 import com.infomaniak.swisstransfer.ui.components.EmptyState
 import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus
 import com.infomaniak.swisstransfer.ui.images.illus.MascotSearching
@@ -42,7 +41,6 @@ fun ReceivedScreen(navigateToDetails: (transferId: Int) -> Unit) {
 @Composable
 private fun ReceivedScreen() {
     Scaffold(
-        topBar = { BrandTobAppBar() },
         floatingActionButton = { ReceivedEmptyFab() },
     ) { contentPadding ->
         EmptyState(

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
@@ -19,6 +19,7 @@ package com.infomaniak.swisstransfer.ui.screen.main.sent
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.Icon
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -40,47 +41,51 @@ import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
 
 @Composable
 fun SentEmptyScreen() {
-    Column(
-        modifier = Modifier.fillMaxSize(),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center,
-    ) {
-        val maxWidth = Dimens.DescriptionWidth
-        Text(
-            modifier = Modifier.widthIn(max = maxWidth),
-            text = stringResource(id = R.string.sentEmptyTitle),
-            style = SwissTransferTheme.typography.specificMedium32,
-            textAlign = TextAlign.Center,
-        )
-        Spacer(modifier = Modifier.height(Margin.Medium))
-        Text(
-            modifier = Modifier.widthIn(max = maxWidth),
-            text = stringResource(id = R.string.firstTransferDescription),
-            style = SwissTransferTheme.typography.bodyRegular,
-            color = SwissTransferTheme.colors.secondaryTextColor,
-        )
-        Spacer(modifier = Modifier.height(Margin.Medium))
-        ConstraintLayout {
-            val (icon, fab) = createRefs()
-
-            Icon(
-                modifier = Modifier
-                    .constrainAs(icon) {
-                        top.linkTo(parent.top)
-                        end.linkTo(fab.start, Margin.Small)
-                    },
-                imageVector = AppImages.AppIllus.ArrowDownRightCurved,
-                contentDescription = null,
+    Scaffold { contentPadding ->
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(contentPadding),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center,
+        ) {
+            val maxWidth = Dimens.DescriptionWidth
+            Text(
+                modifier = Modifier.widthIn(max = maxWidth),
+                text = stringResource(id = R.string.sentEmptyTitle),
+                style = SwissTransferTheme.typography.specificMedium32,
+                textAlign = TextAlign.Center,
             )
-            NewTransferFab(
-                modifier = Modifier
-                    .constrainAs(fab) {
-                        start.linkTo(parent.start)
-                        end.linkTo(parent.end)
-                        top.linkTo(parent.top, Margin.Large)
-                    },
-                newTransferFabType = NewTransferFabType.EMPTY_STATE,
+            Spacer(modifier = Modifier.height(Margin.Medium))
+            Text(
+                modifier = Modifier.widthIn(max = maxWidth),
+                text = stringResource(id = R.string.firstTransferDescription),
+                style = SwissTransferTheme.typography.bodyRegular,
+                color = SwissTransferTheme.colors.secondaryTextColor,
             )
+            Spacer(modifier = Modifier.height(Margin.Medium))
+            ConstraintLayout {
+                val (icon, fab) = createRefs()
+
+                Icon(
+                    modifier = Modifier
+                        .constrainAs(icon) {
+                            top.linkTo(parent.top)
+                            end.linkTo(fab.start, Margin.Small)
+                        },
+                    imageVector = AppImages.AppIllus.ArrowDownRightCurved,
+                    contentDescription = null,
+                )
+                NewTransferFab(
+                    modifier = Modifier
+                        .constrainAs(fab) {
+                            start.linkTo(parent.start)
+                            end.linkTo(parent.end)
+                            top.linkTo(parent.top, Margin.Large)
+                        },
+                    newTransferFabType = NewTransferFabType.EMPTY_STATE,
+                )
+            }
         }
     }
 }

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
@@ -37,7 +37,6 @@ import com.infomaniak.multiplatform_swisstransfer.common.models.Theme
 import com.infomaniak.multiplatform_swisstransfer.common.models.ValidityPeriod
 import com.infomaniak.swisstransfer.BuildConfig
 import com.infomaniak.swisstransfer.R
-import com.infomaniak.swisstransfer.ui.components.BrandTobAppBar
 import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons
 import com.infomaniak.swisstransfer.ui.images.icons.*
 import com.infomaniak.swisstransfer.ui.screen.main.settings.SettingsOptionScreens.*
@@ -58,7 +57,7 @@ fun SettingsScreen(
 ) {
     val selectedSetting = getSelectedSetting()
 
-    Scaffold(topBar = { BrandTobAppBar() }) { paddingsValue ->
+    Scaffold { paddingsValue ->
         Column(
             modifier = Modifier
                 .verticalScroll(rememberScrollState())