From 241ac622a0767f26af706db6b0268ff1382e2716 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 23 Apr 2015 20:20:24 -0700
Subject: #495 Lazy load artist bio information since Subsonic takes so long
 the first time loading

---
 res/layout/select_album_header.xml | 221 ++++++++++++++++++++++---------------
 1 file changed, 130 insertions(+), 91 deletions(-)

(limited to 'res/layout/select_album_header.xml')

diff --git a/res/layout/select_album_header.xml b/res/layout/select_album_header.xml
index f9eff4e8..d028a476 100644
--- a/res/layout/select_album_header.xml
+++ b/res/layout/select_album_header.xml
@@ -1,114 +1,153 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/select_album_header"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/select_album_header_wrapper"
+	android:layout_height="wrap_content"
+	android:layout_width="fill_parent">
 
-	<LinearLayout
-		android:id="@+id/select_album_text_layout"
+	<RelativeLayout
+		android:id="@+id/select_album_header"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:layout_toRightOf="@+id/select_album_art"
-		android:orientation="vertical"
-		android:layout_centerVertical="true">
+		android:layout_gravity="top">
 
-		<TextView
-			android:text="This is the album title"
-			android:id="@+id/select_album_title"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceLarge"
-			android:textStyle="bold"
-			android:singleLine="true"
-			android:ellipsize="marquee"
-			android:marqueeRepeatLimit="marquee_forever"
-			android:scrollHorizontally="true"
-			android:focusable="true"
-			android:focusableInTouchMode="true">
-
-			<requestFocus android:focusable="true"
-				android:focusableInTouchMode="true"
-				android:duplicateParentState="true" />
-		</TextView>
-
-		<TextView
-			android:text="This is the artist name"
-			android:id="@+id/select_album_artist"
-			android:layout_width="wrap_content"
+		<LinearLayout
+			android:id="@+id/select_album_text_layout"
+			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:singleLine="true"
-			android:ellipsize="end"/>
+			android:layout_toRightOf="@+id/select_album_art"
+			android:orientation="vertical"
+			android:layout_centerVertical="true">
 
-		<TextView
-			android:text="XX SONGS"
-			android:id="@+id/select_album_song_count"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:paddingTop="14dip"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:singleLine="true"
-			android:ellipsize="none"/>
-
-		<TextView
-			android:text="0:00"
-			android:id="@+id/select_album_song_length"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:singleLine="true"
-			android:ellipsize="none"/>
+			<TextView
+				android:text="This is the album title"
+				android:id="@+id/select_album_title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:textStyle="bold"
+				android:singleLine="true"
+				android:ellipsize="marquee"
+				android:marqueeRepeatLimit="marquee_forever"
+				android:scrollHorizontally="true"
+				android:focusable="true"
+				android:focusableInTouchMode="true">
 
-	</LinearLayout>
+				<requestFocus android:focusable="true"
+					android:focusableInTouchMode="true"
+					android:duplicateParentState="true" />
+			</TextView>
 
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentBottom="true"
-		android:layout_alignParentRight="true"
-		android:padding="10dip">
+			<TextView
+				android:text="This is the artist name"
+				android:id="@+id/select_album_artist"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:singleLine="true"
+				android:ellipsize="end"/>
+
+			<TextView
+				android:text="XX SONGS"
+				android:id="@+id/select_album_song_count"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:paddingTop="14dip"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:singleLine="true"
+				android:ellipsize="none"/>
+
+			<TextView
+				android:text="0:00"
+				android:id="@+id/select_album_song_length"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:singleLine="true"
+				android:ellipsize="none"/>
+
+		</LinearLayout>
 
 		<LinearLayout
-			android:id="@+id/select_album_rate_wrapper"
 			android:layout_width="wrap_content"
-			android:layout_height="fill_parent">
+			android:layout_height="wrap_content"
+			android:layout_alignParentBottom="true"
+			android:layout_alignParentRight="true"
+			android:padding="10dip">
+
+			<LinearLayout
+				android:id="@+id/select_album_rate_wrapper"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent">
 
-			<RatingBar
-				android:id="@+id/select_album_rate"
+				<RatingBar
+					android:id="@+id/select_album_rate"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:numStars="5"
+					style="@android:style/Widget.Holo.RatingBar.Small"
+					android:layout_gravity="center_vertical"/>
+			</LinearLayout>
+
+			<ImageButton
+				android:id="@+id/select_album_star"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:numStars="5"
-				style="@android:style/Widget.Holo.RatingBar.Small"
+				style="@style/BasicButton"
+				android:src="@android:drawable/star_big_off"
+				android:layout_gravity="center_vertical"/>
+
+			<ImageView
+				android:id="@+id/select_album_share"
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:scaleType="fitCenter"
+				android:src="?attr/share"
+				style="@style/BasicButton"
 				android:layout_gravity="center_vertical"/>
 		</LinearLayout>
 
-		<ImageButton
-			android:id="@+id/select_album_star"
+		<github.daneren2005.dsub.view.RecyclingImageView
+			android:id="@+id/select_album_art"
+			android:layout_width="@dimen/AlbumArt.Header"
+			android:layout_height="@dimen/AlbumArt.Header"
+			android:layout_alignParentTop="true"
+			android:layout_alignParentLeft="true"
+			android:layout_marginRight="10dip"
+			android:scaleType="fitCenter"
+			android:contentDescription="@null"/>
+	</RelativeLayout>
+
+	<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:id="@+id/header_progress"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:clickable="true"
+		android:visibility="gone"
+		android:layout_gravity="top">
+
+		<LinearLayout
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			style="@style/BasicButton"
-			android:src="@android:drawable/star_big_off"
-			android:layout_gravity="center_vertical"/>
+			android:orientation="vertical"
+			android:layout_gravity="center">
 
-		<ImageView
-			android:id="@+id/select_album_share"
-			android:layout_height="wrap_content"
-			android:layout_width="wrap_content"
-			android:scaleType="fitCenter"
-			android:src="?attr/share"
-			style="@style/BasicButton"
-			android:layout_gravity="center_vertical"/>
-	</LinearLayout>
-
-	<github.daneren2005.dsub.view.RecyclingImageView
-		android:id="@+id/select_album_art"
-		android:layout_width="@dimen/AlbumArt.Header"
-		android:layout_height="@dimen/AlbumArt.Header"
-		android:layout_alignParentTop="true"
-		android:layout_alignParentLeft="true"
-		android:layout_marginRight="10dip"
-		android:scaleType="fitCenter"
-		android:contentDescription="@null"/>
-</RelativeLayout>
+			<ProgressBar
+				android:id="@+id/tab_progress_spinner"
+				style="?android:attr/progressBarStyleLarge"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginRight="6dp"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+			<TextView
+				android:id="@+id/tab_progress_message"
+				android:text="@string/progress.artist_info"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:textAppearance="?android:attr/textAppearanceMedium"/>
+		</LinearLayout>
+	</FrameLayout>
+</FrameLayout>
 
 
-- 
cgit v1.2.3