Initial Commit

author: Scott Jackson <daneren2005@gmail.com> 2012-07-02 21:24:02 -0700
committer: Scott Jackson <daneren2005@gmail.com> 2012-07-02 21:24:02 -0700
commit: a1a18f77a50804e0127dfa4b0f5240c49c541184 (patch)
tree: 19a38880afe505beddb5590379a8134d7730a277 /subsonic-android/res/layout
parent: b61d787706979e7e20f4c3c4f93c1f129d92273f (diff)
download: dsub-a1a18f77a50804e0127dfa4b0f5240c49c541184.tar.gz
dsub-a1a18f77a50804e0127dfa4b0f5240c49c541184.tar.bz2
dsub-a1a18f77a50804e0127dfa4b0f5240c49c541184.zip
30 files changed, 1349 insertions, 0 deletions
diff --git a/subsonic-android/res/layout/action_bar.xml b/subsonic-android/res/layout/action_bar.xml
new file mode 100644
index 00000000..7439c0d8
--- /dev/null
+++ b/subsonic-android/res/layout/action_bar.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/menubar_button_disabled">
+
+    <ImageView
+            android:id="@+id/actionbar_home_icon"
+            android:src="@drawable/main_header_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentBottom="true"
+            android:paddingLeft="4dip"
+            android:paddingRight="4dip"
+            android:paddingTop="2dip"
+            android:paddingBottom="2dip"
+            android:scaleType="centerInside"
+            />
+
+    <ImageButton
+            android:id="@+id/action_button_2"
+            android:src="@drawable/action_search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentBottom="true"
+            android:scaleType="center"
+            android:padding="5dp"
+            android:background="@drawable/actionbar_button"
+            />
+
+    <ImageButton
+            android:id="@+id/action_button_1"
+            android:src="@drawable/action_shuffle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentBottom="true"
+            android:layout_toLeftOf="@id/action_button_2"
+            android:scaleType="center"
+            android:padding="5dp"
+            android:background="@drawable/actionbar_button"
+            />
+
+    <TextView
+            android:id="@+id/actionbar_title_text"
+            android:text="Subsonic"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentBottom="true"
+            android:layout_toLeftOf="@id/action_button_1"
+            android:layout_toRightOf="@id/actionbar_home_icon"
+            android:gravity="center_vertical"
+            android:textColor="#FFFFFF"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            android:shadowColor="#000000"
+            android:shadowDx="1"
+            android:shadowDy="1"
+            android:shadowRadius="1"
+            android:lineSpacingMultiplier="0.85"
+            android:ellipsize="middle"
+            android:inputType="none"
+            />
+
+</RelativeLayout>
diff --git a/subsonic-android/res/layout/album_list_item.xml b/subsonic-android/res/layout/album_list_item.xml
new file mode 100644
index 00000000..15d999c3
--- /dev/null
+++ b/subsonic-android/res/layout/album_list_item.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="fill_parent"
+              android:layout_height="?android:attr/listPreferredItemHeight">>
+
+    <ImageView
+            android:id="@+id/album_coverart"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left|center_vertical"
+            android:paddingLeft="6dip"/>
+
+    <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_gravity="left|center_vertical"
+            android:paddingLeft="6dip"
+            android:paddingRight="3dip">
+
+        <TextView
+                android:id="@+id/album_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:singleLine="true"
+                android:ellipsize="marquee"/>
+
+        <TextView
+                android:id="@+id/album_artist"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:singleLine="true"/>
+
+    </LinearLayout>
+
+    <ImageView
+            android:src="@drawable/list_item_artist"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right|center_vertical"
+            android:paddingRight="6dip"/>
+
+</LinearLayout>
diff --git a/subsonic-android/res/layout/appwidget.xml b/subsonic-android/res/layout/appwidget.xml
new file mode 100644
index 00000000..233bc93f
--- /dev/null
+++ b/subsonic-android/res/layout/appwidget.xml
@@ -0,0 +1,97 @@
+<?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="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/appwidget_text"
+        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">
+		<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/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"/>
+		</LinearLayout>
+	</LinearLayout>
+</LinearLayout>
diff --git a/subsonic-android/res/layout/artist_list_item.xml b/subsonic-android/res/layout/artist_list_item.xml
new file mode 100644
index 00000000..8aaa42d0
--- /dev/null
+++ b/subsonic-android/res/layout/artist_list_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@android:id/text1"
+          android:drawableRight="@drawable/list_item_artist"
+          android:drawablePadding="6dip"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:textAppearance="?android:attr/textAppearanceMedium"
+          android:gravity="center_vertical"
+          android:paddingLeft="6dip"
+          android:paddingRight="6dip"
+          android:minHeight="50dip"/>
+\ No newline at end of file
diff --git a/subsonic-android/res/layout/button_bar.xml b/subsonic-android/res/layout/button_bar.xml
new file mode 100644
index 00000000..59b18437
--- /dev/null
+++ b/subsonic-android/res/layout/button_bar.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/button_bar"
+              android:orientation="vertical"
+              android:layout_gravity="bottom"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+
+    <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dividerColor"/>
+
+    <LinearLayout android:orientation="horizontal"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:gravity="center_horizontal">
+
+        <ImageButton android:id="@+id/button_bar_home"
+                     android:src="@drawable/menu_home"
+                     android:contentDescription="@string/button_bar.home"
+                     android:background="@drawable/menubar_button"
+                     android:layout_weight="1"
+                     android:layout_width="0dp"
+                     android:layout_height="wrap_content"/>
+
+        <ImageButton android:id="@+id/button_bar_music"
+                     android:src="@drawable/menu_browse"
+                     android:contentDescription="@string/button_bar.browse"
+                     android:background="@drawable/menubar_button"
+                     android:layout_weight="1"
+                     android:layout_width="0dp"
+                     android:layout_height="wrap_content"/>
+
+        <ImageButton android:id="@+id/button_bar_search"
+                     android:src="@drawable/menu_search"
+                     android:contentDescription="@string/button_bar.search"
+                     android:background="@drawable/menubar_button"
+                     android:layout_weight="1"
+                     android:layout_width="0dp"
+                     android:layout_height="wrap_content"/>
+
+        <ImageButton android:id="@+id/button_bar_playlists"
+                     android:src="@drawable/menu_playlists"
+                     android:contentDescription="@string/button_bar.playlists"
+                     android:background="@drawable/menubar_button"
+                     android:layout_weight="1"
+                     android:layout_width="0dp"
+                     android:layout_height="wrap_content"/>
+
+        <ImageButton android:id="@+id/button_bar_now_playing"
+                     android:src="@drawable/menu_now_playing"
+                     android:contentDescription="@string/button_bar.now_playing"
+                     android:background="@drawable/menubar_button"
+                     android:layout_weight="1"
+                     android:layout_width="0dp"
+                     android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+</LinearLayout>
+
diff --git a/subsonic-android/res/layout/download_button_bar_flipper.xml b/subsonic-android/res/layout/download_button_bar_flipper.xml
new file mode 100644
index 00000000..216f5802
--- /dev/null
+++ b/subsonic-android/res/layout/download_button_bar_flipper.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<net.sourceforge.subsonic.androidapp.util.MyViewFlipper
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/download_button_bar_flipper"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/black">
+
+    <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/black"
+            android:paddingLeft="8dip"
+            android:paddingRight="8dip">
+
+        <TextView
+                android:id="@+id/download_position"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginRight="6dip"
+                android:text="0:00"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/mediaControlForeground"/>
+        <TextView
+                android:id="@+id/download_duration"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="6dip"
+                android:text="-:--"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/mediaControlForeground"/>
+        <TextView
+                android:id="@+id/download_artist"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/download_position"
+                android:layout_toLeftOf="@+id/download_duration"
+                android:layout_centerHorizontal="true"
+                android:layout_alignParentTop="true"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:gravity="center_horizontal"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="#c0c0c0"/>
+        <TextView
+                android:id="@+id/download_album"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_below="@+id/download_artist"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="#c0c0c0"/>
+    </RelativeLayout>
+
+    <include layout="@layout/button_bar"/>
+
+</net.sourceforge.subsonic.androidapp.util.MyViewFlipper>
+
+
+
+
diff --git a/subsonic-android/res/layout/download_playlist.xml b/subsonic-android/res/layout/download_playlist.xml
new file mode 100644
index 00000000..42daee00
--- /dev/null
+++ b/subsonic-android/res/layout/download_playlist.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_weight="1">
+
+    <TextView
+            android:id="@+id/download_empty"
+            android:text="@string/download.empty"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dip"/>
+
+    <ListView
+            android:id="@+id/download_list"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:cacheColorHint="#00000000"/>
+
+</LinearLayout>
+\ No newline at end of file
diff --git a/subsonic-android/res/layout/download_slider.xml b/subsonic-android/res/layout/download_slider.xml
new file mode 100644
index 00000000..a4c62ca2
--- /dev/null
+++ b/subsonic-android/res/layout/download_slider.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<net.sourceforge.subsonic.androidapp.util.HorizontalSlider
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:id="@+id/download_progress_bar"
+        android:indeterminate="false"
+        android:background="@color/mediaControlBackground"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="7dip"
+        android:paddingRight="7dip"
+        android:paddingTop="3dip"
+        android:paddingBottom="7dip"/>
diff --git a/subsonic-android/res/layout/equalizer.xml b/subsonic-android/res/layout/equalizer.xml
new file mode 100644
index 00000000..ee1a9560
--- /dev/null
+++ b/subsonic-android/res/layout/equalizer.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@drawable/album_art_background"
+        android:padding="16dip">
+
+    <CheckBox
+            android:id="@+id/equalizer_enabled"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/equalizer.enabled"
+            android:textColor="#c0c0c0"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+    <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+
+        <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
+            <LinearLayout
+                    android:id="@+id/equalizer_layout"
+                    android:orientation="vertical"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"/>
+
+            <Button
+                    android:id="@+id/equalizer_preset"
+                    android:text="@string/equalizer.preset"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="20dip"
+                    android:paddingLeft="40dip"
+                    android:paddingRight="40dip"/>
+
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
+
diff --git a/subsonic-android/res/layout/equalizer_bar.xml b/subsonic-android/res/layout/equalizer_bar.xml
new file mode 100644
index 00000000..c34d1108
--- /dev/null
+++ b/subsonic-android/res/layout/equalizer_bar.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+
+    <TextView
+            android:id="@+id/equalizer.frequency"
+            android:textSize="12sp"
+            android:textColor="#c0c0c0"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_alignParentLeft="true"
+            />
+
+    <TextView
+            android:id="@+id/equalizer.level"
+            android:text="0 dB"
+            android:textSize="12sp"
+            android:textColor="#c0c0c0"
+            android:gravity="right"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_alignParentRight="true"
+            android:layout_toRightOf="@+id/equalizer.frequency"
+            />
+
+    <SeekBar
+            android:id="@+id/equalizer.bar"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/equalizer.frequency"
+            />
+
+
+</RelativeLayout>
+
diff --git a/subsonic-android/res/layout/help.xml b/subsonic-android/res/layout/help.xml
new file mode 100644
index 00000000..f22dee37
--- /dev/null
+++ b/subsonic-android/res/layout/help.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+
+    <LinearLayout android:id="@+id/help_buttons"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="0"
+                  android:layout_alignParentBottom="true"
+                  android:padding="4dip"
+                  android:gravity="center_horizontal"
+                  android:background="#ffcccccc">
+
+        <Button android:id="@+id/help_back"
+                android:text="@string/help.back"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_marginRight="5dip"
+                android:paddingLeft="25dip"
+                android:paddingRight="25dip"/>
+
+        <Button android:id="@+id/help_close"
+                android:text="@string/help.close"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_marginLeft="5dip"
+                android:paddingLeft="25dip"
+                android:paddingRight="25dip"/>
+    </LinearLayout>
+
+
+    <WebView
+            android:id="@+id/help_contents"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/help_buttons"
+            android:layout_weight="1"
+            android:fadingEdge="vertical"
+            android:fadingEdgeLength="12dip"/>
+
+  </RelativeLayout>
diff --git a/subsonic-android/res/layout/jukebox_volume.xml b/subsonic-android/res/layout/jukebox_volume.xml
new file mode 100644
index 00000000..e124734b
--- /dev/null
+++ b/subsonic-android/res/layout/jukebox_volume.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/toast_layout_root"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:background="@drawable/toast_frame">
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/download.jukebox_volume"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="#ffffffff"
+            android:shadowColor="#bb000000"
+            android:shadowRadius="2.75"
+            android:paddingLeft="32dp"
+            android:paddingRight="32dp"
+            android:paddingBottom="12dp"
+            />
+
+    <ProgressBar android:id="@+id/jukebox_volume_progress_bar"
+                 style="@android:style/Widget.ProgressBar.Horizontal"
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:paddingBottom="3dp"
+            />
+
+</LinearLayout>
+\ No newline at end of file
diff --git a/subsonic-android/res/layout/lyrics.xml b/subsonic-android/res/layout/lyrics.xml
new file mode 100644
index 00000000..4307d8dd
--- /dev/null
+++ b/subsonic-android/res/layout/lyrics.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+
+    <include layout="@layout/tab_progress"/>
+
+    <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1.0">
+
+        <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+            <TextView
+                    android:id="@+id/lyrics_artist"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:gravity="center_horizontal"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="10dip"
+                    android:paddingRight="10dip"
+                    android:paddingTop="10dip"
+                    android:paddingBottom="4dip"
+                    />
+
+            <TextView
+                    android:id="@+id/lyrics_title"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:gravity="center_horizontal"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="10dip"
+                    android:paddingRight="10dip"
+                    />
+
+            <TextView
+                    android:id="@+id/lyrics_text"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:gravity="center_horizontal"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="10dip"
+                    android:paddingRight="10dip"
+                    />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <include layout="@layout/button_bar"/>
+
+</LinearLayout>
+
diff --git a/subsonic-android/res/layout/main.xml b/subsonic-android/res/layout/main.xml
new file mode 100644
index 00000000..e151f319
--- /dev/null
+++ b/subsonic-android/res/layout/main.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+
+    <include 
+            layout="@layout/action_bar"
+            android:layout_width="fill_parent"
+            android:layout_height="45dp"
+            />
+
+    <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dividerColor"/>
+
+    <ListView
+            android:id="@+id/main_list"
+            android:layout_width="fill_parent"
+            android:layout_height="0px"
+            android:layout_weight="1"/>
+
+    <View android:id="@+id/main_dummy"
+          android:layout_width="0px"
+          android:layout_height="0px"/>
+    
+    <include 
+            layout="@layout/button_bar"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"/>
+
+</LinearLayout>
+
diff --git a/subsonic-android/res/layout/main_buttons.xml b/subsonic-android/res/layout/main_buttons.xml
new file mode 100644
index 00000000..969ad99e
--- /dev/null
+++ b/subsonic-android/res/layout/main_buttons.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+
+    <LinearLayout
+            android:id="@+id/main_select_server"
+            android:orientation="horizontal"
+            android:paddingTop="2dip"
+            android:paddingBottom="2dip"
+            android:paddingLeft="6dp"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight">
+
+        <ImageView
+                android:src="@drawable/main_select_server"
+                android:layout_gravity="center_vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+        <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+            <TextView android:id="@+id/main.select_server_1"
+                      android:text="@string/main.select_server"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_marginLeft="10dip"
+                      android:layout_marginTop="6dip"
+                      android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+            <TextView android:id="@+id/main.select_server_2"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_marginLeft="10dip"
+                      android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+        </LinearLayout>
+    </LinearLayout>
+
+    <TextView
+            android:id="@+id/main_albums"
+            android:text="@string/main.albums_title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="#EFEFEF"
+            android:textStyle="bold"
+            android:background="#A5A5A5"
+            android:gravity="center_vertical"
+            android:paddingLeft="4dp"/>
+
+    <TextView
+            android:id="@+id/main_albums_newest"
+            android:text="@string/main.albums_newest"
+            android:drawableRight="@drawable/list_item_artist"
+            android:drawablePadding="6dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:minHeight="50dip"/>
+    <TextView
+            android:id="@+id/main_albums_recent"
+            android:text="@string/main.albums_recent"
+            android:drawableRight="@drawable/list_item_artist"
+            android:drawablePadding="6dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:minHeight="50dip"/>
+    <TextView
+            android:id="@+id/main_albums_frequent"
+            android:text="@string/main.albums_frequent"
+            android:drawableRight="@drawable/list_item_artist"
+            android:drawablePadding="6dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:minHeight="50dip"/>
+    <TextView
+            android:id="@+id/main_albums_highest"
+            android:text="@string/main.albums_highest"
+            android:drawableRight="@drawable/list_item_artist"
+            android:drawablePadding="6dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:minHeight="50dip"/>
+    <TextView
+            android:id="@+id/main_albums_random"
+            android:text="@string/main.albums_random"
+            android:drawableRight="@drawable/list_item_artist"
+            android:drawablePadding="6dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:minHeight="50dip"/>
+
+</LinearLayout>
+
diff --git a/subsonic-android/res/layout/notification.xml b/subsonic-android/res/layout/notification.xml
new file mode 100644
index 00000000..c2edfb9b
--- /dev/null
+++ b/subsonic-android/res/layout/notification.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:padding="3dp">
+	<ImageView 
+		android:id="@+id/notification_image"
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:layout_marginRight="10dp"
+		android:layout_marginLeft="5dp"/>
+	<TextView 
+		android:id="@+id/notification_title"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:textSize="16sp"
+		android:textStyle="bold"
+		android:textColor="@color/notificationTitle"
+		android:singleLine="true"
+		android:layout_toRightOf="@id/notification_image"
+		android:layout_alignParentTop="true"/>
+	<TextView 
+		android:id="@+id/notification_artist"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:textSize="15sp"
+		android:textColor="@color/notificationArtist"
+		android:singleLine="true"
+		android:layout_toRightOf="@id/notification_image"
+		android:layout_below="@id/notification_title"/>
+</RelativeLayout>
diff --git a/subsonic-android/res/layout/play_video.xml b/subsonic-android/res/layout/play_video.xml
new file mode 100644
index 00000000..6a9f3f74
--- /dev/null
+++ b/subsonic-android/res/layout/play_video.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+
+    <WebView
+            android:id="@+id/play_video_contents"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"/>
+
+</FrameLayout>
diff --git a/subsonic-android/res/layout/playlist_list_item.xml b/subsonic-android/res/layout/playlist_list_item.xml
new file mode 100644
index 00000000..20706dc9
--- /dev/null
+++ b/subsonic-android/res/layout/playlist_list_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@android:id/text1"
+          android:drawableRight="@drawable/list_item_playlist"
+          android:drawablePadding="6dip"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:textAppearance="?android:attr/textAppearanceMedium"
+          android:gravity="center_vertical"
+          android:paddingLeft="6dip"
+          android:paddingRight="6dip"
+          android:minHeight="50dip"/>
+\ No newline at end of file
diff --git a/subsonic-android/res/layout/progress.xml b/subsonic-android/res/layout/progress.xml
new file mode 100644
index 00000000..4a693cb3
--- /dev/null
+++ b/subsonic-android/res/layout/progress.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_weight="1"
+              android:layout_width="0dip"
+              android:layout_height="fill_parent"
+              android:padding="10dp">
+
+    <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_marginRight="10dp"/>
+
+    <TextView
+            android:id="@+id/progress_message"
+            android:text="@string/progress.wait"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"/>
+
+</LinearLayout>
+\ No newline at end of file
diff --git a/subsonic-android/res/layout/save_playlist.xml b/subsonic-android/res/layout/save_playlist.xml
new file mode 100644
index 00000000..a0272f37
--- /dev/null
+++ b/subsonic-android/res/layout/save_playlist.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/save_playlist_root"
+              android:padding="10dip"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+
+    <EditText
+            android:id="@+id/save_playlist_name"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:singleLine="true"/>
+
+</LinearLayout>
+
diff --git a/subsonic-android/res/layout/search.xml b/subsonic-android/res/layout/search.xml
new file mode 100644
index 00000000..f65bcb36
--- /dev/null
+++ b/subsonic-android/res/layout/search.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+
+    <include layout="@layout/action_bar"/>
+
+    <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dividerColor"/>
+
+    <include layout="@layout/tab_progress"/>
+
+    <ListView
+            android:id="@+id/search_list"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1.0"
+            android:fastScrollEnabled="true"
+            />
+
+    <include layout="@layout/button_bar"/>
+
+</LinearLayout>
+\ No newline at end of file
diff --git a/subsonic-android/res/layout/search_buttons.xml b/subsonic-android/res/layout/search_buttons.xml
new file mode 100644
index 00000000..10b72166
--- /dev/null
+++ b/subsonic-android/res/layout/search_buttons.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+
+    <TextView
+            android:id="@+id/search_search"
+            android:text="@string/search.search"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:drawablePadding="0dp"
+            android:drawableLeft="@drawable/search"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center"
+            android:padding="12dp"/>
+
+    <TextView
+            android:id="@+id/search_artists"
+            android:text="@string/search.artists"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="#EFEFEF"
+            android:textStyle="bold"
+            android:background="#A5A5A5"
+            android:gravity="center_vertical"
+            android:paddingLeft="4dp"/>
+
+    <TextView
+            android:id="@+id/search_albums"
+            android:text="@string/search.albums"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="#EFEFEF"
+            android:textStyle="bold"
+            android:background="#A5A5A5"
+            android:gravity="center_vertical"
+            android:paddingLeft="4dp"/>
+
+    <TextView
+            android:id="@+id/search_songs"
+            android:text="@string/search.songs"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="#EFEFEF"
+            android:textStyle="bold"
+            android:background="#A5A5A5"
+            android:gravity="center_vertical"
+            android:paddingLeft="4dp"/>
+
+    <TextView
+            android:id="@+id/search_more_artists"
+            android:text="@string/search.more"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:gravity="center"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"/>
+
+    <TextView
+            android:id="@+id/search_more_albums"
+            android:text="@string/search.more"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:gravity="center"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"/>
+
+    <TextView
+            android:id="@+id/search_more_songs"
+            android:text="@string/search.more"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:gravity="center"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"/>
+
+</LinearLayout>
+
diff --git a/subsonic-android/res/layout/select_album.xml b/subsonic-android/res/layout/select_album.xml
new file mode 100644
index 00000000..54c4b74a
--- /dev/null
+++ b/subsonic-android/res/layout/select_album.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+
+    <include layout="@layout/action_bar"/>
+
+    <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dividerColor"/>
+
+    <include layout="@layout/tab_progress"/>
+
+    <TextView
+            android:id="@+id/select_album_empty"
+            android:text="@string/select_album.empty"
+            android:visibility="gone"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dip"/>
+
+    <ListView android:id="@+id/select_album_entries"
+              android:textFilterEnabled="true"
+              android:layout_width="fill_parent"
+              android:layout_height="0dip"
+              android:layout_weight="1.0"
+              android:fastScrollEnabled="true"
+            />
+
+    <LinearLayout android:orientation="horizontal"
+                  android:layout_marginTop="6dp"
+                  android:layout_marginBottom="3dp"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content">
+
+        <Button android:id="@+id/select_album_select"
+                android:text="@string/select_album.select"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:visibility="gone"
+                android:layout_marginLeft="6dp"
+                android:layout_marginRight="3dp"
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"/>
+
+        <Button android:id="@+id/select_album_play_now"
+                android:text="@string/common.play_now"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:visibility="gone"
+                android:layout_marginLeft="3dp"
+                android:layout_marginRight="3dp"
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"/>
+
+        <Button android:id="@+id/select_album_play_last"
+                android:text="@string/common.play_last"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:visibility="gone"
+                android:layout_marginLeft="3dp"
+                android:layout_marginRight="6dp"
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"/>
+
+    </LinearLayout>
+
+    <include layout="@layout/button_bar"/>
+
+</LinearLayout>
+
diff --git a/subsonic-android/res/layout/select_album_footer.xml b/subsonic-android/res/layout/select_album_footer.xml
new file mode 100644
index 00000000..06727db4
--- /dev/null
+++ b/subsonic-android/res/layout/select_album_footer.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:background="@android:color/transparent"
+              android:paddingTop="6dp"
+              android:paddingBottom="0dp"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+
+        <Button android:id="@+id/select_album_pin"
+                android:text="@string/common.pin"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_marginLeft="6dp"
+                android:layout_marginRight="3dp"
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"/>
+
+        <Button android:id="@+id/select_album_unpin"
+                android:text="@string/common.unpin"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_marginLeft="3dp"
+                android:layout_marginRight="3dp"
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"/>
+
+        <Button android:id="@+id/select_album_delete"
+                android:text="@string/common.delete"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_marginLeft="3dp"
+                android:layout_marginRight="6dp"
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"/>
+
+        <Button android:id="@+id/select_album_more"
+                android:text="@string/select_album.more"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:visibility="gone"
+                android:layout_marginLeft="6dp"
+                android:layout_marginRight="6dp"
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"/>
+
+</LinearLayout>
+
diff --git a/subsonic-android/res/layout/select_album_header.xml b/subsonic-android/res/layout/select_album_header.xml
new file mode 100644
index 00000000..7f5fb767
--- /dev/null
+++ b/subsonic-android/res/layout/select_album_header.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:background="@drawable/menubar_button_normal"
+            android:paddingTop="6dip"
+            android:paddingBottom="4dip"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
+            android:layout_weight="1"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip">
+
+        <ImageView
+                android:id="@+id/select_album_cover_art"
+                android:layout_gravity="center_vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+        <LinearLayout
+                android:orientation="vertical"
+                android:layout_weight="1"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content">
+
+            <TextView
+                    android:id="@+id/select_album_text1"
+                    android:singleLine="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="10dip"
+                    android:textColor="@android:color/primary_text_light"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+            <TextView
+                    android:id="@+id/select_album_text2"
+                    android:singleLine="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="10dip"
+                    android:textColor="@android:color/secondary_text_light"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+        </LinearLayout>
+
+        <ImageButton
+                android:id="@+id/select_album_play_all"
+                android:src="@drawable/select_album_play_all"
+                android:background="@android:color/transparent"
+                android:layout_gravity="center_vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+    <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dividerColor"/>
+
+</LinearLayout>
diff --git a/subsonic-android/res/layout/select_artist.xml b/subsonic-android/res/layout/select_artist.xml
new file mode 100644
index 00000000..7cf6fc77
--- /dev/null
+++ b/subsonic-android/res/layout/select_artist.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+
+    <include layout="@layout/action_bar"/>
+
+    <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dividerColor"/>
+
+    <include layout="@layout/tab_progress"/>
+
+    <ListView android:id="@+id/select_artist_list"
+              android:textFilterEnabled="true"
+              android:fastScrollEnabled="true"
+              android:layout_width="fill_parent"
+              android:layout_height="0dip"
+              android:layout_weight="1.0"/>
+
+    <include layout="@layout/button_bar"/>
+
+</LinearLayout>
+
diff --git a/subsonic-android/res/layout/select_artist_header.xml b/subsonic-android/res/layout/select_artist_header.xml
new file mode 100644
index 00000000..247eb806
--- /dev/null
+++ b/subsonic-android/res/layout/select_artist_header.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/select_artist_folder"
+        android:orientation="horizontal"
+        android:paddingTop="2dip"
+        android:paddingBottom="2dip"
+        android:paddingLeft="6dp"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight">
+
+    <ImageView
+            android:src="@drawable/select_artist_folder"
+            android:layout_gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+        <TextView android:id="@+id/select_artist_folder_1"
+                  android:text="@string/select_artist.folder"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_marginLeft="10dip"
+                  android:layout_marginTop="6dip"
+                  android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+        <TextView android:id="@+id/select_artist_folder_2"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_marginLeft="10dip"
+                  android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+    </LinearLayout>
+</LinearLayout>
+\ No newline at end of file
diff --git a/subsonic-android/res/layout/select_playlist.xml b/subsonic-android/res/layout/select_playlist.xml
new file mode 100644
index 00000000..c23e764b
--- /dev/null
+++ b/subsonic-android/res/layout/select_playlist.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+
+    <include layout="@layout/action_bar"/>
+
+    <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dividerColor"/>
+
+    <include layout="@layout/tab_progress"/>
+
+    <TextView
+            android:id="@+id/select_playlist_empty"
+            android:text="@string/select_playlist.empty"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dip"
+            android:visibility="gone"/>
+
+    <ListView android:id="@+id/select_playlist_list"
+              android:layout_width="fill_parent"
+              android:layout_height="0dip"
+              android:layout_weight="1.0"
+              android:fastScrollEnabled="true"
+            />
+
+    <include layout="@layout/button_bar"/>
+
+</LinearLayout>
+
diff --git a/subsonic-android/res/layout/song_list_item.xml b/subsonic-android/res/layout/song_list_item.xml
new file mode 100644
index 00000000..2163ef72
--- /dev/null
+++ b/subsonic-android/res/layout/song_list_item.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="fill_parent"
+              android:layout_height="?android:attr/listPreferredItemHeight">
+
+    <CheckedTextView
+            android:id="@+id/song_check"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:gravity="center_vertical"
+            android:checkMark="?android:attr/textCheckMark"
+            android:paddingLeft="3dip"/>
+
+    <LinearLayout android:orientation="vertical"
+                  android:layout_width="0dip"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1"
+                  android:layout_gravity="center_vertical">
+
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_gravity="center_vertical">
+
+            <TextView
+                    android:id="@+id/song_title"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_gravity="left|center_vertical"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:singleLine="true"
+                    android:ellipsize="marquee"
+                    android:drawablePadding="6dip"
+                    android:paddingLeft="6dip"
+                    android:paddingRight="6dip"/>
+
+            <TextView
+                    android:id="@+id/song_status"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right|center_vertical"
+                    android:drawablePadding="1dip"
+                    android:paddingRight="6dip"/>
+        </LinearLayout>
+
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_gravity="center_vertical">
+
+            <TextView
+                    android:id="@+id/song_artist"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_gravity="left|center_vertical"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:singleLine="true"
+                    android:ellipsize="middle"
+                    android:paddingLeft="6dip"/>
+
+            <TextView
+                    android:id="@+id/song_duration"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right|center_vertical"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:singleLine="true"
+                    android:paddingLeft="3dip"
+                    android:paddingRight="9dip"/>
+
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/subsonic-android/res/layout/tab_progress.xml b/subsonic-android/res/layout/tab_progress.xml
new file mode 100644
index 00000000..6a88600c
--- /dev/null
+++ b/subsonic-android/res/layout/tab_progress.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/tab_progress"
+              android:orientation="horizontal"
+              android:visibility="gone"
+              android:padding="10dp"
+              android:layout_gravity="top"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+
+    <ProgressBar
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="6dp"/>
+
+    <TextView
+            android:id="@+id/tab_progress_message"
+            android:text="@string/progress.wait"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"/>
+
+</LinearLayout>
+\ No newline at end of file
author	Scott Jackson <daneren2005@gmail.com>	2012-07-02 21:24:02 -0700
committer	Scott Jackson <daneren2005@gmail.com>	2012-07-02 21:24:02 -0700
commit	a1a18f77a50804e0127dfa4b0f5240c49c541184 (patch)
tree	19a38880afe505beddb5590379a8134d7730a277 /subsonic-android/res/layout
parent	b61d787706979e7e20f4c3c4f93c1f129d92273f (diff)
download	dsub-a1a18f77a50804e0127dfa4b0f5240c49c541184.tar.gz dsub-a1a18f77a50804e0127dfa4b0f5240c49c541184.tar.bz2 dsub-a1a18f77a50804e0127dfa4b0f5240c49c541184.zip