From 89a5f2e702d4aa52b87b20cdef28ea6d41fa90f1 Mon Sep 17 00:00:00 2001 From: Cuong Tran Date: Sat, 9 Mar 2024 23:58:46 +0700 Subject: [PATCH] no need using builder to create AppBarAction --- .../presentation/browse/SourceFeedScreen.kt | 18 +++++++----------- .../browse/components/GlobalSearchToolbar.kt | 18 +++++++----------- .../browse/components/SourceSettingsButton.kt | 7 +++---- .../migration/search/SourceSearchScreen.kt | 18 +++++++----------- 4 files changed, 24 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt index caf5c1597..b7493ee8f 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt @@ -280,17 +280,13 @@ fun SourceFeedToolbar( // KMK --> actions = { AppBarActions( - actions = persistentListOf().builder() - .apply { - add( - AppBar.Action( - title = stringResource(MR.strings.action_bulk_select), - icon = Icons.Outlined.Checklist, - onClick = toggleSelectionMode, - ), - ) - } - .build(), + actions = persistentListOf( + AppBar.Action( + title = stringResource(MR.strings.action_bulk_select), + icon = Icons.Outlined.Checklist, + onClick = toggleSelectionMode, + ), + ) ) persistentListOf( SourceSettingsButton(sourceId), diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchToolbar.kt b/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchToolbar.kt index 4b8980f0a..295ee04ff 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchToolbar.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchToolbar.kt @@ -65,17 +65,13 @@ fun GlobalSearchToolbar( // KMK --> actions = { AppBarActions( - actions = persistentListOf().builder() - .apply { - add( - AppBar.Action( - title = stringResource(MR.strings.action_bulk_select), - icon = Icons.Outlined.Checklist, - onClick = toggleSelectionMode, - ), - ) - } - .build(), + actions = persistentListOf( + AppBar.Action( + title = stringResource(MR.strings.action_bulk_select), + icon = Icons.Outlined.Checklist, + onClick = toggleSelectionMode, + ), + ) ) }, // KMK <-- diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/SourceSettingsButton.kt b/app/src/main/java/eu/kanade/presentation/browse/components/SourceSettingsButton.kt index bed5bddac..79f048262 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/SourceSettingsButton.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/SourceSettingsButton.kt @@ -17,14 +17,13 @@ import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource import tachiyomi.source.local.LocalSource -// KMK --> @Composable fun SourceSettingsButton( id: Long, @Suppress("UNUSED_PARAMETER") modifier: Modifier = Modifier ) { // Create a fake source - val source = Source(id,"", "", supportsLatest = false, isStub = false) + val source = Source(id, "", "", supportsLatest = false, isStub = false) SourceSettingsButton(source = source) } @@ -38,8 +37,9 @@ fun SourceSettingsButton( val navigator = LocalNavigator.currentOrThrow IconButton(onClick = { - if (source.installedExtension !== null) + if (source.installedExtension !== null) { navigator.push(ExtensionDetailsScreen(source.installedExtension!!.pkgName)) + } }) { Icon( imageVector = Icons.Outlined.Settings, @@ -47,4 +47,3 @@ fun SourceSettingsButton( ) } } -// KMK <-- diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt index 3572e295a..58b17ce7a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt @@ -85,17 +85,13 @@ data class SourceSearchScreen( // KMK --> actions = { AppBarActions( - actions = persistentListOf().builder() - .apply { - add( - AppBar.Action( - title = stringResource(MR.strings.action_bulk_select), - icon = Icons.Outlined.Checklist, - onClick = bulkFavoriteScreenModel::toggleSelectionMode, - ), - ) - } - .build(), + actions = persistentListOf( + AppBar.Action( + title = stringResource(MR.strings.action_bulk_select), + icon = Icons.Outlined.Checklist, + onClick = bulkFavoriteScreenModel::toggleSelectionMode, + ), + ) ) }, // KMK <--