Skip to content

Commit 1be1d59

Browse files
authored
Merge pull request #411 from akitikkx/feature/410-use-navrail-on-expanded
Use NavRail as well on expanded screen layout
2 parents f6e1d60 + de0ebcc commit 1be1d59

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

app/src/main/java/com/theupnextapp/ui/main/MainScreen.kt

-14
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ import androidx.compose.foundation.layout.PaddingValues
1818
import androidx.compose.material3.ExperimentalMaterial3Api
1919
import androidx.compose.material3.Icon
2020
import androidx.compose.material3.Text
21-
import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
2221
import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
23-
import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffoldDefaults
24-
import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType
2522
import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
2623
import androidx.compose.runtime.Composable
2724
import androidx.compose.runtime.MutableState
@@ -30,7 +27,6 @@ import androidx.compose.ui.ExperimentalComposeUiApi
3027
import androidx.compose.ui.res.stringResource
3128
import androidx.navigation.compose.currentBackStackEntryAsState
3229
import androidx.navigation.compose.rememberNavController
33-
import androidx.window.core.layout.WindowWidthSizeClass.Companion.EXPANDED
3430
import com.ramcosta.composedestinations.generated.destinations.TraktAccountScreenDestination
3531
import com.ramcosta.composedestinations.utils.rememberDestinationsNavigator
3632
import com.ramcosta.composedestinations.utils.route
@@ -58,15 +54,6 @@ fun MainScreen(
5854
onTraktAuthCompleted()
5955
}
6056

61-
val adaptiveInfo = currentWindowAdaptiveInfo()
62-
val customNavType = with(adaptiveInfo) {
63-
if(windowSizeClass.windowWidthSizeClass == EXPANDED) {
64-
NavigationSuiteType.NavigationDrawer
65-
} else {
66-
NavigationSuiteScaffoldDefaults.calculateFromAdaptiveInfo(adaptiveInfo)
67-
}
68-
}
69-
7057
NavigationSuiteScaffold(
7158
navigationSuiteItems = {
7259
NavigationDestination.entries.forEach {
@@ -87,7 +74,6 @@ fun MainScreen(
8774
)
8875
}
8976
},
90-
layoutType = customNavType,
9177
content = {
9278
AppNavigation(
9379
navHostController = navController,

0 commit comments

Comments
 (0)