From 05a279b66c2a0b1d2f1b40cc0df6163576aa1e49 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sat, 3 Jan 2015 16:56:13 -0800
Subject: Increase right margin a bit so more button is selectable

---
 res/layout/album_list_item.xml   | 3 +--
 res/layout/basic_list_item.xml   | 3 +--
 res/layout/complex_list_item.xml | 3 +--
 res/layout/song_list_item.xml    | 3 +--
 res/layout/user_list_item.xml    | 3 +--
 res/values/styles.xml            | 4 ++++
 6 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'res')

diff --git a/res/layout/album_list_item.xml b/res/layout/album_list_item.xml
index f0d6eb97..202843b6 100644
--- a/res/layout/album_list_item.xml
+++ b/res/layout/album_list_item.xml
@@ -70,6 +70,5 @@
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
 		android:layout_gravity="right|center_vertical"
-		android:paddingRight="10dip"
-		style="@style/BasicButton"/>
+		style="@style/MoreButton"/>
 </LinearLayout>
diff --git a/res/layout/basic_list_item.xml b/res/layout/basic_list_item.xml
index 84526324..f40aef2e 100644
--- a/res/layout/basic_list_item.xml
+++ b/res/layout/basic_list_item.xml
@@ -33,6 +33,5 @@
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
 		android:layout_gravity="right|center_vertical"
-		android:paddingRight="10dip"
-		style="@style/BasicButton"/>
+		style="@style/MoreButton"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/complex_list_item.xml b/res/layout/complex_list_item.xml
index 421295f2..a36cb2f6 100644
--- a/res/layout/complex_list_item.xml
+++ b/res/layout/complex_list_item.xml
@@ -45,6 +45,5 @@
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
 		android:layout_gravity="right|center_vertical"
-		android:paddingRight="10dip"
-		style="@style/BasicButton"/>
+		style="@style/MoreButton"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/song_list_item.xml b/res/layout/song_list_item.xml
index 1ea118ad..67d460f1 100644
--- a/res/layout/song_list_item.xml
+++ b/res/layout/song_list_item.xml
@@ -122,6 +122,5 @@
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
 		android:layout_gravity="right|center_vertical"
-		android:paddingRight="10dip"
-		style="@style/BasicButton"/>
+		style="@style/MoreButton"/>
 </LinearLayout>
diff --git a/res/layout/user_list_item.xml b/res/layout/user_list_item.xml
index c4092894..ac408295 100644
--- a/res/layout/user_list_item.xml
+++ b/res/layout/user_list_item.xml
@@ -40,6 +40,5 @@
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
 		android:layout_gravity="right|center_vertical"
-		android:paddingRight="10dip"
-		style="@style/BasicButton"/>
+		style="@style/MoreButton"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e32811fa..43271afd 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -4,6 +4,10 @@
 		<item name="android:background">@drawable/abc_item_background_holo_light</item>
 	</style>
 
+	<style name="MoreButton" parent="BasicButton">
+		<item name="android:paddingRight">14dip</item>
+	</style>
+
     <style name="PlaybackControl" parent="@style/BasicButton">
         <item name="android:scaleType">fitCenter</item>
         <item name="android:padding">6dip</item>
-- 
cgit v1.2.3


From 9bc4925ff0a07415b58513044ac4ce1d64caeb6c Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sat, 3 Jan 2015 20:52:18 -0800
Subject: Add Similar Artists button under artist's options

---
 res/menu/select_album.xml                          |   4 +
 res/values/strings.xml                             |   1 +
 src/github/daneren2005/dsub/domain/ArtistInfo.java |  67 ++++++++++++
 .../dsub/fragments/SelectDirectoryFragment.java    |  12 ++
 .../dsub/fragments/SimilarArtistFragment.java      | 121 +++++++++++++++++++++
 .../dsub/service/CachedMusicService.java           |   6 +
 .../daneren2005/dsub/service/MusicService.java     |   3 +
 .../dsub/service/OfflineMusicService.java          |   6 +
 .../daneren2005/dsub/service/RESTMusicService.java |  11 ++
 .../dsub/service/parser/ArtistInfoParser.java      |  69 ++++++++++++
 10 files changed, 300 insertions(+)
 create mode 100644 src/github/daneren2005/dsub/domain/ArtistInfo.java
 create mode 100644 src/github/daneren2005/dsub/fragments/SimilarArtistFragment.java
 create mode 100644 src/github/daneren2005/dsub/service/parser/ArtistInfoParser.java

(limited to 'res')

diff --git a/res/menu/select_album.xml b/res/menu/select_album.xml
index fa887c28..39eb2206 100644
--- a/res/menu/select_album.xml
+++ b/res/menu/select_album.xml
@@ -17,6 +17,10 @@
 		android:id="@+id/menu_top_tracks"
 		android:title="@string/menu.top_tracks"/>
 
+	<item
+		android:id="@+id/menu_similar_artists"
+		android:title="@string/menu.similar_artists"/>
+
 	<item
 		android:id="@+id/menu_show_all"
 		android:title="@string/menu.show_all"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3bcdec17..ebffb19b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -104,6 +104,7 @@
 	<string name="menu.rescan">Rescan Server</string>
 	<string name="menu.rate">Set Rating</string>
 	<string name="menu.top_tracks">Last.FM Top Tracks</string>
+	<string name="menu.similar_artists">Similar Artists</string>
 
     <string name="playlist.label">Playlists</string>
 	<string name="playlist.update_info">Update Information</string>
diff --git a/src/github/daneren2005/dsub/domain/ArtistInfo.java b/src/github/daneren2005/dsub/domain/ArtistInfo.java
new file mode 100644
index 00000000..325f1b6f
--- /dev/null
+++ b/src/github/daneren2005/dsub/domain/ArtistInfo.java
@@ -0,0 +1,67 @@
+/*
+  This file is part of Subsonic.
+	Subsonic is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	Subsonic is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+	Copyright 2014 (C) Scott Jackson
+*/
+
+package github.daneren2005.dsub.domain;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ArtistInfo implements Serializable {
+	private String biography;
+	private String musicBrainzId;
+	private String lastFMUrl;
+	private String imageUrl;
+	private List<Artist> similarArtists;
+
+	public String getBiography() {
+		return biography;
+	}
+
+	public void setBiography(String biography) {
+		this.biography = biography;
+	}
+
+	public String getMusicBrainzId() {
+		return musicBrainzId;
+	}
+
+	public void setMusicBrainzId(String musicBrainzId) {
+		this.musicBrainzId = musicBrainzId;
+	}
+
+	public String getLastFMUrl() {
+		return lastFMUrl;
+	}
+
+	public void setLastFMUrl(String lastFMUrl) {
+		this.lastFMUrl = lastFMUrl;
+	}
+
+	public String getImageUrl() {
+		return imageUrl;
+	}
+
+	public void setImageUrl(String imageUrl) {
+		this.imageUrl = imageUrl;
+	}
+
+	public List<Artist> getSimilarArtists() {
+		return similarArtists;
+	}
+
+	public void setSimilarArtists(List<Artist> similarArtists) {
+		this.similarArtists = similarArtists;
+	}
+}
diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
index 3fbb90cf..fa9eea36 100644
--- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
@@ -298,6 +298,9 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
 			case R.id.menu_top_tracks:
 				showTopTracks();
 				return true;
+			case R.id.menu_similar_artists:
+				showSimilarArtists(id);
+				return true;
 		}
 
 		return super.onOptionsItemSelected(item);
@@ -1211,6 +1214,15 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
 		replaceFragment(fragment, true);
 	}
 
+	private void showSimilarArtists(String artistId) {
+		SubsonicFragment fragment = new SimilarArtistFragment();
+		Bundle args = new Bundle();
+		args.putString(Constants.INTENT_EXTRA_NAME_ARTIST, artistId);
+		fragment.setArguments(args);
+
+		replaceFragment(fragment, true);
+	}
+
 	private View createHeader(List<Entry> entries) {
 		View header = entryList.findViewById(R.id.select_album_header);
 		boolean add = false;
diff --git a/src/github/daneren2005/dsub/fragments/SimilarArtistFragment.java b/src/github/daneren2005/dsub/fragments/SimilarArtistFragment.java
new file mode 100644
index 00000000..8fdd6994
--- /dev/null
+++ b/src/github/daneren2005/dsub/fragments/SimilarArtistFragment.java
@@ -0,0 +1,121 @@
+/*
+  This file is part of Subsonic.
+	Subsonic is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	Subsonic is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+	Copyright 2014 (C) Scott Jackson
+*/
+
+package github.daneren2005.dsub.fragments;
+
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.util.Log;
+import android.view.ContextMenu;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.Artist;
+import github.daneren2005.dsub.domain.ArtistInfo;
+import github.daneren2005.dsub.domain.Indexes;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.MusicFolder;
+import github.daneren2005.dsub.service.MusicService;
+import github.daneren2005.dsub.service.MusicServiceFactory;
+import github.daneren2005.dsub.util.BackgroundTask;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.ProgressListener;
+import github.daneren2005.dsub.util.TabBackgroundTask;
+import github.daneren2005.dsub.util.Util;
+import github.daneren2005.dsub.view.ArtistAdapter;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SimilarArtistFragment extends SelectListFragment<Artist> {
+	private static final String TAG = SimilarArtistFragment.class.getSimpleName();
+	private String artistId;
+
+	@Override
+	public void onCreate(Bundle bundle) {
+		super.onCreate(bundle);
+		artist = true;
+
+		artistId = getArguments().getString(Constants.INTENT_EXTRA_NAME_ARTIST);
+	}
+
+	@Override
+	public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) {
+		super.onCreateContextMenu(menu, view, menuInfo);
+
+		AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
+		Object entry = listView.getItemAtPosition(info.position);
+		onCreateContextMenu(menu, view, menuInfo, entry);
+
+		recreateContextMenu(menu);
+	}
+
+	@Override
+	public boolean onContextItemSelected(MenuItem menuItem) {
+		if(menuItem.getGroupId() != getSupportTag()) {
+			return false;
+		}
+
+		AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo();
+		Artist artist = (Artist) listView.getItemAtPosition(info.position);
+		return onContextItemSelected(menuItem, artist);
+	}
+
+	@Override
+	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+		Artist artist = (Artist) parent.getItemAtPosition(position);
+		SubsonicFragment fragment = new SelectDirectoryFragment();
+		Bundle args = new Bundle();
+		args.putString(Constants.INTENT_EXTRA_NAME_ID, artist.getId());
+		args.putString(Constants.INTENT_EXTRA_NAME_NAME, artist.getName());
+		args.putBoolean(Constants.INTENT_EXTRA_NAME_ARTIST, true);
+		fragment.setArguments(args);
+
+		replaceFragment(fragment);
+	}
+
+	@Override
+	public int getOptionsMenu() {
+		return R.menu.empty;
+	}
+
+	@Override
+	public ArrayAdapter getAdapter(List<Artist> objects) {
+		return new ArtistAdapter(context, objects);
+	}
+
+	@Override
+	public List<Artist> getObjects(MusicService musicService, boolean refresh, ProgressListener listener) throws Exception {
+		ArtistInfo info = musicService.getArtistInfo(artistId, refresh, context, listener);
+		return info.getSimilarArtists();
+	}
+
+	@Override
+	public int getTitleResource() {
+		return R.string.menu_similar_artists;
+	}
+}
diff --git a/src/github/daneren2005/dsub/service/CachedMusicService.java b/src/github/daneren2005/dsub/service/CachedMusicService.java
index 8e8e120d..51f96ffb 100644
--- a/src/github/daneren2005/dsub/service/CachedMusicService.java
+++ b/src/github/daneren2005/dsub/service/CachedMusicService.java
@@ -32,6 +32,7 @@ import android.content.Context;
 import android.graphics.Bitmap;
 
 import github.daneren2005.dsub.domain.Artist;
+import github.daneren2005.dsub.domain.ArtistInfo;
 import github.daneren2005.dsub.domain.Bookmark;
 import github.daneren2005.dsub.domain.ChatMessage;
 import github.daneren2005.dsub.domain.Genre;
@@ -890,6 +891,11 @@ public class CachedMusicService implements MusicService {
 		return musicService.getAvatar(username, size, context, progressListener, task);
 	}
 
+	@Override
+	public ArtistInfo getArtistInfo(String id, boolean refresh, Context context, ProgressListener progressListener) throws Exception {
+		return musicService.getArtistInfo(id, refresh, context, progressListener);
+	}
+
 	@Override
 	public int processOfflineSyncs(final Context context, final ProgressListener progressListener) throws Exception{
 		return musicService.processOfflineSyncs(context, progressListener);
diff --git a/src/github/daneren2005/dsub/service/MusicService.java b/src/github/daneren2005/dsub/service/MusicService.java
index 765f498a..64061191 100644
--- a/src/github/daneren2005/dsub/service/MusicService.java
+++ b/src/github/daneren2005/dsub/service/MusicService.java
@@ -25,6 +25,7 @@ import org.apache.http.HttpResponse;
 import android.content.Context;
 import android.graphics.Bitmap;
 
+import github.daneren2005.dsub.domain.ArtistInfo;
 import github.daneren2005.dsub.domain.Bookmark;
 import github.daneren2005.dsub.domain.ChatMessage;
 import github.daneren2005.dsub.domain.Genre;
@@ -177,6 +178,8 @@ public interface MusicService {
 	void changePassword(String username, String password, Context context, ProgressListener progressListener) throws Exception;
 
 	Bitmap getAvatar(String username, int size, Context context, ProgressListener progressListener, SilentBackgroundTask task) throws Exception;
+
+	ArtistInfo getArtistInfo(String id, boolean refresh, Context context, ProgressListener progressListener) throws Exception;
 	
 	int processOfflineSyncs(final Context context, final ProgressListener progressListener) throws Exception;
 	
diff --git a/src/github/daneren2005/dsub/service/OfflineMusicService.java b/src/github/daneren2005/dsub/service/OfflineMusicService.java
index 887ad84f..dc4651d2 100644
--- a/src/github/daneren2005/dsub/service/OfflineMusicService.java
+++ b/src/github/daneren2005/dsub/service/OfflineMusicService.java
@@ -37,6 +37,7 @@ import android.util.Log;
 import org.apache.http.HttpResponse;
 
 import github.daneren2005.dsub.domain.Artist;
+import github.daneren2005.dsub.domain.ArtistInfo;
 import github.daneren2005.dsub.domain.ChatMessage;
 import github.daneren2005.dsub.domain.Genre;
 import github.daneren2005.dsub.domain.Indexes;
@@ -782,6 +783,11 @@ public class OfflineMusicService implements MusicService {
 		throw new OfflineException(ERRORMSG);
 	}
 
+	@Override
+	public ArtistInfo getArtistInfo(String id, boolean refresh, Context context, ProgressListener progressListener) throws Exception {
+		throw new OfflineException(ERRORMSG);
+	}
+
 	@Override
     public int processOfflineSyncs(final Context context, final ProgressListener progressListener) throws Exception{
 		throw new OfflineException(ERRORMSG);
diff --git a/src/github/daneren2005/dsub/service/RESTMusicService.java b/src/github/daneren2005/dsub/service/RESTMusicService.java
index c7ca2708..53d797b5 100644
--- a/src/github/daneren2005/dsub/service/RESTMusicService.java
+++ b/src/github/daneren2005/dsub/service/RESTMusicService.java
@@ -69,6 +69,7 @@ import android.util.Log;
 import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.domain.*;
 import github.daneren2005.dsub.service.parser.AlbumListParser;
+import github.daneren2005.dsub.service.parser.ArtistInfoParser;
 import github.daneren2005.dsub.service.parser.BookmarkParser;
 import github.daneren2005.dsub.service.parser.ChatMessageParser;
 import github.daneren2005.dsub.service.parser.ErrorParser;
@@ -1378,6 +1379,16 @@ public class RESTMusicService implements MusicService {
 		}
 	}
 
+	@Override
+	public ArtistInfo getArtistInfo(String id, boolean refresh, Context context, ProgressListener progressListener) throws Exception {
+		Reader reader = getReader(context, progressListener, Util.isTagBrowsing(context, getInstance(context)) ? "getArtistInfo2" : "getArtistInfo", null, Arrays.asList("id"), Arrays.<Object>asList(id));
+		try {
+			return new ArtistInfoParser(context, getInstance(context)).parse(reader, progressListener);
+		} finally {
+			Util.close(reader);
+		}
+	}
+
 	@Override
 	public int processOfflineSyncs(final Context context, final ProgressListener progressListener) throws Exception{
 		return processOfflineScrobbles(context, progressListener) + processOfflineStars(context, progressListener);
diff --git a/src/github/daneren2005/dsub/service/parser/ArtistInfoParser.java b/src/github/daneren2005/dsub/service/parser/ArtistInfoParser.java
new file mode 100644
index 00000000..9ffb354c
--- /dev/null
+++ b/src/github/daneren2005/dsub/service/parser/ArtistInfoParser.java
@@ -0,0 +1,69 @@
+/*
+  This file is part of Subsonic.
+	Subsonic is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	Subsonic is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+	Copyright 2014 (C) Scott Jackson
+*/
+
+package github.daneren2005.dsub.service.parser;
+
+import android.content.Context;
+
+import org.xmlpull.v1.XmlPullParser;
+
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+
+import github.daneren2005.dsub.domain.Artist;
+import github.daneren2005.dsub.domain.ArtistInfo;
+import github.daneren2005.dsub.util.ProgressListener;
+
+public class ArtistInfoParser extends AbstractParser {
+
+	public ArtistInfoParser(Context context, int instance) {
+		super(context, instance);
+	}
+
+	public ArtistInfo parse(Reader reader, ProgressListener progressListener) throws Exception {
+		init(reader);
+
+		ArtistInfo info = new ArtistInfo();
+		List<Artist> artists = new ArrayList<Artist>();
+
+		int eventType;
+		do {
+			eventType = nextParseEvent();
+			if (eventType == XmlPullParser.START_TAG) {
+				String name = getElementName();
+				if ("biography".equals(name)) {
+					info.setBiography(getText());
+				} else if ("musicBrainzId".equals(name)) {
+					info.setMusicBrainzId(getText());
+				} else if ("lastFmUrl".equals(name)) {
+					info.setLastFMUrl(getText());
+				} else if ("largeImageUrl".equals(name)) {
+					info.setImageUrl(getText());
+				} else if ("similarArtist".equals(name)) {
+					Artist artist = new Artist();
+					artist.setId(get("id"));
+					artist.setName(get("name"));
+					artists.add(artist);
+				} else if ("error".equals(name)) {
+					handleError();
+				}
+			}
+		} while (eventType != XmlPullParser.END_DOCUMENT);
+
+		info.setSimilarArtists(artists);
+		return info;
+	}
+}
-- 
cgit v1.2.3


From f7d19f2cf94263aedd9e173e19bf52816725fd17 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sun, 4 Jan 2015 13:56:47 -0800
Subject: #438 Add dialog to lookup missing artists

---
 res/menu/similar_artists.xml                       |  8 ++++
 res/values/strings.xml                             |  1 +
 .../dsub/fragments/SimilarArtistFragment.java      | 52 ++++++++++++++--------
 src/github/daneren2005/dsub/util/Util.java         |  7 ++-
 4 files changed, 49 insertions(+), 19 deletions(-)
 create mode 100644 res/menu/similar_artists.xml

(limited to 'res')

diff --git a/res/menu/similar_artists.xml b/res/menu/similar_artists.xml
new file mode 100644
index 00000000..bffa1837
--- /dev/null
+++ b/res/menu/similar_artists.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/menu_show_missing"
+		android:title="@string/menu.show_missing"/>
+</menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ebffb19b..314fc9bf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -105,6 +105,7 @@
 	<string name="menu.rate">Set Rating</string>
 	<string name="menu.top_tracks">Last.FM Top Tracks</string>
 	<string name="menu.similar_artists">Similar Artists</string>
+	<string name="menu.show_missing">Show missing</string>
 
     <string name="playlist.label">Playlists</string>
 	<string name="playlist.update_info">Update Information</string>
diff --git a/src/github/daneren2005/dsub/fragments/SimilarArtistFragment.java b/src/github/daneren2005/dsub/fragments/SimilarArtistFragment.java
index 8fdd6994..26d7fb5e 100644
--- a/src/github/daneren2005/dsub/fragments/SimilarArtistFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SimilarArtistFragment.java
@@ -15,44 +15,33 @@
 
 package github.daneren2005.dsub.fragments;
 
-import android.os.Build;
+import android.app.AlertDialog;
 import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.util.Log;
+import android.text.method.LinkMovementMethod;
 import android.view.ContextMenu;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.LinearLayout;
-import android.widget.ListView;
 import android.widget.TextView;
+
 import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.domain.Artist;
 import github.daneren2005.dsub.domain.ArtistInfo;
-import github.daneren2005.dsub.domain.Indexes;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.MusicFolder;
 import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.util.BackgroundTask;
 import github.daneren2005.dsub.util.Constants;
 import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.TabBackgroundTask;
 import github.daneren2005.dsub.util.Util;
 import github.daneren2005.dsub.view.ArtistAdapter;
 
-import java.io.Serializable;
-import java.util.ArrayList;
+import java.net.URLEncoder;
 import java.util.List;
 
 public class SimilarArtistFragment extends SelectListFragment<Artist> {
 	private static final String TAG = SimilarArtistFragment.class.getSimpleName();
+	private ArtistInfo info;
 	private String artistId;
 
 	@Override
@@ -63,6 +52,21 @@ public class SimilarArtistFragment extends SelectListFragment<Artist> {
 		artistId = getArguments().getString(Constants.INTENT_EXTRA_NAME_ARTIST);
 	}
 
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if(super.onOptionsItemSelected(item)) {
+			return true;
+		}
+
+		switch (item.getItemId()) {
+			case R.id.menu_show_missing:
+				showMissingArtists();
+				break;
+		}
+
+		return false;
+	}
+
 	@Override
 	public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) {
 		super.onCreateContextMenu(menu, view, menuInfo);
@@ -100,7 +104,7 @@ public class SimilarArtistFragment extends SelectListFragment<Artist> {
 
 	@Override
 	public int getOptionsMenu() {
-		return R.menu.empty;
+		return R.menu.similar_artists;
 	}
 
 	@Override
@@ -110,7 +114,7 @@ public class SimilarArtistFragment extends SelectListFragment<Artist> {
 
 	@Override
 	public List<Artist> getObjects(MusicService musicService, boolean refresh, ProgressListener listener) throws Exception {
-		ArtistInfo info = musicService.getArtistInfo(artistId, refresh, context, listener);
+		info = musicService.getArtistInfo(artistId, refresh, context, listener);
 		return info.getSimilarArtists();
 	}
 
@@ -118,4 +122,16 @@ public class SimilarArtistFragment extends SelectListFragment<Artist> {
 	public int getTitleResource() {
 		return R.string.menu_similar_artists;
 	}
+
+	private void showMissingArtists() {
+		StringBuilder b = new StringBuilder();
+
+		for(String name: info.getMissingArtists()) {
+			b.append("<h3><a href=\"https://www.google.com/#q=" + URLEncoder.encode(name) + "\">" + name + "</a></h3> ");
+		}
+
+		Util.showHTMLDialog(context, R.string.menu_similar_artists, b.toString());
+
+		// Util.info(context, R.string.menu_similar_artists, b.toString());
+	}
 }
diff --git a/src/github/daneren2005/dsub/util/Util.java b/src/github/daneren2005/dsub/util/Util.java
index ae0d668c..f899b9e4 100644
--- a/src/github/daneren2005/dsub/util/Util.java
+++ b/src/github/daneren2005/dsub/util/Util.java
@@ -1040,10 +1040,13 @@ public final class Util {
 		((TextView)dialog.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
     }
 	public static void showHTMLDialog(Context context, int title, int message) {
+		showHTMLDialog(context, title, context.getResources().getString(message));
+	}
+	public static void showHTMLDialog(Context context, int title, String message) {
 		AlertDialog dialog = new AlertDialog.Builder(context)
 			.setIcon(android.R.drawable.ic_dialog_info)
 			.setTitle(title)
-			.setMessage(Html.fromHtml(context.getResources().getString(message)))
+			.setMessage(Html.fromHtml(message))
 			.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int i) {
@@ -1051,6 +1054,8 @@ public final class Util {
 				}
 			})
 			.show();
+
+		((TextView)dialog.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
 	}
 
     public static void sleepQuietly(long millis) {
-- 
cgit v1.2.3


From f014c1d35b1d7b3d38266f07e7c825a3cc4f8a5b Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Tue, 13 Jan 2015 09:24:02 -0800
Subject: Add artist headers to grids as well

---
 res/layout/grid_view.xml                           |   2 +-
 .../dsub/fragments/SelectDirectoryFragment.java    |  23 +-
 .../daneren2005/dsub/view/HeaderGridView.java      | 785 +++++++++++++++++++++
 3 files changed, 803 insertions(+), 7 deletions(-)
 create mode 100644 src/github/daneren2005/dsub/view/HeaderGridView.java

(limited to 'res')

diff --git a/res/layout/grid_view.xml b/res/layout/grid_view.xml
index 40674c8d..7690d975 100644
--- a/res/layout/grid_view.xml
+++ b/res/layout/grid_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
+<github.daneren2005.dsub.view.HeaderGridView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/gridview"
 	android:layout_width="fill_parent"
 	android:layout_height="0dip"
diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
index 9cb8c582..b19caced 100644
--- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
@@ -54,6 +54,8 @@ import github.daneren2005.dsub.util.TabBackgroundTask;
 import github.daneren2005.dsub.util.UserUtil;
 import github.daneren2005.dsub.util.Util;
 import github.daneren2005.dsub.view.AlbumListAdapter;
+import github.daneren2005.dsub.view.HeaderGridView;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -687,10 +689,13 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
     private void finishLoading() {
 		// Show header if not album list type and not root and not artist
 		// For Subsonic 5.1+ display a header for artists with getArtistInfo data if it exists
+		View header = null;
 		if(albumListType == null && !"root".equals(id) && (!artist || (ServerInfo.checkServerVersion(context, "1.11") && artistInfo != null))) {
-			View header = createHeader();
-			if(header != null && entryList != null) {
+			header = createHeader();
+			// Only add header to entry list if we aren't going recreate album grid as root anyways
+			if(header != null && entryList != null && (!addAlbumHeader || entries.size() > 0)) {
 				entryList.addHeaderView(header, null, false);
+				header = null;
 			}
 		}
 
@@ -706,6 +711,12 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
 				
 				setupScrollList(albumList);
 				setupAlbumList();
+
+				// This should only not be null for a artist with only albums
+				if(header != null) {
+					HeaderGridView headerGridView = (HeaderGridView) albumList;
+					headerGridView.addHeaderView(header);
+				}
 			}
 			addAlbumHeader = false;
 		}
@@ -1390,13 +1401,13 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
 
 		TextView songCountView = (TextView) header.findViewById(R.id.select_album_song_count);
 		TextView songLengthView = (TextView) header.findViewById(R.id.select_album_song_length);
-		if(podcastDescription == null) {
+		if(podcastDescription != null || artistInfo != null) {
+			songCountView.setVisibility(View.GONE);
+			songLengthView.setVisibility(View.GONE);
+		} else {
 			String s = context.getResources().getQuantityString(R.plurals.select_album_n_songs, songCount, songCount);
 			songCountView.setText(s.toUpperCase());
 			songLengthView.setText(Util.formatDuration(totalDuration));
-		} else {
-			songCountView.setVisibility(View.GONE);
-			songLengthView.setVisibility(View.GONE);
 		}
 	}
 	private void setupButtonEvents(View header) {
diff --git a/src/github/daneren2005/dsub/view/HeaderGridView.java b/src/github/daneren2005/dsub/view/HeaderGridView.java
new file mode 100644
index 00000000..cd57dc0e
--- /dev/null
+++ b/src/github/daneren2005/dsub/view/HeaderGridView.java
@@ -0,0 +1,785 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package github.daneren2005.dsub.view;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.database.DataSetObservable;
+import android.database.DataSetObserver;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.*;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+
+/**
+ * A {@link GridView} that supports adding header rows in a
+ * very similar way to {@link android.widget.ListView}.
+ * See {@link HeaderGridView#addHeaderView(View, Object, boolean)}
+ * See {@link HeaderGridView#addFooterView(View, Object, boolean)}
+ */
+public class HeaderGridView extends GridView {
+
+	public static boolean DEBUG = false;
+
+	/**
+	 * A class that represents a fixed view in a list, for example a header at the top
+	 * or a footer at the bottom.
+	 */
+	private static class FixedViewInfo {
+		/**
+		 * The view to add to the grid
+		 */
+		public View view;
+		public ViewGroup viewContainer;
+		/**
+		 * The data backing the view. This is returned from {@link ListAdapter#getItem(int)}.
+		 */
+		public Object data;
+		/**
+		 * <code>true</code> if the fixed view should be selectable in the grid
+		 */
+		public boolean isSelectable;
+	}
+
+	private int mNumColumns = AUTO_FIT;
+	private View mViewForMeasureRowHeight = null;
+	private int mRowHeight = -1;
+	private static final String LOG_TAG = "grid-view-with-header-and-footer";
+
+	private ArrayList<FixedViewInfo> mHeaderViewInfos = new ArrayList<FixedViewInfo>();
+	private ArrayList<FixedViewInfo> mFooterViewInfos = new ArrayList<FixedViewInfo>();
+
+	private void initHeaderGridView() {
+	}
+
+	public HeaderGridView(Context context) {
+		super(context);
+		initHeaderGridView();
+	}
+
+	public HeaderGridView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		initHeaderGridView();
+	}
+
+	public HeaderGridView(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		initHeaderGridView();
+	}
+
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+		ListAdapter adapter = getAdapter();
+		if (adapter != null && adapter instanceof HeaderViewGridAdapter) {
+			((HeaderViewGridAdapter) adapter).setNumColumns(getNumColumnsCompatible());
+			((HeaderViewGridAdapter) adapter).setRowHeight(getRowHeight());
+		}
+	}
+
+	@Override
+	public void setClipChildren(boolean clipChildren) {
+		// Ignore, since the header rows depend on not being clipped
+	}
+
+	/**
+	 * Do not call this method unless you know how it works.
+	 *
+	 * @param clipChildren
+	 */
+	public void setClipChildrenSupper(boolean clipChildren) {
+		super.setClipChildren(false);
+	}
+
+	/**
+	 * Add a fixed view to appear at the top of the grid. If addHeaderView is
+	 * called more than once, the views will appear in the order they were
+	 * added. Views added using this call can take focus if they want.
+	 * <p/>
+	 * NOTE: Call this before calling setAdapter. This is so HeaderGridView can wrap
+	 * the supplied cursor with one that will also account for header views.
+	 *
+	 * @param v The view to add.
+	 */
+	public void addHeaderView(View v) {
+		addHeaderView(v, null, true);
+	}
+
+	/**
+	 * Add a fixed view to appear at the top of the grid. If addHeaderView is
+	 * called more than once, the views will appear in the order they were
+	 * added. Views added using this call can take focus if they want.
+	 * <p/>
+	 * NOTE: Call this before calling setAdapter. This is so HeaderGridView can wrap
+	 * the supplied cursor with one that will also account for header views.
+	 *
+	 * @param v            The view to add.
+	 * @param data         Data to associate with this view
+	 * @param isSelectable whether the item is selectable
+	 */
+	public void addHeaderView(View v, Object data, boolean isSelectable) {
+		ListAdapter adapter = getAdapter();
+		if (adapter != null && !(adapter instanceof HeaderViewGridAdapter)) {
+			throw new IllegalStateException(
+					"Cannot add header view to grid -- setAdapter has already been called.");
+		}
+
+		ViewGroup.LayoutParams lyp = v.getLayoutParams();
+
+		FixedViewInfo info = new FixedViewInfo();
+		FrameLayout fl = new FullWidthFixedViewLayout(getContext());
+
+		if (lyp != null) {
+			v.setLayoutParams(new FrameLayout.LayoutParams(lyp.width, lyp.height));
+			fl.setLayoutParams(new AbsListView.LayoutParams(lyp.width, lyp.height));
+		}
+		fl.addView(v);
+		info.view = v;
+		info.viewContainer = fl;
+		info.data = data;
+		info.isSelectable = isSelectable;
+		mHeaderViewInfos.add(info);
+		// in the case of re-adding a header view, or adding one later on,
+		// we need to notify the observer
+		if (adapter != null) {
+			((HeaderViewGridAdapter) adapter).notifyDataSetChanged();
+		}
+	}
+
+	public void addFooterView(View v) {
+		addFooterView(v, null, true);
+	}
+
+	public void addFooterView(View v, Object data, boolean isSelectable) {
+		ListAdapter mAdapter = getAdapter();
+		if (mAdapter != null && !(mAdapter instanceof HeaderViewGridAdapter)) {
+			throw new IllegalStateException(
+					"Cannot add header view to grid -- setAdapter has already been called.");
+		}
+
+		ViewGroup.LayoutParams lyp = v.getLayoutParams();
+
+		FixedViewInfo info = new FixedViewInfo();
+		FrameLayout fl = new FullWidthFixedViewLayout(getContext());
+
+		if (lyp != null) {
+			v.setLayoutParams(new FrameLayout.LayoutParams(lyp.width, lyp.height));
+			fl.setLayoutParams(new AbsListView.LayoutParams(lyp.width, lyp.height));
+		}
+		fl.addView(v);
+		info.view = v;
+		info.viewContainer = fl;
+		info.data = data;
+		info.isSelectable = isSelectable;
+		mFooterViewInfos.add(info);
+
+		if (mAdapter != null) {
+			((HeaderViewGridAdapter) mAdapter).notifyDataSetChanged();
+		}
+	}
+
+	public int getHeaderViewCount() {
+		return mHeaderViewInfos.size();
+	}
+
+	public int getFooterViewCount() {
+		return mFooterViewInfos.size();
+	}
+
+	/**
+	 * Removes a previously-added header view.
+	 *
+	 * @param v The view to remove
+	 * @return true if the view was removed, false if the view was not a header
+	 * view
+	 */
+	public boolean removeHeaderView(View v) {
+		if (mHeaderViewInfos.size() > 0) {
+			boolean result = false;
+			ListAdapter adapter = getAdapter();
+			if (adapter != null && ((HeaderViewGridAdapter) adapter).removeHeader(v)) {
+				result = true;
+			}
+			removeFixedViewInfo(v, mHeaderViewInfos);
+			return result;
+		}
+		return false;
+	}
+
+	/**
+	 * Removes a previously-added footer view.
+	 *
+	 * @param v The view to remove
+	 * @return true if the view was removed, false if the view was not a header
+	 * view
+	 */
+	public boolean removeFooterView(View v) {
+		if (mFooterViewInfos.size() > 0) {
+			boolean result = false;
+			ListAdapter adapter = getAdapter();
+			if (adapter != null && ((HeaderViewGridAdapter) adapter).removeFooter(v)) {
+				result = true;
+			}
+			removeFixedViewInfo(v, mFooterViewInfos);
+			return result;
+		}
+		return false;
+	}
+
+	private void removeFixedViewInfo(View v, ArrayList<FixedViewInfo> where) {
+		int len = where.size();
+		for (int i = 0; i < len; ++i) {
+			FixedViewInfo info = where.get(i);
+			if (info.view == v) {
+				where.remove(i);
+				break;
+			}
+		}
+	}
+
+	@TargetApi(11)
+	private int getNumColumnsCompatible() {
+		if (Build.VERSION.SDK_INT >= 11) {
+			return super.getNumColumns();
+		} else {
+			try {
+				Field numColumns = getClass().getSuperclass().getDeclaredField("mNumColumns");
+				numColumns.setAccessible(true);
+				return numColumns.getInt(this);
+			} catch (Exception e) {
+				if (mNumColumns != -1) {
+					return mNumColumns;
+				}
+				throw new RuntimeException("Can not determine the mNumColumns for this API platform, please call setNumColumns to set it.");
+			}
+		}
+	}
+
+	@TargetApi(16)
+	private int getColumnWidthCompatible() {
+		if (Build.VERSION.SDK_INT >= 16) {
+			return super.getColumnWidth();
+		} else {
+			try {
+				Field numColumns = getClass().getSuperclass().getDeclaredField("mColumnWidth");
+				numColumns.setAccessible(true);
+				return numColumns.getInt(this);
+			} catch (NoSuchFieldException e) {
+				throw new RuntimeException(e);
+			} catch (IllegalAccessException e) {
+				throw new RuntimeException(e);
+			}
+		}
+	}
+
+	@Override
+	protected void onDetachedFromWindow() {
+		super.onDetachedFromWindow();
+		mViewForMeasureRowHeight = null;
+	}
+
+	public void invalidateRowHeight() {
+		mRowHeight = -1;
+	}
+
+	public int getRowHeight() {
+		if (mRowHeight > 0) {
+			return mRowHeight;
+		}
+		ListAdapter adapter = getAdapter();
+		int numColumns = getNumColumnsCompatible();
+
+		// adapter has not been set or has no views in it;
+		if (adapter == null || adapter.getCount() <= numColumns * (mHeaderViewInfos.size() + mFooterViewInfos.size())) {
+			return -1;
+		}
+		int mColumnWidth = getColumnWidthCompatible();
+		View view = getAdapter().getView(numColumns * mHeaderViewInfos.size(), mViewForMeasureRowHeight, this);
+		AbsListView.LayoutParams p = (AbsListView.LayoutParams) view.getLayoutParams();
+		if (p == null) {
+			p = new AbsListView.LayoutParams(-1, -2, 0);
+			view.setLayoutParams(p);
+		}
+		int childHeightSpec = getChildMeasureSpec(
+				MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED), 0, p.height);
+		int childWidthSpec = getChildMeasureSpec(
+				MeasureSpec.makeMeasureSpec(mColumnWidth, MeasureSpec.EXACTLY), 0, p.width);
+		view.measure(childWidthSpec, childHeightSpec);
+		mViewForMeasureRowHeight = view;
+		mRowHeight = view.getMeasuredHeight();
+		return mRowHeight;
+	}
+
+	@TargetApi(11)
+	public void tryToScrollToBottomSmoothly() {
+		int lastPos = getAdapter().getCount() - 1;
+		if (Build.VERSION.SDK_INT >= 11) {
+			smoothScrollToPositionFromTop(lastPos, 0);
+		} else {
+			setSelection(lastPos);
+		}
+	}
+
+	@TargetApi(11)
+	public void tryToScrollToBottomSmoothly(int duration) {
+		int lastPos = getAdapter().getCount() - 1;
+		if (Build.VERSION.SDK_INT >= 11) {
+			smoothScrollToPositionFromTop(lastPos, 0, duration);
+		} else {
+			setSelection(lastPos);
+		}
+	}
+
+	@Override
+	public void setAdapter(ListAdapter adapter) {
+		if (mHeaderViewInfos.size() > 0 || mFooterViewInfos.size() > 0) {
+			HeaderViewGridAdapter headerViewGridAdapter = new HeaderViewGridAdapter(mHeaderViewInfos, mFooterViewInfos, adapter);
+			int numColumns = getNumColumnsCompatible();
+			if (numColumns > 1) {
+				headerViewGridAdapter.setNumColumns(numColumns);
+			}
+			headerViewGridAdapter.setRowHeight(getRowHeight());
+			super.setAdapter(headerViewGridAdapter);
+		} else {
+			super.setAdapter(adapter);
+		}
+	}
+
+	/**
+	 * full width
+	 */
+	private class FullWidthFixedViewLayout extends FrameLayout {
+
+		public FullWidthFixedViewLayout(Context context) {
+			super(context);
+		}
+
+		@Override
+		protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+			int realLeft = HeaderGridView.this.getPaddingLeft() + getPaddingLeft();
+			// Try to make where it should be, from left, full width
+			if (realLeft != left) {
+				offsetLeftAndRight(realLeft - left);
+			}
+			super.onLayout(changed, left, top, right, bottom);
+		}
+
+		@Override
+		protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+			int targetWidth = HeaderGridView.this.getMeasuredWidth()
+					- HeaderGridView.this.getPaddingLeft()
+					- HeaderGridView.this.getPaddingRight();
+			widthMeasureSpec = MeasureSpec.makeMeasureSpec(targetWidth,
+					MeasureSpec.getMode(widthMeasureSpec));
+			super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+		}
+	}
+
+	@Override
+	public void setNumColumns(int numColumns) {
+		super.setNumColumns(numColumns);
+		mNumColumns = numColumns;
+		ListAdapter adapter = getAdapter();
+		if (adapter != null && adapter instanceof HeaderViewGridAdapter) {
+			((HeaderViewGridAdapter) adapter).setNumColumns(numColumns);
+		}
+	}
+
+	/**
+	 * ListAdapter used when a HeaderGridView has header views. This ListAdapter
+	 * wraps another one and also keeps track of the header views and their
+	 * associated data objects.
+	 * <p>This is intended as a base class; you will probably not need to
+	 * use this class directly in your own code.
+	 */
+	private static class HeaderViewGridAdapter implements WrapperListAdapter, Filterable {
+		// This is used to notify the container of updates relating to number of columns
+		// or headers changing, which changes the number of placeholders needed
+		private final DataSetObservable mDataSetObservable = new DataSetObservable();
+		private final ListAdapter mAdapter;
+		static final ArrayList<FixedViewInfo> EMPTY_INFO_LIST =
+				new ArrayList<FixedViewInfo>();
+
+		// This ArrayList is assumed to NOT be null.
+		ArrayList<FixedViewInfo> mHeaderViewInfos;
+		ArrayList<FixedViewInfo> mFooterViewInfos;
+		private int mNumColumns = 1;
+		private int mRowHeight = -1;
+		boolean mAreAllFixedViewsSelectable;
+		private final boolean mIsFilterable;
+		private boolean mCachePlaceHoldView = true;
+		// From Recycle Bin or calling getView, this a question...
+		private boolean mCacheFirstHeaderView = false;
+
+		public HeaderViewGridAdapter(ArrayList<FixedViewInfo> headerViewInfos, ArrayList<FixedViewInfo> footViewInfos, ListAdapter adapter) {
+			mAdapter = adapter;
+			mIsFilterable = adapter instanceof Filterable;
+			if (headerViewInfos == null) {
+				mHeaderViewInfos = EMPTY_INFO_LIST;
+			} else {
+				mHeaderViewInfos = headerViewInfos;
+			}
+
+			if (footViewInfos == null) {
+				mFooterViewInfos = EMPTY_INFO_LIST;
+			} else {
+				mFooterViewInfos = footViewInfos;
+			}
+			mAreAllFixedViewsSelectable = areAllListInfosSelectable(mHeaderViewInfos)
+					&& areAllListInfosSelectable(mFooterViewInfos);
+		}
+
+		public void setNumColumns(int numColumns) {
+			if (numColumns < 1) {
+				return;
+			}
+			if (mNumColumns != numColumns) {
+				mNumColumns = numColumns;
+				notifyDataSetChanged();
+			}
+		}
+
+		public void setRowHeight(int height) {
+			mRowHeight = height;
+		}
+
+		public int getHeadersCount() {
+			return mHeaderViewInfos.size();
+		}
+
+		public int getFootersCount() {
+			return mFooterViewInfos.size();
+		}
+
+		@Override
+		public boolean isEmpty() {
+			return (mAdapter == null || mAdapter.isEmpty()) && getHeadersCount() == 0 && getFootersCount() == 0;
+		}
+
+		private boolean areAllListInfosSelectable(ArrayList<FixedViewInfo> infos) {
+			if (infos != null) {
+				for (FixedViewInfo info : infos) {
+					if (!info.isSelectable) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+
+		public boolean removeHeader(View v) {
+			for (int i = 0; i < mHeaderViewInfos.size(); i++) {
+				FixedViewInfo info = mHeaderViewInfos.get(i);
+				if (info.view == v) {
+					mHeaderViewInfos.remove(i);
+					mAreAllFixedViewsSelectable =
+							areAllListInfosSelectable(mHeaderViewInfos) && areAllListInfosSelectable(mFooterViewInfos);
+					mDataSetObservable.notifyChanged();
+					return true;
+				}
+			}
+			return false;
+		}
+
+		public boolean removeFooter(View v) {
+			for (int i = 0; i < mFooterViewInfos.size(); i++) {
+				FixedViewInfo info = mFooterViewInfos.get(i);
+				if (info.view == v) {
+					mFooterViewInfos.remove(i);
+					mAreAllFixedViewsSelectable =
+							areAllListInfosSelectable(mHeaderViewInfos) && areAllListInfosSelectable(mFooterViewInfos);
+					mDataSetObservable.notifyChanged();
+					return true;
+				}
+			}
+			return false;
+		}
+
+		@Override
+		public int getCount() {
+			if (mAdapter != null) {
+				return (getFootersCount() + getHeadersCount()) * mNumColumns + getAdapterAndPlaceHolderCount();
+			} else {
+				return (getFootersCount() + getHeadersCount()) * mNumColumns;
+			}
+		}
+
+		@Override
+		public boolean areAllItemsEnabled() {
+			if (mAdapter != null) {
+				return mAreAllFixedViewsSelectable && mAdapter.areAllItemsEnabled();
+			} else {
+				return true;
+			}
+		}
+
+		private int getAdapterAndPlaceHolderCount() {
+			final int adapterCount = (int) (Math.ceil(1f * mAdapter.getCount() / mNumColumns) * mNumColumns);
+			return adapterCount;
+		}
+
+		@Override
+		public boolean isEnabled(int position) {
+			// Header (negative positions will throw an IndexOutOfBoundsException)
+			int numHeadersAndPlaceholders = getHeadersCount() * mNumColumns;
+			if (position < numHeadersAndPlaceholders) {
+				return position % mNumColumns == 0
+						&& mHeaderViewInfos.get(position / mNumColumns).isSelectable;
+			}
+
+			// Adapter
+			final int adjPosition = position - numHeadersAndPlaceholders;
+			int adapterCount = 0;
+			if (mAdapter != null) {
+				adapterCount = getAdapterAndPlaceHolderCount();
+				if (adjPosition < adapterCount) {
+					return adjPosition < mAdapter.getCount() && mAdapter.isEnabled(adjPosition);
+				}
+			}
+
+			// Footer (off-limits positions will throw an IndexOutOfBoundsException)
+			final int footerPosition = adjPosition - adapterCount;
+			return footerPosition % mNumColumns == 0
+					&& mFooterViewInfos.get(footerPosition / mNumColumns).isSelectable;
+		}
+
+		@Override
+		public Object getItem(int position) {
+			// Header (negative positions will throw an ArrayIndexOutOfBoundsException)
+			int numHeadersAndPlaceholders = getHeadersCount() * mNumColumns;
+			if (position < numHeadersAndPlaceholders) {
+				if (position % mNumColumns == 0) {
+					return mHeaderViewInfos.get(position / mNumColumns).data;
+				}
+				return null;
+			}
+
+			// Adapter
+			final int adjPosition = position - numHeadersAndPlaceholders;
+			int adapterCount = 0;
+			if (mAdapter != null) {
+				adapterCount = getAdapterAndPlaceHolderCount();
+				if (adjPosition < adapterCount) {
+					if (adjPosition < mAdapter.getCount()) {
+						return mAdapter.getItem(adjPosition);
+					} else {
+						return null;
+					}
+				}
+			}
+
+			// Footer (off-limits positions will throw an IndexOutOfBoundsException)
+			final int footerPosition = adjPosition - adapterCount;
+			if (footerPosition % mNumColumns == 0) {
+				return mFooterViewInfos.get(footerPosition).data;
+			} else {
+				return null;
+			}
+		}
+
+		@Override
+		public long getItemId(int position) {
+			int numHeadersAndPlaceholders = getHeadersCount() * mNumColumns;
+			if (mAdapter != null && position >= numHeadersAndPlaceholders) {
+				int adjPosition = position - numHeadersAndPlaceholders;
+				int adapterCount = mAdapter.getCount();
+				if (adjPosition < adapterCount) {
+					return mAdapter.getItemId(adjPosition);
+				}
+			}
+			return -1;
+		}
+
+		@Override
+		public boolean hasStableIds() {
+			if (mAdapter != null) {
+				return mAdapter.hasStableIds();
+			}
+			return false;
+		}
+
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+			if (DEBUG) {
+				Log.d(LOG_TAG, String.format("getView: %s, reused: %s", position, convertView == null));
+			}
+			// Header (negative positions will throw an ArrayIndexOutOfBoundsException)
+			int numHeadersAndPlaceholders = getHeadersCount() * mNumColumns;
+			if (position < numHeadersAndPlaceholders) {
+				View headerViewContainer = mHeaderViewInfos
+						.get(position / mNumColumns).viewContainer;
+				if (position % mNumColumns == 0) {
+					return headerViewContainer;
+				} else {
+					if (convertView == null) {
+						convertView = new View(parent.getContext());
+					}
+					// We need to do this because GridView uses the height of the last item
+					// in a row to determine the height for the entire row.
+					convertView.setVisibility(View.INVISIBLE);
+					convertView.setMinimumHeight(headerViewContainer.getHeight());
+					return convertView;
+				}
+			}
+			// Adapter
+			final int adjPosition = position - numHeadersAndPlaceholders;
+			int adapterCount = 0;
+			if (mAdapter != null) {
+				adapterCount = getAdapterAndPlaceHolderCount();
+				if (adjPosition < adapterCount) {
+					if (adjPosition < mAdapter.getCount()) {
+						View view = mAdapter.getView(adjPosition, convertView, parent);
+						return view;
+					} else {
+						if (convertView == null) {
+							convertView = new View(parent.getContext());
+						}
+						convertView.setVisibility(View.INVISIBLE);
+						convertView.setMinimumHeight(mRowHeight);
+						return convertView;
+					}
+				}
+			}
+			// Footer
+			final int footerPosition = adjPosition - adapterCount;
+			if (footerPosition < getCount()) {
+				View footViewContainer = mFooterViewInfos
+						.get(footerPosition / mNumColumns).viewContainer;
+				if (position % mNumColumns == 0) {
+					return footViewContainer;
+				} else {
+					if (convertView == null) {
+						convertView = new View(parent.getContext());
+					}
+					// We need to do this because GridView uses the height of the last item
+					// in a row to determine the height for the entire row.
+					convertView.setVisibility(View.INVISIBLE);
+					convertView.setMinimumHeight(footViewContainer.getHeight());
+					return convertView;
+				}
+			}
+			throw new ArrayIndexOutOfBoundsException(position);
+		}
+
+		@Override
+		public int getItemViewType(int position) {
+
+			final int numHeadersAndPlaceholders = getHeadersCount() * mNumColumns;
+			final int adapterViewTypeStart = mAdapter == null ? 0 : mAdapter.getViewTypeCount() - 1;
+			int type = AdapterView.ITEM_VIEW_TYPE_HEADER_OR_FOOTER;
+			if (mCachePlaceHoldView) {
+				// Header
+				if (position < numHeadersAndPlaceholders) {
+					if (position == 0) {
+						if (mCacheFirstHeaderView) {
+							type = adapterViewTypeStart + mHeaderViewInfos.size() + mFooterViewInfos.size() + 1 + 1;
+						}
+					}
+					if (position % mNumColumns != 0) {
+						type = adapterViewTypeStart + (position / mNumColumns + 1);
+					}
+				}
+			}
+
+			// Adapter
+			final int adjPosition = position - numHeadersAndPlaceholders;
+			int adapterCount = 0;
+			if (mAdapter != null) {
+				adapterCount = getAdapterAndPlaceHolderCount();
+				if (adjPosition >= 0 && adjPosition < adapterCount) {
+					if (adjPosition < mAdapter.getCount()) {
+						type = mAdapter.getItemViewType(adjPosition);
+					} else {
+						if (mCachePlaceHoldView) {
+							type = adapterViewTypeStart + mHeaderViewInfos.size() + 1;
+						}
+					}
+				}
+			}
+
+			if (mCachePlaceHoldView) {
+				// Footer
+				final int footerPosition = adjPosition - adapterCount;
+				if (footerPosition >= 0 && footerPosition < getCount() && (footerPosition % mNumColumns) != 0) {
+					type = adapterViewTypeStart + mHeaderViewInfos.size() + 1 + (footerPosition / mNumColumns + 1);
+				}
+			}
+			if (DEBUG) {
+				Log.d(LOG_TAG, String.format("getItemViewType: pos: %s, result: %s", position, type, mCachePlaceHoldView, mCacheFirstHeaderView));
+			}
+			return type;
+		}
+
+		/**
+		 * content view, content view holder, header[0], header and footer placeholder(s)
+		 *
+		 * @return
+		 */
+		@Override
+		public int getViewTypeCount() {
+			int count = mAdapter == null ? 1 : mAdapter.getViewTypeCount();
+			if (mCachePlaceHoldView) {
+				int offset = mHeaderViewInfos.size() + 1 + mFooterViewInfos.size();
+				if (mCacheFirstHeaderView) {
+					offset += 1;
+				}
+				count += offset;
+			}
+			if (DEBUG) {
+				Log.d(LOG_TAG, String.format("getViewTypeCount: %s", count));
+			}
+			return count;
+		}
+
+		@Override
+		public void registerDataSetObserver(DataSetObserver observer) {
+			mDataSetObservable.registerObserver(observer);
+			if (mAdapter != null) {
+				mAdapter.registerDataSetObserver(observer);
+			}
+		}
+
+		@Override
+		public void unregisterDataSetObserver(DataSetObserver observer) {
+			mDataSetObservable.unregisterObserver(observer);
+			if (mAdapter != null) {
+				mAdapter.unregisterDataSetObserver(observer);
+			}
+		}
+
+		@Override
+		public Filter getFilter() {
+			if (mIsFilterable) {
+				return ((Filterable) mAdapter).getFilter();
+			}
+			return null;
+		}
+
+		@Override
+		public ListAdapter getWrappedAdapter() {
+			return mAdapter;
+		}
+
+		public void notifyDataSetChanged() {
+			mDataSetObservable.notifyChanged();
+		}
+	}
+}
-- 
cgit v1.2.3


From 719811985eee20c0f98f4740347e8e66b490a4f9 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 15 Jan 2015 09:17:42 -0800
Subject: Make text wrap from around image in header

---
 res/layout/select_album_header.xml                 |  1 +
 .../dsub/fragments/SelectDirectoryFragment.java    | 36 ++++++++++++++++++++--
 .../dsub/view/MyLeadingMarginSpan2.java            | 34 ++++++++++++++++++++
 3 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 src/github/daneren2005/dsub/view/MyLeadingMarginSpan2.java

(limited to 'res')

diff --git a/res/layout/select_album_header.xml b/res/layout/select_album_header.xml
index 8b13ee68..abc16e58 100644
--- a/res/layout/select_album_header.xml
+++ b/res/layout/select_album_header.xml
@@ -15,6 +15,7 @@
 		android:contentDescription="@null"/>
 
 	<LinearLayout
+		android:id="@+id/select_album_text_layout"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:layout_toRightOf="@+id/select_album_art"
diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
index b19caced..7342fc79 100644
--- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
@@ -5,15 +5,21 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Canvas;
+import android.graphics.Paint;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.text.Html;
+import android.text.Layout;
+import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
+import android.text.style.LeadingMarginSpan;
 import android.util.Log;
 import android.view.ContextMenu;
+import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -27,6 +33,7 @@ import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.RatingBar;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.domain.ArtistInfo;
@@ -55,6 +62,7 @@ import github.daneren2005.dsub.util.UserUtil;
 import github.daneren2005.dsub.util.Util;
 import github.daneren2005.dsub.view.AlbumListAdapter;
 import github.daneren2005.dsub.view.HeaderGridView;
+import github.daneren2005.dsub.view.MyLeadingMarginSpan2;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1320,8 +1328,8 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
 			imageLoader.loadImage(coverArtView, albumRep, false, true);
 		}
 	}
-	private void setupTextDisplay(View header) {
-		TextView titleView = (TextView) header.findViewById(R.id.select_album_title);
+	private void setupTextDisplay(final View header) {
+		final TextView titleView = (TextView) header.findViewById(R.id.select_album_title);
 		if(playlistName != null) {
 			titleView.setText(playlistName);
 		} else if(podcastName != null) {
@@ -1370,12 +1378,36 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
 			artistView.setLines(5);
 			artistView.setTextAppearance(context, android.R.style.TextAppearance_Small);
 
+			final Spanned spannedText = spanned;
 			artistView.setOnClickListener(new View.OnClickListener() {
 				@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 				@Override
 				public void onClick(View v) {
 					if(artistView.getMaxLines() == 5) {
+						// Use LeadingMarginSpan2 to try to make text flow around image
+						Display display = context.getWindowManager().getDefaultDisplay();
+						View coverArtView = header.findViewById(R.id.select_album_art);
+						coverArtView.measure(display.getWidth(), display.getHeight());
+						ViewGroup.MarginLayoutParams vlp = (ViewGroup.MarginLayoutParams) coverArtView.getLayoutParams();
+						int height = coverArtView.getMeasuredHeight() + coverArtView.getPaddingBottom();
+						int width = coverArtView.getWidth() + coverArtView.getPaddingRight();
+						float textLineHeight = artistView.getPaint().getTextSize();
+						int lines = (int) Math.ceil(height / textLineHeight);
+
+						SpannableString ss = new SpannableString(spannedText);
+						ss.setSpan(new MyLeadingMarginSpan2(lines, width), 0, ss.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+						View linearLayout = header.findViewById(R.id.select_album_text_layout);
+						RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) linearLayout.getLayoutParams();
+						int[]rules = params.getRules();
+						rules[RelativeLayout.RIGHT_OF] = 0;
+						params.leftMargin = vlp.rightMargin;
+
+						artistView.setText(ss);
 						artistView.setMaxLines(100);
+
+						vlp = (ViewGroup.MarginLayoutParams) titleView.getLayoutParams();
+						vlp.leftMargin = width;
 					} else {
 						artistView.setMaxLines(5);
 					}
diff --git a/src/github/daneren2005/dsub/view/MyLeadingMarginSpan2.java b/src/github/daneren2005/dsub/view/MyLeadingMarginSpan2.java
new file mode 100644
index 00000000..20281a28
--- /dev/null
+++ b/src/github/daneren2005/dsub/view/MyLeadingMarginSpan2.java
@@ -0,0 +1,34 @@
+package github.daneren2005.dsub.view;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.text.Layout;
+import android.text.style.LeadingMarginSpan;
+
+/**
+ * Created by Scott on 1/13/2015.
+ */
+public class MyLeadingMarginSpan2 implements LeadingMarginSpan.LeadingMarginSpan2 {
+	private int margin;
+	private int lines;
+
+	public MyLeadingMarginSpan2(int lines, int margin) {
+		this.margin = margin;
+		this.lines = lines;
+	}
+
+	@Override
+	public int getLeadingMargin(boolean first) {
+		return first ? margin : 0;
+	}
+
+	@Override
+	public int getLeadingMarginLineCount() {
+		return lines;
+	}
+
+	@Override
+	public void drawLeadingMargin(Canvas c, Paint p, int x, int dir,
+								  int top, int baseline, int bottom, CharSequence text,
+								  int start, int end, boolean first, Layout layout) {}
+}
-- 
cgit v1.2.3