tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced the selectors with the ones from cabinet to fix the ripple flickering bug.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-05-21 18:27:22 +02:00
commit 5dd57ef3ed
24 changed files with 64 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/res/drawable-v21/list_ripple_selector.xml
View file

@ -1,6 +0,0 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item android:drawable="@drawable/list_selector" />
</ripple>

6
app/src/main/res/drawable-v21/list_ripple_selector_dark.xml
View file

@ -1,6 +0,0 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item android:drawable="@drawable/list_selector_dark" />
</ripple>

15
app/src/main/res/drawable-v21/rect_ripple_selector.xml Normal file
View file

@ -0,0 +1,15 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/ripple_material_light">
<item
android:id="@android:id/mask"
android:drawable="@android:color/white" />
<item>
<selector>
<item
android:state_activated="true"
android:drawable="@color/ripple_material_light" />
</selector>
</item>
</ripple>

15
app/src/main/res/drawable-v21/rect_ripple_selector_dark.xml Normal file
View file

@ -0,0 +1,15 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/ripple_material_dark">
<item
android:id="@android:id/mask"
android:drawable="@android:color/white" />
<item>
<selector>
<item
android:state_activated="true"
android:drawable="@color/ripple_material_dark" />
</selector>
</item>
</ripple>

5
app/src/main/res/drawable-v21/round_ripple_selector.xml
View file

@ -1,7 +1,8 @@
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item
android:id="@android:id/mask"
android:drawable="@drawable/round_ripple_selector_mask" />
</ripple>

6
app/src/main/res/drawable-v21/round_ripple_selector_dark.xml
View file

@ -1,6 +0,0 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item android:drawable="@drawable/round_selector_dark" />
</ripple>

6
app/src/main/res/drawable-v21/round_ripple_selector_mask.xml
View file

@ -1,5 +1,5 @@
<shape
android:shape="oval"
xmlns:android="http://schemas.android.com/apk/res/android">
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@android:color/white" />
</shape>

5
app/src/main/res/drawable/list_activated.xml
View file

@ -1,5 +0,0 @@
<shape
android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#26000000" />
</shape>

5
app/src/main/res/drawable/list_activated_dark.xml
View file

@ -1,5 +0,0 @@
<shape
android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#26FFFFFF" />
</shape>

5
app/src/main/res/drawable/list_selector.xml
View file

@ -1,5 +0,0 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/list_activated" android:state_activated="true" />
<item android:drawable="@drawable/rect_selected" android:state_pressed="true" />
<item android:drawable="@drawable/transparent" />
</selector>

5
app/src/main/res/drawable/list_selector_dark.xml
View file

@ -1,5 +0,0 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/list_activated_dark" android:state_activated="true" />
<item android:drawable="@drawable/rect_selected_dark" android:state_pressed="true" />
<item android:drawable="@drawable/transparent" />
</selector>

5
app/src/main/res/drawable/rect_selected.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#B3E4E4E4" />
</shape>

5
app/src/main/res/drawable/rect_selected_dark.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#26FFFFFF" />
</shape>

6
app/src/main/res/drawable/rect_selector.xml
View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/rect_selected" />
<item android:drawable="@drawable/transparent" />
<item android:state_activated="true" android:state_pressed="true" android:drawable="@color/activated_selected_light" />
<item android:state_activated="true" android:drawable="@color/ripple_material_light" />
<item android:state_pressed="true" android:drawable="@color/ripple_material_light" />
<item android:drawable="@android:color/transparent" />
</selector>

6
app/src/main/res/drawable/rect_selector_dark.xml
View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/rect_selected_dark" />
<item android:drawable="@drawable/transparent" />
<item android:state_activated="true" android:state_pressed="true" android:drawable="@color/activated_selected_dark" />
<item android:state_activated="true" android:drawable="@color/ripple_material_dark" />
<item android:state_pressed="true" android:drawable="@color/ripple_material_dark" />
<item android:drawable="@android:color/transparent" />
</selector>

6
app/src/main/res/drawable/round_selected.xml
View file

@ -1,5 +1,5 @@
<shape
android:shape="oval"
xmlns:android="http://schemas.android.com/apk/res/android">
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/ripple_material_light" />
</shape>

6
app/src/main/res/drawable/round_selected_dark.xml
View file

@ -1,5 +1,5 @@
<shape
android:shape="oval"
xmlns:android="http://schemas.android.com/apk/res/android">
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/ripple_material_dark" />
</shape>

5
app/src/main/res/drawable/round_selector.xml
View file

@ -1,4 +1,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_shortAnimTime">
<item android:state_pressed="true" android:drawable="@drawable/round_selected" />
<item android:drawable="@android:color/transparent" />
</selector>

5
app/src/main/res/drawable/round_selector_dark.xml
View file

@ -1,4 +1,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_shortAnimTime">
<item android:state_pressed="true" android:drawable="@drawable/round_selected_dark" />
<item android:drawable="@android:color/transparent" />
</selector>

5
app/src/main/res/drawable/transparent.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@android:color/transparent"/>
</shape>

2
app/src/main/res/layout/item_navigation_drawer.xml
View file

@ -17,7 +17,7 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?list_selector"
android:background="?rect_selector"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingTop="2dp"

8
app/src/main/res/values-v21/styles.xml
View file

@ -1,17 +1,15 @@
<resources>
<style name="Theme.MaterialMusic" parent="Theme.MaterialMusic.Base">
<item name="round_selector">@drawable/round_ripple_selector_dark</item>
<item name="rect_selector">?selectableItemBackground</item>
<item name="list_selector">@drawable/list_ripple_selector_dark</item>
<item name="round_selector">@drawable/round_ripple_selector</item>
<item name="rect_selector">@drawable/rect_ripple_selector_dark</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
<style name="Theme.MaterialMusic.Light" parent="Theme.MaterialMusic.Base.Light">
<item name="round_selector">@drawable/round_ripple_selector</item>
<item name="rect_selector">?selectableItemBackground</item>
<item name="list_selector">@drawable/list_ripple_selector</item>
<item name="rect_selector">@drawable/rect_ripple_selector</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>

2
app/src/main/res/values/styles_parents.xml
View file

@ -17,7 +17,6 @@
@color/materialmusic_dark_navigation_drawer_background_color
</item>
<item name="list_selector">@drawable/list_selector_dark</item>
<item name="round_selector">@drawable/round_selector_dark</item>
<item name="rect_selector">@drawable/rect_selector_dark</item>
<item name="separator_color">@color/materialmusic_dark_separator_color</item>
@ -49,7 +48,6 @@
@color/materialmusic_navigation_drawer_background_color
</item>
<item name="list_selector">@drawable/list_selector</item>
<item name="round_selector">@drawable/round_selector</item>
<item name="rect_selector">@drawable/rect_selector</item>
<item name="separator_color">@color/materialmusic_separator_color</item>