Skip to content

Locked tag for locked posts #1236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
folkemat wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Locked tag for locked posts #1236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/org/quantumbadger/redreader/common/PrefsUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,8 @@ public enum AppearancePostSubtitleItem {
SPOILER,
NSFW,
UPVOTE_RATIO,
COMMENTS
COMMENTS,
LOCKED
}

public static EnumSet<AppearancePostSubtitleItem> appearance_post_subtitle_items() {
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/org/quantumbadger/redreader/common/RRThemeAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<PrefsUtility.AppearanceCommentHeaderItem> mCommentHeaderItems;

Expand All @@ -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
});

Expand All @@ -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();

Expand Down
31 changes: 30 additions & 1 deletion src/main/java/org/quantumbadger/redreader/reddit/prepared/RedditPreparedPost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();

Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions src/main/res/values/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,7 @@
<item>@string/pref_appearance_post_subtitle_items_sticky</item>
<item>@string/pref_appearance_post_subtitle_items_spoiler</item>
<item>@string/pref_appearance_post_subtitle_items_nsfw</item>
<item>@string/pref_appearance_post_subtitle_items_locked</item>
</string-array>

<!-- Constants. Do not change. -->
Expand All @@ -889,6 +890,7 @@
<item>sticky</item>
<item>spoiler</item>
<item>nsfw</item>
<item>locked</item>
</string-array>

<!-- Constants. Do not change. -->
Expand All @@ -903,6 +905,7 @@
<item>sticky</item>
<item>spoiler</item>
<item>nsfw</item>
<item>locked</item>
</string-array>

<!-- 2020-02-05 -->
Expand Down
2 changes: 2 additions & 0 deletions src/main/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
<attr name="rrGoldBackCol" format="color" />
<attr name="rrGoldTextCol" format="color" />
<attr name="rrPostInlinePreviewDivider" format="color" />
<attr name="rrLockedpostBackCol" format="color" />
<attr name="rrLockedpostTextCol" format="color" />

<attr name="rrCommentBodyCol" format="color" />
<attr name="rrCommentHeaderCol" format="color" />
Expand Down
5 changes: 5 additions & 0 deletions src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1902,4 +1902,9 @@
<string name="album_grid_pref_horizontal_padding">Horizontal padding</string>

<string name="album_pref_compact_title">Compact title</string>

<!-- 2024-09-01 -->
<string name="locked">LOCKED</string>
<string name="pref_appearance_post_subtitle_items_locked">Locked tag</string>
<string name="accessibility_subtitle_lockedpost">Locked post.</string>
</resources>
8 changes: 8 additions & 0 deletions src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
<item name="rrFlairTextCol">#AAAAAA</item>
<item name="rrGoldBackCol">#B0923C</item>
<item name="rrGoldTextCol">#000000</item>
<item name="rrLockedpostBackCol">#8B0000</item>
<item name="rrLockedpostTextCol">#FFFFFF</item>

<item name="rrPostToolbarCol">#181818</item>

Expand Down Expand Up @@ -195,6 +197,8 @@
<item name="rrFlairTextCol">#AAAAAA</item>
<item name="rrGoldBackCol">#B0923C</item>
<item name="rrGoldTextCol">#000000</item>
<item name="rrLockedpostBackCol">#8B0000</item>
<item name="rrLockedpostTextCol">#FFFFFF</item>

<!-- Comment -->

Expand Down Expand Up @@ -263,6 +267,8 @@
<item name="rrFlairTextCol">#AAAAAA</item>
<item name="rrGoldBackCol">#B0923C</item>
<item name="rrGoldTextCol">#000000</item>
<item name="rrLockedpostBackCol">#8B0000</item>
<item name="rrLockedpostTextCol">#FFFFFF</item>

<item name="rrPostToolbarCol">#000000</item>

Expand Down Expand Up @@ -387,6 +393,8 @@
<item name="rrFlairTextCol">#444444</item>
<item name="rrGoldBackCol">#FFDF52</item>
<item name="rrGoldTextCol">#000000</item>
<item name="rrLockedpostBackCol">#8B0000</item>
<item name="rrLockedpostTextCol">#FFFFFF</item>

<item name="rrPostToolbarCol">#F2FBFB</item>

Expand Down