owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding orange theme, tweaking the blue and green theme

Browse Source
This commit is contained in:
LucasGGamerM
2022-12-04 11:16:58 -03:00
parent 8d63be513d
commit 29abf70cec
9 changed files with 146 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
View File

@@ -55,7 +55,8 @@ public class GlobalUserPreferences{
PINK, PINK,
PURPLE, PURPLE,
GREEN, GREEN,
BLUE BLUE,
ORANGE
} }
public enum ThemePreference{ public enum ThemePreference{

5
mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
View File

@@ -685,6 +685,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
pref = GlobalUserPreferences.ColorPreference.BLUE; pref = GlobalUserPreferences.ColorPreference.BLUE;
onColorPreferenceClick(pref); onColorPreferenceClick(pref);
} }
else if(id==R.id.orange_color) {
pref = GlobalUserPreferences.ColorPreference.ORANGE;
onColorPreferenceClick(pref);
}
else else
return false; return false;
return true; return true;
@@ -702,6 +706,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
case PURPLE -> R.string.purple_color; case PURPLE -> R.string.purple_color;
case GREEN -> R.string.green_color; case GREEN -> R.string.green_color;
case BLUE -> R.string.blue_color; case BLUE -> R.string.blue_color;
case ORANGE -> R.string.orange_color;
}); });
} }
} }

10
mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
View File

@@ -698,6 +698,16 @@ public class UiUtils{
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Blue : R.style.Theme_Mastodon_Dark_Blue; GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Blue : R.style.Theme_Mastodon_Dark_Blue;
}); });
break; break;
case ORANGE:
context.setTheme(switch(GlobalUserPreferences.theme){
case AUTO ->
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Orange : R.style.Theme_Mastodon_AutoLightDark_Orange;
case LIGHT ->
R.style.Theme_Mastodon_Light_Orange;
case DARK ->
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Orange : R.style.Theme_Mastodon_Dark_Orange;
});
break;
} }
} }

1
mastodon/src/main/res/menu/color_picker.xml
View File

@@ -4,4 +4,5 @@
<item android:id="@+id/purple_color" android:title="@string/purple_color"/> <item android:id="@+id/purple_color" android:title="@string/purple_color"/>
<item android:id="@+id/green_color" android:title="@string/green_color"/> <item android:id="@+id/green_color" android:title="@string/green_color"/>
<item android:id="@+id/blue_color" android:title="@string/blue_color"/> <item android:id="@+id/blue_color" android:title="@string/blue_color"/>
<item android:id="@+id/orange_color" android:title="@string/orange_color"/>
</menu> </menu>

2
mastodon/src/main/res/values-night/styles.xml
View File

@@ -12,4 +12,6 @@
<style name="Theme.Mastodon.AutoLightDark.Blue" parent="Theme.Mastodon.Dark.Blue"/> <style name="Theme.Mastodon.AutoLightDark.Blue" parent="Theme.Mastodon.Dark.Blue"/>
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Blue" parent="Theme.Mastodon.Dark.TrueBlack.Blue"/> <style name="Theme.Mastodon.AutoLightDark.TrueBlack.Blue" parent="Theme.Mastodon.Dark.TrueBlack.Blue"/>
<style name="Theme.Mastodon.AutoLightDark.Orange" parent="Theme.Mastodon.Dark.Orange"/>
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Orange" parent="Theme.Mastodon.Dark.TrueBlack.Orange"/>
</resources> </resources>

1
mastodon/src/main/res/values-v27/colors.xml
View File

@@ -3,4 +3,5 @@
<color name="navigation_bar_bg">@color/gray_50</color> <color name="navigation_bar_bg">@color/gray_50</color>
<color name="green_navigation_bar_bg">@color/green_gray_50</color> <color name="green_navigation_bar_bg">@color/green_gray_50</color>
<color name="blue_navigation_bar_bg">@color/blue_gray_50</color> <color name="blue_navigation_bar_bg">@color/blue_gray_50</color>
<color name="orange_navigation_bar_bg">@color/orange_gray_50</color>
</resources> </resources>

61
mastodon/src/main/res/values/colors.xml
View File

@@ -67,6 +67,18 @@
<color name="blue_primary_800">#003354</color> <color name="blue_primary_800">#003354</color>
<color name="blue_primary_900">#001d33</color> <color name="blue_primary_900">#001d33</color>
<color name="orange_primary_25">#fafaff</color>
<color name="orange_primary_50">#ffeedf</color>
<color name="orange_primary_100">#ffdcbb</color>
<color name="orange_primary_200">#ffb869</color>
<color name="orange_primary_300">#e89a3b</color>
<color name="orange_primary_400">#c98121</color>
<color name="orange_primary_500">#a96700</color>
<color name="orange_primary_600">#885200</color>
<color name="orange_primary_700">#673d00</color>
<color name="orange_primary_800">#482900</color>
<color name="orange_primary_900">#2b1700</color>
<color name="custom_gray_900">#000000</color> <color name="custom_gray_900">#000000</color>
<color name="custom_gray_800t">#171717</color> <color name="custom_gray_800t">#171717</color>
<color name="custom_gray_800">#171717</color> <color name="custom_gray_800">#171717</color>
@@ -74,22 +86,47 @@
<color name="custom_gray_600">#212121</color> <color name="custom_gray_600">#212121</color>
<color name="custom_gray_500">#242424</color> <color name="custom_gray_500">#242424</color>
<color name="green_gray_400">#8f918e</color> <!-- Old Colors:-->
<color name="green_gray_300">#a9aca8</color> <!-- <color name="green_gray_400">#8f918e</color>-->
<color name="green_gray_200">#c5c7c3</color> <!-- <color name="green_gray_300">#a9aca8</color>-->
<color name="green_gray_100">#e1e3df</color> <!-- <color name="green_gray_200">#c5c7c3</color>-->
<color name="green_gray_50t">#eff1ed</color> <!-- <color name="green_gray_100">#e1e3df</color>-->
<color name="green_gray_50">#eff1ed</color> <!-- <color name="green_gray_50t">#eff1ed</color>-->
<!-- <color name="green_gray_50">#eff1ed</color>-->
<!-- <color name="green_gray_25">#f7f8fa</color>-->
<!-- <color name="blue_gray_400">#919191</color>-->
<!-- <color name="blue_gray_300">#ababab</color>-->
<!-- <color name="blue_gray_200">#c6c6c6</color>-->
<!-- <color name="blue_gray_100">#e2e2e2</color>-->
<!-- <color name="blue_gray_50t">#f1f1f1</color>-->
<!-- <color name="blue_gray_50">#f1f1f1</color>-->
<!-- <color name="blue_gray_25">#f7f8fa</color>-->
<color name="green_gray_400">#a2b095</color>
<color name="green_gray_300">#bdcbaf</color>
<color name="green_gray_200">#d9e7ca</color>
<color name="green_gray_100">#d9e7ca</color>
<color name="green_gray_50t">#e8f8d8</color>
<color name="green_gray_50">#e8f5d8</color>
<color name="green_gray_25">#f7f8fa</color> <color name="green_gray_25">#f7f8fa</color>
<color name="blue_gray_400">#919191</color> <color name="blue_gray_400">#9eadbe</color>
<color name="blue_gray_300">#ababab</color> <color name="blue_gray_300">#b9c8da</color>
<color name="blue_gray_200">#c6c6c6</color> <color name="blue_gray_200">#d5e4f7</color>
<color name="blue_gray_100">#e2e2e2</color> <color name="blue_gray_100">#e8f2ff</color>
<color name="blue_gray_50t">#f1f1f1</color> <color name="blue_gray_50t">#e8f2ff</color>
<color name="blue_gray_50">#f1f1f1</color> <color name="blue_gray_50">#e8f2ff</color>
<color name="blue_gray_25">#f7f8fa</color> <color name="blue_gray_25">#f7f8fa</color>
<color name="orange_gray_400">#c3a689</color>
<color name="orange_gray_300">#e0c1a3</color>
<color name="orange_gray_200">#feddbd</color>
<color name="orange_gray_100">#ffeedf</color>
<color name="orange_gray_50t">#ffeedf</color>
<color name="orange_gray_50">#ffeedf</color>
<color name="orange_gray_25">#f7f8fa</color>
<color name="error_25">#FFFBFA</color> <color name="error_25">#FFFBFA</color>
<color name="error_50">#FEF3F2</color> <color name="error_50">#FEF3F2</color>
<color name="error_100">#FEE4E2</color> <color name="error_100">#FEE4E2</color>

1
mastodon/src/main/res/values/strings.xml
View File

@@ -433,4 +433,5 @@
<string name="purple_color">Purple</string> <string name="purple_color">Purple</string>
<string name="green_color">Green</string> <string name="green_color">Green</string>
<string name="blue_color">Blue</string> <string name="blue_color">Blue</string>
<string name="orange_color">Orange</string>
</resources> </resources>

75
mastodon/src/main/res/values/styles.xml
View File

@@ -300,6 +300,81 @@
<item name="android:textColorSecondary">@color/custom_gray_800</item> <item name="android:textColorSecondary">@color/custom_gray_800</item>
</style> </style>
<style name="Theme.Mastodon.Light.Orange" parent="Theme.Mastodon.Light.CustomBase">
<item name="android:colorAccent">@color/orange_primary_700</item>
<item name="android:colorBackground">@color/orange_gray_100</item>
<item name="colorButtonText">@color/orange_gray_50</item>
<item name="colorBackgroundLight">@color/orange_gray_50</item>
<item name="colorBackgroundLightest">@color/orange_gray_25</item>
<item name="android:statusBarColor">@color/orange_gray_50</item>
<item name="android:navigationBarColor">@color/orange_navigation_bar_bg</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Orange</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Orange</item>
<item name="colorPollMostVoted">@color/orange_primary_500</item>
<item name="colorPollVoted">@color/orange_gray_300</item>
<item name="colorAccentLight">@color/orange_primary_600</item>
<item name="colorSearchField">@color/orange_gray_200</item>
<item name="colorTabInactive">@color/orange_gray_400</item>
<item name="colorAccentLightest">@color/orange_primary_100</item>
</style>
<style name="Theme.Mastodon.Dark.Orange" parent="Theme.Mastodon.Dark.CustomBase">
<item name="android:colorAccent">@color/orange_primary_400</item>
<item name="android:colorPrimary">@color/orange_gray_50</item>
<item name="android:textColorPrimary">@color/orange_gray_50</item>
<item name="android:textColorSecondary">@color/orange_gray_400</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Orange</item>
<item name="colorPollMostVoted">@color/orange_primary_700</item>
<item name="colorAccentLight">@color/orange_primary_600</item>
<item name="colorAccentLightest">@color/orange_primary_800</item>
<item name="colorTabInactive">@color/orange_gray_400</item>
<item name="colorSearchHint">@color/orange_gray_300</item>
</style>
<style name="Theme.Mastodon.Dark.TrueBlack.Orange" parent="Theme.Mastodon.Dark.TrueBlack.CustomBase">
<item name="android:colorAccent">@color/orange_primary_400</item>
<item name="colorPollMostVoted">@color/orange_primary_700</item>
<item name="colorAccentLight">@color/orange_primary_600</item>
<item name="colorAccentLightest">@color/orange_primary_800</item>
</style>
<style name="Theme.Mastodon.AutoLightDark.Orange" parent="Theme.Mastodon.Light.Orange"/>
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Orange" parent="Theme.Mastodon.Light.Orange"/>
<style name="Theme.Mastodon.Dialog.Alert.Dark.Orange" parent="android:Theme.Material.Dialog.Alert">
<item name="android:windowTitleStyle">@style/alert_title</item>
<item name="android:dialogPreferredPadding">24dp</item>
<item name="android:windowBackground">@drawable/bg_alert</item>
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
<!-- colors -->
<item name="android:colorAccent">@color/orange_primary_600</item>
<item name="android:colorPrimary">@color/orange_gray_50</item>
<item name="android:colorBackground">@color/custom_gray_700</item>
<item name="android:textColorPrimary">@color/orange_gray_50</item>
<item name="android:textColorSecondary">@color/orange_gray_400</item>
</style>
<style name="Theme.Mastodon.Dialog.Alert.Orange" parent="android:Theme.Material.Light.Dialog.Alert">
<item name="android:windowTitleStyle">@style/alert_title</item>
<item name="android:dialogPreferredPadding">24dp</item>
<item name="android:windowBackground">@drawable/bg_alert</item>
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
<!-- colors -->
<item name="android:colorAccent">@color/orange_primary_700</item>
<item name="android:colorPrimary">@color/custom_gray_800</item>
<item name="android:colorBackground">@color/orange_gray_100</item>
<item name="android:textColorPrimary">@color/custom_gray_800</item>
<item name="android:textColorSecondary">@color/custom_gray_500</item>
</style>
<style name="Theme.Mastodon.Toolbar.Orange" parent="android:ThemeOverlay.Material.ActionBar">
<item name="android:colorPrimary">@color/orange_gray_50</item>
<item name="android:textColorPrimary">@color/custom_gray_800</item>
<item name="android:textColorSecondary">@color/custom_gray_800</item>
</style>
<style name="Theme.Mastodon.Dark.Original" parent="Theme.Mastodon.Dark"> <style name="Theme.Mastodon.Dark.Original" parent="Theme.Mastodon.Dark">
<item name="android:colorAccent">@color/original_primary_400</item> <item name="android:colorAccent">@color/original_primary_400</item>