clean-arc
This commit is contained in:
parent
1d423fc7bd
commit
5ee566c09a
62 changed files with 477 additions and 937 deletions
|
@ -15,19 +15,17 @@
|
|||
package code.name.monkey.retromusic.helper
|
||||
|
||||
import android.content.Context
|
||||
|
||||
import java.io.BufferedWriter
|
||||
import java.io.File
|
||||
import java.io.FileWriter
|
||||
import java.io.IOException
|
||||
import java.util.ArrayList
|
||||
|
||||
import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
|
||||
import code.name.monkey.retromusic.model.AbsCustomPlaylist
|
||||
import code.name.monkey.retromusic.model.Playlist
|
||||
import code.name.monkey.retromusic.model.Song
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.ObservableEmitter
|
||||
import java.io.BufferedWriter
|
||||
import java.io.File
|
||||
import java.io.FileWriter
|
||||
import java.io.IOException
|
||||
import java.util.*
|
||||
|
||||
class M3UWriter : M3UConstants {
|
||||
companion object {
|
||||
|
|
|
@ -26,6 +26,7 @@ import android.provider.DocumentsContract
|
|||
import android.provider.MediaStore
|
||||
import android.util.Log
|
||||
import android.widget.Toast
|
||||
|
||||
import code.name.monkey.retromusic.R
|
||||
import code.name.monkey.retromusic.loaders.SongLoader
|
||||
import code.name.monkey.retromusic.model.Song
|
||||
|
@ -47,7 +48,7 @@ object MusicPlayerRemote {
|
|||
val currentSong: Song
|
||||
get() = if (musicService != null) {
|
||||
musicService!!.currentSong
|
||||
} else Song.EMPTY_SONG
|
||||
} else Song.emptySong
|
||||
|
||||
/**
|
||||
* Async
|
||||
|
|
|
@ -24,10 +24,10 @@ import java.util.*
|
|||
|
||||
|
||||
object SearchQueryHelper {
|
||||
private val TITLE_SELECTION = "lower(" + MediaStore.Audio.AudioColumns.TITLE + ") = ?"
|
||||
private val ALBUM_SELECTION = "lower(" + MediaStore.Audio.AudioColumns.ALBUM + ") = ?"
|
||||
private val ARTIST_SELECTION = "lower(" + MediaStore.Audio.AudioColumns.ARTIST + ") = ?"
|
||||
private val AND = " AND "
|
||||
private const val TITLE_SELECTION = "lower(" + MediaStore.Audio.AudioColumns.TITLE + ") = ?"
|
||||
private const val ALBUM_SELECTION = "lower(" + MediaStore.Audio.AudioColumns.ALBUM + ") = ?"
|
||||
private const val ARTIST_SELECTION = "lower(" + MediaStore.Audio.AudioColumns.ARTIST + ") = ?"
|
||||
private const val AND = " AND "
|
||||
var songs = ArrayList<Song>()
|
||||
|
||||
fun getSongs(context: Context, extras: Bundle): ArrayList<Song> {
|
||||
|
|
|
@ -17,6 +17,7 @@ package code.name.monkey.retromusic.helper.menu
|
|||
import android.app.Activity
|
||||
import android.view.MenuItem
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
|
||||
import code.name.monkey.retromusic.R
|
||||
import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
|
||||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||
|
|
|
@ -20,6 +20,7 @@ import androidx.appcompat.app.AppCompatActivity
|
|||
import android.view.MenuItem
|
||||
import android.widget.Toast
|
||||
|
||||
|
||||
import java.util.ArrayList
|
||||
|
||||
import code.name.monkey.retromusic.R
|
||||
|
|
|
@ -20,6 +20,7 @@ import android.view.View
|
|||
import android.widget.PopupMenu
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.fragment.app.FragmentActivity
|
||||
|
||||
import code.name.monkey.retromusic.R
|
||||
import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
|
||||
import code.name.monkey.retromusic.dialogs.DeleteSongsDialog
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
package code.name.monkey.retromusic.helper.menu
|
||||
|
||||
import androidx.fragment.app.FragmentActivity
|
||||
|
||||
import code.name.monkey.retromusic.R
|
||||
import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
|
||||
import code.name.monkey.retromusic.dialogs.DeleteSongsDialog
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue