From eee663f717d6dde4fba289350f10e5aad8b98f08 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Thu, 6 Feb 2020 11:09:10 +0530 Subject: [PATCH] Improved album and artist grid style change --- .../activities/AlbumDetailsActivity.kt | 2 +- .../activities/ArtistDetailActivity.kt | 32 +++++++------------ .../retromusic/activities/MainActivity.kt | 2 +- .../monkey/retromusic/adapter/HomeAdapter.kt | 1 - .../retromusic/adapter/album/AlbumAdapter.kt | 23 ------------- .../adapter/album/AlbumFullWidthAdapter.kt | 9 ------ .../adapter/album/HorizontalAlbumAdapter.kt | 3 +- .../adapter/artist/ArtistAdapter.kt | 9 ++---- .../adapter/base/MediaEntryViewHolder.java | 4 --- ...PagerRecyclerViewCustomGridSizeFragment.kt | 7 +--- .../fragments/mainactivity/AlbumsFragment.kt | 27 ++++------------ .../fragments/mainactivity/ArtistsFragment.kt | 15 --------- .../fragments/mainactivity/SongsFragment.kt | 11 ------- app/src/main/res/layout-land/pager_item.xml | 15 ++------- .../res/layout-xlarge-land/pager_item.xml | 16 ++-------- app/src/main/res/layout-xlarge/pager_item.xml | 14 ++------ app/src/main/res/layout/pager_item.xml | 10 ------ 17 files changed, 31 insertions(+), 169 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt index 079dba7fc..529728af7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt @@ -208,7 +208,7 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView, C moreRecyclerView.show() moreTitle.text = String.format(getString(R.string.label_more_from), album.artist) - val albumAdapter = HorizontalAlbumAdapter(this, albums, false, null) + val albumAdapter = HorizontalAlbumAdapter(this, albums, null) moreRecyclerView.layoutManager = GridLayoutManager( this, 1, diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt index ff1c44d77..e34e468a4 100755 --- a/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt @@ -22,10 +22,12 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter +import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog import code.name.monkey.retromusic.extensions.ripAlpha import code.name.monkey.retromusic.extensions.show import code.name.monkey.retromusic.glide.ArtistGlideRequest import code.name.monkey.retromusic.glide.RetroMusicColoredTarget +import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.interfaces.CabHolder import code.name.monkey.retromusic.model.Album import code.name.monkey.retromusic.model.Artist @@ -57,7 +59,6 @@ import kotlinx.android.synthetic.main.activity_artist_details.artistTitle import kotlinx.android.synthetic.main.activity_artist_details.image import kotlinx.android.synthetic.main.activity_artist_details.text import kotlinx.android.synthetic.main.activity_artist_details.toolbar -import java.text.DecimalFormat import java.util.Locale import javax.inject.Inject @@ -84,6 +85,7 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView, private var cab: MaterialCab? = null private var biography: Spanned? = null private lateinit var artist: Artist + private lateinit var songs: List private lateinit var songAdapter: SimpleSongAdapter private lateinit var albumAdapter: HorizontalAlbumAdapter private var forceDownload: Boolean = false @@ -133,10 +135,10 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView, setupRecyclerView() playAction.apply { - //setOnClickListener { MusicPlayerRemote.openQueue(artist.songs, 0, true) } + setOnClickListener { MusicPlayerRemote.openQueue(songs, 0, true) } } shuffleAction.apply { - //setOnClickListener { MusicPlayerRemote.openAndShuffleQueue(artist.songs, true) } + setOnClickListener { MusicPlayerRemote.openAndShuffleQueue(songs, true) } } biographyText.setOnClickListener { @@ -154,7 +156,7 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView, } private fun setupRecyclerView() { - albumAdapter = HorizontalAlbumAdapter(this, ArrayList(), false, null) + albumAdapter = HorizontalAlbumAdapter(this, ArrayList(), null) albumRecyclerView.apply { itemAnimator = DefaultItemAnimator() layoutManager = GridLayoutManager(this.context, 1, GridLayoutManager.HORIZONTAL, false) @@ -190,6 +192,7 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView, } override fun songs(songs: List) { + this.songs = songs songAdapter.swapDataSet(songs) } @@ -287,45 +290,32 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView, MaterialUtil.setTint(button = playAction, color = buttonColor) val toolbarColor = ATHUtil.resolveColor(this, R.attr.colorSurface) - //status_bar.setBackgroundColor(toolbarColor) + toolbar.setBackgroundColor(toolbarColor) setSupportActionBar(toolbar) supportActionBar?.title = null } - private fun numberFormat(count: Float): String { - val prefixes = arrayOf("", "K", "M", "B", "T", "P", "E") - var index = 0 - var finalCount = count - while (finalCount / 1000 >= 1) { - finalCount /= 1000 - index++ - } - val decimal = DecimalFormat("#.##") - return String.format("%s %s", decimal.format(finalCount), prefixes[index]) - } - override fun onOptionsItemSelected(item: MenuItem): Boolean { return handleSortOrderMenuItem(item) } private fun handleSortOrderMenuItem(item: MenuItem): Boolean { - //val songs = artist.songs when (item.itemId) { android.R.id.home -> { super.onBackPressed() return true } R.id.action_play_next -> { - //MusicPlayerRemote.playNext(songs) + MusicPlayerRemote.playNext(songs) return true } R.id.action_add_to_current_playing -> { - //MusicPlayerRemote.enqueue(songs) + MusicPlayerRemote.enqueue(songs) return true } R.id.action_add_to_playlist -> { - //AddToPlaylistDialog.create(songs).show(supportFragmentManager, "ADD_PLAYLIST") + AddToPlaylistDialog.create(songs).show(supportFragmentManager, "ADD_PLAYLIST") return true } R.id.action_set_artist_image -> { diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt index 34f87b098..ab1d7dc7a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt @@ -218,7 +218,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedP } override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) { - if (key == PreferenceUtil.GENERAL_THEME || key == PreferenceUtil.BLACK_THEME || key == PreferenceUtil.ADAPTIVE_COLOR_APP || key == PreferenceUtil.DOMINANT_COLOR || key == PreferenceUtil.USER_NAME || key == PreferenceUtil.TOGGLE_FULL_SCREEN || key == PreferenceUtil.TOGGLE_VOLUME || key == PreferenceUtil.ROUND_CORNERS || key == PreferenceUtil.CAROUSEL_EFFECT || key == PreferenceUtil.NOW_PLAYING_SCREEN_ID || key == PreferenceUtil.TOGGLE_GENRE || key == PreferenceUtil.BANNER_IMAGE_PATH || key == PreferenceUtil.PROFILE_IMAGE_PATH || key == PreferenceUtil.CIRCULAR_ALBUM_ART || key == PreferenceUtil.KEEP_SCREEN_ON || key == PreferenceUtil.TOGGLE_SEPARATE_LINE || key == PreferenceUtil.ALBUM_GRID_STYLE || key == PreferenceUtil.ARTIST_GRID_STYLE || key == PreferenceUtil.TOGGLE_HOME_BANNER || key == PreferenceUtil.TOGGLE_ADD_CONTROLS || key == PreferenceUtil.ALBUM_COVER_STYLE || key == PreferenceUtil.HOME_ARTIST_GRID_STYLE || key == PreferenceUtil.ALBUM_COVER_TRANSFORM || key == PreferenceUtil.DESATURATED_COLOR || key == PreferenceUtil.TAB_TEXT_MODE || key == PreferenceUtil.LIBRARY_CATEGORIES + if (key == PreferenceUtil.GENERAL_THEME || key == PreferenceUtil.BLACK_THEME || key == PreferenceUtil.ADAPTIVE_COLOR_APP || key == PreferenceUtil.DOMINANT_COLOR || key == PreferenceUtil.USER_NAME || key == PreferenceUtil.TOGGLE_FULL_SCREEN || key == PreferenceUtil.TOGGLE_VOLUME || key == PreferenceUtil.ROUND_CORNERS || key == PreferenceUtil.CAROUSEL_EFFECT || key == PreferenceUtil.NOW_PLAYING_SCREEN_ID || key == PreferenceUtil.TOGGLE_GENRE || key == PreferenceUtil.BANNER_IMAGE_PATH || key == PreferenceUtil.PROFILE_IMAGE_PATH || key == PreferenceUtil.CIRCULAR_ALBUM_ART || key == PreferenceUtil.KEEP_SCREEN_ON || key == PreferenceUtil.TOGGLE_SEPARATE_LINE || key == PreferenceUtil.TOGGLE_HOME_BANNER || key == PreferenceUtil.TOGGLE_ADD_CONTROLS || key == PreferenceUtil.ALBUM_COVER_STYLE || key == PreferenceUtil.HOME_ARTIST_GRID_STYLE || key == PreferenceUtil.ALBUM_COVER_TRANSFORM || key == PreferenceUtil.DESATURATED_COLOR || key == PreferenceUtil.TAB_TEXT_MODE || key == PreferenceUtil.LIBRARY_CATEGORIES ) postRecreate() } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt index 10ce8b0ab..024daf715 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt @@ -121,7 +121,6 @@ class HomeAdapter( activity, list, PreferenceUtil.getInstance(activity).getHomeGridStyle(activity), - false, null ) adapter = artistAdapter diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt index 9ec98cd80..42f7f683c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt @@ -29,7 +29,6 @@ open class AlbumAdapter( protected val activity: AppCompatActivity, dataSet: List, protected var itemLayoutRes: Int, - usePalette: Boolean, cabHolder: CabHolder? ) : AbsMultiSelectAdapter( activity, @@ -40,24 +39,11 @@ open class AlbumAdapter( var dataSet: List protected set - protected var usePalette = false - init { this.dataSet = dataSet - this.usePalette = usePalette this.setHasStableIds(true) } - fun useItemLayout(itemLayoutRes: Int) { - this.itemLayoutRes = itemLayoutRes - notifyDataSetChanged() - } - - fun usePalette(usePalette: Boolean) { - this.usePalette = usePalette - notifyDataSetChanged() - } - fun swapDataSet(dataSet: List) { this.dataSet = dataSet notifyDataSetChanged() @@ -86,15 +72,6 @@ open class AlbumAdapter( holder.itemView.isActivated = isChecked holder.title?.text = getAlbumTitle(album) holder.text?.text = getAlbumText(album) - holder.playSongs?.setOnClickListener { - /*album.songs?.let { songs -> - MusicPlayerRemote.openQueue( - songs, - 0, - true - ) - }*/ - } loadAlbumCover(album, holder) } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt index 4495c2e74..e167e7bd2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt @@ -45,15 +45,6 @@ class AlbumFullWidthAdapter( val album = dataSet[position] holder.title?.text = getAlbumTitle(album) holder.text?.text = getAlbumText(album) - holder.playSongs?.setOnClickListener { - /*album.songs?.let { songs -> - MusicPlayerRemote.openQueue( - songs, - 0, - true - ) - }*/ - } loadAlbumCover(album, holder) } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt index 843a33870..0b888ee21 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt @@ -16,10 +16,9 @@ import java.util.ArrayList class HorizontalAlbumAdapter( activity: AppCompatActivity, dataSet: ArrayList, - usePalette: Boolean, cabHolder: CabHolder? ) : AlbumAdapter( - activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, usePalette, cabHolder + activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, cabHolder ) { override fun createViewHolder(view: View, viewType: Int): ViewHolder { diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt index d017dc760..82df259a0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt @@ -30,7 +30,7 @@ class ArtistAdapter( val activity: AppCompatActivity, var dataSet: ArrayList, var itemLayoutRes: Int, - var usePalette: Boolean, + cabHolder: CabHolder? ) : AbsMultiSelectAdapter( activity, cabHolder, R.menu.menu_media_selection @@ -41,13 +41,8 @@ class ArtistAdapter( notifyDataSetChanged() } - fun usePalette(usePalette: Boolean) { - this.usePalette = usePalette - notifyDataSetChanged() - } - override fun getItemId(position: Int): Long { - return dataSet[position].id.toLong() + return dataSet[position].id } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java index 014d7ea15..d39194120 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java @@ -17,7 +17,6 @@ package code.name.monkey.retromusic.adapter.base; import android.graphics.Color; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; @@ -60,8 +59,6 @@ public class MediaEntryViewHolder extends AbstractDraggableSwipeableItemViewHold @Nullable public View paletteColorContainer; - @Nullable - public ImageButton playSongs; @Nullable public RecyclerView recyclerView; @@ -93,7 +90,6 @@ public class MediaEntryViewHolder extends AbstractDraggableSwipeableItemViewHold paletteColorContainer = itemView.findViewById(R.id.paletteColorContainer); recyclerView = itemView.findViewById(R.id.recycler_view); mask = itemView.findViewById(R.id.mask); - playSongs = itemView.findViewById(R.id.playSongs); dummyContainer = itemView.findViewById(R.id.dummy_view); if (imageContainerCard != null) { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt index 60ba8e84d..8b078163f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt @@ -34,6 +34,7 @@ abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment) { + override fun albums(albums: List) { adapter?.swapDataSet(albums) } @@ -53,21 +53,13 @@ open class AlbumsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment + android:layout_margin="8dp" + app:cardCornerRadius="16dp"> - - + android:layout_margin="8dp" + app:cardCornerRadius="16dp"> - - + + android:layout_margin="8dp" + app:cardCornerRadius="16dp"> - -