More polishes over the green theme
This commit is contained in:
LucasGGamerM
parent
19238c389f
commit
77669cedf6
3 changed files with 103 additions and 11 deletions
|
|
@ -1,4 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="navigation_bar_bg">@color/gray_50</color>
|
||||
<color name="green_navigation_bar_bg">@color/green_gray_50</color>
|
||||
</resources>
|
||||
|
|
@ -61,6 +61,13 @@
|
|||
<color name="green_gray_700">#191919</color>
|
||||
<color name="green_gray_600">#212121</color>
|
||||
<color name="green_gray_500">#242424</color>
|
||||
<color name="green_gray_400">#8f918e</color>
|
||||
<color name="green_gray_300">#a9aca8</color>
|
||||
<color name="green_gray_200">#c5c7c3</color>
|
||||
<color name="green_gray_100">#e1e3df</color>
|
||||
<color name="green_gray_50t">#eff1ed</color>
|
||||
<color name="green_gray_50">#eff1ed</color>
|
||||
<color name="green_gray_25">#f7f8fa</color>
|
||||
|
||||
<color name="error_25">#FFFBFA</color>
|
||||
<color name="error_50">#FEF3F2</color>
|
||||
|
|
|
|||
|
|
@ -128,10 +128,10 @@
|
|||
<item name="primaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Primary_LightOnDark</item>
|
||||
<item name="secondaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Secondary_LightOnDark</item>
|
||||
<item name="android:colorAccent">@color/green_primary_400</item>
|
||||
<item name="android:colorPrimary">@color/gray_50</item>
|
||||
<item name="android:colorPrimary">@color/green_gray_50</item>
|
||||
<item name="android:colorBackground">@color/green_gray_700</item>
|
||||
<item name="android:textColorPrimary">@color/gray_50</item>
|
||||
<item name="android:textColorSecondary">@color/gray_400</item>
|
||||
<item name="android:textColorPrimary">@color/green_gray_50</item>
|
||||
<item name="android:textColorSecondary">@color/green_gray_400</item>
|
||||
<item name="colorButtonText">@color/green_gray_800</item>
|
||||
<item name="colorSecondary">#E9EDF2</item>
|
||||
<item name="colorBackgroundLight">@color/green_gray_700</item>
|
||||
|
|
@ -142,17 +142,17 @@
|
|||
<item name="android:statusBarColor">@color/green_gray_800</item>
|
||||
<item name="android:navigationBarColor">@color/green_gray_800</item>
|
||||
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.Green</item>
|
||||
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark</item>
|
||||
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Green</item>
|
||||
<item name="colorPollMostVoted">@color/green_primary_700</item>
|
||||
<item name="colorPollVoted">@color/green_gray_600</item>
|
||||
<item name="colorAccentLight">@color/green_primary_600</item>
|
||||
<item name="colorAccentLightest">@color/green_primary_800</item>
|
||||
<item name="colorTabInactive">@color/gray_400</item>
|
||||
<item name="colorTabInactive">@color/green_gray_400</item>
|
||||
<item name="profileHeaderBackground">?colorWindowBackground</item>
|
||||
|
||||
<!-- TODO dark colors -->
|
||||
<item name="colorSearchField">@color/gray_700</item>
|
||||
<item name="colorSearchHint">@color/gray_300</item>
|
||||
<item name="colorSearchField">@color/green_gray_700</item>
|
||||
<item name="colorSearchHint">@color/green_gray_300</item>
|
||||
|
||||
<item name="buttonBackground">@drawable/bg_button_primary_light_on_dark</item>
|
||||
<item name="android:editTextBackground">@drawable/bg_edittext_dark</item>
|
||||
|
|
@ -168,13 +168,62 @@
|
|||
<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="colorPollVoted">@color/green_gray_800</item>
|
||||
<item name="colorSearchField">@color/green_gray_900</item>
|
||||
<item name="colorBackgroundPopup">@color/green_gray_900</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Mastodon.Light.Green" parent="Theme.Mastodon.Light">
|
||||
<item name="android:colorAccent">@color/green_primary_400</item>
|
||||
<item name="colorPollMostVoted">@color/green_primary_700</item>
|
||||
<!-- <style name="Theme.Mastodon.Light.Green" parent="Theme.Mastodon.Light">-->
|
||||
<!-- <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>-->
|
||||
<!-- </style>-->
|
||||
<style name="Theme.Mastodon.Light.Green" parent="Theme.AppKit.Light">
|
||||
<!-- needed to disable scrim on API 29+ -->
|
||||
<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
|
||||
<item name="android:enforceStatusBarContrast" tools:ignore="NewApi">false</item>
|
||||
<item name="appkitBackDrawable">@drawable/ic_fluent_arrow_left_24_regular</item>
|
||||
<item name="android:splitMotionEvents">false</item>
|
||||
<item name="android:windowBackground">?colorWindowBackground</item>
|
||||
<item name="android:editTextStyle">@style/Widget.Mastodon.EditText</item>
|
||||
|
||||
<item name="android:buttonStyle">@style/Widget.Mastodon.Button.Primary_DarkOnLight</item>
|
||||
<item name="secondaryButtonStyle">@style/Widget.Mastodon.Button.Secondary_DarkOnLight</item>
|
||||
<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/green_primary_700</item>
|
||||
<item name="android:colorPrimary">@color/green_gray_800</item>
|
||||
<item name="android:colorBackground">@color/green_gray_100</item>
|
||||
<item name="android:textColorPrimary">@color/green_gray_800</item>
|
||||
<item name="android:textColorSecondary">@color/green_gray_500</item>
|
||||
<item name="colorButtonText">@color/green_gray_50</item>
|
||||
<item name="colorSecondary">#E9EDF2</item>
|
||||
<item name="colorBackgroundLight">@color/green_gray_50</item>
|
||||
<item name="colorBackgroundLightest">@color/green_gray_25</item>
|
||||
<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
|
||||
<item name="colorDarkIcon">@color/green_gray_900</item>
|
||||
<item name="colorWindowBackground">@color/white</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="colorAccentLightest">@color/green_primary_800</item>
|
||||
<item name="colorSearchField">@color/green_gray_200</item>
|
||||
<item name="colorSearchHint">@color/green_gray_600</item>
|
||||
<item name="colorTabInactive">@color/green_gray_400</item>
|
||||
<item name="colorAccentLightest">@color/green_primary_100</item>
|
||||
<item name="profileHeaderBackground">@color/green_gray_500</item>
|
||||
|
||||
<item name="buttonBackground">@drawable/bg_button_primary_dark_on_light</item>
|
||||
<item name="android:editTextBackground">@drawable/bg_edittext_light</item>
|
||||
|
||||
<item name="android:windowLightStatusBar">true</item>
|
||||
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
|
||||
<item name="android:popupMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
|
||||
<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Mastodon.AutoLightDark.Green" parent="Theme.Mastodon.Light.Green"/>
|
||||
|
|
@ -218,6 +267,12 @@
|
|||
<item name="android:textColorSecondary">@color/gray_50</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/green_gray_800</item>
|
||||
<item name="android:textColorSecondary">@color/green_gray_800</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Mastodon.Toolbar.Dark.Green" parent="android:ThemeOverlay.Material.Dark.ActionBar">
|
||||
<item name="android:colorPrimary">@color/green_gray_800</item>
|
||||
<item name="android:textColorPrimary">@color/gray_50</item>
|
||||
|
|
@ -329,6 +384,34 @@
|
|||
<item name="android:textColorSecondary">@color/gray_400</item>
|
||||
</style>
|
||||
|
||||
<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/green_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/green_gray_800</item>
|
||||
<item name="android:colorBackground">@color/green_gray_100</item>
|
||||
<item name="android:textColorPrimary">@color/green_gray_800</item>
|
||||
<item name="android:textColorSecondary">@color/green_gray_500</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.ButtonBarButton" parent="android:Widget.Material.Button.Borderless">
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:layout_marginEnd">8dp</item>
|
||||
|
|
@ -343,6 +426,7 @@
|
|||
<item name="android:popupBackground">@drawable/bg_popup</item>
|
||||
</style>
|
||||
|
||||
|
||||
<style name="alert_title">
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:textSize">24dp</item>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue