null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reorganize tracking settings closer to main + remove auto add tracking pref

Browse source
This commit is contained in:
Jays2Kings 2022-04-03 20:17:50 -04:00
parent 714592d724
commit a39510d08e
6 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
View file

@ -97,8 +97,6 @@ object PreferenceKeys {
const val autoUpdateTrack = "pref_auto_update_manga_sync_key"
const val autoAddTrack = "pref_auto_add_track_key"
const val trackingsToAddOnline = "pref_tracking_for_online"
const val lastUsedCatalogueSource = "last_catalogue_source"

2
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
View file

@ -188,8 +188,6 @@ class PreferencesHelper(val context: Context) {
fun autoUpdateTrack() = prefs.getBoolean(Keys.autoUpdateTrack, true)
fun autoAddTrack() = prefs.getBoolean(Keys.autoAddTrack, true)
fun trackingsToAddOnline() = flowPrefs.getStringSet(Keys.trackingsToAddOnline, emptySet())
fun lastUsedCatalogueSource() = flowPrefs.getLong(Keys.lastUsedCatalogueSource, -1)

4
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
View file

@ -1376,9 +1376,7 @@ class MangaDetailsController :
},
onMangaMoved = {
updateHeader()
if (presenter.preferences.autoAddTrack()) {
presenter.fetchChapters(andTracking = true)
}
presenter.fetchChapters(andTracking = true)
},
onMangaDeleted = { presenter.confirmDeletion() }
)

17
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt
View file

@ -36,12 +36,6 @@ class SettingsTrackingController :
titleRes = R.string.sync_chapters_after_reading
defaultValue = true
}
switchPreference {
key = Keys.autoAddTrack
titleRes = R.string.track_when_adding_to_library
summaryRes = R.string.only_applies_silent_trackers
defaultValue = true
}
preferenceCategory {
titleRes = R.string.services
@ -86,13 +80,18 @@ class SettingsTrackingController :
trackPreference(trackManager.shikimori) {
activity?.openInBrowser(ShikimoriApi.authUrl(), trackManager.shikimori.getLogoColor())
}
trackPreference(trackManager.bangumi) {
activity?.openInBrowser(BangumiApi.authUrl(), trackManager.bangumi.getLogoColor())
}
infoPreference(R.string.tracking_info)
}
preferenceCategory {
titleRes = R.string.enhanced_services
trackPreference(trackManager.komga) {
trackManager.komga.loginNoop()
updatePreference(trackManager.komga.id)
}
trackPreference(trackManager.bangumi) {
activity?.openInBrowser(BangumiApi.authUrl(), trackManager.bangumi.getLogoColor())
}
infoPreference(R.string.enhanced_tracking_info)
}
}

12
app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt
View file

@ -116,9 +116,7 @@ fun Manga.addOrRemoveToFavorites(
defaultCategory != null -> {
favorite = true
date_added = Date().time
if (preferences.autoAddTrack()) {
autoAddTrack(db, onMangaMoved)
}
autoAddTrack(db, onMangaMoved)
db.insertManga(this).executeAsBlocking()
val mc = MangaCategory.create(this, defaultCategory)
db.setMangaCategories(listOf(mc), listOf(this))
@ -132,9 +130,7 @@ fun Manga.addOrRemoveToFavorites(
defaultCategoryId == 0 || categories.isEmpty() -> { // 'Default' or no category
favorite = true
date_added = Date().time
if (preferences.autoAddTrack()) {
autoAddTrack(db, onMangaMoved)
}
autoAddTrack(db, onMangaMoved)
db.insertManga(this).executeAsBlocking()
db.setMangaCategories(emptyList(), listOf(this))
onMangaMoved()
@ -160,9 +156,7 @@ fun Manga.addOrRemoveToFavorites(
true
) {
onMangaAdded()
if (preferences.autoAddTrack()) {
autoAddTrack(db, onMangaMoved)
}
autoAddTrack(db, onMangaMoved)
}.show()
}
}

3
app/src/main/res/values/strings.xml
View file

@ -554,6 +554,9 @@
<string name="tracked">Tracked</string>
<string name="not_tracked">Not tracked</string>
<string name="services">Services</string>
<string name="tracking_info">One-way sync to update the chapter progress in tracking services. Set up tracking for individual manga entries from their tracking button.</string>
<string name="enhanced_services">Enhanced services</string>
<string name="enhanced_tracking_info">Services that provide enhanced features for specific sources. Manga are automatically tracked when added to your library.</string>
<string name="sync_chapters_after_reading">Sync chapters after reading</string>
<string name="track_when_adding_to_library">Track when adding to library</string>
<string name="only_applies_silent_trackers">Only applies to silent trackers, such as Komga</string>