chore(deps): upgrade Compose Material3 to 1.2.1

brdunn · Jun 12, 2024 · 1cc73dd · 1cc73dd
1 parent c816c0e
commit 1cc73dd
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 19 deletions.
diff --git a/app/src/main/java/com/devdunnapps/amplify/ui/about/AboutActivity.kt b/app/src/main/java/com/devdunnapps/amplify/ui/about/AboutActivity.kt
@@ -30,7 +30,6 @@ class AboutActivity : AppCompatActivity() {
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun AboutScreen(onNavigateUp: () -> Unit) {
     Scaffold(

diff --git a/...rc/main/java/com/devdunnapps/amplify/ui/addtoplaylist/AddToPlaylistBottomSheetFragment.kt b/...rc/main/java/com/devdunnapps/amplify/ui/addtoplaylist/AddToPlaylistBottomSheetFragment.kt
@@ -13,7 +13,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.ComposeView
@@ -61,7 +60,6 @@ class AddToPlaylistBottomSheetFragment : BottomSheetDialogFragment() {
     }
 }
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 private fun AddToPlaylistBottomSheet(
     viewModel: AddToPlaylistViewModel = viewModel()

diff --git a/app/src/main/java/com/devdunnapps/amplify/ui/artist/ArtistFragment.kt b/app/src/main/java/com/devdunnapps/amplify/ui/artist/ArtistFragment.kt
@@ -18,7 +18,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
@@ -121,7 +120,6 @@ private fun ArtistRoute(
     )
 }
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 private fun ArtistScreen(
     artist: Resource<Artist>,

diff --git a/app/src/main/java/com/devdunnapps/amplify/ui/components/AmplifyScaffold.kt b/app/src/main/java/com/devdunnapps/amplify/ui/components/AmplifyScaffold.kt
@@ -1,13 +1,11 @@
 package com.devdunnapps.amplify.ui.components
 
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.google.accompanist.themeadapter.material3.Mdc3Theme
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AmplifyScaffold(
     topBar: @Composable () -> Unit,

diff --git a/app/src/main/java/com/devdunnapps/amplify/ui/onboarding/ServerSelectionScreen.kt b/app/src/main/java/com/devdunnapps/amplify/ui/onboarding/ServerSelectionScreen.kt
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Card
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -59,7 +58,6 @@ internal fun ServerSelectionScreen(viewModel: LoginFlowViewModel, onNavigateToLi
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun ServerItem(server: Server, onClick: (Server) -> Unit) {
     Card(

diff --git a/app/src/main/java/com/devdunnapps/amplify/ui/playlist/PlaylistFragment.kt b/app/src/main/java/com/devdunnapps/amplify/ui/playlist/PlaylistFragment.kt
@@ -19,7 +19,6 @@ import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.material.icons.outlined.Edit
 import androidx.compose.material.icons.outlined.Shuffle
 import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -248,7 +247,6 @@ private fun PlaylistHeader(
 private fun PlaylistZeroState(modifier: Modifier = Modifier) =
     ZeroStateScreen(title = R.string.playlist_zero_state_title, modifier = modifier)
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun EditPlaylistDialog(
     playlist: Playlist,

diff --git a/app/src/main/java/com/devdunnapps/amplify/ui/playlists/PlaylistsFragment.kt b/app/src/main/java/com/devdunnapps/amplify/ui/playlists/PlaylistsFragment.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
@@ -23,7 +22,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -114,7 +112,6 @@ class PlaylistsFragment : Fragment() {
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun CreatePlaylistDialog(onSubmit: (String) -> Unit, onDismiss: () -> Unit) {
     var playlistTitle by remember { mutableStateOf("") }

diff --git a/app/src/main/java/com/devdunnapps/amplify/ui/search/SearchFragment.kt b/app/src/main/java/com/devdunnapps/amplify/ui/search/SearchFragment.kt
@@ -33,7 +33,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -114,7 +113,7 @@ private fun SearchScreen(
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun SearchAppBar(onUpClicked: () -> Unit, onTextChanged: (String) -> Unit) {
     TopAppBar(
@@ -169,7 +168,6 @@ private fun SearchAppBar(onUpClicked: () -> Unit, onTextChanged: (String) -> Uni
     )
 }
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 private fun SearchResultsContent(results: SearchResults, onPlaySong: (Song) -> Unit) {
     val songs = results.songs

diff --git a/app/src/test/java/com/devdunnapps/amplify/data/PlexRepositoryImplTest.kt b/app/src/test/java/com/devdunnapps/amplify/data/PlexRepositoryImplTest.kt
@@ -13,7 +13,6 @@ import org.junit.Test
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class PlexRepositoryImplTest {
 
     private lateinit var repository: PlexRepository

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ androidxComposeMaterial = "1.6.7"
 androidxComposeCompiler = "1.5.14"
 androidxComposePaging = "1.0.0-alpha20"
 androidxActivity = "1.9.0"
-androidxComposeMaterial3 = "1.1.2"
+androidxComposeMaterial3 = "1.2.1"
 androidxHiltNavigationCompose = "1.2.0"
 coil = "2.6.0"
 exoPlayer = "2.19.1"