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

refactor some code and remove useless comments

Browse source
This commit is contained in:
dkanada 2020-04-25 17:55:06 +09:00
commit e876a57d01
55 changed files with 51 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java
View file

@ -1,6 +1,5 @@
package com.kabouzeid.gramophone.adapter;
import android.content.SharedPreferences;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
@ -16,7 +15,6 @@ import com.kabouzeid.gramophone.glide.CustomPaletteTarget;
import com.kabouzeid.gramophone.glide.SongGlideRequest;
import com.kabouzeid.gramophone.misc.CustomFragmentStatePagerAdapter;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.PreferenceUtil;
import java.util.List;
@ -24,9 +22,6 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
private List<Song> dataSet;

4
app/src/main/java/com/kabouzeid/gramophone/adapter/GenreAdapter.java
View file

@ -64,15 +64,19 @@ public class GenreAdapter extends RecyclerView.Adapter<GenreAdapter.ViewHolder>
holder.separator.setVisibility(View.VISIBLE);
}
}
if (holder.shortSeparator != null) {
holder.shortSeparator.setVisibility(View.GONE);
}
if (holder.menu != null) {
holder.menu.setVisibility(View.GONE);
}
if (holder.title != null) {
holder.title.setText(genre.name);
}
if (holder.text != null) {
holder.text.setText(MusicUtil.getGenreInfoString(activity, genre));
}

11
app/src/main/java/com/kabouzeid/gramophone/adapter/MusicLibraryPagerAdapter.java
View file

@ -62,6 +62,7 @@ public class MusicLibraryPagerAdapter extends FragmentPagerAdapter {
if (mWeakFragment != null && mWeakFragment.get() != null) {
return mWeakFragment.get();
}
return getItem(position);
}
@ -73,6 +74,7 @@ public class MusicLibraryPagerAdapter extends FragmentPagerAdapter {
return i;
}
}
return POSITION_NONE;
}
@ -90,6 +92,7 @@ public class MusicLibraryPagerAdapter extends FragmentPagerAdapter {
if (mWeakFragment != null) {
mWeakFragment.clear();
}
mFragmentArray.put(position, new WeakReference<>(mFragment));
return mFragment;
}
@ -97,8 +100,7 @@ public class MusicLibraryPagerAdapter extends FragmentPagerAdapter {
@Override
public Fragment getItem(final int position) {
final Holder mCurrentHolder = mHolderList.get(position);
return Fragment.instantiate(mContext,
mCurrentHolder.mClassName, mCurrentHolder.mParams);
return Fragment.instantiate(mContext, mCurrentHolder.mClassName, mCurrentHolder.mParams);
}
@Override
@ -128,7 +130,6 @@ public class MusicLibraryPagerAdapter extends FragmentPagerAdapter {
if (mFragmentArray.size() == 0) return;
HashMap<String, WeakReference<Fragment>> mappings = new HashMap<>(mFragmentArray.size());
for (int i = 0, size = mFragmentArray.size(); i < size; i++) {
WeakReference<Fragment> ref = mFragmentArray.valueAt(i);
Fragment fragment = ref.get();
@ -136,6 +137,7 @@ public class MusicLibraryPagerAdapter extends FragmentPagerAdapter {
mappings.put(fragment.getClass().getName(), ref);
}
}
for (int i = 0, size = mHolderList.size(); i < size; i++) {
WeakReference<Fragment> ref = mappings.get(mHolderList.get(i).mClassName);
if (ref != null) {
@ -166,8 +168,9 @@ public class MusicLibraryPagerAdapter extends FragmentPagerAdapter {
public static MusicFragments of(Class<?> cl) {
MusicFragments[] fragments = All.FRAGMENTS;
for (MusicFragments fragment : fragments) {
if (cl.equals(fragment.mFragmentClass))
if (cl.equals(fragment.mFragmentClass)) {
return fragment;
}
}
throw new IllegalArgumentException("Unknown music fragment " + cl);

10
app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
View file

@ -38,9 +38,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewHolder, Playlist> {
private static final int SMART_PLAYLIST = 0;
@ -112,6 +109,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
if (playlist instanceof AbsSmartPlaylist) {
return ((AbsSmartPlaylist) playlist).iconRes;
}
return MusicUtil.isFavoritePlaylist(activity, playlist) ? R.drawable.ic_favorite_white_24dp : R.drawable.ic_queue_music_white_24dp;
}
@ -148,6 +146,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
i--;
}
}
if (selection.size() > 0) {
DeletePlaylistDialog.create(selection).show(activity.getSupportFragmentManager(), "DELETE_PLAYLIST");
}
@ -176,7 +175,6 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
int failures = 0;
String dir = "";
for (Playlist playlist : params[0]) {
try {
dir = PlaylistsUtil.savePlaylist(App.getInstance().getApplicationContext(), playlist).getParent();
@ -212,11 +210,11 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
songs.addAll(PlaylistSongLoader.getPlaylistSongList(activity, playlist.id));
}
}
return songs;
}
public class ViewHolder extends MediaEntryViewHolder {
public ViewHolder(@NonNull View itemView, int itemViewType) {
super(itemView);
@ -244,6 +242,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
if (playlist instanceof LatestPlaylist) {
popupMenu.getMenu().findItem(R.id.action_clear_playlist).setVisible(false);
}
popupMenu.setOnMenuItemClickListener(item -> {
if (item.getItemId() == R.id.action_clear_playlist) {
if (playlist instanceof AbsSmartPlaylist) {
@ -254,6 +253,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
return PlaylistMenuHelper.handleMenuClick(
activity, dataSet.get(getAdapterPosition()), item);
});
popupMenu.show();
});
}

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

@ -26,9 +26,6 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
import java.util.ArrayList;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder> {
private static final int HEADER = 0;

12
app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
View file

@ -33,11 +33,7 @@ import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
import java.util.ArrayList;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder, Album> implements FastScrollRecyclerView.SectionedAdapter {
protected final AppCompatActivity activity;
protected List<Album> dataSet;
@ -124,6 +120,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
if (holder.title != null) {
holder.title.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)));
}
if (holder.text != null) {
holder.text.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)));
}
@ -144,10 +141,11 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
@Override
public void onColorReady(int color) {
if (usePalette)
if (usePalette) {
setColors(color, holder);
else
} else {
setColors(getDefaultFooterColor(), holder);
}
}
});
}
@ -183,6 +181,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
for (Album album : albums) {
songs.addAll(album.songs);
}
return songs;
}
@ -206,7 +205,6 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
}
public class ViewHolder extends MediaEntryViewHolder {
public ViewHolder(@NonNull final View itemView) {
super(itemView);
setImageTransitionName(activity.getString(R.string.transition_album_art));

10
app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java
View file

@ -20,11 +20,7 @@ import com.kabouzeid.gramophone.util.MusicUtil;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class HorizontalAlbumAdapter extends AlbumAdapter {
public HorizontalAlbumAdapter(@NonNull AppCompatActivity activity, List<Album> dataSet, boolean usePalette, @Nullable CabHolder cabHolder) {
super(activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, usePalette, cabHolder);
}
@ -44,6 +40,7 @@ public class HorizontalAlbumAdapter extends AlbumAdapter {
if (holder.title != null) {
holder.title.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)));
}
if (holder.text != null) {
holder.text.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)));
}
@ -65,10 +62,11 @@ public class HorizontalAlbumAdapter extends AlbumAdapter {
@Override
public void onColorReady(int color) {
if (usePalette)
if (usePalette) {
setColors(color, holder);
else
} else {
setColors(getAlbumArtistFooterColor(), holder);
}
}
});
}

20
app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
View file

@ -32,11 +32,7 @@ import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
import java.util.ArrayList;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist> implements FastScrollRecyclerView.SectionedAdapter {
protected final AppCompatActivity activity;
protected List<Artist> dataSet;
@ -103,11 +99,12 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
if (holder.title != null) {
holder.title.setText(artist.getName());
}
if (holder.text != null) {
holder.text.setText(MusicUtil.getArtistInfoString(activity, artist));
}
holder.itemView.setActivated(isChecked(artist));
holder.itemView.setActivated(isChecked(artist));
loadArtistImage(artist, holder);
}
@ -117,6 +114,7 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
if (holder.title != null) {
holder.title.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)));
}
if (holder.text != null) {
holder.text.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)));
}
@ -136,10 +134,11 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
@Override
public void onColorReady(int color) {
if (usePalette)
if (usePalette) {
setColors(color, holder);
else
} else {
setColors(getDefaultFooterColor(), holder);
}
}
});
}
@ -170,6 +169,7 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
for (Artist artist : artists) {
songs.addAll(artist.getSongs());
}
return songs;
}
@ -188,7 +188,6 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
}
public class ViewHolder extends MediaEntryViewHolder {
public ViewHolder(@NonNull View itemView) {
super(itemView);
setImageTransitionName(activity.getString(R.string.transition_artist_image));
@ -202,10 +201,7 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
if (isInQuickSelectMode()) {
toggleChecked(getAdapterPosition());
} else {
Pair[] artistPairs = new Pair[]{
Pair.create(image,
activity.getResources().getString(R.string.transition_artist_image)
)};
Pair[] artistPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_artist_image))};
NavigationUtil.goToArtist(activity, dataSet.get(getAdapterPosition()).getId(), artistPairs);
}
}

3
app/src/main/java/com/kabouzeid/gramophone/adapter/base/AbsMultiSelectAdapter.java
View file

@ -14,9 +14,6 @@ import com.kabouzeid.gramophone.interfaces.CabHolder;
import java.util.ArrayList;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public abstract class AbsMultiSelectAdapter<VH extends RecyclerView.ViewHolder, I> extends RecyclerView.Adapter<VH> implements MaterialCab.Callback {
private final Context context;
private final CabHolder cabHolder;

4
app/src/main/java/com/kabouzeid/gramophone/adapter/base/MediaEntryViewHolder.java
View file

@ -13,9 +13,6 @@ import com.kabouzeid.gramophone.R;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class MediaEntryViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
@Nullable
@BindView(R.id.image)
@ -74,6 +71,5 @@ public class MediaEntryViewHolder extends RecyclerView.ViewHolder implements Vie
@Override
public void onClick(View v) {
}
}

4
app/src/main/java/com/kabouzeid/gramophone/adapter/song/AbsOffsetSongAdapter.java
View file

@ -39,6 +39,7 @@ public abstract class AbsOffsetSongAdapter extends SongAdapter {
View view = LayoutInflater.from(activity).inflate(R.layout.item_list_single_row, parent, false);
return createViewHolder(view);
}
return super.onCreateViewHolder(parent, viewType);
}
@ -50,6 +51,7 @@ public abstract class AbsOffsetSongAdapter extends SongAdapter {
@Override
public long getItemId(int position) {
position--;
if (position < 0) return -2;
return super.getItemId(position);
}
@ -58,6 +60,7 @@ public abstract class AbsOffsetSongAdapter extends SongAdapter {
@Override
protected Song getIdentifier(int position) {
position--;
if (position < 0) return null;
return super.getIdentifier(position);
}
@ -82,7 +85,6 @@ public abstract class AbsOffsetSongAdapter extends SongAdapter {
}
public class ViewHolder extends SongAdapter.ViewHolder {
public ViewHolder(@NonNull View itemView) {
super(itemView);
}

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

@ -28,9 +28,6 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
import java.util.ArrayList;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class ArtistSongAdapter extends ArrayAdapter<Song> implements MaterialCab.Callback {
@Nullable
private final CabHolder cabHolder;

5
app/src/main/java/com/kabouzeid/gramophone/adapter/song/OrderablePlaylistSongAdapter.java
View file

@ -21,9 +21,6 @@ import com.kabouzeid.gramophone.util.ViewUtil;
import java.util.ArrayList;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
@SuppressWarnings("unchecked")
public class OrderablePlaylistSongAdapter extends PlaylistSongAdapter implements DraggableItemAdapter<OrderablePlaylistSongAdapter.ViewHolder> {
@ -43,6 +40,7 @@ public class OrderablePlaylistSongAdapter extends PlaylistSongAdapter implements
@Override
public long getItemId(int position) {
position--;
if (position < 0) return -2;
return ((List<PlaylistSong>) (List) dataSet).get(position).idInPlayList; // important!
}
@ -54,6 +52,7 @@ public class OrderablePlaylistSongAdapter extends PlaylistSongAdapter implements
RemoveFromPlaylistDialog.create((List<PlaylistSong>) (List) selection).show(activity.getSupportFragmentManager(), "ADD_PLAYLIST");
return;
}
super.onMultipleItemAction(menuItem, selection);
}

4
app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlayingQueueAdapter.java
View file

@ -19,11 +19,7 @@ import com.kabouzeid.gramophone.util.ViewUtil;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class PlayingQueueAdapter extends SongAdapter implements DraggableItemAdapter<PlayingQueueAdapter.ViewHolder> {
private static final int HISTORY = 0;
private static final int CURRENT = 1;
private static final int UP_NEXT = 2;

4
app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlaylistSongAdapter.java
View file

@ -18,11 +18,7 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
import java.util.ArrayList;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class PlaylistSongAdapter extends AbsOffsetSongAdapter {
public PlaylistSongAdapter(AppCompatActivity activity, @NonNull List<Song> dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) {
super(activity, dataSet, itemLayoutRes, usePalette, cabHolder, false);
setMultiSelectMenuRes(R.menu.menu_cannot_delete_single_songs_playlist_songs_selection);

5
app/src/main/java/com/kabouzeid/gramophone/adapter/song/ShuffleButtonSongAdapter.java
View file

@ -16,9 +16,6 @@ import com.kabouzeid.gramophone.model.Song;
import java.util.ArrayList;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class ShuffleButtonSongAdapter extends AbsOffsetSongAdapter {
public ShuffleButtonSongAdapter(AppCompatActivity activity, List<Song> dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) {
@ -63,7 +60,6 @@ public class ShuffleButtonSongAdapter extends AbsOffsetSongAdapter {
}
public class ViewHolder extends AbsOffsetSongAdapter.ViewHolder {
public ViewHolder(@NonNull View itemView) {
super(itemView);
}
@ -74,6 +70,7 @@ public class ShuffleButtonSongAdapter extends AbsOffsetSongAdapter {
MusicPlayerRemote.openAndShuffleQueue(dataSet, true);
return;
}
super.onClick(v);
}
}

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

@ -33,9 +33,6 @@ import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, Song> implements MaterialCab.Callback, FastScrollRecyclerView.SectionedAdapter {
protected final AppCompatActivity activity;
@ -115,7 +112,6 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
}
loadAlbumCover(song, holder);
}
private void setColors(int color, ViewHolder holder) {
@ -124,6 +120,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
if (holder.title != null) {
holder.title.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)));
}
if (holder.text != null) {
holder.text.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)));
}
@ -144,10 +141,11 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
@Override
public void onColorReady(int color) {
if (usePalette)
if (usePalette) {
setColors(color, holder);
else
} else {
setColors(getDefaultFooterColor(), holder);
}
}
});
}
@ -216,6 +214,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
if (menu == null) {
return;
}
menu.setOnClickListener(new SongMenuHelper.OnClickSongMenu(activity) {
@Override
public Song getSong() {
@ -253,6 +252,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
return true;
}
}
return false;
}

1
app/src/main/java/com/kabouzeid/gramophone/dialogs/AddToPlaylistDialog.java
View file

@ -45,6 +45,7 @@ public class AddToPlaylistDialog extends DialogFragment {
for (int i = 1; i < playlistNames.length; i++) {
playlistNames[i] = playlists.get(i - 1).name;
}
return new MaterialDialog.Builder(getActivity())
.title(R.string.action_add_to_playlist)
.items(playlistNames)

3
app/src/main/java/com/kabouzeid/gramophone/glide/ArtistGlideRequest.java
View file

@ -27,9 +27,6 @@ import com.kabouzeid.gramophone.model.Artist;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.ArtistSignatureUtil;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class ArtistGlideRequest {
private static final DiskCacheStrategy DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.ALL;

4
app/src/main/java/com/kabouzeid/gramophone/glide/BlurTransformation.java
View file

@ -19,9 +19,6 @@ import com.kabouzeid.gramophone.BuildConfig;
import com.kabouzeid.gramophone.helper.StackBlur;
import com.kabouzeid.gramophone.util.ImageUtil;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class BlurTransformation extends BitmapTransformation {
public static final float DEFAULT_BLUR_RADIUS = 5f;
@ -131,7 +128,6 @@ public class BlurTransformation extends BitmapTransformation {
rs.destroy();
return out;
} catch (RSRuntimeException e) {
// on some devices RenderScript.create() throws: android.support.v8.renderscript.RSRuntimeException: Error loading libRSSupport library
if (BuildConfig.DEBUG) e.printStackTrace();

4
app/src/main/java/com/kabouzeid/gramophone/glide/CustomGlideModule.java
View file

@ -12,13 +12,9 @@ import com.kabouzeid.gramophone.glide.artistimage.ArtistImageLoader;
import com.kabouzeid.gramophone.glide.audiocover.AudioFileCover;
import com.kabouzeid.gramophone.glide.audiocover.AudioFileCoverLoader;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class CustomGlideModule implements GlideModule {
@Override
public void applyOptions(Context context, GlideBuilder builder) {
}
@Override

3
app/src/main/java/com/kabouzeid/gramophone/glide/SongGlideRequest.java
View file

@ -18,9 +18,6 @@ import com.kabouzeid.gramophone.glide.palette.BitmapPaletteTranscoder;
import com.kabouzeid.gramophone.glide.palette.BitmapPaletteWrapper;
import com.kabouzeid.gramophone.model.Song;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class SongGlideRequest {
public static final DiskCacheStrategy DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.NONE;
public static final int DEFAULT_ERROR_IMAGE = R.drawable.default_album_art;

8
app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/AlbumCover.java
View file

@ -1,8 +1,5 @@
package com.kabouzeid.gramophone.glide.artistimage;
/**
* Used to define the artist cover
*/
public class AlbumCover {
private int year;
@ -10,28 +7,23 @@ public class AlbumCover {
private String filePath;
public AlbumCover(int year, String filePath) {
this.filePath = filePath;
this.year = year;
}
public int getYear() {
return year;
}
public void setYear(int year) {
this.year = year;
}
public String getFilePath() {
return filePath;
}
public void setFilePath(String filePath) {
this.filePath = filePath;
}
}

11
app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageFetcher.java
View file

@ -20,9 +20,6 @@ import com.bumptech.glide.load.data.DataFetcher;
import com.kabouzeid.gramophone.glide.audiocover.AudioFileCoverUtils;
import com.kabouzeid.gramophone.util.ImageUtil;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class ArtistImageFetcher implements DataFetcher<InputStream> {
private ArtistImage model;
@ -47,7 +44,6 @@ public class ArtistImageFetcher implements DataFetcher<InputStream> {
}
private InputStream getMosaic(final List<AlbumCover> albumCovers) throws FileNotFoundException {
MediaMetadataRetriever retriever = new MediaMetadataRetriever();
int artistBitMapSize = 512;
@ -66,7 +62,6 @@ public class ArtistImageFetcher implements DataFetcher<InputStream> {
}
int nbImages = images.size();
if (nbImages > 3) {
streams = new ArrayList<>(images.keySet());
@ -74,6 +69,7 @@ public class ArtistImageFetcher implements DataFetcher<InputStream> {
for (int i = 1; i < nbImages && Math.pow(i, 2) <= nbImages; ++i) {
divisor = i;
}
divisor += 1;
double nbTiles = Math.pow(divisor, 2);
@ -81,14 +77,13 @@ public class ArtistImageFetcher implements DataFetcher<InputStream> {
divisor -= 1;
nbTiles = Math.pow(divisor, 2);
}
final int resize = (artistBitMapSize / divisor) + 1;
final int resize = (artistBitMapSize / divisor) + 1;
final Bitmap bitmap = Bitmap.createBitmap(artistBitMapSize, artistBitMapSize, Bitmap.Config.RGB_565);
final Canvas canvas = new Canvas(bitmap);
int x = 0;
int y = 0;
for (int i = 0; i < streams.size() && i < nbTiles; ++i) {
final Bitmap bitmap1 = ImageUtil.resize(streams.get(i), resize, resize);
canvas.drawBitmap(bitmap1, x, y, null);
@ -128,6 +123,7 @@ public class ArtistImageFetcher implements DataFetcher<InputStream> {
e.printStackTrace();
}
}
return result;
}
@ -145,6 +141,5 @@ public class ArtistImageFetcher implements DataFetcher<InputStream> {
@Override
public void cancel() {
}
}

5
app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageLoader.java
View file

@ -9,11 +9,6 @@ import com.bumptech.glide.load.model.GenericLoaderFactory;
import com.bumptech.glide.load.model.ModelLoader;
import com.bumptech.glide.load.model.ModelLoaderFactory;
import com.bumptech.glide.load.model.stream.StreamModelLoader;
import com.kabouzeid.gramophone.util.PreferenceUtil;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class ArtistImageLoader implements StreamModelLoader<ArtistImage> {
private Context context;

3
app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCover.java
View file

@ -1,8 +1,5 @@
package com.kabouzeid.gramophone.glide.audiocover;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class AudioFileCover {
public final String filePath;

3
app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java
View file

@ -9,9 +9,6 @@ import java.io.InputStream;
import com.bumptech.glide.Priority;
import com.bumptech.glide.load.data.DataFetcher;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class AudioFileCoverFetcher implements DataFetcher<InputStream> {
private final AudioFileCover model;

3
app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverLoader.java
View file

@ -10,9 +10,6 @@ import com.bumptech.glide.load.model.stream.StreamModelLoader;
import java.io.InputStream;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class AudioFileCoverLoader implements StreamModelLoader<AudioFileCover> {
@Override

1
app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverUtils.java
View file

@ -36,6 +36,7 @@ public class AudioFileCoverUtils {
return new FileInputStream(cover);
}
}
return null;
}
}

3
app/src/main/java/com/kabouzeid/gramophone/glide/palette/BitmapPaletteResource.java
View file

@ -4,9 +4,6 @@ import com.bumptech.glide.load.engine.Resource;
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
import com.bumptech.glide.util.Util;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class BitmapPaletteResource implements Resource<BitmapPaletteWrapper> {
private final BitmapPaletteWrapper bitmapPaletteWrapper;

3
app/src/main/java/com/kabouzeid/gramophone/helper/HorizontalAdapterHelper.java
View file

@ -5,9 +5,6 @@ import android.view.ViewGroup;
import com.kabouzeid.gramophone.R;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class HorizontalAdapterHelper {
public static final int LAYOUT_RES = R.layout.item_grid_card_horizontal;

3
app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java
View file

@ -32,9 +32,6 @@ import java.util.List;
import java.util.Random;
import java.util.WeakHashMap;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class MusicPlayerRemote {
public static final String TAG = MusicPlayerRemote.class.getSimpleName();

3
app/src/main/java/com/kabouzeid/gramophone/helper/MusicProgressViewUpdateHelper.java
View file

@ -4,9 +4,6 @@ import android.os.Handler;
import android.os.Message;
import androidx.annotation.NonNull;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class MusicProgressViewUpdateHelper extends Handler {
private static final int CMD_REFRESH_PROGRESS_VIEWS = 1;

3
app/src/main/java/com/kabouzeid/gramophone/helper/PlayPauseButtonOnClickHandler.java
View file

@ -2,9 +2,6 @@ package com.kabouzeid.gramophone.helper;
import android.view.View;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class PlayPauseButtonOnClickHandler implements View.OnClickListener {
@Override
public void onClick(View v) {

3
app/src/main/java/com/kabouzeid/gramophone/helper/ShuffleHelper.java
View file

@ -7,9 +7,6 @@ import com.kabouzeid.gramophone.model.Song;
import java.util.Collections;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class ShuffleHelper {
public static void makeShuffleList(@NonNull List<Song> listToShuffle, final int current) {

3
app/src/main/java/com/kabouzeid/gramophone/helper/menu/PlaylistMenuHelper.java
View file

@ -24,9 +24,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class PlaylistMenuHelper {
public static boolean handleMenuClick(@NonNull AppCompatActivity activity, @NonNull final Playlist playlist, @NonNull MenuItem item) {
switch (item.getItemId()) {

3
app/src/main/java/com/kabouzeid/gramophone/helper/menu/SongMenuHelper.java
View file

@ -17,9 +17,6 @@ import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.NavigationUtil;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class SongMenuHelper {
public static final int MENU_RES = R.menu.menu_item_song;

4
app/src/main/java/com/kabouzeid/gramophone/helper/menu/SongsMenuHelper.java
View file

@ -11,9 +11,6 @@ import com.kabouzeid.gramophone.model.Song;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class SongsMenuHelper {
public static boolean handleMenuClick(@NonNull FragmentActivity activity, @NonNull List<Song> songs, int menuItemId) {
switch (menuItemId) {
@ -30,6 +27,7 @@ public class SongsMenuHelper {
DeleteSongsDialog.create(songs).show(activity.getSupportFragmentManager(), "DELETE_SONGS");
return true;
}
return false;
}
}

3
app/src/main/java/com/kabouzeid/gramophone/interfaces/CabHolder.java
View file

@ -4,9 +4,6 @@ import androidx.annotation.NonNull;
import com.afollestad.materialcab.MaterialCab;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public interface CabHolder {
@NonNull

3
app/src/main/java/com/kabouzeid/gramophone/interfaces/LoaderIds.java
View file

@ -1,8 +1,5 @@
package com.kabouzeid.gramophone.interfaces;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public interface LoaderIds {
int ALBUM_DETAIL_ACTIVITY = 1;
int ARTIST_DETAIL_ACTIVITY = 2;

3
app/src/main/java/com/kabouzeid/gramophone/interfaces/MusicServiceEventListener.java
View file

@ -1,8 +1,5 @@
package com.kabouzeid.gramophone.interfaces;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public interface MusicServiceEventListener {
void onServiceConnected();

3
app/src/main/java/com/kabouzeid/gramophone/interfaces/PaletteColorHolder.java
View file

@ -2,9 +2,6 @@ package com.kabouzeid.gramophone.interfaces;
import androidx.annotation.ColorInt;
/**
* @author Aidan Follestad (afollestad)
*/
public interface PaletteColorHolder {
@ColorInt

3
app/src/main/java/com/kabouzeid/gramophone/misc/DialogAsyncTask.java
View file

@ -8,9 +8,6 @@ import androidx.annotation.Nullable;
import java.lang.ref.WeakReference;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public abstract class DialogAsyncTask<Params, Progress, Result> extends WeakContextAsyncTask<Params, Progress, Result> {
private final int delay;
private WeakReference<Dialog> dialogWeakReference;

3
app/src/main/java/com/kabouzeid/gramophone/misc/SimpleAnimatorListener.java
View file

@ -2,9 +2,6 @@ package com.kabouzeid.gramophone.misc;
import android.animation.Animator;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public abstract class SimpleAnimatorListener implements Animator.AnimatorListener {
@Override
public void onAnimationStart(Animator animation) {

6
app/src/main/java/com/kabouzeid/gramophone/misc/SimpleObservableScrollViewCallbacks.java
View file

@ -3,22 +3,16 @@ package com.kabouzeid.gramophone.misc;
import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks;
import com.github.ksoichiro.android.observablescrollview.ScrollState;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public abstract class SimpleObservableScrollViewCallbacks implements ObservableScrollViewCallbacks {
@Override
public void onScrollChanged(int i, boolean b, boolean b2) {
}
@Override
public void onDownMotionEvent() {
}
@Override
public void onUpOrCancelMotionEvent(ScrollState scrollState) {
}
}

6
app/src/main/java/com/kabouzeid/gramophone/misc/SimpleOnSeekbarChangeListener.java
View file

@ -2,22 +2,16 @@ package com.kabouzeid.gramophone.misc;
import android.widget.SeekBar;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public abstract class SimpleOnSeekbarChangeListener implements SeekBar.OnSeekBarChangeListener {
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
}
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
}
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
}
}

3
app/src/main/java/com/kabouzeid/gramophone/misc/WeakContextAsyncTask.java
View file

@ -6,9 +6,6 @@ import androidx.annotation.Nullable;
import java.lang.ref.WeakReference;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public abstract class WeakContextAsyncTask<Params, Progress, Result> extends AsyncTask<Params, Progress, Result> {
private WeakReference<Context> contextWeakReference;

3
app/src/main/java/com/kabouzeid/gramophone/model/Album.java
View file

@ -9,9 +9,6 @@ import org.jellyfin.apiclient.model.dto.BaseItemDto;
import java.util.ArrayList;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class Album implements Parcelable {
public List<Song> songs;

3
app/src/main/java/com/kabouzeid/gramophone/model/Artist.java
View file

@ -11,9 +11,6 @@ import org.jellyfin.apiclient.model.dto.BaseItemDto;
import java.util.ArrayList;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class Artist implements Parcelable {
public static final String UNKNOWN_ARTIST_DISPLAY_NAME = "Unknown Artist";

3
app/src/main/java/com/kabouzeid/gramophone/model/Playlist.java
View file

@ -4,9 +4,6 @@ import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.NonNull;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class Playlist implements Parcelable {
public final int id;
public final String name;

3
app/src/main/java/com/kabouzeid/gramophone/model/Song.java
View file

@ -5,9 +5,6 @@ import android.os.Parcelable;
import org.jellyfin.apiclient.model.dto.BaseItemDto;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class Song implements Parcelable {
public static final Song EMPTY_SONG = new Song("", "", -1, -1, -1, "", -1, "", "", "", "");

3
app/src/main/java/com/kabouzeid/gramophone/model/playlist/AbsSmartPlaylist.java
View file

@ -11,9 +11,6 @@ import com.kabouzeid.gramophone.model.Song;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public abstract class AbsSmartPlaylist extends Playlist {
@DrawableRes
public final int iconRes;

3
app/src/main/java/com/kabouzeid/gramophone/model/playlist/FrequentPlaylist.java
View file

@ -11,9 +11,6 @@ import com.kabouzeid.gramophone.provider.SongPlayCountStore;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class FrequentPlaylist extends AbsSmartPlaylist {
public FrequentPlaylist(@NonNull Context context) {

3
app/src/main/java/com/kabouzeid/gramophone/model/playlist/LatestPlaylist.java
View file

@ -10,9 +10,6 @@ import com.kabouzeid.gramophone.R;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class LatestPlaylist extends AbsSmartPlaylist {
public LatestPlaylist(@NonNull Context context) {

3
app/src/main/java/com/kabouzeid/gramophone/model/playlist/RecentPlaylist.java
View file

@ -11,9 +11,6 @@ import com.kabouzeid.gramophone.R;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class RecentPlaylist extends AbsSmartPlaylist {
public RecentPlaylist(@NonNull Context context) {