Merge branch 'Grid' of https://github.com/daneren2005/Subsonic

4 files changed, 68 insertions, 62 deletions

diff --git a/res/layout/album_cell_item.xml b/res/layout/album_cell_item.xml
new file mode 100644
index 00000000..9cc85c6e
--- /dev/null
+++ b/res/layout/album_cell_item.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+	android:orientation="vertical"

+	android:layout_width="match_parent"

+	android:layout_height="match_parent">

+

+	<github.daneren2005.dsub.view.SquareImageView

+		android:id="@+id/album_coverart"

+		android:layout_width="match_parent"

+		android:layout_height="0dp"

+		android:layout_weight="1"

+		android:src="@drawable/unknown_album"/>

+

+	<LinearLayout

+		android:layout_width="fill_parent"

+		android:layout_height="wrap_content"

+		android:orientation="horizontal"

+		android:paddingTop="4dp"

+		android:paddingLeft="2dp">

+

+		<LinearLayout

+			android:layout_width="0dp"

+			android:layout_height="wrap_content"

+			android:layout_weight="1"

+			android:gravity="center_vertical"

+			android:orientation="vertical">

+

+			<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"

+				android:text="@string/search.albums"/>

+

+			<TextView

+				android:id="@+id/album_artist"

+				android:layout_width="wrap_content"

+				android:layout_height="wrap_content"

+				android:textAppearance="?android:attr/textAppearanceSmall"

+				android:singleLine="true"

+				android:text="@string/search.artists"/>

+		</LinearLayout>

+

+		<ImageView

+			android:id="@+id/album_more"

+			android:src="?attr/download_none"

+			android:layout_width="wrap_content"

+			android:layout_height="wrap_content"

+			android:layout_gravity="right|center_vertical"

+			android:paddingRight="2dp"

+			android:background="@drawable/menubar_button"/>

+	</LinearLayout>

+

+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/album_list_item.xml b/res/layout/album_list_item.xml
deleted file mode 100644
index 99a9ed88..00000000
--- a/res/layout/album_list_item.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-		android:id="@id/drag_handle"

-		android:orientation="horizontal"

-		android:layout_width="fill_parent"

-		android:layout_height="wrap_content">

-

-    <ImageView

-            android:id="@+id/album_coverart"

-            android:layout_width="@dimen/AlbumArt.Small"

-            android:layout_height="@dimen/AlbumArt.Small"

-            android:layout_gravity="left|center_vertical"/>

-

-    <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="10dip"

-            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>

-	

-	<ImageButton

-			android:id="@+id/album_star"

-			android:layout_width="wrap_content"

-			android:layout_height="wrap_content"

-			android:layout_gravity="right|center_vertical"

-			android:src="@drawable/ic_stat_star"

-			android:background="@android:color/transparent"

-			android:focusable="false"

-			android:visibility="gone"/>

-

-    <ImageView

-		android:id="@+id/album_more"

-		android:src="?attr/download_none"

-		android:layout_width="wrap_content"

-		android:layout_height="fill_parent"

-		android:layout_gravity="right|center_vertical"

-		android:paddingRight="10dip"

-		android:background="@drawable/menubar_button"/>

-</LinearLayout>

diff --git a/res/layout/grid_view.xml b/res/layout/grid_view.xml
new file mode 100644
index 00000000..549f9ae5
--- /dev/null
+++ b/res/layout/grid_view.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>

+<github.daneren2005.dsub.view.UnscrollableGridView xmlns:android="http://schemas.android.com/apk/res/android"

+	android:id="@+id/gridview"

+	android:layout_width="fill_parent"

+	android:layout_height="wrap_content"

+	android:numColumns="auto_fit"

+	android:horizontalSpacing="10dp"

+	android:verticalSpacing="10dp"

+	android:gravity="center"

+	android:stretchMode="columnWidth"/>
\ No newline at end of file
diff --git a/res/layout/select_album.xml b/res/layout/select_album.xml
index 9b1e36dd..954fbcf6 100644
--- a/res/layout/select_album.xml
+++ b/res/layout/select_album.xml
@@ -25,13 +25,11 @@
 			android:layout_height="wrap_content"

 			android:padding="10dip"/>

 

-		<com.mobeta.android.dslv.DragSortListView

-			style="@style/DragDropListView"

+		<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"/>

+			android:layout_weight="1.0"/>

 	</LinearLayout>

 </android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file