yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

More themes cleanup (#5410)

Browse Source 
* More themes cleanup

* Tweak some things

* Fix 'Clear History' icon

* Split out ripple colored to its own drawable

* Tidy up things

* Unify background dim amount

* Use primaryColor for Account login button

* More colored ripples

* use colorOnPrimary for selected comfortable library item title

Co-authored-by: Soitora <simon.mattila@protonmail.com>
This commit is contained in:
Ivan Iskandar
2021-06-20 02:45:16 +07:00
committed by GitHub
parent 05771ddf6d
commit 932c92412c
108 changed files with 556 additions and 882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/src/main/res/drawable/library_item_selector.xml
View File

@@ -1,42 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorLibrarySelection">
android:color="?attr/colorPrimary">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="#80FFFFFF" />
</shape>
</item>
<item>
<selector>
<item
android:state_selected="true"
android:top="2dp"
android:right="2dp"
android:bottom="2dp"
android:left="2dp">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="?attr/colorLibrarySelectionActive" />
</shape>
</item>
<item
android:state_activated="true"
android:top="2dp"
android:right="2dp"
android:bottom="2dp"
android:left="2dp">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="?attr/colorLibrarySelectionActive" />
</shape>
</item>
<item
android:top="2dp"
android:right="2dp"
android:bottom="2dp"
android:left="2dp">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="?android:attr/colorBackground" />
</shape>
</item>
</selector>
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="@color/library_item_background" />
</shape>
</item>
</ripple>

23
app/src/main/res/drawable/library_item_selector_overlay.xml
View File

@@ -1,21 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorLibrarySelection">
android:color="?attr/colorPrimary">
<item>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="@color/selector_overlay" />
</shape>
</item>
<item android:state_activated="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="@color/selector_overlay" />
</shape>
</item>
</selector>
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="@color/library_item_foreground" />
</shape>
</item>
</ripple>
</ripple>

6
app/src/main/res/drawable/list_item_selector.xml
View File

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

6
app/src/main/res/drawable/list_item_selector_background.xml
View File

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

2
app/src/main/res/drawable/reader_seekbar_background.xml
View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="?attr/actionBarSize" />
<solid android:color="?attr/colorPrimary" />
<solid android:color="?attr/colorToolbar" />
</shape>

2
app/src/main/res/drawable/reader_seekbar_ripple.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/rippleColor">
android:color="?attr/colorControlHighlight">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">

5
app/src/main/res/drawable/ripple_background.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/rippleColor">
<item android:drawable="?android:attr/colorBackground" />
</ripple>

3
app/src/main/res/drawable/ripple_regular.xml
View File

@@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/rippleColor" />

6
app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
View File

@@ -6,17 +6,17 @@
android:viewportHeight="48">
<path
android:fillColor="@color/colorPrimary"
android:fillColor="@color/accent_lightblue"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z" />
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,12l-2.5,-1.5L15,12L15,4h5v8z" />
</group>
</vector>

4
app/src/main/res/drawable/sc_explore_48dp.xml
View File

@@ -6,14 +6,14 @@
android:viewportHeight="48">
<path
android:fillColor="@color/colorPrimary"
android:fillColor="@color/accent_lightblue"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z" />
</group>
</vector>

4
app/src/main/res/drawable/sc_history_48dp.xml
View File

@@ -6,14 +6,14 @@
android:viewportHeight="48">
<path
android:fillColor="@color/colorPrimary"
android:fillColor="@color/accent_lightblue"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
</group>
</vector>

4
app/src/main/res/drawable/sc_new_releases_48dp.xml
View File

@@ -6,14 +6,14 @@
android:viewportHeight="48">
<path
android:fillColor="@color/colorPrimary"
android:fillColor="@color/accent_lightblue"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
</group>
</vector>

3
app/src/main/res/drawable/selectable_item_background.xml
View File

@@ -1,3 +0,0 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ripple_regular" />
</selector>

2
app/src/main/res/drawable/splash_background.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="?attr/colorBackgroundSplash" />
<item android:drawable="@color/splash" />
<item
android:width="72dp"

2
app/src/main/res/drawable/tab_indicator.xml
View File

@@ -3,5 +3,5 @@
<corners
android:topLeftRadius="4dp"
android:topRightRadius="4dp" />
<solid android:color="?attr/colorAccentOnPrimary" />
<solid android:color="@android:color/white" />
</shape>