mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-11-07 19:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix comments refreshing bug. Fix some custom theme issues.

Browse Source
This commit is contained in:
Alex Ning 2020-04-08 19:55:27 +08:00
parent 2c36d46cd0
commit b7824d2abc
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostImageActivity.java
View File

@ -393,9 +393,9 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor(); spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor();
nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor(); nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor(); nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
flairTextView.setTextColor(flairTextColor); flairTextView.setTextColor(primaryTextColor);
spoilerTextView.setTextColor(spoilerTextColor); spoilerTextView.setTextColor(primaryTextColor);
nsfwTextView.setTextColor(nsfwTextColor); nsfwTextView.setTextColor(primaryTextColor);
titleEditText.setTextColor(primaryTextColor); titleEditText.setTextColor(primaryTextColor);
titleEditText.setHintTextColor(secondaryTextColor); titleEditText.setHintTextColor(secondaryTextColor);
applyFABTheme(captureFab); applyFABTheme(captureFab);

6
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostLinkActivity.java
View File

@ -332,9 +332,9 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor(); spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor();
nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor(); nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor(); nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
flairTextView.setTextColor(flairTextColor); flairTextView.setTextColor(primaryTextColor);
spoilerTextView.setTextColor(spoilerTextColor); spoilerTextView.setTextColor(primaryTextColor);
nsfwTextView.setTextColor(nsfwTextColor); nsfwTextView.setTextColor(primaryTextColor);
titleEditText.setTextColor(primaryTextColor); titleEditText.setTextColor(primaryTextColor);
titleEditText.setHintTextColor(secondaryTextColor); titleEditText.setHintTextColor(secondaryTextColor);
linkEditText.setTextColor(primaryTextColor); linkEditText.setTextColor(primaryTextColor);

6
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostTextActivity.java
View File

@ -336,9 +336,9 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr
spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor(); spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor();
nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor(); nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor(); nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
flairTextView.setTextColor(flairTextColor); flairTextView.setTextColor(primaryTextColor);
spoilerTextView.setTextColor(spoilerTextColor); spoilerTextView.setTextColor(primaryTextColor);
nsfwTextView.setTextColor(nsfwTextColor); nsfwTextView.setTextColor(primaryTextColor);
titleEditText.setTextColor(primaryTextColor); titleEditText.setTextColor(primaryTextColor);
titleEditText.setHintTextColor(secondaryTextColor); titleEditText.setHintTextColor(secondaryTextColor);
contentEditText.setTextColor(primaryTextColor); contentEditText.setTextColor(primaryTextColor);

6
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostVideoActivity.java
View File

@ -398,9 +398,9 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF
spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor(); spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor();
nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor(); nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor(); nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
flairTextView.setTextColor(flairTextColor); flairTextView.setTextColor(primaryTextColor);
spoilerTextView.setTextColor(spoilerTextColor); spoilerTextView.setTextColor(primaryTextColor);
nsfwTextView.setTextColor(nsfwTextColor); nsfwTextView.setTextColor(primaryTextColor);
titleEditText.setTextColor(primaryTextColor); titleEditText.setTextColor(primaryTextColor);
titleEditText.setHintTextColor(secondaryTextColor); titleEditText.setHintTextColor(secondaryTextColor);
applyFABTheme(captureFab); applyFABTheme(captureFab);

2
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java
View File

@ -850,7 +850,7 @@ public class ViewPostDetailActivity extends BaseActivity implements FlairBottomS
} }
void fetchMoreComments() { void fetchMoreComments() {
if (isLoadingMoreChildren || !loadMoreChildrenSuccess) { if (isFetchingComments || isLoadingMoreChildren || !loadMoreChildrenSuccess) {
return; return;
} }

2
app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
View File

@ -1524,7 +1524,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
} }
} }
public void addComments(ArrayList<CommentData> comments, boolean hasMoreComments) { public void addComments(@NonNull ArrayList<CommentData> comments, boolean hasMoreComments) {
if (mVisibleComments.size() == 0) { if (mVisibleComments.size() == 0) {
isInitiallyLoading = false; isInitiallyLoading = false;
isInitiallyLoadingFailed = false; isInitiallyLoadingFailed = false;