Update of the widget #38

25 files changed, 81 insertions, 182 deletions

diff --git a/subsonic-android/res/drawable-hdpi-v4/appwidget_bg.9.png b/subsonic-android/res/drawable-hdpi-v4/appwidget_bg.9.png
index d8f892c3..6bacc7fe 100644
--- a/subsonic-android/res/drawable-hdpi-v4/appwidget_bg.9.png
+++ b/subsonic-android/res/drawable-hdpi-v4/appwidget_bg.9.png
diff --git a/subsonic-android/res/drawable-hdpi-v4/appwidget_divider.9.png b/subsonic-android/res/drawable-hdpi-v4/appwidget_divider.9.png
deleted file mode 100644
index 3445e842..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/appwidget_divider.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_focus_c.9.png b/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_focus_c.9.png
deleted file mode 100644
index a949bd2c..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_focus_c.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_focus_l.9.png b/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_focus_l.9.png
deleted file mode 100644
index 4aaca6c5..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_focus_l.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_focus_r.9.png b/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_focus_r.9.png
deleted file mode 100644
index 1fc0f900..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_focus_r.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_press_c.9.png b/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_press_c.9.png
deleted file mode 100644
index ca6f16cd..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_press_c.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_press_l.9.png b/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_press_l.9.png
deleted file mode 100644
index 642eb3d3..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_press_l.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_press_r.9.png b/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_press_r.9.png
deleted file mode 100644
index 5e1f70a3..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/appwidget_inner_press_r.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable/appwidget_button_background.9.png b/subsonic-android/res/drawable/appwidget_button_background.9.png
deleted file mode 100644
index b7d3b18f..00000000
--- a/subsonic-android/res/drawable/appwidget_button_background.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable/appwidget_button_background_r.9.png b/subsonic-android/res/drawable/appwidget_button_background_r.9.png
deleted file mode 100644
index 90e2cc82..00000000
--- a/subsonic-android/res/drawable/appwidget_button_background_r.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable/appwidget_button_center.xml b/subsonic-android/res/drawable/appwidget_button_center.xml
deleted file mode 100644
index b6a3be4b..00000000
--- a/subsonic-android/res/drawable/appwidget_button_center.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_overlay" />
-
-    <item android:state_focused="true" android:state_enabled="true"
-        android:state_window_focused="true"
-        android:drawable="@drawable/appwidget_overlay" />
-        
-    <item android:drawable="@drawable/appwidget_button_background" />
-</selector>
diff --git a/subsonic-android/res/drawable/appwidget_button_left.xml b/subsonic-android/res/drawable/appwidget_button_left.xml
deleted file mode 100644
index 5bfa124c..00000000
--- a/subsonic-android/res/drawable/appwidget_button_left.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_overlay" />
-
-    <item android:state_focused="true" android:state_enabled="true"
-        android:state_window_focused="true"
-        android:drawable="@drawable/appwidget_overlay" />
-
-    <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/subsonic-android/res/drawable/appwidget_button_right.xml b/subsonic-android/res/drawable/appwidget_button_right.xml
deleted file mode 100644
index 3d1181be..00000000
--- a/subsonic-android/res/drawable/appwidget_button_right.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_overlay" />
-
-    <item android:state_focused="true" android:state_enabled="true"
-        android:state_window_focused="true"
-        android:drawable="@drawable/appwidget_overlay" />
-
-    <item android:drawable="@drawable/appwidget_button_background_r" />
-</selector>
diff --git a/subsonic-android/res/drawable/appwidget_divider.9.png b/subsonic-android/res/drawable/appwidget_divider.9.png
deleted file mode 100644
index 3445e842..00000000
--- a/subsonic-android/res/drawable/appwidget_divider.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable/appwidget_divider_horizontal.9.png b/subsonic-android/res/drawable/appwidget_divider_horizontal.9.png
deleted file mode 100644
index e2e80af9..00000000
--- a/subsonic-android/res/drawable/appwidget_divider_horizontal.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable/appwidget_divider_vertical.png b/subsonic-android/res/drawable/appwidget_divider_vertical.png
deleted file mode 100644
index efe466a6..00000000
--- a/subsonic-android/res/drawable/appwidget_divider_vertical.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable/appwidget_inner_focus_c.9.png b/subsonic-android/res/drawable/appwidget_inner_focus_c.9.png
deleted file mode 100644
index 1450e65b..00000000
--- a/subsonic-android/res/drawable/appwidget_inner_focus_c.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable/appwidget_inner_focus_l.9.png b/subsonic-android/res/drawable/appwidget_inner_focus_l.9.png
deleted file mode 100644
index 6e8f100e..00000000
--- a/subsonic-android/res/drawable/appwidget_inner_focus_l.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable/appwidget_inner_focus_r.9.png b/subsonic-android/res/drawable/appwidget_inner_focus_r.9.png
deleted file mode 100644
index bc8757b8..00000000
--- a/subsonic-android/res/drawable/appwidget_inner_focus_r.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable/appwidget_inner_press_c.9.png b/subsonic-android/res/drawable/appwidget_inner_press_c.9.png
deleted file mode 100644
index bd542bac..00000000
--- a/subsonic-android/res/drawable/appwidget_inner_press_c.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable/appwidget_inner_press_l.9.png b/subsonic-android/res/drawable/appwidget_inner_press_l.9.png
deleted file mode 100644
index 575ecf4e..00000000
--- a/subsonic-android/res/drawable/appwidget_inner_press_l.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable/appwidget_inner_press_r.9.png b/subsonic-android/res/drawable/appwidget_inner_press_r.9.png
deleted file mode 100644
index 79eaea35..00000000
--- a/subsonic-android/res/drawable/appwidget_inner_press_r.9.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable/appwidget_overlay.png b/subsonic-android/res/drawable/appwidget_overlay.png
deleted file mode 100644
index dfbbd3ec..00000000
--- a/subsonic-android/res/drawable/appwidget_overlay.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable/widget_background.xml b/subsonic-android/res/drawable/widget_background.xml
deleted file mode 100644
index fe641900..00000000
--- a/subsonic-android/res/drawable/widget_background.xml
+++ /dev/null
@@ -1,12 +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/appwidget_overlay" />
-
-    <item android:state_focused="true" android:state_enabled="true"
-        android:state_window_focused="true"
-        android:drawable="@drawable/appwidget_overlay" />
-
-    <item android:drawable="@drawable/appwidget_bg" />
-</selector>
-
diff --git a/subsonic-android/res/layout/appwidget.xml b/subsonic-android/res/layout/appwidget.xml
index 6b3c892e..fa47a7b9 100644
--- a/subsonic-android/res/layout/appwidget.xml
+++ b/subsonic-android/res/layout/appwidget.xml
@@ -1,97 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:orientation="horizontal"
-              android:background="@drawable/widget_background">
-<ImageView
-	android:id="@+id/appwidget_coverart"
-	android:layout_height="fill_parent"
-	android:layout_width="81dip"
-	android:scaleType="fitXY"
-	android:src="@drawable/appwidget_art_default"
-	android:clickable="true"
-	android:focusable="true"
-	android:background="@drawable/appwidget_button_left"/>
-<ImageView
-	android:layout_width="2dip"
-	android:layout_height="fill_parent"
-	android:background="@drawable/appwidget_divider_vertical"/>
-<LinearLayout
-	android:id="@+id/appwidget_top"
-	android:layout_height="fill_parent"
 	android:layout_width="fill_parent"
-	android:orientation="vertical"
-	android:clickable="true"
-    android:focusable="true"
-	android:background="@drawable/appwidget_button_left">
-    <TextView
-	    android:id="@+id/title"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:minHeight="16sp"
-	    android:textColor="@color/appwidget_text"
-	    android:textStyle="bold"
-	    android:textSize="16sp"
-	    android:singleLine="true"
-	    android:paddingLeft="5dip"
-	    android:paddingRight="5dip"
-	    android:fadingEdge="horizontal"
-	    android:fadingEdgeLength="20dip"
-	    android:ellipsize="none"/>
-	<TextView
-        android:id="@+id/artist"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textColor="@color/cyan"
-        android:minHeight="12sp"
-        android:textSize="12sp"
-        android:singleLine="true"
-        android:paddingLeft="5dip"
-        android:paddingBottom="2dip"
-        android:fadingEdge="horizontal"
-        android:fadingEdgeLength="10dip"
-        android:ellipsize="none"/>
-    <ImageView
-		android:layout_width="fill_parent"
-		android:layout_height="2dip"
-		android:background="@drawable/appwidget_divider_horizontal"/>
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:orientation="horizontal"
+	android:background="@drawable/appwidget_bg">
+		
+	<ImageView
+		android:id="@+id/appwidget_coverart"
 		android:layout_height="fill_parent"
-		android:orientation="horizontal">
-		<ImageButton
-			android:id="@+id/control_previous"
-			android:layout_width="0dip"
-			android:layout_weight="1"
+		android:layout_width="81dip"
+		android:scaleType="fitXY"
+		android:src="@drawable/appwidget_art_default"
+		android:clickable="true"
+		android:focusable="true"
+		android:background="@drawable/media_button"/>
+	<LinearLayout
+		android:id="@+id/appwidget_top"
+		android:layout_height="fill_parent"
+		android:layout_width="fill_parent"
+		android:orientation="vertical"
+		android:clickable="true"
+		android:focusable="true"
+		android:background="@drawable/media_button">
+			
+		<TextView
+			android:id="@+id/title"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:minHeight="16sp"
+			android:textColor="@color/appwidget_text"
+			android:textStyle="bold"
+			android:textSize="16sp"
+			android:singleLine="true"
+			android:paddingLeft="5dip"
+			android:paddingRight="5dip"
+			android:fadingEdge="horizontal"
+			android:fadingEdgeLength="20dip"
+			android:ellipsize="none"/>
+		<TextView
+			android:id="@+id/artist"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textColor="@color/cyan"
+			android:minHeight="12sp"
+			android:textSize="12sp"
+			android:singleLine="true"
+			android:paddingLeft="5dip"
+			android:paddingBottom="2dip"
+			android:fadingEdge="horizontal"
+			android:fadingEdgeLength="10dip"
+			android:ellipsize="none"/>
+			
+		<LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="1.0dip"
+            android:background="#33ffffff"/>
+			
+		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			android:layout_width="fill_parent"
 			android:layout_height="fill_parent"
-			android:src="@drawable/ic_appwidget_music_previous"
-			android:background="@drawable/appwidget_button_center"
-			android:scaleType="center"/>
-		<ImageView
-	        android:layout_width="2dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_divider_vertical"/>
-		<ImageButton
-            android:id="@+id/control_play"
-            android:layout_width="0dip"
-            android:layout_weight="1"
-            android:layout_height="fill_parent"
-            android:src="@drawable/ic_appwidget_music_play"
-            android:background="@drawable/appwidget_button_center"
-            android:scaleType="center"/>
-   	    <ImageView
-	        android:layout_width="2dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_divider_vertical"/>
-    	<ImageButton
-            android:id="@+id/control_next"
-            android:layout_width="0dip"
-            android:layout_weight="1"
-            android:layout_height="fill_parent"
-            android:src="@drawable/ic_appwidget_music_next"
-            android:background="@drawable/appwidget_button_right"
-            android:scaleType="center"/>
+			android:orientation="horizontal">
+			<ImageButton
+				android:id="@+id/control_previous"
+				android:layout_width="0dip"
+				android:layout_weight="1"
+				android:layout_height="fill_parent"
+				android:src="@drawable/ic_appwidget_music_previous"
+				android:background="@drawable/media_button"
+				android:scaleType="center"/>
+			<ImageButton
+				android:id="@+id/control_play"
+				android:layout_width="0dip"
+				android:layout_weight="1"
+				android:layout_height="fill_parent"
+				android:src="@drawable/ic_appwidget_music_play"
+				android:background="@drawable/media_button"
+				android:scaleType="center"/>
+			<ImageButton
+				android:id="@+id/control_next"
+				android:layout_width="0dip"
+				android:layout_weight="1"
+				android:layout_height="fill_parent"
+				android:src="@drawable/ic_appwidget_music_next"
+				android:background="@drawable/media_button"
+				android:scaleType="center"/>
 		</LinearLayout>
 	</LinearLayout>
 </LinearLayout>