From e1260eafd3b6053fd51663b2eff5b97fabf51c4e Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Fri, 18 Dec 2015 17:48:44 -0800
Subject: Use card view for albums as well

---
 app/src/main/res/layout/album_cell_item.xml | 141 ++++++++++++++--------------
 1 file changed, 73 insertions(+), 68 deletions(-)

(limited to 'app/src/main/res/layout/album_cell_item.xml')

diff --git a/app/src/main/res/layout/album_cell_item.xml b/app/src/main/res/layout/album_cell_item.xml
index f6693a7f..da872273 100644
--- a/app/src/main/res/layout/album_cell_item.xml
+++ b/app/src/main/res/layout/album_cell_item.xml
@@ -1,90 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
+<github.daneren2005.dsub.view.CardView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:background="?attr/selectableItemBackground">
+	android:layout_height="match_parent">
 
-	<RelativeLayout
+	<LinearLayout
+		android:orientation="vertical"
 		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1">
+		android:layout_height="match_parent"
+		android:background="?attr/selectableItemBackground">
 
-		<github.daneren2005.dsub.view.SquareImageView
-			android:id="@+id/album_coverart"
+		<RelativeLayout
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"/>
+			android:layout_height="0dp"
+			android:layout_weight="1">
 
-		<RatingBar
-			android:id="@+id/album_rating"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:isIndicator="true"
-			android:layout_centerHorizontal="true"
-			android:numStars="5"
-			style="@android:style/Widget.Holo.RatingBar.Small"
-			android:layout_alignParentBottom="true"
-			android:visibility="gone"/>
-	</RelativeLayout>
+			<github.daneren2005.dsub.view.SquareImageView
+				android:id="@+id/album_coverart"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"/>
 
-	<LinearLayout
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		android:paddingTop="4dp"
-		android:paddingLeft="2dp">
+			<RatingBar
+				android:id="@+id/album_rating"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:isIndicator="true"
+				android:layout_centerHorizontal="true"
+				android:numStars="5"
+				style="@android:style/Widget.Holo.RatingBar.Small"
+				android:layout_alignParentBottom="true"
+				android:visibility="gone"/>
+		</RelativeLayout>
 
 		<LinearLayout
-			android:layout_width="0dp"
+			android:layout_width="fill_parent"
 			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/textAppearanceSmall"
-				android:singleLine="true"
-				android:ellipsize="marquee"
-				android:text="@string/search.albums"
-				android:textColor="?android:textColorPrimary"/>
+			android:orientation="horizontal"
+			android:paddingTop="4dp"
+			android:paddingLeft="2dp">
 
 			<LinearLayout
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content">
+				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_artist"
-					android:layout_width="0dp"
-					android:layout_weight="1"
+					android:id="@+id/album_title"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:textSize="12sp"
-					android:textColor="?android:textColorSecondary"
+					android:textAppearance="?android:attr/textAppearanceSmall"
 					android:singleLine="true"
-					android:text="@string/search.artists"/>
+					android:ellipsize="marquee"
+					android:text="@string/search.albums"
+					android:textColor="?android:textColorPrimary"/>
+
+				<LinearLayout
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content">
 
-				<ImageButton
-					android:id="@+id/album_star"
-					android:layout_width="@dimen/Star.Small"
-					android:layout_height="@dimen/Star.Small"
-					android:scaleType="fitCenter"
-					android:layout_gravity="right|center_vertical"
-					android:background="@android:color/transparent"
-					android:focusable="false"
-					android:visibility="gone"/>
+					<TextView
+						android:id="@+id/album_artist"
+						android:layout_width="0dp"
+						android:layout_weight="1"
+						android:layout_height="wrap_content"
+						android:textSize="12sp"
+						android:textColor="?android:textColorSecondary"
+						android:singleLine="true"
+						android:text="@string/search.artists"/>
+
+					<ImageButton
+						android:id="@+id/album_star"
+						android:layout_width="@dimen/Star.Small"
+						android:layout_height="@dimen/Star.Small"
+						android:scaleType="fitCenter"
+						android:layout_gravity="right|center_vertical"
+						android:background="@android:color/transparent"
+						android:focusable="false"
+						android:visibility="gone"/>
+				</LinearLayout>
 			</LinearLayout>
+
+			<ImageView
+				android:id="@+id/item_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"
+				style="@style/BasicButton"/>
 		</LinearLayout>
 
-		<ImageView
-			android:id="@+id/item_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"
-			style="@style/BasicButton"/>
 	</LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+</github.daneren2005.dsub.view.CardView>
\ No newline at end of file
-- 
cgit v1.2.3