diff options
Diffstat (limited to 'app/src')
8 files changed, 38 insertions, 1 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CommentActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CommentActivity.java index 072b5163..3dfb6298 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CommentActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CommentActivity.java @@ -237,7 +237,9 @@ public class CommentActivity extends BaseActivity { commentParentMarkwonView.setTextColor(mCustomThemeWrapper.getCommentColor()); divider.setBackgroundColor(mCustomThemeWrapper.getDividerColor()); commentEditText.setTextColor(mCustomThemeWrapper.getCommentColor()); - markdownColor = mCustomThemeWrapper.getSecondaryTextColor(); + int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor(); + commentEditText.setHintTextColor(secondaryTextColor); + markdownColor = secondaryTextColor; } private void getCurrentAccount() { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CreateMultiRedditActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CreateMultiRedditActivity.java index be346485..b564a3a3 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CreateMultiRedditActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CreateMultiRedditActivity.java @@ -215,13 +215,17 @@ public class CreateMultiRedditActivity extends BaseActivity { @Override protected void applyCustomTheme() { + coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor()); applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar); int primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor(); + int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor(); nameEditText.setTextColor(primaryTextColor); + nameEditText.setHintTextColor(secondaryTextColor); int dividerColor = mCustomThemeWrapper.getDividerColor(); divider1.setBackgroundColor(dividerColor); divider2.setBackgroundColor(dividerColor); descriptionEditText.setTextColor(primaryTextColor); + descriptionEditText.setHintTextColor(secondaryTextColor); visibilityTextView.setTextColor(primaryTextColor); selectSubredditTextView.setTextColor(primaryTextColor); } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/EditMultiRedditActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/EditMultiRedditActivity.java index d914b236..de8c71a9 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/EditMultiRedditActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/EditMultiRedditActivity.java @@ -249,14 +249,18 @@ public class EditMultiRedditActivity extends BaseActivity { @Override protected void applyCustomTheme() { + coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor()); applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar); progressBar.setIndeterminateTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorAccent())); int primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor(); + int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor(); nameEditText.setTextColor(primaryTextColor); + nameEditText.setHintTextColor(secondaryTextColor); int dividerColor = mCustomThemeWrapper.getDividerColor(); divider1.setBackgroundColor(dividerColor); divider2.setBackgroundColor(dividerColor); descriptionEditText.setTextColor(primaryTextColor); + descriptionEditText.setHintTextColor(secondaryTextColor); visibilityTextView.setTextColor(primaryTextColor); selectSubredditTextView.setTextColor(primaryTextColor); } 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 9b2f1dfd..620312f1 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostImageActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostImageActivity.java @@ -378,6 +378,8 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF protected void applyCustomTheme() { coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor()); applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar); + int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor(); + subredditNameTextView.setTextColor(secondaryTextColor); rulesButton.setTextColor(mCustomThemeWrapper.getButtonTextColor()); rulesButton.setBackgroundTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorPrimaryLightTheme())); int dividerColor = mCustomThemeWrapper.getDividerColor(); @@ -391,7 +393,11 @@ 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); titleEditText.setTextColor(primaryTextColor); + titleEditText.setHintTextColor(secondaryTextColor); applyFABTheme(captureFab); applyFABTheme(selectFromLibraryFab); selectAgainTextView.setTextColor(mCustomThemeWrapper.getColorAccent()); 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 eafc4a67..9bc1b118 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostLinkActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostLinkActivity.java @@ -317,6 +317,8 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr protected void applyCustomTheme() { coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor()); applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar); + int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor(); + subredditNameTextView.setTextColor(secondaryTextColor); rulesButton.setTextColor(mCustomThemeWrapper.getButtonTextColor()); rulesButton.setBackgroundTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorPrimaryLightTheme())); int dividerColor = mCustomThemeWrapper.getDividerColor(); @@ -330,8 +332,13 @@ 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); titleEditText.setTextColor(primaryTextColor); + titleEditText.setHintTextColor(secondaryTextColor); linkEditText.setTextColor(primaryTextColor); + linkEditText.setHintTextColor(secondaryTextColor); } private void getCurrentAccount() { 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 1ff0a84c..bfce0c95 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostTextActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostTextActivity.java @@ -321,6 +321,8 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr protected void applyCustomTheme() { coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor()); applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar); + int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor(); + subredditNameTextView.setTextColor(secondaryTextColor); rulesButton.setTextColor(mCustomThemeWrapper.getButtonTextColor()); rulesButton.setBackgroundTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorPrimaryLightTheme())); int dividerColor = mCustomThemeWrapper.getDividerColor(); @@ -334,8 +336,13 @@ 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); titleEditText.setTextColor(primaryTextColor); + titleEditText.setHintTextColor(secondaryTextColor); contentEditText.setTextColor(primaryTextColor); + contentEditText.setHintTextColor(secondaryTextColor); } private void getCurrentAccount() { 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 50a06878..0b2c3b7c 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostVideoActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostVideoActivity.java @@ -383,6 +383,8 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF protected void applyCustomTheme() { coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor()); applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar); + int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor(); + subredditNameTextView.setTextColor(secondaryTextColor); rulesButton.setTextColor(mCustomThemeWrapper.getButtonTextColor()); rulesButton.setBackgroundTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorPrimaryLightTheme())); int dividerColor = mCustomThemeWrapper.getDividerColor(); @@ -396,7 +398,11 @@ 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); titleEditText.setTextColor(primaryTextColor); + titleEditText.setHintTextColor(secondaryTextColor); applyFABTheme(captureFab); applyFABTheme(selectFromLibraryFab); selectAgainTextView.setTextColor(mCustomThemeWrapper.getColorAccent()); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SubscribedSubredditsRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SubscribedSubredditsRecyclerViewAdapter.java index bd01c64d..3f503fea 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SubscribedSubredditsRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/SubscribedSubredditsRecyclerViewAdapter.java @@ -154,6 +154,7 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte ((SubredditViewHolder) viewHolder).favoriteImageView.setVisibility(View.GONE); name = username; iconUrl = userIconUrl; + viewHolder.itemView.setOnClickListener(view -> itemClickListener.onClick(name, iconUrl, true)); } else if (hasClearSelectionRow && viewHolder.getAdapterPosition() == 1) { ((SubredditViewHolder) viewHolder).favoriteImageView.setVisibility(View.GONE); name = username; |