From 632791ad7edcca8a6d51465119bbb08860d84477 Mon Sep 17 00:00:00 2001 From: Florens Douwes Date: Thu, 19 Jun 2014 22:46:38 +0200 Subject: [PATCH] Show how many images a thread has in board view. --- .../src/main/java/org/floens/chan/core/model/Post.java | 3 ++- .../java/org/floens/chan/core/net/ChanReaderRequest.java | 3 +++ .../src/main/java/org/floens/chan/ui/view/PostView.java | 8 ++++++++ Clover/app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Clover/app/src/main/java/org/floens/chan/core/model/Post.java b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java index 83507f0a..686b7999 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/model/Post.java +++ b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java @@ -68,6 +68,7 @@ public class Post { public boolean isSavedReply = false; public String title = ""; public int fileSize; + public int images = -1; /** * This post replies to the these ids @@ -123,7 +124,7 @@ public class Post { isOP = resto == 0; - if (isOP && replies < 0) + if (isOP && (replies < 0 || images < 0)) return false; if (ext != null) { diff --git a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java index 9dbcbcf0..0459b2c5 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java +++ b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java @@ -285,6 +285,9 @@ public class ChanReaderRequest extends JsonReaderRequest> { case "capcode": post.capcode = reader.nextString(); break; + case "images": + post.images = reader.nextInt(); + break; default: // Unknown/ignored key // log("Unknown/ignored key: " + key + "."); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java b/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java index 7a5d293f..9cacec3a 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java @@ -214,6 +214,14 @@ public class PostView extends LinearLayout implements View.OnClickListener, View text = count + " " + context.getString(R.string.one_reply); } + if (manager.getLoadable().isBoardMode() && post.images > 0) { + if (post.images > 1) { + text += ", " + post.images + " " + context.getString(R.string.multiple_images); + } else { + text += ", " + post.images + " " + context.getString(R.string.one_image); + } + } + if (manager.getLoadable().isThreadMode()) { repliesCountView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml index 6f08dd7b..11797e6f 100644 --- a/Clover/app/src/main/res/values/strings.xml +++ b/Clover/app/src/main/res/values/strings.xml @@ -74,6 +74,8 @@ along with this program. If not, see . reply replies + image + images Back Close Info