From b7824d2abc2e2741d2f801ca0ac57c53214dc6aa Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Wed, 8 Apr 2020 19:55:27 +0800 Subject: Fix comments refreshing bug. Fix some custom theme issues. --- .../infinityforreddit/Activity/PostImageActivity.java | 6 +++--- .../infinityforreddit/Activity/PostLinkActivity.java | 6 +++--- .../infinityforreddit/Activity/PostTextActivity.java | 6 +++--- .../infinityforreddit/Activity/PostVideoActivity.java | 6 +++--- .../infinityforreddit/Activity/ViewPostDetailActivity.java | 2 +- .../Adapter/CommentAndPostRecyclerViewAdapter.java | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'app/src/main/java/ml/docilealligator') diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostImageActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostImageActivity.java index 620312f1..12d06132 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostImageActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostImageActivity.java @@ -393,9 +393,9 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor(); nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor(); nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor(); - flairTextView.setTextColor(flairTextColor); - spoilerTextView.setTextColor(spoilerTextColor); - nsfwTextView.setTextColor(nsfwTextColor); + flairTextView.setTextColor(primaryTextColor); + spoilerTextView.setTextColor(primaryTextColor); + nsfwTextView.setTextColor(primaryTextColor); titleEditText.setTextColor(primaryTextColor); titleEditText.setHintTextColor(secondaryTextColor); applyFABTheme(captureFab); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostLinkActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostLinkActivity.java index 9bc1b118..133d4f7d 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostLinkActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostLinkActivity.java @@ -332,9 +332,9 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor(); nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor(); nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor(); - flairTextView.setTextColor(flairTextColor); - spoilerTextView.setTextColor(spoilerTextColor); - nsfwTextView.setTextColor(nsfwTextColor); + flairTextView.setTextColor(primaryTextColor); + spoilerTextView.setTextColor(primaryTextColor); + nsfwTextView.setTextColor(primaryTextColor); titleEditText.setTextColor(primaryTextColor); titleEditText.setHintTextColor(secondaryTextColor); linkEditText.setTextColor(primaryTextColor); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostTextActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostTextActivity.java index bfce0c95..75debb2c 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostTextActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostTextActivity.java @@ -336,9 +336,9 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor(); nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor(); nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor(); - flairTextView.setTextColor(flairTextColor); - spoilerTextView.setTextColor(spoilerTextColor); - nsfwTextView.setTextColor(nsfwTextColor); + flairTextView.setTextColor(primaryTextColor); + spoilerTextView.setTextColor(primaryTextColor); + nsfwTextView.setTextColor(primaryTextColor); titleEditText.setTextColor(primaryTextColor); titleEditText.setHintTextColor(secondaryTextColor); contentEditText.setTextColor(primaryTextColor); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostVideoActivity.java index 0b2c3b7c..dc590b4e 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostVideoActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostVideoActivity.java @@ -398,9 +398,9 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor(); nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor(); nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor(); - flairTextView.setTextColor(flairTextColor); - spoilerTextView.setTextColor(spoilerTextColor); - nsfwTextView.setTextColor(nsfwTextColor); + flairTextView.setTextColor(primaryTextColor); + spoilerTextView.setTextColor(primaryTextColor); + nsfwTextView.setTextColor(primaryTextColor); titleEditText.setTextColor(primaryTextColor); titleEditText.setHintTextColor(secondaryTextColor); applyFABTheme(captureFab); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java index a8de3b71..92d04927 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java @@ -850,7 +850,7 @@ public class ViewPostDetailActivity extends BaseActivity implements FlairBottomS } void fetchMoreComments() { - if (isLoadingMoreChildren || !loadMoreChildrenSuccess) { + if (isFetchingComments || isLoadingMoreChildren || !loadMoreChildrenSuccess) { return; } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java index f9b4e22b..aad2f712 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java @@ -1524,7 +1524,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter comments, boolean hasMoreComments) { + public void addComments(@NonNull ArrayList comments, boolean hasMoreComments) { if (mVisibleComments.size() == 0) { isInitiallyLoading = false; isInitiallyLoadingFailed = false; -- cgit v1.2.3