Use AppBarActions

This commit is contained in:
Jobobby04
2023-05-13 14:02:24 -04:00
parent 7ea6f685bf
commit 190c87f7f3
4 changed files with 55 additions and 62 deletions
@@ -15,7 +15,6 @@ import androidx.compose.material.icons.outlined.CopyAll
import androidx.compose.material.icons.outlined.Done
import androidx.compose.material.icons.outlined.DoneAll
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
@@ -28,6 +27,7 @@ import eu.kanade.presentation.browse.components.MigrationActionIcon
import eu.kanade.presentation.browse.components.MigrationItem
import eu.kanade.presentation.browse.components.MigrationItemResult
import eu.kanade.presentation.components.AppBar
import eu.kanade.presentation.components.AppBarActions
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga
import tachiyomi.core.util.lang.withIOContext
@@ -63,24 +63,22 @@ fun MigrationListScreen(
AppBar(
title = title,
actions = {
IconButton(
onClick = { openMigrationDialog(true) },
enabled = migrationDone,
) {
Icon(
imageVector = if (items.size == 1) Icons.Outlined.ContentCopy else Icons.Outlined.CopyAll,
contentDescription = stringResource(R.string.copy),
)
}
IconButton(
onClick = { openMigrationDialog(false) },
enabled = migrationDone,
) {
Icon(
imageVector = if (items.size == 1) Icons.Outlined.Done else Icons.Outlined.DoneAll,
contentDescription = stringResource(R.string.migrate),
)
}
AppBarActions(
listOf(
AppBar.Action(
title = stringResource(R.string.copy),
icon = if (items.size == 1) Icons.Outlined.ContentCopy else Icons.Outlined.CopyAll,
onClick = { openMigrationDialog(false) },
enabled = migrationDone,
),
AppBar.Action(
title = stringResource(R.string.migrate),
icon = if (items.size == 1) Icons.Outlined.Done else Icons.Outlined.DoneAll,
onClick = { openMigrationDialog(false) },
enabled = migrationDone,
),
),
)
},
scrollBehavior = scrollBehavior,
)
@@ -101,9 +101,9 @@ fun EhLoginWebViewScreen(
val webClient = remember {
object : AccompanistWebViewClient() {
override fun onPageFinished(view: WebView?, url: String?) {
override fun onPageFinished(view: WebView, url: String?) {
super.onPageFinished(view, url)
onPageFinished(view ?: return, url ?: return)
onPageFinished(view, url ?: return)
}
}
}