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

Merge pull request 'Add new themes Dayfox,Nightfox,Carbonfox' (#146) from American_Jesus/Infinity-For-Lemmy:feature/nightfox-themes into master

Browse Source 
Reviewed-on: https://codeberg.org/Bazsalanszky/Eternity/pulls/146
Reviewed-by: Bazsalanszky <bazsalanszky@noreply.codeberg.org>
This commit is contained in:
Bazsalanszky 2023-08-21 18:32:53 +00:00
commit 7c3ddfda5c
2 changed files with 294 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

291
app/src/main/java/eu/toldi/infinityforlemmy/customtheme/CustomThemeWrapper.java
View File

@ -493,6 +493,12 @@ public class CustomThemeWrapper {
return getDracula(context);
} else if (name.equals(context.getString(R.string.theme_name_calm_pastel))) {
return getCalmPastel(context);
} else if (name.equals(context.getString(R.string.theme_name_dayfox))) {
return getDayfox(context);
} else if (name.equals(context.getString(R.string.theme_name_nightfox))) {
return getNightfox(context);
} else if (name.equals(context.getString(R.string.theme_name_carbonfox))) {
return getCarbonfox(context);
} else {
return getIndigo(context);
}
@ -511,6 +517,9 @@ public class CustomThemeWrapper {
customThemes.add(getRedAmoled(context));
customThemes.add(getDracula(context));
customThemes.add(getCalmPastel(context));
customThemes.add(getDayfox(context));
customThemes.add(getNightfox(context));
customThemes.add(getCarbonfox(context));
return customThemes;
}
@ -1537,6 +1546,288 @@ public class CustomThemeWrapper {
return customTheme;
}
private static CustomTheme getDayfox(Context context) {
CustomTheme customTheme = new CustomTheme(context.getString(R.string.theme_name_dayfox));
customTheme.isLightTheme = true;
customTheme.isDarkTheme = false;
customTheme.isAmoledTheme = false;
customTheme.colorPrimary = Color.parseColor("#F2E9E1");
customTheme.colorPrimaryDark = Color.parseColor("#F2E9E1");
customTheme.colorAccent = Color.parseColor("#3D2B5A");
customTheme.colorPrimaryLightTheme = Color.parseColor("#F2E9E1");
customTheme.primaryTextColor = Color.parseColor("#3D2B5A");
customTheme.secondaryTextColor = Color.parseColor("#352C24");
customTheme.postTitleColor = Color.parseColor("#3D2B5A");
customTheme.postContentColor = Color.parseColor("#352C24");
customTheme.readPostTitleColor = Color.parseColor("#352C24");
customTheme.readPostContentColor = Color.parseColor("#352C24");
customTheme.commentColor = Color.parseColor("#3D2B5A");
customTheme.buttonTextColor = Color.parseColor("#3D2B5A");
customTheme.backgroundColor = Color.parseColor("#F6F2EE");
customTheme.cardViewBackgroundColor = Color.parseColor("#F2E9E1");
customTheme.readPostCardViewBackgroundColor = Color.parseColor("#F2E9E1");
customTheme.commentBackgroundColor = Color.parseColor("#F6F2EE");
customTheme.bottomAppBarBackgroundColor = Color.parseColor("#F2E9E1");
customTheme.primaryIconColor = Color.parseColor("#3D2B5A");
customTheme.bottomAppBarIconColor = Color.parseColor("#3D2B5A");
customTheme.postIconAndInfoColor = Color.parseColor("#352C24");
customTheme.commentIconAndInfoColor = Color.parseColor("#352C24");
customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#352C24");
customTheme.toolbarSecondaryTextColor = Color.parseColor("#352C24");
customTheme.circularProgressBarBackground = Color.parseColor("#F6F2EE");
customTheme.mediaIndicatorIconColor = Color.parseColor("#F6F2EE");
customTheme.mediaIndicatorBackgroundColor = Color.parseColor("#3D2B5A");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#F6F2EE");
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#352C24");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#F6F2EE");
customTheme.tabLayoutWithCollapsedCollapsingToolbarTabBackground = Color.parseColor("#F6F2EE");
customTheme.tabLayoutWithCollapsedCollapsingToolbarTextColor = Color.parseColor("#352C24");
customTheme.tabLayoutWithCollapsedCollapsingToolbarTabIndicator = Color.parseColor("#352C24");
customTheme.upvoted = Color.parseColor("#A5222F");
customTheme.downvoted = Color.parseColor("#4863B6");
customTheme.postTypeBackgroundColor = Color.parseColor("#4863B6");
customTheme.postTypeTextColor = Color.parseColor("#F6F2EE");
customTheme.spoilerBackgroundColor = Color.parseColor("#A440B5");
customTheme.spoilerTextColor = Color.parseColor("#F6F2EE");
customTheme.nsfwBackgroundColor = Color.parseColor("#A5222F");
customTheme.nsfwTextColor = Color.parseColor("#F6F2EE");
customTheme.flairBackgroundColor = Color.parseColor("#488D93");
customTheme.flairTextColor = Color.parseColor("#F6F2EE");
customTheme.awardsBackgroundColor = Color.parseColor("#B86E28");
customTheme.awardsTextColor = Color.parseColor("#F6F2EE");
customTheme.archivedTint = Color.parseColor("#A440B5");
customTheme.lockedIconTint = Color.parseColor("#AC5402");
customTheme.crosspostIconTint = Color.parseColor("#A5222F");
customTheme.upvoteRatioIconTint = Color.parseColor("#2848A9");
customTheme.stickiedPostIconTint = Color.parseColor("#4863B6");
customTheme.noPreviewPostTypeIconTint = Color.parseColor("#F6F2EE");
customTheme.subscribed = Color.parseColor("#A5222F");
customTheme.unsubscribed = Color.parseColor("#4863B6");
customTheme.username = Color.parseColor("#4863B6");
customTheme.subreddit = Color.parseColor("#A5222F");
customTheme.authorFlairTextColor = Color.parseColor("#A440B5");
customTheme.submitter = Color.parseColor("#AC5402");
customTheme.moderator = Color.parseColor("#577F63");
customTheme.currentUser = Color.parseColor("#488D93");
customTheme.singleCommentThreadBackgroundColor = Color.parseColor("#F2E9E1");
customTheme.unreadMessageBackgroundColor = Color.parseColor("#F6F2EE");
customTheme.dividerColor = Color.parseColor("#F2E9E1");
customTheme.noPreviewPostTypeBackgroundColor = Color.parseColor("#3D2B5A");
customTheme.voteAndReplyUnavailableButtonColor = Color.parseColor("#F6F2EE");
customTheme.commentVerticalBarColor1 = Color.parseColor("#2848A9");
customTheme.commentVerticalBarColor2 = Color.parseColor("#A440B5");
customTheme.commentVerticalBarColor3 = Color.parseColor("#4863B6");
customTheme.commentVerticalBarColor4 = Color.parseColor("#B86E28");
customTheme.commentVerticalBarColor5 = Color.parseColor("#B3434E");
customTheme.commentVerticalBarColor6 = Color.parseColor("#577F63");
customTheme.commentVerticalBarColor7 = Color.parseColor("#955F61");
customTheme.fabIconColor = Color.parseColor("#F6F2EE");
customTheme.chipTextColor = Color.parseColor("#F6F2EE");
customTheme.linkColor = Color.parseColor("#A5222F");
customTheme.receivedMessageTextColor = Color.parseColor("#3D2B5A");
customTheme.sentMessageTextColor = Color.parseColor("#F6F2EE");
customTheme.receivedMessageBackgroundColor = Color.parseColor("#F2E9E1");
customTheme.sentMessageBackgroundColor = Color.parseColor("#577F63");
customTheme.sendMessageIconColor = Color.parseColor("#4863B6");
customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#F2E9E1");
customTheme.awardedCommentBackgroundColor = Color.parseColor("#F6F2EE");
customTheme.navBarColor = Color.parseColor("#F6F2EE");
customTheme.isLightStatusBar = true;
customTheme.isLightNavBar = true;
customTheme.isChangeStatusBarIconColorAfterToolbarCollapsedInImmersiveInterface = false;
return customTheme;
}
private static CustomTheme getNightfox(Context context) {
CustomTheme customTheme = new CustomTheme(context.getString(R.string.theme_name_nightfox));
customTheme.isLightTheme = false;
customTheme.isDarkTheme = true;
customTheme.isAmoledTheme = false;
customTheme.colorPrimary = Color.parseColor("#2B3B51");
customTheme.colorPrimaryDark = Color.parseColor("#192330");
customTheme.colorAccent = Color.parseColor("#CDCECF");
customTheme.colorPrimaryLightTheme = Color.parseColor("#192330");
customTheme.primaryTextColor = Color.parseColor("#CDCECF");
customTheme.secondaryTextColor = Color.parseColor("#DFDFE0");
customTheme.postTitleColor = Color.parseColor("#CDCECF");
customTheme.postContentColor = Color.parseColor("#DFDFE0");
customTheme.readPostTitleColor = Color.parseColor("#738091");
customTheme.readPostContentColor = Color.parseColor("#738091");
customTheme.commentColor = Color.parseColor("#CDCECF");
customTheme.buttonTextColor = Color.parseColor("#CDCECF");
customTheme.backgroundColor = Color.parseColor("#192330");
customTheme.cardViewBackgroundColor = Color.parseColor("#2B3B51");
customTheme.readPostCardViewBackgroundColor = Color.parseColor("#2B3B51");
customTheme.commentBackgroundColor = Color.parseColor("#192330");
customTheme.bottomAppBarBackgroundColor = Color.parseColor("#2B3B51");
customTheme.primaryIconColor = Color.parseColor("#CDCECF");
customTheme.bottomAppBarIconColor = Color.parseColor("#CDCECF");
customTheme.postIconAndInfoColor = Color.parseColor("#DFDFE0");
customTheme.commentIconAndInfoColor = Color.parseColor("#DFDFE0");
customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#CDCECF");
customTheme.toolbarSecondaryTextColor = Color.parseColor("#CDCECF");
customTheme.circularProgressBarBackground = Color.parseColor("#2B3B51");
customTheme.mediaIndicatorIconColor = Color.parseColor("#393B44");
customTheme.mediaIndicatorBackgroundColor = Color.parseColor("#CDCECF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#2B3B51");
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#CDCECF");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#2B3B51");
customTheme.tabLayoutWithCollapsedCollapsingToolbarTabBackground = Color.parseColor("#2B3B51");
customTheme.tabLayoutWithCollapsedCollapsingToolbarTextColor = Color.parseColor("#CDCECF");
customTheme.tabLayoutWithCollapsedCollapsingToolbarTabIndicator = Color.parseColor("#CDCECF");
customTheme.upvoted = Color.parseColor("#DBC074");
customTheme.downvoted = Color.parseColor("#D16983");
customTheme.postTypeBackgroundColor = Color.parseColor("#719CD6");
customTheme.postTypeTextColor = Color.parseColor("#DFDFE0");
customTheme.spoilerBackgroundColor = Color.parseColor("#E0C989");
customTheme.spoilerTextColor = Color.parseColor("#393B44");
customTheme.nsfwBackgroundColor = Color.parseColor("#D16983");
customTheme.nsfwTextColor = Color.parseColor("#393B44");
customTheme.flairBackgroundColor = Color.parseColor("#9D79D6");
customTheme.flairTextColor = Color.parseColor("#DFDFE0");
customTheme.awardsBackgroundColor = Color.parseColor("#E0C989");
customTheme.awardsTextColor = Color.parseColor("#575860");
customTheme.archivedTint = Color.parseColor("#D67AD2");
customTheme.lockedIconTint = Color.parseColor("#F4A261");
customTheme.crosspostIconTint = Color.parseColor("#DBC074");
customTheme.upvoteRatioIconTint = Color.parseColor("#86ABDC");
customTheme.stickiedPostIconTint = Color.parseColor("#719CD6");
customTheme.noPreviewPostTypeIconTint = Color.parseColor("#CDCECF");
customTheme.subscribed = Color.parseColor("#D16983");
customTheme.unsubscribed = Color.parseColor("#719CD6");
customTheme.username = Color.parseColor("#86ABDC");
customTheme.subreddit = Color.parseColor("#DBC074");
customTheme.authorFlairTextColor = Color.parseColor("#D67AD2");
customTheme.submitter = Color.parseColor("#E0C989");
customTheme.moderator = Color.parseColor("#D67AD2");
customTheme.currentUser = Color.parseColor("#7AD5D6");
customTheme.singleCommentThreadBackgroundColor = Color.parseColor("#2B3B51");
customTheme.unreadMessageBackgroundColor = Color.parseColor("#393B44");
customTheme.dividerColor = Color.parseColor("#2B3B51");
customTheme.noPreviewPostTypeBackgroundColor = Color.parseColor("#D16983");
customTheme.voteAndReplyUnavailableButtonColor = Color.parseColor("#192330");
customTheme.commentVerticalBarColor1 = Color.parseColor("#719CD6");
customTheme.commentVerticalBarColor2 = Color.parseColor("#D16983");
customTheme.commentVerticalBarColor3 = Color.parseColor("#86ABDC");
customTheme.commentVerticalBarColor4 = Color.parseColor("#DBC074");
customTheme.commentVerticalBarColor5 = Color.parseColor("#C94F6D");
customTheme.commentVerticalBarColor6 = Color.parseColor("#81B27A");
customTheme.commentVerticalBarColor7 = Color.parseColor("#D16983");
customTheme.fabIconColor = Color.parseColor("#192330");
customTheme.chipTextColor = Color.parseColor("#CDCECF");
customTheme.linkColor = Color.parseColor("#DBC074");
customTheme.receivedMessageTextColor = Color.parseColor("#CDCECF");
customTheme.sentMessageTextColor = Color.parseColor("#CDCECF");
customTheme.receivedMessageBackgroundColor = Color.parseColor("#2B3B51");
customTheme.sentMessageBackgroundColor = Color.parseColor("#393B44");
customTheme.sendMessageIconColor = Color.parseColor("#C94F6D");
customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#2B3B51");
customTheme.awardedCommentBackgroundColor = Color.parseColor("#2B3B51");
customTheme.navBarColor = Color.parseColor("#192330");
customTheme.isLightStatusBar = false;
customTheme.isLightNavBar = false;
customTheme.isChangeStatusBarIconColorAfterToolbarCollapsedInImmersiveInterface = false;
return customTheme;
}
private static CustomTheme getCarbonfox(Context context) {
CustomTheme customTheme = new CustomTheme(context.getString(R.string.theme_name_carbonfox));
customTheme.isLightTheme = false;
customTheme.isDarkTheme = false;
customTheme.isAmoledTheme = true;
customTheme.colorPrimary = Color.parseColor("#282828");
customTheme.colorPrimaryDark = Color.parseColor("#161616");
customTheme.colorAccent = Color.parseColor("#F2F4F8");
customTheme.colorPrimaryLightTheme = Color.parseColor("#161616");
customTheme.primaryTextColor = Color.parseColor("#F2F4F8");
customTheme.secondaryTextColor = Color.parseColor("#E4E4E5");
customTheme.postTitleColor = Color.parseColor("#F2F4F8");
customTheme.postContentColor = Color.parseColor("#E4E4E5");
customTheme.readPostTitleColor = Color.parseColor("#484848");
customTheme.readPostContentColor = Color.parseColor("#484848");
customTheme.commentColor = Color.parseColor("#F2F4F8");
customTheme.buttonTextColor = Color.parseColor("#F2F4F8");
customTheme.backgroundColor = Color.parseColor("#161616");
customTheme.cardViewBackgroundColor = Color.parseColor("#282828");
customTheme.readPostCardViewBackgroundColor = Color.parseColor("#282828");
customTheme.commentBackgroundColor = Color.parseColor("#282828");
customTheme.bottomAppBarBackgroundColor = Color.parseColor("#161616");
customTheme.primaryIconColor = Color.parseColor("#F2F4F8");
customTheme.bottomAppBarIconColor = Color.parseColor("#F2F4F8");
customTheme.postIconAndInfoColor = Color.parseColor("#E4E4E5");
customTheme.commentIconAndInfoColor = Color.parseColor("#E4E4E5");
customTheme.toolbarPrimaryTextAndIconColor = Color.parseColor("#F2F4F8");
customTheme.toolbarSecondaryTextColor = Color.parseColor("#F2F4F8");
customTheme.circularProgressBarBackground = Color.parseColor("#282828");
customTheme.mediaIndicatorIconColor = Color.parseColor("#161616");
customTheme.mediaIndicatorBackgroundColor = Color.parseColor("#F2F4F8");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = Color.parseColor("#282828");
customTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = Color.parseColor("#F2F4F8");
customTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = Color.parseColor("#282828");
customTheme.tabLayoutWithCollapsedCollapsingToolbarTabBackground = Color.parseColor("#282828");
customTheme.tabLayoutWithCollapsedCollapsingToolbarTextColor = Color.parseColor("#F2F4F8");
customTheme.tabLayoutWithCollapsedCollapsingToolbarTabIndicator = Color.parseColor("#F2F4F8");
customTheme.upvoted = Color.parseColor("#F16DA6");
customTheme.downvoted = Color.parseColor("#52BDFF");
customTheme.postTypeBackgroundColor = Color.parseColor("#33B1FF");
customTheme.postTypeTextColor = Color.parseColor("#282828");
customTheme.spoilerBackgroundColor = Color.parseColor("#F16DA6");
customTheme.spoilerTextColor = Color.parseColor("#282828");
customTheme.nsfwBackgroundColor = Color.parseColor("#F16DA6");
customTheme.nsfwTextColor = Color.parseColor("#282828");
customTheme.flairBackgroundColor = Color.parseColor("#3DDBD9");
customTheme.flairTextColor = Color.parseColor("#282828");
customTheme.awardsBackgroundColor = Color.parseColor("#3DDBD9");
customTheme.awardsTextColor = Color.parseColor("#282828");
customTheme.archivedTint = Color.parseColor("#EE5396");
customTheme.lockedIconTint = Color.parseColor("#EE5396");
customTheme.crosspostIconTint = Color.parseColor("#F16DA6");
customTheme.upvoteRatioIconTint = Color.parseColor("#33B1FF");
customTheme.stickiedPostIconTint = Color.parseColor("#33B1FF");
customTheme.noPreviewPostTypeIconTint = Color.parseColor("#F2F4F8");
customTheme.subscribed = Color.parseColor("#F16DA6");
customTheme.unsubscribed = Color.parseColor("#33B1FF");
customTheme.username = Color.parseColor("#52BDFF");
customTheme.subreddit = Color.parseColor("#F16DA6");
customTheme.authorFlairTextColor = Color.parseColor("#F16DA6");
customTheme.submitter = Color.parseColor("#3DDBD9");
customTheme.moderator = Color.parseColor("#25BE6A");
customTheme.currentUser = Color.parseColor("#2DC7C4");
customTheme.singleCommentThreadBackgroundColor = Color.parseColor("#484848");
customTheme.unreadMessageBackgroundColor = Color.parseColor("#484848");
customTheme.dividerColor = Color.parseColor("#484848");
customTheme.noPreviewPostTypeBackgroundColor = Color.parseColor("#161616");
customTheme.voteAndReplyUnavailableButtonColor = Color.parseColor("#484848");
customTheme.commentVerticalBarColor1 = Color.parseColor("#33B1FF");
customTheme.commentVerticalBarColor2 = Color.parseColor("#C8A5FF");
customTheme.commentVerticalBarColor3 = Color.parseColor("#2DC7C4");
customTheme.commentVerticalBarColor4 = Color.parseColor("#78A9FF");
customTheme.commentVerticalBarColor5 = Color.parseColor("#EE5396");
customTheme.commentVerticalBarColor6 = Color.parseColor("#25BE6A");
customTheme.commentVerticalBarColor7 = Color.parseColor("#FF7EB6");
customTheme.fabIconColor = Color.parseColor("#161616");
customTheme.chipTextColor = Color.parseColor("#282828");
customTheme.linkColor = Color.parseColor("#F16DA6");
customTheme.receivedMessageTextColor = Color.parseColor("#F2F4F8");
customTheme.sentMessageTextColor = Color.parseColor("#F2F4F8");
customTheme.receivedMessageBackgroundColor = Color.parseColor("#484848");
customTheme.sentMessageBackgroundColor = Color.parseColor("#46C880");
customTheme.sendMessageIconColor = Color.parseColor("#52BDFF");
customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#484848");
customTheme.awardedCommentBackgroundColor = Color.parseColor("#282828");
customTheme.navBarColor = Color.parseColor("#161616");
customTheme.isLightStatusBar = false;
customTheme.isLightNavBar = false;
customTheme.isChangeStatusBarIconColorAfterToolbarCollapsedInImmersiveInterface = false;
return customTheme;
}
public static int darkenColor(int color, float factor) {
int a = Color.alpha(color);
int r = Math.round(Color.red(color) * factor);

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

@ -948,6 +948,9 @@
<string name="theme_name_red_amoled">Red Amoled</string>
<string name="theme_name_dracula">Dracula</string>
<string name="theme_name_calm_pastel">Calm Pastel</string>
<string name="theme_name_dayfox">Dayfox</string>
<string name="theme_name_nightfox">Nightfox</string>
<string name="theme_name_carbonfox">Carbonfox</string>
<string name="create_light_theme">Create a Light Theme\nBase on Indigo Theme</string>
<string name="create_dark_theme">Create a Dark Theme\nBase on Indigo Dark Theme</string>
<string name="create_amoled_theme">Create an Amoled Theme\nBase on Indigo Amoled Theme</string>