#575: Add batch star/unstar

3 files changed, 8 insertions, 9 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/EntryGridAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/EntryGridAdapter.java
index 38931482..5693ba56 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/EntryGridAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/EntryGridAdapter.java
@@ -46,7 +46,6 @@ public class EntryGridAdapter extends SectionAdapter<Entry> {
 	private boolean largeAlbums;
 	private boolean showArtist = false;
 	private boolean removeFromPlaylist = false;
-	private boolean removeStarred = true;
 	private View header;
 
 	public EntryGridAdapter(Context context, List<Entry> entries, ImageLoader imageLoader, boolean largeCell) {
@@ -136,9 +135,6 @@ public class EntryGridAdapter extends SectionAdapter<Entry> {
 	public void setRemoveFromPlaylist(boolean removeFromPlaylist) {
 		this.removeFromPlaylist = removeFromPlaylist;
 	}
-	public void setRemoveStarred(boolean removeStarred) {
-		this.removeStarred = removeStarred;
-	}
 
 	@Override
 	public void onCreateActionModeMenu(Menu menu, MenuInflater menuInflater) {
@@ -151,8 +147,10 @@ public class EntryGridAdapter extends SectionAdapter<Entry> {
 		if(!removeFromPlaylist) {
 			menu.removeItem(R.id.menu_remove_playlist);
 		}
-		if(removeStarred) {
-			menu.removeItem(R.id.menu_unstar);
+
+		if(!selected.isEmpty()) {
+			boolean isStarred = selected.get(0).isStarred();
+			menu.findItem(R.id.menu_star).setTitle(isStarred ? R.string.common_unstar : R.string.common_star);
 		}
 	}
 }
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/PodcastChannelAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/PodcastChannelAdapter.java
index a95abeda..aeb98a6b 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/PodcastChannelAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/PodcastChannelAdapter.java
@@ -126,7 +126,7 @@ public class PodcastChannelAdapter extends SectionAdapter<Serializable> implemen
 		}
 
 		menu.removeItem(R.id.menu_remove_playlist);
-		menu.removeItem(R.id.menu_unstar);
+		menu.removeItem(R.id.menu_star);
 	}
 
 	@Override
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java
index d5f9a6ea..fbed4d7a 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java
@@ -414,14 +414,15 @@ public abstract class SectionAdapter<T> extends RecyclerView.Adapter<UpdateViewH
 				@Override
 				public boolean onCreateActionMode(ActionMode mode, Menu menu) {
 					currentActionMode = mode;
-					onCreateActionModeMenu(menu, mode.getMenuInflater());
-					MenuUtil.hideMenuItems(context, menu, updateView);
 
 					T item = holder.getItem();
 					selected.add(item);
 					selectedViews.add(updateView);
 					setChecked(updateView, true);
 
+					onCreateActionModeMenu(menu, mode.getMenuInflater());
+					MenuUtil.hideMenuItems(context, menu, updateView);
+
 					mode.setTitle(context.getResources().getString(R.string.select_album_n_selected, selected.size()));
 					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_COLOR_ACTION_BAR, true)) {
 						TypedValue typedValue = new TypedValue();