From a1f71385883a3d71ebb22ede53a2d20d1585e7a5 Mon Sep 17 00:00:00 2001
From: Kevin Whitaker <eyecreate@gmail.com>
Date: Sun, 29 Nov 2015 21:59:31 -0500
Subject: [PATCH] Switch around Album UI to use smaller art images to make it
 easier for transitions and image cache. Will think about where would be best
 to use larger images later.

---
 .../fragments/AlbumFragment.java              |  8 +--
 app/src/main/res/layout/fragment_album.xml    | 50 +++++++++++++------
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/magnatune/eyecreate/companionformagnatune/fragments/AlbumFragment.java b/app/src/main/java/com/magnatune/eyecreate/companionformagnatune/fragments/AlbumFragment.java
index eaf8a5d..0711584 100644
--- a/app/src/main/java/com/magnatune/eyecreate/companionformagnatune/fragments/AlbumFragment.java
+++ b/app/src/main/java/com/magnatune/eyecreate/companionformagnatune/fragments/AlbumFragment.java
@@ -80,7 +80,8 @@ public class AlbumFragment extends Fragment {
         ListView listView = (ListView) v.findViewById(R.id.album_tracks);
         Album currentAlbum = db.where(Album.class).equalTo("albumsku",getArguments().getString(ARG_ALBUM_ID)).findFirst();
         ((TextView)v.findViewById(R.id.album_name)).setText(currentAlbum.getAlbumname());
-        Picasso.with(getActivity()).load(currentAlbum.getCover_large()).into((ImageView) v.findViewById(R.id.album_cover), new Callback() {
+        ((TextView)v.findViewById(R.id.artist_name)).setText(currentAlbum.getArtist().getArtistname());
+        Picasso.with(getActivity()).load(currentAlbum.getCover_small()).into((ImageView) v.findViewById(R.id.album_cover), new Callback() {
             @Override
             public void onSuccess() {
                 Palette colors = Palette.from(((BitmapDrawable) ((ImageView) v.findViewById(R.id.album_cover)).getDrawable()).getBitmap()).generate();
@@ -93,8 +94,9 @@ public class AlbumFragment extends Fragment {
                     swatch = colors.getSwatches().get(0);
                 }
                 if (swatch != null) {
-                    ((TextView)v.findViewById(R.id.album_name)).setTextColor(swatch.getTitleTextColor());
-                    v.findViewById(R.id.album_name).setBackgroundColor(swatch.getRgb());
+                    ((TextView) v.findViewById(R.id.album_name)).setTextColor(swatch.getTitleTextColor());
+                    ((TextView) v.findViewById(R.id.artist_name)).setTextColor(swatch.getBodyTextColor());
+                    v.findViewById(R.id.album_details).setBackgroundColor(swatch.getRgb());
                 }
             }
 
diff --git a/app/src/main/res/layout/fragment_album.xml b/app/src/main/res/layout/fragment_album.xml
index 5b24f31..5c1ef40 100644
--- a/app/src/main/res/layout/fragment_album.xml
+++ b/app/src/main/res/layout/fragment_album.xml
@@ -9,25 +9,45 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/album_cover"
+        <LinearLayout
+            android:id="@+id/album_details"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/album_name"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:textStyle="bold"
-            android:textSize="20sp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            <ImageView
+                android:id="@+id/album_cover"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="10dp"
+                android:paddingLeft="15dp"
+                android:paddingRight="5dp"
+                android:paddingTop="10dp"
+                android:layout_weight="2">
+
+                <TextView
+                    android:id="@+id/album_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/artist_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="16sp" />
+            </LinearLayout>
+        </LinearLayout>
 
         <ListView
+            android:id="@+id/album_tracks"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/album_tracks"/>
+            android:layout_height="wrap_content" />
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
-- 
GitLab