github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Update Compose Material3"

Browse source 
This partially reverts commit 3dea10bcb9.

See https://issuetracker.google.com/issues/245626686
This commit is contained in:
arkon 2022-09-11 17:48:48 -04:00
parent 0215b66098
commit eb5ef72747
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/kanade/presentation/components/AppBar.kt
View file

@ -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) {

4
app/src/main/java/eu/kanade/presentation/manga/components/MangaAppBar.kt
View file

@ -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,

2
gradle/compose.versions.toml
View file

@ -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"