Merge pull request #14 from chikoski/update-remember-navigation-component-type

Stop referring to form factor information

Author: chikoski

AdaptiveJetStream/gradle/libs.versions.toml

@@ -1,31 +1,31 @@
 [versions]
-activity-compose = "1.10.1"
-android-gradle-plugin = "8.9.3"
-android-test-plugin = "8.9.3"
-androidx-baselineprofile = "1.3.4"
-benchmark-macro-junit4 = "1.3.4"
+activity-compose = "1.11.0"
+android-gradle-plugin = "8.13.0"
+android-test-plugin = "8.13.0"
+androidx-baselineprofile = "1.4.1"
+benchmark-macro-junit4 = "1.4.1"
 coil-compose = "2.7.0"
-compose-bom = "2025.05.00"
-tv-material = "1.0.0"
-core-ktx = "1.16.0"
+compose-bom = "2025.09.00"
+tv-material = "1.0.1"
+core-ktx = "1.17.0"
 core-splashscreen = "1.0.1"
-hilt-navigation-compose = "1.2.0"
-hilt-android = "2.56.1"
-junit = "1.2.1"
-kotlin-android = "2.1.10"
-kotlinx-serialization = "1.8.1"
-ksp = "2.1.10-1.0.30"
-lifecycle-runtime-ktx = "2.9.0"
+hilt-navigation-compose = "1.3.0"
+hilt-android = "2.57.1"
+junit = "1.3.0"
+kotlin-android = "2.2.20"
+kotlinx-serialization = "1.9.0"
+ksp = "2.2.20-2.0.3"
+lifecycle-runtime-ktx = "2.9.4"
 material3-adaptive = "1.1.0"
-material3-adaptive-navigation = "1.4.0-alpha14"
-media3 = "1.6.1"
-navigation-compose = "2.9.0"
+material3-adaptive-navigation = "1.4.0-rc01"
+media3 = "1.8.0"
+navigation-compose = "2.9.4"
 profileinstaller = "1.4.1"
 uiautomator = "2.3.0"
-rules = "1.6.1"
-window = "1.4.0-rc02"
-xr = "1.0.0-alpha04"
-xr-material3 = "1.0.0-alpha08"
+rules = "1.7.0"
+window = "1.4.0"
+xr = "1.0.0-alpha06"
+xr-material3 = "1.0.0-alpha11"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" }

AdaptiveJetStream/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

AdaptiveJetStream/jetstream/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 /*
  * Copyright 2023 Google LLC
  *
@@ -26,17 +28,21 @@ plugins {
 
 kotlin {
     jvmToolchain(17)
+
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+    }
 }
 
 android {
     namespace = "com.google.jetstream"
     // Needed for latest androidx snapshot build
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.google.jetstream"
         minSdk = 28
-        targetSdk = 35
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0"
 
@@ -67,9 +73,6 @@ android {
         }
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
-    }
 }
 
 dependencies {

AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/MainActivity.kt

@@ -19,7 +19,6 @@ package com.google.jetstream
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
-import android.util.Log
 import android.view.KeyEvent
 import android.view.KeyboardShortcutGroup
 import android.view.KeyboardShortcutInfo
@@ -42,7 +41,6 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.xr.compose.material3.EnableXrComponentOverrides
 import androidx.xr.compose.material3.ExperimentalMaterial3XrApi
 import com.google.jetstream.presentation.App
-import com.google.jetstream.presentation.components.feature.UiMode
 import com.google.jetstream.presentation.theme.JetStreamTheme
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -92,7 +90,6 @@ class MainActivity : ComponentActivity() {
     private fun tryEnableCustomHeader() {
         if (toEnableCustomHeader()) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-                Log.d("MainActivity", "Custom header enabled")
                 window.insetsController?.apply {
                     setSystemBarsAppearance(
                         WindowInsetsController.APPEARANCE_TRANSPARENT_CAPTION_BAR_BACKGROUND,
@@ -103,9 +100,6 @@ class MainActivity : ComponentActivity() {
         }
     }
 
-    private val currentUiMode: UiMode
-        get() = UiMode.from(resources.configuration)
-
     private fun toEnableCustomHeader(): Boolean {
         val reliedFeatures = listOf(
             PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT,

AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/App.kt

@@ -149,7 +149,7 @@ fun App(
             }
         }
 
-        NavigationComponentType.Custom -> {
+        NavigationComponentType.TopBar -> {
             AppWithTopBarNavigation(
                 appState = appState,
                 onActivityBackPressed = onActivityBackPressed,

AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/AppState.kt

@@ -74,7 +74,7 @@ class AppState internal constructor(
                 selectedScreen.navigationVisibility.isVisibleInNavigationSuite
             }
 
-            NavigationComponentType.Custom -> {
+            NavigationComponentType.TopBar -> {
                 selectedScreen.navigationVisibility.isVisibleInCustomNavigation
             }
         }

AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/NavigationComponentType.kt

@@ -19,39 +19,40 @@ package com.google.jetstream.presentation.app
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.window.core.layout.WindowSizeClass
-import com.google.jetstream.presentation.components.feature.FormFactor
+import com.google.jetstream.presentation.components.feature.isAutomotiveEnabled
+import com.google.jetstream.presentation.components.feature.isLeanbackEnabled
 import com.google.jetstream.presentation.components.feature.isWidthAtLeastLarge
-import com.google.jetstream.presentation.components.feature.rememberFormFactor
 
 enum class NavigationComponentType {
     NavigationSuiteScaffold,
-    Custom
+    TopBar
 }
 
 @Composable
-fun rememberNavigationComponentType(
-    formFactor: FormFactor = rememberFormFactor(),
-    windowSizeClass: WindowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
-): NavigationComponentType {
-    return remember(formFactor, windowSizeClass) {
-        selectNavigationComponentType(formFactor, windowSizeClass.isWidthAtLeastLarge())
+fun rememberNavigationComponentType(): NavigationComponentType {
+    val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
+    val isLeanbackEnabled = isLeanbackEnabled()
+    val isAutomotiveEnabled = isAutomotiveEnabled()
+
+    return remember(isLeanbackEnabled, isAutomotiveEnabled, windowSizeClass) {
+        selectNavigationComponentType(
+            isLeanbackEnabled = isLeanbackEnabled,
+            isAutomotiveEnabled = isAutomotiveEnabled,
+            isLargeWindow = windowSizeClass.isWidthAtLeastLarge()
+        )
     }
 }
 
+// Select the navigation component type based on the available input devices.
 private fun selectNavigationComponentType(
-    formFactor: FormFactor,
+    isLeanbackEnabled: Boolean,
+    isAutomotiveEnabled: Boolean,
     isLargeWindow: Boolean,
 ): NavigationComponentType {
-    return when (formFactor) {
-        FormFactor.Tv -> NavigationComponentType.Custom
-        FormFactor.Car -> NavigationComponentType.Custom
-        else -> {
-            if (isLargeWindow) {
-                NavigationComponentType.Custom
-            } else {
-                NavigationComponentType.NavigationSuiteScaffold
-            }
-        }
+    return when {
+        isLeanbackEnabled -> NavigationComponentType.TopBar
+        isAutomotiveEnabled -> NavigationComponentType.TopBar
+        isLargeWindow -> NavigationComponentType.TopBar
+        else -> NavigationComponentType.NavigationSuiteScaffold
     }
 }

AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withTopBarNavigation/TopBar.kt

@@ -51,8 +51,7 @@ import androidx.compose.ui.unit.dp
 import com.google.jetstream.data.util.StringConstants
 import com.google.jetstream.presentation.app.JetStreamLogo
 import com.google.jetstream.presentation.app.UserAvatar
-import com.google.jetstream.presentation.components.feature.FormFactor
-import com.google.jetstream.presentation.components.feature.rememberUiMode
+import com.google.jetstream.presentation.components.feature.isDpadAvailable
 import com.google.jetstream.presentation.components.shim.tryRequestFocus
 import com.google.jetstream.presentation.screens.Screens
 
@@ -66,14 +65,12 @@ internal fun TopBar(
     val focusManager = LocalFocusManager.current
     val (tabRow, avatar) = remember { FocusRequester.createRefs() }
 
-    val uiMode = rememberUiMode()
-    val onClickHandler: (Screens) -> Unit = remember(uiMode) {
-        when (uiMode.formFactor) {
-            FormFactor.Tv -> {
-                { focusManager.moveFocus(FocusDirection.Down) }
-            }
-
-            else -> { it -> showScreen(it) }
+    val isDpadAvailable = isDpadAvailable()
+    val onClickHandler: (Screens) -> Unit = remember(isDpadAvailable) {
+        if (isDpadAvailable) {
+            { focusManager.moveFocus(FocusDirection.Down) }
+        } else {
+            { it -> showScreen(it) }
         }
     }
 

AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/components/BackButton.kt

@@ -21,7 +21,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
-import com.google.jetstream.presentation.components.feature.rememberIsBackButtonRequired
+import com.google.jetstream.presentation.components.feature.isBackButtonRequired
 import com.google.jetstream.presentation.screens.videoPlayer.components.button.VideoPlayerControlsIcon
 
 @Composable
@@ -45,7 +45,7 @@ fun BackButton(
     modifier: Modifier = Modifier,
     icon: ImageVector = Icons.AutoMirrored.Filled.ArrowBack,
     description: String? = null,
-    isRequired: Boolean = rememberIsBackButtonRequired()
+    isRequired: Boolean = isBackButtonRequired()
 ) {
     if (isRequired) {
         BackButton(

AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/components/feature/DpadAvailability.kt renamed to AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/components/feature/BackButtonRequired.kt

@@ -17,13 +17,14 @@
 package com.google.jetstream.presentation.components.feature
 
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.input.InputMode
-import androidx.compose.ui.input.InputModeManager
-import androidx.compose.ui.platform.LocalInputModeManager
 
+// This function determines if the back button is required
+// so that users can comfortably navigate back to the previous screen when they are using
+// the app in the environment without touch screen or hardware back button as d-pad has.
 @Composable
-fun rememberDpadAvailability(
-    inputModeManager: InputModeManager = LocalInputModeManager.current
-): Boolean {
-    return inputModeManager.inputMode == InputMode.Keyboard
+fun isBackButtonRequired(): Boolean {
+    return isAutomotiveEnabled() ||
+        isMouseAvailable() ||
+        isTouchPadAvailable() ||
+        isXrSessionAvailable()
 }