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

Remove explicit parameter types

Browse source
This commit is contained in:
Eugene Cheung 2018-09-05 22:45:32 -04:00
commit c9eb6b9a08
No known key found for this signature in database
GPG key ID: E1FD745328866B0A
10 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,8 +83,8 @@ public class StackBlur {
original.getPixels(currentPixels, 0, w, 0, 0, w, h); original.getPixels(currentPixels, 0, w, 0, 0, w, h);
int cores = EXECUTOR_THREADS; int cores = EXECUTOR_THREADS;
ArrayList<BlurTask> horizontal = new ArrayList<BlurTask>(cores); ArrayList<BlurTask> horizontal = new ArrayList<>(cores);
ArrayList<BlurTask> vertical = new ArrayList<BlurTask>(cores); ArrayList<BlurTask> vertical = new ArrayList<>(cores);
for (int i = 0; i < cores; i++) { for (int i = 0; i < cores; i++) {
horizontal.add(new BlurTask(currentPixels, w, h, (int) radius, cores, i, 1)); horizontal.add(new BlurTask(currentPixels, w, h, (int) radius, cores, i, 1));
vertical.add(new BlurTask(currentPixels, w, h, (int) radius, cores, i, 2)); vertical.add(new BlurTask(currentPixels, w, h, (int) radius, cores, i, 2));

5
app/src/main/java/com/kabouzeid/gramophone/misc/CustomFragmentStatePagerAdapter.java
View file

@ -65,14 +65,15 @@ import java.util.ArrayList;
* complete} * complete}
*/ */
public abstract class CustomFragmentStatePagerAdapter extends android.support.v4.view.PagerAdapter { public abstract class CustomFragmentStatePagerAdapter extends android.support.v4.view.PagerAdapter {
public static final String TAG = CustomFragmentStatePagerAdapter.class.getSimpleName(); public static final String TAG = CustomFragmentStatePagerAdapter.class.getSimpleName();
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
private final FragmentManager mFragmentManager; private final FragmentManager mFragmentManager;
private FragmentTransaction mCurTransaction = null; private FragmentTransaction mCurTransaction = null;
private ArrayList<Fragment.SavedState> mSavedState = new ArrayList<Fragment.SavedState>(); private ArrayList<Fragment.SavedState> mSavedState = new ArrayList<>();
private ArrayList<Fragment> mFragments = new ArrayList<Fragment>(); private ArrayList<Fragment> mFragments = new ArrayList<>();
private Fragment mCurrentPrimaryItem = null; private Fragment mCurrentPrimaryItem = null;
public CustomFragmentStatePagerAdapter(FragmentManager fm) { public CustomFragmentStatePagerAdapter(FragmentManager fm) {

4
app/src/main/java/com/kabouzeid/gramophone/ui/activities/GenreDetailActivity.java
View file

@ -83,7 +83,7 @@ public class GenreDetailActivity extends AbsSlidingMusicPanelActivity implements
ViewUtil.setUpFastScrollRecyclerViewColor(this, ((FastScrollRecyclerView) recyclerView), ThemeStore.accentColor(this)); ViewUtil.setUpFastScrollRecyclerViewColor(this, ((FastScrollRecyclerView) recyclerView), ThemeStore.accentColor(this));
recyclerView.setLayoutManager(new LinearLayoutManager(this)); recyclerView.setLayoutManager(new LinearLayoutManager(this));
adapter = new SongAdapter(this, new ArrayList<Song>(), R.layout.item_list, false, this); adapter = new SongAdapter(this, new ArrayList<>(), R.layout.item_list, false, this);
recyclerView.setAdapter(adapter); recyclerView.setAdapter(adapter);
adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() { adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
@ -186,7 +186,7 @@ public class GenreDetailActivity extends AbsSlidingMusicPanelActivity implements
@Override @Override
public void onLoaderReset(Loader<ArrayList<Song>> loader) { public void onLoaderReset(Loader<ArrayList<Song>> loader) {
if (adapter != null) if (adapter != null)
adapter.swapDataSet(new ArrayList<Song>()); adapter.swapDataSet(new ArrayList<>());
} }
private static class AsyncGenreSongLoader extends WrappedAsyncTaskLoader<ArrayList<Song>> { private static class AsyncGenreSongLoader extends WrappedAsyncTaskLoader<ArrayList<Song>> {

6
app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
View file

@ -96,12 +96,12 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
ViewUtil.setUpFastScrollRecyclerViewColor(this, ((FastScrollRecyclerView) recyclerView), ThemeStore.accentColor(this)); ViewUtil.setUpFastScrollRecyclerViewColor(this, ((FastScrollRecyclerView) recyclerView), ThemeStore.accentColor(this));
recyclerView.setLayoutManager(new LinearLayoutManager(this)); recyclerView.setLayoutManager(new LinearLayoutManager(this));
if (playlist instanceof AbsCustomPlaylist) { if (playlist instanceof AbsCustomPlaylist) {
adapter = new PlaylistSongAdapter(this, new ArrayList<Song>(), R.layout.item_list, false, this); adapter = new PlaylistSongAdapter(this, new ArrayList<>(), R.layout.item_list, false, this);
recyclerView.setAdapter(adapter); recyclerView.setAdapter(adapter);
} else { } else {
recyclerViewDragDropManager = new RecyclerViewDragDropManager(); recyclerViewDragDropManager = new RecyclerViewDragDropManager();
final GeneralItemAnimator animator = new RefactoredDefaultItemAnimator(); final GeneralItemAnimator animator = new RefactoredDefaultItemAnimator();
adapter = new OrderablePlaylistSongAdapter(this, new ArrayList<PlaylistSong>(), R.layout.item_list, false, this, (fromPosition, toPosition) -> { adapter = new OrderablePlaylistSongAdapter(this, new ArrayList<>(), R.layout.item_list, false, this, (fromPosition, toPosition) -> {
if (PlaylistsUtil.moveItem(PlaylistDetailActivity.this, playlist.id, fromPosition, toPosition)) { if (PlaylistsUtil.moveItem(PlaylistDetailActivity.this, playlist.id, fromPosition, toPosition)) {
Song song = adapter.getDataSet().remove(fromPosition); Song song = adapter.getDataSet().remove(fromPosition);
adapter.getDataSet().add(toPosition, song); adapter.getDataSet().add(toPosition, song);
@ -251,7 +251,7 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
@Override @Override
public void onLoaderReset(Loader<ArrayList<Song>> loader) { public void onLoaderReset(Loader<ArrayList<Song>> loader) {
if (adapter != null) if (adapter != null)
adapter.swapDataSet(new ArrayList<Song>()); adapter.swapDataSet(new ArrayList<>());
} }
private static class AsyncPlaylistSongLoader extends WrappedAsyncTaskLoader<ArrayList<Song>> { private static class AsyncPlaylistSongLoader extends WrappedAsyncTaskLoader<ArrayList<Song>> {

8
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java
View file

@ -194,7 +194,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi
} }
private void setUpAdapter() { private void setUpAdapter() {
adapter = new SongFileAdapter(getMainActivity(), new LinkedList<File>(), R.layout.item_list, this, this); adapter = new SongFileAdapter(getMainActivity(), new LinkedList<>(), R.layout.item_list, this, this);
adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() { adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
@Override @Override
public void onChanged() { public void onChanged() {
@ -291,7 +291,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi
case R.id.action_scan: case R.id.action_scan:
BreadCrumbLayout.Crumb crumb = getActiveCrumb(); BreadCrumbLayout.Crumb crumb = getActiveCrumb();
if (crumb != null) { if (crumb != null) {
new ListPathsAsyncTask(getActivity(), paths -> scanPaths(paths)).execute(new ListPathsAsyncTask.LoadingInfo(crumb.getFile(), AUDIO_FILE_FILTER)); new ListPathsAsyncTask(getActivity(), this::scanPaths).execute(new ListPathsAsyncTask.LoadingInfo(crumb.getFile(), AUDIO_FILE_FILTER));
} }
return true; return true;
} }
@ -391,7 +391,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi
Toast.makeText(getActivity(), String.format(getString(R.string.new_start_directory), file.getPath()), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), String.format(getString(R.string.new_start_directory), file.getPath()), Toast.LENGTH_SHORT).show();
return true; return true;
case R.id.action_scan: case R.id.action_scan:
new ListPathsAsyncTask(getActivity(), paths -> scanPaths(paths)).execute(new ListPathsAsyncTask.LoadingInfo(file, AUDIO_FILE_FILTER)); new ListPathsAsyncTask(getActivity(), this::scanPaths).execute(new ListPathsAsyncTask.LoadingInfo(file, AUDIO_FILE_FILTER));
return true; return true;
} }
return false; return false;
@ -472,7 +472,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi
@Override @Override
public void onLoaderReset(Loader<List<File>> loader) { public void onLoaderReset(Loader<List<File>> loader) {
updateAdapter(new LinkedList<File>()); updateAdapter(new LinkedList<>());
} }
private static class AsyncFileLoader extends WrappedAsyncTaskLoader<List<File>> { private static class AsyncFileLoader extends WrappedAsyncTaskLoader<List<File>> {

4
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
View file

@ -40,7 +40,7 @@ public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFra
protected AlbumAdapter createAdapter() { protected AlbumAdapter createAdapter() {
int itemLayoutRes = getItemLayoutRes(); int itemLayoutRes = getItemLayoutRes();
notifyLayoutResChanged(itemLayoutRes); notifyLayoutResChanged(itemLayoutRes);
ArrayList<Album> dataSet = getAdapter() == null ? new ArrayList<Album>() : getAdapter().getDataSet(); ArrayList<Album> dataSet = getAdapter() == null ? new ArrayList<>() : getAdapter().getDataSet();
return new AlbumAdapter( return new AlbumAdapter(
getLibraryFragment().getMainActivity(), getLibraryFragment().getMainActivity(),
dataSet, dataSet,
@ -127,7 +127,7 @@ public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFra
@Override @Override
public void onLoaderReset(Loader<ArrayList<Album>> loader) { public void onLoaderReset(Loader<ArrayList<Album>> loader) {
getAdapter().swapDataSet(new ArrayList<Album>()); getAdapter().swapDataSet(new ArrayList<>());
} }
private static class AsyncAlbumLoader extends WrappedAsyncTaskLoader<ArrayList<Album>> { private static class AsyncAlbumLoader extends WrappedAsyncTaskLoader<ArrayList<Album>> {

4
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
View file

@ -41,7 +41,7 @@ public class ArtistsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFr
protected ArtistAdapter createAdapter() { protected ArtistAdapter createAdapter() {
int itemLayoutRes = getItemLayoutRes(); int itemLayoutRes = getItemLayoutRes();
notifyLayoutResChanged(itemLayoutRes); notifyLayoutResChanged(itemLayoutRes);
ArrayList<Artist> dataSet = getAdapter() == null ? new ArrayList<Artist>() : getAdapter().getDataSet(); ArrayList<Artist> dataSet = getAdapter() == null ? new ArrayList<>() : getAdapter().getDataSet();
return new ArtistAdapter( return new ArtistAdapter(
getLibraryFragment().getMainActivity(), getLibraryFragment().getMainActivity(),
dataSet, dataSet,
@ -131,7 +131,7 @@ public class ArtistsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFr
@Override @Override
public void onLoaderReset(Loader<ArrayList<Artist>> loader) { public void onLoaderReset(Loader<ArrayList<Artist>> loader) {
getAdapter().swapDataSet(new ArrayList<Artist>()); getAdapter().swapDataSet(new ArrayList<>());
} }
private static class AsyncArtistLoader extends WrappedAsyncTaskLoader<ArrayList<Artist>> { private static class AsyncArtistLoader extends WrappedAsyncTaskLoader<ArrayList<Artist>> {

4
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java
View file

@ -35,7 +35,7 @@ public class GenresFragment extends AbsLibraryPagerRecyclerViewFragment<GenreAda
@NonNull @NonNull
@Override @Override
protected GenreAdapter createAdapter() { protected GenreAdapter createAdapter() {
ArrayList<Genre> dataSet = getAdapter() == null ? new ArrayList<Genre>() : getAdapter().getDataSet(); ArrayList<Genre> dataSet = getAdapter() == null ? new ArrayList<>() : getAdapter().getDataSet();
return new GenreAdapter(getLibraryFragment().getMainActivity(), dataSet, R.layout.item_list_no_image); return new GenreAdapter(getLibraryFragment().getMainActivity(), dataSet, R.layout.item_list_no_image);
} }
@ -61,7 +61,7 @@ public class GenresFragment extends AbsLibraryPagerRecyclerViewFragment<GenreAda
@Override @Override
public void onLoaderReset(Loader<ArrayList<Genre>> loader) { public void onLoaderReset(Loader<ArrayList<Genre>> loader) {
getAdapter().swapDataSet(new ArrayList<Genre>()); getAdapter().swapDataSet(new ArrayList<>());
} }
private static class AsyncGenreLoader extends WrappedAsyncTaskLoader<ArrayList<Genre>> { private static class AsyncGenreLoader extends WrappedAsyncTaskLoader<ArrayList<Genre>> {

4
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java
View file

@ -41,7 +41,7 @@ public class PlaylistsFragment extends AbsLibraryPagerRecyclerViewFragment<Playl
@NonNull @NonNull
@Override @Override
protected PlaylistAdapter createAdapter() { protected PlaylistAdapter createAdapter() {
ArrayList<Playlist> dataSet = getAdapter() == null ? new ArrayList<Playlist>() : getAdapter().getDataSet(); ArrayList<Playlist> dataSet = getAdapter() == null ? new ArrayList<>() : getAdapter().getDataSet();
return new PlaylistAdapter(getLibraryFragment().getMainActivity(), dataSet, R.layout.item_list_single_row, getLibraryFragment()); return new PlaylistAdapter(getLibraryFragment().getMainActivity(), dataSet, R.layout.item_list_single_row, getLibraryFragment());
} }
@ -67,7 +67,7 @@ public class PlaylistsFragment extends AbsLibraryPagerRecyclerViewFragment<Playl
@Override @Override
public void onLoaderReset(Loader<ArrayList<Playlist>> loader) { public void onLoaderReset(Loader<ArrayList<Playlist>> loader) {
getAdapter().swapDataSet(new ArrayList<Playlist>()); getAdapter().swapDataSet(new ArrayList<>());
} }
private static class AsyncPlaylistLoader extends WrappedAsyncTaskLoader<ArrayList<Playlist>> { private static class AsyncPlaylistLoader extends WrappedAsyncTaskLoader<ArrayList<Playlist>> {

4
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
View file

@ -43,7 +43,7 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag
int itemLayoutRes = getItemLayoutRes(); int itemLayoutRes = getItemLayoutRes();
notifyLayoutResChanged(itemLayoutRes); notifyLayoutResChanged(itemLayoutRes);
boolean usePalette = loadUsePalette(); boolean usePalette = loadUsePalette();
ArrayList<Song> dataSet = getAdapter() == null ? new ArrayList<Song>() : getAdapter().getDataSet(); ArrayList<Song> dataSet = getAdapter() == null ? new ArrayList<>() : getAdapter().getDataSet();
if (getGridSize() <= getMaxGridSizeForList()) { if (getGridSize() <= getMaxGridSizeForList()) {
return new ShuffleButtonSongAdapter( return new ShuffleButtonSongAdapter(
@ -139,7 +139,7 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag
@Override @Override
public void onLoaderReset(Loader<ArrayList<Song>> loader) { public void onLoaderReset(Loader<ArrayList<Song>> loader) {
getAdapter().swapDataSet(new ArrayList<Song>()); getAdapter().swapDataSet(new ArrayList<>());
} }
private static class AsyncSongLoader extends WrappedAsyncTaskLoader<ArrayList<Song>> { private static class AsyncSongLoader extends WrappedAsyncTaskLoader<ArrayList<Song>> {