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

Round selector

Browse source 
- added round selector for Lollipop and below lollipop
This commit is contained in:
Karim Abou Zeid 2015-02-15 14:19:10 +01:00
commit 585d959e3d
20 changed files with 86 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,9 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item
android:id="@android:id/mask"
android:drawable="@drawable/round_selected"/>
<item android:drawable="@drawable/round_selector"/>
</ripple>

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

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

7
app/src/main/res/drawable-v21/round_selector.xml Normal file
View file

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

7
app/src/main/res/drawable-v21/round_selector_dark.xml Normal file
View file

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

2
app/src/main/res/drawable/list_item_activated.xml
View file

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

2
app/src/main/res/drawable/list_item_activated_dark.xml
View file

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

2
app/src/main/res/drawable/list_item_selected.xml
View file

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

2
app/src/main/res/drawable/list_item_selected_dark.xml
View file

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

5
app/src/main/res/drawable/round_selected.xml Normal file
View file

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

5
app/src/main/res/drawable/round_selected_dark.xml Normal file
View file

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

7
app/src/main/res/drawable/round_selector.xml Normal file
View file

@ -0,0 +1,7 @@
<?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/round_selected" />
<item android:drawable="@drawable/transparent" />
</selector>

7
app/src/main/res/drawable/round_selector_dark.xml Normal file
View file

@ -0,0 +1,7 @@
<?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/round_selected_dark" />
<item android:drawable="@drawable/transparent" />
</selector>

8
app/src/main/res/layout/activity_music_controller.xml
View file

@ -114,7 +114,7 @@
android:layout_centerVertical="true"
android:layout_margin="8dp"
android:layout_toLeftOf="@+id/fab"
android:background="?android:attr/selectableItemBackground"
android:background="?round_selector"
android:padding="14dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_skip_previous_white_48dp"/>
@ -126,7 +126,7 @@
android:layout_centerVertical="true"
android:layout_margin="8dp"
android:layout_toRightOf="@+id/fab"
android:background="?android:attr/selectableItemBackground"
android:background="?round_selector"
android:padding="14dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_skip_next_white_48dp"/>
@ -138,7 +138,7 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_margin="8dp"
android:background="?android:attr/selectableItemBackground"
android:background="?round_selector"
android:padding="14dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_repeat_grey600_48dp"/>
@ -150,7 +150,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_margin="8dp"
android:background="?android:attr/selectableItemBackground"
android:background="?round_selector"
android:padding="14dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_shuffle_grey600_48dp"/>

3
app/src/main/res/layout/fragment_place_holder.xml
View file

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
android:id="@+id/fragment_placeholder"
android:id="@+id/fragment_placeholder_text"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:text="Comming soon!"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?title_text_color"/>

3
app/src/main/res/values-v21/colors.xml
View file

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="notification_buttons_tint">#de000000</color>
<color name="button_selected">#D0D0D0</color>
<color name="button_selected_dark">#88FFFFFF</color>
</resources>

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

@ -1,11 +1,11 @@
<resources>
<style name="Theme.MaterialMusic" parent="Theme.MaterialMusic.Base">
<!-- Customize your theme here. -->
<item name="round_selector">@drawable/round_ripple_selector_dark</item>
</style>
<style name="Theme.MaterialMusic.Light" parent="Theme.MaterialMusic.Base.Light">
<!-- Customize your theme here. -->
<!--<item name="round_selector">@drawable/round_ripple_selector</item>-->
</style>
<style name="Theme.MaterialMusic.Notification" parent="@android:style/TextAppearance.Material.Notification"/>

1
app/src/main/res/values/attrs.xml
View file

@ -6,4 +6,5 @@
<attr name="fab_color" format="color"/>
<attr name="fab_color_pressed" format="color"/>
<attr name="list_selector" format="reference"/>
<attr name="round_selector" format="reference"/>
</resources>

8
app/src/main/res/values/colors.xml
View file

@ -25,4 +25,12 @@
<color name="materialmusic_dark_music_controller_container_color">@color/grey_800</color>
<drawable name="notification_template_divider_media">#29ffffff</drawable>
<color name="list_item_activated">#26000000</color>
<color name="list_item_activated_dark">#26FFFFFF</color>
<color name="list_item_selected">#D0D0D0</color>
<color name="list_item_selected_dark">#77404040</color>
<color name="button_selected">#D0D0D0</color>
<color name="button_selected_dark">#30FFFFFF</color>
</resources>

6
app/src/main/res/values/styles.xml
View file

@ -1,11 +1,11 @@
<resources>
<style name="Theme.MaterialMusic" parent="Theme.MaterialMusic.Base">
<!-- Customize your theme here. -->
</style>
<style name="Theme.MaterialMusic.Light" parent="Theme.MaterialMusic.Base.Light">
<!-- Customize your theme here. -->
</style>
<style name="Theme.MaterialMusic.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent"/>
@ -18,7 +18,7 @@
<item name="android:layout_height">48dp</item>
<item name="android:src">@drawable/ic_overflow</item>
<item name="android:scaleType">fitXY</item>
<item name="android:background">?selectableItemBackground</item>
<item name="android:background">?round_selector</item>
<item name="android:layout_centerVertical">true</item>
<item name="android:focusableInTouchMode">false</item>
<item name="android:focusable">false</item>

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

@ -20,6 +20,8 @@
</item>
<item name="list_selector">@drawable/list_selector_dark</item>
<item name="round_selector">@drawable/round_selector_dark</item>
<item name="md_dark_theme">true</item>
</style>
@ -43,7 +45,9 @@
</item>
<item name="list_selector">@drawable/list_selector</item>
<item name="round_selector">@drawable/round_selector</item>
<item name="md_dark_theme">false</item>
</style>
<style name="PlayPauseFabParent">