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

Replayce adapterposition to layoutposition

Browse source
This commit is contained in:
h4h13 2020-04-16 23:43:12 +05:30
parent 43a33a63eb
commit d87c95b7b2
14 changed files with 342 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
View file

@ -49,7 +49,7 @@ class GenreAdapter(
inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
override fun onClick(v: View?) {
super.onClick(v)
val genre = dataSet[adapterPosition]
val genre = dataSet[layoutPosition]
NavigationUtil.goToGenre(activity, genre)
}
}

4
app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
View file

@ -113,7 +113,7 @@ class SearchAdapter(
menu?.visibility = View.VISIBLE
menu?.setOnClickListener(object : SongMenuHelper.OnClickSongMenu(activity) {
override val song: Song
get() = dataSet!![adapterPosition] as Song
get() = dataSet!![layoutPosition] as Song
})
} else {
menu?.visibility = View.GONE
@ -130,7 +130,7 @@ class SearchAdapter(
}
override fun onClick(v: View?) {
val item = dataSet!![adapterPosition]
val item = dataSet!![layoutPosition]
when (itemViewType) {
ALBUM -> {
val options = ActivityOptions.makeSceneTransitionAnimation(

6
app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt
View file

@ -146,7 +146,7 @@ class SongFileAdapter(
init {
if (menu != null && callbacks != null) {
menu?.setOnClickListener { v ->
val position = adapterPosition
val position = layoutPosition
if (isPositionInRange(position)) {
callbacks.onFileMenuClicked(dataSet[position], v)
}
@ -158,7 +158,7 @@ class SongFileAdapter(
}
override fun onClick(v: View?) {
val position = adapterPosition
val position = layoutPosition
if (isPositionInRange(position)) {
if (isInQuickSelectMode) {
toggleChecked(position)
@ -169,7 +169,7 @@ class SongFileAdapter(
}
override fun onLongClick(v: View?): Boolean {
val position = adapterPosition
val position = layoutPosition
return isPositionInRange(position) && toggleChecked(position)
}

4
app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt
View file

@ -97,9 +97,9 @@ class AlbumFullWidthAdapter(
val activityOptions = ActivityOptions.makeSceneTransitionAnimation(
activity,
imageContainerCard ?: image,
"${activity.getString(R.string.transition_album_art)}_${dataSet[adapterPosition].id}"
"${activity.getString(R.string.transition_album_art)}_${dataSet[layoutPosition].id}"
)
NavigationUtil.goToAlbumOptions(activity, dataSet[adapterPosition].id, activityOptions)
NavigationUtil.goToAlbumOptions(activity, dataSet[layoutPosition].id, activityOptions)
}
}
}

8
app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
View file

@ -144,21 +144,21 @@ class ArtistAdapter(
override fun onClick(v: View?) {
super.onClick(v)
if (isInQuickSelectMode) {
toggleChecked(adapterPosition)
toggleChecked(layoutPosition)
} else {
val activityOptions = ActivityOptions.makeSceneTransitionAnimation(
activity,
imageContainerCard ?: image,
"${activity.getString(R.string.transition_artist_image)}_${dataSet[adapterPosition].id}"
"${activity.getString(R.string.transition_artist_image)}_${dataSet[layoutPosition].id}"
)
NavigationUtil.goToArtistOptions(
activity, dataSet[adapterPosition].id, activityOptions
activity, dataSet[layoutPosition].id, activityOptions
)
}
}
override fun onLongClick(v: View?): Boolean {
toggleChecked(adapterPosition)
toggleChecked(layoutPosition)
return super.onLongClick(v)
}
}

20
app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
View file

@ -33,6 +33,7 @@ import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
import code.name.monkey.retromusic.util.AutoGeneratedPlaylistBitmap
import code.name.monkey.retromusic.util.MusicUtil
import code.name.monkey.retromusic.util.NavigationUtil
import code.name.monkey.retromusic.util.RetroColorUtil
import java.util.*
class PlaylistAdapter(
@ -89,7 +90,7 @@ class PlaylistAdapter(
} else {
holder.menu?.show()
}
PlaylistBitmapLoader(this, holder, playlist).execute()
//PlaylistBitmapLoader(this, holder, playlist).execute()
}
private fun getIconRes(playlist: Playlist): Drawable {
@ -182,7 +183,7 @@ class PlaylistAdapter(
}
menu?.setOnClickListener { view ->
val playlist = dataSet[adapterPosition]
val playlist = dataSet[layoutPosition]
val popupMenu = PopupMenu(activity, view)
popupMenu.inflate(
if (itemViewType == SMART_PLAYLIST) R.menu.menu_item_smart_playlist
@ -202,7 +203,7 @@ class PlaylistAdapter(
}
}
PlaylistMenuHelper.handleMenuClick(
activity, dataSet[adapterPosition], item
activity, dataSet[layoutPosition], item
)
}
popupMenu.show()
@ -216,15 +217,15 @@ class PlaylistAdapter(
override fun onClick(v: View?) {
if (isInQuickSelectMode) {
toggleChecked(adapterPosition)
toggleChecked(layoutPosition)
} else {
val playlist = dataSet[adapterPosition]
val playlist = dataSet[layoutPosition]
NavigationUtil.goToPlaylistNew(activity, playlist)
}
}
override fun onLongClick(v: View?): Boolean {
toggleChecked(adapterPosition)
toggleChecked(layoutPosition)
return true
}
}
@ -243,6 +244,13 @@ class PlaylistAdapter(
override fun onPostExecute(result: Bitmap?) {
super.onPostExecute(result)
viewHolder.image?.setImageBitmap(result)
val color = RetroColorUtil.getColor(
RetroColorUtil.generatePalette(
result
),
ATHUtil.resolveColor(adapter.activity, R.attr.colorSurface)
)
viewHolder.paletteColorContainer?.setBackgroundColor(color)
}
}

8
app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt
View file

@ -55,19 +55,19 @@ abstract class AbsOffsetSongAdapter(
override // could also return null, just to be safe return empty song
val song: Song
get() = if (itemViewType == OFFSET_ITEM) Song.emptySong else dataSet[adapterPosition - 1]
get() = if (itemViewType == OFFSET_ITEM) Song.emptySong else dataSet[layoutPosition - 1]
override fun onClick(v: View?) {
if (isInQuickSelectMode && itemViewType != OFFSET_ITEM) {
toggleChecked(adapterPosition)
toggleChecked(layoutPosition)
} else {
MusicPlayerRemote.openQueue(dataSet, adapterPosition - 1, true)
MusicPlayerRemote.openQueue(dataSet, layoutPosition - 1, true)
}
}
override fun onLongClick(v: View?): Boolean {
if (itemViewType == OFFSET_ITEM) return false
toggleChecked(adapterPosition)
toggleChecked(layoutPosition)
return true
}
}

2
app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt
View file

@ -158,7 +158,7 @@ class PlayingQueueAdapter(
override fun onSongMenuItemClick(item: MenuItem): Boolean {
when (item.itemId) {
R.id.action_remove_from_playing_queue -> {
removeFromQueue(adapterPosition)
removeFromQueue(layoutPosition)
return true
}
}

8
app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
View file

@ -150,7 +150,7 @@ open class SongAdapter(
open inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
protected open var songMenuRes = SongMenuHelper.MENU_RES
protected open val song: Song
get() = dataSet[adapterPosition]
get() = dataSet[layoutPosition]
init {
setImageTransitionName(activity.getString(R.string.transition_album_art))
@ -186,14 +186,14 @@ open class SongAdapter(
override fun onClick(v: View?) {
if (isInQuickSelectMode) {
toggleChecked(adapterPosition)
toggleChecked(layoutPosition)
} else {
MusicPlayerRemote.openQueue(dataSet, adapterPosition, true)
MusicPlayerRemote.openQueue(dataSet, layoutPosition, true)
}
}
override fun onLongClick(v: View?): Boolean {
return toggleChecked(adapterPosition)
return toggleChecked(layoutPosition)
}
}