Support for new post spoiler tag

QuantumBadger · Jan 19, 2017 · 15becd9 · 15becd9
1 parent 5425702
commit 15becd9
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/assets/changelog.txt b/assets/changelog.txt
@@ -1,4 +1,5 @@
 77/1.9.7
+Support for new post spoiler tag
 Added low-contrast night theme
 Added Ultra Black theme
 Added higher font scale options

diff --git a/src/main/java/org/quantumbadger/redreader/reddit/prepared/RedditParsedPost.java b/src/main/java/org/quantumbadger/redreader/reddit/prepared/RedditParsedPost.java
@@ -107,6 +107,10 @@ public String getRawSelfText() {
 		return mSrc.selftext;
 	}
 
+	public boolean isSpoiler() {
+		return Boolean.TRUE.equals(mSrc.spoiler);
+	}
+
 	public String getUnescapedSelfText() {
 		return StringEscapeUtils.unescapeHtml4(mSrc.selftext);
 	}

diff --git a/src/main/java/org/quantumbadger/redreader/reddit/prepared/RedditPreparedPost.java b/src/main/java/org/quantumbadger/redreader/reddit/prepared/RedditPreparedPost.java
@@ -767,6 +767,12 @@ private void rebuildSubtitle(Context context) {
 			pointsCol = boldCol;
 		}
 
+		if(src.isSpoiler()) {
+			postListDescSb.append(" SPOILER ", BetterSSB.BOLD | BetterSSB.FOREGROUND_COLOR | BetterSSB.BACKGROUND_COLOR,
+					Color.WHITE, Color.rgb(50, 50, 50), 1f);
+			postListDescSb.append("  ", 0);
+		}
+
 		if(src.isStickied()) {
 			postListDescSb.append(" STICKY ", BetterSSB.BOLD | BetterSSB.FOREGROUND_COLOR | BetterSSB.BACKGROUND_COLOR,
 					Color.WHITE, Color.rgb(0, 170, 0), 1f); // TODO color?
@@ -899,10 +905,6 @@ public boolean isRead() {
 		return mChangeDataManager.isRead(src);
 	}
 
-	public boolean isSticky() {
-		return src.isStickied();
-	}
-
 	public void bind(RedditPostView boundView) {
 		this.boundView = boundView;
 	}

diff --git a/src/main/java/org/quantumbadger/redreader/reddit/things/RedditPost.java b/src/main/java/org/quantumbadger/redreader/reddit/things/RedditPost.java
@@ -29,6 +29,7 @@ public final class RedditPost implements Parcelable, RedditThingWithIdAndType {
 	public boolean archived, over_18, hidden, saved, is_self, clicked, stickied;
 	public Object edited;
 	public Boolean likes;
+	public Boolean spoiler;
 
 	public long created, created_utc;
 
@@ -79,6 +80,18 @@ private RedditPost(final Parcel in) {
 		link_flair_text = in.readString();
 		author_flair_text = in.readString();
 		thumbnail = in.readString();
+
+		switch(in.readInt()) {
+			case -1:
+				spoiler = false;
+				break;
+			case 0:
+				spoiler = null;
+				break;
+			case 1:
+				spoiler = true;
+				break;
+		}
 	}
 
 	public int describeContents() {
@@ -126,6 +139,12 @@ public void writeToParcel(final Parcel parcel, final int flags) {
 		parcel.writeString(link_flair_text);
 		parcel.writeString(author_flair_text);
 		parcel.writeString(thumbnail);
+
+		if(spoiler == null) {
+			parcel.writeInt(0);
+		} else {
+			parcel.writeInt(spoiler ? 1 : -1);
+		}
 	}
 
 	public static final Parcelable.Creator<RedditPost> CREATOR = new Parcelable.Creator<RedditPost>() {