Finish migration to moko resources
This commit is contained in:
@@ -1,26 +1,26 @@
|
||||
package exh.md.utils
|
||||
|
||||
import androidx.annotation.StringRes
|
||||
import eu.kanade.tachiyomi.source.R
|
||||
import dev.icerock.moko.resources.StringResource
|
||||
import tachiyomi.i18n.sy.SYMR
|
||||
|
||||
enum class MangaDexRelation(@StringRes val resId: Int, val mdString: String?) {
|
||||
SIMILAR(R.string.relation_similar, null),
|
||||
MONOCHROME(R.string.relation_monochrome, "monochrome"),
|
||||
MAIN_STORY(R.string.relation_main_story, "main_story"),
|
||||
ADAPTED_FROM(R.string.relation_adapted_from, "adapted_from"),
|
||||
BASED_ON(R.string.relation_based_on, "based_on"),
|
||||
PREQUEL(R.string.relation_prequel, "prequel"),
|
||||
SIDE_STORY(R.string.relation_side_story, "side_story"),
|
||||
DOUJINSHI(R.string.relation_doujinshi, "doujinshi"),
|
||||
SAME_FRANCHISE(R.string.relation_same_franchise, "same_franchise"),
|
||||
SHARED_UNIVERSE(R.string.relation_shared_universe, "shared_universe"),
|
||||
SEQUEL(R.string.relation_sequel, "sequel"),
|
||||
SPIN_OFF(R.string.relation_spin_off, "spin_off"),
|
||||
ALTERNATE_STORY(R.string.relation_alternate_story, "alternate_story"),
|
||||
PRESERIALIZATION(R.string.relation_preserialization, "preserialization"),
|
||||
COLORED(R.string.relation_colored, "colored"),
|
||||
SERIALIZATION(R.string.relation_serialization, "serialization"),
|
||||
ALTERNATE_VERSION(R.string.relation_alternate_version, "alternate_version"),
|
||||
enum class MangaDexRelation(val res: StringResource, val mdString: String?) {
|
||||
SIMILAR(SYMR.strings.relation_similar, null),
|
||||
MONOCHROME(SYMR.strings.relation_monochrome, "monochrome"),
|
||||
MAIN_STORY(SYMR.strings.relation_main_story, "main_story"),
|
||||
ADAPTED_FROM(SYMR.strings.relation_adapted_from, "adapted_from"),
|
||||
BASED_ON(SYMR.strings.relation_based_on, "based_on"),
|
||||
PREQUEL(SYMR.strings.relation_prequel, "prequel"),
|
||||
SIDE_STORY(SYMR.strings.relation_side_story, "side_story"),
|
||||
DOUJINSHI(SYMR.strings.relation_doujinshi, "doujinshi"),
|
||||
SAME_FRANCHISE(SYMR.strings.relation_same_franchise, "same_franchise"),
|
||||
SHARED_UNIVERSE(SYMR.strings.relation_shared_universe, "shared_universe"),
|
||||
SEQUEL(SYMR.strings.relation_sequel, "sequel"),
|
||||
SPIN_OFF(SYMR.strings.relation_spin_off, "spin_off"),
|
||||
ALTERNATE_STORY(SYMR.strings.relation_alternate_story, "alternate_story"),
|
||||
PRESERIALIZATION(SYMR.strings.relation_preserialization, "preserialization"),
|
||||
COLORED(SYMR.strings.relation_colored, "colored"),
|
||||
SERIALIZATION(SYMR.strings.relation_serialization, "serialization"),
|
||||
ALTERNATE_VERSION(SYMR.strings.relation_alternate_version, "alternate_version"),
|
||||
;
|
||||
|
||||
companion object {
|
||||
|
||||
@@ -2,12 +2,14 @@ package exh.metadata.metadata
|
||||
|
||||
import android.content.Context
|
||||
import androidx.core.net.toUri
|
||||
import eu.kanade.tachiyomi.source.R
|
||||
import eu.kanade.tachiyomi.source.model.SManga
|
||||
import eu.kanade.tachiyomi.source.model.copy
|
||||
import exh.metadata.MetadataUtil
|
||||
import exh.pref.DelegateSourcePreferences
|
||||
import kotlinx.serialization.Serializable
|
||||
import tachiyomi.core.i18n.stringResource
|
||||
import tachiyomi.i18n.MR
|
||||
import tachiyomi.i18n.sy.SYMR
|
||||
import uy.kohesive.injekt.Injekt
|
||||
import uy.kohesive.injekt.api.get
|
||||
import java.util.Date
|
||||
@@ -90,28 +92,28 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() {
|
||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||
return with(context) {
|
||||
listOfNotNull(
|
||||
getItem(gId) { getString(R.string.id) },
|
||||
getItem(gToken) { getString(R.string.token) },
|
||||
getItem(exh) { getString(R.string.is_exhentai_gallery) },
|
||||
getItem(thumbnailUrl) { getString(R.string.thumbnail_url) },
|
||||
getItem(title) { getString(R.string.title) },
|
||||
getItem(altTitle) { getString(R.string.alt_title) },
|
||||
getItem(genre) { getString(R.string.genre) },
|
||||
getItem(gId) { stringResource(SYMR.strings.id) },
|
||||
getItem(gToken) { stringResource(SYMR.strings.token) },
|
||||
getItem(exh) { stringResource(SYMR.strings.is_exhentai_gallery) },
|
||||
getItem(thumbnailUrl) { stringResource(SYMR.strings.thumbnail_url) },
|
||||
getItem(title) { stringResource(MR.strings.title) },
|
||||
getItem(altTitle) { stringResource(SYMR.strings.alt_title) },
|
||||
getItem(genre) { stringResource(SYMR.strings.genre) },
|
||||
getItem(datePosted, { MetadataUtil.EX_DATE_FORMAT.format(Date(it)) }) {
|
||||
getString(R.string.date_posted)
|
||||
stringResource(SYMR.strings.date_posted)
|
||||
},
|
||||
getItem(parent) { getString(R.string.parent) },
|
||||
getItem(visible) { getString(R.string.visible) },
|
||||
getItem(language) { getString(R.string.language) },
|
||||
getItem(translated) { getString(R.string.translated) },
|
||||
getItem(size, { MetadataUtil.humanReadableByteCount(it, true) }) { getString(R.string.gallery_size) },
|
||||
getItem(length) { getString(R.string.page_count) },
|
||||
getItem(favorites) { getString(R.string.total_favorites) },
|
||||
getItem(ratingCount) { getString(R.string.total_ratings) },
|
||||
getItem(averageRating) { getString(R.string.average_rating) },
|
||||
getItem(aged) { getString(R.string.aged) },
|
||||
getItem(parent) { stringResource(SYMR.strings.parent) },
|
||||
getItem(visible) { stringResource(SYMR.strings.visible) },
|
||||
getItem(language) { stringResource(SYMR.strings.language) },
|
||||
getItem(translated) { stringResource(SYMR.strings.translated) },
|
||||
getItem(size, { MetadataUtil.humanReadableByteCount(it, true) }) { stringResource(SYMR.strings.gallery_size) },
|
||||
getItem(length) { stringResource(SYMR.strings.page_count) },
|
||||
getItem(favorites) { stringResource(SYMR.strings.total_favorites) },
|
||||
getItem(ratingCount) { stringResource(SYMR.strings.total_ratings) },
|
||||
getItem(averageRating) { stringResource(SYMR.strings.average_rating) },
|
||||
getItem(aged) { stringResource(SYMR.strings.aged) },
|
||||
getItem(lastUpdateCheck, { MetadataUtil.EX_DATE_FORMAT.format(Date(it)) }) {
|
||||
getString(R.string.last_update_check)
|
||||
stringResource(SYMR.strings.last_update_check)
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package exh.metadata.metadata
|
||||
|
||||
import android.content.Context
|
||||
import eu.kanade.tachiyomi.source.R
|
||||
import eu.kanade.tachiyomi.source.model.SManga
|
||||
import eu.kanade.tachiyomi.source.model.copy
|
||||
import exh.util.nullIfEmpty
|
||||
import kotlinx.serialization.Serializable
|
||||
import tachiyomi.core.i18n.stringResource
|
||||
import tachiyomi.i18n.MR
|
||||
import tachiyomi.i18n.sy.SYMR
|
||||
|
||||
@Serializable
|
||||
class EightMusesSearchMetadata : RaisedSearchMetadata() {
|
||||
@@ -41,9 +43,9 @@ class EightMusesSearchMetadata : RaisedSearchMetadata() {
|
||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||
return with(context) {
|
||||
listOfNotNull(
|
||||
getItem(title) { getString(R.string.title) },
|
||||
getItem(path.nullIfEmpty(), { it.joinToString("/", prefix = "/") }) { getString(R.string.path) },
|
||||
getItem(thumbnailUrl) { getString(R.string.thumbnail_url) },
|
||||
getItem(title) { stringResource(MR.strings.title) },
|
||||
getItem(path.nullIfEmpty(), { it.joinToString("/", prefix = "/") }) { stringResource(SYMR.strings.path) },
|
||||
getItem(thumbnailUrl) { stringResource(SYMR.strings.thumbnail_url) },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package exh.metadata.metadata
|
||||
|
||||
import android.content.Context
|
||||
import eu.kanade.tachiyomi.source.R
|
||||
import eu.kanade.tachiyomi.source.model.SManga
|
||||
import eu.kanade.tachiyomi.source.model.copy
|
||||
import kotlinx.serialization.Serializable
|
||||
import tachiyomi.core.i18n.stringResource
|
||||
import tachiyomi.i18n.MR
|
||||
import tachiyomi.i18n.sy.SYMR
|
||||
|
||||
@Serializable
|
||||
class HBrowseSearchMetadata : RaisedSearchMetadata() {
|
||||
@@ -50,11 +52,11 @@ class HBrowseSearchMetadata : RaisedSearchMetadata() {
|
||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||
return with(context) {
|
||||
listOfNotNull(
|
||||
getItem(hbId) { getString(R.string.id) },
|
||||
getItem(hbUrl) { getString(R.string.url) },
|
||||
getItem(thumbnail) { getString(R.string.thumbnail_url) },
|
||||
getItem(title) { getString(R.string.title) },
|
||||
getItem(length) { getString(R.string.page_count) },
|
||||
getItem(hbId) { stringResource(SYMR.strings.id) },
|
||||
getItem(hbUrl) { stringResource(SYMR.strings.url) },
|
||||
getItem(thumbnail) { stringResource(SYMR.strings.thumbnail_url) },
|
||||
getItem(title) { stringResource(MR.strings.title) },
|
||||
getItem(length) { stringResource(SYMR.strings.page_count) },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package exh.metadata.metadata
|
||||
|
||||
import android.content.Context
|
||||
import eu.kanade.tachiyomi.source.R
|
||||
import eu.kanade.tachiyomi.source.model.SManga
|
||||
import eu.kanade.tachiyomi.source.model.copy
|
||||
import exh.md.utils.MangaDexRelation
|
||||
import kotlinx.serialization.Serializable
|
||||
import tachiyomi.core.i18n.stringResource
|
||||
import tachiyomi.i18n.MR
|
||||
import tachiyomi.i18n.sy.SYMR
|
||||
|
||||
@Serializable
|
||||
class MangaDexSearchMetadata : RaisedSearchMetadata() {
|
||||
@@ -76,24 +78,24 @@ class MangaDexSearchMetadata : RaisedSearchMetadata() {
|
||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||
return with(context) {
|
||||
listOfNotNull(
|
||||
getItem(mdUuid) { getString(R.string.id) },
|
||||
// getItem(mdUrl) { getString(R.string.url) },
|
||||
getItem(cover) { getString(R.string.thumbnail_url) },
|
||||
getItem(title) { getString(R.string.title) },
|
||||
getItem(authors, { it.joinToString() }) { getString(R.string.author) },
|
||||
getItem(artists, { it.joinToString() }) { getString(R.string.artist) },
|
||||
getItem(langFlag) { getString(R.string.language) },
|
||||
getItem(lastChapterNumber) { getString(R.string.last_chapter_number) },
|
||||
getItem(rating) { getString(R.string.average_rating) },
|
||||
// getItem(users) { getString(R.string.total_ratings) },
|
||||
getItem(status) { getString(R.string.status) },
|
||||
// getItem(missing_chapters) { getString(R.string.missing_chapters) },
|
||||
getItem(followStatus) { getString(R.string.follow_status) },
|
||||
getItem(anilistId) { getString(R.string.anilist_id) },
|
||||
getItem(kitsuId) { getString(R.string.kitsu_id) },
|
||||
getItem(myAnimeListId) { getString(R.string.mal_id) },
|
||||
getItem(mangaUpdatesId) { getString(R.string.manga_updates_id) },
|
||||
getItem(animePlanetId) { getString(R.string.anime_planet_id) },
|
||||
getItem(mdUuid) { stringResource(SYMR.strings.id) },
|
||||
// getItem(mdUrl) { stringResource(SYMR.strings.url) },
|
||||
getItem(cover) { stringResource(SYMR.strings.thumbnail_url) },
|
||||
getItem(title) { stringResource(MR.strings.title) },
|
||||
getItem(authors, { it.joinToString() }) { stringResource(SYMR.strings.author) },
|
||||
getItem(artists, { it.joinToString() }) { stringResource(SYMR.strings.artist) },
|
||||
getItem(langFlag) { stringResource(SYMR.strings.language) },
|
||||
getItem(lastChapterNumber) { stringResource(SYMR.strings.last_chapter_number) },
|
||||
getItem(rating) { stringResource(SYMR.strings.average_rating) },
|
||||
// getItem(users) { stringResource(SYMR.strings.total_ratings) },
|
||||
getItem(status) { stringResource(MR.strings.status) },
|
||||
// getItem(missing_chapters) { stringResource(SYMR.strings.missing_chapters) },
|
||||
getItem(followStatus) { stringResource(SYMR.strings.follow_status) },
|
||||
getItem(anilistId) { stringResource(SYMR.strings.anilist_id) },
|
||||
getItem(kitsuId) { stringResource(SYMR.strings.kitsu_id) },
|
||||
getItem(myAnimeListId) { stringResource(SYMR.strings.mal_id) },
|
||||
getItem(mangaUpdatesId) { stringResource(SYMR.strings.manga_updates_id) },
|
||||
getItem(animePlanetId) { stringResource(SYMR.strings.anime_planet_id) },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package exh.metadata.metadata
|
||||
|
||||
import android.content.Context
|
||||
import eu.kanade.tachiyomi.source.R
|
||||
import eu.kanade.tachiyomi.source.model.SManga
|
||||
import eu.kanade.tachiyomi.source.model.copy
|
||||
import exh.metadata.MetadataUtil
|
||||
import kotlinx.serialization.Serializable
|
||||
import tachiyomi.core.i18n.stringResource
|
||||
import tachiyomi.i18n.MR
|
||||
import tachiyomi.i18n.sy.SYMR
|
||||
import java.util.Date
|
||||
|
||||
@Serializable
|
||||
@@ -89,19 +91,19 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() {
|
||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||
return with(context) {
|
||||
listOfNotNull(
|
||||
getItem(nhId) { getString(R.string.id) },
|
||||
getItem(nhId) { stringResource(SYMR.strings.id) },
|
||||
getItem(uploadDate, { MetadataUtil.EX_DATE_FORMAT.format(Date(it * 1000)) }) {
|
||||
getString(R.string.date_posted)
|
||||
stringResource(SYMR.strings.date_posted)
|
||||
},
|
||||
getItem(favoritesCount) { getString(R.string.total_favorites) },
|
||||
getItem(mediaId) { getString(R.string.media_id) },
|
||||
getItem(japaneseTitle) { getString(R.string.japanese_title) },
|
||||
getItem(englishTitle) { getString(R.string.english_title) },
|
||||
getItem(shortTitle) { getString(R.string.short_title) },
|
||||
getItem(coverImageType) { getString(R.string.cover_image_file_type) },
|
||||
getItem(pageImageTypes.size) { getString(R.string.page_count) },
|
||||
getItem(thumbnailImageType) { getString(R.string.thumbnail_image_file_type) },
|
||||
getItem(scanlator) { getString(R.string.scanlator) },
|
||||
getItem(favoritesCount) { stringResource(SYMR.strings.total_favorites) },
|
||||
getItem(mediaId) { stringResource(SYMR.strings.media_id) },
|
||||
getItem(japaneseTitle) { stringResource(SYMR.strings.japanese_title) },
|
||||
getItem(englishTitle) { stringResource(SYMR.strings.english_title) },
|
||||
getItem(shortTitle) { stringResource(SYMR.strings.short_title) },
|
||||
getItem(coverImageType) { stringResource(SYMR.strings.cover_image_file_type) },
|
||||
getItem(pageImageTypes.size) { stringResource(SYMR.strings.page_count) },
|
||||
getItem(thumbnailImageType) { stringResource(SYMR.strings.thumbnail_image_file_type) },
|
||||
getItem(scanlator) { stringResource(MR.strings.scanlator) },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package exh.metadata.metadata
|
||||
|
||||
import android.content.Context
|
||||
import eu.kanade.tachiyomi.source.R
|
||||
import eu.kanade.tachiyomi.source.model.SManga
|
||||
import eu.kanade.tachiyomi.source.model.copy
|
||||
import kotlinx.serialization.Serializable
|
||||
import tachiyomi.core.i18n.stringResource
|
||||
import tachiyomi.i18n.MR
|
||||
import tachiyomi.i18n.sy.SYMR
|
||||
|
||||
@Serializable
|
||||
class PururinSearchMetadata : RaisedSearchMetadata() {
|
||||
@@ -56,16 +58,16 @@ class PururinSearchMetadata : RaisedSearchMetadata() {
|
||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||
return with(context) {
|
||||
listOfNotNull(
|
||||
getItem(prId) { getString(R.string.id) },
|
||||
getItem(title) { getString(R.string.title) },
|
||||
getItem(altTitle) { getString(R.string.alt_title) },
|
||||
getItem(thumbnailUrl) { getString(R.string.thumbnail_url) },
|
||||
getItem(uploaderDisp) { getString(R.string.uploader_capital) },
|
||||
getItem(uploader) { getString(R.string.uploader) },
|
||||
getItem(pages) { getString(R.string.page_count) },
|
||||
getItem(fileSize) { getString(R.string.gallery_size) },
|
||||
getItem(ratingCount) { getString(R.string.total_ratings) },
|
||||
getItem(averageRating) { getString(R.string.average_rating) },
|
||||
getItem(prId) { stringResource(SYMR.strings.id) },
|
||||
getItem(title) { stringResource(MR.strings.title) },
|
||||
getItem(altTitle) { stringResource(SYMR.strings.alt_title) },
|
||||
getItem(thumbnailUrl) { stringResource(SYMR.strings.thumbnail_url) },
|
||||
getItem(uploaderDisp) { stringResource(SYMR.strings.uploader_capital) },
|
||||
getItem(uploader) { stringResource(SYMR.strings.uploader) },
|
||||
getItem(pages) { stringResource(SYMR.strings.page_count) },
|
||||
getItem(fileSize) { stringResource(SYMR.strings.gallery_size) },
|
||||
getItem(ratingCount) { stringResource(SYMR.strings.total_ratings) },
|
||||
getItem(averageRating) { stringResource(SYMR.strings.average_rating) },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,12 +2,14 @@ package exh.metadata.metadata
|
||||
|
||||
import android.content.Context
|
||||
import androidx.core.net.toUri
|
||||
import eu.kanade.tachiyomi.source.R
|
||||
import eu.kanade.tachiyomi.source.model.SManga
|
||||
import eu.kanade.tachiyomi.source.model.copy
|
||||
import exh.metadata.MetadataUtil
|
||||
import exh.util.nullIfEmpty
|
||||
import kotlinx.serialization.Serializable
|
||||
import tachiyomi.core.i18n.stringResource
|
||||
import tachiyomi.i18n.MR
|
||||
import tachiyomi.i18n.sy.SYMR
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.Date
|
||||
import java.util.Locale
|
||||
@@ -68,22 +70,22 @@ class TsuminoSearchMetadata : RaisedSearchMetadata() {
|
||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||
return with(context) {
|
||||
listOfNotNull(
|
||||
getItem(tmId) { getString(R.string.id) },
|
||||
getItem(title) { getString(R.string.title) },
|
||||
getItem(uploader) { getString(R.string.uploader) },
|
||||
getItem(tmId) { stringResource(SYMR.strings.id) },
|
||||
getItem(title) { stringResource(MR.strings.title) },
|
||||
getItem(uploader) { stringResource(SYMR.strings.uploader) },
|
||||
getItem(uploadDate, { MetadataUtil.EX_DATE_FORMAT.format(Date(it)) }) {
|
||||
getString(R.string.date_posted)
|
||||
stringResource(SYMR.strings.date_posted)
|
||||
},
|
||||
getItem(length) { getString(R.string.page_count) },
|
||||
getItem(ratingString) { getString(R.string.rating_string) },
|
||||
getItem(averageRating) { getString(R.string.average_rating) },
|
||||
getItem(userRatings) { getString(R.string.total_ratings) },
|
||||
getItem(favorites) { getString(R.string.total_favorites) },
|
||||
getItem(category) { getString(R.string.genre) },
|
||||
getItem(collection) { getString(R.string.collection) },
|
||||
getItem(group) { getString(R.string.group) },
|
||||
getItem(parody.nullIfEmpty(), { it.joinToString() }) { getString(R.string.parodies) },
|
||||
getItem(character.nullIfEmpty(), { it.joinToString() }) { getString(R.string.characters) },
|
||||
getItem(length) { stringResource(SYMR.strings.page_count) },
|
||||
getItem(ratingString) { stringResource(SYMR.strings.rating_string) },
|
||||
getItem(averageRating) { stringResource(SYMR.strings.average_rating) },
|
||||
getItem(userRatings) { stringResource(SYMR.strings.total_ratings) },
|
||||
getItem(favorites) { stringResource(SYMR.strings.total_favorites) },
|
||||
getItem(category) { stringResource(SYMR.strings.genre) },
|
||||
getItem(collection) { stringResource(SYMR.strings.collection) },
|
||||
getItem(group) { stringResource(SYMR.strings.group) },
|
||||
getItem(parody.nullIfEmpty(), { it.joinToString() }) { stringResource(SYMR.strings.parodies) },
|
||||
getItem(character.nullIfEmpty(), { it.joinToString() }) { stringResource(SYMR.strings.characters) },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user