From 6441e5437a8721c475342c0bcff1474eca1f8ff4 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Thu, 2 May 2024 20:13:10 +0200
Subject: [PATCH] chore: upgrade androidx tv material3 to 1.0.0-beta01

---
 app/tv/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt  | 1 -
 .../src/main/java/dev/jdtech/jellyfin/ui/AddServerScreen.kt | 2 --
 app/tv/src/main/java/dev/jdtech/jellyfin/ui/HomeScreen.kt   | 2 --
 .../src/main/java/dev/jdtech/jellyfin/ui/LibrariesScreen.kt | 3 +--
 .../src/main/java/dev/jdtech/jellyfin/ui/LibraryScreen.kt   | 2 --
 app/tv/src/main/java/dev/jdtech/jellyfin/ui/LoginScreen.kt  | 2 --
 app/tv/src/main/java/dev/jdtech/jellyfin/ui/MainScreen.kt   | 2 --
 app/tv/src/main/java/dev/jdtech/jellyfin/ui/MovieScreen.kt  | 2 --
 app/tv/src/main/java/dev/jdtech/jellyfin/ui/PlayerScreen.kt | 2 --
 app/tv/src/main/java/dev/jdtech/jellyfin/ui/SeasonScreen.kt | 2 --
 .../main/java/dev/jdtech/jellyfin/ui/ServerSelectScreen.kt  | 3 ---
 .../src/main/java/dev/jdtech/jellyfin/ui/SettingsScreen.kt  | 2 --
 .../main/java/dev/jdtech/jellyfin/ui/SettingsSubScreen.kt   | 2 --
 app/tv/src/main/java/dev/jdtech/jellyfin/ui/ShowScreen.kt   | 2 --
 .../main/java/dev/jdtech/jellyfin/ui/UserSelectScreen.kt    | 3 ---
 .../java/dev/jdtech/jellyfin/ui/components/EpisodeCard.kt   | 2 --
 .../main/java/dev/jdtech/jellyfin/ui/components/ItemCard.kt | 2 --
 .../java/dev/jdtech/jellyfin/ui/components/ItemPoster.kt    | 2 --
 .../jdtech/jellyfin/ui/components/PillBorderIndicator.kt    | 2 --
 .../java/dev/jdtech/jellyfin/ui/components/ProfileButton.kt | 2 --
 .../java/dev/jdtech/jellyfin/ui/components/ProgressBadge.kt | 2 --
 .../jdtech/jellyfin/ui/components/SettingsCategoryCard.kt   | 2 --
 .../jellyfin/ui/components/SettingsDetailsSelectCard.kt     | 2 --
 .../dev/jdtech/jellyfin/ui/components/SettingsSelectCard.kt | 2 --
 .../dev/jdtech/jellyfin/ui/components/SettingsSwitchCard.kt | 2 --
 .../jellyfin/ui/components/player/VideoPlayerControls.kt    | 2 --
 .../jellyfin/ui/components/player/VideoPlayerMediaButton.kt | 2 --
 .../jellyfin/ui/components/player/VideoPlayerMediaTitle.kt  | 2 --
 .../jellyfin/ui/components/player/VideoPlayerOverlay.kt     | 2 --
 .../jellyfin/ui/components/player/VideoPlayerSeekBar.kt     | 3 +--
 .../jellyfin/ui/components/player/VideoPlayerSeeker.kt      | 2 --
 .../jellyfin/ui/dialogs/VideoPlayerTrackSelectorDialog.kt   | 2 --
 app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Color.kt  | 2 --
 app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Shape.kt  | 2 --
 .../src/main/java/dev/jdtech/jellyfin/ui/theme/Spacing.kt   | 3 ---
 app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Theme.kt  | 6 ++----
 app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Type.kt   | 2 --
 gradle/libs.versions.toml                                   | 3 ++-
 38 files changed, 6 insertions(+), 79 deletions(-)

diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
index 950cdd4a..0e0ea714 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
+++ b/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)
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/AddServerScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/AddServerScreen.kt
index e1731b4c..acdacdce 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/AddServerScreen.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/HomeScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/HomeScreen.kt
index a908e471..4515a414 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/HomeScreen.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibrariesScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibrariesScreen.kt
index 5fff7f97..1e0b5d0d 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibrariesScreen.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibraryScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibraryScreen.kt
index 54a04bac..6b18565f 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibraryScreen.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LoginScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LoginScreen.kt
index 84e60508..6cbc210c 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LoginScreen.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MainScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MainScreen.kt
index 39afd435..3debc4d8 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MainScreen.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MovieScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MovieScreen.kt
index ca1273be..338b98d3 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MovieScreen.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/PlayerScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/PlayerScreen.kt
index e286e358..92cb0aae 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/PlayerScreen.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SeasonScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SeasonScreen.kt
index b90b138c..e54895e7 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SeasonScreen.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ServerSelectScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ServerSelectScreen.kt
index 85a7d3f3..4d3cc63c 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ServerSelectScreen.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsScreen.kt
index 8fe27874..9e5866c0 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsScreen.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsSubScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsSubScreen.kt
index 8bbfa872..eec271ef 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsSubScreen.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ShowScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ShowScreen.kt
index c595461d..77fb1464 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ShowScreen.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/UserSelectScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/UserSelectScreen.kt
index 97305e9c..ed1b6e92 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/UserSelectScreen.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/EpisodeCard.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/EpisodeCard.kt
index 7d9f8f23..9e1b4569 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/EpisodeCard.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemCard.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemCard.kt
index 6d63c42e..b8bb0fc3 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemCard.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemPoster.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemPoster.kt
index 623bed32..041f7c0f 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemPoster.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/PillBorderIndicator.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/PillBorderIndicator.kt
index 1cfc1958..47489184 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/PillBorderIndicator.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProfileButton.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProfileButton.kt
index f976abba..fa82acf2 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProfileButton.kt
+++ b/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?,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProgressBadge.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProgressBadge.kt
index a525cda6..b62db7a8 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProgressBadge.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsCategoryCard.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsCategoryCard.kt
index ae040d93..322f5358 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsCategoryCard.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsDetailsSelectCard.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsDetailsSelectCard.kt
index 94ff0ed3..74d2b9ba 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsDetailsSelectCard.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSelectCard.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSelectCard.kt
index 46b9ce29..d858832c 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSelectCard.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSwitchCard.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSwitchCard.kt
index 976cb4fd..d0b84f69 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSwitchCard.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerControls.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerControls.kt
index e8717d28..61d0010c 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerControls.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaButton.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaButton.kt
index 73139a13..54e15b22 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaButton.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaTitle.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaTitle.kt
index e16bb849..4b55f2bd 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaTitle.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerOverlay.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerOverlay.kt
index 86d536d2..f0738e0d 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerOverlay.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeekBar.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeekBar.kt
index e98685f5..43a79ab3 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeekBar.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeeker.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeeker.kt
index 400196a1..4700403b 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeeker.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dialogs/VideoPlayerTrackSelectorDialog.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dialogs/VideoPlayerTrackSelectorDialog.kt
index 595c609a..94176948 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dialogs/VideoPlayerTrackSelectorDialog.kt
+++ b/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(
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Color.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Color.kt
index e662f891..42520774 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Color.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Shape.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Shape.kt
index 5470e4c3..487d3c18 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Shape.kt
+++ b/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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Spacing.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Spacing.kt
index 0d69d897..884971f8 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Spacing.kt
+++ b/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 }
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Theme.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Theme.kt
index 30475d26..26de65c1 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Theme.kt
+++ b/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.NonInteractiveSurfaceDefaults
+import androidx.tv.material3.SurfaceDefaults
 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,
diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Type.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Type.kt
index ff6732a2..acc53b68 100644
--- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Type.kt
+++ b/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,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 73bd70b5..c9c75f8b 100644
--- a/gradle/libs.versions.toml
+++ b/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" }