Merge branch 'true-black-improvements' into fork
This commit is contained in:
commit
24023e9843
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<solid android:color="?colorBackgroundLightest"/>
|
<solid android:color="?colorBackgroundPopup"/>
|
||||||
<corners android:radius="10dp"/>
|
<corners android:radius="10dp"/>
|
||||||
<padding android:top="8dp" android:bottom="8dp"/>
|
<padding android:top="8dp" android:bottom="8dp"/>
|
||||||
</shape>
|
</shape>
|
|
@ -4,6 +4,7 @@
|
||||||
<attr name="colorSecondary" format="color"/>
|
<attr name="colorSecondary" format="color"/>
|
||||||
<attr name="colorBackgroundLight" format="color"/>
|
<attr name="colorBackgroundLight" format="color"/>
|
||||||
<attr name="colorBackgroundLightest" format="color"/>
|
<attr name="colorBackgroundLightest" format="color"/>
|
||||||
|
<attr name="colorBackgroundPopup" format="color"/>
|
||||||
<attr name="colorDarkIcon" format="color"/>
|
<attr name="colorDarkIcon" format="color"/>
|
||||||
<attr name="colorPollMostVoted" format="color"/>
|
<attr name="colorPollMostVoted" format="color"/>
|
||||||
<attr name="colorPollVoted" format="color"/>
|
<attr name="colorPollVoted" format="color"/>
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
<item name="colorSecondary">#E9EDF2</item>
|
<item name="colorSecondary">#E9EDF2</item>
|
||||||
<item name="colorBackgroundLight">@color/gray_50</item>
|
<item name="colorBackgroundLight">@color/gray_50</item>
|
||||||
<item name="colorBackgroundLightest">@color/gray_25</item>
|
<item name="colorBackgroundLightest">@color/gray_25</item>
|
||||||
|
<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
|
||||||
<item name="colorDarkIcon">@color/gray_900</item>
|
<item name="colorDarkIcon">@color/gray_900</item>
|
||||||
<item name="colorWindowBackground">@color/white</item>
|
<item name="colorWindowBackground">@color/white</item>
|
||||||
<item name="android:statusBarColor">@color/gray_50</item>
|
<item name="android:statusBarColor">@color/gray_50</item>
|
||||||
|
@ -67,6 +68,7 @@
|
||||||
<item name="colorSecondary">#E9EDF2</item>
|
<item name="colorSecondary">#E9EDF2</item>
|
||||||
<item name="colorBackgroundLight">@color/gray_700</item>
|
<item name="colorBackgroundLight">@color/gray_700</item>
|
||||||
<item name="colorBackgroundLightest">@color/gray_900</item>
|
<item name="colorBackgroundLightest">@color/gray_900</item>
|
||||||
|
<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
|
||||||
<item name="colorDarkIcon">@color/gray_25</item>
|
<item name="colorDarkIcon">@color/gray_25</item>
|
||||||
<item name="colorWindowBackground">@color/gray_800</item>
|
<item name="colorWindowBackground">@color/gray_800</item>
|
||||||
<item name="android:statusBarColor">@color/gray_800</item>
|
<item name="android:statusBarColor">@color/gray_800</item>
|
||||||
|
@ -101,6 +103,9 @@
|
||||||
<item name="colorWindowBackground">@color/black</item>
|
<item name="colorWindowBackground">@color/black</item>
|
||||||
<item name="colorButtonText">@color/black</item>
|
<item name="colorButtonText">@color/black</item>
|
||||||
<item name="colorPollVoted">@color/gray_800</item>
|
<item name="colorPollVoted">@color/gray_800</item>
|
||||||
|
<item name="colorSearchField">@color/gray_900</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/black</item>
|
||||||
|
<item name="colorBackgroundPopup">@color/gray_900</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.Mastodon.AutoLightDark" parent="Theme.Mastodon.Light"/>
|
<style name="Theme.Mastodon.AutoLightDark" parent="Theme.Mastodon.Light"/>
|
||||||
|
|
Loading…
Reference in New Issue