fix no tv start option, fix crash on tv when clicking cast button, ad…

…ded volume slider on desktop

app/android/src/androidMain/AndroidManifest.xml

@@ -17,6 +17,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:banner="@mipmap/tv_banner"
         android:supportsRtl="true"
         android:theme="@style/SplashScreenTheme"
         android:name=".App"
@@ -40,6 +41,7 @@
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
         </activity>
 
@@ -49,7 +51,7 @@
 
         <receiver
             android:name="androidx.mediarouter.media.MediaTransferReceiver"
-            android:exported="true"></receiver>
+            android:exported="true" />
     </application>
 
 </manifest>

app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/App.android.kt

@@ -11,7 +11,7 @@ actual fun SystemProvider(content: @Composable () -> Unit) {
 }
 
 @Composable
-actual fun isTv(): Boolean {
+actual fun rememberIsTv(): Boolean {
     val context = LocalContext.current
     return remember { context.isTv() }
 }

app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoScreen.android.kt

@@ -48,6 +48,7 @@ import dev.datlag.burningseries.shared.common.findWindow
 import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle
 import dev.datlag.burningseries.shared.common.withIOContext
 import dev.datlag.burningseries.shared.common.withMainContext
+import dev.datlag.burningseries.shared.rememberIsTv
 import dev.datlag.burningseries.shared.ui.*
 import dev.datlag.kast.ConnectionState
 import dev.datlag.kast.Kast
@@ -324,6 +325,7 @@ actual fun VideoScreen(component: VideoComponent) {
 
     val progressColor = MaterialTheme.colorScheme.primary.toArgb()
     val episode by component.episode.collectAsStateWithLifecycle()
+    val isTv = rememberIsTv()
 
     AndroidView(
         modifier = Modifier.fillMaxSize().background(Color.Black),
@@ -354,6 +356,12 @@ actual fun VideoScreen(component: VideoComponent) {
                 usingPlayer.pause()
                 component.selectCast()
             }
+            mediaRouteButton.visibility = if (isTv) {
+                View.GONE
+            } else {
+                View.VISIBLE
+            }
+            mediaRouteButton.isEnabled = !isTv
 
             subtitleButton.setOnClickListener {
                 playerView.player?.pause()

app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.android.kt

@@ -52,7 +52,7 @@ actual fun CastDialog(component: CastComponent) {
         icon = {
             Icon(
                 imageVector = Icons.Default.Cast,
-                contentDescription = null
+                contentDescription = stringResource(SharedRes.strings.casting)
             )
         },
         title = {

app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/App.kt

@@ -64,4 +64,4 @@ fun App(
 expect fun SystemProvider(content: @Composable () -> Unit)
 
 @Composable
-expect fun isTv(): Boolean
+expect fun rememberIsTv(): Boolean

app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/common/ExtendCompose.kt

@@ -1,10 +1,6 @@
 package dev.datlag.burningseries.shared.common
 
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.AnimationSpec
-import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.spring
 import androidx.compose.foundation.focusable
 import androidx.compose.foundation.gestures.awaitFirstDown
 import androidx.compose.foundation.gestures.waitForUpOrCancellation
@@ -16,13 +12,11 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyGridItemScope
 import androidx.compose.foundation.lazy.grid.LazyGridScope
-import androidx.compose.material3.ColorScheme
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.vector.PathBuilder
 import androidx.compose.ui.input.pointer.pointerInput
@@ -112,13 +106,13 @@ fun LazyListState.OnBottomReached(enabled: Boolean = true, buffer: Int = 0, bloc
     }
 }
 
+@Composable
 fun Modifier.isFocused(
     hoverable: Boolean = true,
     focusable: Boolean = true,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
     builder: Modifier.() -> Modifier
 ): Modifier = composed {
-    val interactionSource = remember { MutableInteractionSource() }
-
     val isHovered by interactionSource.collectIsHoveredAsState()
     val isFocused by interactionSource.collectIsFocusedAsState()
 
@@ -133,14 +127,42 @@ fun Modifier.isFocused(
     )
 }
 
+@Composable
+fun Modifier.onFocusChanged(
+    hoverable: Boolean = true,
+    focusable: Boolean = true,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+    onChanged: (Boolean) -> Unit
+): Modifier = composed {
+    val isHovered by interactionSource.collectIsHoveredAsState()
+    val isFocused by interactionSource.collectIsFocusedAsState()
+
+    val latestValue = remember(isHovered, isFocused) { isHovered || isFocused }
+
+    LaunchedEffect(latestValue) {
+        onChanged(latestValue)
+    }
+
+    this.hoverable(
+        interactionSource = interactionSource,
+        enabled = hoverable
+    ).focusable(
+        interactionSource = interactionSource,
+        enabled = focusable
+    )
+}
+
+@Composable
 fun Modifier.focusScale(
     scale: Float = 1.1F,
     hoverable: Boolean = true,
-    focusable: Boolean = true
+    focusable: Boolean = true,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }
 ) = composed {
     isFocused(
         hoverable,
-        focusable
+        focusable,
+        interactionSource
     ) {
         graphicsLayer {
             scaleX = scale
@@ -149,32 +171,6 @@ fun Modifier.focusScale(
     }
 }
 
-@Composable
-fun ColorScheme.animate(spec: AnimationSpec<Color> = spring(stiffness = Spring.StiffnessLow)): ColorScheme {
-    return this.copy(
-        primary = animateColorAsState(this.primary, spec).value,
-        onPrimary = animateColorAsState(this.onPrimary, spec).value,
-        primaryContainer = animateColorAsState(this.primaryContainer, spec).value,
-        onPrimaryContainer = animateColorAsState(this.onPrimaryContainer, spec).value,
-        secondary = animateColorAsState(this.secondary, spec).value,
-        onSecondary = animateColorAsState(this.onSecondary, spec).value,
-        secondaryContainer = animateColorAsState(this.secondaryContainer, spec).value,
-        onSecondaryContainer = animateColorAsState(this.onSecondaryContainer, spec).value,
-        tertiary = animateColorAsState(this.tertiary, spec).value,
-        onTertiary = animateColorAsState(this.onTertiary, spec).value,
-        tertiaryContainer = animateColorAsState(this.tertiaryContainer, spec).value,
-        onTertiaryContainer = animateColorAsState(this.onTertiaryContainer, spec).value,
-        background = animateColorAsState(this.background, spec).value,
-        onBackground = animateColorAsState(this.onBackground, spec).value,
-        surface = animateColorAsState(this.surface, spec).value,
-        onSurface = animateColorAsState(this.onSurface, spec).value,
-        error = animateColorAsState(this.error, spec).value,
-        onError = animateColorAsState(this.onError, spec).value,
-        errorContainer = animateColorAsState(this.errorContainer, spec).value,
-        onErrorContainer = animateColorAsState(this.onErrorContainer, spec).value
-    )
-}
-
 fun PathBuilder.drawPathFromSvgData(data: String) {
     val pathCommands = data.split("(?=[a-zA-Z])".toRegex()).filterNot { it.isBlank() }
     val numberRegex = "[-+]?\\d*\\.?\\d+".toRegex()

app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/InitialScreen.kt

@@ -15,7 +15,7 @@ import com.arkivanov.decompose.ExperimentalDecomposeApi
 import com.arkivanov.decompose.extensions.compose.jetbrains.pages.Pages
 import com.moriatsushi.insetsx.ExperimentalSoftwareKeyboardApi
 import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle
-import dev.datlag.burningseries.shared.isTv
+import dev.datlag.burningseries.shared.rememberIsTv
 import dev.datlag.burningseries.shared.ui.custom.ExpandedPages
 import dev.icerock.moko.resources.compose.stringResource
 
@@ -29,7 +29,7 @@ fun InitialScreen(component: InitialComponent) {
             WindowWidthSizeClass.Compact -> CompactScreen(component)
             WindowWidthSizeClass.Medium -> MediumScreen(component)
             WindowWidthSizeClass.Expanded -> {
-                if (isTv()) {
+                if (rememberIsTv()) {
                     MediumScreen(component)
                 } else {
                     ExpandedScreen(component)

app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreen.kt

@@ -26,7 +26,7 @@ import dev.datlag.burningseries.shared.SharedRes
 import dev.datlag.burningseries.shared.common.header
 import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle
 import dev.datlag.burningseries.shared.common.onClick
-import dev.datlag.burningseries.shared.isTv
+import dev.datlag.burningseries.shared.rememberIsTv
 import dev.datlag.burningseries.shared.ui.custom.VerticalScrollbar
 import dev.datlag.burningseries.shared.ui.custom.rememberScrollbarAdapter
 import dev.datlag.burningseries.shared.ui.screen.initial.home.component.SeriesItem
@@ -37,7 +37,7 @@ import dev.icerock.moko.resources.compose.stringResource
 fun FavoriteScreen(component: FavoriteComponent) {
     when (calculateWindowSizeClass().widthSizeClass) {
         WindowWidthSizeClass.Expanded -> {
-            if (isTv()) {
+            if (rememberIsTv()) {
                 DefaultView(component)
             } else {
                 ExpandedView(component)

app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeScreen.kt

@@ -5,7 +5,6 @@ import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.lazy.grid.rememberLazyGridState
-import androidx.compose.material.icons.Icons
 import androidx.compose.material3.*
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
 import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
@@ -23,8 +22,8 @@ import dev.datlag.burningseries.model.state.HomeState
 import dev.datlag.burningseries.shared.SharedRes
 import dev.datlag.burningseries.shared.common.header
 import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle
-import dev.datlag.burningseries.shared.isTv
 import dev.datlag.burningseries.shared.other.StateSaver
+import dev.datlag.burningseries.shared.rememberIsTv
 import dev.datlag.burningseries.shared.ui.custom.VerticalScrollbar
 import dev.datlag.burningseries.shared.ui.custom.rememberScrollbarAdapter
 import dev.datlag.burningseries.shared.ui.custom.state.ErrorState
@@ -53,7 +52,7 @@ fun HomeScreen(component: HomeComponent) {
         is HomeState.Success -> {
             when (calculateWindowSizeClass().widthSizeClass) {
                 WindowWidthSizeClass.Expanded -> {
-                    if (isTv()) {
+                    if (rememberIsTv()) {
                         DefaultView(currentState.home, component)
                     } else {
                         ExpandedView(currentState.home, component)
@@ -142,7 +141,7 @@ private fun MainView(home: Home, component: HomeComponent, modifier: Modifier =
                         ) {
                             Icon(
                                 imageVector = MaterialSymbols.rememberDeployedCodeAlert(),
-                                contentDescription = null
+                                contentDescription = stringResource(SharedRes.strings.sekret_unavailable_title)
                             )
                         }
                     }

app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreen.kt

@@ -30,7 +30,7 @@ import dev.datlag.burningseries.shared.SharedRes
 import dev.datlag.burningseries.shared.common.OnBottomReached
 import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle
 import dev.datlag.burningseries.shared.common.onClick
-import dev.datlag.burningseries.shared.isTv
+import dev.datlag.burningseries.shared.rememberIsTv
 import dev.datlag.burningseries.shared.ui.custom.VerticalScrollbar
 import dev.datlag.burningseries.shared.ui.custom.rememberScrollbarAdapter
 import dev.datlag.burningseries.shared.ui.custom.state.ErrorState
@@ -54,7 +54,7 @@ fun SearchScreen(component: SearchComponent) {
         is SearchState.Success -> {
             when (calculateWindowSizeClass().widthSizeClass) {
                 WindowWidthSizeClass.Expanded -> {
-                    if (isTv()) {
+                    if (rememberIsTv()) {
                         DefaultView(component)
                     } else {
                         ExpandedView(component)

app/shared/src/commonMain/resources/MR/base/strings.xml

@@ -70,4 +70,6 @@
     <string name="github">GitHub</string>
     <string name="sekret_unavailable_title">Sekret unavailable</string>
     <string name="sekret_unavailable_text">Some features do not work currently.\nYou should restart the app and check if this issue persists.</string>
+    <string name="muted">Muted</string>
+    <string name="unmuted">Unmuted</string>
 </resources>

app/shared/src/commonMain/resources/MR/de/strings.xml

@@ -68,4 +68,8 @@
     <string name="release_available_title">Neue Version verfügbar</string>
     <string name="release_available_text">Eine neue Version ist verfügbar "%s".\nDas solltest du dir ansehen!</string>
     <string name="github">GitHub</string>
+    <string name="sekret_unavailable_title">Sekret nicht verfügbar</string>
+    <string name="sekret_unavailable_text">Einige Funktionen sind momentan nicht verfügbar.\nDu solltest die App neu starten und prüfen, ob das Problem bestehen bleibt.</string>
+    <string name="muted">Stumm</string>
+    <string name="unmuted">Nicht stumm</string>
 </resources>

app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/App.desktop.kt

@@ -5,7 +5,9 @@ import androidx.compose.foundation.LocalContextMenuRepresentation
 import androidx.compose.foundation.text.LocalTextContextMenu
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.awt.ComposeWindow
 import com.dzirbel.contextmenu.ContextMenuColors
@@ -35,6 +37,6 @@ fun ContextMenuColors(scheme: ColorScheme = MaterialTheme.colorScheme) = Context
 )
 
 @Composable
-actual fun isTv(): Boolean {
+actual fun rememberIsTv(): Boolean {
     return false
 }

app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/MediaPlayer.kt

@@ -1,15 +1,21 @@
 package dev.datlag.burningseries.shared.ui.screen.video
 
+import androidx.compose.runtime.MutableFloatState
 import androidx.compose.runtime.MutableLongState
 import androidx.compose.runtime.MutableState
 
 interface MediaPlayer {
     val isPlaying: MutableState<Boolean>
     val time: MutableLongState
     val length: MutableLongState
+    val isMuted: MutableState<Boolean>
+    val volume: MutableFloatState
     fun play()
     fun pause()
     fun rewind()
     fun forward()
     fun seekTo(millis: Long)
+    fun mute()
+    fun unmute()
+    fun setVolume(volume: Float)
 }