From 0ad2680b45e027592ee381f77bfac4f4bb655b5b Mon Sep 17 00:00:00 2001 From: "Cuong M. Tran" Date: Thu, 7 Mar 2024 13:00:31 +0700 Subject: [PATCH] renovate code --- .../browse/MigrateSearchScreen.kt | 3 +- .../presentation/browse/SourceFeedScreen.kt | 32 +------------------ 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt index d32f3ffdd..c3a1e2c21 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt @@ -3,6 +3,7 @@ package eu.kanade.presentation.browse import androidx.compose.runtime.Composable import androidx.compose.runtime.State import eu.kanade.presentation.browse.components.GlobalSearchToolbar +import eu.kanade.presentation.components.SelectionToolbar import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.ui.browse.migration.search.MigrateSearchScreenModel import eu.kanade.tachiyomi.ui.browse.source.globalsearch.SearchScreenModel @@ -31,7 +32,7 @@ fun MigrateSearchScreen( topBar = { scrollBehavior -> // KMK --> if (state.selectionMode) - eu.kanade.presentation.components.SelectionToolbar( + SelectionToolbar( selectedCount = state.selection.size, onClickClearSelection = screenModel::toggleSelectionMode, onChangeCategoryClicked = screenModel::addFavorite, 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 cbf6f6471..3ed1449ce 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt @@ -3,9 +3,6 @@ package eu.kanade.presentation.browse import androidx.compose.animation.Crossfade import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.lazy.items -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.BookmarkAdd -import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.runtime.Composable import androidx.compose.runtime.ReadOnlyComposable @@ -17,10 +14,9 @@ import eu.kanade.presentation.browse.components.GlobalSearchErrorResultItem import eu.kanade.presentation.browse.components.GlobalSearchLoadingResultItem import eu.kanade.presentation.browse.components.GlobalSearchResultItem import eu.kanade.presentation.browse.components.SourceSettingsButton -import eu.kanade.presentation.components.AppBar -import eu.kanade.presentation.components.AppBarActions import eu.kanade.presentation.components.AppBarTitle import eu.kanade.presentation.components.SearchToolbar +import eu.kanade.presentation.components.SelectionToolbar import eu.kanade.tachiyomi.ui.browse.source.feed.SourceFeedScreenModel import eu.kanade.tachiyomi.ui.browse.source.feed.SourceFeedState import kotlinx.collections.immutable.ImmutableList @@ -280,29 +276,3 @@ fun SourceFeedToolbar( // KMK <-- ) } - -// KMK --> -@Composable -private fun SelectionToolbar( - selectedCount: Int, - onClickClearSelection: () -> Unit = {}, - onChangeCategoryClicked: () -> Unit = {}, -) { - AppBar( - titleContent = { Text(text = "$selectedCount") }, - actions = { - AppBarActions( - persistentListOf( - AppBar.Action( - title = stringResource(MR.strings.action_bookmark), - icon = Icons.Outlined.BookmarkAdd, - onClick = onChangeCategoryClicked, - ), - ), - ) - }, - isActionMode = true, - onCancelActionMode = onClickClearSelection, - ) -} -// KMK <--