Skip to content

Commit

Permalink
Merge pull request #411 from akitikkx/feature/410-use-navrail-on-expa…
Browse files Browse the repository at this point in the history
…nded

Use NavRail as well on expanded screen layout
  • Loading branch information
akitikkx authored Aug 17, 2024
2 parents f6e1d60 + de0ebcc commit 1be1d59
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions app/src/main/java/com/theupnextapp/ui/main/MainScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffoldDefaults
import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType
import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
Expand All @@ -30,7 +27,6 @@ import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.res.stringResource
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import androidx.window.core.layout.WindowWidthSizeClass.Companion.EXPANDED
import com.ramcosta.composedestinations.generated.destinations.TraktAccountScreenDestination
import com.ramcosta.composedestinations.utils.rememberDestinationsNavigator
import com.ramcosta.composedestinations.utils.route
Expand Down Expand Up @@ -58,15 +54,6 @@ fun MainScreen(
onTraktAuthCompleted()
}

val adaptiveInfo = currentWindowAdaptiveInfo()
val customNavType = with(adaptiveInfo) {
if(windowSizeClass.windowWidthSizeClass == EXPANDED) {
NavigationSuiteType.NavigationDrawer
} else {
NavigationSuiteScaffoldDefaults.calculateFromAdaptiveInfo(adaptiveInfo)
}
}

NavigationSuiteScaffold(
navigationSuiteItems = {
NavigationDestination.entries.forEach {
Expand All @@ -87,7 +74,6 @@ fun MainScreen(
)
}
},
layoutType = customNavType,
content = {
AppNavigation(
navHostController = navController,
Expand Down

0 comments on commit 1be1d59

Please sign in to comment.