mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-12-29 04:17:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set toolbar secondary text color. Fix flairs don't show in some posts.

Browse Source
This commit is contained in:
Alex Ning 2020-06-08 16:36:31 +08:00
parent dd8619e783
commit b8e4ce6e1d
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/BaseActivity.java
View File

@ -185,14 +185,11 @@ public abstract class BaseActivity extends AppCompatActivity {
} }
protected void setToolbarGoToTop(Toolbar toolbar) { protected void setToolbarGoToTop(Toolbar toolbar) {
toolbar.setOnLongClickListener(new View.OnLongClickListener() { toolbar.setOnLongClickListener(view -> {
@Override if (BaseActivity.this instanceof ActivityToolbarInterface) {
public boolean onLongClick(View view) { ((ActivityToolbarInterface) BaseActivity.this).onLongPress();
if (BaseActivity.this instanceof ActivityToolbarInterface) {
((ActivityToolbarInterface) BaseActivity.this).onLongPress();
}
return true;
} }
return true;
}); });
} }
@ -247,6 +244,7 @@ public abstract class BaseActivity extends AppCompatActivity {
protected void applyAppBarLayoutAndToolbarTheme(AppBarLayout appBarLayout, Toolbar toolbar) { protected void applyAppBarLayoutAndToolbarTheme(AppBarLayout appBarLayout, Toolbar toolbar) {
appBarLayout.setBackgroundColor(customThemeWrapper.getColorPrimary()); appBarLayout.setBackgroundColor(customThemeWrapper.getColorPrimary());
toolbar.setTitleTextColor(customThemeWrapper.getToolbarPrimaryTextAndIconColor()); toolbar.setTitleTextColor(customThemeWrapper.getToolbarPrimaryTextAndIconColor());
toolbar.setSubtitleTextColor(customThemeWrapper.getToolbarSecondaryTextColor());
if (toolbar.getNavigationIcon() != null) { if (toolbar.getNavigationIcon() != null) {
toolbar.getNavigationIcon().setColorFilter(customThemeWrapper.getToolbarPrimaryTextAndIconColor(), android.graphics.PorterDuff.Mode.SRC_IN); toolbar.getNavigationIcon().setColorFilter(customThemeWrapper.getToolbarPrimaryTextAndIconColor(), android.graphics.PorterDuff.Mode.SRC_IN);
} }

1
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ThemePreviewActivity.java
View File

@ -337,6 +337,7 @@ public class ThemePreviewActivity extends AppCompatActivity {
protected void applyAppBarLayoutAndToolbarTheme(AppBarLayout appBarLayout, Toolbar toolbar) { protected void applyAppBarLayoutAndToolbarTheme(AppBarLayout appBarLayout, Toolbar toolbar) {
appBarLayout.setBackgroundColor(customTheme.colorPrimary); appBarLayout.setBackgroundColor(customTheme.colorPrimary);
toolbar.setTitleTextColor(customTheme.toolbarPrimaryTextAndIconColor); toolbar.setTitleTextColor(customTheme.toolbarPrimaryTextAndIconColor);
toolbar.setSubtitleTextColor(customTheme.toolbarSecondaryTextColor);
if (toolbar.getNavigationIcon() != null) { if (toolbar.getNavigationIcon() != null) {
toolbar.getNavigationIcon().setColorFilter(customTheme.toolbarPrimaryTextAndIconColor, android.graphics.PorterDuff.Mode.SRC_IN); toolbar.getNavigationIcon().setColorFilter(customTheme.toolbarPrimaryTextAndIconColor, android.graphics.PorterDuff.Mode.SRC_IN);
} }

8
app/src/main/java/ml/docilealligator/infinityforreddit/Post/ParsePost.java
View File

@ -64,6 +64,7 @@ public class ParsePost {
boolean locked = data.getBoolean(JSONUtils.LOCKEC_KEY); boolean locked = data.getBoolean(JSONUtils.LOCKEC_KEY);
boolean saved = data.getBoolean(JSONUtils.SAVED_KEY); boolean saved = data.getBoolean(JSONUtils.SAVED_KEY);
StringBuilder postFlairHTMLBuilder = new StringBuilder(); StringBuilder postFlairHTMLBuilder = new StringBuilder();
String flair = "";
if (data.has(JSONUtils.LINK_FLAIR_RICHTEXT_KEY)) { if (data.has(JSONUtils.LINK_FLAIR_RICHTEXT_KEY)) {
JSONArray flairArray = data.getJSONArray(JSONUtils.LINK_FLAIR_RICHTEXT_KEY); JSONArray flairArray = data.getJSONArray(JSONUtils.LINK_FLAIR_RICHTEXT_KEY);
for (int i = 0; i < flairArray.length(); i++) { for (int i = 0; i < flairArray.length(); i++) {
@ -75,8 +76,13 @@ public class ParsePost {
postFlairHTMLBuilder.append("<img src=\"").append(Html.escapeHtml(flairObject.getString(JSONUtils.U_KEY))).append("\">"); postFlairHTMLBuilder.append("<img src=\"").append(Html.escapeHtml(flairObject.getString(JSONUtils.U_KEY))).append("\">");
} }
} }
flair = postFlairHTMLBuilder.toString();
} }
String flair = postFlairHTMLBuilder.toString();
if (flair.equals("") && data.has(JSONUtils.LINK_FLAIR_TEXT_KEY) && !data.isNull(JSONUtils.LINK_FLAIR_TEXT_KEY)) {
flair = data.getString(JSONUtils.LINK_FLAIR_TEXT_KEY);
}
StringBuilder awardingsBuilder = new StringBuilder(); StringBuilder awardingsBuilder = new StringBuilder();
JSONArray awardingsArray = data.getJSONArray(JSONUtils.ALL_AWARDINGS_KEY); JSONArray awardingsArray = data.getJSONArray(JSONUtils.ALL_AWARDINGS_KEY);
int nAwards = 0; int nAwards = 0;

1
app/src/main/java/ml/docilealligator/infinityforreddit/Utils/JSONUtils.java
View File

@ -23,6 +23,7 @@ public class JSONUtils {
public static final String U_KEY = "u"; public static final String U_KEY = "u";
public static final String LINK_KEY = "link"; public static final String LINK_KEY = "link";
public static final String LINK_AUTHOR_KEY = "link_author"; public static final String LINK_AUTHOR_KEY = "link_author";
public static final String LINK_FLAIR_TEXT_KEY = "link_flair_text";
public static final String LINK_FLAIR_RICHTEXT_KEY = "link_flair_richtext"; public static final String LINK_FLAIR_RICHTEXT_KEY = "link_flair_richtext";
public static final String SCORE_KEY = "score"; public static final String SCORE_KEY = "score";
public static final String LIKES_KEY = "likes"; public static final String LIKES_KEY = "likes";