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

New theme options: Media Indicator Icon Color and Media Indicator Background Color.

Browse Source
This commit is contained in:
Alex Ning 2021-10-14 21:32:47 +08:00
parent a8f21a94b0
commit a129c918a0
6 changed files with 107 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,6 +352,8 @@ public abstract class RedditDataRoomDatabase extends RoomDatabase {
"PRIMARY KEY(path, username, subreddit_name), FOREIGN KEY(path) REFERENCES multi_reddits(path) ON DELETE CASCADE ON UPDATE CASCADE, " + "PRIMARY KEY(path, username, subreddit_name), FOREIGN KEY(path) REFERENCES multi_reddits(path) ON DELETE CASCADE ON UPDATE CASCADE, " +
"FOREIGN KEY(username) REFERENCES multi_reddits(username) ON DELETE CASCADE ON UPDATE CASCADE)"); "FOREIGN KEY(username) REFERENCES multi_reddits(username) ON DELETE CASCADE ON UPDATE CASCADE)");
database.execSQL("ALTER TABLE recent_search_queries ADD COLUMN time INTEGER DEFAULT 0 NOT NULL"); database.execSQL("ALTER TABLE recent_search_queries ADD COLUMN time INTEGER DEFAULT 0 NOT NULL");
database.execSQL("ALTER TABLE custom_themes ADD COLUMN media_indicator_icon_color INTEGER DEFAULT " + Color.parseColor("#FFFFFF") + " NOT NULL");
database.execSQL("ALTER TABLE custom_themes ADD COLUMN media_indicator_background_color INTEGER DEFAULT " + Color.parseColor("#000000") + " NOT NULL");
} }
}; };
} }

102
app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomTheme.java
View File

@ -69,6 +69,10 @@ public class CustomTheme {
public int toolbarSecondaryTextColor; public int toolbarSecondaryTextColor;
@ColumnInfo(name = "circular_progress_bar_background") @ColumnInfo(name = "circular_progress_bar_background")
public int circularProgressBarBackground; public int circularProgressBarBackground;
@ColumnInfo(name = "media_indicator_icon_color")
public int mediaIndicatorIconColor;
@ColumnInfo(name = "media_indicator_background_color")
public int mediaIndicatorBackgroundColor;
@ColumnInfo(name = "tab_layout_with_expanded_collapsing_toolbar_tab_background") @ColumnInfo(name = "tab_layout_with_expanded_collapsing_toolbar_tab_background")
public int tabLayoutWithExpandedCollapsingToolbarTabBackground; public int tabLayoutWithExpandedCollapsingToolbarTabBackground;
@ColumnInfo(name = "tab_layout_with_expanded_collapsing_toolbar_text_color") @ColumnInfo(name = "tab_layout_with_expanded_collapsing_toolbar_text_color")
@ -241,54 +245,56 @@ public class CustomTheme {
customTheme.toolbarPrimaryTextAndIconColor = customThemeSettingsItems.get(34).colorValue; customTheme.toolbarPrimaryTextAndIconColor = customThemeSettingsItems.get(34).colorValue;
customTheme.toolbarSecondaryTextColor = customThemeSettingsItems.get(35).colorValue; customTheme.toolbarSecondaryTextColor = customThemeSettingsItems.get(35).colorValue;
customTheme.circularProgressBarBackground = customThemeSettingsItems.get(36).colorValue; customTheme.circularProgressBarBackground = customThemeSettingsItems.get(36).colorValue;
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = customThemeSettingsItems.get(37).colorValue; customTheme.mediaIndicatorIconColor = customThemeSettingsItems.get(37).colorValue;
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = customThemeSettingsItems.get(38).colorValue; customTheme.mediaIndicatorBackgroundColor = customThemeSettingsItems.get(38).colorValue;
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = customThemeSettingsItems.get(39).colorValue; customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = customThemeSettingsItems.get(39).colorValue;
customTheme.tabLayoutWithCollapsedCollapsingToolbarTabBackground = customThemeSettingsItems.get(40).colorValue; customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = customThemeSettingsItems.get(40).colorValue;
customTheme.tabLayoutWithCollapsedCollapsingToolbarTextColor = customThemeSettingsItems.get(41).colorValue; customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = customThemeSettingsItems.get(41).colorValue;
customTheme.tabLayoutWithCollapsedCollapsingToolbarTabIndicator = customThemeSettingsItems.get(42).colorValue; customTheme.tabLayoutWithCollapsedCollapsingToolbarTabBackground = customThemeSettingsItems.get(42).colorValue;
customTheme.upvoted = customThemeSettingsItems.get(43).colorValue; customTheme.tabLayoutWithCollapsedCollapsingToolbarTextColor = customThemeSettingsItems.get(43).colorValue;
customTheme.downvoted = customThemeSettingsItems.get(44).colorValue; customTheme.tabLayoutWithCollapsedCollapsingToolbarTabIndicator = customThemeSettingsItems.get(44).colorValue;
customTheme.postTypeBackgroundColor = customThemeSettingsItems.get(45).colorValue; customTheme.upvoted = customThemeSettingsItems.get(45).colorValue;
customTheme.postTypeTextColor = customThemeSettingsItems.get(46).colorValue; customTheme.downvoted = customThemeSettingsItems.get(46).colorValue;
customTheme.spoilerBackgroundColor = customThemeSettingsItems.get(47).colorValue; customTheme.postTypeBackgroundColor = customThemeSettingsItems.get(47).colorValue;
customTheme.spoilerTextColor = customThemeSettingsItems.get(48).colorValue; customTheme.postTypeTextColor = customThemeSettingsItems.get(48).colorValue;
customTheme.nsfwBackgroundColor = customThemeSettingsItems.get(49).colorValue; customTheme.spoilerBackgroundColor = customThemeSettingsItems.get(49).colorValue;
customTheme.nsfwTextColor = customThemeSettingsItems.get(50).colorValue; customTheme.spoilerTextColor = customThemeSettingsItems.get(50).colorValue;
customTheme.flairBackgroundColor = customThemeSettingsItems.get(51).colorValue; customTheme.nsfwBackgroundColor = customThemeSettingsItems.get(51).colorValue;
customTheme.flairTextColor = customThemeSettingsItems.get(52).colorValue; customTheme.nsfwTextColor = customThemeSettingsItems.get(52).colorValue;
customTheme.awardsBackgroundColor = customThemeSettingsItems.get(53).colorValue; customTheme.flairBackgroundColor = customThemeSettingsItems.get(53).colorValue;
customTheme.awardsTextColor = customThemeSettingsItems.get(54).colorValue; customTheme.flairTextColor = customThemeSettingsItems.get(54).colorValue;
customTheme.archivedTint = customThemeSettingsItems.get(55).colorValue; customTheme.awardsBackgroundColor = customThemeSettingsItems.get(55).colorValue;
customTheme.lockedIconTint = customThemeSettingsItems.get(56).colorValue; customTheme.awardsTextColor = customThemeSettingsItems.get(56).colorValue;
customTheme.crosspostIconTint = customThemeSettingsItems.get(57).colorValue; customTheme.archivedTint = customThemeSettingsItems.get(57).colorValue;
customTheme.upvoteRatioIconTint = customThemeSettingsItems.get(58).colorValue; customTheme.lockedIconTint = customThemeSettingsItems.get(58).colorValue;
customTheme.stickiedPostIconTint = customThemeSettingsItems.get(59).colorValue; customTheme.crosspostIconTint = customThemeSettingsItems.get(59).colorValue;
customTheme.noPreviewPostTypeIconTint = customThemeSettingsItems.get(60).colorValue; customTheme.upvoteRatioIconTint = customThemeSettingsItems.get(60).colorValue;
customTheme.subscribed = customThemeSettingsItems.get(61).colorValue; customTheme.stickiedPostIconTint = customThemeSettingsItems.get(61).colorValue;
customTheme.unsubscribed = customThemeSettingsItems.get(62).colorValue; customTheme.noPreviewPostTypeIconTint = customThemeSettingsItems.get(62).colorValue;
customTheme.username = customThemeSettingsItems.get(63).colorValue; customTheme.subscribed = customThemeSettingsItems.get(63).colorValue;
customTheme.subreddit = customThemeSettingsItems.get(64).colorValue; customTheme.unsubscribed = customThemeSettingsItems.get(64).colorValue;
customTheme.authorFlairTextColor = customThemeSettingsItems.get(65).colorValue; customTheme.username = customThemeSettingsItems.get(65).colorValue;
customTheme.submitter = customThemeSettingsItems.get(66).colorValue; customTheme.subreddit = customThemeSettingsItems.get(66).colorValue;
customTheme.moderator = customThemeSettingsItems.get(67).colorValue; customTheme.authorFlairTextColor = customThemeSettingsItems.get(67).colorValue;
customTheme.currentUser = customThemeSettingsItems.get(68).colorValue; customTheme.submitter = customThemeSettingsItems.get(68).colorValue;
customTheme.singleCommentThreadBackgroundColor = customThemeSettingsItems.get(69).colorValue; customTheme.moderator = customThemeSettingsItems.get(69).colorValue;
customTheme.unreadMessageBackgroundColor = customThemeSettingsItems.get(70).colorValue; customTheme.currentUser = customThemeSettingsItems.get(70).colorValue;
customTheme.dividerColor = customThemeSettingsItems.get(71).colorValue; customTheme.singleCommentThreadBackgroundColor = customThemeSettingsItems.get(71).colorValue;
customTheme.noPreviewPostTypeBackgroundColor = customThemeSettingsItems.get(72).colorValue; customTheme.unreadMessageBackgroundColor = customThemeSettingsItems.get(72).colorValue;
customTheme.voteAndReplyUnavailableButtonColor = customThemeSettingsItems.get(73).colorValue; customTheme.dividerColor = customThemeSettingsItems.get(73).colorValue;
customTheme.commentVerticalBarColor1 = customThemeSettingsItems.get(74).colorValue; customTheme.noPreviewPostTypeBackgroundColor = customThemeSettingsItems.get(74).colorValue;
customTheme.commentVerticalBarColor2 = customThemeSettingsItems.get(75).colorValue; customTheme.voteAndReplyUnavailableButtonColor = customThemeSettingsItems.get(75).colorValue;
customTheme.commentVerticalBarColor3 = customThemeSettingsItems.get(76).colorValue; customTheme.commentVerticalBarColor1 = customThemeSettingsItems.get(76).colorValue;
customTheme.commentVerticalBarColor4 = customThemeSettingsItems.get(77).colorValue; customTheme.commentVerticalBarColor2 = customThemeSettingsItems.get(77).colorValue;
customTheme.commentVerticalBarColor5 = customThemeSettingsItems.get(78).colorValue; customTheme.commentVerticalBarColor3 = customThemeSettingsItems.get(78).colorValue;
customTheme.commentVerticalBarColor6 = customThemeSettingsItems.get(79).colorValue; customTheme.commentVerticalBarColor4 = customThemeSettingsItems.get(79).colorValue;
customTheme.commentVerticalBarColor7 = customThemeSettingsItems.get(80).colorValue; customTheme.commentVerticalBarColor5 = customThemeSettingsItems.get(80).colorValue;
customTheme.navBarColor = customThemeSettingsItems.get(81).colorValue; customTheme.commentVerticalBarColor6 = customThemeSettingsItems.get(81).colorValue;
customTheme.isLightStatusBar = customThemeSettingsItems.get(82).isEnabled; customTheme.commentVerticalBarColor7 = customThemeSettingsItems.get(82).colorValue;
customTheme.isLightNavBar = customThemeSettingsItems.get(83).isEnabled; customTheme.navBarColor = customThemeSettingsItems.get(83).colorValue;
customTheme.isChangeStatusBarIconColorAfterToolbarCollapsedInImmersiveInterface = customThemeSettingsItems.get(84).isEnabled; customTheme.isLightStatusBar = customThemeSettingsItems.get(84).isEnabled;
customTheme.isLightNavBar = customThemeSettingsItems.get(85).isEnabled;
customTheme.isChangeStatusBarIconColorAfterToolbarCollapsedInImmersiveInterface = customThemeSettingsItems.get(86).isEnabled;
return customTheme; return customTheme;
} }

8
app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeSettingsItem.java
View File

@ -204,6 +204,14 @@ public class CustomThemeSettingsItem implements Parcelable {
context.getString(R.string.theme_item_circular_progress_bar_background_color), context.getString(R.string.theme_item_circular_progress_bar_background_color),
context.getString(R.string.theme_item_circular_progress_bar_background_color_detail), context.getString(R.string.theme_item_circular_progress_bar_background_color_detail),
customTheme.circularProgressBarBackground)); customTheme.circularProgressBarBackground));
customThemeSettingsItems.add(new CustomThemeSettingsItem(
context.getString(R.string.theme_item_media_indicator_icon_color),
context.getString(R.string.theme_item_media_indicator_icon_color_detail),
customTheme.mediaIndicatorIconColor));
customThemeSettingsItems.add(new CustomThemeSettingsItem(
context.getString(R.string.theme_item_media_indicator_background_color),
context.getString(R.string.theme_item_media_indicator_background_color_detail),
customTheme.mediaIndicatorBackgroundColor));
customThemeSettingsItems.add(new CustomThemeSettingsItem( customThemeSettingsItems.add(new CustomThemeSettingsItem(
context.getString(R.string.theme_item_tab_layout_with_expanded_collapsing_toolbar_tab_background), context.getString(R.string.theme_item_tab_layout_with_expanded_collapsing_toolbar_tab_background),
context.getString(R.string.theme_item_tab_layout_with_expanded_collapsing_toolbar_tab_background_detail), context.getString(R.string.theme_item_tab_layout_with_expanded_collapsing_toolbar_tab_background_detail),

38
app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java
View File

@ -1,5 +1,8 @@
package ml.docilealligator.infinityforreddit.customtheme; package ml.docilealligator.infinityforreddit.customtheme;
import static ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils.AMOLED;
import static ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils.DARK;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Color; import android.graphics.Color;
@ -9,9 +12,6 @@ import java.util.ArrayList;
import ml.docilealligator.infinityforreddit.R; import ml.docilealligator.infinityforreddit.R;
import ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils; import ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils;
import static ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils.AMOLED;
import static ml.docilealligator.infinityforreddit.utils.CustomThemeSharedPreferencesUtils.DARK;
public class CustomThemeWrapper { public class CustomThemeWrapper {
private SharedPreferences lightThemeSharedPreferences; private SharedPreferences lightThemeSharedPreferences;
private SharedPreferences darkThemeSharedPreferences; private SharedPreferences darkThemeSharedPreferences;
@ -172,6 +172,16 @@ public class CustomThemeWrapper {
getDefaultColor("#FFFFFF", "#242424", "#000000")); getDefaultColor("#FFFFFF", "#242424", "#000000"));
} }
public int getMediaIndicatorIconColor() {
return getThemeSharedPreferences().getInt(CustomThemeSharedPreferencesUtils.MEDIA_INDICATOR_ICON_COLOR,
getDefaultColor("#FFFFFF", "#000000", "#000000"));
}
public int getMediaIndicatorBackgroundColor() {
return getThemeSharedPreferences().getInt(CustomThemeSharedPreferencesUtils.MEDIA_INDICATOR_BACKGROUND_COLOR,
getDefaultColor("#000000", "#FFFFFF", "#FFFFFF"));
}
public int getTabLayoutWithExpandedCollapsingToolbarTabBackground() { public int getTabLayoutWithExpandedCollapsingToolbarTabBackground() {
return getThemeSharedPreferences().getInt(CustomThemeSharedPreferencesUtils.TAB_LAYOUT_WITH_EXPANDED_COLLAPSING_TOOLBAR_TAB_BACKGROUND, return getThemeSharedPreferences().getInt(CustomThemeSharedPreferencesUtils.TAB_LAYOUT_WITH_EXPANDED_COLLAPSING_TOOLBAR_TAB_BACKGROUND,
getDefaultColor("#FFFFFF", "#242424", "#000000")); getDefaultColor("#FFFFFF", "#242424", "#000000"));
@ -533,6 +543,8 @@ public class CustomThemeWrapper {
customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF"); customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF");
customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF"); customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF");
customTheme.circularProgressBarBackground = Color.parseColor("#FFFFFF"); customTheme.circularProgressBarBackground = Color.parseColor("#FFFFFF");
customTheme.mediaIndicatorIconColor = Color.parseColor("#FFFFFF");
customTheme.mediaIndicatorBackgroundColor = Color.parseColor("#000000");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#0336FF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#0336FF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#0336FF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#0336FF");
@ -624,6 +636,8 @@ public class CustomThemeWrapper {
customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF"); customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF");
customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF"); customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF");
customTheme.circularProgressBarBackground = Color.parseColor("#242424"); customTheme.circularProgressBarBackground = Color.parseColor("#242424");
customTheme.mediaIndicatorIconColor = Color.parseColor("#000000");
customTheme.mediaIndicatorBackgroundColor = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#242424"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#242424");
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#FFFFFF");
@ -715,6 +729,8 @@ public class CustomThemeWrapper {
customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF"); customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF");
customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF"); customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF");
customTheme.circularProgressBarBackground = Color.parseColor("#000000"); customTheme.circularProgressBarBackground = Color.parseColor("#000000");
customTheme.mediaIndicatorIconColor = Color.parseColor("#000000");
customTheme.mediaIndicatorBackgroundColor = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#000000"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#000000");
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#FFFFFF");
@ -806,6 +822,8 @@ public class CustomThemeWrapper {
customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#3C4043"); customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#3C4043");
customTheme.toolbarSecondaryTextColor = Color.parseColor("#3C4043"); customTheme.toolbarSecondaryTextColor = Color.parseColor("#3C4043");
customTheme.circularProgressBarBackground = Color.parseColor("#FFFFFF"); customTheme.circularProgressBarBackground = Color.parseColor("#FFFFFF");
customTheme.mediaIndicatorIconColor = Color.parseColor("#FFFFFF");
customTheme.mediaIndicatorBackgroundColor = Color.parseColor("#000000");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#3C4043"); customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#3C4043");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#3C4043"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#3C4043");
@ -897,6 +915,8 @@ public class CustomThemeWrapper {
customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF"); customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF");
customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF"); customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF");
customTheme.circularProgressBarBackground = Color.parseColor("#242424"); customTheme.circularProgressBarBackground = Color.parseColor("#242424");
customTheme.mediaIndicatorIconColor = Color.parseColor("#000000");
customTheme.mediaIndicatorBackgroundColor = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#242424"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#242424");
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#FFFFFF");
@ -988,6 +1008,8 @@ public class CustomThemeWrapper {
customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF"); customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF");
customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF"); customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF");
customTheme.circularProgressBarBackground = Color.parseColor("#000000"); customTheme.circularProgressBarBackground = Color.parseColor("#000000");
customTheme.mediaIndicatorIconColor = Color.parseColor("#000000");
customTheme.mediaIndicatorBackgroundColor = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#000000"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#000000");
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#FFFFFF");
@ -1079,6 +1101,8 @@ public class CustomThemeWrapper {
customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF"); customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF");
customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF"); customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF");
customTheme.circularProgressBarBackground = Color.parseColor("#FFFFFF"); customTheme.circularProgressBarBackground = Color.parseColor("#FFFFFF");
customTheme.mediaIndicatorIconColor = Color.parseColor("#FFFFFF");
customTheme.mediaIndicatorBackgroundColor = Color.parseColor("#000000");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#EE0270"); customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#EE0270");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#EE0270"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#EE0270");
@ -1170,6 +1194,8 @@ public class CustomThemeWrapper {
customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF"); customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF");
customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF"); customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF");
customTheme.circularProgressBarBackground = Color.parseColor("#242424"); customTheme.circularProgressBarBackground = Color.parseColor("#242424");
customTheme.mediaIndicatorIconColor = Color.parseColor("#000000");
customTheme.mediaIndicatorBackgroundColor = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#242424"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#242424");
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#FFFFFF");
@ -1261,6 +1287,8 @@ public class CustomThemeWrapper {
customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF"); customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF");
customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF"); customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF");
customTheme.circularProgressBarBackground = Color.parseColor("#000000"); customTheme.circularProgressBarBackground = Color.parseColor("#000000");
customTheme.mediaIndicatorIconColor = Color.parseColor("#000000");
customTheme.mediaIndicatorBackgroundColor = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#000000"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#000000");
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#FFFFFF");
@ -1352,6 +1380,8 @@ public class CustomThemeWrapper {
customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF"); customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#FFFFFF");
customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF"); customTheme.toolbarSecondaryTextColor = Color.parseColor("#FFFFFF");
customTheme.circularProgressBarBackground = Color.parseColor("#393A59"); customTheme.circularProgressBarBackground = Color.parseColor("#393A59");
customTheme.mediaIndicatorIconColor = Color.parseColor("#FFFFFF");
customTheme.mediaIndicatorBackgroundColor = Color.parseColor("#000000");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#393A59"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#393A59");
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#FFFFFF");
@ -1443,6 +1473,8 @@ public class CustomThemeWrapper {
customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#3C4043"); customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#3C4043");
customTheme.toolbarSecondaryTextColor = Color.parseColor("#3C4043"); customTheme.toolbarSecondaryTextColor = Color.parseColor("#3C4043");
customTheme.circularProgressBarBackground = Color.parseColor("#D48AE0"); customTheme.circularProgressBarBackground = Color.parseColor("#D48AE0");
customTheme.mediaIndicatorIconColor = Color.parseColor("#FFFFFF");
customTheme.mediaIndicatorBackgroundColor = Color.parseColor("#000000");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#FFFFFF"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#FFFFFF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#D48AE0"); customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#D48AE0");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#D48AE0"); customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#D48AE0");

4
app/src/main/java/ml/docilealligator/infinityforreddit/utils/CustomThemeSharedPreferencesUtils.java
View File

@ -38,6 +38,8 @@ public class CustomThemeSharedPreferencesUtils {
public static final String TOOLBAR_PRIMARY_TEXT_AND_ICON_COLOR = "toolbarPrimaryTextAndIconColor"; public static final String TOOLBAR_PRIMARY_TEXT_AND_ICON_COLOR = "toolbarPrimaryTextAndIconColor";
public static final String TOOLBAR_SECONDARY_TEXT_COLOR = "toolbarSecondaryTextColor"; public static final String TOOLBAR_SECONDARY_TEXT_COLOR = "toolbarSecondaryTextColor";
public static final String CIRCULAR_PROGRESS_BAR_BACKGROUND = "circularProgressBarBackground"; public static final String CIRCULAR_PROGRESS_BAR_BACKGROUND = "circularProgressBarBackground";
public static final String MEDIA_INDICATOR_ICON_COLOR = "mediaIndicatorIconColor";
public static final String MEDIA_INDICATOR_BACKGROUND_COLOR = "mediaIndicatorBackgroundColor";
public static final String TAB_LAYOUT_WITH_EXPANDED_COLLAPSING_TOOLBAR_TAB_BACKGROUND = "tabLayoutWithExpandedCollapsingToolbarTabBackground"; public static final String TAB_LAYOUT_WITH_EXPANDED_COLLAPSING_TOOLBAR_TAB_BACKGROUND = "tabLayoutWithExpandedCollapsingToolbarTabBackground";
public static final String TAB_LAYOUT_WITH_EXPANDED_COLLAPSING_TOOLBAR_TEXT_COLOR = "tabLayoutWithExpandedCollapsingToolbarTextColor"; public static final String TAB_LAYOUT_WITH_EXPANDED_COLLAPSING_TOOLBAR_TEXT_COLOR = "tabLayoutWithExpandedCollapsingToolbarTextColor";
public static final String TAB_LAYOUT_WITH_EXPANDED_COLLAPSING_TOOLBAR_TAB_INDICATOR = "tabLayoutWithExpandedCollapsingToolbarTabIndicator"; public static final String TAB_LAYOUT_WITH_EXPANDED_COLLAPSING_TOOLBAR_TAB_INDICATOR = "tabLayoutWithExpandedCollapsingToolbarTabIndicator";
@ -120,6 +122,8 @@ public class CustomThemeSharedPreferencesUtils {
editor.putInt(TOOLBAR_PRIMARY_TEXT_AND_ICON_COLOR, customTheme.toolbarPrimaryTextAndIconColor); editor.putInt(TOOLBAR_PRIMARY_TEXT_AND_ICON_COLOR, customTheme.toolbarPrimaryTextAndIconColor);
editor.putInt(TOOLBAR_SECONDARY_TEXT_COLOR, customTheme.toolbarSecondaryTextColor); editor.putInt(TOOLBAR_SECONDARY_TEXT_COLOR, customTheme.toolbarSecondaryTextColor);
editor.putInt(CIRCULAR_PROGRESS_BAR_BACKGROUND, customTheme.circularProgressBarBackground); editor.putInt(CIRCULAR_PROGRESS_BAR_BACKGROUND, customTheme.circularProgressBarBackground);
editor.putInt(MEDIA_INDICATOR_ICON_COLOR, customTheme.mediaIndicatorIconColor);
editor.putInt(MEDIA_INDICATOR_BACKGROUND_COLOR, customTheme.mediaIndicatorBackgroundColor);
editor.putInt(TAB_LAYOUT_WITH_EXPANDED_COLLAPSING_TOOLBAR_TAB_BACKGROUND, customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground); editor.putInt(TAB_LAYOUT_WITH_EXPANDED_COLLAPSING_TOOLBAR_TAB_BACKGROUND, customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground);
editor.putInt(TAB_LAYOUT_WITH_EXPANDED_COLLAPSING_TOOLBAR_TEXT_COLOR, customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor); editor.putInt(TAB_LAYOUT_WITH_EXPANDED_COLLAPSING_TOOLBAR_TEXT_COLOR, customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor);
editor.putInt(TAB_LAYOUT_WITH_EXPANDED_COLLAPSING_TOOLBAR_TAB_INDICATOR, customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator); editor.putInt(TAB_LAYOUT_WITH_EXPANDED_COLLAPSING_TOOLBAR_TAB_INDICATOR, customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator);

4
app/src/main/res/values/strings.xml
View File

@ -796,6 +796,10 @@
<string name="theme_item_toolbar_secondary_text_color_detail">Applied to: Secondary texts in toolbars</string> <string name="theme_item_toolbar_secondary_text_color_detail">Applied to: Secondary texts in toolbars</string>
<string name="theme_item_circular_progress_bar_background_color">Circular Progress Bar Background Color</string> <string name="theme_item_circular_progress_bar_background_color">Circular Progress Bar Background Color</string>
<string name="theme_item_circular_progress_bar_background_color_detail">Applied to: Background of Circular progress bar</string> <string name="theme_item_circular_progress_bar_background_color_detail">Applied to: Background of Circular progress bar</string>
<string name="theme_item_media_indicator_icon_color">Media Indicator Icon Color</string>
<string name="theme_item_media_indicator_icon_color_detail">Applied to: Video or gallery icon on post preview</string>
<string name="theme_item_media_indicator_background_color">Media Indicator Background Color</string>
<string name="theme_item_media_indicator_background_color_detail">Applied to: Background of video or gallery icon on post preview</string>
<string name="theme_item_tab_layout_with_expanded_collapsing_toolbar_tab_background">Background Color of Tab Layout in Expanded Toolbar</string> <string name="theme_item_tab_layout_with_expanded_collapsing_toolbar_tab_background">Background Color of Tab Layout in Expanded Toolbar</string>
<string name="theme_item_tab_layout_with_expanded_collapsing_toolbar_tab_background_detail">Applied to: Tab layout background (expanded toolbar)</string> <string name="theme_item_tab_layout_with_expanded_collapsing_toolbar_tab_background_detail">Applied to: Tab layout background (expanded toolbar)</string>
<string name="theme_item_tab_layout_with_expanded_collapsing_toolbar_text_color">Text Color of Tab Layout in Expanded Toolbar</string> <string name="theme_item_tab_layout_with_expanded_collapsing_toolbar_text_color">Text Color of Tab Layout in Expanded Toolbar</string>