diff options
290 files changed, 756 insertions, 553 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizePostFilterActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizePostFilterActivity.java index ca56bcdf..c4b93a34 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizePostFilterActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizePostFilterActivity.java @@ -264,22 +264,22 @@ public class CustomizePostFilterActivity extends BaseActivity { binding.postTypeCardViewCustomizePostFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor); binding.postTypeExplanationTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor); - binding.postTypeTextTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_text_24dp, primaryIconColor), null, null, null); + binding.postTypeTextTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_text_day_night_24dp, primaryIconColor), null, null, null); binding.postTypeTextTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor); - binding.postTypeLinkTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_link, primaryIconColor), null, null, null); + binding.postTypeLinkTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_link_day_night_24dp, primaryIconColor), null, null, null); binding.postTypeLinkTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor); - binding.postTypeImageTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_image_24dp, primaryIconColor), null, null, null); + binding.postTypeImageTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_image_day_night_24dp, primaryIconColor), null, null, null); binding.postTypeImageTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor); - binding.postTypeGifTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_image_24dp, primaryIconColor), null, null, null); + binding.postTypeGifTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_image_day_night_24dp, primaryIconColor), null, null, null); binding.postTypeGifTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor); - binding.postTypeVideoTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_outline_video_24dp, primaryIconColor), null, null, null); + binding.postTypeVideoTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_video_day_night_24dp, primaryIconColor), null, null, null); binding.postTypeVideoTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor); - binding.postTypeGalleryTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_gallery_24dp, primaryIconColor), null, null, null); + binding.postTypeGalleryTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_gallery_day_night_24dp, primaryIconColor), null, null, null); binding.postTypeGalleryTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor); binding.onlyNsfwSpoilerCardViewCustomizePostFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor); binding.onlyNsfwSpoilerExplanationTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor); - binding.onlyNsfwTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_nsfw_on_24dp, primaryIconColor), null, null, null); + binding.onlyNsfwTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_nsfw_on_day_night_24dp, primaryIconColor), null, null, null); binding.onlyNsfwTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor); binding.onlySpoilerTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_spoiler_black_24dp, primaryIconColor), null, null, null); binding.onlySpoilerTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LoginActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LoginActivity.java index 99d134dd..3d20da35 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LoginActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LoginActivity.java @@ -288,7 +288,7 @@ public class LoginActivity extends BaseActivity { binding.getRoot().setBackgroundColor(mCustomThemeWrapper.getBackgroundColor()); applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(binding.appbarLayoutLoginActivity, null, binding.toolbarLoginActivity); binding.twoFaInfOTextViewLoginActivity.setTextColor(mCustomThemeWrapper.getPrimaryTextColor()); - Drawable infoDrawable = Utils.getTintedDrawable(this, R.drawable.ic_info_preference_24dp, mCustomThemeWrapper.getPrimaryIconColor()); + Drawable infoDrawable = Utils.getTintedDrawable(this, R.drawable.ic_info_preference_day_night_24dp, mCustomThemeWrapper.getPrimaryIconColor()); binding.twoFaInfOTextViewLoginActivity.setCompoundDrawablesWithIntrinsicBounds(infoDrawable, null, null, null); applyFABTheme(binding.fabLoginActivity); if (typeface != null) { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/MainActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/MainActivity.java index e49ec447..64f28a26 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/MainActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/MainActivity.java @@ -510,43 +510,43 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb private int getBottomAppBarOptionDrawableResource(int option) { switch (option) { case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_SUBSCRIPTIONS: - return R.drawable.ic_subscritptions_bottom_app_bar_24dp; + return R.drawable.ic_subscriptions_bottom_app_bar_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_MULTIREDDITS: - return R.drawable.ic_multi_reddit_24dp; + return R.drawable.ic_multi_reddit_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_INBOX: - return R.drawable.ic_inbox_24dp; + return R.drawable.ic_inbox_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_SUBMIT_POSTS: return R.drawable.ic_add_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_REFRESH: - return R.drawable.ic_refresh_24dp; + return R.drawable.ic_refresh_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_CHANGE_SORT_TYPE: return R.drawable.ic_sort_toolbar_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_CHANGE_POST_LAYOUT: - return R.drawable.ic_post_layout_24dp; + return R.drawable.ic_post_layout_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_SEARCH: - return R.drawable.ic_search_24dp; + return R.drawable.ic_search_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_GO_TO_SUBREDDIT: - return R.drawable.ic_subreddit_24dp; + return R.drawable.ic_subreddit_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_GO_TO_USER: - return R.drawable.ic_user_24dp; + return R.drawable.ic_user_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_RANDOM: - return R.drawable.ic_random_24dp; + return R.drawable.ic_random_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_HIDE_READ_POSTS: - return R.drawable.ic_hide_read_posts_24dp; + return R.drawable.ic_hide_read_posts_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_FILTER_POSTS: - return R.drawable.ic_filter_24dp; + return R.drawable.ic_filter_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_UPVOTED: - return R.drawable.ic_arrow_upward_black_24dp; + return R.drawable.ic_arrow_upward_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_DOWNVOTED: - return R.drawable.ic_arrow_downward_black_24dp; + return R.drawable.ic_arrow_downward_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_HIDDEN: - return R.drawable.ic_outline_lock_24dp; + return R.drawable.ic_lock_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_SAVED: - return R.drawable.ic_outline_bookmarks_24dp; + return R.drawable.ic_bookmarks_day_night_24dp; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_GO_TO_TOP: - return R.drawable.ic_keyboard_double_arrow_up_24; + return R.drawable.ic_keyboard_double_arrow_up_day_night_24dp; default: - return R.drawable.ic_account_circle_24dp; + return R.drawable.ic_account_circle_day_night_24dp; } } @@ -647,7 +647,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_SUBMIT_POSTS); switch (fabOption) { case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_REFRESH: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_refresh_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_refresh_day_night_24dp); navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_refresh)); break; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_CHANGE_SORT_TYPE: @@ -655,46 +655,46 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_change_sort_type)); break; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_CHANGE_POST_LAYOUT: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_post_layout_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_post_layout_day_night_24dp); navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_change_post_layout)); break; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_SEARCH: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_search_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_search_day_night_24dp); navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_search)); break; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_GO_TO_SUBREDDIT: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_subreddit_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_subreddit_day_night_24dp); navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_go_to_subreddit)); break; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_GO_TO_USER: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_user_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_user_day_night_24dp); navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_go_to_user)); break; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_RANDOM: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_random_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_random_day_night_24dp); navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_random)); break; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_HIDE_READ_POSTS: if (accountName.equals(Account.ANONYMOUS_ACCOUNT)) { - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp); fabOption = SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_FILTER_POSTS; navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_filter_posts)); } else { - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_hide_read_posts_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_hide_read_posts_day_night_24dp); navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_hide_read_posts)); } break; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_FILTER_POSTS: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp); navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_filter_posts)); break; case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_GO_TO_TOP: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_keyboard_double_arrow_up_24); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_keyboard_double_arrow_up_day_night_24dp); navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_go_to_top)); break; default: if (accountName.equals(Account.ANONYMOUS_ACCOUNT)) { - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp); fabOption = SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_FILTER_POSTS; navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_filter_posts)); } else { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchResultActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchResultActivity.java index 77c59575..9685630f 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchResultActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchResultActivity.java @@ -279,43 +279,43 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect fabOption = bottomAppBarSharedPreference.getInt(SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB, SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_SUBMIT_POSTS); switch (fabOption) { case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_REFRESH: - binding.fabSearchResultActivity.setImageResource(R.drawable.ic_refresh_24dp); + binding.fabSearchResultActivity.setImageResource(R.drawable.ic_refresh_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_CHANGE_SORT_TYPE: binding.fabSearchResultActivity.setImageResource(R.drawable.ic_sort_toolbar_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_CHANGE_POST_LAYOUT: - binding.fabSearchResultActivity.setImageResource(R.drawable.ic_post_layout_24dp); + binding.fabSearchResultActivity.setImageResource(R.drawable.ic_post_layout_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_SEARCH: - binding.fabSearchResultActivity.setImageResource(R.drawable.ic_search_24dp); + binding.fabSearchResultActivity.setImageResource(R.drawable.ic_search_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_SUBREDDIT: - binding.fabSearchResultActivity.setImageResource(R.drawable.ic_subreddit_24dp); + binding.fabSearchResultActivity.setImageResource(R.drawable.ic_subreddit_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_USER: - binding.fabSearchResultActivity.setImageResource(R.drawable.ic_user_24dp); + binding.fabSearchResultActivity.setImageResource(R.drawable.ic_user_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_RANDOM: - binding.fabSearchResultActivity.setImageResource(R.drawable.ic_random_24dp); + binding.fabSearchResultActivity.setImageResource(R.drawable.ic_random_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_HIDE_READ_POSTS: if (accountName.equals(Account.ANONYMOUS_ACCOUNT)) { - binding.fabSearchResultActivity.setImageResource(R.drawable.ic_filter_24dp); + binding.fabSearchResultActivity.setImageResource(R.drawable.ic_filter_day_night_24dp); fabOption = SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS; } else { - binding.fabSearchResultActivity.setImageResource(R.drawable.ic_hide_read_posts_24dp); + binding.fabSearchResultActivity.setImageResource(R.drawable.ic_hide_read_posts_day_night_24dp); } break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS: - binding.fabSearchResultActivity.setImageResource(R.drawable.ic_filter_24dp); + binding.fabSearchResultActivity.setImageResource(R.drawable.ic_filter_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_TOP: - binding.fabSearchResultActivity.setImageResource(R.drawable.ic_keyboard_double_arrow_up_24); + binding.fabSearchResultActivity.setImageResource(R.drawable.ic_keyboard_double_arrow_up_day_night_24dp); break; default: if (accountName.equals(Account.ANONYMOUS_ACCOUNT)) { - binding.fabSearchResultActivity.setImageResource(R.drawable.ic_filter_24dp); + binding.fabSearchResultActivity.setImageResource(R.drawable.ic_filter_day_night_24dp); fabOption = SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS; } else { binding.fabSearchResultActivity.setImageResource(R.drawable.ic_add_day_night_24dp); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubmitCrosspostActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubmitCrosspostActivity.java index 956f8d05..df885e2c 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubmitCrosspostActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubmitCrosspostActivity.java @@ -254,7 +254,7 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom binding.playButtonImageViewSubmitCrosspostActivity.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_play_circle_36dp)); } else if (post.getPostType() == Post.GALLERY_TYPE) { binding.playButtonImageViewSubmitCrosspostActivity.setVisibility(View.VISIBLE); - binding.playButtonImageViewSubmitCrosspostActivity.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_gallery_24dp)); + binding.playButtonImageViewSubmitCrosspostActivity.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_gallery_day_night_24dp)); } } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewMultiRedditDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewMultiRedditDetailActivity.java index 47425b0a..436b1184 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewMultiRedditDetailActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewMultiRedditDetailActivity.java @@ -308,43 +308,43 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT fabOption = bottomAppBarSharedPreference.getInt(SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB, SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_SUBMIT_POSTS); switch (fabOption) { case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_REFRESH: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_refresh_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_refresh_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_CHANGE_SORT_TYPE: navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_sort_toolbar_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_CHANGE_POST_LAYOUT: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_post_layout_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_post_layout_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_SEARCH: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_search_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_search_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_SUBREDDIT: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_subreddit_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_subreddit_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_USER: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_user_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_user_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_RANDOM: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_random_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_random_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_HIDE_READ_POSTS: if (accountName.equals(Account.ANONYMOUS_ACCOUNT)) { - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp); fabOption = SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS; } else { - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_hide_read_posts_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_hide_read_posts_day_night_24dp); } break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_TOP: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_keyboard_double_arrow_up_24); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_keyboard_double_arrow_up_day_night_24dp); break; default: if (accountName.equals(Account.ANONYMOUS_ACCOUNT)) { - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp); fabOption = SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS; } else { navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_add_day_night_24dp); @@ -529,45 +529,45 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT private int getBottomAppBarOptionDrawableResource(int option) { switch (option) { case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_HOME: - return R.drawable.ic_home_black_24dp; + return R.drawable.ic_home_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_SUBSCRIPTIONS: - return R.drawable.ic_subscritptions_bottom_app_bar_24dp; + return R.drawable.ic_subscriptions_bottom_app_bar_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_INBOX: - return R.drawable.ic_inbox_24dp; + return R.drawable.ic_inbox_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_MULTIREDDITS: - return R.drawable.ic_multi_reddit_24dp; + return R.drawable.ic_multi_reddit_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_SUBMIT_POSTS: return R.drawable.ic_add_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_REFRESH: - return R.drawable.ic_refresh_24dp; + return R.drawable.ic_refresh_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_CHANGE_SORT_TYPE: return R.drawable.ic_sort_toolbar_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_CHANGE_POST_LAYOUT: - return R.drawable.ic_post_layout_24dp; + return R.drawable.ic_post_layout_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_SEARCH: - return R.drawable.ic_search_24dp; + return R.drawable.ic_search_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_GO_TO_SUBREDDIT: - return R.drawable.ic_subreddit_24dp; + return R.drawable.ic_subreddit_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_GO_TO_USER: - return R.drawable.ic_user_24dp; + return R.drawable.ic_user_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_RANDOM: - return R.drawable.ic_random_24dp; + return R.drawable.ic_random_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_HIDE_READ_POSTS: - return R.drawable.ic_hide_read_posts_24dp; + return R.drawable.ic_hide_read_posts_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_FILTER_POSTS: - return R.drawable.ic_filter_24dp; + return R.drawable.ic_filter_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_UPVOTED: - return R.drawable.ic_arrow_upward_black_24dp; + return R.drawable.ic_arrow_upward_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_DOWNVOTED: - return R.drawable.ic_arrow_downward_black_24dp; + return R.drawable.ic_arrow_downward_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_HIDDEN: - return R.drawable.ic_outline_lock_24dp; + return R.drawable.ic_lock_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_SAVED: - return R.drawable.ic_outline_bookmarks_24dp; + return R.drawable.ic_bookmarks_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_GO_TO_TOP: - return R.drawable.ic_keyboard_double_arrow_up_24; + return R.drawable.ic_keyboard_double_arrow_up_day_night_24dp; default: - return R.drawable.ic_account_circle_24dp; + return R.drawable.ic_account_circle_day_night_24dp; } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java index 25869ef0..a13b6e3e 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java @@ -703,45 +703,45 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp private int getBottomAppBarOptionDrawableResource(int option) { switch (option) { case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_HOME: - return R.drawable.ic_home_black_24dp; + return R.drawable.ic_home_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_SUBSCRIPTIONS: - return R.drawable.ic_subscritptions_bottom_app_bar_24dp; + return R.drawable.ic_subscriptions_bottom_app_bar_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_INBOX: - return R.drawable.ic_inbox_24dp; + return R.drawable.ic_inbox_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_MULTIREDDITS: - return R.drawable.ic_multi_reddit_24dp; + return R.drawable.ic_multi_reddit_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_SUBMIT_POSTS: return R.drawable.ic_add_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_REFRESH: - return R.drawable.ic_refresh_24dp; + return R.drawable.ic_refresh_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_CHANGE_SORT_TYPE: return R.drawable.ic_sort_toolbar_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_CHANGE_POST_LAYOUT: - return R.drawable.ic_post_layout_24dp; + return R.drawable.ic_post_layout_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_SEARCH: - return R.drawable.ic_search_24dp; + return R.drawable.ic_search_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_GO_TO_SUBREDDIT: - return R.drawable.ic_subreddit_24dp; + return R.drawable.ic_subreddit_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_GO_TO_USER: - return R.drawable.ic_user_24dp; + return R.drawable.ic_user_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_RANDOM: - return R.drawable.ic_random_24dp; + return R.drawable.ic_random_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_HIDE_READ_POSTS: - return R.drawable.ic_hide_read_posts_24dp; + return R.drawable.ic_hide_read_posts_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_FILTER_POSTS: - return R.drawable.ic_filter_24dp; + return R.drawable.ic_filter_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_UPVOTED: - return R.drawable.ic_arrow_upward_black_24dp; + return R.drawable.ic_arrow_upward_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_DOWNVOTED: - return R.drawable.ic_arrow_downward_black_24dp; + return R.drawable.ic_arrow_downward_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_HIDDEN: - return R.drawable.ic_outline_lock_24dp; + return R.drawable.ic_lock_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_SAVED: - return R.drawable.ic_outline_bookmarks_24dp; + return R.drawable.ic_bookmarks_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_GO_TO_TOP: - return R.drawable.ic_keyboard_double_arrow_up_24; + return R.drawable.ic_keyboard_double_arrow_up_day_night_24dp; default: - return R.drawable.ic_account_circle_24dp; + return R.drawable.ic_account_circle_day_night_24dp; } } @@ -851,43 +851,43 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp fabOption = mBottomAppBarSharedPreference.getInt((accountName.equals(Account.ANONYMOUS_ACCOUNT) ? Account.ANONYMOUS_ACCOUNT : "") + SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB, SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_SUBMIT_POSTS); switch (fabOption) { case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_REFRESH: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_refresh_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_refresh_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_CHANGE_SORT_TYPE: navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_sort_toolbar_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_CHANGE_POST_LAYOUT: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_post_layout_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_post_layout_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_SEARCH: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_search_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_search_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_SUBREDDIT: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_subreddit_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_subreddit_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_USER: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_user_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_user_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_RANDOM: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_random_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_random_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_HIDE_READ_POSTS: if (accountName.equals(Account.ANONYMOUS_ACCOUNT)) { - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp); fabOption = SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS; } else { - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_hide_read_posts_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_hide_read_posts_day_night_24dp); } break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_TOP: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_keyboard_double_arrow_up_24); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_keyboard_double_arrow_up_day_night_24dp); break; default: if (accountName.equals(Account.ANONYMOUS_ACCOUNT)) { - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp); fabOption = SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS; } else { navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_add_day_night_24dp); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewUserDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewUserDetailActivity.java index c0984cbe..c9c819a8 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewUserDetailActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewUserDetailActivity.java @@ -801,43 +801,43 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele fabOption = mBottomAppBarSharedPreference.getInt((accountName.equals(Account.ANONYMOUS_ACCOUNT) ? Account.ANONYMOUS_ACCOUNT : "") + SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB, SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_SUBMIT_POSTS); switch (fabOption) { case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_REFRESH: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_refresh_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_refresh_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_CHANGE_SORT_TYPE: navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_sort_toolbar_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_CHANGE_POST_LAYOUT: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_post_layout_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_post_layout_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_SEARCH: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_search_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_search_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_SUBREDDIT: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_subreddit_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_subreddit_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_USER: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_user_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_user_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_RANDOM: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_random_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_random_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_HIDE_READ_POSTS: if (accountName.equals(Account.ANONYMOUS_ACCOUNT)) { - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp); fabOption = SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS; } else { - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_hide_read_posts_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_hide_read_posts_day_night_24dp); } break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp); break; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_TOP: - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_keyboard_double_arrow_up_24); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_keyboard_double_arrow_up_day_night_24dp); break; default: if (accountName.equals(Account.ANONYMOUS_ACCOUNT)) { - navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp); + navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp); fabOption = SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS; } else { navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_add_day_night_24dp); @@ -1019,45 +1019,45 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele private int getBottomAppBarOptionDrawableResource(int option) { switch (option) { case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_HOME: - return R.drawable.ic_home_black_24dp; + return R.drawable.ic_home_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_SUBSCRIPTIONS: - return R.drawable.ic_subscritptions_bottom_app_bar_24dp; + return R.drawable.ic_subscriptions_bottom_app_bar_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_INBOX: - return R.drawable.ic_inbox_24dp; + return R.drawable.ic_inbox_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_MULTIREDDITS: - return R.drawable.ic_multi_reddit_24dp; + return R.drawable.ic_multi_reddit_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_SUBMIT_POSTS: return R.drawable.ic_add_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_REFRESH: - return R.drawable.ic_refresh_24dp; + return R.drawable.ic_refresh_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_CHANGE_SORT_TYPE: return R.drawable.ic_sort_toolbar_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_CHANGE_POST_LAYOUT: - return R.drawable.ic_post_layout_24dp; + return R.drawable.ic_post_layout_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_SEARCH: - return R.drawable.ic_search_24dp; + return R.drawable.ic_search_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_GO_TO_SUBREDDIT: - return R.drawable.ic_subreddit_24dp; + return R.drawable.ic_subreddit_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_GO_TO_USER: - return R.drawable.ic_user_24dp; + return R.drawable.ic_user_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_RANDOM: - return R.drawable.ic_random_24dp; + return R.drawable.ic_random_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_HIDE_READ_POSTS: - return R.drawable.ic_hide_read_posts_24dp; + return R.drawable.ic_hide_read_posts_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_FILTER_POSTS: - return R.drawable.ic_filter_24dp; + return R.drawable.ic_filter_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_UPVOTED: - return R.drawable.ic_arrow_upward_black_24dp; + return R.drawable.ic_arrow_upward_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_DOWNVOTED: - return R.drawable.ic_arrow_downward_black_24dp; + return R.drawable.ic_arrow_downward_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_HIDDEN: - return R.drawable.ic_outline_lock_24dp; + return R.drawable.ic_lock_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_SAVED: - return R.drawable.ic_outline_bookmarks_24dp; + return R.drawable.ic_bookmarks_day_night_24dp; case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_GO_TO_TOP: - return R.drawable.ic_keyboard_double_arrow_up_24; + return R.drawable.ic_keyboard_double_arrow_up_day_night_24dp; default: - return R.drawable.ic_account_circle_24dp; + return R.drawable.ic_account_circle_day_night_24dp; } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/HistoryPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/HistoryPostRecyclerViewAdapter.java index 5cda5a7f..bab066b1 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/HistoryPostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/HistoryPostRecyclerViewAdapter.java @@ -850,29 +850,29 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy ((PostWithPreviewTypeViewHolder) holder).binding.linkTextViewItemPostWithPreview.setText(domain); if (post.getPostType() == Post.NO_PREVIEW_LINK_TYPE) { ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setVisibility(View.VISIBLE); - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_link); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } } if (mDataSavingMode && mDisableImagePreview) { ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setVisibility(View.VISIBLE); if (post.getPostType() == Post.VIDEO_TYPE) { - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostWithPreviewTypeViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostWithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.IMAGE_TYPE || post.getPostType() == Post.GIF_TYPE) { - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostWithPreviewTypeViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostWithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.LINK_TYPE) { - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_link); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } } else if (mDataSavingMode && mOnlyDisablePreviewInVideoAndGifPosts && (post.getPostType() == Post.VIDEO_TYPE || post.getPostType() == Post.GIF_TYPE)) { ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setVisibility(View.VISIBLE); - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostWithPreviewTypeViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostWithPreview.setVisibility(View.GONE); } else { if (post.getPostType() == Post.GIF_TYPE && ((post.isNSFW() && mNeedBlurNsfw && !(mAutoplay && mAutoplayNsfwVideos)) || (post.isSpoiler() && mNeedBlurSpoiler))) { ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setVisibility(View.VISIBLE); - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostWithPreviewTypeViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostWithPreview.setVisibility(View.GONE); } else { Post.Preview preview = getSuitablePreview(post.getPreviews()); @@ -898,15 +898,15 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy } else { ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setVisibility(View.VISIBLE); if (post.getPostType() == Post.VIDEO_TYPE) { - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostWithPreviewTypeViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostWithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.IMAGE_TYPE || post.getPostType() == Post.GIF_TYPE) { - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostWithPreviewTypeViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostWithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.LINK_TYPE) { - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_link); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } else if (post.getPostType() == Post.GALLERY_TYPE) { - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_gallery_24dp); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_gallery_day_night_24dp); } } } @@ -914,7 +914,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy } else if (holder instanceof PostBaseGalleryTypeViewHolder) { if (mDataSavingMode && mDisableImagePreview) { ((PostBaseGalleryTypeViewHolder) holder).noPreviewImageView.setVisibility(View.VISIBLE); - ((PostBaseGalleryTypeViewHolder) holder).noPreviewImageView.setImageResource(R.drawable.ic_gallery_24dp); + ((PostBaseGalleryTypeViewHolder) holder).noPreviewImageView.setImageResource(R.drawable.ic_gallery_day_night_24dp); } else { ((PostBaseGalleryTypeViewHolder) holder).frameLayout.setVisibility(View.VISIBLE); ((PostBaseGalleryTypeViewHolder) holder).imageIndexTextView.setText(mActivity.getString(R.string.image_index_in_gallery, 1, post.getGallery().size())); @@ -1027,29 +1027,29 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy ((PostCard2WithPreviewViewHolder) holder).binding.linkTextViewItemPostCard2WithPreview.setText(domain); if (post.getPostType() == Post.NO_PREVIEW_LINK_TYPE) { ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setVisibility(View.VISIBLE); - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_link); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } } if (mDataSavingMode && mDisableImagePreview) { ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setVisibility(View.VISIBLE); if (post.getPostType() == Post.VIDEO_TYPE) { - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.IMAGE_TYPE || post.getPostType() == Post.GIF_TYPE) { - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.LINK_TYPE) { - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_link); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } } else if (mDataSavingMode && mOnlyDisablePreviewInVideoAndGifPosts && (post.getPostType() == Post.VIDEO_TYPE || post.getPostType() == Post.GIF_TYPE)) { ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setVisibility(View.VISIBLE); - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setVisibility(View.GONE); } else { if (post.getPostType() == Post.GIF_TYPE && ((post.isNSFW() && mNeedBlurNsfw && !(mAutoplay && mAutoplayNsfwVideos)) || (post.isSpoiler() && mNeedBlurSpoiler))) { ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setVisibility(View.VISIBLE); - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setVisibility(View.GONE); } else { Post.Preview preview = getSuitablePreview(post.getPreviews()); @@ -1074,13 +1074,13 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy } else { ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setVisibility(View.VISIBLE); if (post.getPostType() == Post.VIDEO_TYPE) { - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.IMAGE_TYPE || post.getPostType() == Post.GIF_TYPE) { - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.LINK_TYPE) { - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_link); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } } } @@ -1293,7 +1293,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy ((PostCompactBaseViewHolder) holder).relativeLayout.setVisibility(View.VISIBLE); if (post.getPostType() == Post.GALLERY_TYPE && post.getPreviews() != null && post.getPreviews().isEmpty()) { ((PostCompactBaseViewHolder) holder).noPreviewPostImageFrameLayout.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_gallery_24dp); + ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_gallery_day_night_24dp); } if (post.getPreviews() != null && !post.getPreviews().isEmpty()) { ((PostCompactBaseViewHolder) holder).imageView.setVisibility(View.VISIBLE); @@ -1330,14 +1330,14 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy ((PostCompactBaseViewHolder) holder).typeTextView.setText(R.string.image); if (mDataSavingMode && mDisableImagePreview) { ((PostCompactBaseViewHolder) holder).noPreviewPostImageFrameLayout.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_image_24dp); + ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_image_day_night_24dp); } break; case Post.LINK_TYPE: ((PostCompactBaseViewHolder) holder).typeTextView.setText(R.string.link); if (mDataSavingMode && mDisableImagePreview) { ((PostCompactBaseViewHolder) holder).noPreviewPostImageFrameLayout.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_link); + ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_link_day_night_24dp); } ((PostCompactBaseViewHolder) holder).linkTextView.setVisibility(View.VISIBLE); @@ -1348,7 +1348,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy ((PostCompactBaseViewHolder) holder).typeTextView.setText(R.string.gif); if (mDataSavingMode && (mDisableImagePreview || mOnlyDisablePreviewInVideoAndGifPosts)) { ((PostCompactBaseViewHolder) holder).noPreviewPostImageFrameLayout.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_image_24dp); + ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_image_day_night_24dp); } else { ((PostCompactBaseViewHolder) holder).playButtonImageView.setVisibility(View.VISIBLE); ((PostCompactBaseViewHolder) holder).playButtonImageView.setImageDrawable(ContextCompat.getDrawable(mActivity, R.drawable.ic_play_circle_24dp)); @@ -1358,7 +1358,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy ((PostCompactBaseViewHolder) holder).typeTextView.setText(R.string.video); if (mDataSavingMode && (mDisableImagePreview || mOnlyDisablePreviewInVideoAndGifPosts)) { ((PostCompactBaseViewHolder) holder).noPreviewPostImageFrameLayout.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_video_day_night_24dp); } else { ((PostCompactBaseViewHolder) holder).playButtonImageView.setVisibility(View.VISIBLE); ((PostCompactBaseViewHolder) holder).playButtonImageView.setImageDrawable(ContextCompat.getDrawable(mActivity, R.drawable.ic_play_circle_24dp)); @@ -1372,16 +1372,16 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy String noPreviewLinkDomain = Uri.parse(noPreviewLinkUrl).getHost(); ((PostCompactBaseViewHolder) holder).linkTextView.setText(noPreviewLinkDomain); ((PostCompactBaseViewHolder) holder).noPreviewPostImageFrameLayout.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_link); + ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_link_day_night_24dp); break; case Post.GALLERY_TYPE: ((PostCompactBaseViewHolder) holder).typeTextView.setText(R.string.gallery); if (mDataSavingMode && mDisableImagePreview) { ((PostCompactBaseViewHolder) holder).noPreviewPostImageFrameLayout.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_gallery_24dp); + ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_gallery_day_night_24dp); } else { ((PostCompactBaseViewHolder) holder).playButtonImageView.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).playButtonImageView.setImageDrawable(ContextCompat.getDrawable(mActivity, R.drawable.ic_gallery_24dp)); + ((PostCompactBaseViewHolder) holder).playButtonImageView.setImageDrawable(ContextCompat.getDrawable(mActivity, R.drawable.ic_gallery_day_night_24dp)); } break; case Post.TEXT_TYPE: @@ -1434,21 +1434,21 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy } else { ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setVisibility(View.VISIBLE); if (post.getPostType() == Post.VIDEO_TYPE) { - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostGalleryViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostGallery.setVisibility(View.GONE); } else if (post.getPostType() == Post.IMAGE_TYPE || post.getPostType() == Post.GIF_TYPE) { ((PostGalleryViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostGallery.setVisibility(View.GONE); } else if (post.getPostType() == Post.LINK_TYPE) { - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_link); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_link_day_night_24dp); } - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_image_24dp); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_image_day_night_24dp); } break; } case Post.GIF_TYPE: { if (post.getPostType() == Post.GIF_TYPE && ((post.isNSFW() && mNeedBlurNsfw && !(mAutoplay && mAutoplayNsfwVideos)) || (post.isSpoiler() && mNeedBlurSpoiler))) { ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setVisibility(View.VISIBLE); - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_image_24dp); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_image_day_night_24dp); } else { Post.Preview preview = getSuitablePreview(post.getPreviews()); ((PostGalleryViewHolder) holder).preview = preview; @@ -1474,7 +1474,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy }); } else { ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setVisibility(View.VISIBLE); - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_image_24dp); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_image_day_night_24dp); } } break; @@ -1504,7 +1504,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy }); } else { ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setVisibility(View.VISIBLE); - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_video_day_night_24dp); } break; } @@ -1514,7 +1514,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy if (preview != null) { ((PostGalleryViewHolder) holder).binding.imageViewItemPostGallery.setVisibility(View.VISIBLE); ((PostGalleryViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostGallery.setVisibility(View.VISIBLE); - ((PostGalleryViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostGallery.setImageDrawable(ContextCompat.getDrawable(mActivity, R.drawable.ic_link_post_type_indicator)); + ((PostGalleryViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostGallery.setImageDrawable(ContextCompat.getDrawable(mActivity, R.drawable.ic_link_post_type_indicator_day_night_24dp)); if (mFixedHeightPreviewInCard || (preview.getPreviewWidth() <= 0 || preview.getPreviewHeight() <= 0)) { int height = (int) (400 * mScale); @@ -1533,13 +1533,13 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy }); } else { ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setVisibility(View.VISIBLE); - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_link); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_link_day_night_24dp); } break; } case Post.NO_PREVIEW_LINK_TYPE: { ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setVisibility(View.VISIBLE); - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_link); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_link_day_night_24dp); break; } case Post.TEXT_TYPE: { @@ -1557,7 +1557,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy if (mDataSavingMode && mDisableImagePreview) { ((PostGalleryBaseGalleryTypeViewHolder) holder).noPreviewImageView.setVisibility(View.VISIBLE); - ((PostGalleryBaseGalleryTypeViewHolder) holder).noPreviewImageView.setImageResource(R.drawable.ic_gallery_24dp); + ((PostGalleryBaseGalleryTypeViewHolder) holder).noPreviewImageView.setImageResource(R.drawable.ic_gallery_day_night_24dp); } else { Post.Preview preview = getSuitablePreview(post.getPreviews()); ((PostGalleryBaseGalleryTypeViewHolder) holder).preview = preview; @@ -1834,29 +1834,29 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy ((PostMaterial3CardWithPreviewViewHolder) holder).binding.linkTextViewItemPostCard3WithPreview.setText(domain); if (post.getPostType() == Post.NO_PREVIEW_LINK_TYPE) { ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setVisibility(View.VISIBLE); - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_link); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } } if (mDataSavingMode && mDisableImagePreview) { ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setVisibility(View.VISIBLE); if (post.getPostType() == Post.VIDEO_TYPE) { - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostMaterial3CardWithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard3WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.IMAGE_TYPE || post.getPostType() == Post.GIF_TYPE) { - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostMaterial3CardWithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard3WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.LINK_TYPE) { - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_link); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } } else if (mDataSavingMode && mOnlyDisablePreviewInVideoAndGifPosts && (post.getPostType() == Post.VIDEO_TYPE || post.getPostType() == Post.GIF_TYPE)) { ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setVisibility(View.VISIBLE); - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostMaterial3CardWithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard3WithPreview.setVisibility(View.GONE); } else { if (post.getPostType() == Post.GIF_TYPE && ((post.isNSFW() && mNeedBlurNsfw && !(mAutoplay && mAutoplayNsfwVideos)) || (post.isSpoiler() && mNeedBlurSpoiler))) { ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setVisibility(View.VISIBLE); - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostMaterial3CardWithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard3WithPreview.setVisibility(View.GONE); } else { Post.Preview preview = getSuitablePreview(post.getPreviews()); @@ -1882,15 +1882,15 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy } else { ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setVisibility(View.VISIBLE); if (post.getPostType() == Post.VIDEO_TYPE) { - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostMaterial3CardWithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard3WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.IMAGE_TYPE || post.getPostType() == Post.GIF_TYPE) { - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostMaterial3CardWithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard3WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.LINK_TYPE) { - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_link); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } else if (post.getPostType() == Post.GALLERY_TYPE) { - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_gallery_24dp); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_gallery_day_night_24dp); } } } @@ -1898,7 +1898,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy } else if (holder instanceof PostMaterial3CardBaseGalleryTypeViewHolder) { if (mDataSavingMode && mDisableImagePreview) { ((PostMaterial3CardBaseGalleryTypeViewHolder) holder).noPreviewImageView.setVisibility(View.VISIBLE); - ((PostMaterial3CardBaseGalleryTypeViewHolder) holder).noPreviewImageView.setImageResource(R.drawable.ic_gallery_24dp); + ((PostMaterial3CardBaseGalleryTypeViewHolder) holder).noPreviewImageView.setImageResource(R.drawable.ic_gallery_day_night_24dp); } else { ((PostMaterial3CardBaseGalleryTypeViewHolder) holder).frameLayout.setVisibility(View.VISIBLE); ((PostMaterial3CardBaseGalleryTypeViewHolder) holder).imageIndexTextView.setText(mActivity.getString(R.string.image_index_in_gallery, 1, post.getGallery().size())); @@ -1985,7 +1985,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy } RequestBuilder<Drawable> imageRequestBuilder = mGlide.load(postCompactThumbnailPreviewUrl) - .error(R.drawable.ic_error_outline_black_24dp).listener(((PostCompactBaseViewHolder) holder).requestListener); + .error(R.drawable.ic_error_outline_black_day_night_24dp).listener(((PostCompactBaseViewHolder) holder).requestListener); if ((post.isNSFW() && mNeedBlurNsfw) || (post.isSpoiler() && mNeedBlurSpoiler)) { imageRequestBuilder .transform(new BlurTransformation(50, 2)).into(((PostCompactBaseViewHolder) holder).imageView); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/MarkdownBottomBarRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/MarkdownBottomBarRecyclerViewAdapter.java index ac99ad82..73405851 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/MarkdownBottomBarRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/MarkdownBottomBarRecyclerViewAdapter.java @@ -88,7 +88,7 @@ public class MarkdownBottomBarRecyclerViewAdapter extends RecyclerView.Adapter<R ((MarkdownBottomBarItemViewHolder) holder).imageView.setImageResource(R.drawable.ic_ordered_list_black_24dp); break; case UNORDERED_LIST: - ((MarkdownBottomBarItemViewHolder) holder).imageView.setImageResource(R.drawable.ic_unordered_list_black_24dp); + ((MarkdownBottomBarItemViewHolder) holder).imageView.setImageResource(R.drawable.ic_unordered_list_24dp); break; case SPOILER: ((MarkdownBottomBarItemViewHolder) holder).imageView.setImageResource(R.drawable.ic_spoiler_black_24dp); @@ -100,7 +100,7 @@ public class MarkdownBottomBarRecyclerViewAdapter extends RecyclerView.Adapter<R ((MarkdownBottomBarItemViewHolder) holder).imageView.setImageResource(R.drawable.ic_code_24dp); break; case UPLOAD_IMAGE: - ((MarkdownBottomBarItemViewHolder) holder).imageView.setImageResource(R.drawable.ic_image_24dp); + ((MarkdownBottomBarItemViewHolder) holder).imageView.setImageResource(R.drawable.ic_image_day_night_24dp); break; } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java index bfe7a333..35d18ee2 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java @@ -808,7 +808,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler String noPreviewLinkDomain = Uri.parse(mPost.getUrl()).getHost(); ((PostDetailNoPreviewViewHolder) holder).binding.linkTextViewItemPostDetailNoPreview.setVisibility(View.VISIBLE); ((PostDetailNoPreviewViewHolder) holder).binding.linkTextViewItemPostDetailNoPreview.setText(noPreviewLinkDomain); - ((PostDetailNoPreviewViewHolder) holder).binding.imageViewNoPreviewPostTypeItemPostDetailNoPreview.setImageResource(R.drawable.ic_link); + ((PostDetailNoPreviewViewHolder) holder).binding.imageViewNoPreviewPostTypeItemPostDetailNoPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } else { ((PostDetailNoPreviewViewHolder) holder).binding.linkTextViewItemPostDetailNoPreview.setVisibility(View.GONE); switch (mPost.getPostType()) { @@ -816,32 +816,32 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler if (!mHidePostType) { ((PostDetailNoPreviewViewHolder) holder).binding.typeTextViewItemPostDetailNoPreview.setText(R.string.video); } - ((PostDetailNoPreviewViewHolder) holder).binding.imageViewNoPreviewPostTypeItemPostDetailNoPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostDetailNoPreviewViewHolder) holder).binding.imageViewNoPreviewPostTypeItemPostDetailNoPreview.setImageResource(R.drawable.ic_video_day_night_24dp); break; case Post.IMAGE_TYPE: if (!mHidePostType) { ((PostDetailNoPreviewViewHolder) holder).binding.typeTextViewItemPostDetailNoPreview.setText(R.string.image); } - ((PostDetailNoPreviewViewHolder) holder).binding.imageViewNoPreviewPostTypeItemPostDetailNoPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostDetailNoPreviewViewHolder) holder).binding.imageViewNoPreviewPostTypeItemPostDetailNoPreview.setImageResource(R.drawable.ic_image_day_night_24dp); break; case Post.GIF_TYPE: if (!mHidePostType) { ((PostDetailNoPreviewViewHolder) holder).binding.typeTextViewItemPostDetailNoPreview.setText(R.string.gif); } - ((PostDetailNoPreviewViewHolder) holder).binding.imageViewNoPreviewPostTypeItemPostDetailNoPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostDetailNoPreviewViewHolder) holder).binding.imageViewNoPreviewPostTypeItemPostDetailNoPreview.setImageResource(R.drawable.ic_image_day_night_24dp); break; case Post.GALLERY_TYPE: if (!mHidePostType) { ((PostDetailNoPreviewViewHolder) holder).binding.typeTextViewItemPostDetailNoPreview.setText(R.string.gallery); } - ((PostDetailNoPreviewViewHolder) holder).binding.imageViewNoPreviewPostTypeItemPostDetailNoPreview.setImageResource(R.drawable.ic_gallery_24dp); + ((PostDetailNoPreviewViewHolder) holder).binding.imageViewNoPreviewPostTypeItemPostDetailNoPreview.setImageResource(R.drawable.ic_gallery_day_night_24dp); break; } } } else if (holder instanceof PostDetailGalleryViewHolder) { if (mDataSavingMode && mDisableImagePreview) { ((PostDetailGalleryViewHolder) holder).binding.noPreviewPostTypeImageViewItemPostDetailGallery.setVisibility(View.VISIBLE); - ((PostDetailGalleryViewHolder) holder).binding.noPreviewPostTypeImageViewItemPostDetailGallery.setImageResource(R.drawable.ic_gallery_24dp); + ((PostDetailGalleryViewHolder) holder).binding.noPreviewPostTypeImageViewItemPostDetailGallery.setImageResource(R.drawable.ic_gallery_day_night_24dp); } else { ((PostDetailGalleryViewHolder) holder).binding.galleryFrameLayoutItemPostDetailGallery.setVisibility(View.VISIBLE); ((PostDetailGalleryViewHolder) holder).binding.imageIndexTextViewItemPostDetailGallery.setText(mActivity.getString(R.string.image_index_in_gallery, 1, mPost.getGallery().size())); @@ -1679,7 +1679,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler archivedImageView.setColorFilter(mArchivedTintColor, PorterDuff.Mode.SRC_IN); lockedImageView.setColorFilter(mLockedTintColor, PorterDuff.Mode.SRC_IN); crosspostImageView.setColorFilter(mCrosspostTintColor, PorterDuff.Mode.SRC_IN); - Drawable upvoteRatioDrawable = Utils.getTintedDrawable(mActivity, R.drawable.ic_upvote_ratio, mUpvoteRatioTintColor); + Drawable upvoteRatioDrawable = Utils.getTintedDrawable(mActivity, R.drawable.ic_upvote_ratio_18dp, mUpvoteRatioTintColor); upvoteRatioTextView.setCompoundDrawablesWithIntrinsicBounds( upvoteRatioDrawable, null, null, null); upvoteRatioTextView.setTextColor(mSecondaryTextColor); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostFilterWithUsageRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostFilterWithUsageRecyclerViewAdapter.java index 1e732c49..41a5b0d9 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostFilterWithUsageRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostFilterWithUsageRecyclerViewAdapter.java @@ -109,7 +109,7 @@ public class PostFilterWithUsageRecyclerViewAdapter extends RecyclerView.Adapter super(itemView); TextView infoTextView = itemView.findViewById(R.id.info_text_view_item_filter_fragment_header); infoTextView.setTextColor(customThemeWrapper.getSecondaryTextColor()); - infoTextView.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(activity, R.drawable.ic_info_preference_24dp, activity.customThemeWrapper.getPrimaryIconColor()), null, null, null); + infoTextView.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(activity, R.drawable.ic_info_preference_day_night_24dp, activity.customThemeWrapper.getPrimaryIconColor()), null, null, null); } } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java index 410bcbab..995b9de2 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java @@ -88,6 +88,7 @@ import ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity; import ml.docilealligator.infinityforreddit.activities.ViewVideoActivity; import ml.docilealligator.infinityforreddit.apis.RedgifsAPI; import ml.docilealligator.infinityforreddit.apis.StreamableAPI; +import ml.docilealligator.infinityforreddit.bottomsheetfragments.PostOptionsBottomSheetFragment; import ml.docilealligator.infinityforreddit.bottomsheetfragments.ShareLinkBottomSheetFragment; import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper; import ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView; @@ -893,29 +894,29 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie ((PostWithPreviewTypeViewHolder) holder).binding.linkTextViewItemPostWithPreview.setText(domain); if (post.getPostType() == Post.NO_PREVIEW_LINK_TYPE) { ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setVisibility(View.VISIBLE); - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_link); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } } if (mDataSavingMode && mDisableImagePreview) { ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setVisibility(View.VISIBLE); if (post.getPostType() == Post.VIDEO_TYPE) { - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostWithPreviewTypeViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostWithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.IMAGE_TYPE || post.getPostType() == Post.GIF_TYPE) { - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostWithPreviewTypeViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostWithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.LINK_TYPE) { - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_link); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } } else if (mDataSavingMode && mOnlyDisablePreviewInVideoAndGifPosts && (post.getPostType() == Post.VIDEO_TYPE || post.getPostType() == Post.GIF_TYPE)) { ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setVisibility(View.VISIBLE); - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostWithPreviewTypeViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostWithPreview.setVisibility(View.GONE); } else { if (post.getPostType() == Post.GIF_TYPE && ((post.isNSFW() && mNeedBlurNsfw && !(mDoNotBlurNsfwInNsfwSubreddits && mFragment != null && mFragment.getIsNsfwSubreddit()) && !(mAutoplay && mAutoplayNsfwVideos)) || (post.isSpoiler() && mNeedBlurSpoiler))) { ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setVisibility(View.VISIBLE); - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostWithPreviewTypeViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostWithPreview.setVisibility(View.GONE); } else { Post.Preview preview = getSuitablePreview(post.getPreviews()); @@ -941,15 +942,15 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie } else { ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setVisibility(View.VISIBLE); if (post.getPostType() == Post.VIDEO_TYPE) { - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostWithPreviewTypeViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostWithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.IMAGE_TYPE || post.getPostType() == Post.GIF_TYPE) { - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostWithPreviewTypeViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostWithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.LINK_TYPE) { - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_link); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } else if (post.getPostType() == Post.GALLERY_TYPE) { - ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_gallery_24dp); + ((PostWithPreviewTypeViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostWithPreview.setImageResource(R.drawable.ic_gallery_day_night_24dp); } } } @@ -957,7 +958,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie } else if (holder instanceof PostBaseGalleryTypeViewHolder) { if (mDataSavingMode && mDisableImagePreview) { ((PostBaseGalleryTypeViewHolder) holder).noPreviewImageView.setVisibility(View.VISIBLE); - ((PostBaseGalleryTypeViewHolder) holder).noPreviewImageView.setImageResource(R.drawable.ic_gallery_24dp); + ((PostBaseGalleryTypeViewHolder) holder).noPreviewImageView.setImageResource(R.drawable.ic_gallery_day_night_24dp); } else { ((PostBaseGalleryTypeViewHolder) holder).frameLayout.setVisibility(View.VISIBLE); ((PostBaseGalleryTypeViewHolder) holder).imageIndexTextView.setText(mActivity.getString(R.string.image_index_in_gallery, 1, post.getGallery().size())); @@ -1073,35 +1074,35 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie ((PostCard2WithPreviewViewHolder) holder).binding.linkTextViewItemPostCard2WithPreview.setText(domain); if (post.getPostType() == Post.NO_PREVIEW_LINK_TYPE) { ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setVisibility(View.VISIBLE); - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_link); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } } else if (post.getPostType() == Post.GALLERY_TYPE) { ((PostCard2WithPreviewViewHolder) holder).typeTextView.setText(mActivity.getString(R.string.gallery)); ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setVisibility(View.VISIBLE); - ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setImageDrawable(ContextCompat.getDrawable(mActivity, R.drawable.ic_gallery_24dp)); + ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setImageDrawable(ContextCompat.getDrawable(mActivity, R.drawable.ic_gallery_day_night_24dp)); } if (mDataSavingMode && mDisableImagePreview) { ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setVisibility(View.VISIBLE); if (post.getPostType() == Post.VIDEO_TYPE) { - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.IMAGE_TYPE || post.getPostType() == Post.GIF_TYPE) { - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.LINK_TYPE) { - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_link); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } else if (post.getPostType() == Post.GALLERY_TYPE) { - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_gallery_24dp); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_gallery_day_night_24dp); } } else if (mDataSavingMode && mOnlyDisablePreviewInVideoAndGifPosts && (post.getPostType() == Post.VIDEO_TYPE || post.getPostType() == Post.GIF_TYPE)) { ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setVisibility(View.VISIBLE); - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setVisibility(View.GONE); } else { if (post.getPostType() == Post.GIF_TYPE && ((post.isNSFW() && mNeedBlurNsfw && !(mDoNotBlurNsfwInNsfwSubreddits && mFragment != null && mFragment.getIsNsfwSubreddit()) && !(mAutoplay && mAutoplayNsfwVideos)) || (post.isSpoiler() && mNeedBlurSpoiler))) { ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setVisibility(View.VISIBLE); - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setVisibility(View.GONE); } else { Post.Preview preview = getSuitablePreview(post.getPreviews()); @@ -1126,15 +1127,15 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie } else { ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setVisibility(View.VISIBLE); if (post.getPostType() == Post.VIDEO_TYPE) { - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.IMAGE_TYPE || post.getPostType() == Post.GIF_TYPE) { - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostCard2WithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard2WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.LINK_TYPE) { - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_link); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } else if (post.getPostType() == Post.GALLERY_TYPE) { - ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_gallery_24dp); + ((PostCard2WithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard2WithPreview.setImageResource(R.drawable.ic_gallery_day_night_24dp); } } } @@ -1357,7 +1358,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie ((PostCompactBaseViewHolder) holder).relativeLayout.setVisibility(View.VISIBLE); if (post.getPostType() == Post.GALLERY_TYPE && post.getPreviews() != null && post.getPreviews().isEmpty()) { ((PostCompactBaseViewHolder) holder).noPreviewPostImageFrameLayout.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_gallery_24dp); + ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_gallery_day_night_24dp); } if (post.getPreviews() != null && !post.getPreviews().isEmpty()) { ((PostCompactBaseViewHolder) holder).imageView.setVisibility(View.VISIBLE); @@ -1394,14 +1395,14 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie ((PostCompactBaseViewHolder) holder).typeTextView.setText(R.string.image); if (mDataSavingMode && mDisableImagePreview) { ((PostCompactBaseViewHolder) holder).noPreviewPostImageFrameLayout.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_image_24dp); + ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_image_day_night_24dp); } break; case Post.LINK_TYPE: ((PostCompactBaseViewHolder) holder).typeTextView.setText(R.string.link); if (mDataSavingMode && mDisableImagePreview) { ((PostCompactBaseViewHolder) holder).noPreviewPostImageFrameLayout.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_link); + ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_link_day_night_24dp); } ((PostCompactBaseViewHolder) holder).linkTextView.setVisibility(View.VISIBLE); @@ -1412,7 +1413,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie ((PostCompactBaseViewHolder) holder).typeTextView.setText(R.string.gif); if (mDataSavingMode && (mDisableImagePreview || mOnlyDisablePreviewInVideoAndGifPosts)) { ((PostCompactBaseViewHolder) holder).noPreviewPostImageFrameLayout.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_image_24dp); + ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_image_day_night_24dp); } else { ((PostCompactBaseViewHolder) holder).playButtonImageView.setVisibility(View.VISIBLE); ((PostCompactBaseViewHolder) holder).playButtonImageView.setImageDrawable(ContextCompat.getDrawable(mActivity, R.drawable.ic_play_circle_24dp)); @@ -1422,7 +1423,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie ((PostCompactBaseViewHolder) holder).typeTextView.setText(R.string.video); if (mDataSavingMode && (mDisableImagePreview || mOnlyDisablePreviewInVideoAndGifPosts)) { ((PostCompactBaseViewHolder) holder).noPreviewPostImageFrameLayout.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_video_day_night_24dp); } else { ((PostCompactBaseViewHolder) holder).playButtonImageView.setVisibility(View.VISIBLE); ((PostCompactBaseViewHolder) holder).playButtonImageView.setImageDrawable(ContextCompat.getDrawable(mActivity, R.drawable.ic_play_circle_24dp)); @@ -1436,16 +1437,16 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie String noPreviewLinkDomain = Uri.parse(noPreviewLinkUrl).getHost(); ((PostCompactBaseViewHolder) holder).linkTextView.setText(noPreviewLinkDomain); ((PostCompactBaseViewHolder) holder).noPreviewPostImageFrameLayout.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_link); + ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_link_day_night_24dp); break; case Post.GALLERY_TYPE: ((PostCompactBaseViewHolder) holder).typeTextView.setText(R.string.gallery); if (mDataSavingMode && mDisableImagePreview) { ((PostCompactBaseViewHolder) holder).noPreviewPostImageFrameLayout.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_gallery_24dp); + ((PostCompactBaseViewHolder) holder).noPreviewPostImageView.setImageResource(R.drawable.ic_gallery_day_night_24dp); } else { ((PostCompactBaseViewHolder) holder).playButtonImageView.setVisibility(View.VISIBLE); - ((PostCompactBaseViewHolder) holder).playButtonImageView.setImageDrawable(ContextCompat.getDrawable(mActivity, R.drawable.ic_gallery_24dp)); + ((PostCompactBaseViewHolder) holder).playButtonImageView.setImageDrawable(ContextCompat.getDrawable(mActivity, R.drawable.ic_gallery_day_night_24dp)); } break; case Post.TEXT_TYPE: @@ -1482,15 +1483,15 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie ((post.getPostType() == Post.VIDEO_TYPE || post.getPostType() == Post.GIF_TYPE) && mOnlyDisablePreviewInVideoAndGifPosts))) { ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setVisibility(View.VISIBLE); if (post.getPostType() == Post.VIDEO_TYPE) { - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostGalleryViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostGallery.setVisibility(View.GONE); } else if (post.getPostType() == Post.IMAGE_TYPE || post.getPostType() == Post.GIF_TYPE) { - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_image_24dp); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostGalleryViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostGallery.setVisibility(View.GONE); } else if (post.getPostType() == Post.LINK_TYPE) { - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_link); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_link_day_night_24dp); } else if (post.getPostType() == Post.GALLERY_TYPE) { - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_gallery_24dp); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_gallery_day_night_24dp); } } else { switch (post.getPostType()) { @@ -1517,14 +1518,14 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie }); } else { ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setVisibility(View.VISIBLE); - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_image_24dp); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_image_day_night_24dp); } break; } case Post.GIF_TYPE: { if (post.getPostType() == Post.GIF_TYPE && ((post.isNSFW() && mNeedBlurNsfw && !(mDoNotBlurNsfwInNsfwSubreddits && mFragment != null && mFragment.getIsNsfwSubreddit()) && !(mAutoplay && mAutoplayNsfwVideos)) || (post.isSpoiler() && mNeedBlurSpoiler))) { ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setVisibility(View.VISIBLE); - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_image_24dp); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_image_day_night_24dp); } else { Post.Preview preview = getSuitablePreview(post.getPreviews()); ((PostGalleryViewHolder) holder).preview = preview; @@ -1550,7 +1551,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie }); } else { ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setVisibility(View.VISIBLE); - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_image_24dp); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_image_day_night_24dp); } } break; @@ -1580,7 +1581,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie }); } else { ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setVisibility(View.VISIBLE); - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_video_day_night_24dp); } break; } @@ -1590,7 +1591,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie if (preview != null) { ((PostGalleryViewHolder) holder).binding.imageViewItemPostGallery.setVisibility(View.VISIBLE); ((PostGalleryViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostGallery.setVisibility(View.VISIBLE); - ((PostGalleryViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostGallery.setImageDrawable(ContextCompat.getDrawable(mActivity, R.drawable.ic_link_post_type_indicator)); + ((PostGalleryViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostGallery.setImageDrawable(ContextCompat.getDrawable(mActivity, R.drawable.ic_link_post_type_indicator_day_night_24dp)); if (mFixedHeightPreviewInCard || (preview.getPreviewWidth() <= 0 || preview.getPreviewHeight() <= 0)) { int height = (int) (400 * mScale); @@ -1609,13 +1610,13 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie }); } else { ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setVisibility(View.VISIBLE); - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_link); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_link_day_night_24dp); } break; } case Post.NO_PREVIEW_LINK_TYPE: { ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setVisibility(View.VISIBLE); - ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_link); + ((PostGalleryViewHolder) holder).binding.imageViewNoPreviewItemPostGallery.setImageResource(R.drawable.ic_link_day_night_24dp); break; } case Post.TEXT_TYPE: { @@ -1637,7 +1638,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie if (mDataSavingMode && mDisableImagePreview) { ((PostGalleryBaseGalleryTypeViewHolder) holder).noPreviewImageView.setVisibility(View.VISIBLE); - ((PostGalleryBaseGalleryTypeViewHolder) holder).noPreviewImageView.setImageResource(R.drawable.ic_gallery_24dp); + ((PostGalleryBaseGalleryTypeViewHolder) holder).noPreviewImageView.setImageResource(R.drawable.ic_gallery_day_night_24dp); } else { Post.Preview preview = getSuitablePreview(post.getPreviews()); ((PostGalleryBaseGalleryTypeViewHolder) holder).preview = preview; @@ -1919,29 +1920,29 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie ((PostMaterial3CardWithPreviewViewHolder) holder).binding.linkTextViewItemPostCard3WithPreview.setText(domain); if (post.getPostType() == Post.NO_PREVIEW_LINK_TYPE) { ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setVisibility(View.VISIBLE); - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_link); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } } if (mDataSavingMode && mDisableImagePreview) { ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setVisibility(View.VISIBLE); if (post.getPostType() == Post.VIDEO_TYPE) { - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostMaterial3CardWithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard3WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.IMAGE_TYPE || post.getPostType() == Post.GIF_TYPE) { - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostMaterial3CardWithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard3WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.LINK_TYPE) { - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_link); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } } else if (mDataSavingMode && mOnlyDisablePreviewInVideoAndGifPosts && (post.getPostType() == Post.VIDEO_TYPE || post.getPostType() == Post.GIF_TYPE)) { ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setVisibility(View.VISIBLE); - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostMaterial3CardWithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard3WithPreview.setVisibility(View.GONE); } else { if (post.getPostType() == Post.GIF_TYPE && ((post.isNSFW() && mNeedBlurNsfw && !(mDoNotBlurNsfwInNsfwSubreddits && mFragment != null && mFragment.getIsNsfwSubreddit()) && !(mAutoplay && mAutoplayNsfwVideos)) || (post.isSpoiler() && mNeedBlurSpoiler))) { ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setVisibility(View.VISIBLE); - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostMaterial3CardWithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard3WithPreview.setVisibility(View.GONE); } else { Post.Preview preview = getSuitablePreview(post.getPreviews()); @@ -1967,15 +1968,15 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie } else { ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setVisibility(View.VISIBLE); if (post.getPostType() == Post.VIDEO_TYPE) { - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_outline_video_24dp); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_video_day_night_24dp); ((PostMaterial3CardWithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard3WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.IMAGE_TYPE || post.getPostType() == Post.GIF_TYPE) { - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_image_24dp); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_image_day_night_24dp); ((PostMaterial3CardWithPreviewViewHolder) holder).binding.videoOrGifIndicatorImageViewItemPostCard3WithPreview.setVisibility(View.GONE); } else if (post.getPostType() == Post.LINK_TYPE) { - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_link); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_link_day_night_24dp); } else if (post.getPostType() == Post.GALLERY_TYPE) { - ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_gallery_24dp); + ((PostMaterial3CardWithPreviewViewHolder) holder).binding.imageViewNoPreviewGalleryItemPostCard3WithPreview.setImageResource(R.drawable.ic_gallery_day_night_24dp); } } } @@ -1983,7 +1984,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie } else if (holder instanceof PostMaterial3CardBaseGalleryTypeViewHolder) { if (mDataSavingMode && mDisableImagePreview) { ((PostMaterial3CardBaseGalleryTypeViewHolder) holder).noPreviewImageView.setVisibility(View.VISIBLE); - ((PostMaterial3CardBaseGalleryTypeViewHolder) holder).noPreviewImageView.setImageResource(R.drawable.ic_gallery_24dp); + ((PostMaterial3CardBaseGalleryTypeViewHolder) holder).noPreviewImageView.setImageResource(R.drawable.ic_gallery_day_night_24dp); } else { ((PostMaterial3CardBaseGalleryTypeViewHolder) holder).frameLayout.setVisibility(View.VISIBLE); ((PostMaterial3CardBaseGalleryTypeViewHolder) holder).imageIndexTextView.setText(mActivity.getString(R.string.image_index_in_gallery, 1, post.getGallery().size())); @@ -2073,7 +2074,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie } RequestBuilder<Drawable> imageRequestBuilder = mGlide.load(postCompactThumbnailPreviewUrl) - .error(R.drawable.ic_error_outline_black_24dp).listener(((PostCompactBaseViewHolder) holder).requestListener); + .error(R.drawable.ic_error_outline_black_day_night_24dp).listener(((PostCompactBaseViewHolder) holder).requestListener); if ((post.isNSFW() && mNeedBlurNsfw && !(mDoNotBlurNsfwInNsfwSubreddits && mFragment != null && mFragment.getIsNsfwSubreddit())) || (post.isSpoiler() && mNeedBlurSpoiler)) { imageRequestBuilder .transform(new BlurTransformation(50, 2)).into(((PostCompactBaseViewHolder) holder).imageView); @@ -2825,6 +2826,17 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie } }); + itemView.setOnLongClickListener(v -> { + Post post = getItem(getBindingAdapterPosition()); + if (post == null) { + return false; + } + + PostOptionsBottomSheetFragment postOptionsBottomSheetFragment = PostOptionsBottomSheetFragment.newInstance(post); + postOptionsBottomSheetFragment.show(mActivity.getSupportFragmentManager(), postOptionsBottomSheetFragment.getTag()); + return true; + }); + itemView.setOnTouchListener((v, event) -> { if (event.getActionMasked() == MotionEvent.ACTION_UP || event.getActionMasked() == MotionEvent.ACTION_CANCEL) { if (mFragment.isRecyclerViewItemSwipeable(PostBaseViewHolder.this)) { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/AccountManagementSectionRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/AccountManagementSectionRecyclerViewAdapter.java index a921b8cd..8d365f5c 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/AccountManagementSectionRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/AccountManagementSectionRecyclerViewAdapter.java @@ -80,17 +80,17 @@ public class AccountManagementSectionRecyclerViewAdapter extends RecyclerView.Ad int offset = accounts == null ? 0 : accounts.size(); if (position == offset) { stringId = R.string.add_account; - drawableId = R.drawable.ic_outline_add_circle_outline_24dp; + drawableId = R.drawable.ic_add_circle_outline_day_night_24dp; } else if (position == offset + 1) { stringId = R.string.anonymous_account; - drawableId = R.drawable.ic_anonymous_24dp; + drawableId = R.drawable.ic_anonymous_day_night_24dp; } else if (position == offset + 2) { stringId = R.string.log_out; - drawableId = R.drawable.ic_log_out_24dp; + drawableId = R.drawable.ic_log_out_day_night_24dp; } } else { stringId = R.string.add_account; - drawableId = R.drawable.ic_outline_add_circle_outline_24dp; + drawableId = R.drawable.ic_add_circle_outline_day_night_24dp; } if (stringId != 0) { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/AccountSectionRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/AccountSectionRecyclerViewAdapter.java index b91a8b7a..218b6a75 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/AccountSectionRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/AccountSectionRecyclerViewAdapter.java @@ -91,15 +91,15 @@ public class AccountSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recy switch (position) { case 1: stringId = R.string.profile; - drawableId = R.drawable.ic_account_circle_24dp; + drawableId = R.drawable.ic_account_circle_day_night_24dp; break; case 2: stringId = R.string.subscriptions; - drawableId = R.drawable.ic_subscritptions_bottom_app_bar_24dp; + drawableId = R.drawable.ic_subscriptions_bottom_app_bar_day_night_24dp; break; case 3: stringId = R.string.multi_reddit; - drawableId = R.drawable.ic_multi_reddit_24dp; + drawableId = R.drawable.ic_multi_reddit_day_night_24dp; break; case 4: setOnClickListener = false; @@ -108,7 +108,7 @@ public class AccountSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recy } else { ((MenuItemViewHolder) holder).binding.textViewItemNavDrawerMenuItem.setText(R.string.inbox); } - ((MenuItemViewHolder) holder).binding.imageViewItemNavDrawerMenuItem.setImageDrawable(ContextCompat.getDrawable(baseActivity, R.drawable.ic_inbox_24dp)); + ((MenuItemViewHolder) holder).binding.imageViewItemNavDrawerMenuItem.setImageDrawable(ContextCompat.getDrawable(baseActivity, R.drawable.ic_inbox_day_night_24dp)); holder.itemView.setOnClickListener(view -> { Intent intent = new Intent(baseActivity, InboxActivity.class); baseActivity.startActivity(intent); @@ -116,22 +116,22 @@ public class AccountSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recy break; default: stringId = R.string.history; - drawableId = R.drawable.ic_history_24dp; + drawableId = R.drawable.ic_history_day_night_24dp; } } else { switch (position) { case 1: stringId = R.string.subscriptions; - drawableId = R.drawable.ic_subscritptions_bottom_app_bar_24dp; + drawableId = R.drawable.ic_subscriptions_bottom_app_bar_day_night_24dp; break; case 2: stringId = R.string.multi_reddit; - drawableId = R.drawable.ic_multi_reddit_24dp; + drawableId = R.drawable.ic_multi_reddit_day_night_24dp; break; default: stringId = R.string.history; - drawableId = R.drawable.ic_history_24dp; + drawableId = R.drawable.ic_history_day_night_24dp; } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/PostSectionRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/PostSectionRecyclerViewAdapter.java index fd0c837a..02156806 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/PostSectionRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/PostSectionRecyclerViewAdapter.java @@ -86,19 +86,19 @@ public class PostSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recycle switch (position) { case 1: stringId = R.string.upvoted; - drawableId = R.drawable.ic_arrow_upward_black_24dp; + drawableId = R.drawable.ic_arrow_upward_day_night_24dp; break; case 2: stringId = R.string.downvoted; - drawableId = R.drawable.ic_arrow_downward_black_24dp; + drawableId = R.drawable.ic_arrow_downward_day_night_24dp; break; case 3: stringId = R.string.hidden; - drawableId = R.drawable.ic_outline_lock_24dp; + drawableId = R.drawable.ic_lock_day_night_24dp; break; case 4: stringId = R.string.account_saved_thing_activity_label; - drawableId = R.drawable.ic_outline_bookmarks_24dp; + drawableId = R.drawable.ic_bookmarks_day_night_24dp; break; } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/PreferenceSectionRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/PreferenceSectionRecyclerViewAdapter.java index f8d60b48..e791b35e 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/PreferenceSectionRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/PreferenceSectionRecyclerViewAdapter.java @@ -103,29 +103,29 @@ public class PreferenceSectionRecyclerViewAdapter extends RecyclerView.Adapter<R setOnClickListener = false; if (isNSFWEnabled) { stringId = R.string.disable_nsfw; - drawableId = R.drawable.ic_nsfw_off_24dp; + drawableId = R.drawable.ic_nsfw_off_day_night_24dp; } else { stringId = R.string.enable_nsfw; - drawableId = R.drawable.ic_nsfw_on_24dp; + drawableId = R.drawable.ic_nsfw_on_day_night_24dp; } holder.itemView.setOnClickListener(view -> { if (isNSFWEnabled) { isNSFWEnabled = false; ((MenuItemViewHolder) holder).binding.textViewItemNavDrawerMenuItem.setText(R.string.enable_nsfw); - ((MenuItemViewHolder) holder).binding.imageViewItemNavDrawerMenuItem.setImageDrawable(ContextCompat.getDrawable(baseActivity, R.drawable.ic_nsfw_on_24dp)); + ((MenuItemViewHolder) holder).binding.imageViewItemNavDrawerMenuItem.setImageDrawable(ContextCompat.getDrawable(baseActivity, R.drawable.ic_nsfw_on_day_night_24dp)); itemClickListener.onMenuClick(R.string.disable_nsfw); } else { isNSFWEnabled = true; ((MenuItemViewHolder) holder).binding.textViewItemNavDrawerMenuItem.setText(R.string.disable_nsfw); - ((MenuItemViewHolder) holder).binding.imageViewItemNavDrawerMenuItem.setImageDrawable(ContextCompat.getDrawable(baseActivity, R.drawable.ic_nsfw_off_24dp)); + ((MenuItemViewHolder) holder).binding.imageViewItemNavDrawerMenuItem.setImageDrawable(ContextCompat.getDrawable(baseActivity, R.drawable.ic_nsfw_off_day_night_24dp)); itemClickListener.onMenuClick(R.string.enable_nsfw); } }); break; case 3: stringId = R.string.settings; - drawableId = R.drawable.ic_settings_24dp; + drawableId = R.drawable.ic_settings_day_night_24dp; } if (stringId != 0) { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java index 6daf7b86..6b0078f6 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java @@ -113,10 +113,10 @@ public class CommentMoreBottomSheetFragment extends LandscapeExpandedRoundedBott binding.replyTextViewCommentMoreBottomSheetFragment.setVisibility(View.VISIBLE); binding.saveTextViewCommentMoreBottomSheetFragment.setVisibility(View.VISIBLE); if (comment.isSaved()) { - binding.saveTextViewCommentMoreBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(activity, R.drawable.ic_bookmark_24dp), null, null, null); + binding.saveTextViewCommentMoreBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(activity, R.drawable.ic_bookmark_day_night_24dp), null, null, null); binding.saveTextViewCommentMoreBottomSheetFragment.setText(R.string.unsave_comment); } else { - binding.saveTextViewCommentMoreBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(activity, R.drawable.ic_bookmark_border_24dp), null, null, null); + binding.saveTextViewCommentMoreBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(activity, R.drawable.ic_bookmark_border_day_night_24dp), null, null, null); binding.saveTextViewCommentMoreBottomSheetFragment.setText(R.string.save_comment); } binding.replyTextViewCommentMoreBottomSheetFragment.setOnClickListener(view -> { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PlaybackSpeedBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PlaybackSpeedBottomSheetFragment.java index 099e4ecf..e0fbb151 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PlaybackSpeedBottomSheetFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PlaybackSpeedBottomSheetFragment.java @@ -39,28 +39,28 @@ public class PlaybackSpeedBottomSheetFragment extends LandscapeExpandedRoundedBo int playbackSpeed = getArguments().getInt(EXTRA_PLAYBACK_SPEED, ViewVideoActivity.PLAYBACK_SPEED_NORMAL); switch (playbackSpeed) { case ViewVideoActivity.PLAYBACK_SPEED_25: - binding.playbackSpeed025TextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_24dp, 0); + binding.playbackSpeed025TextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_day_night_24dp, 0); break; case ViewVideoActivity.PLAYBACK_SPEED_50: - binding.playbackSpeed050TextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_24dp, 0); + binding.playbackSpeed050TextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_day_night_24dp, 0); break; case ViewVideoActivity.PLAYBACK_SPEED_75: - binding.playbackSpeed075TextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_24dp, 0); + binding.playbackSpeed075TextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_day_night_24dp, 0); break; case ViewVideoActivity.PLAYBACK_SPEED_NORMAL: - binding.playbackSpeedNormalTextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_24dp, 0); + binding.playbackSpeedNormalTextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_day_night_24dp, 0); break; case ViewVideoActivity.PLAYBACK_SPEED_125: - binding.playbackSpeed125TextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_24dp, 0); + binding.playbackSpeed125TextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_day_night_24dp, 0); break; case ViewVideoActivity.PLAYBACK_SPEED_150: - binding.playbackSpeed150TextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_24dp, 0); + binding.playbackSpeed150TextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_day_night_24dp, 0); break; case ViewVideoActivity.PLAYBACK_SPEED_175: - binding.playbackSpeed175TextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_24dp, 0); + binding.playbackSpeed175TextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_day_night_24dp, 0); break; case ViewVideoActivity.PLAYBACK_SPEED_200: - binding.playbackSpeed200TextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_24dp, 0); + binding.playbackSpeed200TextViewPlaybackSpeedBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_playback_speed_day_night_24dp, 0); break; } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostCommentSortTypeBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostCommentSortTypeBottomSheetFragment.java index 7d396c3c..ff8102b8 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostCommentSortTypeBottomSheetFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostCommentSortTypeBottomSheetFragment.java @@ -51,21 +51,21 @@ public class PostCommentSortTypeBottomSheetFragment extends LandscapeExpandedRou SortType.Type currentSortType = (SortType.Type) getArguments().getSerializable(EXTRA_CURRENT_SORT_TYPE); if (currentSortType.equals(SortType.Type.BEST) || currentSortType.equals(SortType.Type.CONFIDENCE)) { - binding.bestTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.bestTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.bestTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.bestTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.TOP)) { - binding.topTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.topTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.topTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.topTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.NEW)) { - binding.newTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.newTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.newTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.newTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.CONTROVERSIAL)) { - binding.controversialTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.controversialTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.controversialTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.controversialTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.OLD)) { - binding.oldTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.oldTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.oldTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.oldTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.RANDOM)) { - binding.randomTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.randomTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.randomTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.randomTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.QA)) { - binding.qaTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.qaTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.qaTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.qaTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.LIVE)) { - binding.liveTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.liveTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.liveTypeTextViewPostCommentSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.liveTypeTextViewPostCommentSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostOptionsBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostOptionsBottomSheetFragment.java new file mode 100644 index 00000000..4e2f9ca2 --- /dev/null +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostOptionsBottomSheetFragment.java @@ -0,0 +1,63 @@ +package ml.docilealligator.infinityforreddit.bottomsheetfragments; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; + +import ml.docilealligator.infinityforreddit.customviews.LandscapeExpandedRoundedBottomSheetDialogFragment; +import ml.docilealligator.infinityforreddit.databinding.FragmentPostOptionsBottomSheetBinding; +import ml.docilealligator.infinityforreddit.post.Post; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link PostOptionsBottomSheetFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class PostOptionsBottomSheetFragment extends LandscapeExpandedRoundedBottomSheetDialogFragment { + + private static final String EXTRA_POST = "EP"; + + private Post mPost; + private FragmentPostOptionsBottomSheetBinding binding; + + public PostOptionsBottomSheetFragment() { + // Required empty public constructor + } + + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param post Post + * @return A new instance of fragment PostOptionsBottomSheetFragment. + */ + public static PostOptionsBottomSheetFragment newInstance(Post post) { + PostOptionsBottomSheetFragment fragment = new PostOptionsBottomSheetFragment(); + Bundle args = new Bundle(); + args.putParcelable(EXTRA_POST, post); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (getArguments() != null) { + mPost = getArguments().getParcelable(EXTRA_POST); + } else { + dismiss(); + } + } + + @Override + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + binding = FragmentPostOptionsBottomSheetBinding.inflate(inflater, container, false); + return binding.getRoot(); + } +}
\ No newline at end of file diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SearchPostSortTypeBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SearchPostSortTypeBottomSheetFragment.java index f07a41db..85d49273 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SearchPostSortTypeBottomSheetFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SearchPostSortTypeBottomSheetFragment.java @@ -49,15 +49,15 @@ public class SearchPostSortTypeBottomSheetFragment extends LandscapeExpandedRoun String currentSortType = getArguments().getString(EXTRA_CURRENT_SORT_TYPE); if (currentSortType.equals(SortType.Type.RELEVANCE.fullName)) { - binding.relevanceTypeTextViewSearchSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.relevanceTypeTextViewSearchSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.relevanceTypeTextViewSearchSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.relevanceTypeTextViewSearchSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.HOT.fullName)) { - binding.hotTypeTextViewSearchSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.hotTypeTextViewSearchSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.hotTypeTextViewSearchSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.hotTypeTextViewSearchSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.TOP.fullName)) { - binding.topTypeTextViewSearchSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.topTypeTextViewSearchSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.topTypeTextViewSearchSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.topTypeTextViewSearchSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.NEW.fullName)) { - binding.newTypeTextViewSearchSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.newTypeTextViewSearchSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.newTypeTextViewSearchSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.newTypeTextViewSearchSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.RISING.fullName)) { - binding.commentsTypeTextViewSearchSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.commentsTypeTextViewSearchSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.commentsTypeTextViewSearchSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.commentsTypeTextViewSearchSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SearchUserAndSubredditSortTypeBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SearchUserAndSubredditSortTypeBottomSheetFragment.java index 978ff641..9cc38685 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SearchUserAndSubredditSortTypeBottomSheetFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SearchUserAndSubredditSortTypeBottomSheetFragment.java @@ -52,9 +52,9 @@ public class SearchUserAndSubredditSortTypeBottomSheetFragment extends Landscape String currentSortType = getArguments().getString(EXTRA_CURRENT_SORT_TYPE); if (currentSortType.equals(SortType.Type.RELEVANCE.fullName)) { - binding.relevanceTypeTextViewSearchUserAndSubredditSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.relevanceTypeTextViewSearchUserAndSubredditSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.relevanceTypeTextViewSearchUserAndSubredditSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.relevanceTypeTextViewSearchUserAndSubredditSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.ACTIVITY.fullName)) { - binding.activityTypeTextViewSearchUserAndSubredditSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.activityTypeTextViewSearchUserAndSubredditSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.activityTypeTextViewSearchUserAndSubredditSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.activityTypeTextViewSearchUserAndSubredditSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/ShareLinkBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/ShareLinkBottomSheetFragment.java index 35632d3a..e4e43156 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/ShareLinkBottomSheetFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/ShareLinkBottomSheetFragment.java @@ -59,19 +59,19 @@ public class ShareLinkBottomSheetFragment extends LandscapeExpandedRoundedBottom binding.shareMediaLinkTextViewShareLinkBottomSheetFragment.setText(R.string.share_image_link); binding.copyMediaLinkTextViewShareLinkBottomSheetFragment.setText(R.string.copy_image_link); binding.shareMediaLinkTextViewShareLinkBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds( - activity.getDrawable(R.drawable.ic_image_24dp), null, null, null); + activity.getDrawable(R.drawable.ic_image_day_night_24dp), null, null, null); break; case Post.GIF_TYPE: binding.shareMediaLinkTextViewShareLinkBottomSheetFragment.setText(R.string.share_gif_link); binding.copyMediaLinkTextViewShareLinkBottomSheetFragment.setText(R.string.copy_gif_link); binding.shareMediaLinkTextViewShareLinkBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds( - activity.getDrawable(R.drawable.ic_image_24dp), null, null, null); + activity.getDrawable(R.drawable.ic_image_day_night_24dp), null, null, null); break; case Post.VIDEO_TYPE: binding.shareMediaLinkTextViewShareLinkBottomSheetFragment.setText(R.string.share_video_link); binding.copyMediaLinkTextViewShareLinkBottomSheetFragment.setText(R.string.copy_video_link); binding.shareMediaLinkTextViewShareLinkBottomSheetFragment.setCompoundDrawablesWithIntrinsicBounds( - activity.getDrawable(R.drawable.ic_outline_video_24dp), null, null, null); + activity.getDrawable(R.drawable.ic_video_day_night_24dp), null, null, null); break; case Post.LINK_TYPE: case Post.NO_PREVIEW_LINK_TYPE: diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SortTypeBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SortTypeBottomSheetFragment.java index 3d21f8c6..9a5a7454 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SortTypeBottomSheetFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/SortTypeBottomSheetFragment.java @@ -65,17 +65,17 @@ public class SortTypeBottomSheetFragment extends LandscapeExpandedRoundedBottomS String currentSortType = getArguments().getString(EXTRA_CURRENT_SORT_TYPE); if (currentSortType.equals(SortType.Type.BEST.fullName)) { - binding.bestTypeTextViewSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.bestTypeTextViewSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.bestTypeTextViewSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.bestTypeTextViewSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.HOT.fullName)) { - binding.hotTypeTextViewSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.hotTypeTextViewSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.hotTypeTextViewSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.hotTypeTextViewSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.NEW.fullName)) { - binding.newTypeTextViewSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.newTypeTextViewSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.newTypeTextViewSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.newTypeTextViewSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.RISING.fullName)) { - binding.risingTypeTextViewSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.risingTypeTextViewSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.risingTypeTextViewSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.risingTypeTextViewSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.TOP.fullName)) { - binding.topTypeTextViewSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.topTypeTextViewSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.topTypeTextViewSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.topTypeTextViewSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.CONTROVERSIAL.fullName)) { - binding.controversialTypeTextViewSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.controversialTypeTextViewSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.controversialTypeTextViewSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.controversialTypeTextViewSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } binding.hotTypeTextViewSortTypeBottomSheetFragment.setOnClickListener(view -> { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/UserThingSortTypeBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/UserThingSortTypeBottomSheetFragment.java index 85c21fdd..e27334cc 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/UserThingSortTypeBottomSheetFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/UserThingSortTypeBottomSheetFragment.java @@ -50,13 +50,13 @@ public class UserThingSortTypeBottomSheetFragment extends LandscapeExpandedRound String currentSortType = getArguments().getString(EXTRA_CURRENT_SORT_TYPE); if (currentSortType.equals(SortType.Type.NEW.fullName)) { - binding.newTypeTextViewUserThingSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.newTypeTextViewUserThingSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.newTypeTextViewUserThingSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.newTypeTextViewUserThingSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.HOT.fullName)) { - binding.hotTypeTextViewUserThingSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.hotTypeTextViewUserThingSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.hotTypeTextViewUserThingSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.hotTypeTextViewUserThingSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.TOP.fullName)) { - binding.topTypeTextViewUserThingSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.topTypeTextViewUserThingSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.topTypeTextViewUserThingSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.topTypeTextViewUserThingSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.CONTROVERSIAL.fullName)) { - binding.controversialTypeTextViewUserThingSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.controversialTypeTextViewUserThingSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + binding.controversialTypeTextViewUserThingSortTypeBottomSheetFragment.setCompoundDrawablesRelativeWithIntrinsicBounds(binding.controversialTypeTextViewUserThingSortTypeBottomSheetFragment.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_check_circle_day_night_24dp), null); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/CommentsListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/CommentsListingFragment.java index 44ca9537..81db03be 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/CommentsListingFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/CommentsListingFragment.java @@ -338,18 +338,18 @@ public class CommentsListingFragment extends Fragment implements FragmentCommuni private void initializeSwipeActionDrawable() { if (swipeRightAction == SharedPreferencesUtils.SWIPE_ACITON_DOWNVOTE) { backgroundSwipeRight = new ColorDrawable(customThemeWrapper.getDownvoted()); - drawableSwipeRight = ResourcesCompat.getDrawable(mActivity.getResources(), R.drawable.ic_arrow_downward_black_24dp, null); + drawableSwipeRight = ResourcesCompat.getDrawable(mActivity.getResources(), R.drawable.ic_arrow_downward_day_night_24dp, null); } else { backgroundSwipeRight = new ColorDrawable(customThemeWrapper.getUpvoted()); - drawableSwipeRight = ResourcesCompat.getDrawable(mActivity.getResources(), R.drawable.ic_arrow_upward_black_24dp, null); + drawableSwipeRight = ResourcesCompat.getDrawable(mActivity.getResources(), R.drawable.ic_arrow_upward_day_night_24dp, null); } if (swipeLeftAction == SharedPreferencesUtils.SWIPE_ACITON_UPVOTE) { backgroundSwipeLeft = new ColorDrawable(customThemeWrapper.getUpvoted()); - drawableSwipeLeft = ResourcesCompat.getDrawable(mActivity.getResources(), R.drawable.ic_arrow_upward_black_24dp, null); + drawableSwipeLeft = ResourcesCompat.getDrawable(mActivity.getResources(), R.drawable.ic_arrow_upward_day_night_24dp, null); } else { backgroundSwipeLeft = new ColorDrawable(customThemeWrapper.getDownvoted()); - drawableSwipeLeft = ResourcesCompat.getDrawable(mActivity.getResources(), R.drawable.ic_arrow_downward_black_24dp, null); + drawableSwipeLeft = ResourcesCompat.getDrawable(mActivity.getResources(), R.drawable.ic_arrow_downward_day_night_24dp, null); } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/HistoryPostFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/HistoryPostFragment.java index 478a3e56..eb47e9ba 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/HistoryPostFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/HistoryPostFragment.java @@ -682,18 +682,18 @@ public class HistoryPostFragment extends Fragment implements FragmentCommunicato private void initializeSwipeActionDrawable() { if (swipeRightAction == SharedPreferencesUtils.SWIPE_ACITON_DOWNVOTE) { backgroundSwipeRight = new ColorDrawable(mCustomThemeWrapper.getDownvoted()); - drawableSwipeRight = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_downward_black_24dp, null); + drawableSwipeRight = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_downward_day_night_24dp, null); } else { backgroundSwipeRight = new ColorDrawable(mCustomThemeWrapper.getUpvoted()); - drawableSwipeRight = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_upward_black_24dp, null); + drawableSwipeRight = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_upward_day_night_24dp, null); } if (swipeLeftAction == SharedPreferencesUtils.SWIPE_ACITON_UPVOTE) { backgroundSwipeLeft = new ColorDrawable(mCustomThemeWrapper.getUpvoted()); - drawableSwipeLeft = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_upward_black_24dp, null); + drawableSwipeLeft = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_upward_day_night_24dp, null); } else { backgroundSwipeLeft = new ColorDrawable(mCustomThemeWrapper.getDownvoted()); - drawableSwipeLeft = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_downward_black_24dp, null); + drawableSwipeLeft = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_downward_day_night_24dp, null); } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java index c61fba65..68131e45 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java @@ -1387,18 +1387,18 @@ public class PostFragment extends Fragment implements FragmentCommunicator { private void initializeSwipeActionDrawable() { if (swipeRightAction == SharedPreferencesUtils.SWIPE_ACITON_DOWNVOTE) { backgroundSwipeRight = new ColorDrawable(mCustomThemeWrapper.getDownvoted()); - drawableSwipeRight = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_downward_black_24dp, null); + drawableSwipeRight = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_downward_day_night_24dp, null); } else { backgroundSwipeRight = new ColorDrawable(mCustomThemeWrapper.getUpvoted()); - drawableSwipeRight = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_upward_black_24dp, null); + drawableSwipeRight = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_upward_day_night_24dp, null); } if (swipeLeftAction == SharedPreferencesUtils.SWIPE_ACITON_UPVOTE) { backgroundSwipeLeft = new ColorDrawable(mCustomThemeWrapper.getUpvoted()); - drawableSwipeLeft = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_upward_black_24dp, null); + drawableSwipeLeft = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_upward_day_night_24dp, null); } else { backgroundSwipeLeft = new ColorDrawable(mCustomThemeWrapper.getDownvoted()); - drawableSwipeLeft = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_downward_black_24dp, null); + drawableSwipeLeft = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_downward_day_night_24dp, null); } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java index cdcfdf95..b9826f11 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java @@ -705,18 +705,18 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic private void initializeSwipeActionDrawable() { if (swipeRightAction == SharedPreferencesUtils.SWIPE_ACITON_DOWNVOTE) { backgroundSwipeRight = new ColorDrawable(mCustomThemeWrapper.getDownvoted()); - drawableSwipeRight = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_arrow_downward_black_24dp, null); + drawableSwipeRight = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_arrow_downward_day_night_24dp, null); } else { backgroundSwipeRight = new ColorDrawable(mCustomThemeWrapper.getUpvoted()); - drawableSwipeRight = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_arrow_upward_black_24dp, null); + drawableSwipeRight = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_arrow_upward_day_night_24dp, null); } if (swipeLeftAction == SharedPreferencesUtils.SWIPE_ACITON_UPVOTE) { backgroundSwipeLeft = new ColorDrawable(mCustomThemeWrapper.getUpvoted()); - drawableSwipeLeft = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_arrow_upward_black_24dp, null); + drawableSwipeLeft = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_arrow_upward_day_night_24dp, null); } else { backgroundSwipeLeft = new ColorDrawable(mCustomThemeWrapper.getDownvoted()); - drawableSwipeLeft = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_arrow_downward_black_24dp, null); + drawableSwipeLeft = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_arrow_downward_day_night_24dp, null); } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/settings/CustomizeBottomAppBarFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/CustomizeBottomAppBarFragment.java index 6bfd4af6..0c808599 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/settings/CustomizeBottomAppBarFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/CustomizeBottomAppBarFragment.java @@ -318,7 +318,7 @@ public class CustomizeBottomAppBarFragment extends Fragment { int secondaryTextColor = activity.customThemeWrapper.getSecondaryTextColor(); int accentColor = activity.customThemeWrapper.getColorAccent(); binding.infoTextViewCustomizeBottomAppBarFragment.setTextColor(secondaryTextColor); - Drawable infoDrawable = Utils.getTintedDrawable(activity, R.drawable.ic_info_preference_24dp, activity.customThemeWrapper.getPrimaryIconColor()); + Drawable infoDrawable = Utils.getTintedDrawable(activity, R.drawable.ic_info_preference_day_night_24dp, activity.customThemeWrapper.getPrimaryIconColor()); binding.infoTextViewCustomizeBottomAppBarFragment.setCompoundDrawablesWithIntrinsicBounds(infoDrawable, null, null, null); binding.mainActivityGroupSummaryCustomizeBottomAppBarFragment.setTextColor(accentColor); binding.mainActivityOptionCountTitleTextViewCustomizeBottomAppBarFragment.setTextColor(primaryTextColor); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/settings/CustomizeMainPageTabsFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/CustomizeMainPageTabsFragment.java index d352a5e7..525defaf 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/settings/CustomizeMainPageTabsFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/CustomizeMainPageTabsFragment.java @@ -401,7 +401,7 @@ public class CustomizeMainPageTabsFragment extends Fragment { int colorAccent = activity.customThemeWrapper.getColorAccent(); int primaryIconColor = activity.customThemeWrapper.getPrimaryIconColor(); binding.infoTextViewCustomizeMainPageTabsFragment.setTextColor(secondaryTextColor); - Drawable infoDrawable = Utils.getTintedDrawable(activity, R.drawable.ic_info_preference_24dp, secondaryTextColor); + Drawable infoDrawable = Utils.getTintedDrawable(activity, R.drawable.ic_info_preference_day_night_24dp, secondaryTextColor); binding.infoTextViewCustomizeMainPageTabsFragment.setCompoundDrawablesWithIntrinsicBounds(infoDrawable, null, null, null); binding.tabCountTitleTextViewCustomizeMainPageTabsFragment.setTextColor(primaryTextColor); binding.tabCountTextViewCustomizeMainPageTabsFragment.setTextColor(secondaryTextColor); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/settings/NsfwAndSpoilerFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/NsfwAndSpoilerFragment.java index 6cebdc41..df14c496 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/settings/NsfwAndSpoilerFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/NsfwAndSpoilerFragment.java @@ -156,7 +156,7 @@ public class NsfwAndSpoilerFragment extends Fragment { private void applyCustomTheme() { int primaryTextColor = activity.customThemeWrapper.getPrimaryTextColor(); - binding.enableNsfwTextViewNsfwAndSpoilerFragment.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(activity, R.drawable.ic_nsfw_on_24dp, activity.customThemeWrapper.getPrimaryIconColor()), null, null, null); + binding.enableNsfwTextViewNsfwAndSpoilerFragment.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(activity, R.drawable.ic_nsfw_on_day_night_24dp, activity.customThemeWrapper.getPrimaryIconColor()), null, null, null); binding.enableNsfwTextViewNsfwAndSpoilerFragment.setTextColor(primaryTextColor); binding.blurNsfwTextViewNsfwAndSpoilerFragment.setTextColor(primaryTextColor); binding.doNotBlurNsfwTextViewNsfwAndSpoilerFragment.setTextColor(primaryTextColor); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/settings/PostHistoryFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/PostHistoryFragment.java index 123679a5..0268a7ca 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/settings/PostHistoryFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/PostHistoryFragment.java @@ -92,7 +92,7 @@ public class PostHistoryFragment extends Fragment { private void applyCustomTheme() { binding.infoTextViewPostHistoryFragment.setTextColor(activity.customThemeWrapper.getSecondaryTextColor()); - Drawable infoDrawable = Utils.getTintedDrawable(activity, R.drawable.ic_info_preference_24dp, activity.customThemeWrapper.getPrimaryIconColor()); + Drawable infoDrawable = Utils.getTintedDrawable(activity, R.drawable.ic_info_preference_day_night_24dp, activity.customThemeWrapper.getPrimaryIconColor()); binding.infoTextViewPostHistoryFragment.setCompoundDrawablesWithIntrinsicBounds(infoDrawable, null, null, null); int primaryTextColor = activity.customThemeWrapper.getPrimaryTextColor(); binding.markPostsAsReadTextViewPostHistoryFragment.setTextColor(primaryTextColor); diff --git a/app/src/main/res/drawable-night/ic_about_24dp.xml b/app/src/main/res/drawable-night/ic_about_day_night_24dp.xml index e0580503..e0580503 100644 --- a/app/src/main/res/drawable-night/ic_about_24dp.xml +++ b/app/src/main/res/drawable-night/ic_about_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_outline_access_time_24dp.xml b/app/src/main/res/drawable-night/ic_access_time_day_night_24dp.xml index a846b915..a846b915 100644 --- a/app/src/main/res/drawable-night/ic_outline_access_time_24dp.xml +++ b/app/src/main/res/drawable-night/ic_access_time_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_account_circle_24dp.xml b/app/src/main/res/drawable-night/ic_account_circle_day_night_24dp.xml index cad8c2bc..cad8c2bc 100644 --- a/app/src/main/res/drawable-night/ic_account_circle_24dp.xml +++ b/app/src/main/res/drawable-night/ic_account_circle_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_outline_add_a_photo_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_add_a_photo_day_night_24dp.xml index 57869fc5..57869fc5 100644 --- a/app/src/main/res/drawable-night/ic_outline_add_a_photo_day_night_24dp.xml +++ b/app/src/main/res/drawable-night/ic_add_a_photo_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_outline_add_circle_outline_24dp.xml b/app/src/main/res/drawable-night/ic_add_circle_outline_day_night_24dp.xml index 8c721cf1..8c721cf1 100644 --- a/app/src/main/res/drawable-night/ic_outline_add_circle_outline_24dp.xml +++ b/app/src/main/res/drawable-night/ic_add_circle_outline_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_advanced_24dp.xml b/app/src/main/res/drawable-night/ic_advanced_day_night_24dp.xml index f4fbd6c9..f4fbd6c9 100644 --- a/app/src/main/res/drawable-night/ic_advanced_24dp.xml +++ b/app/src/main/res/drawable-night/ic_advanced_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_amoled_theme_preference_24dp.xml b/app/src/main/res/drawable-night/ic_amoled_theme_preference_day_night_24dp.xml index 3eb4a608..3eb4a608 100644 --- a/app/src/main/res/drawable-night/ic_amoled_theme_preference_24dp.xml +++ b/app/src/main/res/drawable-night/ic_amoled_theme_preference_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_anonymous_24dp.xml b/app/src/main/res/drawable-night/ic_anonymous_day_night_24dp.xml index 7a00ccf5..7a00ccf5 100644 --- a/app/src/main/res/drawable-night/ic_anonymous_24dp.xml +++ b/app/src/main/res/drawable-night/ic_anonymous_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_apply_to_24dp.xml b/app/src/main/res/drawable-night/ic_apply_to_day_night_24dp.xml index ee73a4df..ee73a4df 100644 --- a/app/src/main/res/drawable-night/ic_apply_to_24dp.xml +++ b/app/src/main/res/drawable-night/ic_apply_to_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_arrow_downward_black_24dp.xml b/app/src/main/res/drawable-night/ic_arrow_downward_day_night_24dp.xml index 90611a60..90611a60 100644 --- a/app/src/main/res/drawable-night/ic_arrow_downward_black_24dp.xml +++ b/app/src/main/res/drawable-night/ic_arrow_downward_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_arrow_upward_black_24dp.xml b/app/src/main/res/drawable-night/ic_arrow_upward_day_night_24dp.xml index b7323a1e..b7323a1e 100644 --- a/app/src/main/res/drawable-night/ic_arrow_upward_black_24dp.xml +++ b/app/src/main/res/drawable-night/ic_arrow_upward_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_bookmark_border_24dp.xml b/app/src/main/res/drawable-night/ic_bookmark_border_day_night_24dp.xml index f41f953b..f41f953b 100644 --- a/app/src/main/res/drawable-night/ic_bookmark_border_24dp.xml +++ b/app/src/main/res/drawable-night/ic_bookmark_border_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_bookmark_24dp.xml b/app/src/main/res/drawable-night/ic_bookmark_day_night_24dp.xml index edee7cf9..edee7cf9 100644 --- a/app/src/main/res/drawable-night/ic_bookmark_24dp.xml +++ b/app/src/main/res/drawable-night/ic_bookmark_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_outline_bookmarks_24dp.xml b/app/src/main/res/drawable-night/ic_bookmarks_day_night_24dp.xml index dc287190..dc287190 100644 --- a/app/src/main/res/drawable-night/ic_outline_bookmarks_24dp.xml +++ b/app/src/main/res/drawable-night/ic_bookmarks_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_round_check_circle_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_check_circle_day_night_24dp.xml index d11c68bf..d11c68bf 100644 --- a/app/src/main/res/drawable-night/ic_round_check_circle_day_night_24dp.xml +++ b/app/src/main/res/drawable-night/ic_check_circle_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_outline_color_lens_24dp.xml b/app/src/main/res/drawable-night/ic_color_lens_day_night_24dp.xml index 6fa0d26f..6fa0d26f 100644 --- a/app/src/main/res/drawable-night/ic_outline_color_lens_24dp.xml +++ b/app/src/main/res/drawable-night/ic_color_lens_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_copy_24dp.xml b/app/src/main/res/drawable-night/ic_copy_day_night_24dp.xml index 00d23548..00d23548 100644 --- a/app/src/main/res/drawable-night/ic_copy_24dp.xml +++ b/app/src/main/res/drawable-night/ic_copy_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_dark_theme_preference_24dp.xml b/app/src/main/res/drawable-night/ic_dark_theme_preference_day_night_24dp.xml index 3ea2743e..3ea2743e 100644 --- a/app/src/main/res/drawable-night/ic_dark_theme_preference_24dp.xml +++ b/app/src/main/res/drawable-night/ic_dark_theme_preference_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_data_saving_mode_24dp.xml b/app/src/main/res/drawable-night/ic_data_saving_mode_day_night_24dp.xml index 49d83ff8..49d83ff8 100644 --- a/app/src/main/res/drawable-night/ic_data_saving_mode_24dp.xml +++ b/app/src/main/res/drawable-night/ic_data_saving_mode_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_delete_24dp.xml b/app/src/main/res/drawable-night/ic_delete_day_night_24dp.xml index 4169cae5..4169cae5 100644 --- a/app/src/main/res/drawable-night/ic_delete_24dp.xml +++ b/app/src/main/res/drawable-night/ic_delete_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_download_24dp.xml b/app/src/main/res/drawable-night/ic_download_day_night_24dp.xml index eb39e3f3..eb39e3f3 100644 --- a/app/src/main/res/drawable-night/ic_download_24dp.xml +++ b/app/src/main/res/drawable-night/ic_download_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_edit_24dp.xml b/app/src/main/res/drawable-night/ic_edit_day_night_24dp.xml index 7f32de65..7f32de65 100644 --- a/app/src/main/res/drawable-night/ic_edit_24dp.xml +++ b/app/src/main/res/drawable-night/ic_edit_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_error_outline_black_24dp.xml b/app/src/main/res/drawable-night/ic_error_outline_black_day_night_24dp.xml index e7d3eb31..e7d3eb31 100644 --- a/app/src/main/res/drawable-night/ic_error_outline_black_24dp.xml +++ b/app/src/main/res/drawable-night/ic_error_outline_black_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_exit_24dp.xml b/app/src/main/res/drawable-night/ic_exit_day_night_24dp.xml index ce5bd595..ce5bd595 100644 --- a/app/src/main/res/drawable-night/ic_exit_24dp.xml +++ b/app/src/main/res/drawable-night/ic_exit_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_filter_24dp.xml b/app/src/main/res/drawable-night/ic_filter_day_night_24dp.xml index 641119c4..641119c4 100644 --- a/app/src/main/res/drawable-night/ic_filter_24dp.xml +++ b/app/src/main/res/drawable-night/ic_filter_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_font_size_24dp.xml b/app/src/main/res/drawable-night/ic_font_size_day_night_24dp.xml index 44c361be..44c361be 100644 --- a/app/src/main/res/drawable-night/ic_font_size_24dp.xml +++ b/app/src/main/res/drawable-night/ic_font_size_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_gallery_24dp.xml b/app/src/main/res/drawable-night/ic_gallery_day_night_24dp.xml index d54dba10..d54dba10 100644 --- a/app/src/main/res/drawable-night/ic_gallery_24dp.xml +++ b/app/src/main/res/drawable-night/ic_gallery_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_gesture_24dp.xml b/app/src/main/res/drawable-night/ic_gesture_day_night_24dp.xml index 4ad8e70e..4ad8e70e 100644 --- a/app/src/main/res/drawable-night/ic_gesture_24dp.xml +++ b/app/src/main/res/drawable-night/ic_gesture_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_give_award_24dp.xml b/app/src/main/res/drawable-night/ic_give_award_day_night_24dp.xml index cb3c05a5..cb3c05a5 100644 --- a/app/src/main/res/drawable-night/ic_give_award_24dp.xml +++ b/app/src/main/res/drawable-night/ic_give_award_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_hide_post_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_hide_post_day_night_24dp.xml new file mode 100644 index 00000000..a00a0d8c --- /dev/null +++ b/app/src/main/res/drawable-night/ic_hide_post_day_night_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + <path + android:pathData="m791,905 l-91,-91q-49,32 -104.5,49T480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480q0,-60 17,-115.5T146,260l-91,-91 57,-57 736,736 -57,57ZM480,800q43,0 83.5,-11t78.5,-33L204,318q-22,38 -33,78.5T160,480q0,133 93.5,226.5T480,800ZM814,700 L756,642q22,-38 33,-78.5t11,-83.5q0,-133 -93.5,-226.5T480,160q-43,0 -83.5,11T318,204l-58,-58q49,-32 104.5,-49T480,80q83,0 156,31.5T763,197q54,54 85.5,127T880,480q0,60 -17,115.5T814,700ZM537,423ZM423,537Z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/app/src/main/res/drawable-night/ic_hide_read_posts_24dp.xml b/app/src/main/res/drawable-night/ic_hide_read_posts_day_night_24dp.xml index ea2c937f..ea2c937f 100644 --- a/app/src/main/res/drawable-night/ic_hide_read_posts_24dp.xml +++ b/app/src/main/res/drawable-night/ic_hide_read_posts_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_history_24dp.xml b/app/src/main/res/drawable-night/ic_history_day_night_24dp.xml index af91e161..af91e161 100644 --- a/app/src/main/res/drawable-night/ic_history_24dp.xml +++ b/app/src/main/res/drawable-night/ic_history_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_home_black_24dp.xml b/app/src/main/res/drawable-night/ic_home_day_night_24dp.xml index c112c91b..c112c91b 100644 --- a/app/src/main/res/drawable-night/ic_home_black_24dp.xml +++ b/app/src/main/res/drawable-night/ic_home_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_image_24dp.xml b/app/src/main/res/drawable-night/ic_image_day_night_24dp.xml index 6f61394f..6f61394f 100644 --- a/app/src/main/res/drawable-night/ic_image_24dp.xml +++ b/app/src/main/res/drawable-night/ic_image_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_inbox_24dp.xml b/app/src/main/res/drawable-night/ic_inbox_day_night_24dp.xml index cc3f203c..cc3f203c 100644 --- a/app/src/main/res/drawable-night/ic_inbox_24dp.xml +++ b/app/src/main/res/drawable-night/ic_inbox_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_info_preference_24dp.xml b/app/src/main/res/drawable-night/ic_info_preference_day_night_24dp.xml index 10088cff..10088cff 100644 --- a/app/src/main/res/drawable-night/ic_info_preference_24dp.xml +++ b/app/src/main/res/drawable-night/ic_info_preference_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_interface_24dp.xml b/app/src/main/res/drawable-night/ic_interface_day_night_24dp.xml index 633b54cb..633b54cb 100644 --- a/app/src/main/res/drawable-night/ic_interface_24dp.xml +++ b/app/src/main/res/drawable-night/ic_interface_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_keyboard_double_arrow_up_24.xml b/app/src/main/res/drawable-night/ic_keyboard_double_arrow_up_day_night_24dp.xml index cea7e80b..cea7e80b 100644 --- a/app/src/main/res/drawable-night/ic_keyboard_double_arrow_up_24.xml +++ b/app/src/main/res/drawable-night/ic_keyboard_double_arrow_up_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_language_24dp.xml b/app/src/main/res/drawable-night/ic_language_day_night_24dp.xml index e6e0586d..e6e0586d 100644 --- a/app/src/main/res/drawable-night/ic_language_24dp.xml +++ b/app/src/main/res/drawable-night/ic_language_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_light_theme_preference_24dp.xml b/app/src/main/res/drawable-night/ic_light_theme_preference_day_night_24dp.xml index 8a7d0fe8..8a7d0fe8 100644 --- a/app/src/main/res/drawable-night/ic_light_theme_preference_24dp.xml +++ b/app/src/main/res/drawable-night/ic_light_theme_preference_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_link.xml b/app/src/main/res/drawable-night/ic_link_day_night_24dp.xml index 720bb7c5..720bb7c5 100644 --- a/app/src/main/res/drawable-night/ic_link.xml +++ b/app/src/main/res/drawable-night/ic_link_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_link_post_type_indicator.xml b/app/src/main/res/drawable-night/ic_link_post_type_indicator_day_night_24dp.xml index 4b447423..4b447423 100644 --- a/app/src/main/res/drawable-night/ic_link_post_type_indicator.xml +++ b/app/src/main/res/drawable-night/ic_link_post_type_indicator_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_outline_lock_24dp.xml b/app/src/main/res/drawable-night/ic_lock_day_night_24dp.xml index d4968533..d4968533 100644 --- a/app/src/main/res/drawable-night/ic_outline_lock_24dp.xml +++ b/app/src/main/res/drawable-night/ic_lock_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_log_out_24dp.xml b/app/src/main/res/drawable-night/ic_log_out_day_night_24dp.xml index 4885d221..4885d221 100644 --- a/app/src/main/res/drawable-night/ic_log_out_24dp.xml +++ b/app/src/main/res/drawable-night/ic_log_out_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_miscellaneous_24dp.xml b/app/src/main/res/drawable-night/ic_miscellaneous_day_night_24dp.xml index 52a52180..52a52180 100644 --- a/app/src/main/res/drawable-night/ic_miscellaneous_24dp.xml +++ b/app/src/main/res/drawable-night/ic_miscellaneous_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_multi_reddit_24dp.xml b/app/src/main/res/drawable-night/ic_multi_reddit_day_night_24dp.xml index 0dd56678..0dd56678 100644 --- a/app/src/main/res/drawable-night/ic_multi_reddit_24dp.xml +++ b/app/src/main/res/drawable-night/ic_multi_reddit_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_mute_preferences_24dp.xml b/app/src/main/res/drawable-night/ic_mute_preferences_day_night_24dp.xml index ff764c78..ff764c78 100644 --- a/app/src/main/res/drawable-night/ic_mute_preferences_24dp.xml +++ b/app/src/main/res/drawable-night/ic_mute_preferences_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_outline_notifications_24dp.xml b/app/src/main/res/drawable-night/ic_notifications_day_night_24dp.xml index 43d52df4..43d52df4 100644 --- a/app/src/main/res/drawable-night/ic_outline_notifications_24dp.xml +++ b/app/src/main/res/drawable-night/ic_notifications_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_nsfw_off_24dp.xml b/app/src/main/res/drawable-night/ic_nsfw_off_day_night_24dp.xml index 9f331000..9f331000 100644 --- a/app/src/main/res/drawable-night/ic_nsfw_off_24dp.xml +++ b/app/src/main/res/drawable-night/ic_nsfw_off_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_nsfw_on_24dp.xml b/app/src/main/res/drawable-night/ic_nsfw_on_day_night_24dp.xml index ccd0b005..ccd0b005 100644 --- a/app/src/main/res/drawable-night/ic_nsfw_on_24dp.xml +++ b/app/src/main/res/drawable-night/ic_nsfw_on_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_open_link_24dp.xml b/app/src/main/res/drawable-night/ic_open_link_day_night_24dp.xml index db3c9198..db3c9198 100644 --- a/app/src/main/res/drawable-night/ic_open_link_24dp.xml +++ b/app/src/main/res/drawable-night/ic_open_link_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_playback_speed_24dp.xml b/app/src/main/res/drawable-night/ic_playback_speed_day_night_24dp.xml index 1e774fee..1e774fee 100644 --- a/app/src/main/res/drawable-night/ic_playback_speed_24dp.xml +++ b/app/src/main/res/drawable-night/ic_playback_speed_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_poll_24dp.xml b/app/src/main/res/drawable-night/ic_poll_day_night_24dp.xml index fa199daf..fa199daf 100644 --- a/app/src/main/res/drawable-night/ic_poll_24dp.xml +++ b/app/src/main/res/drawable-night/ic_poll_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_post_layout_24dp.xml b/app/src/main/res/drawable-night/ic_post_layout_day_night_24dp.xml index c83788d8..c83788d8 100644 --- a/app/src/main/res/drawable-night/ic_post_layout_24dp.xml +++ b/app/src/main/res/drawable-night/ic_post_layout_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_preview_24dp.xml b/app/src/main/res/drawable-night/ic_preview_day_night_24dp.xml index e54e3a9f..e54e3a9f 100644 --- a/app/src/main/res/drawable-night/ic_preview_24dp.xml +++ b/app/src/main/res/drawable-night/ic_preview_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_outline_privacy_policy_24dp.xml b/app/src/main/res/drawable-night/ic_privacy_policy_day_night_24dp.xml index 6aeb54e1..6aeb54e1 100644 --- a/app/src/main/res/drawable-night/ic_outline_privacy_policy_24dp.xml +++ b/app/src/main/res/drawable-night/ic_privacy_policy_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_random_24dp.xml b/app/src/main/res/drawable-night/ic_random_day_night_24dp.xml index b80a99cf..b80a99cf 100644 --- a/app/src/main/res/drawable-night/ic_random_24dp.xml +++ b/app/src/main/res/drawable-night/ic_random_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_refresh_24dp.xml b/app/src/main/res/drawable-night/ic_refresh_day_night_24dp.xml index 768b210a..768b210a 100644 --- a/app/src/main/res/drawable-night/ic_refresh_24dp.xml +++ b/app/src/main/res/drawable-night/ic_refresh_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_reply_24dp.xml b/app/src/main/res/drawable-night/ic_reply_day_night_24dp.xml index f8ebec5e..f8ebec5e 100644 --- a/app/src/main/res/drawable-night/ic_reply_24dp.xml +++ b/app/src/main/res/drawable-night/ic_reply_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_report_24dp.xml b/app/src/main/res/drawable-night/ic_report_day_night_24dp.xml index 252ebc72..252ebc72 100644 --- a/app/src/main/res/drawable-night/ic_report_24dp.xml +++ b/app/src/main/res/drawable-night/ic_report_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_save_to_database_24dp.xml b/app/src/main/res/drawable-night/ic_save_to_database_day_night_24dp.xml index b10b206f..b10b206f 100644 --- a/app/src/main/res/drawable-night/ic_save_to_database_24dp.xml +++ b/app/src/main/res/drawable-night/ic_save_to_database_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_search_24dp.xml b/app/src/main/res/drawable-night/ic_search_day_night_24dp.xml index 466e71dd..466e71dd 100644 --- a/app/src/main/res/drawable-night/ic_search_24dp.xml +++ b/app/src/main/res/drawable-night/ic_search_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_security_24dp.xml b/app/src/main/res/drawable-night/ic_security_day_night_24dp.xml index 3e21f473..3e21f473 100644 --- a/app/src/main/res/drawable-night/ic_security_24dp.xml +++ b/app/src/main/res/drawable-night/ic_security_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_outline_select_photo_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_select_photo_day_night_24dp.xml index 136ace9f..136ace9f 100644 --- a/app/src/main/res/drawable-night/ic_outline_select_photo_day_night_24dp.xml +++ b/app/src/main/res/drawable-night/ic_select_photo_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_settings_24dp.xml b/app/src/main/res/drawable-night/ic_settings_day_night_24dp.xml index 364c03b7..364c03b7 100644 --- a/app/src/main/res/drawable-night/ic_settings_24dp.xml +++ b/app/src/main/res/drawable-night/ic_settings_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_share_24dp.xml b/app/src/main/res/drawable-night/ic_share_day_night_24dp.xml index cbe3d4aa..cbe3d4aa 100644 --- a/app/src/main/res/drawable-night/ic_share_24dp.xml +++ b/app/src/main/res/drawable-night/ic_share_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_sort_24dp.xml b/app/src/main/res/drawable-night/ic_sort_day_night_24dp.xml index e795d2a2..e795d2a2 100644 --- a/app/src/main/res/drawable-night/ic_sort_24dp.xml +++ b/app/src/main/res/drawable-night/ic_sort_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_submit_post_24dp.xml b/app/src/main/res/drawable-night/ic_submit_post_day_night_24dp.xml index 21ef5658..21ef5658 100644 --- a/app/src/main/res/drawable-night/ic_submit_post_24dp.xml +++ b/app/src/main/res/drawable-night/ic_submit_post_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_subreddit_24dp.xml b/app/src/main/res/drawable-night/ic_subreddit_day_night_24dp.xml index 505f8067..505f8067 100644 --- a/app/src/main/res/drawable-night/ic_subreddit_24dp.xml +++ b/app/src/main/res/drawable-night/ic_subreddit_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_subscritptions_bottom_app_bar_24dp.xml b/app/src/main/res/drawable-night/ic_subscriptions_bottom_app_bar_day_night_24dp.xml index 660848ef..660848ef 100644 --- a/app/src/main/res/drawable-night/ic_subscritptions_bottom_app_bar_24dp.xml +++ b/app/src/main/res/drawable-night/ic_subscriptions_bottom_app_bar_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_text_24dp.xml b/app/src/main/res/drawable-night/ic_text_day_night_24dp.xml index a88d9084..a88d9084 100644 --- a/app/src/main/res/drawable-night/ic_text_24dp.xml +++ b/app/src/main/res/drawable-night/ic_text_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_outline_user_agreement_24dp.xml b/app/src/main/res/drawable-night/ic_user_agreement_day_night_24dp.xml index 694f0d45..694f0d45 100644 --- a/app/src/main/res/drawable-night/ic_outline_user_agreement_24dp.xml +++ b/app/src/main/res/drawable-night/ic_user_agreement_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_user_24dp.xml b/app/src/main/res/drawable-night/ic_user_day_night_24dp.xml index 4b963261..4b963261 100644 --- a/app/src/main/res/drawable-night/ic_user_24dp.xml +++ b/app/src/main/res/drawable-night/ic_user_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_outline_video_24dp.xml b/app/src/main/res/drawable-night/ic_video_day_night_24dp.xml index b3546bb6..b3546bb6 100644 --- a/app/src/main/res/drawable-night/ic_outline_video_24dp.xml +++ b/app/src/main/res/drawable-night/ic_video_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_wallpaper_both_black_24dp.xml b/app/src/main/res/drawable-night/ic_wallpaper_both_day_night_24dp.xml index d41e02ac..d41e02ac 100644 --- a/app/src/main/res/drawable-night/ic_wallpaper_both_black_24dp.xml +++ b/app/src/main/res/drawable-night/ic_wallpaper_both_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_wallpaper_home_screen_black_24dp.xml b/app/src/main/res/drawable-night/ic_wallpaper_home_screen_day_night_24dp.xml index c112c91b..c112c91b 100644 --- a/app/src/main/res/drawable-night/ic_wallpaper_home_screen_black_24dp.xml +++ b/app/src/main/res/drawable-night/ic_wallpaper_home_screen_day_night_24dp.xml diff --git a/app/src/main/res/drawable-night/ic_wallpaper_lock_screen_black_24dp.xml b/app/src/main/res/drawable-night/ic_wallpaper_lock_screen_day_night_24dp.xml index c771c895..c771c895 100644 --- a/app/src/main/res/drawable-night/ic_wallpaper_lock_screen_black_24dp.xml +++ b/app/src/main/res/drawable-night/ic_wallpaper_lock_screen_day_night_24dp.xml diff --git a/app/src/main/res/drawable/crosspost.xml b/app/src/main/res/drawable/crosspost.xml deleted file mode 100644 index c8b43c52..00000000 --- a/app/src/main/res/drawable/crosspost.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="27.963dp" - android:height="27.963dp" - android:viewportWidth="27.963" - android:viewportHeight="27.963"> - - <path - android:fillColor="#030104" - android:pathData="M7.254,12.923c-0.117,0-0.234-0.043-0.324-0.125c-0.316-0.295-0.588-0.533-0.834-0.73 c-1.076-0.887-1.9-1.195-2.312-1.195H0.475C0.213,10.872,0,10.655,0,10.395V6.763c0-0.256,0.213-0.471,0.475-0.471h3.268 c1.352,0.004,2.695,0.457,4.104,1.385c0.701,0.463,1.404,1.029,2.207,1.779c0.092,0.084,0.148,0.209,0.15,0.334 c0.004,0.125-0.045,0.25-0.131,0.342c-0.459,0.48-0.91,0.963-1.355,1.438c-0.386,0.419-0.757,0.818-1.122,1.204 C7.504,12.874,7.379,12.923,7.254,12.923z" /> - <path - android:fillColor="#030104" - android:pathData="M21.818,24.675c-0.068,0-0.133-0.012-0.199-0.043c-0.166-0.078-0.275-0.244-0.275-0.426v-2.402 h-2.342c-1.363-0.006-2.723-0.453-4.143-1.379c-0.703-0.459-1.406-1.02-2.213-1.764c-0.096-0.086-0.146-0.207-0.15-0.336 c-0.006-0.127,0.039-0.248,0.131-0.344c0.488-0.506,0.969-1.021,1.439-1.531c0.355-0.383,0.697-0.752,1.035-1.109 c0.18-0.186,0.475-0.197,0.67-0.023c0.301,0.281,0.564,0.51,0.805,0.697c0.932,0.762,1.822,1.211,2.389,1.211h2.379V14.65 c0-0.184,0.109-0.355,0.275-0.432s0.367-0.053,0.508,0.064l5.662,4.787c0.109,0.092,0.174,0.223,0.174,0.363 s-0.064,0.273-0.174,0.363l-5.662,4.768C22.039,24.64,21.93,24.675,21.818,24.675z" /> - <path - android:fillColor="#030104" - android:pathData="M3.689,21.804H0.475C0.213,21.804,0,21.591,0,21.327V17.7c0-0.262,0.213-0.475,0.475-0.475H3.69 c0.436,0,1.016-0.229,1.648-0.641c0.682-0.443,1.523-1.16,2.492-2.143c0.613-0.609,1.221-1.271,1.867-1.965 c1.27-1.377,2.588-2.801,4.016-3.963c1.27-1.023,3.014-2.199,5.23-2.223h2.4V3.763c0-0.186,0.109-0.354,0.275-0.432 c0.166-0.074,0.367-0.051,0.508,0.066l5.662,4.785c0.109,0.09,0.174,0.225,0.174,0.365c0,0.14-0.066,0.271-0.174,0.363 l-5.662,4.768c-0.141,0.117-0.342,0.146-0.508,0.07c-0.166-0.078-0.275-0.25-0.275-0.432v-2.444h-2.396 c-0.246,0-0.756,0.078-1.586,0.629c-0.676,0.441-1.506,1.164-2.475,2.146c-0.588,0.596-1.174,1.229-1.797,1.904 c-1.301,1.398-2.643,2.854-4.109,4.035c-1.289,1.023-3.045,2.195-5.289,2.217C3.691,21.804,3.691,21.804,3.689,21.804z" /> -</vector>
\ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about_24dp.xml b/app/src/main/res/drawable/ic_about_day_night_24dp.xml index 58603013..58603013 100644 --- a/app/src/main/res/drawable/ic_about_24dp.xml +++ b/app/src/main/res/drawable/ic_about_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_outline_access_time_24dp.xml b/app/src/main/res/drawable/ic_access_time_day_night_24dp.xml index dcb0d6ec..dcb0d6ec 100644 --- a/app/src/main/res/drawable/ic_outline_access_time_24dp.xml +++ b/app/src/main/res/drawable/ic_access_time_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_account_circle_24dp.xml b/app/src/main/res/drawable/ic_account_circle_day_night_24dp.xml index 0c9a104b..0c9a104b 100644 --- a/app/src/main/res/drawable/ic_account_circle_24dp.xml +++ b/app/src/main/res/drawable/ic_account_circle_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_outline_add_a_photo_24dp.xml b/app/src/main/res/drawable/ic_add_a_photo_24dp.xml index 98c1ac80..98c1ac80 100644 --- a/app/src/main/res/drawable/ic_outline_add_a_photo_24dp.xml +++ b/app/src/main/res/drawable/ic_add_a_photo_24dp.xml diff --git a/app/src/main/res/drawable/ic_outline_add_a_photo_day_night_24dp.xml b/app/src/main/res/drawable/ic_add_a_photo_day_night_24dp.xml index 98c1ac80..98c1ac80 100644 --- a/app/src/main/res/drawable/ic_outline_add_a_photo_day_night_24dp.xml +++ b/app/src/main/res/drawable/ic_add_a_photo_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_outline_add_circle_outline_24dp.xml b/app/src/main/res/drawable/ic_add_circle_outline_day_night_24dp.xml index 8611136a..8611136a 100644 --- a/app/src/main/res/drawable/ic_outline_add_circle_outline_24dp.xml +++ b/app/src/main/res/drawable/ic_add_circle_outline_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_advanced_24dp.xml b/app/src/main/res/drawable/ic_advanced_day_night_24dp.xml index 146913cd..146913cd 100644 --- a/app/src/main/res/drawable/ic_advanced_24dp.xml +++ b/app/src/main/res/drawable/ic_advanced_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_amoled_theme_preference_24dp.xml b/app/src/main/res/drawable/ic_amoled_theme_preference_day_night_24dp.xml index 1389a13e..1389a13e 100644 --- a/app/src/main/res/drawable/ic_amoled_theme_preference_24dp.xml +++ b/app/src/main/res/drawable/ic_amoled_theme_preference_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_anonymous_24dp.xml b/app/src/main/res/drawable/ic_anonymous_day_night_24dp.xml index aafeefba..aafeefba 100644 --- a/app/src/main/res/drawable/ic_anonymous_24dp.xml +++ b/app/src/main/res/drawable/ic_anonymous_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_apply_to_24dp.xml b/app/src/main/res/drawable/ic_apply_to_day_night_24dp.xml index 23e47b34..23e47b34 100644 --- a/app/src/main/res/drawable/ic_apply_to_24dp.xml +++ b/app/src/main/res/drawable/ic_apply_to_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_arrow_downward_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_downward_day_night_24dp.xml index b6967461..b6967461 100644 --- a/app/src/main/res/drawable/ic_arrow_downward_black_24dp.xml +++ b/app/src/main/res/drawable/ic_arrow_downward_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_arrow_upward_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_upward_day_night_24dp.xml index fb30b2cb..fb30b2cb 100644 --- a/app/src/main/res/drawable/ic_arrow_upward_black_24dp.xml +++ b/app/src/main/res/drawable/ic_arrow_upward_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_bookmark_border_24dp.xml b/app/src/main/res/drawable/ic_bookmark_border_day_night_24dp.xml index 22c3d5fa..22c3d5fa 100644 --- a/app/src/main/res/drawable/ic_bookmark_border_24dp.xml +++ b/app/src/main/res/drawable/ic_bookmark_border_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_bookmark_24dp.xml b/app/src/main/res/drawable/ic_bookmark_day_night_24dp.xml index 05588d52..05588d52 100644 --- a/app/src/main/res/drawable/ic_bookmark_24dp.xml +++ b/app/src/main/res/drawable/ic_bookmark_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_outline_bookmarks_24dp.xml b/app/src/main/res/drawable/ic_bookmarks_day_night_24dp.xml index 33ceac3f..33ceac3f 100644 --- a/app/src/main/res/drawable/ic_outline_bookmarks_24dp.xml +++ b/app/src/main/res/drawable/ic_bookmarks_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_round_check_circle_day_night_24dp.xml b/app/src/main/res/drawable/ic_check_circle_day_night_24dp.xml index f484cad7..f484cad7 100644 --- a/app/src/main/res/drawable/ic_round_check_circle_day_night_24dp.xml +++ b/app/src/main/res/drawable/ic_check_circle_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_outline_color_lens_24dp.xml b/app/src/main/res/drawable/ic_color_lens_day_night_24dp.xml index d1bc2624..d1bc2624 100644 --- a/app/src/main/res/drawable/ic_outline_color_lens_24dp.xml +++ b/app/src/main/res/drawable/ic_color_lens_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_round_copy_16.xml b/app/src/main/res/drawable/ic_copy_16dp.xml index e965d28e..e965d28e 100644 --- a/app/src/main/res/drawable/ic_round_copy_16.xml +++ b/app/src/main/res/drawable/ic_copy_16dp.xml diff --git a/app/src/main/res/drawable/ic_copy_24dp.xml b/app/src/main/res/drawable/ic_copy_day_night_24dp.xml index a2d2a87c..a2d2a87c 100644 --- a/app/src/main/res/drawable/ic_copy_24dp.xml +++ b/app/src/main/res/drawable/ic_copy_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_crosspost_24dp.xml b/app/src/main/res/drawable/ic_crosspost_24dp.xml new file mode 100644 index 00000000..fb64ae15 --- /dev/null +++ b/app/src/main/res/drawable/ic_crosspost_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + <path + android:pathData="M560,800v-80h104L537,593l57,-57 126,126v-102h80v240L560,800ZM216,800 L160,744 664,240L560,240v-80h240v240h-80v-104L216,800ZM367,423L160,216l56,-56 207,207 -56,56Z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/app/src/main/res/drawable/ic_dark_theme_preference_24dp.xml b/app/src/main/res/drawable/ic_dark_theme_preference_day_night_24dp.xml index 24ef45dd..24ef45dd 100644 --- a/app/src/main/res/drawable/ic_dark_theme_preference_24dp.xml +++ b/app/src/main/res/drawable/ic_dark_theme_preference_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_data_saving_mode_24dp.xml b/app/src/main/res/drawable/ic_data_saving_mode_day_night_24dp.xml index 89f69eca..89f69eca 100644 --- a/app/src/main/res/drawable/ic_data_saving_mode_24dp.xml +++ b/app/src/main/res/drawable/ic_data_saving_mode_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_delete_24dp.xml b/app/src/main/res/drawable/ic_delete_day_night_24dp.xml index aaf18eb9..aaf18eb9 100644 --- a/app/src/main/res/drawable/ic_delete_24dp.xml +++ b/app/src/main/res/drawable/ic_delete_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_download_24dp.xml b/app/src/main/res/drawable/ic_download_day_night_24dp.xml index ad852174..ad852174 100644 --- a/app/src/main/res/drawable/ic_download_24dp.xml +++ b/app/src/main/res/drawable/ic_download_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_edit_24dp.xml b/app/src/main/res/drawable/ic_edit_day_night_24dp.xml index 17a2a81f..17a2a81f 100644 --- a/app/src/main/res/drawable/ic_edit_24dp.xml +++ b/app/src/main/res/drawable/ic_edit_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_error_outline_black_24dp.xml b/app/src/main/res/drawable/ic_error_outline_black_day_night_24dp.xml index a07a0f90..a07a0f90 100644 --- a/app/src/main/res/drawable/ic_error_outline_black_24dp.xml +++ b/app/src/main/res/drawable/ic_error_outline_black_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_exit_24dp.xml b/app/src/main/res/drawable/ic_exit_day_night_24dp.xml index 5f4abdc7..5f4abdc7 100644 --- a/app/src/main/res/drawable/ic_exit_24dp.xml +++ b/app/src/main/res/drawable/ic_exit_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_filter_24dp.xml b/app/src/main/res/drawable/ic_filter_day_night_24dp.xml index 869e7e5e..869e7e5e 100644 --- a/app/src/main/res/drawable/ic_filter_24dp.xml +++ b/app/src/main/res/drawable/ic_filter_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_font_size_24dp.xml b/app/src/main/res/drawable/ic_font_size_day_night_24dp.xml index b2ef0e15..b2ef0e15 100644 --- a/app/src/main/res/drawable/ic_font_size_24dp.xml +++ b/app/src/main/res/drawable/ic_font_size_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_gallery_24dp.xml b/app/src/main/res/drawable/ic_gallery_day_night_24dp.xml index 74716ba7..74716ba7 100644 --- a/app/src/main/res/drawable/ic_gallery_24dp.xml +++ b/app/src/main/res/drawable/ic_gallery_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_gesture_24dp.xml b/app/src/main/res/drawable/ic_gesture_day_night_24dp.xml index f629ede8..f629ede8 100644 --- a/app/src/main/res/drawable/ic_gesture_24dp.xml +++ b/app/src/main/res/drawable/ic_gesture_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_give_award_24dp.xml b/app/src/main/res/drawable/ic_give_award_day_night_24dp.xml index 538f5d71..538f5d71 100644 --- a/app/src/main/res/drawable/ic_give_award_24dp.xml +++ b/app/src/main/res/drawable/ic_give_award_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_hide_post_day_night_24dp.xml b/app/src/main/res/drawable/ic_hide_post_day_night_24dp.xml new file mode 100644 index 00000000..a3cdccc1 --- /dev/null +++ b/app/src/main/res/drawable/ic_hide_post_day_night_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + <path + android:pathData="m791,905 l-91,-91q-49,32 -104.5,49T480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480q0,-60 17,-115.5T146,260l-91,-91 57,-57 736,736 -57,57ZM480,800q43,0 83.5,-11t78.5,-33L204,318q-22,38 -33,78.5T160,480q0,133 93.5,226.5T480,800ZM814,700 L756,642q22,-38 33,-78.5t11,-83.5q0,-133 -93.5,-226.5T480,160q-43,0 -83.5,11T318,204l-58,-58q49,-32 104.5,-49T480,80q83,0 156,31.5T763,197q54,54 85.5,127T880,480q0,60 -17,115.5T814,700ZM537,423ZM423,537Z" + android:fillColor="#000000"/> +</vector> diff --git a/app/src/main/res/drawable/ic_hide_read_posts_24dp.xml b/app/src/main/res/drawable/ic_hide_read_posts_day_night_24dp.xml index f69f3ff8..f69f3ff8 100644 --- a/app/src/main/res/drawable/ic_hide_read_posts_24dp.xml +++ b/app/src/main/res/drawable/ic_hide_read_posts_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_history_24dp.xml b/app/src/main/res/drawable/ic_history_day_night_24dp.xml index a3fbac1c..a3fbac1c 100644 --- a/app/src/main/res/drawable/ic_history_24dp.xml +++ b/app/src/main/res/drawable/ic_history_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_day_night_24dp.xml index a35f1eff..a35f1eff 100644 --- a/app/src/main/res/drawable/ic_home_black_24dp.xml +++ b/app/src/main/res/drawable/ic_home_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_hot_24.xml b/app/src/main/res/drawable/ic_hot_24dp.xml index c163a23d..c163a23d 100644 --- a/app/src/main/res/drawable/ic_hot_24.xml +++ b/app/src/main/res/drawable/ic_hot_24dp.xml diff --git a/app/src/main/res/drawable/ic_image_24dp.xml b/app/src/main/res/drawable/ic_image_day_night_24dp.xml index 804484a0..804484a0 100644 --- a/app/src/main/res/drawable/ic_image_24dp.xml +++ b/app/src/main/res/drawable/ic_image_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_inbox_24dp.xml b/app/src/main/res/drawable/ic_inbox_day_night_24dp.xml index 97d34185..97d34185 100644 --- a/app/src/main/res/drawable/ic_inbox_24dp.xml +++ b/app/src/main/res/drawable/ic_inbox_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_info_preference_24dp.xml b/app/src/main/res/drawable/ic_info_preference_day_night_24dp.xml index 88855dce..88855dce 100644 --- a/app/src/main/res/drawable/ic_info_preference_24dp.xml +++ b/app/src/main/res/drawable/ic_info_preference_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_interface_24dp.xml b/app/src/main/res/drawable/ic_interface_day_night_24dp.xml index 5ec271dc..5ec271dc 100644 --- a/app/src/main/res/drawable/ic_interface_24dp.xml +++ b/app/src/main/res/drawable/ic_interface_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_keyboard_double_arrow_up_24.xml b/app/src/main/res/drawable/ic_keyboard_double_arrow_up_day_night_24dp.xml index fd6c2ac9..fd6c2ac9 100644 --- a/app/src/main/res/drawable/ic_keyboard_double_arrow_up_24.xml +++ b/app/src/main/res/drawable/ic_keyboard_double_arrow_up_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_language_24dp.xml b/app/src/main/res/drawable/ic_language_day_night_24dp.xml index b7840867..b7840867 100644 --- a/app/src/main/res/drawable/ic_language_24dp.xml +++ b/app/src/main/res/drawable/ic_language_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_light_theme_preference_24dp.xml b/app/src/main/res/drawable/ic_light_theme_preference_day_night_24dp.xml index 5eb72292..5eb72292 100644 --- a/app/src/main/res/drawable/ic_light_theme_preference_24dp.xml +++ b/app/src/main/res/drawable/ic_light_theme_preference_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link_day_night_24dp.xml index 4b447423..4b447423 100644 --- a/app/src/main/res/drawable/ic_link.xml +++ b/app/src/main/res/drawable/ic_link_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_link_post_type_indicator.xml b/app/src/main/res/drawable/ic_link_post_type_indicator_day_night_24dp.xml index 720bb7c5..720bb7c5 100644 --- a/app/src/main/res/drawable/ic_link_post_type_indicator.xml +++ b/app/src/main/res/drawable/ic_link_post_type_indicator_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_outline_lock_24dp.xml b/app/src/main/res/drawable/ic_lock_day_night_24dp.xml index f4299e6c..f4299e6c 100644 --- a/app/src/main/res/drawable/ic_outline_lock_24dp.xml +++ b/app/src/main/res/drawable/ic_lock_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_log_out_24dp.xml b/app/src/main/res/drawable/ic_log_out_day_night_24dp.xml index 0c5dbe45..0c5dbe45 100644 --- a/app/src/main/res/drawable/ic_log_out_24dp.xml +++ b/app/src/main/res/drawable/ic_log_out_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_miscellaneous_24dp.xml b/app/src/main/res/drawable/ic_miscellaneous_day_night_24dp.xml index 788d988e..788d988e 100644 --- a/app/src/main/res/drawable/ic_miscellaneous_24dp.xml +++ b/app/src/main/res/drawable/ic_miscellaneous_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_multi_reddit_24dp.xml b/app/src/main/res/drawable/ic_multi_reddit_day_night_24dp.xml index c4235218..c4235218 100644 --- a/app/src/main/res/drawable/ic_multi_reddit_24dp.xml +++ b/app/src/main/res/drawable/ic_multi_reddit_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_mute_preferences_24dp.xml b/app/src/main/res/drawable/ic_mute_preferences_day_night_24dp.xml index c206c848..c206c848 100644 --- a/app/src/main/res/drawable/ic_mute_preferences_24dp.xml +++ b/app/src/main/res/drawable/ic_mute_preferences_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_outline_notifications_24dp.xml b/app/src/main/res/drawable/ic_notifications_day_night_24dp.xml index 0c2c90a7..0c2c90a7 100644 --- a/app/src/main/res/drawable/ic_outline_notifications_24dp.xml +++ b/app/src/main/res/drawable/ic_notifications_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_nsfw_off_24dp.xml b/app/src/main/res/drawable/ic_nsfw_off_day_night_24dp.xml index 5f69aef8..5f69aef8 100644 --- a/app/src/main/res/drawable/ic_nsfw_off_24dp.xml +++ b/app/src/main/res/drawable/ic_nsfw_off_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_nsfw_on_24dp.xml b/app/src/main/res/drawable/ic_nsfw_on_day_night_24dp.xml index f03560c8..f03560c8 100644 --- a/app/src/main/res/drawable/ic_nsfw_on_24dp.xml +++ b/app/src/main/res/drawable/ic_nsfw_on_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_open_link_24dp.xml b/app/src/main/res/drawable/ic_open_link_day_night_24dp.xml index 48468b54..48468b54 100644 --- a/app/src/main/res/drawable/ic_open_link_24dp.xml +++ b/app/src/main/res/drawable/ic_open_link_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_playback_speed_24dp.xml b/app/src/main/res/drawable/ic_playback_speed_day_night_24dp.xml index 1ab79da6..1ab79da6 100644 --- a/app/src/main/res/drawable/ic_playback_speed_24dp.xml +++ b/app/src/main/res/drawable/ic_playback_speed_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_poll_24dp.xml b/app/src/main/res/drawable/ic_poll_day_night_24dp.xml index c4033782..c4033782 100644 --- a/app/src/main/res/drawable/ic_poll_24dp.xml +++ b/app/src/main/res/drawable/ic_poll_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_post_layout_24dp.xml b/app/src/main/res/drawable/ic_post_layout_day_night_24dp.xml index bca9e973..bca9e973 100644 --- a/app/src/main/res/drawable/ic_post_layout_24dp.xml +++ b/app/src/main/res/drawable/ic_post_layout_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_preview_24dp.xml b/app/src/main/res/drawable/ic_preview_day_night_24dp.xml index 4153950d..4153950d 100644 --- a/app/src/main/res/drawable/ic_preview_24dp.xml +++ b/app/src/main/res/drawable/ic_preview_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_outline_privacy_policy_24dp.xml b/app/src/main/res/drawable/ic_privacy_policy_day_night_24dp.xml index 5521a149..5521a149 100644 --- a/app/src/main/res/drawable/ic_outline_privacy_policy_24dp.xml +++ b/app/src/main/res/drawable/ic_privacy_policy_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_random_24dp.xml b/app/src/main/res/drawable/ic_random_day_night_24dp.xml index bd0bc639..bd0bc639 100644 --- a/app/src/main/res/drawable/ic_random_24dp.xml +++ b/app/src/main/res/drawable/ic_random_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_refresh_24dp.xml b/app/src/main/res/drawable/ic_refresh_day_night_24dp.xml index 528662cf..528662cf 100644 --- a/app/src/main/res/drawable/ic_refresh_24dp.xml +++ b/app/src/main/res/drawable/ic_refresh_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_reply_24dp.xml b/app/src/main/res/drawable/ic_reply_day_night_24dp.xml index 43e4df73..43e4df73 100644 --- a/app/src/main/res/drawable/ic_reply_24dp.xml +++ b/app/src/main/res/drawable/ic_reply_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_report_24dp.xml b/app/src/main/res/drawable/ic_report_day_night_24dp.xml index 6e07b06d..6e07b06d 100644 --- a/app/src/main/res/drawable/ic_report_24dp.xml +++ b/app/src/main/res/drawable/ic_report_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_rising_24.xml b/app/src/main/res/drawable/ic_rising_24dp.xml index 75754f74..75754f74 100644 --- a/app/src/main/res/drawable/ic_rising_24.xml +++ b/app/src/main/res/drawable/ic_rising_24dp.xml diff --git a/app/src/main/res/drawable/ic_save_to_database_24dp.xml b/app/src/main/res/drawable/ic_save_to_database_day_night_24dp.xml index 4402c5df..4402c5df 100644 --- a/app/src/main/res/drawable/ic_save_to_database_24dp.xml +++ b/app/src/main/res/drawable/ic_save_to_database_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_search_24dp.xml b/app/src/main/res/drawable/ic_search_day_night_24dp.xml index 9bece0ba..9bece0ba 100644 --- a/app/src/main/res/drawable/ic_search_24dp.xml +++ b/app/src/main/res/drawable/ic_search_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_security_24dp.xml b/app/src/main/res/drawable/ic_security_day_night_24dp.xml index be9737bd..be9737bd 100644 --- a/app/src/main/res/drawable/ic_security_24dp.xml +++ b/app/src/main/res/drawable/ic_security_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_outline_select_photo_24dp.xml b/app/src/main/res/drawable/ic_select_photo_24dp.xml index 9551f621..9551f621 100644 --- a/app/src/main/res/drawable/ic_outline_select_photo_24dp.xml +++ b/app/src/main/res/drawable/ic_select_photo_24dp.xml diff --git a/app/src/main/res/drawable/ic_outline_select_photo_day_night_24dp.xml b/app/src/main/res/drawable/ic_select_photo_day_night_24dp.xml index 9551f621..9551f621 100644 --- a/app/src/main/res/drawable/ic_outline_select_photo_day_night_24dp.xml +++ b/app/src/main/res/drawable/ic_select_photo_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_settings_24dp.xml b/app/src/main/res/drawable/ic_settings_day_night_24dp.xml index e1fb6a23..e1fb6a23 100644 --- a/app/src/main/res/drawable/ic_settings_24dp.xml +++ b/app/src/main/res/drawable/ic_settings_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_share_24dp.xml b/app/src/main/res/drawable/ic_share_day_night_24dp.xml index 82ddcec3..82ddcec3 100644 --- a/app/src/main/res/drawable/ic_share_24dp.xml +++ b/app/src/main/res/drawable/ic_share_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_sort_24dp.xml b/app/src/main/res/drawable/ic_sort_day_night_24dp.xml index 6cef6369..6cef6369 100644 --- a/app/src/main/res/drawable/ic_sort_24dp.xml +++ b/app/src/main/res/drawable/ic_sort_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_submit_post_24dp.xml b/app/src/main/res/drawable/ic_submit_post_day_night_24dp.xml index df26adda..df26adda 100644 --- a/app/src/main/res/drawable/ic_submit_post_24dp.xml +++ b/app/src/main/res/drawable/ic_submit_post_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_subreddit_24dp.xml b/app/src/main/res/drawable/ic_subreddit_day_night_24dp.xml index 37af6d27..37af6d27 100644 --- a/app/src/main/res/drawable/ic_subreddit_24dp.xml +++ b/app/src/main/res/drawable/ic_subreddit_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_subscritptions_bottom_app_bar_24dp.xml b/app/src/main/res/drawable/ic_subscriptions_bottom_app_bar_day_night_24dp.xml index 96b7725a..96b7725a 100644 --- a/app/src/main/res/drawable/ic_subscritptions_bottom_app_bar_24dp.xml +++ b/app/src/main/res/drawable/ic_subscriptions_bottom_app_bar_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_text_24dp.xml b/app/src/main/res/drawable/ic_text_day_night_24dp.xml index 6afe43f5..6afe43f5 100644 --- a/app/src/main/res/drawable/ic_text_24dp.xml +++ b/app/src/main/res/drawable/ic_text_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_unordered_list_black_24dp.xml b/app/src/main/res/drawable/ic_unordered_list_24dp.xml index 2a2bb753..2a2bb753 100644 --- a/app/src/main/res/drawable/ic_unordered_list_black_24dp.xml +++ b/app/src/main/res/drawable/ic_unordered_list_24dp.xml diff --git a/app/src/main/res/drawable/ic_upvote_ratio.xml b/app/src/main/res/drawable/ic_upvote_ratio_18dp.xml index d696673b..d696673b 100644 --- a/app/src/main/res/drawable/ic_upvote_ratio.xml +++ b/app/src/main/res/drawable/ic_upvote_ratio_18dp.xml diff --git a/app/src/main/res/drawable/ic_outline_user_agreement_24dp.xml b/app/src/main/res/drawable/ic_user_agreement_day_night_24dp.xml index da9a2872..da9a2872 100644 --- a/app/src/main/res/drawable/ic_outline_user_agreement_24dp.xml +++ b/app/src/main/res/drawable/ic_user_agreement_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_user_24dp.xml b/app/src/main/res/drawable/ic_user_day_night_24dp.xml index 4d161f62..4d161f62 100644 --- a/app/src/main/res/drawable/ic_user_24dp.xml +++ b/app/src/main/res/drawable/ic_user_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_outline_video_24dp.xml b/app/src/main/res/drawable/ic_video_day_night_24dp.xml index 2c421e88..2c421e88 100644 --- a/app/src/main/res/drawable/ic_outline_video_24dp.xml +++ b/app/src/main/res/drawable/ic_video_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_volume_off_black_24dp.xml b/app/src/main/res/drawable/ic_volume_off_32dp.xml index 628a8aef..628a8aef 100644 --- a/app/src/main/res/drawable/ic_volume_off_black_24dp.xml +++ b/app/src/main/res/drawable/ic_volume_off_32dp.xml diff --git a/app/src/main/res/drawable/ic_volume_up_black_24dp.xml b/app/src/main/res/drawable/ic_volume_up_32dp.xml index 7c11fa9e..7c11fa9e 100644 --- a/app/src/main/res/drawable/ic_volume_up_black_24dp.xml +++ b/app/src/main/res/drawable/ic_volume_up_32dp.xml diff --git a/app/src/main/res/drawable/ic_wallpaper_white_24dp.xml b/app/src/main/res/drawable/ic_wallpaper_24dp.xml index 9db92d6f..9db92d6f 100644 --- a/app/src/main/res/drawable/ic_wallpaper_white_24dp.xml +++ b/app/src/main/res/drawable/ic_wallpaper_24dp.xml diff --git a/app/src/main/res/drawable/ic_wallpaper_both_black_24dp.xml b/app/src/main/res/drawable/ic_wallpaper_both_day_night_24dp.xml index 98044749..98044749 100644 --- a/app/src/main/res/drawable/ic_wallpaper_both_black_24dp.xml +++ b/app/src/main/res/drawable/ic_wallpaper_both_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_wallpaper_home_screen_black_24dp.xml b/app/src/main/res/drawable/ic_wallpaper_home_screen_day_night_24dp.xml index a35f1eff..a35f1eff 100644 --- a/app/src/main/res/drawable/ic_wallpaper_home_screen_black_24dp.xml +++ b/app/src/main/res/drawable/ic_wallpaper_home_screen_day_night_24dp.xml diff --git a/app/src/main/res/drawable/ic_wallpaper_lock_screen_black_24dp.xml b/app/src/main/res/drawable/ic_wallpaper_lock_screen_day_night_24dp.xml index fb71425e..fb71425e 100644 --- a/app/src/main/res/drawable/ic_wallpaper_lock_screen_black_24dp.xml +++ b/app/src/main/res/drawable/ic_wallpaper_lock_screen_day_night_24dp.xml diff --git a/app/src/main/res/drawable/subreddit_default_icon_2.jpg b/app/src/main/res/drawable/subreddit_default_icon_2.jpg Binary files differdeleted file mode 100644 index 4e9bc2fc..00000000 --- a/app/src/main/res/drawable/subreddit_default_icon_2.jpg +++ /dev/null diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml index c894fdc2..2da6f923 100644 --- a/app/src/main/res/layout/activity_edit_profile.xml +++ b/app/src/main/res/layout/activity_edit_profile.xml @@ -69,7 +69,7 @@ android:padding="8dp" android:background="@drawable/ic_dot_outline" android:contentDescription="@string/content_description_change_banner" - app:srcCompat="@drawable/ic_outline_add_a_photo_day_night_24dp" /> + app:srcCompat="@drawable/ic_add_a_photo_day_night_24dp" /> </FrameLayout> @@ -95,7 +95,7 @@ android:padding="8dp" android:background="@drawable/ic_dot_outline" android:contentDescription="@string/content_description_change_avatar" - app:srcCompat="@drawable/ic_outline_add_a_photo_day_night_24dp" /> + app:srcCompat="@drawable/ic_add_a_photo_day_night_24dp" /> </FrameLayout> diff --git a/app/src/main/res/layout/activity_filtered_thing.xml b/app/src/main/res/layout/activity_filtered_thing.xml index 4aae7921..9cc9ef75 100644 --- a/app/src/main/res/layout/activity_filtered_thing.xml +++ b/app/src/main/res/layout/activity_filtered_thing.xml @@ -46,6 +46,6 @@ android:layout_margin="@dimen/fab_margin" android:layout_gravity="bottom|end" android:contentDescription="@string/content_description_customize_post_filter" - android:src="@drawable/ic_filter_24dp" /> + android:src="@drawable/ic_filter_day_night_24dp" /> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml index 22c9f4f0..ca03fbd9 100644 --- a/app/src/main/res/layout/activity_post_image.xml +++ b/app/src/main/res/layout/activity_post_image.xml @@ -232,7 +232,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16dp" - android:src="@drawable/ic_outline_add_a_photo_24dp" + android:src="@drawable/ic_add_a_photo_24dp" android:contentDescription="@string/content_description_capture_photo" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_image_activity" @@ -246,7 +246,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16dp" - android:src="@drawable/ic_outline_select_photo_24dp" + android:src="@drawable/ic_select_photo_24dp" android:contentDescription="@string/content_description_select_image" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml index f84b84fe..72cbcd57 100644 --- a/app/src/main/res/layout/activity_post_video.xml +++ b/app/src/main/res/layout/activity_post_video.xml @@ -232,7 +232,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="16dp" - android:src="@drawable/ic_outline_add_a_photo_24dp" + android:src="@drawable/ic_add_a_photo_24dp" android:contentDescription="@string/content_description_record_video" app:useCompatPadding="true" app:layout_constraintBottom_toBottomOf="parent" @@ -246,7 +246,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="16dp" - android:src="@drawable/ic_outline_select_photo_24dp" + android:src="@drawable/ic_select_photo_24dp" android:contentDescription="@string/content_description_select_video" app:useCompatPadding="true" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 62adf999..25d36164 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -54,7 +54,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="8dp" - android:src="@drawable/ic_open_link_24dp" + android:src="@drawable/ic_open_link_day_night_24dp" android:clickable="true" android:focusable="true" android:background="?attr/actionBarItemBackground" diff --git a/app/src/main/res/layout/activity_theme_preview.xml b/app/src/main/res/layout/activity_theme_preview.xml index 89d02306..c09d889a 100644 --- a/app/src/main/res/layout/activity_theme_preview.xml +++ b/app/src/main/res/layout/activity_theme_preview.xml @@ -156,7 +156,7 @@ android:gravity="center" android:paddingTop="8dp" android:paddingBottom="8dp" - android:src="@drawable/ic_subscritptions_bottom_app_bar_24dp" + android:src="@drawable/ic_subscriptions_bottom_app_bar_day_night_24dp" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/content_description_bottom_navigation_bar_button" /> @@ -168,7 +168,7 @@ android:gravity="center" android:paddingTop="8dp" android:paddingBottom="8dp" - android:src="@drawable/ic_multi_reddit_24dp" + android:src="@drawable/ic_multi_reddit_day_night_24dp" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/content_description_bottom_navigation_bar_button" /> @@ -186,7 +186,7 @@ android:gravity="center" android:paddingTop="8dp" android:paddingBottom="8dp" - android:src="@drawable/ic_inbox_24dp" + android:src="@drawable/ic_inbox_day_night_24dp" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/content_description_bottom_navigation_bar_button" /> @@ -199,7 +199,7 @@ android:paddingTop="8dp" android:paddingBottom="8dp" android:gravity="center" - android:src="@drawable/ic_account_circle_24dp" + android:src="@drawable/ic_account_circle_day_night_24dp" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/content_description_bottom_navigation_bar_button" /> diff --git a/app/src/main/res/layout/activity_view_image_or_gif.xml b/app/src/main/res/layout/activity_view_image_or_gif.xml index 24d433ee..d8986d2c 100644 --- a/app/src/main/res/layout/activity_view_image_or_gif.xml +++ b/app/src/main/res/layout/activity_view_image_or_gif.xml @@ -91,7 +91,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:padding="16dp" - android:src="@drawable/ic_wallpaper_white_24dp" + android:src="@drawable/ic_wallpaper_24dp" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/content_description_set_as_wallpaper" /> diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml index d52479e6..5b4d87d4 100644 --- a/app/src/main/res/layout/activity_view_post_detail.xml +++ b/app/src/main/res/layout/activity_view_post_detail.xml @@ -90,7 +90,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:padding="8dp" - android:src="@drawable/ic_arrow_upward_black_24dp" + android:src="@drawable/ic_arrow_upward_day_night_24dp" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -102,7 +102,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:padding="8dp" - android:src="@drawable/ic_arrow_downward_black_24dp" + android:src="@drawable/ic_arrow_downward_day_night_24dp" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_comment_filter_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_comment_filter_options_bottom_sheet.xml index 011f7d51..726f9edc 100644 --- a/app/src/main/res/layout/fragment_comment_filter_options_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_comment_filter_options_bottom_sheet.xml @@ -23,7 +23,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_edit_24dp" + app:drawableStartCompat="@drawable/ic_edit_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -41,7 +41,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_apply_to_24dp" + app:drawableStartCompat="@drawable/ic_apply_to_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -59,7 +59,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_delete_24dp" + app:drawableStartCompat="@drawable/ic_delete_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_comment_filter_usage_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_comment_filter_usage_options_bottom_sheet.xml index cc9e4926..cc6970e5 100644 --- a/app/src/main/res/layout/fragment_comment_filter_usage_options_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_comment_filter_usage_options_bottom_sheet.xml @@ -23,7 +23,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_edit_24dp" + app:drawableStartCompat="@drawable/ic_edit_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -41,7 +41,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_delete_24dp" + app:drawableStartCompat="@drawable/ic_delete_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml index 6d233edc..6d2af1a7 100644 --- a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml @@ -27,7 +27,7 @@ android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" android:visibility="gone" - app:drawableStartCompat="@drawable/ic_edit_24dp" /> + app:drawableStartCompat="@drawable/ic_edit_day_night_24dp" /> <TextView android:id="@+id/delete_text_view_comment_more_bottom_sheet_fragment" @@ -46,7 +46,7 @@ android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" android:visibility="gone" - app:drawableStartCompat="@drawable/ic_delete_24dp" /> + app:drawableStartCompat="@drawable/ic_delete_day_night_24dp" /> <TextView android:id="@+id/reply_text_view_comment_more_bottom_sheet_fragment" @@ -66,7 +66,7 @@ android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" android:visibility="gone" - app:drawableStartCompat="@drawable/ic_reply_24dp" /> + app:drawableStartCompat="@drawable/ic_reply_day_night_24dp" /> <TextView android:id="@+id/save_text_view_comment_more_bottom_sheet_fragment" @@ -103,7 +103,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_share_24dp" /> + app:drawableStartCompat="@drawable/ic_share_day_night_24dp" /> <TextView android:id="@+id/copy_text_view_comment_more_bottom_sheet_fragment" @@ -122,7 +122,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_copy_24dp" /> + app:drawableStartCompat="@drawable/ic_copy_day_night_24dp" /> <TextView android:id="@+id/report_view_comment_more_bottom_sheet_fragment" @@ -141,7 +141,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_report_24dp" /> + app:drawableStartCompat="@drawable/ic_report_day_night_24dp" /> <TextView android:id="@+id/add_to_comment_filter_view_comment_more_bottom_sheet_fragment" @@ -160,7 +160,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_filter_24dp" /> + app:drawableStartCompat="@drawable/ic_filter_day_night_24dp" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_create_theme_bottom_sheet.xml b/app/src/main/res/layout/fragment_create_theme_bottom_sheet.xml index 81b4a46b..a1b6ec38 100644 --- a/app/src/main/res/layout/fragment_create_theme_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_create_theme_bottom_sheet.xml @@ -42,7 +42,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_light_theme_preference_24dp" + android:drawableStart="@drawable/ic_light_theme_preference_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -61,7 +61,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_dark_theme_preference_24dp" + android:drawableStart="@drawable/ic_dark_theme_preference_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -80,7 +80,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_amoled_theme_preference_24dp" + android:drawableStart="@drawable/ic_amoled_theme_preference_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_custom_theme_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_custom_theme_options_bottom_sheet.xml index b44d9001..45bf21ea 100644 --- a/app/src/main/res/layout/fragment_custom_theme_options_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_custom_theme_options_bottom_sheet.xml @@ -34,7 +34,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_edit_24dp" + android:drawableStart="@drawable/ic_edit_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -53,7 +53,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_edit_24dp" + android:drawableStart="@drawable/ic_edit_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -72,7 +72,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_share_24dp" + android:drawableStart="@drawable/ic_share_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -91,7 +91,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_delete_24dp" + android:drawableStart="@drawable/ic_delete_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml index 62947feb..a7f1ee1c 100644 --- a/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml @@ -24,7 +24,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_submit_post_24dp" + app:drawableStartCompat="@drawable/ic_submit_post_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -43,7 +43,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_refresh_24dp" + app:drawableStartCompat="@drawable/ic_refresh_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -62,7 +62,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_sort_24dp" + app:drawableStartCompat="@drawable/ic_sort_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -81,7 +81,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_post_layout_24dp" + app:drawableStartCompat="@drawable/ic_post_layout_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -100,7 +100,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_search_24dp" + app:drawableStartCompat="@drawable/ic_search_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -119,7 +119,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_subreddit_24dp" + app:drawableStartCompat="@drawable/ic_subreddit_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -138,7 +138,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_user_24dp" + app:drawableStartCompat="@drawable/ic_user_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -157,7 +157,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_random_24dp" + app:drawableStartCompat="@drawable/ic_random_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -176,7 +176,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_hide_read_posts_24dp" + app:drawableStartCompat="@drawable/ic_hide_read_posts_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -195,7 +195,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_filter_24dp" + app:drawableStartCompat="@drawable/ic_filter_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -214,7 +214,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_keyboard_double_arrow_up_24" + app:drawableStartCompat="@drawable/ic_keyboard_double_arrow_up_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_filtered_thing_fab_more_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_filtered_thing_fab_more_options_bottom_sheet.xml index f775fd6a..66b5e2ba 100644 --- a/app/src/main/res/layout/fragment_filtered_thing_fab_more_options_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_filtered_thing_fab_more_options_bottom_sheet.xml @@ -24,7 +24,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_filter_24dp" + app:drawableStartCompat="@drawable/ic_filter_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -43,7 +43,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_hide_read_posts_24dp" + app:drawableStartCompat="@drawable/ic_hide_read_posts_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_multi_reddit_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_multi_reddit_options_bottom_sheet.xml index 407390b5..fd0777b5 100644 --- a/app/src/main/res/layout/fragment_multi_reddit_options_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_multi_reddit_options_bottom_sheet.xml @@ -23,7 +23,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_copy_24dp" + android:drawableStart="@drawable/ic_copy_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -42,7 +42,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_edit_24dp" + android:drawableStart="@drawable/ic_edit_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -61,7 +61,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_delete_24dp" + android:drawableStart="@drawable/ic_delete_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_new_comment_filter_usage_bottom_sheet.xml b/app/src/main/res/layout/fragment_new_comment_filter_usage_bottom_sheet.xml index 546a87de..aa5f3f9f 100644 --- a/app/src/main/res/layout/fragment_new_comment_filter_usage_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_new_comment_filter_usage_bottom_sheet.xml @@ -23,7 +23,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_subreddit_24dp" + app:drawableStartCompat="@drawable/ic_subreddit_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_new_post_filter_usage_bottom_sheet.xml b/app/src/main/res/layout/fragment_new_post_filter_usage_bottom_sheet.xml index 11515ec4..488e5db2 100644 --- a/app/src/main/res/layout/fragment_new_post_filter_usage_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_new_post_filter_usage_bottom_sheet.xml @@ -23,7 +23,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_home_black_24dp" + app:drawableStartCompat="@drawable/ic_home_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -41,7 +41,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_subreddit_24dp" + app:drawableStartCompat="@drawable/ic_subreddit_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -59,7 +59,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_user_24dp" + app:drawableStartCompat="@drawable/ic_user_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -77,7 +77,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_multi_reddit_24dp" + app:drawableStartCompat="@drawable/ic_multi_reddit_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -95,7 +95,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_search_24dp" + app:drawableStartCompat="@drawable/ic_search_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_post_filter_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_filter_options_bottom_sheet.xml index 2fa19826..5fa4a617 100644 --- a/app/src/main/res/layout/fragment_post_filter_options_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_post_filter_options_bottom_sheet.xml @@ -23,7 +23,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_edit_24dp" + app:drawableStartCompat="@drawable/ic_edit_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -41,7 +41,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_apply_to_24dp" + app:drawableStartCompat="@drawable/ic_apply_to_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -59,7 +59,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_delete_24dp" + app:drawableStartCompat="@drawable/ic_delete_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_post_filter_usage_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_filter_usage_options_bottom_sheet.xml index e4a68585..c12fce42 100644 --- a/app/src/main/res/layout/fragment_post_filter_usage_options_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_post_filter_usage_options_bottom_sheet.xml @@ -23,7 +23,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_edit_24dp" + app:drawableStartCompat="@drawable/ic_edit_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -41,7 +41,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - app:drawableStartCompat="@drawable/ic_delete_24dp" + app:drawableStartCompat="@drawable/ic_delete_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_post_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_options_bottom_sheet.xml new file mode 100644 index 00000000..c84f7402 --- /dev/null +++ b/app/src/main/res/layout/fragment_post_options_bottom_sheet.xml @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:overScrollMode="never" + android:paddingBottom="8dp"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/comment_text_view_post_options_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:drawableStart="@drawable/ic_comment_toolbar_24dp" + android:drawablePadding="48dp" + android:focusable="true" + android:fontFamily="?attr/font_family" + android:paddingStart="32dp" + android:paddingTop="16dp" + android:paddingEnd="32dp" + android:paddingBottom="16dp" + android:text="@string/comment" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + app:drawableTint="?attr/primaryTextColor" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/at_to_post_filter_text_view_post_options_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:drawableStart="@drawable/ic_filter_day_night_24dp" + android:drawablePadding="48dp" + android:focusable="true" + android:fontFamily="?attr/font_family" + android:paddingStart="32dp" + android:paddingTop="16dp" + android:paddingEnd="32dp" + android:paddingBottom="16dp" + android:text="@string/action_add_to_post_filter" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + app:drawableTint="?attr/primaryTextColor" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/hide_post_text_view_post_options_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:drawableStart="@drawable/ic_hide_post_day_night_24dp" + android:drawablePadding="48dp" + android:focusable="true" + android:fontFamily="?attr/font_family" + android:paddingStart="32dp" + android:paddingTop="16dp" + android:paddingEnd="32dp" + android:paddingBottom="16dp" + android:text="@string/action_hide_post" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + app:drawableTint="?attr/primaryTextColor" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/crosspost_text_view_post_options_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:drawableStart="@drawable/ic_crosspost_24dp" + android:drawablePadding="48dp" + android:focusable="true" + android:fontFamily="?attr/font_family" + android:paddingStart="32dp" + android:paddingTop="16dp" + android:paddingEnd="32dp" + android:paddingBottom="16dp" + android:text="@string/action_crosspost" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + app:drawableTint="?attr/primaryTextColor" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/report_text_view_post_options_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:drawableStart="@drawable/ic_report_day_night_24dp" + android:drawablePadding="48dp" + android:focusable="true" + android:fontFamily="?attr/font_family" + android:paddingStart="32dp" + android:paddingTop="16dp" + android:paddingEnd="32dp" + android:paddingBottom="16dp" + android:text="@string/report" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + app:drawableTint="?attr/primaryTextColor" /> + + </LinearLayout> + +</androidx.core.widget.NestedScrollView> diff --git a/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml index a597db67..4e3ba3aa 100644 --- a/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml @@ -23,7 +23,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_text_24dp" + android:drawableStart="@drawable/ic_text_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -42,7 +42,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_link" + android:drawableStart="@drawable/ic_link_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -61,7 +61,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_outline_video_24dp" + android:drawableStart="@drawable/ic_video_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -80,7 +80,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_image_24dp" + android:drawableStart="@drawable/ic_image_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -99,7 +99,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_gallery_24dp" + android:drawableStart="@drawable/ic_gallery_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -118,7 +118,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_poll_24dp" + android:drawableStart="@drawable/ic_poll_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml index 8b1c86b6..db7ed2fa 100644 --- a/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" android:clickable="true" - android:drawableStart="@drawable/ic_hot_24" + android:drawableStart="@drawable/ic_hot_24dp" android:drawablePadding="48dp" android:focusable="true" android:fontFamily="?attr/font_family" diff --git a/app/src/main/res/layout/fragment_select_or_capture_image_bottom_sheet.xml b/app/src/main/res/layout/fragment_select_or_capture_image_bottom_sheet.xml index 55f60691..e70cd150 100644 --- a/app/src/main/res/layout/fragment_select_or_capture_image_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_select_or_capture_image_bottom_sheet.xml @@ -23,7 +23,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_outline_select_photo_day_night_24dp" + android:drawableStart="@drawable/ic_select_photo_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -42,7 +42,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_outline_add_a_photo_day_night_24dp" + android:drawableStart="@drawable/ic_add_a_photo_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_set_as_wallpaper_bottom_sheet.xml b/app/src/main/res/layout/fragment_set_as_wallpaper_bottom_sheet.xml index f2fcd3ea..7e8a8586 100644 --- a/app/src/main/res/layout/fragment_set_as_wallpaper_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_set_as_wallpaper_bottom_sheet.xml @@ -23,7 +23,7 @@ android:textColor="@color/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_wallpaper_home_screen_black_24dp" + android:drawableStart="@drawable/ic_wallpaper_home_screen_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -43,7 +43,7 @@ android:textColor="@color/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_wallpaper_lock_screen_black_24dp" + android:drawableStart="@drawable/ic_wallpaper_lock_screen_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -63,7 +63,7 @@ android:textColor="@color/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_wallpaper_both_black_24dp" + android:drawableStart="@drawable/ic_wallpaper_both_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml b/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml index 01091b03..a9000895 100644 --- a/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml @@ -37,7 +37,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_link" + android:drawableStart="@drawable/ic_link_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -56,7 +56,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_copy_24dp" + android:drawableStart="@drawable/ic_copy_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -89,7 +89,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_link" + android:drawableStart="@drawable/ic_link_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -108,7 +108,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - android:drawableStart="@drawable/ic_copy_24dp" + android:drawableStart="@drawable/ic_copy_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml index 91c0ed62..86805aeb 100644 --- a/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" android:clickable="true" - android:drawableStart="@drawable/ic_hot_24" + android:drawableStart="@drawable/ic_hot_24dp" android:drawablePadding="48dp" android:focusable="true" android:fontFamily="?attr/font_family" @@ -74,7 +74,7 @@ android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" android:clickable="true" - android:drawableStart="@drawable/ic_rising_24" + android:drawableStart="@drawable/ic_rising_24dp" android:drawablePadding="48dp" android:focusable="true" android:fontFamily="?attr/font_family" diff --git a/app/src/main/res/layout/fragment_theme_preview_posts.xml b/app/src/main/res/layout/fragment_theme_preview_posts.xml index 081c22f5..f85a8a04 100644 --- a/app/src/main/res/layout/fragment_theme_preview_posts.xml +++ b/app/src/main/res/layout/fragment_theme_preview_posts.xml @@ -200,13 +200,13 @@ android:id="@+id/locked_image_view_theme_preview_posts_fragment" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/ic_outline_lock_24dp" /> + android:src="@drawable/ic_lock_day_night_24dp" /> <ImageView android:id="@+id/crosspost_image_view_theme_preview_posts_fragment" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/crosspost" /> + android:src="@drawable/ic_crosspost_24dp" /> </com.nex3z.flowlayout.FlowLayout> @@ -233,7 +233,7 @@ android:layout_width="match_parent" android:layout_height="150dp" android:scaleType="center" - android:src="@drawable/ic_link" + android:src="@drawable/ic_link_day_night_24dp" app:tint="@android:color/tab_indicator_text" /> <androidx.constraintlayout.widget.ConstraintLayout diff --git a/app/src/main/res/layout/fragment_url_menu_bottom_sheet.xml b/app/src/main/res/layout/fragment_url_menu_bottom_sheet.xml index 65dacae2..eaa62c9a 100644 --- a/app/src/main/res/layout/fragment_url_menu_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_url_menu_bottom_sheet.xml @@ -36,7 +36,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - android:drawableStart="@drawable/ic_open_link_24dp" + android:drawableStart="@drawable/ic_open_link_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -54,7 +54,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - android:drawableStart="@drawable/ic_copy_24dp" + android:drawableStart="@drawable/ic_copy_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" @@ -72,7 +72,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - android:drawableStart="@drawable/ic_share_24dp" + android:drawableStart="@drawable/ic_share_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml index 17056053..42d8c2ac 100644 --- a/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" android:clickable="true" - android:drawableStart="@drawable/ic_hot_24" + android:drawableStart="@drawable/ic_hot_24dp" android:drawablePadding="48dp" android:focusable="true" android:fontFamily="?attr/font_family" diff --git a/app/src/main/res/layout/fragment_view_imgur_image.xml b/app/src/main/res/layout/fragment_view_imgur_image.xml index 0c031d32..4cb9e3cb 100644 --- a/app/src/main/res/layout/fragment_view_imgur_image.xml +++ b/app/src/main/res/layout/fragment_view_imgur_image.xml @@ -85,7 +85,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:padding="16dp" - android:src="@drawable/ic_wallpaper_white_24dp" + android:src="@drawable/ic_wallpaper_24dp" android:background="?attr/selectableItemBackgroundBorderless" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_view_reddit_gallery_image_or_gif.xml b/app/src/main/res/layout/fragment_view_reddit_gallery_image_or_gif.xml index 61296cc7..46c4d733 100644 --- a/app/src/main/res/layout/fragment_view_reddit_gallery_image_or_gif.xml +++ b/app/src/main/res/layout/fragment_view_reddit_gallery_image_or_gif.xml @@ -135,7 +135,7 @@ android:layout_marginEnd="16dp" android:background="?attr/selectableItemBackgroundBorderless" android:padding="16dp" - android:src="@drawable/ic_wallpaper_white_24dp" /> + android:src="@drawable/ic_wallpaper_24dp" /> </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/item_flair.xml b/app/src/main/res/layout/item_flair.xml index d6b0c239..30bfe10e 100644 --- a/app/src/main/res/layout/item_flair.xml +++ b/app/src/main/res/layout/item_flair.xml @@ -27,7 +27,7 @@ android:layout_gravity="center_vertical|end" android:paddingStart="32dp" android:paddingEnd="32dp" - android:src="@drawable/ic_edit_24dp" + android:src="@drawable/ic_edit_day_night_24dp" android:visibility="gone" app:tint="?attr/primaryTextColor" android:background="?actionBarItemBackground" diff --git a/app/src/main/res/layout/item_gallery_image_in_post_feed.xml b/app/src/main/res/layout/item_gallery_image_in_post_feed.xml index ae253945..8ec66012 100644 --- a/app/src/main/res/layout/item_gallery_image_in_post_feed.xml +++ b/app/src/main/res/layout/item_gallery_image_in_post_feed.xml @@ -25,7 +25,7 @@ android:id="@+id/error_text_view_item_gallery_image_in_post_feed" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableTop="@drawable/ic_error_outline_black_24dp" + android:drawableTop="@drawable/ic_error_outline_black_day_night_24dp" android:layout_gravity="center" android:gravity="center" android:text="@string/error_loading_image_tap_to_retry" diff --git a/app/src/main/res/layout/item_post_card_2_gallery_type.xml b/app/src/main/res/layout/item_post_card_2_gallery_type.xml index a3664c6d..b7a0bc39 100644 --- a/app/src/main/res/layout/item_post_card_2_gallery_type.xml +++ b/app/src/main/res/layout/item_post_card_2_gallery_type.xml @@ -136,14 +136,14 @@ android:id="@+id/locked_image_view_item_post_card_2_gallery_type" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_card_2_gallery_type" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> <ImageView diff --git a/app/src/main/res/layout/item_post_card_2_text.xml b/app/src/main/res/layout/item_post_card_2_text.xml index 54d6fefe..9a78c4ad 100644 --- a/app/src/main/res/layout/item_post_card_2_text.xml +++ b/app/src/main/res/layout/item_post_card_2_text.xml @@ -104,14 +104,14 @@ android:id="@+id/locked_image_view_item_post_card_2_text" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_card_2_text" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> <ImageView diff --git a/app/src/main/res/layout/item_post_card_2_video_autoplay.xml b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml index def1c328..c0b4a3e5 100644 --- a/app/src/main/res/layout/item_post_card_2_video_autoplay.xml +++ b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml @@ -139,14 +139,14 @@ android:id="@+id/locked_image_view_item_post_card_2_video_autoplay" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_card_2_video_autoplay" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> <ImageView diff --git a/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml index 08110054..ce8f3b2a 100644 --- a/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml @@ -139,14 +139,14 @@ android:id="@+id/locked_image_view_item_post_card_2_video_autoplay" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_card_2_video_autoplay" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> <ImageView diff --git a/app/src/main/res/layout/item_post_card_2_with_preview.xml b/app/src/main/res/layout/item_post_card_2_with_preview.xml index 0dddf0ff..a249a1f8 100644 --- a/app/src/main/res/layout/item_post_card_2_with_preview.xml +++ b/app/src/main/res/layout/item_post_card_2_with_preview.xml @@ -47,7 +47,7 @@ android:id="@+id/load_image_error_text_view_item_post_card_2_with_preview" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableTop="@drawable/ic_error_outline_black_24dp" + android:drawableTop="@drawable/ic_error_outline_black_day_night_24dp" android:layout_gravity="center" android:gravity="center" android:paddingStart="16dp" @@ -148,14 +148,14 @@ android:id="@+id/locked_image_view_item_post_card_2_with_preview" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_card_2_with_preview" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> <ImageView diff --git a/app/src/main/res/layout/item_post_card_3_gallery_type.xml b/app/src/main/res/layout/item_post_card_3_gallery_type.xml index 7d1b73cb..804d51f2 100644 --- a/app/src/main/res/layout/item_post_card_3_gallery_type.xml +++ b/app/src/main/res/layout/item_post_card_3_gallery_type.xml @@ -47,7 +47,7 @@ android:id="@+id/no_preview_image_view_item_post_card_3_gallery_type" android:layout_width="match_parent" android:layout_height="150dp" - android:src="@drawable/ic_gallery_24dp" + android:src="@drawable/ic_gallery_day_night_24dp" android:scaleType="center" android:visibility="gone" /> diff --git a/app/src/main/res/layout/item_post_card_3_with_preview.xml b/app/src/main/res/layout/item_post_card_3_with_preview.xml index 6c67c593..cf659b55 100644 --- a/app/src/main/res/layout/item_post_card_3_with_preview.xml +++ b/app/src/main/res/layout/item_post_card_3_with_preview.xml @@ -48,7 +48,7 @@ android:id="@+id/load_image_error_text_view_item_post_card_3_with_preview" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableTop="@drawable/ic_error_outline_black_24dp" + android:drawableTop="@drawable/ic_error_outline_black_day_night_24dp" android:layout_gravity="center" android:gravity="center" android:text="@string/error_loading_image_tap_to_retry" diff --git a/app/src/main/res/layout/item_post_compact.xml b/app/src/main/res/layout/item_post_compact.xml index 3ef422b0..561808ae 100644 --- a/app/src/main/res/layout/item_post_compact.xml +++ b/app/src/main/res/layout/item_post_compact.xml @@ -167,14 +167,14 @@ android:id="@+id/locked_image_view_item_post_compact" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_compact" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> @@ -253,7 +253,7 @@ android:layout_width="72dp" android:layout_height="72dp" android:scaleType="center" - android:src="@drawable/ic_link" + android:src="@drawable/ic_link_day_night_24dp" app:tint="@android:color/tab_indicator_text" /> </FrameLayout> diff --git a/app/src/main/res/layout/item_post_compact_right_thumbnail.xml b/app/src/main/res/layout/item_post_compact_right_thumbnail.xml index fc2e338c..f1794aa3 100644 --- a/app/src/main/res/layout/item_post_compact_right_thumbnail.xml +++ b/app/src/main/res/layout/item_post_compact_right_thumbnail.xml @@ -132,7 +132,7 @@ android:layout_width="72dp" android:layout_height="72dp" android:scaleType="center" - android:src="@drawable/ic_link" + android:src="@drawable/ic_link_day_night_24dp" app:tint="@android:color/tab_indicator_text" /> </FrameLayout> @@ -229,14 +229,14 @@ android:id="@+id/locked_image_view_item_post_compact_right_thumbnail" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_compact_right_thumbnail" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> diff --git a/app/src/main/res/layout/item_post_detail_gallery.xml b/app/src/main/res/layout/item_post_detail_gallery.xml index 8790147d..8cefdfd7 100644 --- a/app/src/main/res/layout/item_post_detail_gallery.xml +++ b/app/src/main/res/layout/item_post_detail_gallery.xml @@ -182,14 +182,14 @@ android:id="@+id/locked_image_view_item_post_detail_gallery" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_detail_gallery" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> @@ -225,7 +225,7 @@ android:layout_width="match_parent" android:layout_height="150dp" android:scaleType="center" - android:src="@drawable/ic_link" + android:src="@drawable/ic_link_day_night_24dp" android:visibility="gone" /> <androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml b/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml index 88226537..e6e0dc4e 100644 --- a/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml +++ b/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml @@ -182,14 +182,14 @@ android:id="@+id/locked_image_view_item_post_detail_image_and_gif_autoplay" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_detail_image_and_gif_autoplay" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> @@ -221,7 +221,7 @@ android:id="@+id/load_image_error_text_view_item_post_detail_image_and_gif_autoplay" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableTop="@drawable/ic_error_outline_black_24dp" + android:drawableTop="@drawable/ic_error_outline_black_day_night_24dp" android:layout_centerInParent="true" android:gravity="center" android:text="@string/error_loading_image_tap_to_retry" diff --git a/app/src/main/res/layout/item_post_detail_link.xml b/app/src/main/res/layout/item_post_detail_link.xml index 07146487..3ada66fa 100644 --- a/app/src/main/res/layout/item_post_detail_link.xml +++ b/app/src/main/res/layout/item_post_detail_link.xml @@ -182,14 +182,14 @@ android:id="@+id/locked_image_view_item_post_detail_link" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_detail_link" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> @@ -231,7 +231,7 @@ android:id="@+id/load_image_error_text_view_item_post_detail_link" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableTop="@drawable/ic_error_outline_black_24dp" + android:drawableTop="@drawable/ic_error_outline_black_day_night_24dp" android:layout_centerInParent="true" android:gravity="center" android:text="@string/error_loading_image_tap_to_retry" diff --git a/app/src/main/res/layout/item_post_detail_no_preview.xml b/app/src/main/res/layout/item_post_detail_no_preview.xml index edeff313..c73667ae 100644 --- a/app/src/main/res/layout/item_post_detail_no_preview.xml +++ b/app/src/main/res/layout/item_post_detail_no_preview.xml @@ -192,14 +192,14 @@ android:id="@+id/locked_image_view_item_post_detail_no_preview" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_detail_no_preview" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> diff --git a/app/src/main/res/layout/item_post_detail_text.xml b/app/src/main/res/layout/item_post_detail_text.xml index dece9e5b..4b613e7c 100644 --- a/app/src/main/res/layout/item_post_detail_text.xml +++ b/app/src/main/res/layout/item_post_detail_text.xml @@ -192,14 +192,14 @@ android:id="@+id/locked_image_view_item_post_detail_text" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_detail_text" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> diff --git a/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml b/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml index 0a0cbefb..aad84497 100644 --- a/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml +++ b/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml @@ -181,14 +181,14 @@ android:id="@+id/locked_image_view_item_post_detail_video_and_gif_preview" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_detail_video_and_gif_preview" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> @@ -234,7 +234,7 @@ android:id="@+id/load_image_error_text_view_item_post_detail_video_and_gif_preview" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableTop="@drawable/ic_error_outline_black_24dp" + android:drawableTop="@drawable/ic_error_outline_black_day_night_24dp" android:layout_centerInParent="true" android:gravity="center" android:text="@string/error_loading_image_tap_to_retry" diff --git a/app/src/main/res/layout/item_post_detail_video_autoplay.xml b/app/src/main/res/layout/item_post_detail_video_autoplay.xml index c7f83e63..e125831c 100644 --- a/app/src/main/res/layout/item_post_detail_video_autoplay.xml +++ b/app/src/main/res/layout/item_post_detail_video_autoplay.xml @@ -182,14 +182,14 @@ android:id="@+id/locked_image_view_item_post_detail_video_autoplay" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_detail_video_autoplay" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> diff --git a/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml index 5fc8b31c..27f91352 100644 --- a/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml @@ -182,14 +182,14 @@ android:id="@+id/locked_image_view_item_post_detail_video_autoplay" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_detail_video_autoplay" android:layout_width="20dp" android:layout_height="20dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> diff --git a/app/src/main/res/layout/item_post_gallery.xml b/app/src/main/res/layout/item_post_gallery.xml index 5153fd8f..98b6fed9 100644 --- a/app/src/main/res/layout/item_post_gallery.xml +++ b/app/src/main/res/layout/item_post_gallery.xml @@ -47,7 +47,7 @@ android:layout_gravity="center" android:paddingStart="16dp" android:paddingEnd="16dp" - app:drawableTopCompat="@drawable/ic_error_outline_black_24dp" + app:drawableTopCompat="@drawable/ic_error_outline_black_day_night_24dp" android:layout_centerInParent="true" android:text="@string/error_loading_image_tap_to_retry" android:textSize="?attr/font_default" diff --git a/app/src/main/res/layout/item_post_gallery_type.xml b/app/src/main/res/layout/item_post_gallery_type.xml index 722620c9..32e4f719 100644 --- a/app/src/main/res/layout/item_post_gallery_type.xml +++ b/app/src/main/res/layout/item_post_gallery_type.xml @@ -172,14 +172,14 @@ android:id="@+id/locked_image_view_item_post_gallery_type" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_gallery_type" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> @@ -214,7 +214,7 @@ android:id="@+id/no_preview_image_view_item_post_gallery_type" android:layout_width="match_parent" android:layout_height="150dp" - android:src="@drawable/ic_gallery_24dp" + android:src="@drawable/ic_gallery_day_night_24dp" android:scaleType="center" android:visibility="gone" /> diff --git a/app/src/main/res/layout/item_post_text.xml b/app/src/main/res/layout/item_post_text.xml index 2d67b40d..56f08466 100644 --- a/app/src/main/res/layout/item_post_text.xml +++ b/app/src/main/res/layout/item_post_text.xml @@ -185,14 +185,14 @@ android:id="@+id/locked_image_view_item_post_text_type" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_text_type" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> diff --git a/app/src/main/res/layout/item_post_video_type_autoplay.xml b/app/src/main/res/layout/item_post_video_type_autoplay.xml index 6082e545..cfe3aa97 100644 --- a/app/src/main/res/layout/item_post_video_type_autoplay.xml +++ b/app/src/main/res/layout/item_post_video_type_autoplay.xml @@ -172,14 +172,14 @@ android:id="@+id/locked_image_view_item_post_video_type_autoplay" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_video_type_autoplay" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> diff --git a/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml index 52290db7..0dfa90fd 100644 --- a/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml @@ -172,14 +172,14 @@ android:id="@+id/locked_image_view_item_post_video_type_autoplay" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_video_type_autoplay" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> diff --git a/app/src/main/res/layout/item_post_with_preview.xml b/app/src/main/res/layout/item_post_with_preview.xml index 8e6c0c06..6c63a587 100644 --- a/app/src/main/res/layout/item_post_with_preview.xml +++ b/app/src/main/res/layout/item_post_with_preview.xml @@ -171,14 +171,14 @@ android:id="@+id/locked_image_view_item_post_with_preview" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/ic_outline_lock_24dp" + android:src="@drawable/ic_lock_day_night_24dp" android:visibility="gone" /> <ImageView android:id="@+id/crosspost_image_view_item_post_with_preview" android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/crosspost" + android:src="@drawable/ic_crosspost_24dp" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> @@ -225,7 +225,7 @@ android:id="@+id/load_image_error_text_view_item_post_with_preview" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableTop="@drawable/ic_error_outline_black_24dp" + android:drawableTop="@drawable/ic_error_outline_black_day_night_24dp" android:layout_gravity="center" android:gravity="center" android:text="@string/error_loading_image_tap_to_retry" diff --git a/app/src/main/res/layout/item_private_message_received.xml b/app/src/main/res/layout/item_private_message_received.xml index 7b26b3d4..3312967d 100644 --- a/app/src/main/res/layout/item_private_message_received.xml +++ b/app/src/main/res/layout/item_private_message_received.xml @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="8dp" - android:src="@drawable/ic_round_copy_16" + android:src="@drawable/ic_copy_16dp" android:clickable="true" android:focusable="true" android:background="?attr/actionBarItemBackground" diff --git a/app/src/main/res/layout/item_private_message_sent.xml b/app/src/main/res/layout/item_private_message_sent.xml index 38578b07..844f90dc 100644 --- a/app/src/main/res/layout/item_private_message_sent.xml +++ b/app/src/main/res/layout/item_private_message_sent.xml @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="8dp" - android:src="@drawable/ic_round_copy_16" + android:src="@drawable/ic_copy_16dp" android:clickable="true" android:focusable="true" android:background="?attr/actionBarItemBackground" diff --git a/app/src/main/res/layout/item_reddit_gallery_submission_add_image.xml b/app/src/main/res/layout/item_reddit_gallery_submission_add_image.xml index 2e118595..2b219ef7 100644 --- a/app/src/main/res/layout/item_reddit_gallery_submission_add_image.xml +++ b/app/src/main/res/layout/item_reddit_gallery_submission_add_image.xml @@ -7,7 +7,7 @@ android:id="@+id/fab_item_gallery_submission_add_image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_outline_select_photo_24dp" + android:src="@drawable/ic_select_photo_24dp" android:layout_gravity="center" /> </FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_selected_subreddit.xml b/app/src/main/res/layout/item_selected_subreddit.xml index 2e8ae1c9..d1c26058 100644 --- a/app/src/main/res/layout/item_selected_subreddit.xml +++ b/app/src/main/res/layout/item_selected_subreddit.xml @@ -23,7 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:src="@drawable/ic_delete_24dp" + android:src="@drawable/ic_delete_day_night_24dp" android:clickable="true" android:focusable="true" android:background="?attr/selectableItemBackground" /> diff --git a/app/src/main/res/layout/item_trending_search.xml b/app/src/main/res/layout/item_trending_search.xml index 8a14922a..d7c6a6a6 100644 --- a/app/src/main/res/layout/item_trending_search.xml +++ b/app/src/main/res/layout/item_trending_search.xml @@ -41,7 +41,7 @@ android:id="@+id/load_image_error_text_view_item_trending_search" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableTop="@drawable/ic_error_outline_black_24dp" + android:drawableTop="@drawable/ic_error_outline_black_day_night_24dp" android:layout_gravity="center" android:gravity="center" android:text="@string/error_loading_image_tap_to_retry" @@ -57,7 +57,7 @@ android:layout_width="match_parent" android:layout_height="150dp" android:scaleType="center" - android:src="@drawable/ic_image_24dp" + android:src="@drawable/ic_image_day_night_24dp" android:visibility="gone" /> <TextView diff --git a/app/src/main/res/layout/item_user_custom_theme.xml b/app/src/main/res/layout/item_user_custom_theme.xml index 03bfed78..038d7a8f 100644 --- a/app/src/main/res/layout/item_user_custom_theme.xml +++ b/app/src/main/res/layout/item_user_custom_theme.xml @@ -31,7 +31,7 @@ android:layout_height="24dp" android:layout_gravity="center_vertical" android:layout_marginStart="16dp" - android:src="@drawable/ic_share_24dp" + android:src="@drawable/ic_share_day_night_24dp" android:background="?attr/selectableItemBackgroundBorderless" /> <ImageView diff --git a/app/src/main/res/layout/item_user_flair.xml b/app/src/main/res/layout/item_user_flair.xml index 2b21529a..c057d4f1 100644 --- a/app/src/main/res/layout/item_user_flair.xml +++ b/app/src/main/res/layout/item_user_flair.xml @@ -24,7 +24,7 @@ android:layout_gravity="center_vertical" android:layout_marginStart="16dp" android:padding="16dp" - android:src="@drawable/ic_edit_24dp" + android:src="@drawable/ic_edit_day_night_24dp" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" /> diff --git a/app/src/main/res/layout/markdown_image_and_gif_block.xml b/app/src/main/res/layout/markdown_image_and_gif_block.xml index 8e0aad32..fa340220 100644 --- a/app/src/main/res/layout/markdown_image_and_gif_block.xml +++ b/app/src/main/res/layout/markdown_image_and_gif_block.xml @@ -34,7 +34,7 @@ android:text="@string/error_loading_image_tap_to_retry" android:textSize="?attr/font_default" android:visibility="gone" - app:drawableTopCompat="@drawable/ic_error_outline_black_24dp" /> + app:drawableTopCompat="@drawable/ic_error_outline_black_day_night_24dp" /> </FrameLayout> diff --git a/app/src/main/res/menu/comment_activity.xml b/app/src/main/res/menu/comment_activity.xml index be0fd32f..31152064 100644 --- a/app/src/main/res/menu/comment_activity.xml +++ b/app/src/main/res/menu/comment_activity.xml @@ -5,7 +5,7 @@ android:id="@+id/action_preview_comment_activity" android:orderInCategory="1" android:title="@string/action_preview" - android:icon="@drawable/ic_preview_24dp" + android:icon="@drawable/ic_preview_day_night_24dp" app:showAsAction="ifRoom" /> <item diff --git a/app/src/main/res/menu/crash_reports_fragment.xml b/app/src/main/res/menu/crash_reports_fragment.xml index ad1c92ec..f3f7c4ec 100644 --- a/app/src/main/res/menu/crash_reports_fragment.xml +++ b/app/src/main/res/menu/crash_reports_fragment.xml @@ -5,12 +5,12 @@ android:id="@+id/action_delete_logs_crash_reports_fragment" android:orderInCategory="1" android:title="@string/action_delete_logs" - android:icon="@drawable/ic_delete_24dp" + android:icon="@drawable/ic_delete_day_night_24dp" app:showAsAction="ifRoom" /> <item android:id="@+id/action_export_logs_crash_reports_fragment" android:orderInCategory="2" android:title="@string/action_create_github_issue" - android:icon="@drawable/ic_open_link_24dp" + android:icon="@drawable/ic_open_link_day_night_24dp" app:showAsAction="ifRoom" /> </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/customize_comment_filter_activity.xml b/app/src/main/res/menu/customize_comment_filter_activity.xml index 8d947f81..c7a21dc2 100644 --- a/app/src/main/res/menu/customize_comment_filter_activity.xml +++ b/app/src/main/res/menu/customize_comment_filter_activity.xml @@ -12,6 +12,6 @@ android:id="@+id/action_save_to_database_customize_comment_filter_activity" android:orderInCategory="2" android:title="@string/action_save_to_database" - android:icon="@drawable/ic_save_to_database_24dp" + android:icon="@drawable/ic_save_to_database_day_night_24dp" app:showAsAction="ifRoom" /> </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/customize_post_filter_activity.xml b/app/src/main/res/menu/customize_post_filter_activity.xml index 01690700..260d0f4b 100644 --- a/app/src/main/res/menu/customize_post_filter_activity.xml +++ b/app/src/main/res/menu/customize_post_filter_activity.xml @@ -12,6 +12,6 @@ android:id="@+id/action_save_to_database_customize_post_filter_activity" android:orderInCategory="2" android:title="@string/action_save_to_database" - android:icon="@drawable/ic_save_to_database_24dp" + android:icon="@drawable/ic_save_to_database_day_night_24dp" app:showAsAction="ifRoom" /> </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/customize_theme_activity.xml b/app/src/main/res/menu/customize_theme_activity.xml index 5e0125d3..4966005f 100644 --- a/app/src/main/res/menu/customize_theme_activity.xml +++ b/app/src/main/res/menu/customize_theme_activity.xml @@ -5,7 +5,7 @@ android:id="@+id/action_preview_customize_theme_activity" android:orderInCategory="1" android:title="@string/action_preview" - android:icon="@drawable/ic_preview_24dp" + android:icon="@drawable/ic_preview_day_night_24dp" app:showAsAction="ifRoom" /> <item diff --git a/app/src/main/res/menu/edit_comment_activity.xml b/app/src/main/res/menu/edit_comment_activity.xml index e79f54f6..388e6336 100644 --- a/app/src/main/res/menu/edit_comment_activity.xml +++ b/app/src/main/res/menu/edit_comment_activity.xml @@ -5,7 +5,7 @@ android:id="@+id/action_preview_edit_comment_activity" android:orderInCategory="1" android:title="@string/action_preview" - android:icon="@drawable/ic_preview_24dp" + android:icon="@drawable/ic_preview_day_night_24dp" app:showAsAction="ifRoom" /> <item diff --git a/app/src/main/res/menu/edit_post_activity.xml b/app/src/main/res/menu/edit_post_activity.xml index f6b161ee..41396ad0 100644 --- a/app/src/main/res/menu/edit_post_activity.xml +++ b/app/src/main/res/menu/edit_post_activity.xml @@ -5,7 +5,7 @@ android:id="@+id/action_preview_edit_post_activity" android:orderInCategory="1" android:title="@string/action_preview" - android:icon="@drawable/ic_preview_24dp" + android:icon="@drawable/ic_preview_day_night_24dp" app:showAsAction="ifRoom" /> <item diff --git a/app/src/main/res/menu/post_poll_activity.xml b/app/src/main/res/menu/post_poll_activity.xml index a0c5e65f..c7b66f73 100644 --- a/app/src/main/res/menu/post_poll_activity.xml +++ b/app/src/main/res/menu/post_poll_activity.xml @@ -5,7 +5,7 @@ android:id="@+id/action_preview_post_poll_activity" android:orderInCategory="1" android:title="@string/action_preview" - android:icon="@drawable/ic_preview_24dp" + android:icon="@drawable/ic_preview_day_night_24dp" app:showAsAction="ifRoom" /> <item android:id="@+id/action_send_post_poll_activity" diff --git a/app/src/main/res/menu/post_text_activity.xml b/app/src/main/res/menu/post_text_activity.xml index 66a9448b..2289de94 100644 --- a/app/src/main/res/menu/post_text_activity.xml +++ b/app/src/main/res/menu/post_text_activity.xml @@ -5,7 +5,7 @@ android:id="@+id/action_preview_post_text_activity" android:orderInCategory="1" android:title="@string/action_preview" - android:icon="@drawable/ic_preview_24dp" + android:icon="@drawable/ic_preview_day_night_24dp" app:showAsAction="ifRoom" /> <item diff --git a/app/src/main/res/menu/trending_activity.xml b/app/src/main/res/menu/trending_activity.xml index 2bd2db1c..51de166c 100644 --- a/app/src/main/res/menu/trending_activity.xml +++ b/app/src/main/res/menu/trending_activity.xml @@ -5,6 +5,6 @@ android:id="@+id/action_refresh_trending_activity" android:orderInCategory="1" android:title="@string/action_refresh" - android:icon="@drawable/ic_refresh_24dp" + android:icon="@drawable/ic_refresh_day_night_24dp" app:showAsAction="ifRoom" /> </menu>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 07952129..19007a64 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1488,4 +1488,6 @@ <string name="content_description_hidden">Hidden</string> <string name="content_description_saved">Saved</string> + <string name="comment">Comment</string> + </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 958b57dc..c3c49463 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -534,12 +534,12 @@ </style> <style name="ToroMediaButton.VolumeUp"> - <item name="android:src">@drawable/ic_volume_up_black_24dp</item> + <item name="android:src">@drawable/ic_volume_up_32dp</item> <item name="android:contentDescription">@string/exo_controls_volume_up_description</item> </style> <style name="ToroMediaButton.VolumeOff"> - <item name="android:src">@drawable/ic_volume_off_black_24dp</item> + <item name="android:src">@drawable/ic_volume_off_32dp</item> <item name="android:contentDescription">@string/exo_controls_volume_off_description</item> </style> diff --git a/app/src/main/res/xml-sw600dp/number_of_columns_in_post_feed_preferences.xml b/app/src/main/res/xml-sw600dp/number_of_columns_in_post_feed_preferences.xml index e7fe6320..2edc86a3 100644 --- a/app/src/main/res/xml-sw600dp/number_of_columns_in_post_feed_preferences.xml +++ b/app/src/main/res/xml-sw600dp/number_of_columns_in_post_feed_preferences.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - app:icon="@drawable/ic_info_preference_24dp" + app:icon="@drawable/ic_info_preference_day_night_24dp" app:summary="@string/restart_app_see_changes" app:enabled="false" /> diff --git a/app/src/main/res/xml/data_saving_mode_preferences.xml b/app/src/main/res/xml/data_saving_mode_preferences.xml index 1aad1008..0917fd9c 100644 --- a/app/src/main/res/xml/data_saving_mode_preferences.xml +++ b/app/src/main/res/xml/data_saving_mode_preferences.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - app:icon="@drawable/ic_info_preference_24dp" + app:icon="@drawable/ic_info_preference_day_night_24dp" app:summary="@string/settings_data_saving_mode_info_summary" app:enabled="false" /> diff --git a/app/src/main/res/xml/interface_preferences.xml b/app/src/main/res/xml/interface_preferences.xml index f15a58a7..165dd8dc 100644 --- a/app/src/main/res/xml/interface_preferences.xml +++ b/app/src/main/res/xml/interface_preferences.xml @@ -3,7 +3,7 @@ <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference app:title="@string/settings_font_title" - app:icon="@drawable/ic_font_size_24dp" + app:icon="@drawable/ic_font_size_day_night_24dp" app:fragment="ml.docilealligator.infinityforreddit.settings.FontPreferenceFragment" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml index b582f0da..67e64abc 100644 --- a/app/src/main/res/xml/main_preferences.xml +++ b/app/src/main/res/xml/main_preferences.xml @@ -3,28 +3,28 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - app:icon="@drawable/ic_outline_notifications_24dp" + app:icon="@drawable/ic_notifications_day_night_24dp" app:title="@string/settings_notification_master_title" app:fragment="ml.docilealligator.infinityforreddit.settings.NotificationPreferenceFragment" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - app:icon="@drawable/ic_interface_24dp" + app:icon="@drawable/ic_interface_day_night_24dp" app:title="@string/settings_interface_title" app:fragment="ml.docilealligator.infinityforreddit.settings.InterfacePreferenceFragment" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference app:title="@string/settings_theme_title" - app:icon="@drawable/ic_outline_color_lens_24dp" + app:icon="@drawable/ic_color_lens_day_night_24dp" app:fragment="ml.docilealligator.infinityforreddit.settings.ThemePreferenceFragment" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - app:icon="@drawable/ic_gesture_24dp" + app:icon="@drawable/ic_gesture_day_night_24dp" app:title="@string/settings_gestures_and_buttons_title" app:fragment="ml.docilealligator.infinityforreddit.settings.GesturesAndButtonsPreferenceFragment" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference app:title="@string/settigns_video_title" - android:icon="@drawable/ic_outline_video_24dp" + android:icon="@drawable/ic_video_day_night_24dp" app:fragment="ml.docilealligator.infinityforreddit.settings.VideoPreferenceFragment" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontListPreference @@ -32,74 +32,74 @@ android:entries="@array/settings_lazy_mode_interval" app:entryValues="@array/settings_lazy_mode_interval_values" app:key="lazy_mode_interval" - app:icon="@drawable/ic_outline_access_time_24dp" + app:icon="@drawable/ic_access_time_day_night_24dp" app:title="@string/settings_lazy_mode_interval_title" app:useSimpleSummaryProvider="true" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference app:title="@string/settings_download_location_title" - android:icon="@drawable/ic_download_24dp" + android:icon="@drawable/ic_download_day_night_24dp" app:fragment="ml.docilealligator.infinityforreddit.settings.DownloadLocationPreferenceFragment" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference app:key="security" app:title="@string/settings_security_title" - app:icon="@drawable/ic_security_24dp" + app:icon="@drawable/ic_security_day_night_24dp" app:fragment="ml.docilealligator.infinityforreddit.settings.SecurityPreferenceFragment" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference app:title="@string/settings_data_saving_mode" - app:icon="@drawable/ic_data_saving_mode_24dp" + app:icon="@drawable/ic_data_saving_mode_day_night_24dp" app:fragment="ml.docilealligator.infinityforreddit.settings.DataSavingModePreferenceFragment" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - app:icon="@drawable/ic_nsfw_on_24dp" + app:icon="@drawable/ic_nsfw_on_day_night_24dp" app:title="@string/settings_nsfw_and_spoiler_title" app:fragment="ml.docilealligator.infinityforreddit.settings.NsfwAndSpoilerFragment"/> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - app:icon="@drawable/ic_history_24dp" + app:icon="@drawable/ic_history_day_night_24dp" android:title="@string/settings_post_history_title" app:fragment="ml.docilealligator.infinityforreddit.settings.PostHistoryFragment" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference app:key="post_filter" - app:icon="@drawable/ic_filter_24dp" + app:icon="@drawable/ic_filter_day_night_24dp" app:title="@string/settings_post_filter_title" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference app:key="comment_filter" - app:icon="@drawable/ic_filter_24dp" + app:icon="@drawable/ic_filter_day_night_24dp" app:title="@string/settings_comment_filter_title" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - app:icon="@drawable/ic_sort_24dp" + app:icon="@drawable/ic_sort_day_night_24dp" app:title="@string/settings_sort_type_title" app:fragment="ml.docilealligator.infinityforreddit.settings.SortTypePreferenceFragment" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - app:icon="@drawable/ic_miscellaneous_24dp" + app:icon="@drawable/ic_miscellaneous_day_night_24dp" app:title="@string/settings_miscellaneous_title" app:fragment="ml.docilealligator.infinityforreddit.settings.MiscellaneousPreferenceFragment" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - android:icon="@drawable/ic_advanced_24dp" + android:icon="@drawable/ic_advanced_day_night_24dp" app:title="@string/settings_advanced_master_title" app:fragment="ml.docilealligator.infinityforreddit.settings.AdvancedPreferenceFragment" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - android:icon="@drawable/ic_about_24dp" + android:icon="@drawable/ic_about_day_night_24dp" app:title="@string/settings_about_master_title" app:fragment="ml.docilealligator.infinityforreddit.settings.AboutPreferenceFragment" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference android:key="privacy_policy" - app:icon="@drawable/ic_outline_privacy_policy_24dp" + app:icon="@drawable/ic_privacy_policy_day_night_24dp" app:title="@string/settings_privacy_policy_title" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference android:key="reddit_user_agreement" - app:icon="@drawable/ic_outline_user_agreement_24dp" + app:icon="@drawable/ic_user_agreement_day_night_24dp" app:title="@string/settings_reddit_user_agreement_title" /> </androidx.preference.PreferenceScreen>
\ No newline at end of file diff --git a/app/src/main/res/xml/miscellaneous_preferences.xml b/app/src/main/res/xml/miscellaneous_preferences.xml index 1ae7ed8f..1c413a97 100644 --- a/app/src/main/res/xml/miscellaneous_preferences.xml +++ b/app/src/main/res/xml/miscellaneous_preferences.xml @@ -11,7 +11,7 @@ app:defaultValue="0" app:entries="@array/link_handler" app:entryValues="@array/link_handler_values" - app:icon="@drawable/ic_link" + app:icon="@drawable/ic_link_day_night_24dp" app:key="link_handler" app:title="@string/settings_link_handler_title" app:useSimpleSummaryProvider="true" /> @@ -21,7 +21,7 @@ app:entries="@array/main_page_back_button_action" app:entryValues="@array/main_page_back_button_action_values" app:key="main_page_back_button_action" - app:icon="@drawable/ic_exit_24dp" + app:icon="@drawable/ic_exit_day_night_24dp" app:title="@string/settings_main_page_back_button_action" app:useSimpleSummaryProvider="true" /> @@ -36,7 +36,7 @@ app:entries="@array/settings_language" app:entryValues="@array/settings_language_values" app:key="language" - app:icon="@drawable/ic_language_24dp" + app:icon="@drawable/ic_language_day_night_24dp" app:title="@string/settings_language_title" app:useSimpleSummaryProvider="true" /> @@ -44,7 +44,7 @@ app:title="@string/settings_miscellaneous_dangerous_group_title" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - app:icon="@drawable/ic_info_preference_24dp" + app:icon="@drawable/ic_info_preference_day_night_24dp" app:summary="@string/settings_post_feed_max_resolution_warning_title" app:enabled="false" /> diff --git a/app/src/main/res/xml/navigation_drawer_preferences.xml b/app/src/main/res/xml/navigation_drawer_preferences.xml index db57a2e2..40a7dd4d 100644 --- a/app/src/main/res/xml/navigation_drawer_preferences.xml +++ b/app/src/main/res/xml/navigation_drawer_preferences.xml @@ -2,7 +2,7 @@ <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - app:icon="@drawable/ic_info_preference_24dp" + app:icon="@drawable/ic_info_preference_day_night_24dp" app:summary="@string/restart_app_see_changes" app:enabled="false" /> diff --git a/app/src/main/res/xml/notification_preferences.xml b/app/src/main/res/xml/notification_preferences.xml index 27c1adaa..2403ae4e 100644 --- a/app/src/main/res/xml/notification_preferences.xml +++ b/app/src/main/res/xml/notification_preferences.xml @@ -4,7 +4,7 @@ <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference app:defaultValue="true" app:key="enable_notification" - app:icon="@drawable/ic_outline_notifications_24dp" + app:icon="@drawable/ic_notifications_day_night_24dp" app:title="@string/settings_notification_enable_notification_title"/> <ml.docilealligator.infinityforreddit.customviews.CustomFontListPreference @@ -12,7 +12,7 @@ app:entries="@array/settings_notification_interval" app:entryValues="@array/settings_notification_interval_values" app:key="notificaiton_interval" - app:icon="@drawable/ic_outline_access_time_24dp" + app:icon="@drawable/ic_access_time_day_night_24dp" app:title="@string/settings_notification_interval_title" app:useSimpleSummaryProvider="true" app:isPreferenceVisible="false" /> diff --git a/app/src/main/res/xml/number_of_columns_in_post_feed_preferences.xml b/app/src/main/res/xml/number_of_columns_in_post_feed_preferences.xml index 08bf1e63..3a066f41 100644 --- a/app/src/main/res/xml/number_of_columns_in_post_feed_preferences.xml +++ b/app/src/main/res/xml/number_of_columns_in_post_feed_preferences.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - android:icon="@drawable/ic_info_preference_24dp" + android:icon="@drawable/ic_info_preference_day_night_24dp" app:summary="@string/restart_app_see_changes" app:enabled="false" /> diff --git a/app/src/main/res/xml/security_preferences.xml b/app/src/main/res/xml/security_preferences.xml index e388f4c4..9e529dd1 100644 --- a/app/src/main/res/xml/security_preferences.xml +++ b/app/src/main/res/xml/security_preferences.xml @@ -14,7 +14,7 @@ <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference app:defaultValue="false" app:key="app_lock" - app:icon="@drawable/ic_outline_lock_24dp" + app:icon="@drawable/ic_lock_day_night_24dp" app:title="@string/settings_app_lock_title" app:summary="@string/settings_app_lock_summary" /> @@ -23,7 +23,7 @@ app:entries="@array/settings_app_lock_timeout" app:entryValues="@array/settings_app_lock_timeout_values" app:key="app_lock_timeout" - app:icon="@drawable/ic_outline_access_time_24dp" + app:icon="@drawable/ic_access_time_day_night_24dp" app:title="@string/settings_app_lock_timeout_title" app:useSimpleSummaryProvider="true" /> diff --git a/app/src/main/res/xml/swipe_action_preferences.xml b/app/src/main/res/xml/swipe_action_preferences.xml index 6ee0bac7..bf20cdb6 100644 --- a/app/src/main/res/xml/swipe_action_preferences.xml +++ b/app/src/main/res/xml/swipe_action_preferences.xml @@ -2,7 +2,7 @@ <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - app:icon="@drawable/ic_info_preference_24dp" + app:icon="@drawable/ic_info_preference_day_night_24dp" app:summary="@string/settings_swipe_action_info_summary" app:enabled="false" /> diff --git a/app/src/main/res/xml/theme_preferences.xml b/app/src/main/res/xml/theme_preferences.xml index ab02e39b..9037806b 100644 --- a/app/src/main/res/xml/theme_preferences.xml +++ b/app/src/main/res/xml/theme_preferences.xml @@ -5,14 +5,14 @@ app:defaultValue="2" app:entryValues="@array/settings_theme_values" app:key="theme" - app:icon="@drawable/ic_outline_color_lens_24dp" + app:icon="@drawable/ic_color_lens_day_night_24dp" app:title="@string/settings_theme_title" app:useSimpleSummaryProvider="true" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference app:defaultValue="false" app:key="amoled_dark" - app:icon="@drawable/ic_amoled_theme_preference_24dp" + app:icon="@drawable/ic_amoled_theme_preference_day_night_24dp" app:title="@string/settings_amoled_dark_title" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreferenceCategory @@ -20,32 +20,32 @@ <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference app:key="customize_light_theme" - app:icon="@drawable/ic_light_theme_preference_24dp" + app:icon="@drawable/ic_light_theme_preference_day_night_24dp" app:title="@string/settings_customize_light_theme_title" app:isPreferenceVisible="false" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference app:key="customize_dark_theme" - app:icon="@drawable/ic_dark_theme_preference_24dp" + app:icon="@drawable/ic_dark_theme_preference_day_night_24dp" app:title="@string/settings_customize_dark_theme_title" app:isPreferenceVisible="false" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference app:key="customize_amoled_theme" - app:icon="@drawable/ic_amoled_theme_preference_24dp" + app:icon="@drawable/ic_amoled_theme_preference_day_night_24dp" app:title="@string/settings_customize_amoled_theme_title" app:isPreferenceVisible="false" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference app:key="manage_themes" - app:icon="@drawable/ic_edit_24dp" + app:icon="@drawable/ic_edit_day_night_24dp" app:title="@string/settings_manage_themes_title" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreferenceCategory app:title="@string/settings_category_material_you_title" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - app:icon="@drawable/ic_info_preference_24dp" + app:icon="@drawable/ic_info_preference_day_night_24dp" app:summary="@string/settings_enable_material_you_warning_summary" app:enabled="false" /> diff --git a/app/src/main/res/xml/video_preferences.xml b/app/src/main/res/xml/video_preferences.xml index 402497b8..9f98b248 100644 --- a/app/src/main/res/xml/video_preferences.xml +++ b/app/src/main/res/xml/video_preferences.xml @@ -5,13 +5,13 @@ <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference app:defaultValue="false" app:key="mute_video" - app:icon="@drawable/ic_mute_preferences_24dp" + app:icon="@drawable/ic_mute_preferences_day_night_24dp" app:title="@string/settings_mute_video_title" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference app:defaultValue="false" app:key="mute_nsfw_video" - app:icon="@drawable/ic_mute_preferences_24dp" + app:icon="@drawable/ic_mute_preferences_day_night_24dp" app:title="@string/settings_mute_nsfw_video_title" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference @@ -59,7 +59,7 @@ <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference app:defaultValue="true" app:key="mute_autoplaying_videos" - app:icon="@drawable/ic_mute_preferences_24dp" + app:icon="@drawable/ic_mute_preferences_day_night_24dp" app:title="@string/settings_mute_autoplaying_videos_title" /> <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference |
