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

fix some ide warnings

Browse source
This commit is contained in:
dkanada 2020-09-23 16:13:52 +09:00
commit 3b995be8bd
14 changed files with 56 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
View file

@ -99,7 +99,7 @@ public class NowPlayingScreenPreferenceDialog extends DialogFragment implements
ImageView image = layout.findViewById(R.id.image);
TextView title = layout.findViewById(R.id.title);
image.setImageResource(nowPlayingScreen.drawableResId);
image.setImageResource(nowPlayingScreen.drawableRes);
title.setText(nowPlayingScreen.titleRes);
return layout;

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/AbsMusicServiceFragment.java
View file

@ -13,7 +13,7 @@ public class AbsMusicServiceFragment extends Fragment implements MusicServiceEve
private AbsMusicServiceActivity activity;
@Override
public void onAttach(Context context) {
public void onAttach(@NonNull Context context) {
super.onAttach(context);
try {
activity = (AbsMusicServiceActivity) context;

27
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
View file

@ -56,7 +56,6 @@ import java.util.ArrayList;
import java.util.List;
public class LibraryFragment extends AbsMainActivityFragment implements CabHolder, MainActivity.MainActivityFragmentCallbacks, ViewPager.OnPageChangeListener, SharedPreferences.OnSharedPreferenceChangeListener {
private FragmentLibraryBinding binding;
private MusicLibraryPagerAdapter pagerAdapter;
@ -70,7 +69,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
binding = FragmentLibraryBinding.inflate(inflater);
return binding.getRoot();
@ -84,7 +83,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
}
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
PreferenceUtil.getInstance(getActivity()).registerOnSharedPreferenceChangedListener(this);
getMainActivity().setStatusbarColorAuto();
getMainActivity().setNavigationbarColorAuto();
@ -110,27 +109,27 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
}
private void setUpToolbar() {
int primaryColor = ThemeStore.primaryColor(getActivity());
int primaryColor = ThemeStore.primaryColor(requireActivity());
binding.appbar.setBackgroundColor(primaryColor);
binding.toolbar.setBackgroundColor(primaryColor);
binding.toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
getActivity().setTitle(R.string.app_name);
requireActivity().setTitle(R.string.app_name);
getMainActivity().setSupportActionBar(binding.toolbar);
}
private void setUpViewPager() {
pagerAdapter = new MusicLibraryPagerAdapter(getActivity(), getChildFragmentManager());
pagerAdapter = new MusicLibraryPagerAdapter(requireActivity(), getChildFragmentManager());
binding.pager.setAdapter(pagerAdapter);
binding.pager.setOffscreenPageLimit(pagerAdapter.getCount() - 1);
binding.tabs.setupWithViewPager(binding.pager);
int primaryColor = ThemeStore.primaryColor(getActivity());
int normalColor = ToolbarContentTintHelper.toolbarSubtitleColor(getActivity(), primaryColor);
int selectedColor = ToolbarContentTintHelper.toolbarTitleColor(getActivity(), primaryColor);
int primaryColor = ThemeStore.primaryColor(requireActivity());
int normalColor = ToolbarContentTintHelper.toolbarSubtitleColor(requireActivity(), primaryColor);
int selectedColor = ToolbarContentTintHelper.toolbarTitleColor(requireActivity(), primaryColor);
TabLayoutUtil.setTabIconColors(binding.tabs, normalColor, selectedColor);
binding.tabs.setTabTextColors(normalColor, selectedColor);
binding.tabs.setSelectedTabIndicatorColor(ThemeStore.accentColor(getActivity()));
binding.tabs.setSelectedTabIndicatorColor(ThemeStore.accentColor(requireActivity()));
updateTabVisibility();
@ -161,7 +160,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
cab = new MaterialCab(getMainActivity(), R.id.cab_stub)
.setMenu(menuRes)
.setCloseDrawableRes(R.drawable.ic_close_white_24dp)
.setBackgroundColor(ThemeUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(getActivity())))
.setBackgroundColor(ThemeUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(requireActivity())))
.start(callback);
return cab;
@ -180,7 +179,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
inflater.inflate(R.menu.menu_main, menu);
if (isPlaylistPage()) {
@ -222,7 +221,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
}
@Override
public void onPrepareOptionsMenu(Menu menu) {
public void onPrepareOptionsMenu(@NonNull Menu menu) {
super.onPrepareOptionsMenu(menu);
Activity activity = getActivity();
if (activity == null) return;
@ -256,7 +255,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
int id = item.getItemId();
switch (id) {
case R.id.action_shuffle_all:
MusicPlayerRemote.openAndShuffleQueue(SongLoader.getAllSongs(getActivity()), true);
MusicPlayerRemote.openAndShuffleQueue(SongLoader.getAllSongs(requireActivity()), true);
return true;
case R.id.action_new_playlist:
CreatePlaylistDialog.create().show(getChildFragmentManager(), "CREATE_PLAYLIST");

6
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
View file

@ -124,7 +124,7 @@ public abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A extend
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
applyRecyclerViewPaddingForLayoutRes(getRecyclerView(), currentLayoutRes);
}
@ -170,10 +170,10 @@ public abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A extend
protected int getMaxGridSizeForList() {
if (isLandscape()) {
return getActivity().getResources().getInteger(R.integer.default_list_columns_land);
return requireActivity().getResources().getInteger(R.integer.default_list_columns_land);
}
return getActivity().getResources().getInteger(R.integer.default_list_columns);
return requireActivity().getResources().getInteger(R.integer.default_list_columns);
}
protected final boolean isLandscape() {

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java
View file

@ -72,7 +72,7 @@ public abstract class AbsLibraryPagerRecyclerViewFragment<A extends RecyclerView
}
private void initRecyclerView() {
ViewUtil.setUpFastScrollRecyclerViewColor(getActivity(), binding.recyclerView, ThemeStore.accentColor(getActivity()));
ViewUtil.setUpFastScrollRecyclerViewColor(getActivity(), binding.recyclerView, ThemeStore.accentColor(requireActivity()));
binding.recyclerView.setLayoutManager(layoutManager);
binding.recyclerView.setAdapter(adapter);

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

@ -134,7 +134,7 @@ public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFra
@Override
protected int loadGridSize() {
return PreferenceUtil.getInstance(getActivity()).getAlbumGridSize(getActivity());
return PreferenceUtil.getInstance(getActivity()).getAlbumGridSize(requireActivity());
}
@Override
@ -144,7 +144,7 @@ public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFra
@Override
protected int loadGridSizeLand() {
return PreferenceUtil.getInstance(getActivity()).getAlbumGridSizeLand(getActivity());
return PreferenceUtil.getInstance(getActivity()).getAlbumGridSizeLand(requireActivity());
}
@Override

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

@ -130,7 +130,7 @@ public class ArtistsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFr
@Override
protected int loadGridSize() {
return PreferenceUtil.getInstance(getActivity()).getArtistGridSize(getActivity());
return PreferenceUtil.getInstance(getActivity()).getArtistGridSize(requireActivity());
}
@Override
@ -140,7 +140,7 @@ public class ArtistsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFr
@Override
protected int loadGridSizeLand() {
return PreferenceUtil.getInstance(getActivity()).getArtistGridSizeLand(getActivity());
return PreferenceUtil.getInstance(getActivity()).getArtistGridSizeLand(requireActivity());
}
@Override

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

@ -140,7 +140,7 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag
@Override
protected int loadGridSize() {
return PreferenceUtil.getInstance(getActivity()).getSongGridSize(getActivity());
return PreferenceUtil.getInstance(getActivity()).getSongGridSize(requireActivity());
}
@Override
@ -150,7 +150,7 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag
@Override
protected int loadGridSizeLand() {
return PreferenceUtil.getInstance(getActivity()).getSongGridSizeLand(getActivity());
return PreferenceUtil.getInstance(getActivity()).getSongGridSizeLand(requireActivity());
}
@Override

18
app/src/main/java/com/dkanada/gramophone/ui/fragments/player/AbsPlayerFragment.java
View file

@ -23,9 +23,9 @@ import com.dkanada.gramophone.util.MusicUtil;
import com.dkanada.gramophone.util.NavigationUtil;
public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implements Toolbar.OnMenuItemClickListener, PaletteColorHolder {
private static boolean isToolbarShown = true;
private Callbacks callbacks;
private static boolean isToolbarShown = true;
@Override
public void onAttach(Context context) {
@ -48,38 +48,38 @@ public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implemen
final Song song = MusicPlayerRemote.getCurrentSong();
switch (item.getItemId()) {
case R.id.action_sleep_timer:
new SleepTimerDialog().show(getFragmentManager(), "SET_SLEEP_TIMER");
new SleepTimerDialog().show(getParentFragmentManager(), "SET_SLEEP_TIMER");
return true;
case R.id.action_toggle_favorite:
toggleFavorite(song);
return true;
case R.id.action_share:
SongShareDialog.create(song).show(getFragmentManager(), "SHARE_SONG");
SongShareDialog.create(song).show(getParentFragmentManager(), "SHARE_SONG");
return true;
case R.id.action_add_to_playlist:
AddToPlaylistDialog.create(song).show(getFragmentManager(), "ADD_PLAYLIST");
AddToPlaylistDialog.create(song).show(getParentFragmentManager(), "ADD_PLAYLIST");
return true;
case R.id.action_clear_queue:
MusicPlayerRemote.clearQueue();
return true;
case R.id.action_save_queue:
CreatePlaylistDialog.create(MusicPlayerRemote.getPlayingQueue()).show(getActivity().getSupportFragmentManager(), "ADD_TO_PLAYLIST");
CreatePlaylistDialog.create(MusicPlayerRemote.getPlayingQueue()).show(getParentFragmentManager(), "ADD_TO_PLAYLIST");
return true;
case R.id.action_details:
SongDetailDialog.create(song).show(getFragmentManager(), "SONG_DETAIL");
SongDetailDialog.create(song).show(getParentFragmentManager(), "SONG_DETAIL");
return true;
case R.id.action_go_to_album:
NavigationUtil.goToAlbum(getActivity(), new Album(song));
NavigationUtil.goToAlbum(requireActivity(), new Album(song));
return true;
case R.id.action_go_to_artist:
NavigationUtil.goToArtist(getActivity(), new Artist(song));
NavigationUtil.goToArtist(requireActivity(), new Artist(song));
return true;
}
return false;
}
protected void toggleFavorite(Song song) {
MusicUtil.toggleFavorite(getActivity(), song);
MusicUtil.toggleFavorite(requireActivity(), song);
}
protected boolean isToolbarShown() {

11
app/src/main/java/com/dkanada/gramophone/ui/fragments/player/MiniPlayerFragment.java
View file

@ -1,5 +1,6 @@
package com.dkanada.gramophone.ui.fragments.player;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
@ -23,7 +24,6 @@ import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
import com.dkanada.gramophone.views.PlayPauseDrawable;
public class MiniPlayerFragment extends AbsMusicServiceFragment implements MusicProgressViewUpdateHelper.Callback {
private FragmentMiniPlayerBinding binding;
private PlayPauseDrawable miniPlayerPlayPauseDrawable;
@ -45,7 +45,7 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
view.setOnTouchListener(new FlingPlayBackController(getActivity()));
@ -54,13 +54,13 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music
private void setUpMiniPlayer() {
setUpPlayPauseButton();
binding.progressBar.setProgressTintList(ColorStateList.valueOf(ThemeStore.accentColor(getActivity())));
binding.progressBar.setProgressTintList(ColorStateList.valueOf(ThemeStore.accentColor(requireActivity())));
}
private void setUpPlayPauseButton() {
miniPlayerPlayPauseDrawable = new PlayPauseDrawable(getActivity());
miniPlayerPlayPauseDrawable = new PlayPauseDrawable(requireActivity());
binding.miniPlayerPlayPauseButton.setImageDrawable(miniPlayerPlayPauseDrawable);
binding.miniPlayerPlayPauseButton.setColorFilter(ATHUtil.resolveColor(getActivity(), R.attr.iconColor, ThemeStore.textColorSecondary(getActivity())), PorterDuff.Mode.SRC_IN);
binding.miniPlayerPlayPauseButton.setColorFilter(ATHUtil.resolveColor(requireActivity(), R.attr.iconColor, ThemeStore.textColorSecondary(requireActivity())), PorterDuff.Mode.SRC_IN);
binding.miniPlayerPlayPauseButton.setOnClickListener(new PlayPauseButtonOnClickHandler());
}
@ -125,6 +125,7 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music
}
@Override
@SuppressLint("ClickableViewAccessibility")
public boolean onTouch(View v, MotionEvent event) {
return flingPlayBackController.onTouchEvent(event);
}

7
app/src/main/java/com/dkanada/gramophone/ui/fragments/player/NowPlayingScreen.java
View file

@ -13,12 +13,13 @@ public enum NowPlayingScreen {
public final int titleRes;
@DrawableRes
public final int drawableResId;
public final int drawableRes;
public final int id;
NowPlayingScreen(@StringRes int titleRes, @DrawableRes int drawableResId, int id) {
NowPlayingScreen(@StringRes int titleRes, @DrawableRes int drawableRes, int id) {
this.titleRes = titleRes;
this.drawableResId = drawableResId;
this.drawableRes = drawableRes;
this.id = id;
}
}

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java
View file

@ -1,6 +1,7 @@
package com.dkanada.gramophone.ui.fragments.player;
import android.animation.Animator;
import android.annotation.SuppressLint;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.viewpager.widget.ViewPager;
@ -36,6 +37,7 @@ public class PlayerAlbumCoverFragment extends AbsMusicServiceFragment implements
}
@Override
@SuppressLint("ClickableViewAccessibility")
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
binding.playerAlbumCoverViewPager.addOnPageChangeListener(this);

15
app/src/main/java/com/dkanada/gramophone/util/ImageUtil.java
View file

@ -13,6 +13,7 @@ import androidx.annotation.ColorInt;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.res.ResourcesCompat;
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import java.io.InputStream;
@ -87,23 +88,19 @@ public class ImageUtil {
}
public static Drawable getVectorDrawable(@NonNull Resources res, @DrawableRes int resId, @Nullable Resources.Theme theme) {
if (Build.VERSION.SDK_INT >= 21) {
return res.getDrawable(resId, theme);
}
return VectorDrawableCompat.create(res, resId, theme);
return ResourcesCompat.getDrawable(res, resId, theme);
}
public static Drawable getTintedVectorDrawable(@NonNull Resources res, @DrawableRes int resId, @Nullable Resources.Theme theme, @ColorInt int color) {
return TintHelper.createTintedDrawable(getVectorDrawable(res, resId, theme), color);
}
public static Drawable getTintedVectorDrawable(@NonNull Context context, @DrawableRes int id, @ColorInt int color) {
return TintHelper.createTintedDrawable(getVectorDrawable(context.getResources(), id, context.getTheme()), color);
public static Drawable getTintedVectorDrawable(@NonNull Context context, @DrawableRes int resId, @ColorInt int color) {
return TintHelper.createTintedDrawable(getVectorDrawable(context.getResources(), resId, context.getTheme()), color);
}
public static Drawable getVectorDrawable(@NonNull Context context, @DrawableRes int id) {
return getVectorDrawable(context.getResources(), id, context.getTheme());
public static Drawable getVectorDrawable(@NonNull Context context, @DrawableRes int resId) {
return getVectorDrawable(context.getResources(), resId, context.getTheme());
}
public static Drawable resolveDrawable(@NonNull Context context, @AttrRes int drawableAttr) {

8
app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java
View file

@ -221,7 +221,7 @@ public final class PreferenceUtil {
public void setAlbumSortOrder(final String sortOrder) {
final SharedPreferences.Editor editor = mPreferences.edit();
editor.putString(ALBUM_SORT_ORDER, sortOrder);
editor.commit();
editor.apply();
}
public final String getSongSortOrder() {
@ -231,7 +231,7 @@ public final class PreferenceUtil {
public void setSongSortOrder(final String sortOrder) {
final SharedPreferences.Editor editor = mPreferences.edit();
editor.putString(SONG_SORT_ORDER, sortOrder);
editor.commit();
editor.apply();
}
public final String getAlbumSortMethod() {
@ -241,7 +241,7 @@ public final class PreferenceUtil {
public void setAlbumSortMethod(final String sortMethod) {
final SharedPreferences.Editor editor = mPreferences.edit();
editor.putString(ALBUM_SORT_METHOD, sortMethod);
editor.commit();
editor.apply();
}
public final String getSongSortMethod() {
@ -251,7 +251,7 @@ public final class PreferenceUtil {
public void setSongSortMethod(final String sortMethod) {
final SharedPreferences.Editor editor = mPreferences.edit();
editor.putString(SONG_SORT_METHOD, sortMethod);
editor.commit();
editor.apply();
}
public int getLastSleepTimerValue() {