Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 15:41:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Compose Material3

Browse Source
This commit is contained in:
arkon 2022-09-11 11:52:29 -04:00
parent cd3cb72b65
commit 3dea10bcb9
3 changed files with 7 additions and 7 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.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SmallTopAppBar
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.material3.TopAppBarScrollBehavior
import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.material3.surfaceColorAtElevation
@ -113,7 +113,7 @@ fun AppBar(
Column( Column(
modifier = modifier, modifier = modifier,
) { ) {
SmallTopAppBar( TopAppBar(
navigationIcon = { navigationIcon = {
if (isActionMode) { if (isActionMode) {
IconButton(onClick = onCancelActionMode) { 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.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SmallTopAppBar
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.material3.surfaceColorAtElevation
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -56,7 +56,7 @@ fun MangaAppBar(
modifier = modifier, modifier = modifier,
) { ) {
val isActionMode = actionModeCounter > 0 val isActionMode = actionModeCounter > 0
SmallTopAppBar( TopAppBar(
title = { title = {
Text( Text(
text = if (isActionMode) actionModeCounter.toString() else title, text = if (isActionMode) actionModeCounter.toString() else title,

6
gradle/compose.versions.toml
View File

@ -2,10 +2,10 @@
compiler = "1.3.1" compiler = "1.3.1"
compose = "1.2.1" compose = "1.2.1"
accompanist = "0.25.1" accompanist = "0.25.1"
material3 = "1.0.0-beta01" material3 = "1.0.0-beta02"
[libraries] [libraries]
activity = "androidx.activity:activity-compose:1.6.0-rc01" activity = "androidx.activity:activity-compose:1.6.0-rc02"
foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" } foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
animation = { module = "androidx.compose.animation:animation", version.ref = "compose" } animation = { module = "androidx.compose.animation:animation", version.ref = "compose" }
animation-graphics = { module = "androidx.compose.animation:animation-graphics", version.ref = "compose" } animation-graphics = { module = "androidx.compose.animation:animation-graphics", version.ref = "compose" }
@ -14,7 +14,7 @@ ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "compose" }
material3-core = { module = "androidx.compose.material3:material3", version.ref = "material3" } material3-core = { module = "androidx.compose.material3:material3", version.ref = "material3" }
material3-windowsizeclass = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "material3" } material3-windowsizeclass = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "material3" }
material3-adapter = "com.google.android.material:compose-theme-adapter-3:1.0.17" material3-adapter = "com.google.android.material:compose-theme-adapter-3:1.0.18"
material-icons = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" } material-icons = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" }
accompanist-webview = { module = "com.google.accompanist:accompanist-webview", version.ref = "accompanist" } accompanist-webview = { module = "com.google.accompanist:accompanist-webview", version.ref = "accompanist" }