overhaul existing preferences

This commit is contained in:
dkanada 2019-07-18 03:54:31 -07:00
commit 7c83b50179
66 changed files with 98 additions and 543 deletions

View file

@ -59,9 +59,7 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
return o;
}
/**
* Only the latest passed {@link AlbumCoverFragment.ColorReceiver} is guaranteed to receive a response
*/
// only the latest ColorReceiver is guaranteed a response
public void receiveColor(AlbumCoverFragment.ColorReceiver colorReceiver, int position) {
AlbumCoverFragment fragment = (AlbumCoverFragment) getFragment(position);
if (fragment != null) {
@ -74,7 +72,7 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
}
}
public static class AlbumCoverFragment extends Fragment implements SharedPreferences.OnSharedPreferenceChangeListener {
public static class AlbumCoverFragment extends Fragment {
private static final String SONG_ARG = "song";
private Unbinder unbinder;
@ -112,24 +110,18 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
@Override
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
forceSquareAlbumCover(false);
// TODO
// forceSquareAlbumCover(PreferenceUtil.getInstance(getContext()).forceSquareAlbumCover());
PreferenceUtil.getInstance(getActivity()).registerOnSharedPreferenceChangedListener(this);
loadAlbumCover();
}
@Override
public void onDestroyView() {
super.onDestroyView();
PreferenceUtil.getInstance(getActivity()).unregisterOnSharedPreferenceChangedListener(this);
unbinder.unbind();
colorReceiver = null;
}
private void loadAlbumCover() {
SongGlideRequest.Builder.from(Glide.with(this), song)
.checkIgnoreMediaStore(getActivity())
SongGlideRequest.Builder.from(Glide.with(getContext()), song)
.generatePalette(getActivity()).build()
.into(new CustomPaletteTarget(albumCover) {
@Override
@ -139,20 +131,6 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
});
}
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
switch (key) {
case PreferenceUtil.FORCE_SQUARE_ALBUM_COVER:
// TODO
// forceSquareAlbumCover(PreferenceUtil.getInstance(getActivity()).forceSquareAlbumCover());
break;
}
}
public void forceSquareAlbumCover(boolean forceSquareAlbumCover) {
albumCover.setScaleType(forceSquareAlbumCover ? ImageView.ScaleType.FIT_CENTER : ImageView.ScaleType.CENTER_CROP);
}
private void setColor(int color) {
this.color = color;
isColorReady = true;

View file

@ -35,7 +35,7 @@ public class MusicLibraryPagerAdapter extends FragmentPagerAdapter {
public MusicLibraryPagerAdapter(@NonNull final Context context, final FragmentManager fragmentManager) {
super(fragmentManager);
mContext = context;
setCategoryInfos(PreferenceUtil.getInstance(context).getLibraryCategoryInfos());
setCategoryInfos(PreferenceUtil.getInstance(context).getLibraryCategories());
}
public void setCategoryInfos(@NonNull List<CategoryInfo> categoryInfos) {

View file

@ -74,7 +74,7 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
holder.title.setText(album.getTitle());
holder.text.setText(MusicUtil.getAlbumInfoString(activity, album));
SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
.checkIgnoreMediaStore(activity).build()
.build()
.into(holder.image);
break;
case ARTIST:

View file

@ -134,7 +134,6 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
if (holder.image == null) return;
SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
.checkIgnoreMediaStore(activity)
.generatePalette(activity).build()
.into(new CustomPaletteTarget(holder.image) {
@Override

View file

@ -55,7 +55,6 @@ public class HorizontalAlbumAdapter extends AlbumAdapter {
if (holder.image == null) return;
SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
.checkIgnoreMediaStore(activity)
.generatePalette(activity).build()
.into(new CustomPaletteTarget(holder.image) {
@Override

View file

@ -87,7 +87,7 @@ public class ArtistSongAdapter extends ArrayAdapter<Song> implements MaterialCab
songInfo.setText(song.albumName);
SongGlideRequest.Builder.from(Glide.with(activity), song)
.checkIgnoreMediaStore(activity).build()
.build()
.into(albumArt);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

View file

@ -134,7 +134,6 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
if (holder.image == null) return;
SongGlideRequest.Builder.from(Glide.with(activity), song)
.checkIgnoreMediaStore(activity)
.generatePalette(activity).build()
.into(new CustomPaletteTarget(holder.image) {
@Override