Fix Tablet UI quickly before release!

CraftWorksMC · Sep 12, 2024 · b95b7d1 · b95b7d1
1 parent b783bfe
commit b95b7d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/app/src/main/java/com/craftworks/music/MainActivity.kt b/app/src/main/java/com/craftworks/music/MainActivity.kt
@@ -31,7 +31,6 @@ import androidx.compose.material3.NavigationRailItem
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SheetState
 import androidx.compose.material3.SheetValue
-import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -107,7 +106,6 @@ class MainActivity : ComponentActivity() {
             ),
             snackbarHostState = SnackbarHostState()
         )
-        val snackbarHostState = SnackbarHostState()
 
         setContent {
             MusicPlayerTheme {
@@ -122,7 +120,6 @@ class MainActivity : ComponentActivity() {
                     println("Recomposing EVERYTHING!!!!! VERY BAD")
 
                     Scaffold(
-                        snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
                         bottomBar = {
                             AnimatedBottomNavBar(navController, scaffoldState)
                         }
@@ -131,7 +128,8 @@ class MainActivity : ComponentActivity() {
                         Log.d("RECOMPOSITION", "Recomposing scaffold!")
 
                         // No BottomSheetScaffold for Android TV
-                        if (LocalConfiguration.current.uiMode and Configuration.UI_MODE_TYPE_MASK != Configuration.UI_MODE_TYPE_TELEVISION) {
+                        if ((LocalConfiguration.current.uiMode and Configuration.UI_MODE_TYPE_MASK != Configuration.UI_MODE_TYPE_TELEVISION) &&
+                            LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT) {
                             BottomSheetScaffold(
                                 sheetContainerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(
                                     3.dp
@@ -296,8 +294,9 @@ fun AnimatedBottomNavBar(
     } else {
         NavigationRail {
             val uiMode = LocalConfiguration.current.uiMode and Configuration.UI_MODE_TYPE_MASK
+            val orientation = LocalConfiguration.current.orientation
             LaunchedEffect(orderedNavItems) {
-                if (orderedNavItems.firstOrNull { it.screenRoute == "playing_tv_screen" } == null && uiMode == Configuration.UI_MODE_TYPE_TELEVISION) {
+                if (orderedNavItems.firstOrNull { it.screenRoute == "playing_tv_screen" } == null && (uiMode == Configuration.UI_MODE_TYPE_TELEVISION || orientation == Configuration.ORIENTATION_LANDSCAPE)) {
 
                     val updatedItems = orderedNavItems.toMutableList()
                     updatedItems.add(

diff --git a/app/src/main/java/com/craftworks/music/ui/playing/NowPlaying.kt b/app/src/main/java/com/craftworks/music/ui/playing/NowPlaying.kt
@@ -48,10 +48,11 @@ fun NowPlayingContent(
 //        }
 //    }
 
-    when (LocalConfiguration.current.uiMode and Configuration.UI_MODE_TYPE_MASK){
-        Configuration.UI_MODE_TYPE_TELEVISION -> NowPlayingTV(mediaController, navHostController)
-        else -> NowPlayingPortrait(mediaController, navHostController)
+    if ((LocalConfiguration.current.uiMode and Configuration.UI_MODE_TYPE_MASK == Configuration.UI_MODE_TYPE_TELEVISION) ||
+        LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE){
+        NowPlayingTV(mediaController, navHostController)
     }
+    else NowPlayingPortrait(mediaController, navHostController)
 }
 
 @Composable