Fixes #626: Put missing artists inline instead of requiring dialog

11 files changed, 104 insertions, 49 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/SimilarArtistAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/SimilarArtistAdapter.java
new file mode 100644
index 00000000..2234d4cd
--- /dev/null
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/SimilarArtistAdapter.java
@@ -0,0 +1,53 @@
+/*
+  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 2016 (C) Scott Jackson
+*/
+
+package github.daneren2005.dsub.adapter;
+
+import android.content.Context;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import github.daneren2005.dsub.domain.Artist;
+import github.daneren2005.dsub.view.ArtistView;
+import github.daneren2005.dsub.view.UpdateView;
+
+public class SimilarArtistAdapter extends SectionAdapter<Artist> {
+	public static int VIEW_TYPE_ARTIST = 4;
+
+	public SimilarArtistAdapter(Context context, List<Artist> artists, OnItemClickedListener onItemClickedListener) {
+		super(context, artists);
+		this.onItemClickedListener = onItemClickedListener;
+	}
+	public SimilarArtistAdapter(Context context, List<String> headers, List<List<Artist>> sections, OnItemClickedListener onItemClickedListener) {
+		super(context, headers, sections);
+		this.onItemClickedListener = onItemClickedListener;
+	}
+
+	@Override
+	public UpdateView.UpdateViewHolder onCreateSectionViewHolder(ViewGroup parent, int viewType) {
+		return new UpdateView.UpdateViewHolder(new ArtistView(context));
+	}
+
+	@Override
+	public void onBindViewHolder(UpdateView.UpdateViewHolder holder, Artist item, int viewType) {
+		holder.getUpdateView().setObject(item);
+	}
+
+	@Override
+	public int getItemViewType(Artist item) {
+		return VIEW_TYPE_ARTIST;
+	}
+}
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/Artist.java b/app/src/main/java/github/daneren2005/dsub/domain/Artist.java
index 56e8f92e..9d4cbe29 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/Artist.java
+++ b/app/src/main/java/github/daneren2005/dsub/domain/Artist.java
@@ -30,6 +30,8 @@ import java.util.List;
  */
 public class Artist implements Serializable {
 	private static final String TAG = Artist.class.getSimpleName();
+	public static final String ROOT_ID = "-1";
+	public static final String MISSING_ID = "-2";
 
     private String id;
     private String name;
@@ -38,6 +40,14 @@ public class Artist implements Serializable {
 	private Integer rating;
 	private int closeness;
 
+	public Artist() {
+
+	}
+	public Artist(String id, String name) {
+		this.id = id;
+		this.name = name;
+	}
+
     public String getId() {
         return id;
     }
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SimilarArtistFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SimilarArtistFragment.java
index 93e3a93a..a41b9d6f 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SimilarArtistFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SimilarArtistFragment.java
@@ -15,14 +15,16 @@
 
 package github.daneren2005.dsub.fragments;
 
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
 import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.ArtistAdapter;
 import github.daneren2005.dsub.adapter.SectionAdapter;
+import github.daneren2005.dsub.adapter.SimilarArtistAdapter;
 import github.daneren2005.dsub.domain.Artist;
 import github.daneren2005.dsub.domain.ArtistInfo;
 import github.daneren2005.dsub.domain.MusicDirectory;
@@ -35,6 +37,8 @@ import github.daneren2005.dsub.util.Util;
 import github.daneren2005.dsub.view.UpdateView;
 
 import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -52,18 +56,6 @@ public class SimilarArtistFragment extends SelectRecyclerFragment<Artist> {
 	}
 
 	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
-		super.onCreateOptionsMenu(menu, menuInflater);
-		if(!primaryFragment) {
-			return;
-		}
-
-		if(info.getMissingArtists().isEmpty()) {
-			menu.removeItem(R.id.menu_show_missing);
-		}
-	}
-
-	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 			case R.id.menu_play_now:
@@ -72,9 +64,6 @@ public class SimilarArtistFragment extends SelectRecyclerFragment<Artist> {
 			case R.id.menu_shuffle:
 				playAll(true);
 				return true;
-			case R.id.menu_show_missing:
-				showMissingArtists();
-				break;
 		}
 
 		return super.onOptionsItemSelected(item);
@@ -82,8 +71,10 @@ public class SimilarArtistFragment extends SelectRecyclerFragment<Artist> {
 
 	@Override
 	public void onCreateContextMenu(Menu menu, MenuInflater menuInflater, UpdateView<Artist> updateView, Artist item) {
-		onCreateContextMenuSupport(menu, menuInflater, updateView, item);
-		recreateContextMenu(menu);
+		if(!Artist.MISSING_ID.equals(item.getId())) {
+			onCreateContextMenuSupport(menu, menuInflater, updateView, item);
+			recreateContextMenu(menu);
+		}
 	}
 
 	@Override
@@ -93,14 +84,21 @@ public class SimilarArtistFragment extends SelectRecyclerFragment<Artist> {
 
 	@Override
 	public void onItemClicked(UpdateView<Artist> updateView, Artist artist) {
-		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);
+		if(Artist.MISSING_ID.equals(artist.getId())) {
+			String url = "http://www.last.fm/music/" + URLEncoder.encode(artist.getName());
+			Intent intent = new Intent(Intent.ACTION_VIEW);
+			intent.setData(Uri.parse(url));
+			startActivity(intent);
+		} else {
+			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
@@ -109,8 +107,22 @@ public class SimilarArtistFragment extends SelectRecyclerFragment<Artist> {
 	}
 
 	@Override
-	public SectionAdapter getAdapter(List<Artist> objects) {
-		return new ArtistAdapter(context, objects, this);
+	public SectionAdapter getAdapter(List<Artist> artists) {
+		if(info.getMissingArtists().isEmpty()) {
+			return new SimilarArtistAdapter(context, artists, this);
+		} else {
+			List<String> headers = new ArrayList<>();
+			headers.add(null);
+			headers.add(context.getResources().getString(R.string.menu_similar_artists_missing));
+
+			List<Artist> missingArtists = new ArrayList<>();
+			for(String artistName: info.getMissingArtists()) {
+				Artist artist = new Artist(Artist.MISSING_ID, artistName);
+				missingArtists.add(artist);
+			}
+
+			return new SimilarArtistAdapter(context, headers, Arrays.asList(artists, missingArtists), this);
+		}
 	}
 
 	@Override
@@ -124,16 +136,6 @@ public class SimilarArtistFragment extends SelectRecyclerFragment<Artist> {
 		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());
-	}
-
 	private void playAll(final boolean shuffle) {
 		new RecursiveLoader(context) {
 			@Override
diff --git a/app/src/main/res/menu/similar_artists.xml b/app/src/main/res/menu/similar_artists.xml
index f6c30fb2..2557381e 100644
--- a/app/src/main/res/menu/similar_artists.xml
+++ b/app/src/main/res/menu/similar_artists.xml
@@ -13,8 +13,4 @@
 		android:icon="?attr/shuffle"
 		android:title="@string/menu.shuffle"
 		compat:showAsAction="ifRoom|withText"/>
-
-	<item
-		android:id="@+id/menu_show_missing"
-		android:title="@string/menu.show_missing"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 13453ae6..3ab30895 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -106,7 +106,6 @@
 	<string name="menu.rate">Setze Bewertung</string>
 	<string name="menu.top_tracks">Last.FM Top Medien</string>
 	<string name="menu.similar_artists">Ähnliche Künstler</string>
-	<string name="menu.show_missing">Zeige fehlende</string>
 	<string name="menu.start_radio">Starte Radio</string>
 	<string name="menu.first_level_artist">Erste Ebene sind Künstler</string>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f56e939e..47f7ce7f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -96,7 +96,6 @@
 	<string name="menu.rate">Establecer valoración</string>
 	<string name="menu.top_tracks">Tp Tracks de Last.FM</string>
 	<string name="menu.similar_artists">Artistas similares</string>
-	<string name="menu.show_missing">Mostrar los que faltan</string>
 	<string name="menu.start_radio">Iniciar radio</string>
 
     <string name="playlist.label">Listas de reproducción</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index ea8d3eeb..11302cd3 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -111,7 +111,6 @@
 	<string name="menu.rate">Értékelés</string>
 	<string name="menu.top_tracks">Last.fm legjobb dalok</string>
 	<string name="menu.similar_artists">Hasonló előadók</string>
-	<string name="menu.show_missing">Hiányzó megjelenítése</string>
 	<string name="menu.start_radio">Rádió indítása</string>
 	<string name="menu.first_level_artist">Részletes megjelenítés</string>
 
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 4bf21c67..545e9505 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -109,7 +109,6 @@
 	<string name="menu.rate">Bepaal rating</string>
 	<string name="menu.top_tracks">Laatste .FM Top Nummers</string>
 	<string name="menu.similar_artists">Gelijke artiesten</string>
-	<string name="menu.show_missing">Toon missende</string>
 	<string name="menu.start_radio">Start radio</string>
 	<string name="menu.first_level_artist">Eerste niveau artiesten</string>
 
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 03b65571..75042859 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -110,7 +110,6 @@
 	<string name="menu.rate">Classificar</string>
 	<string name="menu.top_tracks">Top faixas do Last.FM</string>
 	<string name="menu.similar_artists">Artistas semelhantes</string>
-	<string name="menu.show_missing">Mostrar os que faltam</string>
 	<string name="menu.start_radio">Iniciar rádio</string>
 	<string name="menu.first_level_artist">Artistas no primeiro nível</string>
 
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 38add733..8288d155 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -111,7 +111,6 @@
 	<string name="menu.rate">Sätt betyg </string>
 	<string name="menu.top_tracks">Last.FM topp spår</string>
 	<string name="menu.similar_artists">Liknande artister</string>
-	<string name="menu.show_missing">Visa saknade</string>
 	<string name="menu.start_radio">Starta radio</string>
 	<string name="menu.first_level_artist">Första steget artister</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b59cf620..821f2ad3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -115,7 +115,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="menu.similar_artists.missing">Missing Artists</string>
 	<string name="menu.start_radio">Start Radio</string>
 	<string name="menu.first_level_artist">First level artists</string>