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 eaf8a5d7eb6ad9f3f1a36d475e48d08629b03ed8..071158483f3c180033ee0c0c3c725c6e244946b8 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 5b24f31e45c82630ddacd543c1032aab36c4c4e8..5c1ef40fa58d59ec838a8b3eb72dc9fab45de416 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"> - + android:layout_height="wrap_content" + android:orientation="horizontal"> - + + + + + + + + + + android:layout_height="wrap_content" /> \ No newline at end of file