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

Fix blacklist dialog

Browse source
This commit is contained in:
h4h13 2020-04-26 15:25:00 +05:30
parent 2da9d1c5b7
commit eaa2e258c6
13 changed files with 171 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

44
app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
View file

@ -2,11 +2,14 @@ package code.name.monkey.retromusic.adapter.song
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.AppCompatImageView
import androidx.appcompat.widget.PopupMenu
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.helper.MusicPlayerRemote
import code.name.monkey.retromusic.interfaces.CabHolder
import code.name.monkey.retromusic.model.Song
import com.google.android.material.button.MaterialButton
import code.name.monkey.retromusic.util.PreferenceUtil
import com.google.android.material.textview.MaterialTextView
class ShuffleButtonSongAdapter(
activity: AppCompatActivity,
@ -15,34 +18,45 @@ class ShuffleButtonSongAdapter(
cabHolder: CabHolder?
) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, cabHolder) {
override fun createViewHolder(view: View): SongAdapter.ViewHolder {
override fun createViewHolder(view: View): ViewHolder {
return ViewHolder(view)
}
override fun onBindViewHolder(holder: SongAdapter.ViewHolder, position: Int) {
if (holder.itemViewType == OFFSET_ITEM) {
val viewHolder = holder as ViewHolder
viewHolder.playAction?.setOnClickListener {
MusicPlayerRemote.openQueue(dataSet, 0, true)
}
viewHolder.info?.text =
activity.resources.getQuantityString(R.plurals.numSongs, dataSet.size, dataSet.size)
viewHolder.shuffleAction?.setOnClickListener {
MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
}
showChangeLayout(viewHolder)
showSortMenu(viewHolder)
} else {
super.onBindViewHolder(holder, position - 1)
}
}
inner class ViewHolder(itemView: View) : AbsOffsetSongAdapter.ViewHolder(itemView) {
val playAction: MaterialButton? = itemView.findViewById(R.id.playAction)
val shuffleAction: MaterialButton? = itemView.findViewById(R.id.shuffleAction)
override fun onClick(v: View?) {
if (itemViewType == OFFSET_ITEM) {
MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
return
}
super.onClick(v)
private fun showChangeLayout(viewHolder: ViewHolder) {
viewHolder.changeLayoutType?.setOnClickListener {
val popupMenu = PopupMenu(activity, viewHolder.changeLayoutType)
popupMenu.inflate(R.menu.menu_layout_types)
popupMenu.show()
}
}
private fun showSortMenu(viewHolder: ViewHolder) {
viewHolder.sortOrder?.setOnClickListener {
val popupMenu = PopupMenu(activity, viewHolder.sortOrder)
popupMenu.show()
}
}
inner class ViewHolder(itemView: View) : AbsOffsetSongAdapter.ViewHolder(itemView) {
val sortOrder: AppCompatImageView? = itemView.findViewById(R.id.sortOrder)
val changeLayoutType: AppCompatImageView? = itemView.findViewById(R.id.changeLayoutType)
val shuffleAction: View? = itemView.findViewById(R.id.shuffleAction)
val info: MaterialTextView? = itemView.findViewById(R.id.info)
}
}

4
app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.kt
View file

@ -86,7 +86,7 @@ class BlacklistFolderChooserDialog : DialogFragment() {
Manifest.permission.READ_EXTERNAL_STORAGE
) != PackageManager.PERMISSION_GRANTED
) {
return MaterialDialog(requireActivity(), BottomSheet(LayoutMode.WRAP_CONTENT)).show {
return MaterialDialog(requireActivity()).show {
title(R.string.md_error_label)
cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
message(R.string.md_storage_perm_error)
@ -103,7 +103,7 @@ class BlacklistFolderChooserDialog : DialogFragment() {
checkIfCanGoUp()
parentContents = listFiles()
return MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT)).show {
return MaterialDialog(requireContext()).show {
title(text = parentFolder!!.absolutePath)
cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
listItems(items = contentsArray(), waitForPositiveButton = false) { _, index, _ ->

28
app/src/main/java/code/name/monkey/retromusic/model/Song.kt
View file

@ -14,23 +14,27 @@
package code.name.monkey.retromusic.model
import android.os.Parcelable
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
import code.name.monkey.retromusic.room.SongEntity
import kotlinx.android.parcel.Parcelize
@Parcelize
@Entity(tableName = "playing_queue")
open class Song(
val id: Int,
val title: String,
val trackNumber: Int,
val year: Int,
val duration: Long,
val data: String,
val dateModified: Long,
val albumId: Int,
val albumName: String,
val artistId: Int,
val artistName: String,
val composer: String?
@PrimaryKey val id: Int,
@ColumnInfo(name = "title") val title: String,
@ColumnInfo(name = "track_number") val trackNumber: Int,
@ColumnInfo(name = "year") val year: Int,
@ColumnInfo(name = "duration") val duration: Long,
@ColumnInfo(name = "data") val data: String,
@ColumnInfo(name = "date_modified") val dateModified: Long,
@ColumnInfo(name = "album_id") val albumId: Int,
@ColumnInfo(name = "album_name") val albumName: String,
@ColumnInfo(name = "artist_id") val artistId: Int,
@ColumnInfo(name = "artist_name") val artistName: String,
@ColumnInfo(name = "composer") val composer: String?
) : Parcelable {

25
app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt
View file

@ -28,9 +28,7 @@ import code.name.monkey.retromusic.dialogs.BlacklistFolderChooserDialog
import code.name.monkey.retromusic.extensions.colorControlNormal
import code.name.monkey.retromusic.providers.BlacklistStore
import code.name.monkey.retromusic.util.PreferenceUtil
import com.afollestad.materialdialogs.LayoutMode
import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.bottomsheets.BottomSheet
import com.afollestad.materialdialogs.list.listItems
import java.io.File
import java.util.*
@ -59,23 +57,23 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
}
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val blacklistFolderChooserDialog =
val chooserDialog =
childFragmentManager.findFragmentByTag("FOLDER_CHOOSER") as BlacklistFolderChooserDialog?
blacklistFolderChooserDialog?.setCallback(this)
chooserDialog?.setCallback(this)
refreshBlacklistData()
return MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT)).show {
title(code.name.monkey.retromusic.R.string.blacklist)
return MaterialDialog(requireContext()).show {
title(R.string.blacklist)
cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
positiveButton(android.R.string.ok) {
dismiss()
}
neutralButton(text = getString(R.string.clear_action)) {
MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT)).show {
MaterialDialog(requireContext()).show {
title(code.name.monkey.retromusic.R.string.clear_blacklist)
message(code.name.monkey.retromusic.R.string.do_you_want_to_clear_the_blacklist)
cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
positiveButton(code.name.monkey.retromusic.R.string.clear_action) {
BlacklistStore.getInstance(context).clear()
BlacklistStore.getInstance(requireContext()).clear()
refreshBlacklistData()
}
negativeButton(android.R.string.cancel)
@ -87,20 +85,21 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
dialog.show(childFragmentManager, "FOLDER_CHOOSER")
}
listItems(items = paths, waitForPositiveButton = false) { _, _, text ->
MaterialDialog(context, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
MaterialDialog(requireContext()).show {
cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
title(code.name.monkey.retromusic.R.string.remove_from_blacklist)
message(
text = HtmlCompat.fromHtml(
getString(
code.name.monkey.retromusic.R.string.do_you_want_to_remove_from_the_blacklist,
R.string.do_you_want_to_remove_from_the_blacklist,
text
),
HtmlCompat.FROM_HTML_MODE_LEGACY
)
)
positiveButton(code.name.monkey.retromusic.R.string.remove_action) {
BlacklistStore.getInstance(context).removePath(File(text.toString()))
BlacklistStore.getInstance(requireContext())
.removePath(File(text.toString()))
refreshBlacklistData()
}
negativeButton(android.R.string.cancel)
@ -113,13 +112,13 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
private lateinit var paths: ArrayList<String>
private fun refreshBlacklistData() {
this.paths = BlacklistStore.getInstance(context!!).paths
this.paths = BlacklistStore.getInstance(requireContext()).paths
val dialog = dialog as MaterialDialog?
dialog?.listItems(items = paths)
}
override fun onFolderSelection(dialog: BlacklistFolderChooserDialog, folder: File) {
BlacklistStore.getInstance(context!!).addPath(folder)
BlacklistStore.getInstance(requireContext()).addPath(folder)
refreshBlacklistData()
}
}

3
app/src/main/java/code/name/monkey/retromusic/room/MusicPlaybackQueueStoreDatabase.kt
View file

@ -4,8 +4,9 @@ import android.content.Context
import androidx.room.Database
import androidx.room.Room
import androidx.room.RoomDatabase
import code.name.monkey.retromusic.model.Song
@Database(entities = [SongEntity::class], version = 2, exportSchema = false)
@Database(entities = [Song::class, SongEntity::class], version = 3, exportSchema = false)
abstract class MusicPlaybackQueueStoreDatabase : RoomDatabase() {
abstract fun queueDao(): QueueDao

10
app/src/main/java/code/name/monkey/retromusic/room/MusicQueueRepository.kt
View file

@ -1,16 +1,18 @@
package code.name.monkey.retromusic.room
import code.name.monkey.retromusic.model.Song
class MusicQueueRepository(private val queueDao: QueueDao) {
fun getQueue(): List<SongEntity> = queueDao.getQueue()
fun getQueue(): List<Song> = queueDao.getQueue()
fun getOriginalQueue(): List<SongEntity> = queueDao.getQueue()
fun getOriginalQueue(): List<SongEntity> = queueDao.getOriginalQueue()
suspend fun insertQueue(queue: List<SongEntity>) {
suspend fun insertQueue(queue: List<Song>) {
queueDao.saveQueue(queue)
}
suspend fun insertOriginalQueue(queue: List<SongEntity>) {
queueDao.saveQueue(queue)
queueDao.saveOriginalQueue(queue)
}
}

24
app/src/main/java/code/name/monkey/retromusic/room/NowPlayingQueue.kt
View file

@ -12,31 +12,19 @@ class NowPlayingQueue(context: Context) {
private val musicQueueRepository: MusicQueueRepository = MusicQueueRepository(queueDao)
fun saveQueue(songs: List<Song>) = GlobalScope.launch(Dispatchers.IO) {
val songEntity = songs.map {
Song.toSongEntity(it)
}
musicQueueRepository.insertQueue(songEntity)
fun saveQueue(songs: List<Song>) = GlobalScope.launch(Dispatchers.Default) {
musicQueueRepository.insertQueue(songs)
}
fun saveOriginalQueue(playingQueue: List<Song>) = GlobalScope.launch(Dispatchers.IO) {
val songEntity = playingQueue.map {
Song.toSongEntity(it)
}
musicQueueRepository.insertOriginalQueue(songEntity)
fun saveOriginalQueue(songs: List<Song>) = GlobalScope.launch(Dispatchers.Default) {
musicQueueRepository.insertOriginalQueue(songs.map { Song.toSongEntity(it) })
}
fun getQueue(): List<Song> {
val songEntity = musicQueueRepository.getQueue()
return songEntity.map {
SongEntity.toSong(it)
}
return musicQueueRepository.getQueue()
}
fun getOriginalQueue(): List<Song> {
val songEntity = musicQueueRepository.getOriginalQueue()
return songEntity.map {
SongEntity.toSong(it)
}
return musicQueueRepository.getOriginalQueue().map { SongEntity.toSong(it) }
}
}

12
app/src/main/java/code/name/monkey/retromusic/room/QueueDao.kt
View file

@ -4,6 +4,7 @@ import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import code.name.monkey.retromusic.model.Song
/**
* Created by hemanths on 2020-02-23.
@ -12,12 +13,15 @@ import androidx.room.Query
interface QueueDao {
@Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun saveQueue(playingQueue: List<SongEntity>)
suspend fun saveQueue(playingQueue: List<Song>)
@Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun saveOriginalQueue(playingQueue: List<SongEntity>)
@Query("SELECT * FROM song_entity")
fun getQueue(): List<SongEntity>
@Query("SELECT * FROM playing_queue")
fun getQueue(): List<Song>
@Query("SELECT * FROM song_entity")
@Query("SELECT * FROM original_playing_queue")
fun getOriginalQueue(): List<SongEntity>
}

2
app/src/main/java/code/name/monkey/retromusic/room/SongEntity.kt
View file

@ -5,7 +5,7 @@ import androidx.room.Entity
import androidx.room.PrimaryKey
import code.name.monkey.retromusic.model.Song
@Entity(tableName = "song_entity")
@Entity(tableName = "original_playing_queue")
class SongEntity(
@PrimaryKey val id: Int,
@ColumnInfo(name = "title") val title: String,