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

MANGA Plus: Add preference to remove the chapter number from the name and add the site name as scanlator (#4965) 

* asasdsa

* more

* this is useless
This commit is contained in:
bapeey 2024-09-08 01:42:35 -05:00 committed by Draff
parent 20b3c8ac86
commit f8ab0d3f2f
No known key found for this signature in database
GPG Key ID: E8A89F3211677653
4 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/mangaplus/assets/i18n/messages_en.properties
View File

@ -17,6 +17,8 @@ schedule_monthly=Monthly
schedule_other=Other schedule_other=Other
schedule_trimonthly=Trimonthly schedule_trimonthly=Trimonthly
schedule_weekly=Weekly schedule_weekly=Weekly
subtitle_only=Show subtitle only
subtitle_only_summary=Removes the redundant chapter number from the chapter name.
serialization=Serialization: %s serialization=Serialization: %s
split_double_pages=Split double pages split_double_pages=Split double pages
split_double_pages_summary=Only a few titles supports disabling this setting. split_double_pages_summary=Only a few titles supports disabling this setting.

2
src/all/mangaplus/build.gradle
View File

@ -1,7 +1,7 @@
ext { ext {
extName = 'MANGA Plus by SHUEISHA' extName = 'MANGA Plus by SHUEISHA'
extClass = '.MangaPlusFactory' extClass = '.MangaPlusFactory'
extVersionCode = 52 extVersionCode = 53
} }
apply from: "$rootDir/common.gradle" apply from: "$rootDir/common.gradle"

26
src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt
View File

@ -289,9 +289,10 @@ class MangaPlus(
} }
val titleDetailView = result.success.titleDetailView!! val titleDetailView = result.success.titleDetailView!!
val subtitleOnly = preferences.subtitleOnly()
return titleDetailView.chapterList return titleDetailView.chapterList
.map(Chapter::toSChapter) .map { it.toSChapter(subtitleOnly) }
.reversed() .reversed()
} }
@ -307,8 +308,8 @@ class MangaPlus(
private fun pageListRequest(chapterId: String): Request { private fun pageListRequest(chapterId: String): Request {
val url = "$APP_API_URL/manga_viewer".toHttpUrl().newBuilder() val url = "$APP_API_URL/manga_viewer".toHttpUrl().newBuilder()
.addQueryParameter("chapter_id", chapterId) .addQueryParameter("chapter_id", chapterId)
.addQueryParameter("split", if (preferences.splitImages) "yes" else "no") .addQueryParameter("split", if (preferences.splitImages()) "yes" else "no")
.addQueryParameter("img_quality", preferences.imageQuality) .addQueryParameter("img_quality", preferences.imageQuality())
.addQueryParameter("ticket_reading", "no") .addQueryParameter("ticket_reading", "no")
.addQueryParameter("free_reading", "yes") .addQueryParameter("free_reading", "yes")
.addQueryParameter("subscription_reading", "no") .addQueryParameter("subscription_reading", "no")
@ -378,8 +379,16 @@ class MangaPlus(
key = "${VER_PREF_KEY}_$lang", key = "${VER_PREF_KEY}_$lang",
) )
val titlePref = SwitchPreferenceCompat(screen.context).apply {
key = "${SUBTITLE_ONLY_KEY}_$lang"
title = intl["subtitle_only"]
summary = intl["subtitle_only_summary"]
setDefaultValue(SUBTITLE_ONLY_DEFAULT_VALUE)
}
screen.addPreference(qualityPref) screen.addPreference(qualityPref)
screen.addPreference(splitPref) screen.addPreference(splitPref)
screen.addPreference(titlePref)
} }
private fun PreferenceScreen.addEditTextPreference( private fun PreferenceScreen.addEditTextPreference(
@ -494,11 +503,11 @@ class MangaPlus(
json.decodeFromString(body.string()) json.decodeFromString(body.string())
} }
private val SharedPreferences.imageQuality: String private fun SharedPreferences.imageQuality(): String = getString("${QUALITY_PREF_KEY}_$lang", QUALITY_PREF_DEFAULT_VALUE)!!
get() = getString("${QUALITY_PREF_KEY}_$lang", QUALITY_PREF_DEFAULT_VALUE)!!
private val SharedPreferences.splitImages: Boolean private fun SharedPreferences.splitImages(): Boolean = getBoolean("${SPLIT_PREF_KEY}_$lang", SPLIT_PREF_DEFAULT_VALUE)
get() = getBoolean("${SPLIT_PREF_KEY}_$lang", SPLIT_PREF_DEFAULT_VALUE)
private fun SharedPreferences.subtitleOnly(): Boolean = getBoolean("${SUBTITLE_ONLY_KEY}_$lang", SUBTITLE_ONLY_DEFAULT_VALUE)
private val SharedPreferences.appVersion: String? private val SharedPreferences.appVersion: String?
get() = getString("${VER_PREF_KEY}_$lang", VER_PREF_DEFAULT_VALUE) get() = getString("${VER_PREF_KEY}_$lang", VER_PREF_DEFAULT_VALUE)
@ -526,6 +535,9 @@ private val QUALITY_PREF_DEFAULT_VALUE = QUALITY_PREF_ENTRY_VALUES[2]
private const val SPLIT_PREF_KEY = "splitImage" private const val SPLIT_PREF_KEY = "splitImage"
private const val SPLIT_PREF_DEFAULT_VALUE = true private const val SPLIT_PREF_DEFAULT_VALUE = true
private const val SUBTITLE_ONLY_KEY = "subtitleOnly"
private const val SUBTITLE_ONLY_DEFAULT_VALUE = false
private const val VER_PREF_KEY = "appVer" private const val VER_PREF_KEY = "appVer"
private const val VER_PREF_DEFAULT_VALUE = "" private const val VER_PREF_DEFAULT_VALUE = ""
private const val SECRET_PREF_KEY = "accountSecret" private const val SECRET_PREF_KEY = "accountSecret"

9
src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlusDto.kt
View File

@ -322,11 +322,16 @@ class Chapter(
val isExpired: Boolean val isExpired: Boolean
get() = subTitle == null get() = subTitle == null
fun toSChapter(): SChapter = SChapter.create().apply { fun toSChapter(subtitlePref: Boolean): SChapter = SChapter.create().apply {
name = "${this@Chapter.name} - $subTitle" name = if (subtitlePref && subTitle != null) {
subTitle
} else {
"${this@Chapter.name} - $subTitle"
}
date_upload = 1000L * startTimeStamp date_upload = 1000L * startTimeStamp
url = "#/viewer/$chapterId" url = "#/viewer/$chapterId"
chapter_number = this@Chapter.name.substringAfter("#").toFloatOrNull() ?: -1f chapter_number = this@Chapter.name.substringAfter("#").toFloatOrNull() ?: -1f
scanlator = "MANGA Plus"
} }
} }