tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed bus. Will be replaced by an intent system soon.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-07-13 03:14:01 +02:00
commit b808491206
26 changed files with 14 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

30
app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
View file

@ -9,7 +9,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.base.MediaEntryViewHolder;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
@ -22,14 +21,12 @@ import com.kabouzeid.gramophone.loader.ArtistLoader;
import com.kabouzeid.gramophone.loader.SongLoader;
import com.kabouzeid.gramophone.model.Album;
import com.kabouzeid.gramophone.model.Artist;
import com.kabouzeid.gramophone.model.DataBaseChangedEvent;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.ColorUtil;
import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.NavigationUtil;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.squareup.otto.Subscribe;
import java.util.ArrayList;
import java.util.Collections;
@ -49,12 +46,8 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
private static final int ARTIST = 2;
private static final int SONG = 3;
@NonNull
private final AppCompatActivity activity;
@NonNull
private List results = Collections.emptyList();
private String query;
@NonNull
private final LastFMRestClient lastFMRestClient;
public SearchAdapter(@NonNull AppCompatActivity activity) {
@ -64,7 +57,6 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
@SuppressWarnings("unchecked")
public void search(@NonNull String query) {
this.query = query;
results = new ArrayList();
if (!query.trim().equals("")) {
List songs = SongLoader.getSongs(activity, query);
@ -250,26 +242,4 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
}
}
}
@Override
public void onDetachedFromRecyclerView(RecyclerView recyclerView) {
super.onDetachedFromRecyclerView(recyclerView);
App.bus.unregister(this);
}
@Override
public void onAttachedToRecyclerView(RecyclerView recyclerView) {
super.onAttachedToRecyclerView(recyclerView);
App.bus.register(this);
}
@Subscribe
public void onDataBaseEvent(@NonNull DataBaseChangedEvent event) {
switch (event.getAction()) {
case DataBaseChangedEvent.ALBUMS_CHANGED:
case DataBaseChangedEvent.DATABASE_CHANGED:
search(query);
break;
}
}
}

12
app/src/main/java/com/kabouzeid/gramophone/adapter/song/ArtistSongAdapter.java
View file

@ -52,10 +52,8 @@ public class ArtistSongAdapter extends ArrayAdapter<Song> implements MaterialCab
dataSet = songs;
}
public void updateDataSet(ArrayList<Song> objects) {
dataSet = objects;
clear();
addAll(dataSet);
public ArrayList<Song> getDataSet() {
return dataSet;
}
@Nullable
@ -167,7 +165,7 @@ public class ArtistSongAdapter extends ArrayAdapter<Song> implements MaterialCab
}
}
private void uncheckAll() {
private void unCheckAll() {
checked.clear();
notifyDataSetChanged();
}
@ -189,13 +187,13 @@ public class ArtistSongAdapter extends ArrayAdapter<Song> implements MaterialCab
public boolean onCabItemClicked(@NonNull MenuItem menuItem) {
onMultipleItemAction(menuItem, new ArrayList<>(checked));
cab.finish();
uncheckAll();
unCheckAll();
return true;
}
@Override
public boolean onCabFinished(MaterialCab materialCab) {
uncheckAll();
unCheckAll();
return true;
}
}