yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine GalleryDetail nullability and immutability

Browse Source
This commit is contained in:
tarsin committed 2023-05-01 10:59:25 +08:00
1 parent 97e5636813
commit 7d16ad2119
4 files changed
+62 -56
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/client/data/GalleryDetail.kt
+22 -26
View File
@@ -18,6 +18,23 @@ package com.hippo.ehviewer.client.data
import com.hippo.ehviewer.client.data.GalleryInfo.Companion.S_LANGS
import kotlinx.parcelize.Parcelize
private val LANGUAGES = arrayOf(
"English",
"Chinese",
"Spanish",
"Korean",
"Russian",
"French",
"Portuguese",
"Thai",
"German",
"Italian",
"Vietnamese",
"Polish",
"Hungarian",
"Dutch",
)
@Parcelize
class GalleryDetail(
val galleryInfo: GalleryInfo = BaseGalleryInfo(),
@@ -34,34 +51,13 @@ class GalleryDetail(
var favoriteCount: Int = 0,
var isFavorited: Boolean = false,
var ratingCount: Int = 0,
var tags: Array<GalleryTagGroup>? = null,
var comments: GalleryCommentList? = null,
var previewPages: Int = 0,
var previewList: List<GalleryPreview> = emptyList(),
val tags: Array<GalleryTagGroup>,
var comments: GalleryCommentList,
val previewPages: Int,
val previewList: List<GalleryPreview>,
) : AbstractGalleryInfo by galleryInfo, GalleryInfo {
override fun generateSLang() {
val index = LANGUAGES.indexOf(language)
if (index != -1) {
simpleLanguage = S_LANGS[index]
}
}
companion object {
private val LANGUAGES = arrayOf(
"English",
"Chinese",
"Spanish",
"Korean",
"Russian",
"French",
"Portuguese",
"Thai",
"German",
"Italian",
"Vietnamese",
"Polish",
"Hungarian",
"Dutch",
)
if (index != -1) simpleLanguage = S_LANGS[index]
}
}
app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt
+6 -5
View File
@@ -90,14 +90,15 @@ object GalleryDetailParser {
// Error info
PATTERN_ERROR.find(body)?.run { throw EhException(groupValues[1]) }
val galleryDetail = GalleryDetail()
// Temporary workaround, see https://github.com/jhy/jsoup/issues/1850
val document = Jsoup.parse(body.replace("del>", "s>"))
val galleryDetail = GalleryDetail(
tags = parseTagGroups(document),
comments = parseComments(document),
previewPages = parsePreviewPages(body),
previewList = parsePreviewList(body).first,
)
parseDetail(galleryDetail, document, body)
galleryDetail.tags = parseTagGroups(document)
galleryDetail.comments = parseComments(document)
galleryDetail.previewPages = parsePreviewPages(body)
galleryDetail.previewList = parsePreviewList(body).first
// Generate simpleLanguage for local favorites
galleryDetail.generateSLang()
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt
+33 -24
View File
@@ -131,7 +131,7 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
}
mGalleryDetail = args.getParcelableCompat(KEY_GALLERY_DETAIL)
mShowAllComments =
mGalleryDetail != null && mGalleryDetail!!.comments != null && !mGalleryDetail!!.comments!!.hasMore
mGalleryDetail != null && true && !mGalleryDetail!!.comments.hasMore
}
private fun onInit() {
@@ -140,8 +140,7 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
private fun onRestore(savedInstanceState: Bundle) {
mGalleryDetail = savedInstanceState.getParcelableCompat(KEY_GALLERY_DETAIL)
mShowAllComments =
mGalleryDetail != null && mGalleryDetail!!.comments != null && !mGalleryDetail!!.comments!!.hasMore
mShowAllComments = mGalleryDetail != null && !mGalleryDetail!!.comments.hasMore
}
override fun onSaveInstanceState(outState: Bundle) {
@@ -342,10 +341,10 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
}
private fun hideComment(position: Int) {
if (mGalleryDetail == null || mGalleryDetail!!.comments == null || mGalleryDetail!!.comments!!.comments == null) {
if (mGalleryDetail == null || mGalleryDetail!!.comments.comments == null) {
return
}
val oldCommentsList = mGalleryDetail!!.comments!!.comments
val oldCommentsList = mGalleryDetail!!.comments.comments
val newCommentsList = arrayOfNulls<GalleryComment>(
oldCommentsList!!.size - 1,
)
@@ -358,7 +357,7 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
}
i++
}
mGalleryDetail!!.comments!!.comments = newCommentsList.requireNoNulls()
mGalleryDetail!!.comments.comments = newCommentsList.requireNoNulls()
mAdapter!!.notifyDataSetChanged()
updateView(true)
}
@@ -369,7 +368,10 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
runSuspendCatching {
EhEngine.voteComment(gd.apiUid, gd.apiKey, gd.gid, gd.token, id, vote)
}.onSuccess { result ->
showTip(if (result.expectVote > 0) (if (0 != result.vote) R.string.vote_up_successfully else R.string.cancel_vote_up_successfully) else if (0 != result.vote) R.string.vote_down_successfully else R.string.cancel_vote_down_successfully, LENGTH_SHORT)
showTip(
if (result.expectVote > 0) (if (0 != result.vote) R.string.vote_up_successfully else R.string.cancel_vote_up_successfully) else if (0 != result.vote) R.string.vote_down_successfully else R.string.cancel_vote_down_successfully,
LENGTH_SHORT,
)
withUIContext { onVoteCommentSuccess(result) }
}.onFailure {
showTip(R.string.vote_failed, LENGTH_LONG)
@@ -421,10 +423,10 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
private fun showCommentDialog(position: Int, text: CharSequence) {
val context = context
if (context == null || mGalleryDetail == null || mGalleryDetail!!.comments == null || mGalleryDetail!!.comments!!.comments == null || position >= mGalleryDetail!!.comments!!.comments!!.size || position < 0) {
if (context == null || mGalleryDetail == null || mGalleryDetail!!.comments.comments == null || position >= mGalleryDetail!!.comments.comments!!.size || position < 0) {
return
}
val comment = mGalleryDetail!!.comments!!.comments!![position]
val comment = mGalleryDetail!!.comments.comments!![position]
val menu: MutableList<String> = ArrayList()
val menuId = IntList()
val resources = context.resources
@@ -515,7 +517,7 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
if (null == mViewTransition) {
return
}
if (mGalleryDetail == null || mGalleryDetail!!.comments == null || mGalleryDetail!!.comments!!.comments == null || mGalleryDetail!!.comments!!.comments!!.isEmpty()) {
if (mGalleryDetail == null || mGalleryDetail!!.comments.comments == null || mGalleryDetail!!.comments.comments!!.isEmpty()) {
mViewTransition!!.showView(1, animation)
} else {
mViewTransition!!.showView(0, animation)
@@ -679,9 +681,16 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
val url = galleryDetailUrl ?: return
lifecycleScope.launchIO {
runSuspendCatching {
EhEngine.commentGallery(url, comment, if (mCommentId != 0L) mCommentId.toString() else null)
EhEngine.commentGallery(
url,
comment,
if (mCommentId != 0L) mCommentId.toString() else null,
)
}.onSuccess {
showTip(if (mCommentId != 0L) R.string.edit_comment_successfully else R.string.comment_successfully, LENGTH_SHORT)
showTip(
if (mCommentId != 0L) R.string.edit_comment_successfully else R.string.comment_successfully,
LENGTH_SHORT,
)
withUIContext {
onCommentGallerySuccess(it)
}
@@ -701,7 +710,7 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
}
}
private fun onRefreshGallerySuccess(result: GalleryCommentList?) {
private fun onRefreshGallerySuccess(result: GalleryCommentList) {
if (mGalleryDetail == null || mAdapter == null) {
return
}
@@ -739,14 +748,14 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
}
private fun onVoteCommentSuccess(result: VoteCommentParser.Result) {
if (mAdapter == null || mGalleryDetail!!.comments == null || mGalleryDetail!!.comments!!.comments == null) {
if (mAdapter == null || mGalleryDetail!!.comments.comments == null) {
return
}
var position = -1
var i = 0
val n = mGalleryDetail!!.comments!!.comments!!.size
val n = mGalleryDetail!!.comments.comments!!.size
while (i < n) {
val comment = mGalleryDetail!!.comments!!.comments!![i]
val comment = mGalleryDetail!!.comments.comments!![i]
if (comment.id == result.id) {
position = i
break
@@ -759,7 +768,7 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
}
// Update comment
val comment = mGalleryDetail!!.comments!!.comments!![position]
val comment = mGalleryDetail!!.comments.comments!![position]
comment.score = result.score
if (result.expectVote > 0) {
comment.voteUpEd = 0 != result.vote
@@ -877,7 +886,7 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
override fun onBindViewHolder(holder: CommentHolder, position: Int) {
val context = context
if (context == null || mGalleryDetail == null || mGalleryDetail!!.comments == null) {
if (context == null || mGalleryDetail == null) {
return
}
holder.itemView.setOnClickListener {
@@ -890,22 +899,22 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
holder.itemView.isClickable = true
holder.itemView.isFocusable = true
if (holder is ActualCommentHolder) {
holder.bind(mGalleryDetail!!.comments!!.comments!![position])
holder.bind(mGalleryDetail!!.comments.comments!![position])
}
}
override fun getItemCount(): Int {
return if (mGalleryDetail == null || mGalleryDetail!!.comments == null || mGalleryDetail!!.comments!!.comments == null) {
return if (mGalleryDetail == null || mGalleryDetail!!.comments.comments == null) {
0
} else if (mGalleryDetail!!.comments!!.hasMore) {
mGalleryDetail!!.comments!!.comments!!.size + 1
} else if (mGalleryDetail!!.comments.hasMore) {
mGalleryDetail!!.comments.comments!!.size + 1
} else {
mGalleryDetail!!.comments!!.comments!!.size
mGalleryDetail!!.comments.comments!!.size
}
}
override fun getItemViewType(position: Int): Int {
return if (position >= mGalleryDetail!!.comments!!.comments!!.size) {
return if (position >= mGalleryDetail!!.comments.comments!!.size) {
if (mRefreshingComments) TYPE_PROGRESS else TYPE_MORE
} else {
TYPE_COMMENT
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
+1 -1
View File
@@ -825,7 +825,7 @@ class GalleryDetailScene : BaseScene(), DownloadInfoListener {
}
Spacer(modifier = Modifier.size(dimensionResource(id = R.dimen.keyline_margin)))
val tags = galleryDetail.tags
if (tags.isNullOrEmpty()) {
if (tags.isEmpty()) {
Box(
modifier = Modifier.fillMaxWidth(),
contentAlignment = Alignment.Center,