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

rely on server for custom artist images

Browse source
This commit is contained in:
dkanada 2019-07-17 01:04:03 -07:00
commit 4b02fb2b5f
48 changed files with 37 additions and 359 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,6 @@ import com.kabouzeid.gramophone.misc.CustomFragmentStatePagerAdapter;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.PreferenceUtil;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;

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

@ -18,7 +18,6 @@ import com.kabouzeid.gramophone.interfaces.CabHolder;
import com.kabouzeid.gramophone.model.Album;
import com.kabouzeid.gramophone.util.MusicUtil;
import java.util.ArrayList;
import java.util.List;
/**

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

@ -31,7 +31,6 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.PreferenceUtil;
import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
import java.util.ArrayList;
import java.util.List;
/**

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

@ -26,7 +26,6 @@ import com.kabouzeid.gramophone.model.Album;
import com.kabouzeid.gramophone.model.Artist;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.ArtistSignatureUtil;
import com.kabouzeid.gramophone.util.CustomArtistImageUtil;
/**
* @author Karim Abou Zeid (kabouzeid)
@ -35,12 +34,11 @@ public class ArtistGlideRequest {
private static final DiskCacheStrategy DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.ALL;
private static final int DEFAULT_ERROR_IMAGE = R.drawable.default_artist_image;
public static final int DEFAULT_ANIMATION = android.R.anim.fade_in;
private static final int DEFAULT_ANIMATION = android.R.anim.fade_in;
public static class Builder {
final RequestManager requestManager;
final Artist artist;
boolean noCustomImage;
public static Builder from(@NonNull RequestManager requestManager, Artist artist) {
return new Builder(requestManager, artist);
@ -59,14 +57,9 @@ public class ArtistGlideRequest {
return new BitmapBuilder(this);
}
public Builder noCustomImage(boolean noCustomImage) {
this.noCustomImage = noCustomImage;
return this;
}
public DrawableRequestBuilder<GlideDrawable> build() {
//noinspection unchecked
return createBaseRequest(requestManager, artist, noCustomImage)
return createBaseRequest(requestManager, artist)
.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
.error(DEFAULT_ERROR_IMAGE)
.animate(DEFAULT_ANIMATION)
@ -85,7 +78,7 @@ public class ArtistGlideRequest {
public BitmapRequestBuilder<?, Bitmap> build() {
//noinspection unchecked
return createBaseRequest(builder.requestManager, builder.artist, builder.noCustomImage)
return createBaseRequest(builder.requestManager, builder.artist)
.asBitmap()
.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
.error(DEFAULT_ERROR_IMAGE)
@ -107,7 +100,7 @@ public class ArtistGlideRequest {
public BitmapRequestBuilder<?, BitmapPaletteWrapper> build() {
//noinspection unchecked
return createBaseRequest(builder.requestManager, builder.artist, builder.noCustomImage)
return createBaseRequest(builder.requestManager, builder.artist)
.asBitmap()
.transcode(new BitmapPaletteTranscoder(context), BitmapPaletteWrapper.class)
.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
@ -119,18 +112,13 @@ public class ArtistGlideRequest {
}
}
public static DrawableTypeRequest createBaseRequest(RequestManager requestManager, Artist artist, boolean noCustomImage) {
boolean hasCustomImage = CustomArtistImageUtil.getInstance(App.getInstance()).hasCustomArtistImage(artist);
if (noCustomImage || !hasCustomImage) {
final List<AlbumCover> songs = new ArrayList<>();
for (final Album album : artist.albums) {
final Song song = album.safeGetFirstSong();
songs.add(new AlbumCover(album.getYear(), song.data));
}
return requestManager.load(new ArtistImage(artist.getName(), songs));
} else {
return requestManager.load(CustomArtistImageUtil.getFile(artist));
public static DrawableTypeRequest createBaseRequest(RequestManager requestManager, Artist artist) {
final List<AlbumCover> songs = new ArrayList<>();
for (final Album album : artist.albums) {
final Song song = album.safeGetFirstSong();
songs.add(new AlbumCover(album.getYear(), song.data));
}
return requestManager.load(new ArtistImage(artist.getName(), songs));
}
private static Key createSignature(Artist artist) {

2
app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
View file

@ -542,7 +542,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
}
public void initNotification() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && !PreferenceUtil.getInstance(this).classicNotification()) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && !PreferenceUtil.getInstance(this).getClassicNotification()) {
playingNotification = new PlayingNotificationImpl24();
} else {
playingNotification = new PlayingNotificationImpl();

2
app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java
View file

@ -112,7 +112,7 @@ public class PlayingNotificationImpl extends PlayingNotification {
notificationLayoutBig.setImageViewResource(R.id.image, R.drawable.default_album_art);
}
if (!PreferenceUtil.getInstance(service).coloredNotification()) {
if (!PreferenceUtil.getInstance(service).getColoredNotification()) {
bgColor = Color.WHITE;
}
setBackgroundColor(bgColor);

3
app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl24.java
View file

@ -21,7 +21,6 @@ import com.kabouzeid.gramophone.glide.palette.BitmapPaletteWrapper;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.service.MusicService;
import com.kabouzeid.gramophone.ui.activities.MainActivity;
import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.PreferenceUtil;
import static com.kabouzeid.gramophone.service.MusicService.ACTION_REWIND;
@ -95,7 +94,7 @@ public class PlayingNotificationImpl24 extends PlayingNotification {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
builder.setStyle(new MediaStyle().setMediaSession(service.getMediaSession().getSessionToken()).setShowActionsInCompactView(0, 1, 2))
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O && PreferenceUtil.getInstance(service).coloredNotification())
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O && PreferenceUtil.getInstance(service).getColoredNotification())
builder.setColor(color);
}

2
app/src/main/java/com/kabouzeid/gramophone/shortcuts/AppShortcutIconGenerator.java
View file

@ -22,7 +22,7 @@ import com.kabouzeid.gramophone.util.PreferenceUtil;
public final class AppShortcutIconGenerator {
public static Icon generateThemedIcon(Context context, int iconId) {
if (PreferenceUtil.getInstance(context).coloredAppShortcuts()) {
if (PreferenceUtil.getInstance(context).getColoredAppShortcuts()) {
return generateUserThemedIcon(context, iconId).toIcon();
} else {
return generateDefaultThemedIcon(context, iconId).toIcon();

27
app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
View file

@ -10,7 +10,7 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.Toolbar;
import androidx.loader.app.LoaderManager;
@ -45,16 +45,13 @@ import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
import com.kabouzeid.gramophone.model.Artist;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity;
import com.kabouzeid.gramophone.util.CustomArtistImageUtil;
import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.PhonographColorUtil;
import com.kabouzeid.gramophone.util.PreferenceUtil;
public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implements PaletteColorHolder, CabHolder, LoaderManager.LoaderCallbacks<Artist> {
private static final int LOADER_ID = LoaderIds.ARTIST_DETAIL_ACTIVITY;
private static final int REQUEST_CODE_SELECT_IMAGE = 1000;
public static final String EXTRA_ARTIST_ID = "extra_artist_id";
@ -201,17 +198,8 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case REQUEST_CODE_SELECT_IMAGE:
if (resultCode == RESULT_OK) {
CustomArtistImageUtil.getInstance(this).setCustomArtistImage(artist, data.getData());
}
break;
default:
if (resultCode == RESULT_OK) {
reload();
}
break;
if (resultCode == RESULT_OK) {
reload();
}
}
@ -277,15 +265,6 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
case android.R.id.home:
super.onBackPressed();
return true;
case R.id.action_set_artist_image:
Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
intent.setType("image/*");
startActivityForResult(Intent.createChooser(intent, getString(R.string.pick_from_local_storage)), REQUEST_CODE_SELECT_IMAGE);
return true;
case R.id.action_reset_artist_image:
Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.updating), Toast.LENGTH_SHORT).show();
CustomArtistImageUtil.getInstance(ArtistDetailActivity.this).resetCustomArtistImage(artist);
return true;
case R.id.action_colored_footers:
item.setChecked(!item.isChecked());
setUsePalette(item.isChecked());

10
app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java
View file

@ -32,8 +32,6 @@ import com.kabouzeid.gramophone.preferences.NowPlayingScreenPreferenceDialog;
import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
import com.kabouzeid.gramophone.util.PreferenceUtil;
import java.util.Arrays;
import butterknife.BindView;
import butterknife.ButterKnife;
@ -232,7 +230,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
classicNotification.setVisible(false);
} else {
classicNotification.setChecked(PreferenceUtil.getInstance(getActivity()).classicNotification());
classicNotification.setChecked(PreferenceUtil.getInstance(getActivity()).getClassicNotification());
classicNotification.setOnPreferenceChangeListener((preference, newValue) -> {
// Save preference
PreferenceUtil.getInstance(getActivity()).setClassicNotification((Boolean) newValue);
@ -242,9 +240,9 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
final TwoStatePreference coloredNotification = (TwoStatePreference) findPreference("colored_notification");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
coloredNotification.setEnabled(PreferenceUtil.getInstance(getActivity()).classicNotification());
coloredNotification.setEnabled(PreferenceUtil.getInstance(getActivity()).getClassicNotification());
} else {
coloredNotification.setChecked(PreferenceUtil.getInstance(getActivity()).coloredNotification());
coloredNotification.setChecked(PreferenceUtil.getInstance(getActivity()).getColoredNotification());
coloredNotification.setOnPreferenceChangeListener((preference, newValue) -> {
// Save preference
PreferenceUtil.getInstance(getActivity()).setColoredNotification((Boolean) newValue);
@ -256,7 +254,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
colorAppShortcuts.setVisible(false);
} else {
colorAppShortcuts.setChecked(PreferenceUtil.getInstance(getActivity()).coloredAppShortcuts());
colorAppShortcuts.setChecked(PreferenceUtil.getInstance(getActivity()).getColoredAppShortcuts());
colorAppShortcuts.setOnPreferenceChangeListener((preference, newValue) -> {
// Save preference
PreferenceUtil.getInstance(getActivity()).setColoredAppShortcuts((Boolean) newValue);

137
app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java
View file

@ -1,137 +0,0 @@
package com.kabouzeid.gramophone.util;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
import androidx.annotation.NonNull;
import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.animation.GlideAnimation;
import com.bumptech.glide.request.target.SimpleTarget;
import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.model.Artist;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Locale;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class CustomArtistImageUtil {
private static final String CUSTOM_ARTIST_IMAGE_PREFS = "custom_artist_image";
private static final String FOLDER_NAME = "/custom_artist_images/";
private static CustomArtistImageUtil sInstance;
private final SharedPreferences mPreferences;
private CustomArtistImageUtil(@NonNull final Context context) {
mPreferences = context.getApplicationContext().getSharedPreferences(CUSTOM_ARTIST_IMAGE_PREFS, Context.MODE_PRIVATE);
}
public static CustomArtistImageUtil getInstance(@NonNull final Context context) {
if (sInstance == null) {
sInstance = new CustomArtistImageUtil(context.getApplicationContext());
}
return sInstance;
}
public void setCustomArtistImage(final Artist artist, Uri uri) {
Glide.with(App.getInstance())
.load(uri)
.asBitmap()
.diskCacheStrategy(DiskCacheStrategy.NONE)
.skipMemoryCache(true)
.into(new SimpleTarget<Bitmap>() {
@Override
public void onLoadFailed(Exception e, Drawable errorDrawable) {
super.onLoadFailed(e, errorDrawable);
e.printStackTrace();
Toast.makeText(App.getInstance(), e.toString(), Toast.LENGTH_LONG).show();
}
@Override
public void onResourceReady(final Bitmap resource, GlideAnimation<? super Bitmap> glideAnimation) {
new AsyncTask<Void, Void, Void>() {
@SuppressLint("ApplySharedPref")
@Override
protected Void doInBackground(Void... params) {
File dir = new File(App.getInstance().getFilesDir(), FOLDER_NAME);
if (!dir.exists()) {
if (!dir.mkdirs()) { // create the folder
return null;
}
}
File file = new File(dir, getFileName(artist));
boolean succesful = false;
try {
OutputStream os = new BufferedOutputStream(new FileOutputStream(file));
succesful = ImageUtil.resizeBitmap(resource, 2048).compress(Bitmap.CompressFormat.JPEG, 100, os);
os.close();
} catch (IOException e) {
Toast.makeText(App.getInstance(), e.toString(), Toast.LENGTH_LONG).show();
}
if (succesful) {
mPreferences.edit().putBoolean(getFileName(artist), true).commit();
ArtistSignatureUtil.getInstance(App.getInstance()).updateArtistSignature(artist.getName());
App.getInstance().getContentResolver().notifyChange(Uri.parse("content://media"), null); // trigger media store changed to force artist image reload
}
return null;
}
}.execute();
}
});
}
public void resetCustomArtistImage(final Artist artist) {
new AsyncTask<Void, Void, Void>() {
@SuppressLint("ApplySharedPref")
@Override
protected Void doInBackground(Void... params) {
mPreferences.edit().putBoolean(getFileName(artist), false).commit();
ArtistSignatureUtil.getInstance(App.getInstance()).updateArtistSignature(artist.getName());
App.getInstance().getContentResolver().notifyChange(Uri.parse("content://media"), null); // trigger media store changed to force artist image reload
File file = getFile(artist);
if (!file.exists()) {
return null;
} else {
file.delete();
}
return null;
}
}.execute();
}
// shared prefs saves us many IO operations
public boolean hasCustomArtistImage(Artist artist) {
return mPreferences.getBoolean(getFileName(artist), false);
}
private static String getFileName(Artist artist) {
String artistName = artist.getName();
if (artistName == null)
artistName = "";
// replace everything that is not a letter or a number with _
artistName = artistName.replaceAll("[^a-zA-Z0-9]", "_");
return String.format(Locale.US, "#%d#%s.jpeg", artist.getId(), artistName);
}
public static File getFile(Artist artist) {
File dir = new File(App.getInstance().getFilesDir(), FOLDER_NAME);
return new File(dir, getFileName(artist));
}
}

44
app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
View file

@ -6,7 +6,6 @@ import android.content.SharedPreferences;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.preference.PreferenceManager;
import androidx.annotation.NonNull;
import androidx.annotation.StyleRes;
import com.google.gson.Gson;
@ -18,7 +17,6 @@ import com.kabouzeid.gramophone.helper.SortOrder;
import com.kabouzeid.gramophone.model.CategoryInfo;
import com.kabouzeid.gramophone.ui.fragments.player.NowPlayingScreen;
import java.io.File;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
@ -76,8 +74,6 @@ public final class PreferenceUtil {
public static final String SYNCHRONIZED_LYRICS_SHOW = "synchronized_lyrics_show";
public static final String INITIALIZED_BLACKLIST = "initialized_blacklist";
public static final String LIBRARY_CATEGORIES = "library_categories";
private static final String REMEMBER_SHUFFLE = "remember_shuffle";
@ -86,11 +82,11 @@ public final class PreferenceUtil {
private final SharedPreferences mPreferences;
private PreferenceUtil(@NonNull final Context context) {
private PreferenceUtil(final Context context) {
mPreferences = PreferenceManager.getDefaultSharedPreferences(context);
}
public static PreferenceUtil getInstance(@NonNull final Context context) {
public static PreferenceUtil getInstance(final Context context) {
if (sInstance == null) {
sInstance = new PreferenceUtil(context.getApplicationContext());
}
@ -133,13 +129,13 @@ public final class PreferenceUtil {
@StyleRes
public static int getThemeResFromPrefValue(String themePrefValue) {
switch (themePrefValue) {
case "dark":
return R.style.Theme_Phonograph;
case "light":
return R.style.Theme_Phonograph_Light;
case "black":
return R.style.Theme_Phonograph_Black;
case "light":
case "dark":
default:
return R.style.Theme_Phonograph_Light;
return R.style.Theme_Phonograph;
}
}
@ -172,36 +168,36 @@ public final class PreferenceUtil {
editor.commit();
}
public final boolean coloredNotification() {
public final boolean getColoredNotification() {
return mPreferences.getBoolean(COLORED_NOTIFICATION, true);
}
public final boolean classicNotification() {
return mPreferences.getBoolean(CLASSIC_NOTIFICATION, true);
}
public void setColoredNotification(final boolean value) {
final SharedPreferences.Editor editor = mPreferences.edit();
editor.putBoolean(COLORED_NOTIFICATION, value);
editor.apply();
}
public final boolean getClassicNotification() {
return mPreferences.getBoolean(CLASSIC_NOTIFICATION, true);
}
public void setClassicNotification(final boolean value) {
final SharedPreferences.Editor editor = mPreferences.edit();
editor.putBoolean(CLASSIC_NOTIFICATION, value);
editor.apply();
}
public final boolean getColoredAppShortcuts() {
return mPreferences.getBoolean(COLORED_APP_SHORTCUTS, true);
}
public void setColoredAppShortcuts(final boolean value) {
final SharedPreferences.Editor editor = mPreferences.edit();
editor.putBoolean(COLORED_APP_SHORTCUTS, value);
editor.apply();
}
public final boolean coloredAppShortcuts() {
return mPreferences.getBoolean(COLORED_APP_SHORTCUTS, true);
}
public final boolean gaplessPlayback() {
return mPreferences.getBoolean(GAPLESS_PLAYBACK, true);
}
@ -444,16 +440,6 @@ public final class PreferenceUtil {
return mPreferences.getBoolean(SYNCHRONIZED_LYRICS_SHOW, true);
}
public void setInitializedBlacklist() {
final SharedPreferences.Editor editor = mPreferences.edit();
editor.putBoolean(INITIALIZED_BLACKLIST, true);
editor.apply();
}
public final boolean initializedBlacklist() {
return mPreferences.getBoolean(INITIALIZED_BLACKLIST, false);
}
public void setLibraryCategoryInfos(List<CategoryInfo> categories) {
Gson gson = new Gson();
Type collectionType = new TypeToken<List<CategoryInfo>>() {