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

Added icons for material design and Updated the Album style for Now playing themes

Browse source
This commit is contained in:
h4h13 2020-05-06 02:11:07 +05:30
parent fd22134a23
commit c8837f13ef
18 changed files with 165 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

37
app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt
View file

@ -20,30 +20,25 @@ import androidx.fragment.app.DialogFragment
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.loaders.PlaylistLoader
import code.name.monkey.retromusic.model.Song
import code.name.monkey.retromusic.room.playlist.PlaylistDatabaseModel
import code.name.monkey.retromusic.room.playlist.PlaylistEntity
import code.name.monkey.retromusic.util.PlaylistsUtil
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 kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
class AddToPlaylistDialog : DialogFragment() {
override fun onCreateDialog(
savedInstanceState: Bundle?
): Dialog {
val names = requireArguments().getParcelableArrayList<PlaylistEntity>("names")
val playlists = PlaylistLoader.getAllPlaylists(requireContext())
val playlistNames: MutableList<String> = mutableListOf()
playlistNames.add(requireContext().resources.getString(R.string.action_new_playlist))
for (p in names!!) {
playlistNames.add(p.playlistName)
for (p in playlists) {
playlistNames.add(p.name)
}
return MaterialDialog(requireContext()).show {
title(R.string.add_playlist_title)
cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
@ -57,18 +52,12 @@ class AddToPlaylistDialog : DialogFragment() {
}
} else {
dialog.dismiss()
/*PlaylistsUtil.addToPlaylist(
PlaylistsUtil.addToPlaylist(
requireContext(),
songs,
playlists[index - 1].id,
true
)*/
GlobalScope.launch(Dispatchers.IO) {
PlaylistDatabaseModel().also {
it.addSongsToPlaylist(songs, names[index - 1])
}
}
)
}
}
}
@ -89,17 +78,5 @@ class AddToPlaylistDialog : DialogFragment() {
dialog.arguments = args
return dialog
}
fun create(
songs: ArrayList<Song>,
names: List<PlaylistEntity>
): AddToPlaylistDialog {
val dialog = AddToPlaylistDialog()
val args = Bundle()
args.putParcelableArrayList("songs", ArrayList(songs))
args.putParcelableArrayList("names", ArrayList(names))
dialog.arguments = args
return dialog
}
}
}

8
app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt
View file

@ -24,10 +24,7 @@ import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.R.layout
import code.name.monkey.retromusic.R.string
import code.name.monkey.retromusic.extensions.appHandleColor
import code.name.monkey.retromusic.fragments.playlists.PlaylistViewModel
import code.name.monkey.retromusic.model.Song
import code.name.monkey.retromusic.room.playlist.PlaylistDatabaseModel
import code.name.monkey.retromusic.room.playlist.PlaylistEntity
import code.name.monkey.retromusic.util.PlaylistsUtil
import code.name.monkey.retromusic.util.PreferenceUtil
import com.afollestad.materialdialogs.LayoutMode
@ -60,14 +57,13 @@ class CreatePlaylistDialog : DialogFragment() {
?: return@positiveButton
if (playlistView.text.toString().trim { it <= ' ' }.isNotEmpty()) {
/*val playlistId = PlaylistsUtil.createPlaylist(
val playlistId = PlaylistsUtil.createPlaylist(
requireContext(),
playlistView.text.toString()
)
if (playlistId != -1) {
PlaylistsUtil.addToPlaylist(requireContext(), songs, playlistId, true)
}*/
PlaylistDatabaseModel().savePlaylist(PlaylistEntity(playlistView.text.toString()))
}
}
}
}