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

Converted PreferencUtil to Kotlin class

Browse source
This commit is contained in:
Hemanth S 2020-05-23 14:57:55 +05:30
parent df225e179f
commit e9bd24872f
108 changed files with 1855 additions and 2099 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.kt
View file

@ -16,11 +16,10 @@ package code.name.monkey.retromusic.loaders
import android.content.Context
import android.provider.MediaStore.Audio.AudioColumns
import code.name.monkey.retromusic.App
import code.name.monkey.retromusic.helper.SortOrder
import code.name.monkey.retromusic.model.Album
import code.name.monkey.retromusic.model.Song
import code.name.monkey.retromusic.util.PreferenceUtil
import code.name.monkey.retromusic.util.PreferenceUtilKT
import java.util.*
import kotlin.collections.ArrayList
@ -40,7 +39,7 @@ object AlbumLoader {
context,
AudioColumns.ALBUM + " LIKE ?",
arrayOf("%$query%"),
getSongLoaderSortOrder(context)
getSongLoaderSortOrder()
)
)
return splitIntoAlbums(songs)
@ -56,7 +55,7 @@ object AlbumLoader {
context,
AudioColumns.ALBUM_ID + "=?",
arrayOf(albumId.toString()),
getSongLoaderSortOrder(context)
getSongLoaderSortOrder()
)
)
val album = Album(songs)
@ -72,7 +71,7 @@ object AlbumLoader {
context,
null,
null,
getSongLoaderSortOrder(context)
getSongLoaderSortOrder()
)
)
return splitIntoAlbums(songs)
@ -108,7 +107,7 @@ object AlbumLoader {
}
private fun sortSongsByTrackNumber(album: Album) {
when (PreferenceUtil.getInstance(App.getContext()).albumDetailSongSortOrder) {
when (PreferenceUtilKT.albumDetailSongSortOrder) {
SortOrder.AlbumSongSortOrder.SONG_TRACK_LIST -> album.songs?.sortWith(Comparator { o1, o2 ->
o1.trackNumber.compareTo(
o2.trackNumber
@ -132,8 +131,8 @@ object AlbumLoader {
}
}
private fun getSongLoaderSortOrder(context: Context): String {
return PreferenceUtil.getInstance(context).albumSortOrder + ", " +
PreferenceUtil.getInstance(context).albumSongSortOrder
private fun getSongLoaderSortOrder(): String {
return PreferenceUtilKT.albumSortOrder + ", " +
PreferenceUtilKT.albumSongSortOrder
}
}

8
app/src/main/java/code/name/monkey/retromusic/loaders/ArtistLoader.kt
View file

@ -18,13 +18,13 @@ import android.content.Context
import android.provider.MediaStore.Audio.AudioColumns
import code.name.monkey.retromusic.model.Album
import code.name.monkey.retromusic.model.Artist
import code.name.monkey.retromusic.util.PreferenceUtil
import code.name.monkey.retromusic.util.PreferenceUtilKT
object ArtistLoader {
private fun getSongLoaderSortOrder(context: Context): String {
return PreferenceUtil.getInstance(context).artistSortOrder + ", " +
PreferenceUtil.getInstance(context).artistAlbumSortOrder + ", " +
PreferenceUtil.getInstance(context).artistSongSortOrder
return PreferenceUtilKT.artistSortOrder + ", " +
PreferenceUtilKT.artistAlbumSortOrder + ", " +
PreferenceUtilKT.artistSongSortOrder
}
fun getAllArtists(context: Context): ArrayList<Artist> {

6
app/src/main/java/code/name/monkey/retromusic/loaders/GenreLoader.kt
View file

@ -23,7 +23,7 @@ import code.name.monkey.retromusic.Constants.BASE_SELECTION
import code.name.monkey.retromusic.Constants.baseProjection
import code.name.monkey.retromusic.model.Genre
import code.name.monkey.retromusic.model.Song
import code.name.monkey.retromusic.util.PreferenceUtil
import code.name.monkey.retromusic.util.PreferenceUtilKT
object GenreLoader {
@ -98,7 +98,7 @@ object GenreLoader {
baseProjection,
BASE_SELECTION,
null,
PreferenceUtil.getInstance(context).songSortOrder
PreferenceUtilKT.songSortOrder
)
} catch (e: SecurityException) {
return null
@ -154,7 +154,7 @@ object GenreLoader {
projection,
null,
null,
PreferenceUtil.getInstance(context).genreSortOrder
PreferenceUtilKT.genreSortOrder
)
} catch (e: SecurityException) {
return null

5
app/src/main/java/code/name/monkey/retromusic/loaders/LastAddedSongsLoader.kt
View file

@ -20,7 +20,7 @@ import android.provider.MediaStore
import code.name.monkey.retromusic.model.Album
import code.name.monkey.retromusic.model.Artist
import code.name.monkey.retromusic.model.Song
import code.name.monkey.retromusic.util.PreferenceUtil
import code.name.monkey.retromusic.util.PreferenceUtilKT
/**
* Created by hemanths on 16/08/17.
@ -33,8 +33,7 @@ object LastAddedSongsLoader {
}
private fun makeLastAddedCursor(context: Context): Cursor? {
val cutoff = PreferenceUtil.getInstance(context).lastAddedCutoff
val cutoff = PreferenceUtilKT.lastAddedCutoff
return SongLoader.makeSongCursor(
context,
MediaStore.Audio.Media.DATE_ADDED + ">?",

7
app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.kt
View file

@ -22,7 +22,8 @@ import code.name.monkey.retromusic.Constants.BASE_SELECTION
import code.name.monkey.retromusic.Constants.baseProjection
import code.name.monkey.retromusic.model.Song
import code.name.monkey.retromusic.providers.BlacklistStore
import code.name.monkey.retromusic.util.PreferenceUtil
import code.name.monkey.retromusic.util.PreferenceUtilKT
import java.util.*
/**
@ -106,7 +107,7 @@ object SongLoader {
context: Context,
selection: String?,
selectionValues: Array<String>?,
sortOrder: String = PreferenceUtil.getInstance(context).songSortOrder
sortOrder: String = PreferenceUtilKT.songSortOrder
): Cursor? {
var selectionFinal = selection
var selectionValuesFinal = selectionValues
@ -128,7 +129,7 @@ object SongLoader {
MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
baseProjection,
selectionFinal + " AND " + MediaStore.Audio.Media.DURATION + ">= " +
(PreferenceUtil.getInstance(context).filterLength * 1000),
(PreferenceUtilKT.filterLength * 1000),
selectionValuesFinal,
sortOrder
)