Added song info refresh and song sort by date modified
This commit is contained in:
parent
27141c1bd2
commit
f69a04b2d2
22 changed files with 104 additions and 42 deletions
|
@ -287,14 +287,14 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
|
||||||
key.equals(PreferenceUtil.ADAPTIVE_COLOR_APP) || key.equals(PreferenceUtil.DOMINANT_COLOR) ||
|
key.equals(PreferenceUtil.ADAPTIVE_COLOR_APP) || key.equals(PreferenceUtil.DOMINANT_COLOR) ||
|
||||||
key.equals(PreferenceUtil.USER_NAME) || key.equals(PreferenceUtil.TOGGLE_FULL_SCREEN) ||
|
key.equals(PreferenceUtil.USER_NAME) || key.equals(PreferenceUtil.TOGGLE_FULL_SCREEN) ||
|
||||||
key.equals(PreferenceUtil.TOGGLE_VOLUME) || key.equals(PreferenceUtil.ROUND_CORNERS) ||
|
key.equals(PreferenceUtil.TOGGLE_VOLUME) || key.equals(PreferenceUtil.ROUND_CORNERS) ||
|
||||||
key.equals(PreferenceUtil.CAROUSEL_EFFECT) || key == PreferenceUtil.NOW_PLAYING_SCREEN_ID ||
|
key.equals(PreferenceUtil.CAROUSEL_EFFECT) || key.equals(PreferenceUtil.NOW_PLAYING_SCREEN_ID) ||
|
||||||
key == PreferenceUtil.TOGGLE_GENRE || key.equals(PreferenceUtil.BANNER_IMAGE_PATH) ||
|
key.equals(PreferenceUtil.TOGGLE_GENRE) || key.equals(PreferenceUtil.BANNER_IMAGE_PATH) ||
|
||||||
key == PreferenceUtil.PROFILE_IMAGE_PATH || key == PreferenceUtil.CIRCULAR_ALBUM_ART ||
|
key.equals(PreferenceUtil.PROFILE_IMAGE_PATH) || key.equals(PreferenceUtil.CIRCULAR_ALBUM_ART) ||
|
||||||
key == PreferenceUtil.KEEP_SCREEN_ON || key == PreferenceUtil.TOGGLE_SEPARATE_LINE ||
|
key.equals(PreferenceUtil.KEEP_SCREEN_ON) || key.equals(PreferenceUtil.TOGGLE_SEPARATE_LINE) ||
|
||||||
key == PreferenceUtil.TOGGLE_HOME_BANNER || key == PreferenceUtil.TOGGLE_ADD_CONTROLS ||
|
key.equals(PreferenceUtil.TOGGLE_HOME_BANNER) || key.equals(PreferenceUtil.TOGGLE_ADD_CONTROLS) ||
|
||||||
key == PreferenceUtil.ALBUM_COVER_STYLE || key == PreferenceUtil.HOME_ARTIST_GRID_STYLE ||
|
key.equals(PreferenceUtil.ALBUM_COVER_STYLE) || key.equals(PreferenceUtil.HOME_ARTIST_GRID_STYLE) ||
|
||||||
key == PreferenceUtil.ALBUM_COVER_TRANSFORM || key == PreferenceUtil.DESATURATED_COLOR ||
|
key.equals(PreferenceUtil.ALBUM_COVER_TRANSFORM) || key.equals(PreferenceUtil.DESATURATED_COLOR) ||
|
||||||
key == PreferenceUtil.TAB_TEXT_MODE || key == PreferenceUtil.LIBRARY_CATEGORIES
|
key.equals(PreferenceUtil.TAB_TEXT_MODE) || key.equals(PreferenceUtil.LIBRARY_CATEGORIES)
|
||||||
) {
|
) {
|
||||||
postRecreate();
|
postRecreate();
|
||||||
}
|
}
|
||||||
|
@ -321,7 +321,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
|
||||||
mAppBarLayout.removeOnOffsetChangedListener(onOffsetChangedListener);
|
mAppBarLayout.removeOnOffsetChangedListener(onOffsetChangedListener);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCurrentFragment(Fragment fragment, String tag) {
|
public void setCurrentFragment(@NonNull Fragment fragment, @NonNull String tag) {
|
||||||
String currentTag = null;
|
String currentTag = null;
|
||||||
if (getSupportFragmentManager().findFragmentByTag(tag) != null) {
|
if (getSupportFragmentManager().findFragmentByTag(tag) != null) {
|
||||||
currentTag = getSupportFragmentManager().findFragmentByTag(tag).getTag();
|
currentTag = getSupportFragmentManager().findFragmentByTag(tag).getTag();
|
||||||
|
@ -547,6 +547,9 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
|
||||||
case R.id.action_song_sort_order_composer:
|
case R.id.action_song_sort_order_composer:
|
||||||
sortOrder = SongSortOrder.COMPOSER;
|
sortOrder = SongSortOrder.COMPOSER;
|
||||||
break;
|
break;
|
||||||
|
case R.id.action_song_sort_order_date_modified:
|
||||||
|
sortOrder = SongSortOrder.SONG_DATE_MODIFIED;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -700,6 +703,8 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
|
||||||
.setChecked(currentSortOrder.equals(SongSortOrder.SONG_DATE));
|
.setChecked(currentSortOrder.equals(SongSortOrder.SONG_DATE));
|
||||||
sortOrderMenu.add(0, R.id.action_song_sort_order_composer, 6, R.string.sort_order_composer)
|
sortOrderMenu.add(0, R.id.action_song_sort_order_composer, 6, R.string.sort_order_composer)
|
||||||
.setChecked(currentSortOrder.equals(SongSortOrder.COMPOSER));
|
.setChecked(currentSortOrder.equals(SongSortOrder.COMPOSER));
|
||||||
|
sortOrderMenu.add(0, R.id.action_song_sort_order_date_modified, 6, R.string.sort_order_date_modified)
|
||||||
|
.setChecked(currentSortOrder.equals(SongSortOrder.COMPOSER));
|
||||||
}
|
}
|
||||||
|
|
||||||
sortOrderMenu.setGroupCheckable(0, true, true);
|
sortOrderMenu.setGroupCheckable(0, true, true);
|
||||||
|
|
|
@ -16,6 +16,7 @@ import code.name.monkey.appthemehelper.util.TintHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
import code.name.monkey.retromusic.extensions.ripAlpha
|
import code.name.monkey.retromusic.extensions.ripAlpha
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
||||||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||||
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
||||||
|
@ -70,6 +71,7 @@ class AdaptivePlaybackControlsFragment : AbsPlayerControlsFragment() {
|
||||||
private fun updateSong() {
|
private fun updateSong() {
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
songInfo?.text = getSongInfo(MusicPlayerRemote.currentSong)
|
songInfo?.text = getSongInfo(MusicPlayerRemote.currentSong)
|
||||||
|
songInfo.show()
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo?.hide()
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,7 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper
|
||||||
import code.name.monkey.appthemehelper.util.TintHelper
|
import code.name.monkey.appthemehelper.util.TintHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
||||||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||||
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
||||||
|
@ -75,9 +76,10 @@ class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
|
||||||
private fun updateSong() {
|
private fun updateSong() {
|
||||||
val song = MusicPlayerRemote.currentSong
|
val song = MusicPlayerRemote.currentSong
|
||||||
title.text = song.title
|
title.text = song.title
|
||||||
text.text = "${song.artistName} • ${song.albumName}"
|
text.text = String.format("%s • %s", song.artistName, song.albumName)
|
||||||
|
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
|
songInfo.show()
|
||||||
songInfo?.text = getSongInfo(song)
|
songInfo?.text = getSongInfo(song)
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo?.hide()
|
||||||
|
|
|
@ -16,6 +16,7 @@ import code.name.monkey.appthemehelper.util.TintHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
import code.name.monkey.retromusic.extensions.ripAlpha
|
import code.name.monkey.retromusic.extensions.ripAlpha
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
||||||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||||
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
||||||
|
@ -77,9 +78,10 @@ class CardPlaybackControlsFragment : AbsPlayerControlsFragment() {
|
||||||
text.text = song.artistName
|
text.text = song.artistName
|
||||||
|
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
songInfo?.text = getSongInfo(MusicPlayerRemote.currentSong)
|
songInfo.text = getSongInfo(MusicPlayerRemote.currentSong)
|
||||||
|
songInfo.show()
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo.hide()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,7 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper
|
||||||
import code.name.monkey.appthemehelper.util.TintHelper
|
import code.name.monkey.appthemehelper.util.TintHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
||||||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||||
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
||||||
|
@ -110,11 +111,17 @@ class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
|
||||||
updateSong()
|
updateSong()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onPlayingMetaChanged() {
|
||||||
|
super.onPlayingMetaChanged()
|
||||||
|
updateSong()
|
||||||
|
}
|
||||||
|
|
||||||
private fun updateSong() {
|
private fun updateSong() {
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
songInfo?.text = getSongInfo(MusicPlayerRemote.currentSong)
|
songInfo.text = getSongInfo(MusicPlayerRemote.currentSong)
|
||||||
|
songInfo.show()
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo.hide()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,7 @@ import code.name.monkey.appthemehelper.util.TintHelper
|
||||||
import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
|
import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
|
||||||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||||
|
@ -197,9 +198,10 @@ class CirclePlayerFragment : AbsPlayerFragment(), Callback, OnAudioVolumeChanged
|
||||||
text.text = song.artistName
|
text.text = song.artistName
|
||||||
|
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
songInfo?.text = getSongInfo(song)
|
songInfo.text = getSongInfo(song)
|
||||||
|
songInfo.show()
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo.hide()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@ import code.name.monkey.appthemehelper.util.ColorUtil
|
||||||
import code.name.monkey.appthemehelper.util.TintHelper
|
import code.name.monkey.appthemehelper.util.TintHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
||||||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||||
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
||||||
|
@ -73,9 +74,10 @@ class ColorPlaybackControlsFragment : AbsPlayerControlsFragment() {
|
||||||
text.text = song.artistName
|
text.text = song.artistName
|
||||||
|
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
songInfo?.text = getSongInfo(song)
|
songInfo.text = getSongInfo(song)
|
||||||
|
songInfo.show()
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo.hide()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,7 @@ import code.name.monkey.appthemehelper.util.TintHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
import code.name.monkey.retromusic.extensions.ripAlpha
|
import code.name.monkey.retromusic.extensions.ripAlpha
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
||||||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||||
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
||||||
|
@ -80,9 +81,10 @@ class FitPlaybackControlsFragment : AbsPlayerControlsFragment() {
|
||||||
title.text = song.title
|
title.text = song.title
|
||||||
text.text = song.artistName
|
text.text = song.artistName
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
songInfo?.text = getSongInfo(song)
|
songInfo.text = getSongInfo(song)
|
||||||
|
songInfo.show()
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo.hide()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@ import code.name.monkey.appthemehelper.util.TintHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
import code.name.monkey.retromusic.extensions.ripAlpha
|
import code.name.monkey.retromusic.extensions.ripAlpha
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
||||||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||||
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
||||||
|
@ -179,14 +180,14 @@ class FlatPlaybackControlsFragment : AbsPlayerControlsFragment(), Callback {
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun updateSong() {
|
private fun updateSong() {
|
||||||
//TransitionManager.beginDelayedTransition(viewGroup, new ChangeText().setChangeBehavior(ChangeText.CHANGE_BEHAVIOR_OUT_IN));
|
|
||||||
val song = MusicPlayerRemote.currentSong
|
val song = MusicPlayerRemote.currentSong
|
||||||
title.text = song.title
|
title.text = song.title
|
||||||
text.text = song.artistName
|
text.text = song.artistName
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
songInfo?.text = getSongInfo(song)
|
songInfo.text = getSongInfo(song)
|
||||||
|
songInfo.show()
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo.hide()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,7 @@ import code.name.monkey.appthemehelper.util.TintHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
import code.name.monkey.retromusic.extensions.ripAlpha
|
import code.name.monkey.retromusic.extensions.ripAlpha
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
||||||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||||
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
||||||
|
@ -158,9 +159,10 @@ class FullPlaybackControlsFragment : AbsPlayerControlsFragment(), PopupMenu.OnMe
|
||||||
text.text = song.artistName
|
text.text = song.artistName
|
||||||
updateIsFavorite()
|
updateIsFavorite()
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
songInfo?.text = getSongInfo(song)
|
songInfo.text = getSongInfo(song)
|
||||||
|
songInfo.show()
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo.hide()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -194,7 +194,7 @@ class FullPlayerFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Ca
|
||||||
override fun onColorChanged(color: Int) {
|
override fun onColorChanged(color: Int) {
|
||||||
lastColor = color
|
lastColor = color
|
||||||
fullPlaybackControlsFragment.setDark(color)
|
fullPlaybackControlsFragment.setDark(color)
|
||||||
callbacks!!.onPaletteColorChanged()
|
callbacks?.onPaletteColorChanged()
|
||||||
ToolbarContentTintHelper.colorizeToolbar(playerToolbar, Color.WHITE, activity)
|
ToolbarContentTintHelper.colorizeToolbar(playerToolbar, Color.WHITE, activity)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,7 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
import code.name.monkey.retromusic.extensions.ripAlpha
|
import code.name.monkey.retromusic.extensions.ripAlpha
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
||||||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||||
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
||||||
|
@ -70,9 +71,10 @@ class MaterialControlsFragment : AbsPlayerControlsFragment() {
|
||||||
text.text = song.artistName
|
text.text = song.artistName
|
||||||
|
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
songInfo?.text = getSongInfo(song)
|
songInfo.text = getSongInfo(song)
|
||||||
|
songInfo.show()
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo.hide()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@ import code.name.monkey.appthemehelper.util.TintHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
import code.name.monkey.retromusic.extensions.ripAlpha
|
import code.name.monkey.retromusic.extensions.ripAlpha
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
||||||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||||
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
||||||
|
@ -113,9 +114,10 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment(), OnSharedPref
|
||||||
text.text = song.artistName
|
text.text = song.artistName
|
||||||
|
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
songInfo?.text = getSongInfo(song)
|
songInfo.text = getSongInfo(song)
|
||||||
|
songInfo.show()
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo.hide()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,7 @@ import code.name.monkey.appthemehelper.util.ATHUtil
|
||||||
import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
|
import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
|
||||||
import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
|
import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
|
||||||
import code.name.monkey.retromusic.glide.SongGlideRequest
|
import code.name.monkey.retromusic.glide.SongGlideRequest
|
||||||
|
@ -111,10 +112,12 @@ class PeakPlayerFragment : AbsPlayerFragment() {
|
||||||
val song = MusicPlayerRemote.currentSong
|
val song = MusicPlayerRemote.currentSong
|
||||||
title.text = song.title
|
title.text = song.title
|
||||||
text.text = song.artistName
|
text.text = song.artistName
|
||||||
|
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
songInfo?.text = getSongInfo(song)
|
songInfo.text = getSongInfo(song)
|
||||||
|
songInfo.show()
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo.hide()
|
||||||
}
|
}
|
||||||
|
|
||||||
SongGlideRequest.Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong)
|
SongGlideRequest.Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong)
|
||||||
|
|
|
@ -18,6 +18,7 @@ import code.name.monkey.appthemehelper.util.TintHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
import code.name.monkey.retromusic.extensions.ripAlpha
|
import code.name.monkey.retromusic.extensions.ripAlpha
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
||||||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||||
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
||||||
|
@ -73,9 +74,10 @@ class PlainPlaybackControlsFragment : AbsPlayerControlsFragment() {
|
||||||
|
|
||||||
private fun updateSong() {
|
private fun updateSong() {
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
songInfo?.text = getSongInfo(MusicPlayerRemote.currentSong)
|
songInfo.text = getSongInfo(MusicPlayerRemote.currentSong)
|
||||||
|
songInfo.show()
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo.hide()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper
|
||||||
import code.name.monkey.appthemehelper.util.TintHelper
|
import code.name.monkey.appthemehelper.util.TintHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
|
||||||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||||
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
|
||||||
|
@ -150,10 +151,12 @@ class SimplePlaybackControlsFragment : AbsPlayerControlsFragment() {
|
||||||
val song = MusicPlayerRemote.currentSong
|
val song = MusicPlayerRemote.currentSong
|
||||||
title.text = song.title
|
title.text = song.title
|
||||||
text.text = song.artistName
|
text.text = song.artistName
|
||||||
|
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
songInfo?.text = getSongInfo(song)
|
songInfo.text = getSongInfo(song)
|
||||||
|
songInfo.show()
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo.hide()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper
|
||||||
import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
|
import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.hide
|
import code.name.monkey.retromusic.extensions.hide
|
||||||
|
import code.name.monkey.retromusic.extensions.show
|
||||||
import code.name.monkey.retromusic.fragments.MiniPlayerFragment
|
import code.name.monkey.retromusic.fragments.MiniPlayerFragment
|
||||||
import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
|
import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
|
||||||
import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
|
import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
|
||||||
|
@ -135,9 +136,10 @@ class TinyPlayerFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Ca
|
||||||
text.text = String.format("%s \nby - %s", song.albumName, song.artistName)
|
text.text = String.format("%s \nby - %s", song.albumName, song.artistName)
|
||||||
|
|
||||||
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
|
||||||
songInfo?.text = getSongInfo(song)
|
songInfo.text = getSongInfo(song)
|
||||||
|
songInfo.show()
|
||||||
} else {
|
} else {
|
||||||
songInfo?.hide()
|
songInfo.hide()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -92,7 +92,7 @@ class SortOrder {
|
||||||
const val SONG_DATE = MediaStore.Audio.Media.DATE_ADDED + " DESC"
|
const val SONG_DATE = MediaStore.Audio.Media.DATE_ADDED + " DESC"
|
||||||
|
|
||||||
/* Song sort modified date */
|
/* Song sort modified date */
|
||||||
const val SONG_MODIFIED = MediaStore.Audio.Media.DATE_MODIFIED + " DESC"
|
const val SONG_DATE_MODIFIED = MediaStore.Audio.Media.DATE_MODIFIED + " DESC"
|
||||||
|
|
||||||
/* Song sort order composer*/
|
/* Song sort order composer*/
|
||||||
const val COMPOSER = MediaStore.Audio.Media.COMPOSER
|
const val COMPOSER = MediaStore.Audio.Media.COMPOSER
|
||||||
|
|
19
app/src/main/res/drawable/ic_dashboard_white_24dp.xml
Normal file
19
app/src/main/res/drawable/ic_dashboard_white_24dp.xml
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
<!--
|
||||||
|
~ Copyright (c) 2020 Hemanth Savarala.
|
||||||
|
~
|
||||||
|
~ Licensed under the GNU General Public License v3
|
||||||
|
~
|
||||||
|
~ This is free software: you can redistribute it and/or modify it under
|
||||||
|
~ the terms of the GNU General Public License as published by
|
||||||
|
~ the Free Software Foundation either version 3 of the License, or (at your option) any later version.
|
||||||
|
~
|
||||||
|
~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||||
|
~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
~ See the GNU General Public License for more details.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<vector android:height="24dp" android:tint="#FFFFFF"
|
||||||
|
android:viewportHeight="24.0" android:viewportWidth="24.0"
|
||||||
|
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<path android:fillColor="#FF000000" android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z"/>
|
||||||
|
</vector>
|
|
@ -22,7 +22,7 @@
|
||||||
android:id="@+id/action_grid_size"
|
android:id="@+id/action_grid_size"
|
||||||
android:icon="@drawable/ic_grid_size_white_24dp"
|
android:icon="@drawable/ic_grid_size_white_24dp"
|
||||||
android:title="@string/action_grid_size"
|
android:title="@string/action_grid_size"
|
||||||
app:showAsAction="never">
|
app:showAsAction="ifRoom">
|
||||||
<menu>
|
<menu>
|
||||||
<group
|
<group
|
||||||
android:id="@+id/group_grid_size"
|
android:id="@+id/group_grid_size"
|
||||||
|
@ -56,9 +56,9 @@
|
||||||
</item>
|
</item>
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_layout_type"
|
android:id="@+id/action_layout_type"
|
||||||
android:icon="@drawable/ic_grid_size_white_24dp"
|
android:icon="@drawable/ic_dashboard_white_24dp"
|
||||||
android:title="@string/grid_style_label"
|
android:title="@string/grid_style_label"
|
||||||
app:showAsAction="never">
|
app:showAsAction="ifRoom">
|
||||||
<menu>
|
<menu>
|
||||||
<group
|
<group
|
||||||
android:id="@+id/group_layout_type"
|
android:id="@+id/group_layout_type"
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
<item name="action_song_sort_order_year" type="id" />
|
<item name="action_song_sort_order_year" type="id" />
|
||||||
<item name="action_song_sort_order_date" type="id" />
|
<item name="action_song_sort_order_date" type="id" />
|
||||||
<item name="action_song_sort_order_composer" type="id" />
|
<item name="action_song_sort_order_composer" type="id" />
|
||||||
|
<item name="action_song_sort_order_date_modified" type="id" />
|
||||||
<item name="action_multi_select_adapter_check_all" type="id" />
|
<item name="action_multi_select_adapter_check_all" type="id" />
|
||||||
<item name="action_folder" type="id" />
|
<item name="action_folder" type="id" />
|
||||||
</resources>
|
</resources>
|
|
@ -727,6 +727,7 @@
|
||||||
<string name="sort_order_artist">Artist</string>
|
<string name="sort_order_artist">Artist</string>
|
||||||
<string name="sort_order_composer">Composer</string>
|
<string name="sort_order_composer">Composer</string>
|
||||||
<string name="sort_order_date">Date</string>
|
<string name="sort_order_date">Date</string>
|
||||||
|
<string name="sort_order_date_modified">Date modified</string>
|
||||||
<string name="sort_order_year">Year</string>
|
<string name="sort_order_year">Year</string>
|
||||||
<string name="sort_order_z_a">Descending</string>
|
<string name="sort_order_z_a">Descending</string>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue