From c9eb6b9a08ebb824bf75823f6257fa3ceab1edfc Mon Sep 17 00:00:00 2001 From: Eugene Cheung Date: Wed, 5 Sep 2018 22:45:32 -0400 Subject: [PATCH] Remove explicit parameter types --- .../java/com/kabouzeid/gramophone/helper/StackBlur.java | 4 ++-- .../gramophone/misc/CustomFragmentStatePagerAdapter.java | 5 +++-- .../gramophone/ui/activities/GenreDetailActivity.java | 4 ++-- .../gramophone/ui/activities/PlaylistDetailActivity.java | 6 +++--- .../fragments/mainactivity/folders/FoldersFragment.java | 8 ++++---- .../mainactivity/library/pager/AlbumsFragment.java | 4 ++-- .../mainactivity/library/pager/ArtistsFragment.java | 4 ++-- .../mainactivity/library/pager/GenresFragment.java | 4 ++-- .../mainactivity/library/pager/PlaylistsFragment.java | 4 ++-- .../mainactivity/library/pager/SongsFragment.java | 4 ++-- 10 files changed, 24 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/StackBlur.java b/app/src/main/java/com/kabouzeid/gramophone/helper/StackBlur.java index 535d2a7a..88abb15a 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/helper/StackBlur.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/StackBlur.java @@ -83,8 +83,8 @@ public class StackBlur { original.getPixels(currentPixels, 0, w, 0, 0, w, h); int cores = EXECUTOR_THREADS; - ArrayList horizontal = new ArrayList(cores); - ArrayList vertical = new ArrayList(cores); + ArrayList horizontal = new ArrayList<>(cores); + ArrayList vertical = new ArrayList<>(cores); for (int i = 0; i < cores; i++) { horizontal.add(new BlurTask(currentPixels, w, h, (int) radius, cores, i, 1)); vertical.add(new BlurTask(currentPixels, w, h, (int) radius, cores, i, 2)); diff --git a/app/src/main/java/com/kabouzeid/gramophone/misc/CustomFragmentStatePagerAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/misc/CustomFragmentStatePagerAdapter.java index 8136c2ce..e014bf6c 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/misc/CustomFragmentStatePagerAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/misc/CustomFragmentStatePagerAdapter.java @@ -65,14 +65,15 @@ import java.util.ArrayList; * complete} */ public abstract class CustomFragmentStatePagerAdapter extends android.support.v4.view.PagerAdapter { + public static final String TAG = CustomFragmentStatePagerAdapter.class.getSimpleName(); private static final boolean DEBUG = false; private final FragmentManager mFragmentManager; private FragmentTransaction mCurTransaction = null; - private ArrayList mSavedState = new ArrayList(); - private ArrayList mFragments = new ArrayList(); + private ArrayList mSavedState = new ArrayList<>(); + private ArrayList mFragments = new ArrayList<>(); private Fragment mCurrentPrimaryItem = null; public CustomFragmentStatePagerAdapter(FragmentManager fm) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/GenreDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/GenreDetailActivity.java index e07a4037..fb2df74a 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/GenreDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/GenreDetailActivity.java @@ -83,7 +83,7 @@ public class GenreDetailActivity extends AbsSlidingMusicPanelActivity implements ViewUtil.setUpFastScrollRecyclerViewColor(this, ((FastScrollRecyclerView) recyclerView), ThemeStore.accentColor(this)); recyclerView.setLayoutManager(new LinearLayoutManager(this)); - adapter = new SongAdapter(this, new ArrayList(), R.layout.item_list, false, this); + adapter = new SongAdapter(this, new ArrayList<>(), R.layout.item_list, false, this); recyclerView.setAdapter(adapter); adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() { @@ -186,7 +186,7 @@ public class GenreDetailActivity extends AbsSlidingMusicPanelActivity implements @Override public void onLoaderReset(Loader> loader) { if (adapter != null) - adapter.swapDataSet(new ArrayList()); + adapter.swapDataSet(new ArrayList<>()); } private static class AsyncGenreSongLoader extends WrappedAsyncTaskLoader> { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java index 206aaa49..8013bd02 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java @@ -96,12 +96,12 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme ViewUtil.setUpFastScrollRecyclerViewColor(this, ((FastScrollRecyclerView) recyclerView), ThemeStore.accentColor(this)); recyclerView.setLayoutManager(new LinearLayoutManager(this)); if (playlist instanceof AbsCustomPlaylist) { - adapter = new PlaylistSongAdapter(this, new ArrayList(), R.layout.item_list, false, this); + adapter = new PlaylistSongAdapter(this, new ArrayList<>(), R.layout.item_list, false, this); recyclerView.setAdapter(adapter); } else { recyclerViewDragDropManager = new RecyclerViewDragDropManager(); final GeneralItemAnimator animator = new RefactoredDefaultItemAnimator(); - adapter = new OrderablePlaylistSongAdapter(this, new ArrayList(), 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)) { Song song = adapter.getDataSet().remove(fromPosition); adapter.getDataSet().add(toPosition, song); @@ -251,7 +251,7 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme @Override public void onLoaderReset(Loader> loader) { if (adapter != null) - adapter.swapDataSet(new ArrayList()); + adapter.swapDataSet(new ArrayList<>()); } private static class AsyncPlaylistSongLoader extends WrappedAsyncTaskLoader> { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java index 6adc122f..b5fec7ac 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java @@ -194,7 +194,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi } private void setUpAdapter() { - adapter = new SongFileAdapter(getMainActivity(), new LinkedList(), R.layout.item_list, this, this); + adapter = new SongFileAdapter(getMainActivity(), new LinkedList<>(), R.layout.item_list, this, this); adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() { @Override public void onChanged() { @@ -291,7 +291,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi case R.id.action_scan: BreadCrumbLayout.Crumb crumb = getActiveCrumb(); 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; } @@ -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(); return true; 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 false; @@ -472,7 +472,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi @Override public void onLoaderReset(Loader> loader) { - updateAdapter(new LinkedList()); + updateAdapter(new LinkedList<>()); } private static class AsyncFileLoader extends WrappedAsyncTaskLoader> { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java index 9e251afa..dfa05dd5 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java @@ -40,7 +40,7 @@ public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFra protected AlbumAdapter createAdapter() { int itemLayoutRes = getItemLayoutRes(); notifyLayoutResChanged(itemLayoutRes); - ArrayList dataSet = getAdapter() == null ? new ArrayList() : getAdapter().getDataSet(); + ArrayList dataSet = getAdapter() == null ? new ArrayList<>() : getAdapter().getDataSet(); return new AlbumAdapter( getLibraryFragment().getMainActivity(), dataSet, @@ -127,7 +127,7 @@ public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFra @Override public void onLoaderReset(Loader> loader) { - getAdapter().swapDataSet(new ArrayList()); + getAdapter().swapDataSet(new ArrayList<>()); } private static class AsyncAlbumLoader extends WrappedAsyncTaskLoader> { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java index a9135576..80b78dc4 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java @@ -41,7 +41,7 @@ public class ArtistsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFr protected ArtistAdapter createAdapter() { int itemLayoutRes = getItemLayoutRes(); notifyLayoutResChanged(itemLayoutRes); - ArrayList dataSet = getAdapter() == null ? new ArrayList() : getAdapter().getDataSet(); + ArrayList dataSet = getAdapter() == null ? new ArrayList<>() : getAdapter().getDataSet(); return new ArtistAdapter( getLibraryFragment().getMainActivity(), dataSet, @@ -131,7 +131,7 @@ public class ArtistsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFr @Override public void onLoaderReset(Loader> loader) { - getAdapter().swapDataSet(new ArrayList()); + getAdapter().swapDataSet(new ArrayList<>()); } private static class AsyncArtistLoader extends WrappedAsyncTaskLoader> { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java index 02f14b19..e6a5c8ed 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java @@ -35,7 +35,7 @@ public class GenresFragment extends AbsLibraryPagerRecyclerViewFragment dataSet = getAdapter() == null ? new ArrayList() : getAdapter().getDataSet(); + ArrayList dataSet = getAdapter() == null ? new ArrayList<>() : getAdapter().getDataSet(); return new GenreAdapter(getLibraryFragment().getMainActivity(), dataSet, R.layout.item_list_no_image); } @@ -61,7 +61,7 @@ public class GenresFragment extends AbsLibraryPagerRecyclerViewFragment> loader) { - getAdapter().swapDataSet(new ArrayList()); + getAdapter().swapDataSet(new ArrayList<>()); } private static class AsyncGenreLoader extends WrappedAsyncTaskLoader> { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java index 708393af..56c99691 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java @@ -41,7 +41,7 @@ public class PlaylistsFragment extends AbsLibraryPagerRecyclerViewFragment dataSet = getAdapter() == null ? new ArrayList() : getAdapter().getDataSet(); + ArrayList dataSet = getAdapter() == null ? new ArrayList<>() : getAdapter().getDataSet(); return new PlaylistAdapter(getLibraryFragment().getMainActivity(), dataSet, R.layout.item_list_single_row, getLibraryFragment()); } @@ -67,7 +67,7 @@ public class PlaylistsFragment extends AbsLibraryPagerRecyclerViewFragment> loader) { - getAdapter().swapDataSet(new ArrayList()); + getAdapter().swapDataSet(new ArrayList<>()); } private static class AsyncPlaylistLoader extends WrappedAsyncTaskLoader> { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java index 0d60f710..455ce9be 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java @@ -43,7 +43,7 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag int itemLayoutRes = getItemLayoutRes(); notifyLayoutResChanged(itemLayoutRes); boolean usePalette = loadUsePalette(); - ArrayList dataSet = getAdapter() == null ? new ArrayList() : getAdapter().getDataSet(); + ArrayList dataSet = getAdapter() == null ? new ArrayList<>() : getAdapter().getDataSet(); if (getGridSize() <= getMaxGridSizeForList()) { return new ShuffleButtonSongAdapter( @@ -139,7 +139,7 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag @Override public void onLoaderReset(Loader> loader) { - getAdapter().swapDataSet(new ArrayList()); + getAdapter().swapDataSet(new ArrayList<>()); } private static class AsyncSongLoader extends WrappedAsyncTaskLoader> {