From 17c440ee43209ad9ae57f5ec8be65c79bb9d3cca Mon Sep 17 00:00:00 2001 From: Koitharu Date: Tue, 17 May 2022 11:31:06 +0300 Subject: [PATCH] Fix marking sources as new --- .../koitharu/kotatsu/core/prefs/AppSettings.kt | 2 +- .../settings/sources/SourcesSettingsFragment.kt | 4 ++-- .../settings/sources/SourcesSettingsViewModel.kt | 3 +++ .../sources/adapter/SourceConfigItemDecoration.kt | 15 --------------- 4 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 app/src/main/java/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigItemDecoration.kt diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt index b81fcbe7a..64956277b 100644 --- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt +++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt @@ -152,7 +152,7 @@ class AppSettings(context: Context) { } fun markKnownSources(sources: Collection) { - sourcesOrder = sourcesOrder + sources.map { it.name } + sourcesOrder = (sourcesOrder + sources.map { it.name }).distinct() } val isPagesNumbersEnabled: Boolean diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt index 60a5b6ff9..e89e20173 100644 --- a/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt +++ b/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt @@ -21,7 +21,8 @@ import org.koitharu.kotatsu.settings.sources.adapter.SourceConfigAdapter import org.koitharu.kotatsu.settings.sources.adapter.SourceConfigListener import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem -class SourcesSettingsFragment : BaseFragment(), +class SourcesSettingsFragment : + BaseFragment(), SourceConfigListener, SearchView.OnQueryTextListener, MenuItem.OnActionExpandListener, @@ -53,7 +54,6 @@ class SourcesSettingsFragment : BaseFragment(), val sourcesAdapter = SourceConfigAdapter(this, get(), viewLifecycleOwner) with(binding.recyclerView) { setHasFixedSize(true) - // addItemDecoration(SourceConfigItemDecoration(view.context)) adapter = sourcesAdapter reorderHelper = ItemTouchHelper(SourcesReorderCallback()).also { it.attachToRecyclerView(this) diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsViewModel.kt index 01185ba2a..2f53c15fc 100644 --- a/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsViewModel.kt @@ -51,6 +51,9 @@ class SourcesSettingsViewModel( } else { settings.hiddenSources + source.name } + if (isEnabled) { + settings.markKnownSources(setOf(source)) + } buildList() } diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigItemDecoration.kt b/app/src/main/java/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigItemDecoration.kt deleted file mode 100644 index 0171b9dcf..000000000 --- a/app/src/main/java/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigItemDecoration.kt +++ /dev/null @@ -1,15 +0,0 @@ -package org.koitharu.kotatsu.settings.sources.adapter - -import android.content.Context -import androidx.recyclerview.widget.RecyclerView -import org.koitharu.kotatsu.base.ui.list.decor.AbstractDividerItemDecoration - -class SourceConfigItemDecoration(context: Context) : AbstractDividerItemDecoration(context) { - - override fun shouldDrawDivider( - above: RecyclerView.ViewHolder, - below: RecyclerView.ViewHolder, - ): Boolean { - return above.itemViewType != 0 && below.itemViewType != 0 - } -} \ No newline at end of file