Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable new tracking features only if tracking is enabled

Browse Source
This commit is contained in:
Jobobby04 2020-05-16 18:37:06 -04:00
parent 9d148a70c8
commit 3aee05bf26
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
View File

@ -86,7 +86,7 @@ class LibraryItem(val manga: LibraryManga, private val libraryAsList: Preference
(manga.author?.contains(constraint, true) ?: false) || (manga.author?.contains(constraint, true) ?: false) ||
(manga.artist?.contains(constraint, true) ?: false) || (manga.artist?.contains(constraint, true) ?: false) ||
sourceManager.getOrStub(manga.source).name.contains(constraint, true) || sourceManager.getOrStub(manga.source).name.contains(constraint, true) ||
filterTracks(constraint, db.getTracks(manga).executeAsBlocking()) || (Injekt.get<TrackManager>().hasLoggedServices() && filterTracks(constraint, db.getTracks(manga).executeAsBlocking())) ||
if (constraint.contains(" ") || constraint.contains("\"")) { if (constraint.contains(" ") || constraint.contains("\"")) {
val genres = manga.genre?.split(", ")?.map { val genres = manga.genre?.split(", ")?.map {
it.drop(it.indexOfFirst { it == ':' } + 1).toLowerCase().trim() // tachiEH tag namespaces it.drop(it.indexOfFirst { it == ':' } + 1).toLowerCase().trim() // tachiEH tag namespaces

17
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
View File

@ -6,12 +6,15 @@ import android.util.AttributeSet
import android.view.View import android.view.View
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.Filter
import eu.kanade.tachiyomi.source.model.Filter.TriState.Companion.STATE_EXCLUDE import eu.kanade.tachiyomi.source.model.Filter.TriState.Companion.STATE_EXCLUDE
import eu.kanade.tachiyomi.source.model.Filter.TriState.Companion.STATE_IGNORE import eu.kanade.tachiyomi.source.model.Filter.TriState.Companion.STATE_IGNORE
import eu.kanade.tachiyomi.source.model.Filter.TriState.Companion.STATE_INCLUDE import eu.kanade.tachiyomi.source.model.Filter.TriState.Companion.STATE_INCLUDE
import eu.kanade.tachiyomi.widget.ExtendedNavigationView import eu.kanade.tachiyomi.widget.ExtendedNavigationView
import eu.kanade.tachiyomi.widget.TabbedBottomSheetDialog import eu.kanade.tachiyomi.widget.TabbedBottomSheetDialog
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
class LibrarySettingsSheet( class LibrarySettingsSheet(
@ -73,7 +76,13 @@ class LibrarySettingsSheet(
private val tracked = Item.TriStateGroup(R.string.tracked, this) private val tracked = Item.TriStateGroup(R.string.tracked, this)
override val header = null override val header = null
override val items = listOf(downloaded, unread, completed, tracked) override val items = (
if (Injekt.get<TrackManager>().hasLoggedServices()) {
listOf(downloaded, unread, completed, tracked)
} else {
listOf(downloaded, unread, completed)
}
)
override val footer = null override val footer = null
override fun initModels() { // j2k changes override fun initModels() { // j2k changes
@ -81,7 +90,11 @@ class LibrarySettingsSheet(
downloaded.state = preferences.filterDownloaded().get() downloaded.state = preferences.filterDownloaded().get()
unread.state = preferences.filterUnread().get() unread.state = preferences.filterUnread().get()
completed.state = preferences.filterCompleted().get() completed.state = preferences.filterCompleted().get()
tracked.state = preferences.filterTracked().get() if (Injekt.get<TrackManager>().hasLoggedServices()) {
tracked.state = preferences.filterTracked().get()
} else {
tracked.state = STATE_IGNORE
}
} catch (e: Exception) { } catch (e: Exception) {
preferences.upgradeFilters() preferences.upgradeFilters()
} }