Added a 4x2 widget

5 files changed, 212 insertions, 0 deletions

diff --git a/subsonic-android/res/layout/appwidget4x1.xml b/subsonic-android/res/layout/appwidget4x1.xml
new file mode 100644
index 00000000..ed08d674
--- /dev/null
+++ b/subsonic-android/res/layout/appwidget4x1.xml
@@ -0,0 +1,91 @@
+<?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/appwidget_bg">
+		
+	<ImageView
+		android:id="@+id/appwidget_coverart"
+		android:layout_height="fill_parent"
+		android:layout_width="82dip"
+		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:paddingTop="4dip"
+			android:paddingLeft="5dip"
+			android:paddingRight="5dip"
+			android:paddingBottom="0dip"
+			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="14sp"
+			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: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>
diff --git a/subsonic-android/res/layout/appwidget4x2.xml b/subsonic-android/res/layout/appwidget4x2.xml
new file mode 100644
index 00000000..6407c298
--- /dev/null
+++ b/subsonic-android/res/layout/appwidget4x2.xml
@@ -0,0 +1,105 @@
+<?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="140dp"
+	android:orientation="horizontal"
+	android:background="@drawable/appwidget_bg">
+		
+	<ImageView
+		android:id="@+id/appwidget_coverart"
+		android:layout_height="fill_parent"
+		android:layout_width="135dip"
+		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:paddingTop="8dip"
+			android:paddingLeft="5dip"
+			android:paddingRight="5dip"
+			android:paddingBottom="4dip"
+			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/appwidget_text"
+			android:minHeight="12sp"
+			android:textSize="14sp"
+			android:singleLine="true"
+			android:paddingLeft="5dip"
+			android:paddingBottom="2dip"
+			android:fadingEdge="horizontal"
+			android:fadingEdgeLength="10dip"
+			android:ellipsize="none"/>
+
+		<TextView
+			android:id="@+id/album"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textColor="@color/cyan"
+			android:minHeight="12sp"
+			android:textSize="14sp"
+			android:singleLine="true"
+			android:paddingLeft="5dip"
+			android:paddingBottom="20dip"
+			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: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>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 21dd4b88..2d42a66d 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -302,6 +302,8 @@
     <string name="equalizer.enabled">Enabled</string>

     <string name="equalizer.preset">Select preset</string>

 

+	<string name="widget.4x1">DSub (4x1)</string>

+	<string name="widget.4x2">DSub (4x2)</string>

     <string name="widget.initial_text">Touch to select music</string>

     <string name="widget.sdcard_busy">SD card unavailable</string>

     <string name="widget.sdcard_missing">No SD card</string>

diff --git a/subsonic-android/res/xml/appwidget4x1.xml b/subsonic-android/res/xml/appwidget4x1.xml
new file mode 100644
index 00000000..65f47dba
--- /dev/null
+++ b/subsonic-android/res/xml/appwidget4x1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+	android:minWidth="272dip"
+	android:minHeight="56dip"
+	android:updatePeriodMillis="0"
+	android:resizeMode="horizontal|vertical"
+	android:initialLayout="@layout/appwidget4x1"/>
\ No newline at end of file
diff --git a/subsonic-android/res/xml/appwidget4x2.xml b/subsonic-android/res/xml/appwidget4x2.xml
new file mode 100644
index 00000000..f40204a7
--- /dev/null
+++ b/subsonic-android/res/xml/appwidget4x2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+	android:minWidth="272dip"
+	android:minHeight="110dip"
+	android:updatePeriodMillis="0"
+	android:resizeMode="horizontal|vertical"
+	android:initialLayout="@layout/appwidget4x2"/>
\ No newline at end of file