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

Implement a color picker (#124)

Browse Source 
* Proper implementation on the color picker.
* Disabling the icons for the color picker menu
* Adding a green theme
* Making the green theme more readable
* More polishes over the green theme
* Adding blue theme and refactoring styles.xml
* Make badged settings icon follow accent colors
* Adding an icon to the color picker setting
* Fix readability issue on the light blue theme
* Adding orange theme, tweaking the blue and green theme
* Adding yellow theme
* Making it so that the fab follows the theme
* Fixing the TrueBlack themes for everything
* Make it so that the publish button also follows the theme
* Editing some drawable files to make them also follow the theme
* Making it so that the boost icon is also following the theme when clicked
* Make follow requests icon badge follow the color scheme and also make it that the profile top bar menu also follows the theme. This should be it

Co-authored-by: sk <sk22@mailbox.org>
This commit is contained in:
LucasGGamerM
2022-12-07 14:13:13 -03:00
committed by GitHub
parent 0806d0c5ea
commit e274b7e6d5
25 changed files with 805 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,106 @@
<color name="primary_700">#d92aad</color>
<color name="primary_800">#ae218a</color>
<color name="primary_900">#6d1556</color>
<color name="original_primary_25">#fafaff</color>
<color name="original_primary_50">#f4f3ff</color>
<color name="original_primary_100">#ebebff</color>
<color name="original_primary_200">#d7d7ff</color>
<color name="original_primary_300">#c2c2ff</color>
<color name="original_primary_400">#9999ff</color>
<color name="original_primary_500">#6364ff</color>
<color name="original_primary_600">#562cfc</color>
<color name="original_primary_700">#431cbb</color>
<color name="original_primary_800">#2f0c7a</color>
<color name="original_primary_900">#17063b</color>
<color name="green_primary_25">#fafaff</color>
<color name="green_primary_50">#d1feaf</color>
<color name="green_primary_100">#bbf294</color>
<color name="green_primary_200">#a0d57b</color>
<color name="green_primary_300">#85b962</color>
<color name="green_primary_400">#6c9e4b</color>
<color name="green_primary_500">#528232</color>
<color name="green_primary_600">#3b6a1c</color>
<color name="green_primary_700">#245103</color>
<color name="green_primary_800">#163800</color>
<color name="green_primary_900">#0a2100</color>
<color name="blue_primary_25">#fafaff</color>
<color name="blue_primary_50">#e8f2ff</color>
<color name="blue_primary_100">#cee5ff</color>
<color name="blue_primary_200">#97cbff</color>
<color name="blue_primary_300">#65b1f4</color>
<color name="blue_primary_400">#4796d7</color>
<color name="blue_primary_500">#227bba</color>
<color name="blue_primary_600">#00639b</color>
<color name="blue_primary_700">#004a76</color>
<color name="blue_primary_800">#003354</color>
<color name="blue_primary_900">#001d33</color>
<color name="brown_primary_25">#fafaff</color>
<color name="brown_primary_50">#ffeedf</color>
<color name="brown_primary_100">#ffdcbb</color>
<color name="brown_primary_200">#ffb869</color>
<color name="brown_primary_300">#e89a3b</color>
<color name="brown_primary_400">#c98121</color>
<color name="brown_primary_500">#a96700</color>
<color name="brown_primary_600">#885200</color>
<color name="brown_primary_700">#673d00</color>
<color name="brown_primary_800">#482900</color>
<color name="brown_primary_900">#2b1700</color>
<color name="yellow_primary_25">#fafaff</color>
<color name="yellow_primary_50">#fff0ca</color>
<color name="yellow_primary_100">#ffe084</color>
<color name="yellow_primary_200">#e8c349</color>
<color name="yellow_primary_300">#cba82f</color>
<color name="yellow_primary_400">#ae8d10</color>
<color name="yellow_primary_500">#8f7300</color>
<color name="yellow_primary_600">#735c00</color>
<color name="yellow_primary_700">#574500</color>
<color name="yellow_primary_800">#3c2f00</color>
<color name="yellow_primary_900">#231b00</color>
<color name="custom_gray_900">#000000</color>
<color name="custom_gray_800t">#cc171717</color>
<color name="custom_gray_800">#171717</color>
<color name="custom_gray_700">#191919</color>
<color name="custom_gray_600">#212121</color>
<color name="custom_gray_500">#242424</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">#cce8f8d8</color>
<color name="green_gray_50">#e8f5d8</color>
<color name="green_gray_25">#f7f8fa</color>
<color name="blue_gray_400">#9eadbe</color>
<color name="blue_gray_300">#b9c8da</color>
<color name="blue_gray_200">#d5e4f7</color>
<color name="blue_gray_100">#e8f2ff</color>
<color name="blue_gray_50t">#cce8f2ff</color>
<color name="blue_gray_50">#e8f2ff</color>
<color name="blue_gray_25">#f7f8fa</color>
<color name="brown_gray_400">#c3a689</color>
<color name="brown_gray_300">#e0c1a3</color>
<color name="brown_gray_200">#feddbd</color>
<color name="brown_gray_100">#ffeedf</color>
<color name="brown_gray_50t">#ccffeedf</color>
<color name="brown_gray_50">#ffeedf</color>
<color name="brown_gray_25">#f7f8fa</color>
<color name="yellow_gray_400">#b8aa87</color>
<color name="yellow_gray_300">#d4c5a1</color>
<color name="yellow_gray_200">#f1e1bb</color>
<color name="yellow_gray_100">#fff0ca</color>
<color name="yellow_gray_50t">#ccfff0ca</color>
<color name="yellow_gray_50">#fff0ca</color>
<color name="yellow_gray_25">#f7f8fa</color>
<color name="error_25">#FFFBFA</color>
<color name="error_50">#FEF3F2</color>
<color name="error_100">#FEE4E2</color>

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

@@ -397,4 +397,4 @@
<string name="login_title">Welcome Back</string>
<string name="login_subtitle">Log in with the server where you created your account.</string>
<string name="server_url">Server URL</string>
</resources>
</resources>

7
mastodon/src/main/res/values/strings_sk.xml
View File

@@ -40,4 +40,11 @@
<string name="sk_settings_show_federated_timeline">Show federated timeline</string>
<string name="sk_notification_type_status">Posts</string>
<string name="sk_notify_posts">Post notifications</string>
<string name="sk_settings_color_picker">Color theme</string>
<string name="sk_color_theme_pink">Pink</string>
<string name="sk_color_theme_purple">Purple</string>
<string name="sk_color_theme_green">Green</string>
<string name="sk_color_theme_blue">Blue</string>
<string name="sk_color_theme_brown">Brown</string>
<string name="sk_color_theme_yellow">Yellow</string>
</resources>

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

@@ -70,6 +70,7 @@
<item name="colorM3PressedOverlay">@color/m3_sys_light_on_primary</item>
</style>
<style name="Theme.Mastodon.Dark" parent="Theme.AppKit">
<!-- needed to disable scrim on API 29+ -->
<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
@@ -161,6 +162,437 @@
<style name="Theme.Mastodon.AutoLightDark" parent="Theme.Mastodon.Light"/>
<style name="Theme.Mastodon.AutoLightDark.TrueBlack" parent="Theme.Mastodon.Light"/>
<style name="Theme.Mastodon.Light.CustomBase" parent="Theme.Mastodon.Light">
<!-- needed to disable scrim on API 29+ -->
<item name="android:colorPrimary">@color/custom_gray_800</item>
<item name="android:textColorPrimary">@color/custom_gray_800</item>
<item name="android:textColorSecondary">@color/custom_gray_500</item>
<item name="colorDarkIcon">@color/custom_gray_900</item>
<item name="colorSearchHint">@color/custom_gray_600</item>
<item name="profileHeaderBackground">@color/custom_gray_500</item>
</style>
<style name="Theme.Mastodon.Dark.CustomBase" parent="Theme.Mastodon.Dark">
<!-- needed to disable scrim on API 29+ -->
<item name="android:colorBackground">@color/custom_gray_700</item>
<item name="colorButtonText">@color/custom_gray_800</item>
<item name="colorBackgroundLight">@color/custom_gray_700</item>
<item name="colorBackgroundLightest">@color/custom_gray_900</item>
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
<item name="colorDarkIcon">@color/gray_25</item>
<item name="colorWindowBackground">@color/custom_gray_800</item>
<item name="android:statusBarColor">@color/custom_gray_800</item>
<item name="android:navigationBarColor">@color/custom_gray_800</item>
<item name="colorPollVoted">@color/custom_gray_600</item>
<item name="profileHeaderBackground">?colorWindowBackground</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.CustomBase</item>
<!-- TODO dark colors -->
<item name="colorSearchField">@color/custom_gray_700</item>
</style>
<style name="Theme.Mastodon.Dark.TrueBlack.CustomBase">
<item name="colorPollVoted">@color/custom_gray_800</item>
<item name="colorSearchField">@color/custom_gray_900</item>
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
<item name="android:navigationBarColor">@color/black</item>
<item name="android:colorBackground">@color/black</item>
<item name="android:statusBarColor">@color/black</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
<item name="colorBackgroundLight">@color/black</item>
<item name="colorWindowBackground">@color/black</item>
<item name="colorButtonText">@color/black</item>
<item name="colorBackgroundLightest">@color/black</item>
</style>
<style name="Theme.Mastodon.Light.Green" parent="Theme.Mastodon.Light.CustomBase">
<item name="android:colorAccent">@color/green_primary_700</item>
<item name="android:colorBackground">@color/green_gray_100</item>
<item name="colorButtonText">@color/green_gray_50</item>
<item name="colorBackgroundLight">@color/green_gray_50</item>
<item name="colorBackgroundLightest">@color/green_gray_25</item>
<item name="android:statusBarColor">@color/green_gray_50</item>
<item name="android:navigationBarColor">@color/green_navigation_bar_bg</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Green</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Green</item>
<item name="colorPollMostVoted">@color/green_primary_500</item>
<item name="colorPollVoted">@color/green_gray_300</item>
<item name="colorAccentLight">@color/green_primary_600</item>
<item name="colorSearchField">@color/green_gray_200</item>
<item name="colorTabInactive">@color/green_gray_400</item>
<item name="colorAccentLightest">@color/green_primary_100</item>
<item name="colorSecondary">@color/green_gray_50</item>
</style>
<style name="Theme.Mastodon.Dark.Green" parent="Theme.Mastodon.Dark.CustomBase">
<item name="android:colorAccent">@color/green_primary_400</item>
<item name="android:colorPrimary">@color/green_gray_50</item>
<item name="android:textColorPrimary">@color/green_gray_50</item>
<item name="android:textColorSecondary">@color/green_gray_400</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Green</item>
<item name="colorPollMostVoted">@color/green_primary_700</item>
<item name="colorAccentLight">@color/green_primary_600</item>
<item name="colorAccentLightest">@color/green_primary_800</item>
<item name="colorTabInactive">@color/green_gray_400</item>
<item name="colorSearchHint">@color/green_gray_300</item>
<item name="colorSecondary">@color/green_gray_50</item>
</style>
<style name="Theme.Mastodon.Dark.TrueBlack.Green" parent="Theme.Mastodon.Dark.Green">
<item name="android:colorAccent">@color/green_primary_400</item>
<item name="colorPollMostVoted">@color/green_primary_700</item>
<item name="colorAccentLight">@color/green_primary_600</item>
<item name="colorAccentLightest">@color/green_primary_800</item>
<item name="colorSecondary">@color/green_gray_50</item>
<item name="colorPollVoted">@color/custom_gray_800</item>
<item name="colorSearchField">@color/custom_gray_900</item>
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
<item name="android:navigationBarColor">@color/black</item>
<item name="android:colorBackground">@color/black</item>
<item name="android:statusBarColor">@color/black</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
<item name="colorBackgroundLight">@color/black</item>
<item name="colorWindowBackground">@color/black</item>
<item name="colorButtonText">@color/black</item>
<item name="colorBackgroundLightest">@color/black</item>
</style>
<style name="Theme.Mastodon.AutoLightDark.Green" parent="Theme.Mastodon.Light.Green"/>
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Green" parent="Theme.Mastodon.Light.Green"/>
<style name="Theme.Mastodon.Dialog.Alert.Dark.Green" 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/green_primary_600</item>
<item name="android:colorPrimary">@color/green_gray_50</item>
<item name="android:colorBackground">@color/custom_gray_700</item>
<item name="android:textColorPrimary">@color/green_gray_50</item>
<item name="android:textColorSecondary">@color/green_gray_400</item>
</style>
<style name="Theme.Mastodon.Dialog.Alert.Green" 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/green_primary_700</item>
<item name="android:colorPrimary">@color/custom_gray_800</item>
<item name="android:colorBackground">@color/green_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.Green" parent="android:ThemeOverlay.Material.ActionBar">
<item name="android:colorPrimary">@color/green_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.Light.Blue" parent="Theme.Mastodon.Light.CustomBase">
<item name="android:colorAccent">@color/blue_primary_700</item>
<item name="android:colorBackground">@color/blue_gray_100</item>
<item name="colorButtonText">@color/blue_gray_50</item>
<item name="colorBackgroundLight">@color/blue_gray_50</item>
<item name="colorBackgroundLightest">@color/blue_gray_25</item>
<item name="android:statusBarColor">@color/blue_gray_50</item>
<item name="android:navigationBarColor">@color/blue_navigation_bar_bg</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Blue</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Blue</item>
<item name="colorPollMostVoted">@color/blue_primary_500</item>
<item name="colorPollVoted">@color/blue_gray_300</item>
<item name="colorAccentLight">@color/blue_primary_600</item>
<item name="colorSearchField">@color/blue_gray_200</item>
<item name="colorTabInactive">@color/blue_gray_400</item>
<item name="colorAccentLightest">@color/blue_primary_100</item>
<item name="colorSecondary">@color/blue_gray_50</item>
</style>
<style name="Theme.Mastodon.Dark.Blue" parent="Theme.Mastodon.Dark.CustomBase">
<item name="android:colorAccent">@color/blue_primary_400</item>
<item name="android:colorPrimary">@color/blue_gray_50</item>
<item name="android:textColorPrimary">@color/blue_gray_50</item>
<item name="android:textColorSecondary">@color/blue_gray_400</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Blue</item>
<item name="colorPollMostVoted">@color/blue_primary_700</item>
<item name="colorAccentLight">@color/blue_primary_600</item>
<item name="colorAccentLightest">@color/blue_primary_800</item>
<item name="colorTabInactive">@color/blue_gray_400</item>
<item name="colorSearchHint">@color/blue_gray_300</item>
<item name="colorSecondary">@color/blue_gray_50</item>
</style>
<style name="Theme.Mastodon.Dark.TrueBlack.Blue" parent="Theme.Mastodon.Dark.Blue">
<item name="android:colorAccent">@color/blue_primary_400</item>
<item name="colorPollMostVoted">@color/blue_primary_700</item>
<item name="colorAccentLight">@color/blue_primary_600</item>
<item name="colorAccentLightest">@color/blue_primary_800</item>
<item name="colorSecondary">@color/blue_gray_50</item>
<item name="colorPollVoted">@color/custom_gray_800</item>
<item name="colorSearchField">@color/custom_gray_900</item>
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
<item name="android:navigationBarColor">@color/black</item>
<item name="android:colorBackground">@color/black</item>
<item name="android:statusBarColor">@color/black</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
<item name="colorBackgroundLight">@color/black</item>
<item name="colorWindowBackground">@color/black</item>
<item name="colorButtonText">@color/black</item>
<item name="colorBackgroundLightest">@color/black</item>
</style>
<style name="Theme.Mastodon.AutoLightDark.Blue" parent="Theme.Mastodon.Light.Blue"/>
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Blue" parent="Theme.Mastodon.Light.Blue"/>
<style name="Theme.Mastodon.Dialog.Alert.Dark.Blue" 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/blue_primary_600</item>
<item name="android:colorPrimary">@color/blue_gray_50</item>
<item name="android:colorBackground">@color/custom_gray_700</item>
<item name="android:textColorPrimary">@color/blue_gray_50</item>
<item name="android:textColorSecondary">@color/blue_gray_400</item>
</style>
<style name="Theme.Mastodon.Dialog.Alert.Blue" 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/blue_primary_700</item>
<item name="android:colorPrimary">@color/custom_gray_800</item>
<item name="android:colorBackground">@color/blue_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.Blue" parent="android:ThemeOverlay.Material.ActionBar">
<item name="android:colorPrimary">@color/blue_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.Light.Brown" parent="Theme.Mastodon.Light.CustomBase">
<item name="android:colorAccent">@color/brown_primary_700</item>
<item name="android:colorBackground">@color/brown_gray_100</item>
<item name="colorButtonText">@color/brown_gray_50</item>
<item name="colorBackgroundLight">@color/brown_gray_50</item>
<item name="colorBackgroundLightest">@color/brown_gray_25</item>
<item name="android:statusBarColor">@color/brown_gray_50</item>
<item name="android:navigationBarColor">@color/brown_navigation_bar_bg</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Brown</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Brown</item>
<item name="colorPollMostVoted">@color/brown_primary_500</item>
<item name="colorPollVoted">@color/brown_gray_200</item>
<item name="colorAccentLight">@color/brown_primary_600</item>
<item name="colorSearchField">@color/brown_gray_200</item>
<item name="colorTabInactive">@color/brown_gray_400</item>
<item name="colorAccentLightest">@color/brown_primary_100</item>
<item name="colorSecondary">@color/brown_gray_50</item>
</style>
<style name="Theme.Mastodon.Dark.Brown" parent="Theme.Mastodon.Dark.CustomBase">
<item name="android:colorAccent">@color/brown_primary_400</item>
<item name="android:colorPrimary">@color/brown_gray_50</item>
<item name="android:textColorPrimary">@color/brown_gray_50</item>
<item name="android:textColorSecondary">@color/brown_gray_400</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Brown</item>
<item name="colorPollMostVoted">@color/brown_primary_700</item>
<item name="colorAccentLight">@color/brown_primary_600</item>
<item name="colorAccentLightest">@color/brown_primary_800</item>
<item name="colorTabInactive">@color/brown_gray_400</item>
<item name="colorSearchHint">@color/brown_gray_300</item>
<item name="colorSecondary">@color/brown_gray_50</item>
</style>
<style name="Theme.Mastodon.Dark.TrueBlack.Brown" parent="Theme.Mastodon.Dark.Brown">
<item name="android:colorAccent">@color/brown_primary_400</item>
<item name="colorPollMostVoted">@color/brown_primary_700</item>
<item name="colorAccentLight">@color/brown_primary_600</item>
<item name="colorAccentLightest">@color/brown_primary_800</item>
<item name="colorSecondary">@color/brown_gray_50</item>
<item name="colorPollVoted">@color/custom_gray_800</item>
<item name="colorSearchField">@color/custom_gray_900</item>
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
<item name="android:navigationBarColor">@color/black</item>
<item name="android:colorBackground">@color/black</item>
<item name="android:statusBarColor">@color/black</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
<item name="colorBackgroundLight">@color/black</item>
<item name="colorWindowBackground">@color/black</item>
<item name="colorButtonText">@color/black</item>
<item name="colorBackgroundLightest">@color/black</item>
</style>
<style name="Theme.Mastodon.AutoLightDark.Brown" parent="Theme.Mastodon.Light.Brown"/>
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Brown" parent="Theme.Mastodon.Light.Brown"/>
<style name="Theme.Mastodon.Dialog.Alert.Dark.Brown" 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/brown_primary_600</item>
<item name="android:colorPrimary">@color/brown_gray_50</item>
<item name="android:colorBackground">@color/custom_gray_700</item>
<item name="android:textColorPrimary">@color/brown_gray_50</item>
<item name="android:textColorSecondary">@color/brown_gray_400</item>
</style>
<style name="Theme.Mastodon.Dialog.Alert.Brown" 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/brown_primary_700</item>
<item name="android:colorPrimary">@color/custom_gray_800</item>
<item name="android:colorBackground">@color/brown_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.Brown" parent="android:ThemeOverlay.Material.ActionBar">
<item name="android:colorPrimary">@color/brown_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.Light.Yellow" parent="Theme.Mastodon.Light.CustomBase">
<item name="android:colorAccent">@color/yellow_primary_700</item>
<item name="android:colorBackground">@color/yellow_gray_100</item>
<item name="colorButtonText">@color/yellow_gray_50</item>
<item name="colorBackgroundLight">@color/yellow_gray_50</item>
<item name="colorBackgroundLightest">@color/yellow_gray_25</item>
<item name="android:statusBarColor">@color/yellow_gray_50</item>
<item name="android:navigationBarColor">@color/yellow_navigation_bar_bg</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Yellow</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Yellow</item>
<item name="colorPollMostVoted">@color/yellow_primary_500</item>
<item name="colorPollVoted">@color/yellow_gray_300</item>
<item name="colorAccentLight">@color/yellow_primary_600</item>
<item name="colorSearchField">@color/yellow_gray_200</item>
<item name="colorTabInactive">@color/yellow_gray_400</item>
<item name="colorAccentLightest">@color/yellow_primary_100</item>
<item name="colorSecondary">@color/yellow_gray_50</item>
</style>
<style name="Theme.Mastodon.Dark.Yellow" parent="Theme.Mastodon.Dark.CustomBase">
<item name="android:colorAccent">@color/yellow_primary_400</item>
<item name="android:colorPrimary">@color/yellow_gray_50</item>
<item name="android:textColorPrimary">@color/yellow_gray_50</item>
<item name="android:textColorSecondary">@color/yellow_gray_400</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Yellow</item>
<item name="colorPollMostVoted">@color/yellow_primary_700</item>
<item name="colorAccentLight">@color/yellow_primary_600</item>
<item name="colorAccentLightest">@color/yellow_primary_800</item>
<item name="colorTabInactive">@color/yellow_gray_400</item>
<item name="colorSearchHint">@color/yellow_gray_300</item>
<item name="colorSecondary">@color/yellow_gray_50</item>
</style>
<style name="Theme.Mastodon.Dark.TrueBlack.Yellow" parent="Theme.Mastodon.Dark.Yellow">
<item name="android:colorAccent">@color/yellow_primary_400</item>
<item name="colorPollMostVoted">@color/yellow_primary_700</item>
<item name="colorAccentLight">@color/yellow_primary_600</item>
<item name="colorAccentLightest">@color/yellow_primary_800</item>
<item name="colorSecondary">@color/yellow_gray_50</item>
<item name="colorPollVoted">@color/custom_gray_800</item>
<item name="colorSearchField">@color/custom_gray_900</item>
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
<item name="android:navigationBarColor">@color/black</item>
<item name="android:colorBackground">@color/black</item>
<item name="android:statusBarColor">@color/black</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
<item name="colorBackgroundLight">@color/black</item>
<item name="colorWindowBackground">@color/black</item>
<item name="colorButtonText">@color/black</item>
<item name="colorBackgroundLightest">@color/black</item>
</style>
<style name="Theme.Mastodon.AutoLightDark.Yellow" parent="Theme.Mastodon.Light.Yellow"/>
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Yellow" parent="Theme.Mastodon.Light.Yellow"/>
<style name="Theme.Mastodon.Dialog.Alert.Dark.Yellow" 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/yellow_primary_600</item>
<item name="android:colorPrimary">@color/yellow_gray_50</item>
<item name="android:colorBackground">@color/custom_gray_700</item>
<item name="android:textColorPrimary">@color/yellow_gray_50</item>
<item name="android:textColorSecondary">@color/yellow_gray_400</item>
</style>
<style name="Theme.Mastodon.Dialog.Alert.Yellow" 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/yellow_primary_700</item>
<item name="android:colorPrimary">@color/custom_gray_800</item>
<item name="android:colorBackground">@color/yellow_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.Yellow" parent="android:ThemeOverlay.Material.ActionBar">
<item name="android:colorPrimary">@color/yellow_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">
<item name="android:colorAccent">@color/original_primary_400</item>
<item name="colorPollMostVoted">@color/original_primary_700</item>
<item name="colorAccentLight">@color/original_primary_600</item>
<item name="colorAccentLightest">@color/original_primary_800</item>
</style>
<style name="Theme.Mastodon.Dark.TrueBlack.Original" parent="Theme.Mastodon.Dark.TrueBlack">
<item name="android:colorAccent">@color/original_primary_400</item>
<item name="colorPollMostVoted">@color/original_primary_700</item>
<item name="colorAccentLight">@color/original_primary_600</item>
<item name="colorAccentLightest">@color/original_primary_800</item>
</style>
<style name="Theme.Mastodon.Light.Original" parent="Theme.Mastodon.Light">
<item name="android:colorAccent">@color/original_primary_400</item>
<item name="colorPollMostVoted">@color/original_primary_700</item>
<item name="colorAccentLight">@color/original_primary_600</item>
<item name="colorAccentLightest">@color/original_primary_800</item>
</style>
<style name="Theme.Mastodon.AutoLightDark.Original" parent="Theme.Mastodon.Light.Original"/>
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Original" parent="Theme.Mastodon.Light.Original"/>
<style name="Theme.Mastodon.Toolbar" parent="android:ThemeOverlay.Material.ActionBar">
<item name="android:colorPrimary">@color/gray_50</item>
<item name="android:textColorPrimary">@color/gray_800</item>
@@ -181,19 +613,25 @@
<item name="android:titleMarginStart">0dp</item>
</style>
<style name="Theme.Mastodon.Toolbar.Dark.CustomBase" parent="android:ThemeOverlay.Material.Dark.ActionBar">
<item name="android:colorPrimary">@color/custom_gray_800</item>
<item name="android:textColorPrimary">@color/gray_50</item>
<item name="android:textColorSecondary">@color/gray_50</item>
</style>
<style name="Theme.Mastodon.Toolbar.Dark.TrueBlack" parent="android:ThemeOverlay.Material.Dark.ActionBar">
<item name="android:colorPrimary">@color/black</item>
</style>
<style name="Theme.Mastodon.Toolbar.Profile">
<item name="android:textColorPrimary">@color/gray_50</item>
<item name="android:textColorSecondary">@color/gray_50</item>
<item name="android:drawableTint">@color/gray_50</item>
<item name="android:popupTheme">@style/Theme.Mastodon.AutoLightDark</item>
<item name="android:textColorPrimary">?android:colorPrimary</item>
<item name="android:textColorSecondary">?android:colorPrimary</item>
<item name="android:drawableTint">?android:colorPrimary</item>
<item name="android:popupTheme">?android:actionBarTheme</item>
<item name="android:titleTextAppearance">@style/m3_title_medium</item>
<item name="android:titleTextColor">@color/gray_50</item>
<item name="android:titleTextColor">?android:colorPrimary</item>
<item name="android:subtitleTextAppearance">@style/m3_body_medium</item>
<item name="android:subtitleTextColor">@color/gray_50</item>
<item name="android:subtitleTextColor">?android:colorPrimary</item>
</style>
<style name="Widget.Mastodon.Button" parent="android:Widget.Material.Button">