Skip to content

Commit 747f5f1

Browse files
Docile-AlligatorDocile-Alligator
committed
Start implementing PostOptionsBottomSheetFragment. Rename some drawables.
1 parent fbc00b1 commit 747f5f1

File tree

290 files changed

+756
-553
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

290 files changed

+756
-553
lines changed

‎app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizePostFilterActivity.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -264,22 +264,22 @@ protected void applyCustomTheme() {
264264

265265
binding.postTypeCardViewCustomizePostFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor);
266266
binding.postTypeExplanationTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
267-
binding.postTypeTextTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_text_24dp, primaryIconColor), null, null, null);
267+
binding.postTypeTextTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_text_day_night_24dp, primaryIconColor), null, null, null);
268268
binding.postTypeTextTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
269-
binding.postTypeLinkTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_link, primaryIconColor), null, null, null);
269+
binding.postTypeLinkTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_link_day_night_24dp, primaryIconColor), null, null, null);
270270
binding.postTypeLinkTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
271-
binding.postTypeImageTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_image_24dp, primaryIconColor), null, null, null);
271+
binding.postTypeImageTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_image_day_night_24dp, primaryIconColor), null, null, null);
272272
binding.postTypeImageTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
273-
binding.postTypeGifTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_image_24dp, primaryIconColor), null, null, null);
273+
binding.postTypeGifTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_image_day_night_24dp, primaryIconColor), null, null, null);
274274
binding.postTypeGifTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
275-
binding.postTypeVideoTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_outline_video_24dp, primaryIconColor), null, null, null);
275+
binding.postTypeVideoTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_video_day_night_24dp, primaryIconColor), null, null, null);
276276
binding.postTypeVideoTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
277-
binding.postTypeGalleryTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_gallery_24dp, primaryIconColor), null, null, null);
277+
binding.postTypeGalleryTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_gallery_day_night_24dp, primaryIconColor), null, null, null);
278278
binding.postTypeGalleryTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
279279

280280
binding.onlyNsfwSpoilerCardViewCustomizePostFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor);
281281
binding.onlyNsfwSpoilerExplanationTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
282-
binding.onlyNsfwTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_nsfw_on_24dp, primaryIconColor), null, null, null);
282+
binding.onlyNsfwTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_nsfw_on_day_night_24dp, primaryIconColor), null, null, null);
283283
binding.onlyNsfwTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
284284
binding.onlySpoilerTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_spoiler_black_24dp, primaryIconColor), null, null, null);
285285
binding.onlySpoilerTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);

‎app/src/main/java/ml/docilealligator/infinityforreddit/activities/LoginActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ protected void applyCustomTheme() {
288288
binding.getRoot().setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
289289
applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(binding.appbarLayoutLoginActivity, null, binding.toolbarLoginActivity);
290290
binding.twoFaInfOTextViewLoginActivity.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
291-
Drawable infoDrawable = Utils.getTintedDrawable(this, R.drawable.ic_info_preference_24dp, mCustomThemeWrapper.getPrimaryIconColor());
291+
Drawable infoDrawable = Utils.getTintedDrawable(this, R.drawable.ic_info_preference_day_night_24dp, mCustomThemeWrapper.getPrimaryIconColor());
292292
binding.twoFaInfOTextViewLoginActivity.setCompoundDrawablesWithIntrinsicBounds(infoDrawable, null, null, null);
293293
applyFABTheme(binding.fabLoginActivity);
294294
if (typeface != null) {

‎app/src/main/java/ml/docilealligator/infinityforreddit/activities/MainActivity.java

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -510,43 +510,43 @@ private void bottomAppBarOptionAction(int option) {
510510
private int getBottomAppBarOptionDrawableResource(int option) {
511511
switch (option) {
512512
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_SUBSCRIPTIONS:
513-
return R.drawable.ic_subscritptions_bottom_app_bar_24dp;
513+
return R.drawable.ic_subscriptions_bottom_app_bar_day_night_24dp;
514514
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_MULTIREDDITS:
515-
return R.drawable.ic_multi_reddit_24dp;
515+
return R.drawable.ic_multi_reddit_day_night_24dp;
516516
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_INBOX:
517-
return R.drawable.ic_inbox_24dp;
517+
return R.drawable.ic_inbox_day_night_24dp;
518518
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_SUBMIT_POSTS:
519519
return R.drawable.ic_add_day_night_24dp;
520520
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_REFRESH:
521-
return R.drawable.ic_refresh_24dp;
521+
return R.drawable.ic_refresh_day_night_24dp;
522522
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_CHANGE_SORT_TYPE:
523523
return R.drawable.ic_sort_toolbar_24dp;
524524
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_CHANGE_POST_LAYOUT:
525-
return R.drawable.ic_post_layout_24dp;
525+
return R.drawable.ic_post_layout_day_night_24dp;
526526
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_SEARCH:
527-
return R.drawable.ic_search_24dp;
527+
return R.drawable.ic_search_day_night_24dp;
528528
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_GO_TO_SUBREDDIT:
529-
return R.drawable.ic_subreddit_24dp;
529+
return R.drawable.ic_subreddit_day_night_24dp;
530530
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_GO_TO_USER:
531-
return R.drawable.ic_user_24dp;
531+
return R.drawable.ic_user_day_night_24dp;
532532
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_RANDOM:
533-
return R.drawable.ic_random_24dp;
533+
return R.drawable.ic_random_day_night_24dp;
534534
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_HIDE_READ_POSTS:
535-
return R.drawable.ic_hide_read_posts_24dp;
535+
return R.drawable.ic_hide_read_posts_day_night_24dp;
536536
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_FILTER_POSTS:
537-
return R.drawable.ic_filter_24dp;
537+
return R.drawable.ic_filter_day_night_24dp;
538538
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_UPVOTED:
539-
return R.drawable.ic_arrow_upward_black_24dp;
539+
return R.drawable.ic_arrow_upward_day_night_24dp;
540540
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_DOWNVOTED:
541-
return R.drawable.ic_arrow_downward_black_24dp;
541+
return R.drawable.ic_arrow_downward_day_night_24dp;
542542
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_HIDDEN:
543-
return R.drawable.ic_outline_lock_24dp;
543+
return R.drawable.ic_lock_day_night_24dp;
544544
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_SAVED:
545-
return R.drawable.ic_outline_bookmarks_24dp;
545+
return R.drawable.ic_bookmarks_day_night_24dp;
546546
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_GO_TO_TOP:
547-
return R.drawable.ic_keyboard_double_arrow_up_24;
547+
return R.drawable.ic_keyboard_double_arrow_up_day_night_24dp;
548548
default:
549-
return R.drawable.ic_account_circle_24dp;
549+
return R.drawable.ic_account_circle_day_night_24dp;
550550
}
551551
}
552552

@@ -647,54 +647,54 @@ private void bindView() {
647647
SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_SUBMIT_POSTS);
648648
switch (fabOption) {
649649
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_REFRESH:
650-
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_refresh_24dp);
650+
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_refresh_day_night_24dp);
651651
navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_refresh));
652652
break;
653653
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_CHANGE_SORT_TYPE:
654654
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_sort_toolbar_24dp);
655655
navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_change_sort_type));
656656
break;
657657
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_CHANGE_POST_LAYOUT:
658-
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_post_layout_24dp);
658+
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_post_layout_day_night_24dp);
659659
navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_change_post_layout));
660660
break;
661661
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_SEARCH:
662-
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_search_24dp);
662+
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_search_day_night_24dp);
663663
navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_search));
664664
break;
665665
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_GO_TO_SUBREDDIT:
666-
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_subreddit_24dp);
666+
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_subreddit_day_night_24dp);
667667
navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_go_to_subreddit));
668668
break;
669669
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_GO_TO_USER:
670-
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_user_24dp);
670+
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_user_day_night_24dp);
671671
navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_go_to_user));
672672
break;
673673
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_RANDOM:
674-
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_random_24dp);
674+
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_random_day_night_24dp);
675675
navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_random));
676676
break;
677677
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_HIDE_READ_POSTS:
678678
if (accountName.equals(Account.ANONYMOUS_ACCOUNT)) {
679-
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp);
679+
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp);
680680
fabOption = SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_FILTER_POSTS;
681681
navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_filter_posts));
682682
} else {
683-
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_hide_read_posts_24dp);
683+
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_hide_read_posts_day_night_24dp);
684684
navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_hide_read_posts));
685685
}
686686
break;
687687
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_FILTER_POSTS:
688-
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp);
688+
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp);
689689
navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_filter_posts));
690690
break;
691691
case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_GO_TO_TOP:
692-
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_keyboard_double_arrow_up_24);
692+
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_keyboard_double_arrow_up_day_night_24dp);
693693
navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_go_to_top));
694694
break;
695695
default:
696696
if (accountName.equals(Account.ANONYMOUS_ACCOUNT)) {
697-
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_24dp);
697+
navigationWrapper.floatingActionButton.setImageResource(R.drawable.ic_filter_day_night_24dp);
698698
fabOption = SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_FILTER_POSTS;
699699
navigationWrapper.floatingActionButton.setContentDescription(getString(R.string.content_description_filter_posts));
700700
} else {

‎app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchResultActivity.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -279,43 +279,43 @@ public void onPageSelected(int position) {
279279
fabOption = bottomAppBarSharedPreference.getInt(SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB, SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_SUBMIT_POSTS);
280280
switch (fabOption) {
281281
case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_REFRESH:
282-
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_refresh_24dp);
282+
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_refresh_day_night_24dp);
283283
break;
284284
case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_CHANGE_SORT_TYPE:
285285
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_sort_toolbar_24dp);
286286
break;
287287
case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_CHANGE_POST_LAYOUT:
288-
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_post_layout_24dp);
288+
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_post_layout_day_night_24dp);
289289
break;
290290
case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_SEARCH:
291-
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_search_24dp);
291+
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_search_day_night_24dp);
292292
break;
293293
case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_SUBREDDIT:
294-
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_subreddit_24dp);
294+
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_subreddit_day_night_24dp);
295295
break;
296296
case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_USER:
297-
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_user_24dp);
297+
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_user_day_night_24dp);
298298
break;
299299
case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_RANDOM:
300-
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_random_24dp);
300+
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_random_day_night_24dp);
301301
break;
302302
case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_HIDE_READ_POSTS:
303303
if (accountName.equals(Account.ANONYMOUS_ACCOUNT)) {
304-
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_filter_24dp);
304+
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_filter_day_night_24dp);
305305
fabOption = SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS;
306306
} else {
307-
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_hide_read_posts_24dp);
307+
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_hide_read_posts_day_night_24dp);
308308
}
309309
break;
310310
case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS:
311-
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_filter_24dp);
311+
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_filter_day_night_24dp);
312312
break;
313313
case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_GO_TO_TOP:
314-
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_keyboard_double_arrow_up_24);
314+
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_keyboard_double_arrow_up_day_night_24dp);
315315
break;
316316
default:
317317
if (accountName.equals(Account.ANONYMOUS_ACCOUNT)) {
318-
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_filter_24dp);
318+
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_filter_day_night_24dp);
319319
fabOption = SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_FILTER_POSTS;
320320
} else {
321321
binding.fabSearchResultActivity.setImageResource(R.drawable.ic_add_day_night_24dp);

‎app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubmitCrosspostActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ public void onLoadCleared(@Nullable Drawable placeholder) {
254254
binding.playButtonImageViewSubmitCrosspostActivity.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_play_circle_36dp));
255255
} else if (post.getPostType() == Post.GALLERY_TYPE) {
256256
binding.playButtonImageViewSubmitCrosspostActivity.setVisibility(View.VISIBLE);
257-
binding.playButtonImageViewSubmitCrosspostActivity.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_gallery_24dp));
257+
binding.playButtonImageViewSubmitCrosspostActivity.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_gallery_day_night_24dp));
258258
}
259259
}
260260
}

0 commit comments

Comments
 (0)