Reversed some things from AMOLED update (#1015)

This commit is contained in:
Bram van de Kerkhof 2017-10-01 10:44:48 +02:00 committed by GitHub
parent eaece18afc
commit bfd46f28e0
6 changed files with 9 additions and 13 deletions

View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple <ripple
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/md_blue_grey_900" android:color="@color/selectorColorDark"
> >
<item> <item>
<selector> <selector>
<item android:state_selected="true"> <item android:state_selected="true">
<color android:color="@color/md_blue_grey_800"/> <color android:color="@color/selectorColorDark"/>
</item> </item>
<item android:state_activated="true"> <item android:state_activated="true">
<color android:color="@color/md_blue_grey_800"/> <color android:color="@color/selectorColorDark"/>
</item> </item>
<item> <item>

View File

@ -2,9 +2,9 @@
<selector android:exitFadeDuration="@android:integer/config_longAnimTime" <selector android:exitFadeDuration="@android:integer/config_longAnimTime"
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:drawable="@color/md_blue_grey_800"/> <item android:state_focused="true" android:drawable="@color/selectorColorDark"/>
<item android:state_pressed="true" android:drawable="@color/md_blue_grey_800"/> <item android:state_pressed="true" android:drawable="@color/selectorColorDark"/>
<item android:state_activated="true" android:drawable="@color/md_blue_grey_900"/> <item android:state_activated="true" android:drawable="@color/selectorColorDark"/>
<item android:drawable="@color/md_black_1000"/> <item android:drawable="@color/md_black_1000"/>
</selector> </selector>

View File

@ -8,7 +8,7 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?colorPrimaryDark" android:background="@color/colorPrimary"
android:scaleType="centerCrop"/> android:scaleType="centerCrop"/>
<ImageView <ImageView

View File

@ -26,7 +26,6 @@
<style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled"> <style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled">
<!-- Attributes specific for SDK 21 and up --> <!-- Attributes specific for SDK 21 and up -->
<item name="android:windowDrawsSystemBarBackgrounds">true</item> <item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@color/md_black_1000</item>
</style> </style>
<!--==============--> <!--==============-->

View File

@ -34,7 +34,7 @@
<color name="appBarDark">@color/md_grey_900</color> <color name="appBarDark">@color/md_grey_900</color>
<color name="backgroundDark">#303030</color> <color name="backgroundDark">#303030</color>
<color name="dialogDark">@color/md_grey_800</color> <color name="dialogDark">@color/md_grey_800</color>
<color name="dialog_oled">#141414</color> <color name="dialog_amoled">#141414</color>
<color name="selectorColorDark">@color/md_blue_A200_50</color> <color name="selectorColorDark">@color/md_blue_A200_50</color>
<color name="iconColorDark">@color/md_white_1000_54</color> <color name="iconColorDark">@color/md_white_1000_54</color>

View File

@ -87,14 +87,11 @@
<!--==============--> <!--==============-->
<style name="Theme.Base.Amoled" parent="Theme.Base.Dark"> <style name="Theme.Base.Amoled" parent="Theme.Base.Dark">
<item name="android:colorBackground">@color/md_black_1000</item> <item name="android:colorBackground">@color/md_black_1000</item>
<item name="colorPrimary">@color/appBarDark</item>
<item name="colorPrimaryDark">@color/md_blue_grey_900</item>
<item name="colorAccent">@color/md_grey_800</item>
<!-- Custom Attributes--> <!-- Custom Attributes-->
<item name="selectable_list_drawable">@drawable/list_item_selector_amoled</item> <item name="selectable_list_drawable">@drawable/list_item_selector_amoled</item>
<item name="selectable_library_drawable">@drawable/library_item_selector_amoled</item> <item name="selectable_library_drawable">@drawable/library_item_selector_amoled</item>
<item name="background_card">@color/dialog_oled</item> <item name="background_card">@color/dialog_amoled</item>
</style> </style>
<style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled"> <style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled">