Tweak BaseGalleryInfo layout

This commit is contained in:
tarsin committed 2023-06-16 00:07:38 +08:00
1 parent 5974ce11a1
commit d2bbd1b842
5 files changed
+5 -5

No files matched your search

@@ -12,7 +12,7 @@ interface AbstractGalleryInfo {
var disowned: Boolean
var rating: Float
var rated: Boolean
var simpleTags: Array<String>?
var simpleTags: ArrayList<String>?
var pages: Int
var thumbWidth: Int
var thumbHeight: Int
@@ -57,7 +57,7 @@ open class BaseGalleryInfo(
override var rated: Boolean = false,
@Ignore
override var simpleTags: Array<String>? = null,
override var simpleTags: ArrayList<String>? = null,
@Ignore
override var pages: Int = 0,
@@ -24,7 +24,7 @@ interface GalleryInfo : AbstractGalleryInfo, Parcelable {
?: title?.let { generateSLangFromTitle(it) }
}
private fun generateSLangFromTags(simpleTags: Array<String>): String? {
private fun generateSLangFromTags(simpleTags: List<String>): String? {
for (tag in simpleTags) {
for (i in S_LANGS.indices) {
if (S_LANG_TAGS[i] == tag) {
@@ -40,7 +40,7 @@ object GalleryApiParser {
gi.rating = NumberUtils.parseFloatSafely(g.getString("rating"), 0.0f)
// tags
val tagJa = g.getJSONArray("tags")
gi.simpleTags = (0 until tagJa.length()).map { tagJa.getString(it) }.toTypedArray()
gi.simpleTags = (0 until tagJa.length()).map { tagJa.getString(it) }.let { arrayListOf<String>().apply { addAll(it) } }
gi.pages = NumberUtils.parseIntSafely(g.getString("filecount"), 0)
gi.generateSLang()
}
@@ -127,7 +127,7 @@ object GalleryListParser {
for (gt in gts) {
tags.add(gt.attr("title"))
}
gi.simpleTags = tags.toTypedArray()
gi.simpleTags = tags
}
// Category