Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Disabling Auto Track on Mark as Read & Fix #1369 #1374

Merged
merged 3 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/src/main/java/eu/kanade/domain/track/model/AutoTrackState.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package eu.kanade.domain.track.model

import dev.icerock.moko.resources.StringResource
import tachiyomi.i18n.MR

enum class AutoTrackState(val titleRes: StringResource) {
ASK(MR.strings.default_category_summary),
ALWAYS(MR.strings.lock_always),
Animeboynz marked this conversation as resolved.
Show resolved Hide resolved
NEVER(MR.strings.lock_never),
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package eu.kanade.domain.track.service

import eu.kanade.domain.track.model.AutoTrackState
import eu.kanade.tachiyomi.data.track.Tracker
import eu.kanade.tachiyomi.data.track.anilist.Anilist
import tachiyomi.core.common.preference.Preference
import tachiyomi.core.common.preference.PreferenceStore
import tachiyomi.core.common.preference.getEnum

class TrackPreferences(
private val preferenceStore: PreferenceStore,
Expand Down Expand Up @@ -36,5 +38,8 @@ class TrackPreferences(

fun autoUpdateTrack() = preferenceStore.getBoolean("pref_auto_update_manga_sync_key", true)

fun autoUpdateTrackOnMarkRead() = preferenceStore.getBoolean("pref_auto_update_manga_on_mark_read", true)
fun autoUpdateTrackOnMarkRead() = preferenceStore.getEnum(
"pref_auto_update_manga_on_mark_read",
AutoTrackState.ALWAYS,
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import dev.icerock.moko.resources.StringResource
import eu.kanade.domain.track.model.AutoTrackState
import eu.kanade.domain.track.service.TrackPreferences
import eu.kanade.presentation.more.settings.Preference
import eu.kanade.tachiyomi.data.track.EnhancedTracker
Expand All @@ -52,6 +53,7 @@ import eu.kanade.tachiyomi.data.track.shikimori.ShikimoriApi
import eu.kanade.tachiyomi.util.system.openInBrowser
import eu.kanade.tachiyomi.util.system.toast
import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.persistentMapOf
import kotlinx.collections.immutable.toImmutableList
import tachiyomi.core.common.util.lang.launchIO
import tachiyomi.core.common.util.lang.withUIContext
Expand Down Expand Up @@ -85,6 +87,7 @@ object SettingsTrackingScreen : SearchableSettings {
val trackPreferences = remember { Injekt.get<TrackPreferences>() }
val trackerManager = remember { Injekt.get<TrackerManager>() }
val sourceManager = remember { Injekt.get<SourceManager>() }
val autoTrackStatePref = trackPreferences.autoUpdateTrackOnMarkRead()

var dialog by remember { mutableStateOf<Any?>(null) }
dialog?.run {
Expand Down Expand Up @@ -125,9 +128,18 @@ object SettingsTrackingScreen : SearchableSettings {
pref = trackPreferences.autoUpdateTrack(),
title = stringResource(MR.strings.pref_auto_update_manga_sync),
),
Preference.PreferenceItem.SwitchPreference(
Preference.PreferenceItem.ListPreference(
pref = trackPreferences.autoUpdateTrackOnMarkRead(),
title = stringResource(MR.strings.pref_auto_update_manga_on_mark_read),
entries = persistentMapOf(
AutoTrackState.ALWAYS to stringResource(MR.strings.lock_always),
AutoTrackState.NEVER to stringResource(MR.strings.lock_never),
AutoTrackState.ASK to stringResource(MR.strings.default_category_summary),
),
Animeboynz marked this conversation as resolved.
Show resolved Hide resolved
onValueChanged = {
autoTrackStatePref.set(it)
true
},
Animeboynz marked this conversation as resolved.
Show resolved Hide resolved
),
Preference.PreferenceGroup(
title = stringResource(MR.strings.services),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import eu.kanade.domain.manga.model.downloadedFilter
import eu.kanade.domain.manga.model.toSManga
import eu.kanade.domain.track.interactor.AddTracks
import eu.kanade.domain.track.interactor.TrackChapter
import eu.kanade.domain.track.model.AutoTrackState
import eu.kanade.domain.track.service.TrackPreferences
import eu.kanade.presentation.manga.DownloadAction
import eu.kanade.presentation.manga.components.ChapterDownloadAction
Expand Down Expand Up @@ -140,6 +141,7 @@ class MangaScreenModel(

val chapterSwipeStartAction = libraryPreferences.swipeToEndAction().get()
val chapterSwipeEndAction = libraryPreferences.swipeToStartAction().get()
var autoTrackState = trackPreferences.autoUpdateTrackOnMarkRead().get()

private val skipFiltered by readerPreferences.skipFiltered().asState(screenModelScope)

Expand Down Expand Up @@ -734,15 +736,19 @@ class MangaScreenModel(
chapters = chapters.toTypedArray(),
)

if (!read) return@launchIO
if (!read ||
successState?.hasLoggedInTrackers == false ||
autoTrackState == AutoTrackState.NEVER
Animeboynz marked this conversation as resolved.
Show resolved Hide resolved
) {
return@launchIO
}

val tracks = getTracks.await(mangaId)
val maxChapterNumber = chapters.maxOf { it.chapterNumber }
val shouldPromptTrackingUpdate = tracks.any { track -> maxChapterNumber > track.lastChapterRead }

if (!shouldPromptTrackingUpdate) return@launchIO

if (trackPreferences.autoUpdateTrackOnMarkRead().get()) {
if (autoTrackState == AutoTrackState.ALWAYS) {
Animeboynz marked this conversation as resolved.
Show resolved Hide resolved
trackChapter.await(context, mangaId, maxChapterNumber)
withUIContext {
context.toast(context.stringResource(MR.strings.trackers_updated_summary, maxChapterNumber.toInt()))
Expand Down