[Jetcaster] Add TwoPane from accompanist/adaptive for player UI

Crane/gradle/libs.versions.toml

@@ -50,6 +50,7 @@ secrets = "2.0.1"
 targetSdk = "33"
 
 [libraries]
+accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
 accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" }
 accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" }
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }

JetLagged/gradle/libs.versions.toml

@@ -50,6 +50,7 @@ secrets = "2.0.1"
 targetSdk = "33"
 
 [libraries]
+accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
 accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" }
 accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" }
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }

JetNews/gradle/libs.versions.toml

@@ -50,6 +50,7 @@ secrets = "2.0.1"
 targetSdk = "33"
 
 [libraries]
+accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
 accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" }
 accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" }
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }

Jetcaster/app/build.gradle.kts

@@ -103,6 +103,7 @@ dependencies {
 
     implementation(libs.androidx.compose.foundation)
     implementation(libs.androidx.compose.material)
+    implementation(libs.androidx.compose.materialWindow)
     implementation(libs.androidx.compose.material.iconsExtended)
     implementation(libs.androidx.compose.ui.tooling.preview)
     debugImplementation(libs.androidx.compose.ui.tooling)
@@ -114,6 +115,7 @@ dependencies {
 
     implementation(libs.androidx.window)
 
+    implementation(libs.accompanist.adaptive)
     implementation(libs.accompanist.pager)
 
     implementation(libs.coil.kt.compose)

Jetcaster/app/src/main/java/com/example/jetcaster/ui/JetcasterApp.kt

@@ -19,21 +19,22 @@ package com.example.jetcaster.ui
 import androidx.compose.material.AlertDialog
 import androidx.compose.material.Text
 import androidx.compose.material.TextButton
+import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.window.layout.DisplayFeature
 import com.example.jetcaster.R
 import com.example.jetcaster.ui.home.Home
 import com.example.jetcaster.ui.player.PlayerScreen
 import com.example.jetcaster.ui.player.PlayerViewModel
-import com.example.jetcaster.util.DevicePosture
-import kotlinx.coroutines.flow.StateFlow
 
 @Composable
 fun JetcasterApp(
-    devicePosture: StateFlow<DevicePosture>,
+    windowSizeClass: WindowSizeClass,
+    displayFeatures: List<DisplayFeature>,
     appState: JetcasterAppState = rememberJetcasterAppState()
 ) {
     if (appState.isOnline) {
@@ -55,7 +56,12 @@ fun JetcasterApp(
                         defaultArgs = backStackEntry.arguments
                     )
                 )
-                PlayerScreen(playerViewModel, devicePosture, onBackPress = appState::navigateBack)
+                PlayerScreen(
+                    playerViewModel,
+                    windowSizeClass,
+                    displayFeatures,
+                    onBackPress = appState::navigateBack
+                )
             }
         }
     } else {

Jetcaster/app/src/main/java/com/example/jetcaster/ui/MainActivity.kt

@@ -19,57 +19,29 @@ package com.example.jetcaster.ui
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
+import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.core.view.WindowCompat
-import androidx.lifecycle.flowWithLifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.window.layout.FoldingFeature
-import androidx.window.layout.WindowInfoTracker.Companion.getOrCreate
 import com.example.jetcaster.ui.theme.JetcasterTheme
-import com.example.jetcaster.util.DevicePosture
-import com.example.jetcaster.util.isBookPosture
-import com.example.jetcaster.util.isSeparatingPosture
-import com.example.jetcaster.util.isTableTopPosture
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
+import com.google.accompanist.adaptive.calculateDisplayFeatures
 
 class MainActivity : ComponentActivity() {
+    @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         // This app draws behind the system bars, so we want to handle fitting system windows
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
-        /**
-         * Flow of [DevicePosture] that emits every time there's a change in the windowLayoutInfo
-         */
-        val devicePosture = getOrCreate(this).windowLayoutInfo(this)
-            .flowWithLifecycle(this.lifecycle)
-            .map { layoutInfo ->
-                val foldingFeature =
-                    layoutInfo.displayFeatures.filterIsInstance<FoldingFeature>().firstOrNull()
-                when {
-                    isTableTopPosture(foldingFeature) ->
-                        DevicePosture.TableTopPosture(foldingFeature.bounds)
-                    isBookPosture(foldingFeature) ->
-                        DevicePosture.BookPosture(foldingFeature.bounds)
-                    isSeparatingPosture(foldingFeature) ->
-                        DevicePosture.SeparatingPosture(
-                            foldingFeature.bounds,
-                            foldingFeature.orientation
-                        )
-                    else -> DevicePosture.NormalPosture
-                }
-            }
-            .stateIn(
-                scope = lifecycleScope,
-                started = SharingStarted.Eagerly,
-                initialValue = DevicePosture.NormalPosture
-            )
-
         setContent {
+            val windowSizeClass = calculateWindowSizeClass(this)
+            val displayFeatures = calculateDisplayFeatures(this)
+
             JetcasterTheme {
-                JetcasterApp(devicePosture)
+                JetcasterApp(
+                    windowSizeClass,
+                    displayFeatures
+                )
             }
         }
     }