Remove now unnecessary window size check for TopAppBar backNavigation

Infomaniak · Sep 24, 2024 · 5a86860 · 5a86860
1 parent fb63a8d
commit 5a86860
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/...in/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/OptionScaffold.kt b/...in/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/OptionScaffold.kt
@@ -22,7 +22,6 @@ 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.adaptive.navigationsuite.NavigationSuiteType
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
@@ -32,7 +31,6 @@ import androidx.compose.ui.Modifier
 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.components.LocalNavType
 import com.infomaniak.swisstransfer.ui.screen.main.components.PhoneTopAppBarScaffold
 import com.infomaniak.swisstransfer.ui.screen.main.settings.ThemeOption
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
@@ -46,17 +44,10 @@ fun OptionScaffold(
     enumEntries: List<SettingOption>,
     selectedSettingOptionPosition: Int,
     setSelectedSettingOptionPosition: (Int) -> Unit,
-    navigateBack: (() -> Unit)? = null,
+    navigateBack: (() -> Unit)?,
 ) {
     PhoneTopAppBarScaffold(
-        phoneTopAppBar = {
-            val navigationMenu = if (LocalNavType.current == NavigationSuiteType.NavigationBar) {
-                TopAppBarButton.backButton(navigateBack ?: {})
-            } else {
-                null
-            }
-            SwissTransferTobAppBar(topAppBarTitleRes, navigationMenu)
-        },
+        phoneTopAppBar = { SwissTransferTobAppBar(topAppBarTitleRes, TopAppBarButton.backButton(navigateBack ?: {})) },
     ) { paddingsValue ->
         Column(
             modifier = Modifier