Use new SwissTransferTopAppBar in TransferTypeScreen

Infomaniak · Aug 21, 2024 · 08017da · 08017da
1 parent f935042
commit 08017da
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 5 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferNavHost.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferNavHost.kt
@@ -39,7 +39,7 @@ fun NewTransferNavHost(navController: NavHostController) {
             ImportFilesScreen(navigateToTransferTypeScreen = { navController.navigate(TransferTypeDestination) })
         }
         composable<TransferTypeDestination> {
-            TransferTypeScreen(navigateToTransfer = { /*TODO*/ })
+            TransferTypeScreen(navigateToTransfer = { /*TODO*/ }, popBack = { navController.navigateUp() })
         }
         composable<TransferOptionsDestination> {
             TransferOptionsScreen()

diff --git a/...java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferTypeScreen.kt b/...java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferTypeScreen.kt
@@ -32,6 +32,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.components.SwissTransferTobAppBar
+import com.infomaniak.swisstransfer.ui.components.TopAppBarButton
 import com.infomaniak.swisstransfer.ui.icons.AppIcons
 import com.infomaniak.swisstransfer.ui.icons.illu.ChainTilted
 import com.infomaniak.swisstransfer.ui.icons.illu.EnvelopeTilted
@@ -44,8 +45,14 @@ import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
 import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
 
 @Composable
-fun TransferTypeScreen(navigateToTransfer: (TransferType) -> Unit) {
-    Scaffold(topBar = { SwissTransferTobAppBar() }) { contentPaddings ->
+fun TransferTypeScreen(navigateToTransfer: (TransferType) -> Unit, popBack: () -> Unit) {
+    Scaffold(topBar = {
+        SwissTransferTobAppBar(
+            titleRes = R.string.transferTypeScreenTitle,
+            navigationMenu = TopAppBarButton.backButton(popBack),
+            TopAppBarButton.closeButton { /*TODO*/ }
+        )
+    }) { contentPaddings ->
         Column(
             modifier = Modifier
                 .fillMaxWidth()
@@ -102,6 +109,6 @@ enum class TransferType(
 @Composable
 private fun TransferTypeScreenPreview() {
     SwissTransferTheme {
-        TransferTypeScreen {}
+        TransferTypeScreen({}) {}
     }
 }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -42,6 +42,7 @@
     <string name="transferTypeLink">Link</string>
     <string name="transferTypeProximity">In der Nähe</string>
     <string name="transferTypeQrCode">QR-Code</string>
+    <string name="transferTypeScreenTitle">Übertragen</string>
     <string name="transferTypeTitle">Schicke deine Dateien per</string>
     <string name="transferUploadSourceChoiceCamera">Kamera</string>
     <string name="transferUploadSourceChoiceFiles">Dateien durchsuchen</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -42,6 +42,7 @@
     <string name="transferTypeLink">Enlace</string>
     <string name="transferTypeProximity">Proximidad</string>
     <string name="transferTypeQrCode">Código QR</string>
+    <string name="transferTypeScreenTitle">Transferencia</string>
     <string name="transferTypeTitle">Envía tus archivos por</string>
     <string name="transferUploadSourceChoiceCamera">Cámara</string>
     <string name="transferUploadSourceChoiceFiles">Examinar archivos</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -42,6 +42,7 @@
     <string name="transferTypeLink">Lien</string>
     <string name="transferTypeProximity">A proximité</string>
     <string name="transferTypeQrCode">QR Code</string>
+    <string name="transferTypeScreenTitle">Transfert</string>
     <string name="transferTypeTitle">Envoie tes fichiers par</string>
     <string name="transferUploadSourceChoiceCamera">Appareil photo</string>
     <string name="transferUploadSourceChoiceFiles">Parcourir les fichiers</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -42,7 +42,7 @@
     <string name="transferTypeLink">Link</string>
     <string name="transferTypeProximity">Vicino</string>
     <string name="transferTypeQrCode">Codice QR</string>
-    <string name="transferTypeTitle">Inviate i vostri file tramite</string>
+    <string name="transferTypeScreenTitle">Trasferimento</string>
     <string name="transferUploadSourceChoiceCamera">Macchina fotografica</string>
     <string name="transferUploadSourceChoiceFiles">Sfogliare i file</string>
     <string name="transferUploadSourceChoiceGallery">Galleria di foto e video</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -45,6 +45,7 @@
     <string name="transferTypeLink">Link</string>
     <string name="transferTypeProximity">Proximity</string>
     <string name="transferTypeQrCode">QR Code</string>
+    <string name="transferTypeScreenTitle">Transfer</string>
     <string name="transferTypeTitle">Send your files by</string>
     <string name="transferUploadSourceChoiceCamera">Camera</string>
     <string name="transferUploadSourceChoiceFiles">Browse files</string>