From eb5ef7274702067d6d3890b3bc053c6084f289d2 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 11 Sep 2022 17:48:48 -0400 Subject: [PATCH] Revert "Update Compose Material3" This partially reverts commit 3dea10bcb95f12a406c601efa72f37fbb4792ea9. See https://issuetracker.google.com/issues/245626686 --- app/src/main/java/eu/kanade/presentation/components/AppBar.kt | 4 ++-- .../eu/kanade/presentation/manga/components/MangaAppBar.kt | 4 ++-- gradle/compose.versions.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt index 3953000a6a..e3a28118da 100644 --- a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt +++ b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt @@ -19,8 +19,8 @@ import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.SmallTopAppBar import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.material3.surfaceColorAtElevation @@ -113,7 +113,7 @@ fun AppBar( Column( modifier = modifier, ) { - TopAppBar( + SmallTopAppBar( navigationIcon = { if (isActionMode) { IconButton(onClick = onCancelActionMode) { diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaAppBar.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaAppBar.kt index 15ab392202..ca2ab237cb 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaAppBar.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaAppBar.kt @@ -16,8 +16,8 @@ import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.SmallTopAppBar import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable @@ -56,7 +56,7 @@ fun MangaAppBar( modifier = modifier, ) { val isActionMode = actionModeCounter > 0 - TopAppBar( + SmallTopAppBar( title = { Text( text = if (isActionMode) actionModeCounter.toString() else title, diff --git a/gradle/compose.versions.toml b/gradle/compose.versions.toml index d1a30fa3ca..fbb2fa3677 100644 --- a/gradle/compose.versions.toml +++ b/gradle/compose.versions.toml @@ -2,7 +2,7 @@ compiler = "1.3.1" compose = "1.2.1" accompanist = "0.25.1" -material3 = "1.0.0-beta02" +material3 = "1.0.0-beta01" [libraries] activity = "androidx.activity:activity-compose:1.6.0-rc02"