StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
refactor: extract television device predicate
David Nashash9ce82152c902
diff --git a/app/src/main/java/com/streamvault/app/device/DeviceSupport.kt b/app/src/main/java/com/streamvault/app/device/DeviceSupport.ktindex 71c39262..fe4f122c 100644--- a/app/src/main/java/com/streamvault/app/device/DeviceSupport.kt+++ b/app/src/main/java/com/streamvault/app/device/DeviceSupport.kt@@ -1,39 +1,16 @@package com.streamvault.app.device-import android.app.UiModeManagerimport android.content.Context-import android.content.pm.PackageManager-import android.content.res.Configurationimport android.os.Buildimport android.os.Environmentimport androidx.compose.runtime.Composableimport androidx.compose.runtime.rememberimport androidx.compose.ui.platform.LocalContextimport androidx.core.content.ContextCompat+import com.streamvault.core.ui.device.isTelevisionDevice as coreIsTelevisionDeviceimport java.io.File-fun Context.isTelevisionDevice(): Boolean {- val packageManager = packageManager- if (packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {- return true- }- if (packageManager.hasSystemFeature("android.software.leanback_only")) {- return true- }- if (packageManager.hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {- return true- }- if (packageManager.hasSystemFeature("amazon.hardware.fire_tv")) {- return true- }- val uiModeManager = getSystemService(Context.UI_MODE_SERVICE) as? UiModeManager- if (uiModeManager?.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION) {- return true- }-- val screenWidthDp = resources.configuration.screenWidthDp- return !packageManager.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN) && screenWidthDp >= 900-}+fun Context.isTelevisionDevice(): Boolean = coreIsTelevisionDevice()@Composablefun rememberIsTelevisionDevice(): Boolean {@@ -60,4 +37,4 @@ fun Context.isFireTvDevice(): Boolean =fun Context.removableAppStorageDirs(): List<File> =ContextCompat.getExternalFilesDirs(this, null).filterNotNull()- .filter { runCatching { Environment.isExternalStorageRemovable(it) }.getOrDefault(false) }\ No newline at end of file+ .filter { runCatching { Environment.isExternalStorageRemovable(it) }.getOrDefault(false) }diff --git a/core/ui/src/main/java/com/streamvault/core/ui/device/TelevisionDevice.kt b/core/ui/src/main/java/com/streamvault/core/ui/device/TelevisionDevice.ktnew file mode 100644index 00000000..7e5486f3--- /dev/null+++ b/core/ui/src/main/java/com/streamvault/core/ui/device/TelevisionDevice.kt@@ -0,0 +1,36 @@+package com.streamvault.core.ui.device++import android.app.UiModeManager+import android.content.Context+import android.content.pm.PackageManager+import android.content.res.Configuration++internal fun classifyTelevisionDevice(+ hasLeanback: Boolean,+ hasLeanbackOnly: Boolean,+ hasTelevision: Boolean,+ hasFireTv: Boolean,+ uiModeType: Int?,+ screenWidthDp: Int,+ hasTouchscreen: Boolean+): Boolean =+ hasLeanback ||+ hasLeanbackOnly ||+ hasTelevision ||+ hasFireTv ||+ uiModeType == Configuration.UI_MODE_TYPE_TELEVISION ||+ (!hasTouchscreen && screenWidthDp >= 900)++fun Context.isTelevisionDevice(): Boolean {+ val packageManager = packageManager+ val uiModeManager = getSystemService(Context.UI_MODE_SERVICE) as? UiModeManager+ return classifyTelevisionDevice(+ hasLeanback = packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK),+ hasLeanbackOnly = packageManager.hasSystemFeature("android.software.leanback_only"),+ hasTelevision = packageManager.hasSystemFeature(PackageManager.FEATURE_TELEVISION),+ hasFireTv = packageManager.hasSystemFeature("amazon.hardware.fire_tv"),+ uiModeType = uiModeManager?.currentModeType,+ screenWidthDp = resources.configuration.screenWidthDp,+ hasTouchscreen = packageManager.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN)+ )+}diff --git a/core/ui/src/test/java/com/streamvault/core/ui/device/TelevisionDeviceTest.kt b/core/ui/src/test/java/com/streamvault/core/ui/device/TelevisionDeviceTest.ktnew file mode 100644index 00000000..78bb800c--- /dev/null+++ b/core/ui/src/test/java/com/streamvault/core/ui/device/TelevisionDeviceTest.kt@@ -0,0 +1,36 @@+package com.streamvault.core.ui.device++import com.google.common.truth.Truth.assertThat+import org.junit.Test++class TelevisionDeviceTest {+ @Test+ fun leanbackFeatureIdentifiesTelevision() {+ assertThat(+ classifyTelevisionDevice(+ hasLeanback = true,+ hasLeanbackOnly = false,+ hasTelevision = false,+ hasFireTv = false,+ uiModeType = null,+ screenWidthDp = 0,+ hasTouchscreen = true+ )+ ).isTrue()+ }++ @Test+ fun touchDeviceBelowTelevisionFallbackIsNotTelevision() {+ assertThat(+ classifyTelevisionDevice(+ hasLeanback = false,+ hasLeanbackOnly = false,+ hasTelevision = false,+ hasFireTv = false,+ uiModeType = null,+ screenWidthDp = 600,+ hasTouchscreen = true+ )+ ).isFalse()+ }+}