diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt index 9825b9172..809add879 100644 --- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt +++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt @@ -3,16 +3,15 @@ package org.koitharu.kotatsu.base.ui.widgets import android.content.Context import android.util.AttributeSet import android.view.View.OnClickListener -import androidx.annotation.ColorRes -import androidx.core.content.ContextCompat +import androidx.annotation.DrawableRes import androidx.core.view.children +import com.google.android.material.R as materialR import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipDrawable import com.google.android.material.chip.ChipGroup import org.koitharu.kotatsu.R import org.koitharu.kotatsu.utils.ext.castOrNull import org.koitharu.kotatsu.utils.ext.getThemeColorStateList -import com.google.android.material.R as materialR class ChipsView @JvmOverloads constructor( context: Context, @@ -76,12 +75,12 @@ class ChipsView @JvmOverloads constructor( private fun bindChip(chip: Chip, model: ChipModel) { chip.text = model.title - val tint = if (model.tint == 0) { - null + if (model.icon == 0) { + chip.isChipIconVisible = false } else { - ContextCompat.getColorStateList(context, model.tint) + chip.isChipIconVisible = true + chip.setChipIconResource(model.icon) } - chip.buttonTintList = tint chip.isClickable = onChipClickListener != null || model.isCheckable chip.isCheckable = model.isCheckable chip.isChecked = model.isChecked @@ -93,7 +92,6 @@ class ChipsView @JvmOverloads constructor( val drawable = ChipDrawable.createFromAttributes(context, null, 0, R.style.Widget_Kotatsu_Chip) chip.setChipDrawable(drawable) chip.isCheckedIconVisible = true - chip.isChipIconVisible = false chip.setCheckedIconResource(R.drawable.ic_check) chip.checkedIconTint = context.getThemeColorStateList(materialR.attr.colorControlNormal) chip.isCloseIconVisible = onChipCloseClickListener != null @@ -115,7 +113,7 @@ class ChipsView @JvmOverloads constructor( } class ChipModel( - @ColorRes val tint: Int, + @DrawableRes val icon: Int, val title: CharSequence, val isCheckable: Boolean, val isChecked: Boolean, @@ -128,7 +126,7 @@ class ChipsView @JvmOverloads constructor( other as ChipModel - if (tint != other.tint) return false + if (icon != other.icon) return false if (title != other.title) return false if (isCheckable != other.isCheckable) return false if (isChecked != other.isChecked) return false @@ -138,7 +136,7 @@ class ChipsView @JvmOverloads constructor( } override fun hashCode(): Int { - var result = tint.hashCode() + var result = icon result = 31 * result + title.hashCode() result = 31 * result + isCheckable.hashCode() result = 31 * result + isChecked.hashCode() diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaTagHighlighter.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaTagHighlighter.kt deleted file mode 100644 index 427d205b6..000000000 --- a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaTagHighlighter.kt +++ /dev/null @@ -1,26 +0,0 @@ -package org.koitharu.kotatsu.core.parser - -import android.content.Context -import androidx.annotation.ColorRes -import dagger.Reusable -import dagger.hilt.android.qualifiers.ApplicationContext -import org.koitharu.kotatsu.R -import org.koitharu.kotatsu.parsers.model.MangaTag -import javax.inject.Inject - -@Reusable -class MangaTagHighlighter @Inject constructor( - @ApplicationContext context: Context, -) { - - private val dict = context.resources.getStringArray(R.array.genres_warnlist).toSet() - - @ColorRes - fun getTint(tag: MangaTag): Int { - return if (tag.title.lowercase() in dict) { - R.color.warning - } else { - 0 - } - } -} diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt index 0461182fd..237f5781c 100644 --- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt +++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt @@ -26,7 +26,6 @@ import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration import org.koitharu.kotatsu.base.ui.widgets.ChipsView import org.koitharu.kotatsu.bookmarks.domain.Bookmark import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksAdapter -import org.koitharu.kotatsu.core.parser.MangaTagHighlighter import org.koitharu.kotatsu.databinding.FragmentDetailsBinding import org.koitharu.kotatsu.details.ui.model.ChapterListItem import org.koitharu.kotatsu.details.ui.model.HistoryInfo @@ -70,9 +69,6 @@ class DetailsFragment : @Inject lateinit var coil: ImageLoader - @Inject - lateinit var tagHighlighter: MangaTagHighlighter - private val viewModel by activityViewModels() override fun onInflateView( @@ -325,7 +321,7 @@ class DetailsFragment : manga.tags.map { tag -> ChipsView.ChipModel( title = tag.title, - tint = tagHighlighter.getTint(tag), + icon = 0, data = tag, isCheckable = false, isChecked = false, diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt index f10371dc2..a73142563 100644 --- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt @@ -13,7 +13,6 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.withContext import org.koitharu.kotatsu.R import org.koitharu.kotatsu.base.ui.util.ReversibleAction -import org.koitharu.kotatsu.core.parser.MangaTagHighlighter import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.favourites.domain.FavouritesRepository import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.NO_ID @@ -37,7 +36,6 @@ class FavouritesListViewModel @AssistedInject constructor( private val trackingRepository: TrackingRepository, private val historyRepository: HistoryRepository, private val settings: AppSettings, - private val tagHighlighter: MangaTagHighlighter, ) : MangaListViewModel(settings), ListExtraProvider { var categoryName: String? = null @@ -73,7 +71,7 @@ class FavouritesListViewModel @AssistedInject constructor( ), ) - else -> list.toUi(mode, this, tagHighlighter) + else -> list.toUi(mode, this) } }.catch { emit(listOf(it.toErrorState(canRetry = false))) diff --git a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt index 8f38721f1..8806ea2d2 100644 --- a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt @@ -10,7 +10,6 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onStart import org.koitharu.kotatsu.R import org.koitharu.kotatsu.base.ui.util.ReversibleAction -import org.koitharu.kotatsu.core.parser.MangaTagHighlighter import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.core.prefs.ListMode import org.koitharu.kotatsu.core.prefs.observeAsFlow @@ -39,7 +38,6 @@ class HistoryListViewModel @Inject constructor( private val repository: HistoryRepository, private val settings: AppSettings, private val trackingRepository: TrackingRepository, - private val tagHighlighter: MangaTagHighlighter, ) : MangaListViewModel(settings) { val isGroupingEnabled = MutableLiveData() @@ -120,7 +118,7 @@ class HistoryListViewModel @Inject constructor( val percent = if (showPercent) history.percent else PROGRESS_NONE result += when (mode) { ListMode.LIST -> manga.toListModel(counter, percent) - ListMode.DETAILED_LIST -> manga.toListDetailedModel(counter, percent, tagHighlighter) + ListMode.DETAILED_LIST -> manga.toListDetailedModel(counter, percent) ListMode.GRID -> manga.toGridModel(counter, percent) } } diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt index 20fba3c37..215b0c9d9 100644 --- a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt +++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt @@ -4,7 +4,6 @@ import org.koitharu.kotatsu.R import org.koitharu.kotatsu.base.ui.widgets.ChipsView import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver -import org.koitharu.kotatsu.core.parser.MangaTagHighlighter import org.koitharu.kotatsu.core.prefs.ListMode import org.koitharu.kotatsu.history.domain.PROGRESS_NONE import org.koitharu.kotatsu.list.domain.ListExtraProvider @@ -14,10 +13,7 @@ import org.koitharu.kotatsu.utils.ext.ifZero import java.net.SocketTimeoutException import java.net.UnknownHostException -fun Manga.toListModel( - counter: Int, - progress: Float, -) = MangaListModel( +fun Manga.toListModel(counter: Int, progress: Float) = MangaListModel( id = id, title = title, subtitle = tags.joinToString(", ") { it.title }, @@ -27,11 +23,7 @@ fun Manga.toListModel( progress = progress, ) -fun Manga.toListDetailedModel( - counter: Int, - progress: Float, - tagHighlighter: MangaTagHighlighter?, -) = MangaListDetailedModel( +fun Manga.toListDetailedModel(counter: Int, progress: Float) = MangaListDetailedModel( id = id, title = title, subtitle = altTitle, @@ -39,15 +31,7 @@ fun Manga.toListDetailedModel( manga = this, counter = counter, progress = progress, - tags = tags.map { - ChipsView.ChipModel( - tint = tagHighlighter?.getTint(it) ?: 0, - title = it.title, - isCheckable = false, - isChecked = false, - data = it, - ) - }, + tags = tags.map { ChipsView.ChipModel(0, it.title, false, false, it) }, ) fun Manga.toGridModel(counter: Int, progress: Float) = MangaGridModel( @@ -62,21 +46,18 @@ fun Manga.toGridModel(counter: Int, progress: Float) = MangaGridModel( suspend fun List.toUi( mode: ListMode, extraProvider: ListExtraProvider, - tagHighlighter: MangaTagHighlighter?, -): List = toUi(ArrayList(size), mode, extraProvider, tagHighlighter) +): List = toUi(ArrayList(size), mode, extraProvider) fun List.toUi( mode: ListMode, - tagHighlighter: MangaTagHighlighter?, -): List = toUi(ArrayList(size), mode, tagHighlighter) +): List = toUi(ArrayList(size), mode) fun > List.toUi( destination: C, mode: ListMode, - tagHighlighter: MangaTagHighlighter?, ): C = when (mode) { ListMode.LIST -> mapTo(destination) { it.toListModel(0, PROGRESS_NONE) } - ListMode.DETAILED_LIST -> mapTo(destination) { it.toListDetailedModel(0, PROGRESS_NONE, tagHighlighter) } + ListMode.DETAILED_LIST -> mapTo(destination) { it.toListDetailedModel(0, PROGRESS_NONE) } ListMode.GRID -> mapTo(destination) { it.toGridModel(0, PROGRESS_NONE) } } @@ -84,14 +65,13 @@ suspend fun > List.toUi( destination: C, mode: ListMode, extraProvider: ListExtraProvider, - tagHighlighter: MangaTagHighlighter?, ): C = when (mode) { ListMode.LIST -> mapTo(destination) { it.toListModel(extraProvider.getCounter(it.id), extraProvider.getProgress(it.id)) } ListMode.DETAILED_LIST -> mapTo(destination) { - it.toListDetailedModel(extraProvider.getCounter(it.id), extraProvider.getProgress(it.id), tagHighlighter) + it.toListDetailedModel(extraProvider.getCounter(it.id), extraProvider.getProgress(it.id)) } ListMode.GRID -> mapTo(destination) { diff --git a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt index 240c3649f..499ed4b6d 100644 --- a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt @@ -16,7 +16,6 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.koitharu.kotatsu.R import org.koitharu.kotatsu.base.ui.widgets.ChipsView -import org.koitharu.kotatsu.core.parser.MangaTagHighlighter import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.download.ui.service.DownloadService import org.koitharu.kotatsu.history.domain.HistoryRepository @@ -47,7 +46,6 @@ class LocalListViewModel @Inject constructor( private val historyRepository: HistoryRepository, private val trackingRepository: TrackingRepository, private val settings: AppSettings, - private val tagHighlighter: MangaTagHighlighter, ) : MangaListViewModel(settings), ListExtraProvider { val onMangaRemoved = SingleLiveEvent() @@ -78,7 +76,7 @@ class LocalListViewModel @Inject constructor( else -> buildList(list.size + 1) { add(createHeader(list, tags, order)) - list.toUi(this, mode, this@LocalListViewModel, tagHighlighter) + list.toUi(this, mode, this@LocalListViewModel) } } }.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState)) @@ -172,7 +170,7 @@ class LocalListViewModel @Inject constructor( val chips = LinkedList() for ((tag, _) in topTags) { val model = ChipsView.ChipModel( - tint = 0, + icon = 0, title = tag.title, isCheckable = true, isChecked = tag in selectedTags, diff --git a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt index ce2d3edb9..aef575033 100644 --- a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt @@ -19,7 +19,6 @@ import org.koitharu.kotatsu.R import org.koitharu.kotatsu.base.domain.MangaDataRepository import org.koitharu.kotatsu.base.ui.widgets.ChipsView import org.koitharu.kotatsu.core.parser.MangaRepository -import org.koitharu.kotatsu.core.parser.MangaTagHighlighter import org.koitharu.kotatsu.core.parser.RemoteMangaRepository import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.list.ui.MangaListViewModel @@ -50,7 +49,6 @@ class RemoteListViewModel @AssistedInject constructor( private val searchRepository: MangaSearchRepository, settings: AppSettings, dataRepository: MangaDataRepository, - private val tagHighlighter: MangaTagHighlighter, ) : MangaListViewModel(settings), OnFilterChangedListener { private val repository = mangaRepositoryFactory.create(source) as RemoteMangaRepository @@ -77,7 +75,7 @@ class RemoteListViewModel @AssistedInject constructor( list == null -> add(LoadingState) list.isEmpty() -> add(createEmptyState(header.hasSelectedTags)) else -> { - list.toUi(this, mode, tagHighlighter) + list.toUi(this, mode) when { error != null -> add(error.toErrorFooter()) hasNext -> add(LoadingFooter) @@ -194,7 +192,7 @@ class RemoteListViewModel @AssistedInject constructor( val result = LinkedList() for (tag in tags) { val model = ChipsView.ChipModel( - tint = 0, + icon = 0, title = tag.title, isCheckable = true, isChecked = selectedTags.remove(tag), @@ -208,7 +206,7 @@ class RemoteListViewModel @AssistedInject constructor( } for (tag in selectedTags) { val model = ChipsView.ChipModel( - tint = 0, + icon = 0, title = tag.title, isCheckable = true, isChecked = true, diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt index a7976bfe8..b959f65a7 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt @@ -11,7 +11,6 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.combine import org.koitharu.kotatsu.R import org.koitharu.kotatsu.core.parser.MangaRepository -import org.koitharu.kotatsu.core.parser.MangaTagHighlighter import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.list.ui.MangaListViewModel import org.koitharu.kotatsu.list.ui.model.EmptyState @@ -30,7 +29,6 @@ class SearchViewModel @AssistedInject constructor( @Assisted private val query: String, repositoryFactory: MangaRepository.Factory, settings: AppSettings, - private val tagHighlighter: MangaTagHighlighter, ) : MangaListViewModel(settings) { private val repository = repositoryFactory.create(source) @@ -59,7 +57,7 @@ class SearchViewModel @AssistedInject constructor( else -> { val result = ArrayList(list.size + 1) - list.toUi(result, mode, tagHighlighter) + list.toUi(result, mode) when { error != null -> result += error.toErrorFooter() hasNext -> result += LoadingFooter diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt index c0eaeaa4d..2a9455e08 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt @@ -6,12 +6,7 @@ import androidx.lifecycle.viewModelScope import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject -import kotlinx.coroutines.CancellationException -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import kotlinx.coroutines.async -import kotlinx.coroutines.cancelAndJoin -import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.* import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.update @@ -21,12 +16,7 @@ import org.koitharu.kotatsu.core.exceptions.CompositeException import org.koitharu.kotatsu.core.parser.MangaRepository import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.core.prefs.ListMode -import org.koitharu.kotatsu.list.ui.model.EmptyState -import org.koitharu.kotatsu.list.ui.model.ListModel -import org.koitharu.kotatsu.list.ui.model.LoadingFooter -import org.koitharu.kotatsu.list.ui.model.LoadingState -import org.koitharu.kotatsu.list.ui.model.toErrorState -import org.koitharu.kotatsu.list.ui.model.toUi +import org.koitharu.kotatsu.list.ui.model.* import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct import org.koitharu.kotatsu.utils.ext.printStackTraceDebug @@ -114,7 +104,7 @@ class MultiSearchViewModel @AssistedInject constructor( async(dispatcher) { runCatchingCancellable { val list = mangaRepositoryFactory.create(source).getList(offset = 0, query = q) - .toUi(ListMode.GRID, null) + .toUi(ListMode.GRID) if (list.isNotEmpty()) { MultiSearchListModel(source, list.size > MIN_HAS_MORE_ITEMS, list) } else { diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt index 361969911..31edd3481 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt @@ -134,7 +134,7 @@ class SearchSuggestionViewModel @Inject constructor( private fun mapTags(tags: List): List = tags.map { tag -> ChipsView.ChipModel( - tint = 0, + icon = 0, title = tag.title, data = tag, isCheckable = false, diff --git a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfViewModel.kt index b8d203f85..ef806d69c 100644 --- a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfViewModel.kt @@ -236,7 +236,7 @@ class ShelfViewModel @Inject constructor( return } destination += ShelfSectionModel.Local( - items = local.toUi(ListMode.GRID, this, null), + items = local.toUi(ListMode.GRID, this), showAllButtonText = R.string.show_all, ) } @@ -251,7 +251,7 @@ class ShelfViewModel @Inject constructor( for ((category, list) in favourites) { if (list.isNotEmpty()) { destination += ShelfSectionModel.Favourites( - items = list.toUi(ListMode.GRID, this, null), + items = list.toUi(ListMode.GRID, this), category = category, showAllButtonText = R.string.show_all, ) diff --git a/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt index 1741936f2..2eca00df8 100644 --- a/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt @@ -7,7 +7,6 @@ import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.onStart import org.koitharu.kotatsu.R -import org.koitharu.kotatsu.core.parser.MangaTagHighlighter import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.list.ui.MangaListViewModel import org.koitharu.kotatsu.list.ui.model.EmptyState @@ -23,7 +22,6 @@ import javax.inject.Inject class SuggestionsViewModel @Inject constructor( repository: SuggestionRepository, settings: AppSettings, - private val tagHighlighter: MangaTagHighlighter, ) : MangaListViewModel(settings) { override val content = combine( @@ -40,7 +38,7 @@ class SuggestionsViewModel @Inject constructor( ), ) - else -> list.toUi(mode, tagHighlighter) + else -> list.toUi(mode) } }.onStart { loadingCounter.increment() diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/updates/UpdatesViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/updates/UpdatesViewModel.kt index 1ebe7b8cd..6a649cd38 100644 --- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/updates/UpdatesViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/updates/UpdatesViewModel.kt @@ -7,7 +7,6 @@ import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.onStart import org.koitharu.kotatsu.R -import org.koitharu.kotatsu.core.parser.MangaTagHighlighter import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.core.prefs.ListMode import org.koitharu.kotatsu.history.domain.HistoryRepository @@ -31,7 +30,6 @@ class UpdatesViewModel @Inject constructor( private val repository: TrackingRepository, private val settings: AppSettings, private val historyRepository: HistoryRepository, - private val tagHighlighter: MangaTagHighlighter, ) : MangaListViewModel(settings) { override val content = combine( @@ -71,7 +69,7 @@ class UpdatesViewModel @Inject constructor( val percent = if (showPercent) historyRepository.getProgress(manga.id) else PROGRESS_NONE when (mode) { ListMode.LIST -> manga.toListModel(counter, percent) - ListMode.DETAILED_LIST -> manga.toListDetailedModel(counter, percent, tagHighlighter) + ListMode.DETAILED_LIST -> manga.toListDetailedModel(counter, percent) ListMode.GRID -> manga.toGridModel(counter, percent) } } diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 9529f4d9d..ef901bd78 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -9,5 +9,5 @@ #29FFFFFF #1FFFFFFF #260052 - #EF6C00 + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c05d7cf91..bd13e4c65 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -22,5 +22,4 @@ #29000000 #1F000000 #334800E0 - #FFA726 diff --git a/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml index 44bc52eed..a7f1cd3ff 100644 --- a/app/src/main/res/values/constants.xml +++ b/app/src/main/res/values/constants.xml @@ -38,10 +38,4 @@ 2 0 - - yaoi - яой - yuri - юри -