chore: upgrade androidx tv material3 to 1.0.0-beta01

app/tv/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt

@@ -23,7 +23,6 @@ data class PlayerActivityNavArgs(
 @ActivityDestination(
     navArgsDelegate = PlayerActivityNavArgs::class,
 )
-@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
 class PlayerActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/tv/src/main/java/dev/jdtech/jellyfin/ui/AddServerScreen.kt

@@ -32,7 +32,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.tv.material3.Button
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.LocalContentColor
 import androidx.tv.material3.MaterialTheme
@@ -71,7 +70,6 @@ fun AddServerScreen(
     )
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun AddServerScreenLayout(
     uiState: AddServerViewModel.UiState,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/HomeScreen.kt

@@ -22,7 +22,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.tv.foundation.lazy.list.TvLazyColumn
 import androidx.tv.foundation.lazy.list.TvLazyRow
 import androidx.tv.foundation.lazy.list.items
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
 import com.ramcosta.composedestinations.annotation.Destination
@@ -88,7 +87,6 @@ fun HomeScreen(
     )
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun HomeScreenLayout(
     uiState: HomeViewModel.UiState,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibrariesScreen.kt

@@ -12,12 +12,12 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.tv.foundation.lazy.grid.TvGridCells
 import androidx.tv.foundation.lazy.grid.TvLazyVerticalGrid
 import androidx.tv.foundation.lazy.grid.items
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
@@ -50,7 +50,6 @@ fun LibrariesScreen(
     )
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun LibrariesScreenLayout(
     uiState: MediaViewModel.UiState,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibraryScreen.kt

@@ -18,7 +18,6 @@ import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.tv.foundation.lazy.grid.TvGridCells
 import androidx.tv.foundation.lazy.grid.TvGridItemSpan
 import androidx.tv.foundation.lazy.grid.TvLazyVerticalGrid
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
 import com.ramcosta.composedestinations.annotation.Destination
@@ -75,7 +74,6 @@ fun LibraryScreen(
     )
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun LibraryScreenLayout(
     libraryName: String,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/LoginScreen.kt

@@ -33,7 +33,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.tv.material3.Button
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.LocalContentColor
 import androidx.tv.material3.MaterialTheme
@@ -87,7 +86,6 @@ fun LoginScreen(
     )
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun LoginScreenLayout(
     uiState: LoginViewModel.UiState,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/MainScreen.kt

@@ -29,7 +29,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Tab
@@ -78,7 +77,6 @@ enum class TabDestination(
     // LiveTV(CoreR.drawable.ic_tv, CoreR.string.live_tv)
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun MainScreenLayout(
     uiState: MainViewModel.UiState,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/MovieScreen.kt

@@ -39,7 +39,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.toSize
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.tv.material3.Button
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.LocalContentColor
 import androidx.tv.material3.MaterialTheme
@@ -115,7 +114,6 @@ fun MovieScreen(
     )
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun MovieScreenLayout(
     uiState: MovieViewModel.UiState,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/PlayerScreen.kt

@@ -30,7 +30,6 @@ import androidx.media3.common.TrackSelectionOverride
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.session.MediaSession
 import androidx.media3.ui.PlayerView
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
@@ -204,7 +203,6 @@ fun PlayerScreen(
 }
 
 @androidx.annotation.OptIn(UnstableApi::class)
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun VideoPlayerControls(
     title: String,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/SeasonScreen.kt

@@ -18,7 +18,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.tv.foundation.lazy.list.TvLazyColumn
 import androidx.tv.foundation.lazy.list.items
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
 import com.ramcosta.composedestinations.annotation.Destination
@@ -76,7 +75,6 @@ fun SeasonScreen(
     )
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun SeasonScreenLayout(
     seriesName: String,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/ServerSelectScreen.kt

@@ -35,7 +35,6 @@ import androidx.tv.foundation.lazy.list.TvLazyRow
 import androidx.tv.foundation.lazy.list.items
 import androidx.tv.material3.Border
 import androidx.tv.material3.ClickableSurfaceDefaults
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.OutlinedButton
@@ -103,7 +102,6 @@ fun ServerSelectScreen(
     )
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun ServerSelectScreenLayout(
     uiState: ServerSelectViewModel.UiState,
@@ -246,7 +244,6 @@ private fun ServerSelectScreenLayoutPreviewNoServers() {
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun ServerComponent(
     server: DiscoveredServer,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsScreen.kt

@@ -19,7 +19,6 @@ import androidx.tv.foundation.lazy.grid.TvGridCells
 import androidx.tv.foundation.lazy.grid.TvGridItemSpan
 import androidx.tv.foundation.lazy.grid.TvLazyVerticalGrid
 import androidx.tv.foundation.lazy.grid.items
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
 import com.ramcosta.composedestinations.annotation.Destination
@@ -80,7 +79,6 @@ fun SettingsScreen(
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun SettingsScreenLayout(
     uiState: SettingsViewModel.UiState,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsSubScreen.kt

@@ -25,7 +25,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.tv.foundation.lazy.list.TvLazyColumn
 import androidx.tv.foundation.lazy.list.items
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
 import com.ramcosta.composedestinations.annotation.Destination
@@ -90,7 +89,6 @@ fun SettingsSubScreen(
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun SettingsSubScreenLayout(
     uiState: SettingsViewModel.UiState,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/ShowScreen.kt

@@ -49,7 +49,6 @@ import androidx.tv.foundation.lazy.list.TvLazyRow
 import androidx.tv.foundation.lazy.list.items
 import androidx.tv.foundation.lazy.list.rememberTvLazyListState
 import androidx.tv.material3.Button
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.LocalContentColor
 import androidx.tv.material3.MaterialTheme
@@ -126,7 +125,6 @@ fun ShowScreen(
     )
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun ShowScreenLayout(
     uiState: ShowViewModel.UiState,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/UserSelectScreen.kt

@@ -33,7 +33,6 @@ import androidx.tv.foundation.lazy.list.TvLazyRow
 import androidx.tv.foundation.lazy.list.items
 import androidx.tv.material3.Border
 import androidx.tv.material3.ClickableSurfaceDefaults
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.OutlinedButton
@@ -99,7 +98,6 @@ fun UserSelectScreen(
     )
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun UserSelectScreenLayout(
     uiState: UserSelectViewModel.UiState,
@@ -204,7 +202,6 @@ private fun UserSelectScreenLayoutPreviewNoUsers() {
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun UserComponent(
     user: User,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/EpisodeCard.kt

@@ -23,7 +23,6 @@ import androidx.compose.ui.unit.dp
 import androidx.tv.material3.Border
 import androidx.tv.material3.ClickableSurfaceDefaults
 import androidx.tv.material3.ClickableSurfaceScale
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Surface
 import androidx.tv.material3.Text
@@ -32,7 +31,6 @@ import dev.jdtech.jellyfin.ui.dummy.dummyEpisode
 import dev.jdtech.jellyfin.ui.theme.FindroidTheme
 import dev.jdtech.jellyfin.ui.theme.spacings
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun EpisodeCard(
     episode: FindroidEpisode,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemCard.kt

@@ -21,7 +21,6 @@ import androidx.compose.ui.unit.dp
 import androidx.tv.material3.Border
 import androidx.tv.material3.ClickableSurfaceDefaults
 import androidx.tv.material3.ClickableSurfaceScale
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Surface
 import androidx.tv.material3.Text
@@ -33,7 +32,6 @@ import dev.jdtech.jellyfin.ui.dummy.dummyMovie
 import dev.jdtech.jellyfin.ui.theme.FindroidTheme
 import dev.jdtech.jellyfin.ui.theme.spacings
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun ItemCard(
     item: FindroidItem,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemPoster.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import coil.compose.AsyncImage
 import dev.jdtech.jellyfin.models.FindroidEpisode
@@ -17,7 +16,6 @@ enum class Direction {
     HORIZONTAL, VERTICAL
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun ItemPoster(
     item: FindroidItem,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/PillBorderIndicator.kt

@@ -20,7 +20,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.height
 import androidx.compose.ui.unit.width
 import androidx.compose.ui.zIndex
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.TabRow
 
@@ -35,7 +34,6 @@ import androidx.tv.material3.TabRow
  *
  * This component is adapted from androidx.tv.material3.TabRowDefaults.PillIndicator
  */
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun PillBorderIndicator(
     currentTabPosition: DpRect,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProfileButton.kt

@@ -17,7 +17,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.tv.material3.Border
 import androidx.tv.material3.ClickableSurfaceDefaults
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.Surface
 import coil.compose.AsyncImage
@@ -29,7 +28,6 @@ import dev.jdtech.jellyfin.ui.dummy.dummyUser
 import dev.jdtech.jellyfin.ui.theme.FindroidTheme
 import org.jellyfin.sdk.model.api.ImageType
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun ProfileButton(
     user: User?,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProgressBadge.kt

@@ -14,7 +14,6 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
@@ -25,7 +24,6 @@ import dev.jdtech.jellyfin.ui.theme.FindroidTheme
 import dev.jdtech.jellyfin.ui.theme.spacings
 import dev.jdtech.jellyfin.core.R as CoreR
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun ProgressBadge(
     item: FindroidItem,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsCategoryCard.kt

@@ -21,7 +21,6 @@ import androidx.compose.ui.unit.dp
 import androidx.tv.material3.Border
 import androidx.tv.material3.ClickableSurfaceDefaults
 import androidx.tv.material3.ClickableSurfaceScale
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Surface
@@ -31,7 +30,6 @@ import dev.jdtech.jellyfin.ui.theme.FindroidTheme
 import dev.jdtech.jellyfin.ui.theme.spacings
 import dev.jdtech.jellyfin.core.R as CoreR
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun SettingsCategoryCard(
     preference: PreferenceCategory,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsDetailsSelectCard.kt

@@ -22,7 +22,6 @@ import androidx.tv.foundation.lazy.list.TvLazyColumn
 import androidx.tv.material3.Border
 import androidx.tv.material3.ClickableSurfaceDefaults
 import androidx.tv.material3.ClickableSurfaceScale
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.RadioButton
 import androidx.tv.material3.Surface
@@ -33,7 +32,6 @@ import dev.jdtech.jellyfin.ui.theme.FindroidTheme
 import dev.jdtech.jellyfin.ui.theme.spacings
 import dev.jdtech.jellyfin.core.R as CoreR
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun SettingsDetailsCard(
     preference: PreferenceSelect,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSelectCard.kt

@@ -21,7 +21,6 @@ import androidx.compose.ui.unit.dp
 import androidx.tv.material3.Border
 import androidx.tv.material3.ClickableSurfaceDefaults
 import androidx.tv.material3.ClickableSurfaceScale
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Surface
@@ -32,7 +31,6 @@ import dev.jdtech.jellyfin.ui.theme.FindroidTheme
 import dev.jdtech.jellyfin.ui.theme.spacings
 import dev.jdtech.jellyfin.core.R as CoreR
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun SettingsSelectCard(
     preference: PreferenceSelect,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSwitchCard.kt

@@ -21,7 +21,6 @@ import androidx.compose.ui.unit.dp
 import androidx.tv.material3.Border
 import androidx.tv.material3.ClickableSurfaceDefaults
 import androidx.tv.material3.ClickableSurfaceScale
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Surface
@@ -32,7 +31,6 @@ import dev.jdtech.jellyfin.models.PreferenceSwitch
 import dev.jdtech.jellyfin.ui.theme.FindroidTheme
 import dev.jdtech.jellyfin.ui.theme.spacings
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun SettingsSwitchCard(
     preference: PreferenceSwitch,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerControls.kt

@@ -15,12 +15,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import dev.jdtech.jellyfin.ui.theme.FindroidTheme
 import dev.jdtech.jellyfin.ui.theme.spacings
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun VideoPlayerControlsLayout(
     mediaTitle: @Composable () -> Unit,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaButton.kt

@@ -7,11 +7,9 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.painter.Painter
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.IconButton
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun VideoPlayerMediaButton(
     icon: Painter,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaTitle.kt

@@ -4,12 +4,10 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
 import dev.jdtech.jellyfin.ui.theme.FindroidTheme
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun VideoPlayerMediaTitle(
     title: String,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerOverlay.kt

@@ -21,12 +21,10 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import dev.jdtech.jellyfin.ui.theme.FindroidTheme
 import dev.jdtech.jellyfin.ui.theme.spacings
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun VideoPlayerOverlay(
     isPlaying: Boolean,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeekBar.kt

@@ -25,12 +25,11 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import dev.jdtech.jellyfin.ui.theme.FindroidTheme
 import dev.jdtech.jellyfin.utils.handleDPadKeyEvents
 
-@OptIn(ExperimentalTvMaterial3Api::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun VideoPlayerSeekBar(
     progress: Float,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeeker.kt

@@ -15,7 +15,6 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.IconButton
 import androidx.tv.material3.MaterialTheme
@@ -25,7 +24,6 @@ import dev.jdtech.jellyfin.ui.theme.spacings
 import kotlin.time.Duration
 import dev.jdtech.jellyfin.core.R as CoreR
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun VideoPlayerSeeker(
     focusRequester: FocusRequester,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/dialogs/VideoPlayerTrackSelectorDialog.kt

@@ -24,7 +24,6 @@ import androidx.tv.foundation.lazy.list.items
 import androidx.tv.material3.Border
 import androidx.tv.material3.ClickableSurfaceDefaults
 import androidx.tv.material3.ClickableSurfaceScale
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.RadioButton
 import androidx.tv.material3.Surface
@@ -45,7 +44,6 @@ data class VideoPlayerTrackSelectorDialogResult(
     val index: Int,
 ) : Parcelable
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Destination(style = BaseDialogStyle::class)
 @Composable
 fun VideoPlayerTrackSelectorDialog(

app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Color.kt

@@ -2,7 +2,6 @@ package dev.jdtech.jellyfin.ui.theme
 
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.ui.graphics.Color
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.darkColorScheme as darkColorSchemeTv
 
 val PrimaryDark = Color(0xffa1c9ff)
@@ -23,7 +22,6 @@ val ColorScheme = darkColorScheme(
     background = Neutral1000,
 )
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 val ColorSchemeTv = darkColorSchemeTv(
     primary = ColorScheme.primary,
     onPrimary = ColorScheme.onPrimary,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Shape.kt

@@ -3,7 +3,6 @@ package dev.jdtech.jellyfin.ui.theme
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Shapes
 import androidx.compose.ui.unit.dp
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Shapes as ShapesTv
 
 val shapes = Shapes(
@@ -11,7 +10,6 @@ val shapes = Shapes(
     small = RoundedCornerShape(10.dp),
 )
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 val shapesTv = ShapesTv(
     extraSmall = shapes.extraSmall,
     small = shapes.small,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Spacing.kt

@@ -4,7 +4,6 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 
 @Immutable
@@ -17,9 +16,7 @@ data class Spacings(
     val extraLarge: Dp = 64.dp,
 )
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 val MaterialTheme.spacings
     get() = Spacings()
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 val LocalSpacings = compositionLocalOf { MaterialTheme.spacings }

app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Theme.kt

@@ -10,12 +10,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
-import androidx.tv.material3.ExperimentalTvMaterial3Api
+import androidx.tv.material3.SurfaceDefaults
-import androidx.tv.material3.NonInteractiveSurfaceDefaults
 import androidx.tv.material3.Surface
 import androidx.tv.material3.MaterialTheme as MaterialThemeTv
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun FindroidTheme(
     content: @Composable BoxScope.() -> Unit,
@@ -34,7 +32,7 @@ fun FindroidTheme(
                 shapes = shapesTv,
                 content = {
                     Surface(
-                        colors = NonInteractiveSurfaceDefaults.colors(
+                        colors = SurfaceDefaults.colors(
                             containerColor = androidx.tv.material3.MaterialTheme.colorScheme.background,
                         ),
                         shape = RectangleShape,

app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Type.kt

@@ -4,7 +4,6 @@ import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Typography as TypographyTv
 
 val Typography = Typography(
@@ -34,7 +33,6 @@ val Typography = Typography(
     ),
 )
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 val TypographyTv = TypographyTv(
     displayMedium = Typography.displayMedium,
     headlineMedium = Typography.headlineMedium,

gradle/libs.versions.toml

@@ -23,6 +23,7 @@ androidx-test-junit = "1.1.5"
 androidx-test-rules = "1.5.0"
 androidx-test-runner = "1.5.2"
 androidx-tv = "1.0.0-alpha10"
+androidx-tv-material3 = "1.0.0-beta01"
 androidx-work = "2.9.0"
 coil = "2.6.0"
 hilt = "2.51.1"
@@ -79,7 +80,7 @@ androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref
 androidx-test-rules = { group = "androidx.test" , name = "rules", version.ref = "androidx-test-rules" }
 androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidx-test-runner" }
 androidx-tv-foundation = { group = "androidx.tv", name = "tv-foundation", version.ref = "androidx-tv" }
-androidx-tv-material = { group = "androidx.tv", name = "tv-material", version.ref = "androidx-tv" }
+androidx-tv-material = { group = "androidx.tv", name = "tv-material", version.ref = "androidx-tv-material3" }
 androidx-work = { group = "androidx.work", name = "work-runtime", version.ref = "androidx-work" }
 androidx-work-testing = { group = "androidx.work", name = "work-testing", version.ref = "androidx-work" }
 coil = { group = "io.coil-kt", name = "coil", version.ref = "coil" }