diff --git a/src/main/java/org/quantumbadger/redreader/common/PrefsUtility.java b/src/main/java/org/quantumbadger/redreader/common/PrefsUtility.java index 1262439fb..75c8d0003 100644 --- a/src/main/java/org/quantumbadger/redreader/common/PrefsUtility.java +++ b/src/main/java/org/quantumbadger/redreader/common/PrefsUtility.java @@ -595,7 +595,8 @@ public enum AppearancePostSubtitleItem { SPOILER, NSFW, UPVOTE_RATIO, - COMMENTS + COMMENTS, + LOCKED } public static EnumSet appearance_post_subtitle_items() { diff --git a/src/main/java/org/quantumbadger/redreader/common/RRThemeAttributes.java b/src/main/java/org/quantumbadger/redreader/common/RRThemeAttributes.java index 38d9c47e2..c135ac397 100644 --- a/src/main/java/org/quantumbadger/redreader/common/RRThemeAttributes.java +++ b/src/main/java/org/quantumbadger/redreader/common/RRThemeAttributes.java @@ -37,6 +37,8 @@ public class RRThemeAttributes { public final int rrCommentBodyCol; public final int rrMainTextCol; public final int colorAccent; + public final int rrLockedpostBackCol; + public final int rrLockedpostTextCol; private final EnumSet mCommentHeaderItems; @@ -57,6 +59,8 @@ public RRThemeAttributes(final Context context) { R.attr.rrCommentHeaderCol, R.attr.rrCommentBodyCol, R.attr.rrMainTextCol, + R.attr.rrLockedpostBackCol, + R.attr.rrLockedpostTextCol, com.google.android.material.R.attr.colorAccent }); @@ -72,6 +76,8 @@ public RRThemeAttributes(final Context context) { rrCommentBodyCol = appearance.getColor(9, 255); rrMainTextCol = appearance.getColor(10, 255); colorAccent = appearance.getColor(11, 255); + rrLockedpostBackCol = appearance.getColor(12, 255); + rrLockedpostTextCol = appearance.getColor(13, 255); appearance.recycle(); diff --git a/src/main/java/org/quantumbadger/redreader/reddit/prepared/RedditPreparedPost.java b/src/main/java/org/quantumbadger/redreader/reddit/prepared/RedditPreparedPost.java index ae0c90f1a..a72c5b377 100644 --- a/src/main/java/org/quantumbadger/redreader/reddit/prepared/RedditPreparedPost.java +++ b/src/main/java/org/quantumbadger/redreader/reddit/prepared/RedditPreparedPost.java @@ -178,7 +178,9 @@ public SpannableStringBuilder buildSubtitle( R.attr.rrFlairBackCol, R.attr.rrFlairTextCol, R.attr.rrGoldTextCol, - R.attr.rrGoldBackCol + R.attr.rrGoldBackCol, + R.attr.rrLockedpostTextCol, + R.attr.rrLockedpostBackCol }); final int boldCol; @@ -194,6 +196,8 @@ public SpannableStringBuilder buildSubtitle( final int rrFlairTextCol = appearance.getColor(4, 255); final int rrGoldTextCol = appearance.getColor(5, 255); final int rrGoldBackCol = appearance.getColor(6, 255); + final int rrLockedpostTextCol = appearance.getColor(7, 255); + final int rrLockedpostBackCol = appearance.getColor(8, 255); appearance.recycle(); @@ -253,6 +257,22 @@ public SpannableStringBuilder buildSubtitle( } } + if(mPostSubtitleItems.contains(PrefsUtility.AppearancePostSubtitleItem.LOCKED)) { + if(src.isLocked()) { + postListDescSb.append( + " " + + context.getString(R.string.locked) + + " ", + BetterSSB.BOLD + | BetterSSB.FOREGROUND_COLOR + | BetterSSB.BACKGROUND_COLOR, + rrLockedpostTextCol, + rrLockedpostBackCol, + 1f); + postListDescSb.append(" ", 0); + } + } + if(mPostSubtitleItems.contains(PrefsUtility.AppearancePostSubtitleItem.FLAIR)) { if(src.getFlairText() != null) { postListDescSb.append( @@ -653,6 +673,15 @@ private String buildAccessibilityEmbellishments( } } + if(mPostSubtitleItems.contains(PrefsUtility.AppearancePostSubtitleItem.LOCKED)) { + if(src.isLocked()) { + a11yEmbellish + .append(context.getString( + R.string.accessibility_subtitle_lockedpost)) + .append(separator); + } + } + if(mPostSubtitleItems.contains(PrefsUtility.AppearancePostSubtitleItem.FLAIR)) { if(src.getFlairText() != null) { a11yEmbellish diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 9d3502316..8300980f8 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -873,6 +873,7 @@ @string/pref_appearance_post_subtitle_items_sticky @string/pref_appearance_post_subtitle_items_spoiler @string/pref_appearance_post_subtitle_items_nsfw + @string/pref_appearance_post_subtitle_items_locked @@ -889,6 +890,7 @@ sticky spoiler nsfw + locked @@ -903,6 +905,7 @@ sticky spoiler nsfw + locked diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index e18c4eba0..2c2788d73 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -55,6 +55,8 @@ + + diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4d1f752c7..1a275bfb5 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -1902,4 +1902,9 @@ Horizontal padding Compact title + + + LOCKED + Locked tag + Locked post. diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 0b1ceee85..c38f42539 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -91,6 +91,8 @@ #AAAAAA #B0923C #000000 + #8B0000 + #FFFFFF #181818 @@ -195,6 +197,8 @@ #AAAAAA #B0923C #000000 + #8B0000 + #FFFFFF @@ -263,6 +267,8 @@ #AAAAAA #B0923C #000000 + #8B0000 + #FFFFFF #000000 @@ -387,6 +393,8 @@ #444444 #FFDF52 #000000 + #8B0000 + #FFFFFF #F2FBFB