diff options
58 files changed, 109 insertions, 131 deletions
diff --git a/subsonic-android/res/drawable-hdpi-v4/menubar_button_normal.9.png b/subsonic-android/res/drawable-hdpi-v4/actionbar_background.9.png Binary files differindex 9ce38a61..9ce38a61 100644 --- a/subsonic-android/res/drawable-hdpi-v4/menubar_button_normal.9.png +++ b/subsonic-android/res/drawable-hdpi-v4/actionbar_background.9.png diff --git a/subsonic-android/res/drawable-hdpi-v4/media_backward.png b/subsonic-android/res/drawable-hdpi-v4/media_backward.png Binary files differnew file mode 100644 index 00000000..3bb85e68 --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/media_backward.png diff --git a/subsonic-android/res/drawable-hdpi-v4/media_backward_normal.png b/subsonic-android/res/drawable-hdpi-v4/media_backward_normal.png Binary files differdeleted file mode 100644 index d2e44f1f..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/media_backward_normal.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/media_backward_pressed.png b/subsonic-android/res/drawable-hdpi-v4/media_backward_pressed.png Binary files differdeleted file mode 100644 index 1ab22f24..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/media_backward_pressed.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/media_forward.png b/subsonic-android/res/drawable-hdpi-v4/media_forward.png Binary files differnew file mode 100644 index 00000000..cf39f1f0 --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/media_forward.png diff --git a/subsonic-android/res/drawable-hdpi-v4/media_forward_normal.png b/subsonic-android/res/drawable-hdpi-v4/media_forward_normal.png Binary files differdeleted file mode 100644 index 2b4a2eee..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/media_forward_normal.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/media_forward_pressed.png b/subsonic-android/res/drawable-hdpi-v4/media_forward_pressed.png Binary files differdeleted file mode 100644 index a6cd62a7..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/media_forward_pressed.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/media_pause.png b/subsonic-android/res/drawable-hdpi-v4/media_pause.png Binary files differnew file mode 100644 index 00000000..d4cab525 --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/media_pause.png diff --git a/subsonic-android/res/drawable-hdpi-v4/media_pause_normal.png b/subsonic-android/res/drawable-hdpi-v4/media_pause_normal.png Binary files differdeleted file mode 100644 index c1eefc5b..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/media_pause_normal.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/media_pause_pressed.png b/subsonic-android/res/drawable-hdpi-v4/media_pause_pressed.png Binary files differdeleted file mode 100644 index f4de9fbd..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/media_pause_pressed.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/media_shuffle_normal.png b/subsonic-android/res/drawable-hdpi-v4/media_shuffle_normal.png Binary files differdeleted file mode 100644 index 18e69dea..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/media_shuffle_normal.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/media_shuffle_pressed.png b/subsonic-android/res/drawable-hdpi-v4/media_shuffle_pressed.png Binary files differdeleted file mode 100644 index 4e2e77a2..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/media_shuffle_pressed.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/media_start.png b/subsonic-android/res/drawable-hdpi-v4/media_start.png Binary files differnew file mode 100644 index 00000000..2af5996f --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/media_start.png diff --git a/subsonic-android/res/drawable-hdpi-v4/media_start_normal.png b/subsonic-android/res/drawable-hdpi-v4/media_start_normal.png Binary files differdeleted file mode 100644 index f987b1c2..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/media_start_normal.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/media_start_pressed.png b/subsonic-android/res/drawable-hdpi-v4/media_start_pressed.png Binary files differdeleted file mode 100644 index 97edb4ab..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/media_start_pressed.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/media_stop.png b/subsonic-android/res/drawable-hdpi-v4/media_stop.png Binary files differnew file mode 100644 index 00000000..329eb906 --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/media_stop.png diff --git a/subsonic-android/res/drawable-hdpi-v4/media_stop_normal.png b/subsonic-android/res/drawable-hdpi-v4/media_stop_normal.png Binary files differdeleted file mode 100644 index 6f03a5d3..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/media_stop_normal.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/media_stop_pressed.png b/subsonic-android/res/drawable-hdpi-v4/media_stop_pressed.png Binary files differdeleted file mode 100644 index 7d76ec08..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/media_stop_pressed.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/media_toggle_list_normal.png b/subsonic-android/res/drawable-hdpi-v4/media_toggle_list_normal.png Binary files differdeleted file mode 100644 index 05941b3d..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/media_toggle_list_normal.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/media_toggle_list_pressed.png b/subsonic-android/res/drawable-hdpi-v4/media_toggle_list_pressed.png Binary files differdeleted file mode 100644 index f1019360..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/media_toggle_list_pressed.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/menubar_button_disabled.9.png b/subsonic-android/res/drawable-hdpi-v4/menubar_button_disabled.9.png Binary files differdeleted file mode 100644 index 94a48f7d..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/menubar_button_disabled.9.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/menubar_button_pressed.9.png b/subsonic-android/res/drawable-hdpi-v4/menubar_button_pressed.9.png Binary files differdeleted file mode 100644 index e4b33935..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/menubar_button_pressed.9.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/menubar_button_selected.9.png b/subsonic-android/res/drawable-hdpi-v4/menubar_button_selected.9.png Binary files differnew file mode 100644 index 00000000..0eff695d --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/menubar_button_selected.9.png diff --git a/subsonic-android/res/drawable/media_backward.xml b/subsonic-android/res/drawable/media_backward.xml deleted file mode 100644 index 22db3dd0..00000000 --- a/subsonic-android/res/drawable/media_backward.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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/media_backward_pressed" /> - <item android:drawable="@drawable/media_backward_normal" /> -</selector>
\ No newline at end of file diff --git a/subsonic-android/res/drawable/media_backward_normal.png b/subsonic-android/res/drawable/media_backward_normal.png Binary files differdeleted file mode 100644 index e5372389..00000000 --- a/subsonic-android/res/drawable/media_backward_normal.png +++ /dev/null diff --git a/subsonic-android/res/drawable/media_backward_pressed.png b/subsonic-android/res/drawable/media_backward_pressed.png Binary files differdeleted file mode 100644 index 82c421d0..00000000 --- a/subsonic-android/res/drawable/media_backward_pressed.png +++ /dev/null diff --git a/subsonic-android/res/drawable/media_button.xml b/subsonic-android/res/drawable/media_button.xml new file mode 100644 index 00000000..f144393d --- /dev/null +++ b/subsonic-android/res/drawable/media_button.xml @@ -0,0 +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/menubar_button_pressed"/> + + <item android:drawable="@drawable/menubar_button_normal"/> + +</selector>
\ No newline at end of file diff --git a/subsonic-android/res/drawable/media_forward.xml b/subsonic-android/res/drawable/media_forward.xml deleted file mode 100644 index c6d1a0cd..00000000 --- a/subsonic-android/res/drawable/media_forward.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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/media_forward_pressed" /> - <item android:drawable="@drawable/media_forward_normal" /> -</selector>
\ No newline at end of file diff --git a/subsonic-android/res/drawable/media_forward_normal.png b/subsonic-android/res/drawable/media_forward_normal.png Binary files differdeleted file mode 100644 index 6cb93917..00000000 --- a/subsonic-android/res/drawable/media_forward_normal.png +++ /dev/null diff --git a/subsonic-android/res/drawable/media_forward_pressed.png b/subsonic-android/res/drawable/media_forward_pressed.png Binary files differdeleted file mode 100644 index 42ffbe4c..00000000 --- a/subsonic-android/res/drawable/media_forward_pressed.png +++ /dev/null diff --git a/subsonic-android/res/drawable/media_pause.xml b/subsonic-android/res/drawable/media_pause.xml deleted file mode 100644 index 750ba3f1..00000000 --- a/subsonic-android/res/drawable/media_pause.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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/media_pause_pressed" /> - <item android:drawable="@drawable/media_pause_normal" /> -</selector>
\ No newline at end of file diff --git a/subsonic-android/res/drawable/media_pause_normal.png b/subsonic-android/res/drawable/media_pause_normal.png Binary files differdeleted file mode 100644 index 4fc03eb2..00000000 --- a/subsonic-android/res/drawable/media_pause_normal.png +++ /dev/null diff --git a/subsonic-android/res/drawable/media_pause_pressed.png b/subsonic-android/res/drawable/media_pause_pressed.png Binary files differdeleted file mode 100644 index dd9ae605..00000000 --- a/subsonic-android/res/drawable/media_pause_pressed.png +++ /dev/null diff --git a/subsonic-android/res/drawable/media_shuffle.xml b/subsonic-android/res/drawable/media_shuffle.xml deleted file mode 100644 index 55d744cc..00000000 --- a/subsonic-android/res/drawable/media_shuffle.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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/media_shuffle_pressed" /> - <item android:drawable="@drawable/media_shuffle_normal" /> -</selector>
\ No newline at end of file diff --git a/subsonic-android/res/drawable/media_shuffle_normal.png b/subsonic-android/res/drawable/media_shuffle_normal.png Binary files differdeleted file mode 100644 index dc6b8c8c..00000000 --- a/subsonic-android/res/drawable/media_shuffle_normal.png +++ /dev/null diff --git a/subsonic-android/res/drawable/media_shuffle_pressed.png b/subsonic-android/res/drawable/media_shuffle_pressed.png Binary files differdeleted file mode 100644 index fb2639c8..00000000 --- a/subsonic-android/res/drawable/media_shuffle_pressed.png +++ /dev/null diff --git a/subsonic-android/res/drawable/media_start.xml b/subsonic-android/res/drawable/media_start.xml deleted file mode 100644 index 57117df7..00000000 --- a/subsonic-android/res/drawable/media_start.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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/media_start_pressed" /> - <item android:drawable="@drawable/media_start_normal" /> -</selector>
\ No newline at end of file diff --git a/subsonic-android/res/drawable/media_start_normal.png b/subsonic-android/res/drawable/media_start_normal.png Binary files differdeleted file mode 100644 index a3775d43..00000000 --- a/subsonic-android/res/drawable/media_start_normal.png +++ /dev/null diff --git a/subsonic-android/res/drawable/media_start_pressed.png b/subsonic-android/res/drawable/media_start_pressed.png Binary files differdeleted file mode 100644 index d7ace1ba..00000000 --- a/subsonic-android/res/drawable/media_start_pressed.png +++ /dev/null diff --git a/subsonic-android/res/drawable/media_stop.xml b/subsonic-android/res/drawable/media_stop.xml deleted file mode 100644 index 0cd2ff10..00000000 --- a/subsonic-android/res/drawable/media_stop.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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/media_stop_pressed" /> - <item android:drawable="@drawable/media_stop_normal" /> -</selector>
\ No newline at end of file diff --git a/subsonic-android/res/drawable/media_stop_normal.png b/subsonic-android/res/drawable/media_stop_normal.png Binary files differdeleted file mode 100644 index 120aecd0..00000000 --- a/subsonic-android/res/drawable/media_stop_normal.png +++ /dev/null diff --git a/subsonic-android/res/drawable/media_stop_pressed.png b/subsonic-android/res/drawable/media_stop_pressed.png Binary files differdeleted file mode 100644 index b590abe8..00000000 --- a/subsonic-android/res/drawable/media_stop_pressed.png +++ /dev/null diff --git a/subsonic-android/res/drawable/media_toggle_list.xml b/subsonic-android/res/drawable/media_toggle_list.xml deleted file mode 100644 index 350818e7..00000000 --- a/subsonic-android/res/drawable/media_toggle_list.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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/media_toggle_list_pressed" /> - <item android:drawable="@drawable/media_toggle_list_normal" /> -</selector>
\ No newline at end of file diff --git a/subsonic-android/res/drawable/media_toggle_list_normal.png b/subsonic-android/res/drawable/media_toggle_list_normal.png Binary files differdeleted file mode 100644 index cc269b65..00000000 --- a/subsonic-android/res/drawable/media_toggle_list_normal.png +++ /dev/null diff --git a/subsonic-android/res/drawable/media_toggle_list_pressed.png b/subsonic-android/res/drawable/media_toggle_list_pressed.png Binary files differdeleted file mode 100644 index 97b9a413..00000000 --- a/subsonic-android/res/drawable/media_toggle_list_pressed.png +++ /dev/null diff --git a/subsonic-android/res/drawable/menubar_button.xml b/subsonic-android/res/drawable/menubar_button.xml index 7a717780..1dc79176 100644 --- a/subsonic-android/res/drawable/menubar_button.xml +++ b/subsonic-android/res/drawable/menubar_button.xml @@ -2,12 +2,12 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" - android:drawable="@color/background_holo_light"/> + android:drawable="@drawable/menubar_button_pressed"/> <item android:state_enabled="true" android:drawable="@drawable/menubar_button_normal"/> - <item android:drawable="@drawable/menubar_button_disabled"/> + <item android:drawable="@drawable/menubar_button_selected"/> </selector> diff --git a/subsonic-android/res/drawable/menubar_button_disabled.9.png b/subsonic-android/res/drawable/menubar_button_disabled.9.png Binary files differdeleted file mode 100644 index 94a48f7d..00000000 --- a/subsonic-android/res/drawable/menubar_button_disabled.9.png +++ /dev/null diff --git a/subsonic-android/res/drawable/menubar_button_normal.9.png b/subsonic-android/res/drawable/menubar_button_normal.9.png Binary files differdeleted file mode 100644 index 9ce38a61..00000000 --- a/subsonic-android/res/drawable/menubar_button_normal.9.png +++ /dev/null diff --git a/subsonic-android/res/drawable/menubar_button_normal.xml b/subsonic-android/res/drawable/menubar_button_normal.xml new file mode 100644 index 00000000..76589c0c --- /dev/null +++ b/subsonic-android/res/drawable/menubar_button_normal.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="@android:color/transparent" /> +</shape> diff --git a/subsonic-android/res/drawable/menubar_button_pressed.9.png b/subsonic-android/res/drawable/menubar_button_pressed.9.png Binary files differdeleted file mode 100644 index 4dff0907..00000000 --- a/subsonic-android/res/drawable/menubar_button_pressed.9.png +++ /dev/null diff --git a/subsonic-android/res/drawable/menubar_button_pressed.xml b/subsonic-android/res/drawable/menubar_button_pressed.xml new file mode 100644 index 00000000..b7b42ee5 --- /dev/null +++ b/subsonic-android/res/drawable/menubar_button_pressed.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid android:color="@color/dividerColor" />
+</shape>
diff --git a/subsonic-android/res/layout-land/download.xml b/subsonic-android/res/layout-land/download.xml index b0303e52..1c752542 100644 --- a/subsonic-android/res/layout-land/download.xml +++ b/subsonic-android/res/layout-land/download.xml @@ -107,7 +107,7 @@ <ImageButton
android:id="@+id/download_shuffle"
- android:src="@drawable/media_shuffle"
+ android:src="@drawable/action_shuffle"
android:background="@android:color/transparent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -129,7 +129,7 @@ android:src="@android:drawable/star_big_off"/>
<ImageButton
android:id="@+id/download_toggle_list"
- android:src="@drawable/media_toggle_list"
+ android:src="@drawable/action_toggle_list"
android:background="@android:color/transparent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/subsonic-android/res/layout-port/download.xml b/subsonic-android/res/layout-port/download.xml index 3aabfb4f..4b077bfd 100644 --- a/subsonic-android/res/layout-port/download.xml +++ b/subsonic-android/res/layout-port/download.xml @@ -132,72 +132,7 @@ </github.daneren2005.dsub.util.MyViewFlipper>
- <LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="0dip"
- android:background="@android:color/transparent"
- android:paddingTop="0dip"
- android:paddingBottom="0dip">
- <ImageButton
- android:id="@+id/download_shuffle"
- android:src="@drawable/action_shuffle"
- android:background="@android:color/transparent"
- android:layout_width="0dip"
- android:layout_height="fill_parent"
- android:layout_gravity="center_vertical|left"
- android:layout_weight="1"
- android:paddingLeft="4dip"/>
- <ImageButton
- android:id="@+id/download_previous"
- android:src="@drawable/media_backward"
- android:background="@android:color/transparent"
- android:padding="0dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"/>
- <ImageButton
- android:id="@+id/download_pause"
- android:src="@drawable/media_pause"
- android:background="@android:color/transparent"
- android:padding="0dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"/>
- <ImageButton
- android:id="@+id/download_stop"
- android:src="@drawable/media_stop"
- android:background="@android:color/transparent"
- android:padding="0dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"/>
- <ImageButton
- android:id="@+id/download_start"
- android:src="@drawable/media_start"
- android:background="@android:color/transparent"
- android:padding="0dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"/>
- <ImageButton
- android:id="@+id/download_next"
- android:src="@drawable/media_forward"
- android:background="@android:color/transparent"
- android:padding="0dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"/>
- <ImageButton
- android:id="@+id/download_toggle_list"
- android:src="@drawable/action_toggle_list"
- android:background="@android:color/transparent"
- android:layout_width="0dip"
- android:layout_height="fill_parent"
- android:layout_gravity="center_vertical|right"
- android:layout_weight="1"
- android:paddingRight="4dip"/>
- </LinearLayout>
+ <include layout="@layout/download_media_buttons"/>
<include layout="@layout/download_slider"/>
diff --git a/subsonic-android/res/layout/download_media_buttons.xml b/subsonic-android/res/layout/download_media_buttons.xml new file mode 100644 index 00000000..f0ceabcf --- /dev/null +++ b/subsonic-android/res/layout/download_media_buttons.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8"?> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="@android:color/transparent"> + + <ImageButton + style="@style/PlaybackControl.Small" + android:id="@+id/download_shuffle" + android:src="@drawable/action_shuffle" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + /> + + <ImageButton + style="@style/PlaybackControl" + android:id="@+id/download_previous" + android:src="@drawable/media_backward" + android:layout_toLeftOf="@+id/download_pause" + android:layout_centerVertical="true" + /> + + <ImageButton + style="@style/PlaybackControl" + android:id="@+id/download_pause" + android:src="@drawable/media_pause" + android:layout_centerInParent="true" + /> + + <ImageButton + style="@style/PlaybackControl" + android:id="@+id/download_stop" + android:src="@drawable/media_stop" + android:layout_centerInParent="true" + /> + + <ImageButton + style="@style/PlaybackControl" + android:id="@+id/download_start" + android:src="@drawable/media_start" + android:layout_centerInParent="true" + /> + + <ImageButton + style="@style/PlaybackControl" + android:id="@+id/download_next" + android:src="@drawable/media_forward" + android:layout_toRightOf="@+id/download_start" + android:layout_centerVertical="true" + /> + + <ImageButton + style="@style/PlaybackControl.Small" + android:id="@+id/download_toggle_list" + android:src="@drawable/action_toggle_list" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + /> +</RelativeLayout>
\ No newline at end of file diff --git a/subsonic-android/res/layout/overflow_menu.xml b/subsonic-android/res/layout/overflow_menu.xml deleted file mode 100644 index 4881324f..00000000 --- a/subsonic-android/res/layout/overflow_menu.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<linearlayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/overflow_menu" - android:orientation="vertical" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/menubar_button_disabled"> - - <ImageButton - android:id="@+id/overflow_button_1" - android:src="@drawable/action_shuffle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:scaleType="center" - android:background="@drawable/actionbar_button" - /> - -</linearlayout>
\ No newline at end of file diff --git a/subsonic-android/res/values/styles.xml b/subsonic-android/res/values/styles.xml new file mode 100644 index 00000000..5ebabba3 --- /dev/null +++ b/subsonic-android/res/values/styles.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="PlaybackControl"> + <item name="android:background">@drawable/media_button</item> + <item name="android:scaleType">fitCenter</item> + <item name="android:padding">6dip</item> + <item name="android:layout_marginLeft">4dip</item> + <item name="android:layout_marginRight">4dip</item> + <item name="android:layout_width">54dip</item> + <item name="android:layout_height">54dip</item> + <item name="android:contentDescription">@null</item> + </style> + + <style name="PlaybackControl.Small" parent="@style/PlaybackControl"> + <item name="android:layout_width">46dip</item> + <item name="android:layout_height">46dip</item> + </style> +</resources>
\ No newline at end of file diff --git a/subsonic-android/res/values/themes.xml b/subsonic-android/res/values/themes.xml index 72ea183e..4555af36 100644 --- a/subsonic-android/res/values/themes.xml +++ b/subsonic-android/res/values/themes.xml @@ -30,12 +30,12 @@ <style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse"> <item name="background">@drawable/menubar_button_normal</item> - <item name="android:background">@drawable/menubar_button_normal</item> + <item name="android:background">@drawable/actionbar_background</item> </style> <style name="Widget.DSub.ActionBarStyle.Dark" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse"> <item name="background">@drawable/menubar_button_normal</item> - <item name="android:background">@drawable/menubar_button_normal</item> + <item name="android:background">@drawable/actionbar_background</item> </style> <style name="Widget.DSub.ActionBarStyle.Holo" parent="Widget.Sherlock.ActionBar.Solid"> diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java index 071ac73e..bd0a9e48 100644 --- a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java +++ b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java @@ -815,18 +815,18 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi switch (playerState) { case STARTED: pauseButton.setVisibility(View.VISIBLE); - stopButton.setVisibility(View.GONE); - startButton.setVisibility(View.GONE); + stopButton.setVisibility(View.INVISIBLE); + startButton.setVisibility(View.INVISIBLE); break; case DOWNLOADING: case PREPARING: - pauseButton.setVisibility(View.GONE); + pauseButton.setVisibility(View.INVISIBLE); stopButton.setVisibility(View.VISIBLE); - startButton.setVisibility(View.GONE); + startButton.setVisibility(View.INVISIBLE); break; default: - pauseButton.setVisibility(View.GONE); - stopButton.setVisibility(View.GONE); + pauseButton.setVisibility(View.INVISIBLE); + stopButton.setVisibility(View.INVISIBLE); startButton.setVisibility(View.VISIBLE); break; } |
