Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix crashes on home screen shortcuts and going to artist page

Browse source
This commit is contained in:
h4h13 2019-03-05 08:10:57 +05:30
parent 240874f312
commit 263620310f
38 changed files with 214 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java
View file

@ -366,16 +366,16 @@ public class MusicUtil {
public static void toggleFavorite(@NonNull final Context context, @NonNull final Song song) {
if (isFavorite(context, song)) {
PlaylistsUtil.removeFromPlaylist(context, song, getFavoritesPlaylist(context).blockingFirst().getId());
PlaylistsUtil.removeFromPlaylist(context, song, getFavoritesPlaylist(context).blockingFirst().id);
} else {
PlaylistsUtil.addToPlaylist(context, song, getOrCreateFavoritesPlaylist(context).blockingFirst().getId(),
PlaylistsUtil.addToPlaylist(context, song, getOrCreateFavoritesPlaylist(context).blockingFirst().id,
false);
}
}
public static boolean isFavoritePlaylist(@NonNull final Context context,
@NonNull final Playlist playlist) {
return playlist.getName() != null && playlist.getName().equals(context.getString(R.string.favorites));
return playlist.name != null && playlist.name.equals(context.getString(R.string.favorites));
}
private static Observable<Playlist> getFavoritesPlaylist(@NonNull final Context context) {
@ -397,7 +397,7 @@ public class MusicUtil {
//getFavoritesPlaylist(context).blockingFirst().id.subscribe(MusicUtil::setPlaylist);
//return PlaylistsUtil.doPlaylistContains(context, getFavoritesPlaylist(context).blockingFirst().id, song.id);
return PlaylistsUtil
.doPlaylistContains(context, getFavoritesPlaylist(context).blockingFirst().getId(), song.getId());
.doPlaylistContains(context, getFavoritesPlaylist(context).blockingFirst().id, song.getId());
}
public static boolean isArtistNameUnknown(@Nullable String artistName) {

3
app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java
View file

@ -19,7 +19,6 @@ import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.media.audiofx.AudioEffect;
import android.view.View;
import android.widget.Toast;
import androidx.annotation.NonNull;
@ -76,7 +75,7 @@ public class NavigationUtil {
intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, i);
//noinspection unchecked
ActivityCompat.startActivity(activity, intent,
ActivityOptionsCompat.makeSceneTransitionAnimation(activity, (Pair<View, String>) null).toBundle());
ActivityOptionsCompat.makeSceneTransitionAnimation(activity, null).toBundle());
}
public static void goToPlaylistNew(@NonNull Activity activity, @NonNull Playlist playlist) {

2
app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.java
View file

@ -99,7 +99,7 @@ public class PlaylistsUtil {
final StringBuilder selection = new StringBuilder();
selection.append(MediaStore.Audio.Playlists._ID + " IN (");
for (int i = 0; i < playlists.size(); i++) {
selection.append(playlists.get(i).getId());
selection.append(playlists.get(i).id);
if (i < playlists.size() - 1) {
selection.append(",");
}

2
app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt
View file

@ -120,7 +120,7 @@ object ViewUtil {
val top = v.top + ty
val bottom = v.bottom + ty
return x >= left && x <= right && y >= top && y <= bottom
return x in left..right && y >= top && y <= bottom
}
fun setUpFastScrollRecyclerViewColor(context: Context,