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

pass blurhash in parcel and fix sidebar image

Browse source
This commit is contained in:
dkanada 2020-10-07 12:48:04 +09:00
commit 7f0bbaab4e
9 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/dkanada/gramophone/glide/CustomGlideRequest.java
View file

@ -99,7 +99,6 @@ public class CustomGlideRequest {
public static RequestOptions createRequestOptions(String item, Drawable placeholder) {
return new RequestOptions()
.centerCrop()
.placeholder(placeholder)
.error(DEFAULT_IMAGE)
.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)

6
app/src/main/java/com/dkanada/gramophone/model/Album.java
View file

@ -3,6 +3,8 @@ package com.dkanada.gramophone.model;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.NonNull;
import org.jellyfin.apiclient.model.dto.BaseItemDto;
import org.jellyfin.apiclient.model.entities.ImageType;
@ -52,6 +54,7 @@ public class Album implements Parcelable {
this.artistName = song.artistName;
this.primary = song.primary;
this.blurHash = song.blurHash;
}
public Album() {
@ -72,6 +75,7 @@ public class Album implements Parcelable {
return id.hashCode();
}
@NonNull
@Override
public String toString() {
return id;
@ -92,6 +96,7 @@ public class Album implements Parcelable {
dest.writeString(artistName);
dest.writeString(primary);
dest.writeString(blurHash);
}
protected Album(Parcel in) {
@ -105,6 +110,7 @@ public class Album implements Parcelable {
this.artistName = in.readString();
this.primary = in.readString();
this.blurHash = in.readString();
}
public static final Creator<Album> CREATOR = new Creator<Album>() {

5
app/src/main/java/com/dkanada/gramophone/model/Artist.java
View file

@ -3,6 +3,8 @@ package com.dkanada.gramophone.model;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.NonNull;
import org.jellyfin.apiclient.model.dto.BaseItemDto;
import org.jellyfin.apiclient.model.dto.GenreDto;
import org.jellyfin.apiclient.model.entities.ImageType;
@ -70,6 +72,7 @@ public class Artist implements Parcelable {
return id.hashCode();
}
@NonNull
@Override
public String toString() {
return id;
@ -86,6 +89,7 @@ public class Artist implements Parcelable {
dest.writeString(name);
dest.writeString(primary);
dest.writeString(blurHash);
}
protected Artist(Parcel in) {
@ -97,6 +101,7 @@ public class Artist implements Parcelable {
this.name = in.readString();
this.primary = in.readString();
this.blurHash = in.readString();
}
public static final Parcelable.Creator<Artist> CREATOR = new Parcelable.Creator<Artist>() {

3
app/src/main/java/com/dkanada/gramophone/model/Genre.java
View file

@ -3,6 +3,8 @@ package com.dkanada.gramophone.model;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.NonNull;
import org.jellyfin.apiclient.model.dto.BaseItemDto;
import org.jellyfin.apiclient.model.dto.GenreDto;
@ -37,6 +39,7 @@ public class Genre implements Parcelable {
return id.hashCode();
}
@NonNull
@Override
public String toString() {
return id;

3
app/src/main/java/com/dkanada/gramophone/model/Playlist.java
View file

@ -3,6 +3,8 @@ package com.dkanada.gramophone.model;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.NonNull;
import org.jellyfin.apiclient.model.dto.BaseItemDto;
public class Playlist implements Parcelable {
@ -38,6 +40,7 @@ public class Playlist implements Parcelable {
return id.hashCode();
}
@NonNull
@Override
public String toString() {
return id;

5
app/src/main/java/com/dkanada/gramophone/model/Song.java
View file

@ -3,6 +3,8 @@ package com.dkanada.gramophone.model;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.NonNull;
import org.jellyfin.apiclient.model.dto.BaseItemDto;
import org.jellyfin.apiclient.model.dto.MediaSourceInfo;
import org.jellyfin.apiclient.model.entities.ImageType;
@ -117,6 +119,7 @@ public class Song implements Parcelable {
return id.hashCode();
}
@NonNull
@Override
public String toString() {
return id;
@ -144,6 +147,7 @@ public class Song implements Parcelable {
dest.writeString(this.primary);
dest.writeString(Boolean.toString(favorite));
dest.writeString(this.blurHash);
dest.writeString(this.path);
dest.writeLong(this.size);
@ -173,6 +177,7 @@ public class Song implements Parcelable {
this.primary = in.readString();
this.favorite = Boolean.parseBoolean(in.readString());
this.blurHash = in.readString();
this.path = in.readString();
this.size = in.readLong();

2
app/src/main/java/com/dkanada/gramophone/ui/activities/MainActivity.java
View file

@ -184,7 +184,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity {
CustomGlideRequest.Builder
.from(this, song.primary, song.blurHash)
.build().into(navigationBinding.image);
.build().centerInside().into(navigationBinding.image);
} else if (binding.navigationView.getHeaderCount() != 0) {
binding.navigationView.removeHeaderView(navigationBinding.getRoot());
navigationBinding = null;

6
app/src/main/java/com/dkanada/gramophone/ui/activities/details/AlbumDetailActivity.java
View file

@ -61,7 +61,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
setUpViews();
Album album = getIntent().getExtras().getParcelable(EXTRA_ALBUM);
loadAlbumCover(album.primary);
loadAlbumCover(album);
setAlbum(album);
ItemQuery query = new ItemQuery();
@ -106,9 +106,9 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
setColors(DialogUtils.resolveColor(this, R.attr.defaultFooterColor));
}
private void loadAlbumCover(String primary) {
private void loadAlbumCover(Album album) {
CustomGlideRequest.Builder
.from(this, primary, primary)
.from(this, album.primary, album.blurHash)
.palette().build().dontAnimate()
.into(new CustomPaletteTarget(binding.image) {
@Override

6
app/src/main/java/com/dkanada/gramophone/ui/activities/details/ArtistDetailActivity.java
View file

@ -67,7 +67,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
setUpViews();
Artist artist = getIntent().getExtras().getParcelable(EXTRA_ARTIST);
loadArtistImage(artist.primary);
loadArtistImage(artist);
setArtist(artist);
ItemQuery albums = new ItemQuery();
@ -150,9 +150,9 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
this.usePalette = usePalette;
}
private void loadArtistImage(String primary) {
private void loadArtistImage(Artist artist) {
CustomGlideRequest.Builder
.from(this, primary, primary)
.from(this, artist.primary, artist.blurHash)
.palette().build().dontAnimate()
.into(new CustomPaletteTarget(binding.image) {
@Override