nyancrimew
/
PlayerAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix album details sorting

main
h4h13 2019-09-23 00:49:31 +05:30
parent df7cb7ab49
commit 49e18ec828
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -13,8 +13,8 @@ android {
vectorDrawables.useSupportLibrary = true
applicationId "code.name.monkey.retromusic"
versionCode 370
versionName '3.4.000-beta12'
versionCode 371
versionName '3.4.000-beta-final'
multiDexEnabled true

2
app/src/main/assets/retro-changelog.html
View File

File diff suppressed because one or more lines are too long

8
app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt
View File

@ -128,8 +128,6 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView {
supportActionBar!!.title = null
val primaryColor = ThemeStore.primaryColor(this)
//TintHelper.setTintAuto(contentContainer!!, primaryColor, true)
collapsingToolbarLayout?.let {
it.setContentScrimColor(primaryColor)
@ -317,7 +315,11 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView {
}
private fun reload() {
albumDetailsPresenter.loadAlbum(intent.extras!!.getInt(ArtistDetailActivity.EXTRA_ARTIST_ID))
if (intent.extras!!.containsKey(EXTRA_ALBUM_ID)) {
intent.extras?.getInt(EXTRA_ALBUM_ID)?.let { albumDetailsPresenter.loadAlbum(it) }
} else {
finish()
}
}
companion object {

1
app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt
View File

@ -64,7 +64,6 @@ class ArtistImageFetcher(
} catch (ignore: IOException) {
// can't do much about it
}
}
}

5
app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
View File

@ -45,6 +45,7 @@ import code.name.monkey.retromusic.fragments.AlbumCoverStyle;
import code.name.monkey.retromusic.fragments.NowPlayingScreen;
import code.name.monkey.retromusic.fragments.mainactivity.folders.FoldersFragment;
import code.name.monkey.retromusic.helper.SortOrder;
import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder;
import code.name.monkey.retromusic.model.CategoryInfo;
import code.name.monkey.retromusic.transform.CascadingPageTransformer;
import code.name.monkey.retromusic.transform.DepthTransformation;
@ -229,7 +230,7 @@ public final class PreferenceUtil {
public final String getAlbumSongSortOrder() {
return mPreferences
.getString(ALBUM_SONG_SORT_ORDER, SortOrder.AlbumSongSortOrder.SONG_TRACK_LIST);
.getString(ALBUM_SONG_SORT_ORDER, AlbumSongSortOrder.SONG_TRACK_LIST);
}
public final String getSongSortOrder() {
@ -639,7 +640,7 @@ public final class PreferenceUtil {
public String getAlbumDetailSongSortOrder() {
return mPreferences
.getString(ALBUM_DETAIL_SONG_SORT_ORDER, SortOrder.AlbumSongSortOrder.SONG_TRACK_LIST);
.getString(ALBUM_DETAIL_SONG_SORT_ORDER, AlbumSongSortOrder.SONG_TRACK_LIST);
}
public void setAlbumDetailSongSortOrder(String sortOrder) {