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

Code rearrange and delete songs

Browse source
This commit is contained in:
Karim Abou Zeid 2015-03-23 22:40:51 +01:00
commit 00e3724ab4
15 changed files with 223 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsFabActivity.java
View file

@ -33,8 +33,11 @@ public abstract class AbsFabActivity extends AbsBaseActivity {
@Override
protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
try {
App.bus.register(busEventListener);
} catch (Exception ignored) {
}
setUpFab();
App.bus.register(busEventListener);
}
private void setUpFab() {
@ -137,7 +140,10 @@ public abstract class AbsFabActivity extends AbsBaseActivity {
@Override
protected void onDestroy() {
super.onDestroy();
App.bus.unregister(busEventListener);
try {
App.bus.unregister(busEventListener);
} catch (Exception ignored) {
}
}
public void onMusicRemoteEvent(MusicRemoteEvent event) {

2
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java
View file

@ -2,9 +2,7 @@ package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments;
import android.app.Fragment;
import android.os.Build;
import android.view.ViewConfiguration;
import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble;
import com.kabouzeid.gramophone.ui.activities.MainActivity;

9
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AlbumViewFragment.java
View file

@ -9,10 +9,6 @@ import android.view.ViewGroup;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.AlbumAdapter;
import com.kabouzeid.gramophone.loader.AlbumLoader;
import com.kabouzeid.gramophone.model.Album;
import java.util.List;
/**
* Created by karim on 22.11.14.
@ -35,12 +31,9 @@ public class AlbumViewFragment extends AbsMainActivityFragment {
}
private void setUpRecyclerView() {
List<Album> albums = AlbumLoader.getAllAlbums(getActivity());
AlbumAdapter albumAdapter = new AlbumAdapter(getActivity(), albums);
recyclerView.setLayoutManager(new GridLayoutManager(getActivity(), 2));
recyclerView.setAdapter(albumAdapter);
recyclerView.setPadding(0, getTopPadding(), 0, getBottomPadding());
recyclerView.setAdapter(new AlbumAdapter(getActivity()));
}
@Override

9
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/ArtistViewFragment.java
View file

@ -10,10 +10,6 @@ import android.view.ViewGroup;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.ArtistAdapter;
import com.kabouzeid.gramophone.loader.ArtistLoader;
import com.kabouzeid.gramophone.model.Artist;
import java.util.List;
public class ArtistViewFragment extends AbsMainActivityFragment {
public static final String TAG = ArtistViewFragment.class.getSimpleName();
@ -33,12 +29,9 @@ public class ArtistViewFragment extends AbsMainActivityFragment {
}
private void setUpRecyclerView() {
List<Artist> artists = ArtistLoader.getAllArtists(getActivity());
ArtistAdapter artistAdapter = new ArtistAdapter(getActivity(), artists);
recyclerView.setLayoutManager(new GridLayoutManager(getActivity(), 1));
recyclerView.setAdapter(artistAdapter);
recyclerView.setPadding(0, getTopPadding(), 0, getBottomPadding());
recyclerView.setAdapter(new ArtistAdapter(getActivity()));
}
@Override

36
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/PlaylistViewFragment.java
View file

@ -8,15 +8,8 @@ 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.PlaylistAdapter;
import com.kabouzeid.gramophone.loader.PlaylistLoader;
import com.kabouzeid.gramophone.model.DataBaseChangedEvent;
import com.kabouzeid.gramophone.model.Playlist;
import com.squareup.otto.Subscribe;
import java.util.List;
public class PlaylistViewFragment extends AbsMainActivityFragment {
public static final String TAG = PlaylistViewFragment.class.getSimpleName();
@ -41,24 +34,13 @@ public class PlaylistViewFragment extends AbsMainActivityFragment {
setUpAdapter();
}
private void setUpAdapter(){
if(recyclerView != null) {
List<Playlist> playlists = PlaylistLoader.getAllPlaylists(getActivity());
PlaylistAdapter adapter = new PlaylistAdapter(getActivity(), playlists);
private void setUpAdapter() {
if (recyclerView != null) {
PlaylistAdapter adapter = new PlaylistAdapter(getActivity());
recyclerView.setAdapter(adapter);
}
}
@Subscribe
public void onDataBaseEvent(DataBaseChangedEvent event) {
switch (event.getAction()) {
case DataBaseChangedEvent.PLAYLISTS_CHANGED:
case DataBaseChangedEvent.DATABASE_CHANGED:
setUpAdapter();
break;
}
}
@Override
public void enableViews() {
super.enableViews();
@ -70,16 +52,4 @@ public class PlaylistViewFragment extends AbsMainActivityFragment {
super.disableViews();
recyclerView.setEnabled(false);
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
App.bus.register(this);
}
@Override
public void onDestroy() {
super.onDestroy();
App.bus.unregister(this);
}
}

9
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/SongViewFragment.java
View file

@ -9,10 +9,6 @@ import android.view.ViewGroup;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.songadapter.SongAdapter;
import com.kabouzeid.gramophone.loader.SongLoader;
import com.kabouzeid.gramophone.model.Song;
import java.util.List;
/**
* Created by karim on 29.12.14.
@ -35,12 +31,9 @@ public class SongViewFragment extends AbsMainActivityFragment {
}
private void setUpRecyclerView() {
List<Song> songs = SongLoader.getAllSongs(getActivity());
SongAdapter songAdapter = new SongAdapter(getActivity(), songs);
recyclerView.setLayoutManager(new GridLayoutManager(getActivity(), 1));
recyclerView.setAdapter(songAdapter);
recyclerView.setPadding(0, getTopPadding(), 0, getBottomPadding());
recyclerView.setAdapter(new SongAdapter(getActivity()));
}
@Override