diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryComment.java b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryComment.java index 58f39fef5..04296bbf7 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryComment.java +++ b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryComment.java @@ -33,6 +33,7 @@ public class GalleryComment implements Parcelable { public long time; public String user; public String comment; + public long lastEdited; @Override public int describeContents() { @@ -52,6 +53,7 @@ public class GalleryComment implements Parcelable { dest.writeLong(this.time); dest.writeString(this.user); dest.writeString(this.comment); + dest.writeLong(this.lastEdited); } public GalleryComment() { @@ -69,6 +71,7 @@ public class GalleryComment implements Parcelable { this.time = in.readLong(); this.user = in.readString(); this.comment = in.readString(); + this.lastEdited = in.readLong(); } public static final Creator CREATOR = new Creator() { diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java index 6262dc55d..8f69ddcf7 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java +++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java @@ -444,6 +444,14 @@ public class GalleryDetailParser { comment.user = c3.child(0).text(); // comment comment.comment = JsoupUtils.getElementByClass(element, "c6").html(); + // last edited + Element c8 = JsoupUtils.getElementByClass(element, "c8"); + if (c8 != null) { + Element e = c8.children().first(); + if (e != null) { + comment.lastEdited = WEB_COMMENT_DATE_FORMAT.parse(temp).getTime(); + } + } return comment; } catch (Throwable e) { ExceptionUtils.throwIfFatal(e); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java index 8a7ab003e..621f93537 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java @@ -687,6 +687,16 @@ public final class GalleryCommentsScene extends ToolbarScene ssb.append(" ").append(ss); } + if (comment.lastEdited != 0) { + String str = context.getString(R.string.last_edited, ReadableTime.getTimeAgo(comment.lastEdited)); + SpannableString ss = new SpannableString(str); + ss.setSpan(new RelativeSizeSpan(0.8f), 0, str.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + ss.setSpan(new StyleSpan(Typeface.BOLD), 0, str.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + ss.setSpan(new ForegroundColorSpan(AttrResources.getAttrColor(context, android.R.attr.textColorSecondary)), + 0, str.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + ssb.append("\n\n").append(ss); + } + return TextUrl.handleTextUrl(ssb); } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2366f1ca4..4098210d8 100755 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -293,6 +293,7 @@ 投票失败 查看投票情况 点击加载更多评论 + 上次修改时间:%s 画廊预览 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 28b93a9d8..696e7a6a4 100755 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -293,6 +293,7 @@ 投票失敗 查看投票情況 點擊加載更多評論 + 上次修改時間:%s 畫廊預覽 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ce09aa8a8..f0f30a5dd 100755 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -292,6 +292,7 @@ 推噓失敗 檢視推噓狀態 點選載入更多留言 + 上次修改時間:%s 圖庫預覽 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 34972403f..f97fd72ff 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -339,6 +339,7 @@ Vote failed View vote details Click to load more comments + Last edited: %s Gallery Previews