chore: Move the TopAppBar to the MainScreen to temporary fix an anima…

…tion issue
Infomaniak · Dec 4, 2024 · 2b6ed3c · 2b6ed3c
1 parent 61bda97
commit 2b6ed3c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 22 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferTopAppBar.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferTopAppBar.kt
@@ -44,7 +44,7 @@ fun SwissTransferTopAppBar(
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun SwissTransferTopAppBar(
-    title: String,
+    title: String = "",
     navigationMenu: TopAppBarButton? = null,
     vararg actionMenus: TopAppBarButton,
 ) {

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
@@ -72,7 +72,6 @@ fun MainNavHost(
                 withFileSize = false,
                 withSpaceLeft = false,
                 withFileDelete = false,
-                onCloseClicked = {},
             )
         }
     }

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
@@ -24,6 +24,8 @@ import androidx.compose.runtime.remember
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.infomaniak.swisstransfer.ui.components.BrandTopAppBar
+import com.infomaniak.swisstransfer.ui.components.SwissTransferTopAppBar
+import com.infomaniak.swisstransfer.ui.components.TopAppBarButton
 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
@@ -43,7 +45,17 @@ fun MainScreen() {
     MainScaffold(
         navController = navController,
         currentDestination = currentDestination,
-        largeWindowTopAppBar = { BrandTopAppBar() },
+        largeWindowTopAppBar = {
+            // This is temporary to fix an issue with the animation when displaying the FilesDetailsScreen
+            if (currentDestination is MainNavigation.FilesDetailsDestination) {
+                SwissTransferTopAppBar(
+                    navigationMenu = TopAppBarButton.backButton { navController.popBackStack() },
+                    actionMenus = arrayOf(TopAppBarButton.closeButton { }),
+                )
+            } else {
+                BrandTopAppBar()
+            }
+        },
         content = { MainNavHost(navController, currentDestination) },
     )
 }

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
@@ -44,15 +44,12 @@ fun MainScaffold(
     content: @Composable () -> Unit = {},
 ) {
     val navType by rememberNavType(currentDestination)
-    val topAppBar = if (navType != NavigationSuiteType.None) largeWindowTopAppBar else {
-        {}
-    }
 
     MainScaffold(
         navType = navType,
         currentDestination = currentDestination,
         navigateToSelectedItem = navController::navigateToSelectedItem,
-        largeWindowTopAppBar = topAppBar,
+        largeWindowTopAppBar = largeWindowTopAppBar,
         content = content
     )
 }

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
@@ -83,7 +83,6 @@ fun NewTransferNavHost(navController: NavHostController, closeActivity: () -> Un
                 withFileSize = true,
                 withSpaceLeft = true,
                 withFileDelete = true,
-                onCloseClicked = {},
                 navigateBack = { navController.popBackStack() },
             )
         }

diff --git a/...java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/FilesDetailsScreen.kt b/...java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/FilesDetailsScreen.kt
@@ -45,7 +45,6 @@ fun FilesDetailsScreen(
     withFileSize: Boolean,
     withSpaceLeft: Boolean,
     withFileDelete: Boolean,
-    onCloseClicked: (() -> Unit),
     navigateBack: (() -> Unit),
 ) {
     // If we don't have a folderUuid, it means we have to load files from importedFiles in ImportFilesViewModel
@@ -60,8 +59,6 @@ fun FilesDetailsScreen(
             withFileSize = withFileSize,
             withSpaceLeft = withSpaceLeft,
             onFileRemoved = getOnFileRemoveCallback(importFilesViewModel, withFileDelete),
-            onCloseClicked = onCloseClicked,
-            navigateBack = navigateBack,
         )
     }
 }
@@ -77,21 +74,13 @@ private fun getOnFileRemoveCallback(
 
 @Composable
 private fun FilesDetailsScreen(
-    title: String = "",
     files: List<FileUi>,
     navigateToDetails: (String) -> Unit,
     withFileSize: Boolean,
     withSpaceLeft: Boolean,
     onFileRemoved: ((uuid: String) -> Unit)? = null,
-    onCloseClicked: (() -> Unit),
-    navigateBack: (() -> Unit),
 ) {
     Column {
-        SwissTransferTopAppBar(
-            title = title,
-            navigationMenu = TopAppBarButton.backButton { navigateBack() },
-            TopAppBarButton.closeButton { onCloseClicked() },
-        )
 
         FilesSize(files, withFileSize = withFileSize, withSpaceLeft)
         FileItemList(
@@ -116,14 +105,11 @@ private fun FilesDetailsScreenPreview(@PreviewParameter(FileUiListPreviewParamet
     SwissTransferTheme {
         Surface {
             FilesDetailsScreen(
-                title = "Title",
                 files = files,
                 navigateToDetails = { _ -> },
                 withFileSize = true,
                 withSpaceLeft = true,
-                onCloseClicked = {},
                 onFileRemoved = {},
-                navigateBack = {},
             )
         }
     }