Refactoring the purple/pink theme. Merge this @sk22, as its exactly what you asked earlier
This commit is contained in:
LucasGGamerM
parent
bce2367cfc
commit
4c9d1544fa
|
|
@ -14,16 +14,16 @@
|
|||
<item name="primaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Primary_DarkOnLight</item>
|
||||
<item name="secondaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Secondary_DarkOnLight</item>
|
||||
<item name="android:colorAccent">@color/primary_700</item>
|
||||
<item name="android:colorPrimary">@color/gray_800</item>
|
||||
<item name="android:colorPrimary">@color/custom_gray_800</item>
|
||||
<item name="android:colorBackground">@color/gray_100</item>
|
||||
<item name="android:textColorPrimary">@color/gray_800</item>
|
||||
<item name="android:textColorSecondary">@color/gray_500</item>
|
||||
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||
<item name="android:textColorSecondary">@color/custom_gray_500</item>
|
||||
<item name="colorButtonText">@color/gray_50</item>
|
||||
<item name="colorSecondary">#E9EDF2</item>
|
||||
<item name="colorBackgroundLight">@color/gray_50</item>
|
||||
<item name="colorBackgroundLightest">@color/gray_25</item>
|
||||
<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
|
||||
<item name="colorDarkIcon">@color/gray_900</item>
|
||||
<item name="colorDarkIcon">@color/custom_gray_900</item>
|
||||
<item name="colorWindowBackground">@color/white</item>
|
||||
<item name="android:statusBarColor">@color/gray_50</item>
|
||||
<item name="android:navigationBarColor">@color/navigation_bar_bg</item>
|
||||
|
|
@ -33,10 +33,10 @@
|
|||
<item name="colorPollVoted">@color/gray_300</item>
|
||||
<item name="colorAccentLight">@color/primary_600</item>
|
||||
<item name="colorSearchField">@color/gray_200</item>
|
||||
<item name="colorSearchHint">@color/gray_600</item>
|
||||
<item name="colorSearchHint">@color/custom_gray_600</item>
|
||||
<item name="colorTabInactive">@color/gray_400</item>
|
||||
<item name="colorAccentLightest">@color/primary_100</item>
|
||||
<item name="profileHeaderBackground">@color/gray_500</item>
|
||||
<item name="profileHeaderBackground">@color/custom_gray_500</item>
|
||||
|
||||
<item name="buttonBackground">@drawable/bg_button_primary_dark_on_light</item>
|
||||
<item name="android:editTextBackground">@drawable/bg_edittext_light</item>
|
||||
|
|
@ -89,29 +89,29 @@
|
|||
<item name="secondaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Secondary_LightOnDark</item>
|
||||
<item name="android:colorAccent">@color/primary_400</item>
|
||||
<item name="android:colorPrimary">@color/gray_50</item>
|
||||
<item name="android:colorBackground">@color/gray_700</item>
|
||||
<item name="android:colorBackground">@color/custom_gray_700</item>
|
||||
<item name="android:textColorPrimary">@color/gray_50</item>
|
||||
<item name="android:textColorSecondary">@color/gray_400</item>
|
||||
<item name="colorButtonText">@color/gray_800</item>
|
||||
<item name="colorButtonText">@color/custom_gray_800</item>
|
||||
<item name="colorSecondary">#E9EDF2</item>
|
||||
<item name="colorBackgroundLight">@color/gray_700</item>
|
||||
<item name="colorBackgroundLightest">@color/gray_900</item>
|
||||
<item name="colorBackgroundLight">@color/custom_gray_700</item>
|
||||
<item name="colorBackgroundLightest">@color/custom_gray_900</item>
|
||||
<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
|
||||
<item name="colorDarkIcon">@color/gray_25</item>
|
||||
<item name="colorWindowBackground">@color/gray_800</item>
|
||||
<item name="android:statusBarColor">@color/gray_800</item>
|
||||
<item name="android:navigationBarColor">@color/gray_800</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="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark</item>
|
||||
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark</item>
|
||||
<item name="colorPollMostVoted">@color/primary_700</item>
|
||||
<item name="colorPollVoted">@color/gray_600</item>
|
||||
<item name="colorPollVoted">@color/custom_gray_600</item>
|
||||
<item name="colorAccentLight">@color/primary_600</item>
|
||||
<item name="colorAccentLightest">@color/primary_800</item>
|
||||
<item name="colorTabInactive">@color/gray_400</item>
|
||||
<item name="profileHeaderBackground">?colorWindowBackground</item>
|
||||
|
||||
<!-- TODO dark colors -->
|
||||
<item name="colorSearchField">@color/gray_700</item>
|
||||
<item name="colorSearchField">@color/custom_gray_700</item>
|
||||
<item name="colorSearchHint">@color/gray_300</item>
|
||||
|
||||
<item name="buttonBackground">@drawable/bg_button_primary_light_on_dark</item>
|
||||
|
|
@ -157,10 +157,10 @@
|
|||
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
|
||||
<item name="colorBackgroundLight">@color/black</item>
|
||||
<item name="colorButtonText">@color/black</item>
|
||||
<item name="colorPollVoted">@color/gray_800</item>
|
||||
<item name="colorSearchField">@color/gray_900</item>
|
||||
<item name="colorPollVoted">@color/custom_gray_800</item>
|
||||
<item name="colorSearchField">@color/custom_gray_900</item>
|
||||
<item name="colorBackgroundLightest">@color/black</item>
|
||||
<item name="colorBackgroundPopup">@color/gray_900</item>
|
||||
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
|
||||
<item name="colorWindowBackground">@color/black</item>
|
||||
|
||||
<item name="colorM3Background">#000</item>
|
||||
|
|
@ -696,6 +696,7 @@
|
|||
<item name="colorPollMostVoted">@color/original_primary_700</item>
|
||||
<item name="colorAccentLight">@color/original_primary_600</item>
|
||||
<item name="colorAccentLightest">@color/original_primary_800</item>
|
||||
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Original</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Mastodon.Dark.TrueBlack.Original" parent="Theme.Mastodon.Dark.TrueBlack">
|
||||
|
|
@ -703,6 +704,7 @@
|
|||
<item name="colorPollMostVoted">@color/original_primary_700</item>
|
||||
<item name="colorAccentLight">@color/original_primary_600</item>
|
||||
<item name="colorAccentLightest">@color/original_primary_800</item>
|
||||
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Original</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Mastodon.Light.Original" parent="Theme.Mastodon.Light">
|
||||
|
|
@ -710,20 +712,48 @@
|
|||
<item name="colorPollMostVoted">@color/original_primary_700</item>
|
||||
<item name="colorAccentLight">@color/original_primary_600</item>
|
||||
<item name="colorAccentLightest">@color/original_primary_800</item>
|
||||
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Original</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.Dialog.Alert.Dark.Original" 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/original_primary_600</item>
|
||||
<item name="android:colorPrimary">@color/gray_50</item>
|
||||
<item name="android:colorBackground">@color/custom_gray_700</item>
|
||||
<item name="android:textColorPrimary">@color/gray_50</item>
|
||||
<item name="android:textColorSecondary">@color/gray_400</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Mastodon.Dialog.Alert.Original" 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/original_primary_700</item>
|
||||
<item name="android:colorPrimary">@color/custom_gray_800</item>
|
||||
<item name="android:colorBackground">@color/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" parent="android:ThemeOverlay.Material.ActionBar">
|
||||
<item name="android:colorPrimary">@color/gray_50</item>
|
||||
<item name="android:textColorPrimary">@color/gray_800</item>
|
||||
<item name="android:textColorSecondary">@color/gray_800</item>
|
||||
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||
<item name="android:textColorSecondary">@color/custom_gray_800</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Mastodon.Toolbar.Dark" parent="android:ThemeOverlay.Material.Dark.ActionBar">
|
||||
<item name="android:colorPrimary">@color/gray_800</item>
|
||||
<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>
|
||||
|
|
@ -825,10 +855,10 @@
|
|||
|
||||
<!-- colors -->
|
||||
<item name="android:colorAccent">@color/primary_700</item>
|
||||
<item name="android:colorPrimary">@color/gray_800</item>
|
||||
<item name="android:colorPrimary">@color/custom_gray_800</item>
|
||||
<item name="android:colorBackground">@color/gray_100</item>
|
||||
<item name="android:textColorPrimary">@color/gray_800</item>
|
||||
<item name="android:textColorSecondary">@color/gray_500</item>
|
||||
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||
<item name="android:textColorSecondary">@color/custom_gray_500</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Mastodon.Dialog.Alert.Dark" parent="android:Theme.Material.Dialog.Alert">
|
||||
|
|
@ -840,7 +870,7 @@
|
|||
<!-- colors -->
|
||||
<item name="android:colorAccent">@color/primary_600</item>
|
||||
<item name="android:colorPrimary">@color/gray_50</item>
|
||||
<item name="android:colorBackground">@color/gray_700</item>
|
||||
<item name="android:colorBackground">@color/custom_gray_700</item>
|
||||
<item name="android:textColorPrimary">@color/gray_50</item>
|
||||
<item name="android:textColorSecondary">@color/gray_400</item>
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Reference in New Issue