Removed unesscery ids, res, etc
This commit is contained in:
parent
4fdb336444
commit
0fe0c2728f
166 changed files with 38 additions and 6488 deletions
|
@ -1,6 +1,5 @@
|
|||
package code.name.monkey.retromusic.util
|
||||
|
||||
import android.content.Context
|
||||
import android.content.SharedPreferences.OnSharedPreferenceChangeListener
|
||||
import android.net.ConnectivityManager
|
||||
import android.net.NetworkInfo
|
||||
|
@ -8,75 +7,7 @@ import androidx.core.content.ContextCompat
|
|||
import androidx.core.content.edit
|
||||
import androidx.preference.PreferenceManager
|
||||
import androidx.viewpager.widget.ViewPager
|
||||
import code.name.monkey.retromusic.ADAPTIVE_COLOR_APP
|
||||
import code.name.monkey.retromusic.ALBUM_ARTISTS_ONLY
|
||||
import code.name.monkey.retromusic.ALBUM_ART_ON_LOCK_SCREEN
|
||||
import code.name.monkey.retromusic.ALBUM_COVER_STYLE
|
||||
import code.name.monkey.retromusic.ALBUM_COVER_TRANSFORM
|
||||
import code.name.monkey.retromusic.ALBUM_DETAIL_SONG_SORT_ORDER
|
||||
import code.name.monkey.retromusic.ALBUM_GRID_SIZE
|
||||
import code.name.monkey.retromusic.ALBUM_GRID_SIZE_LAND
|
||||
import code.name.monkey.retromusic.ALBUM_GRID_STYLE
|
||||
import code.name.monkey.retromusic.ALBUM_SONG_SORT_ORDER
|
||||
import code.name.monkey.retromusic.ALBUM_SORT_ORDER
|
||||
import code.name.monkey.retromusic.ARTIST_ALBUM_SORT_ORDER
|
||||
import code.name.monkey.retromusic.ARTIST_GRID_SIZE
|
||||
import code.name.monkey.retromusic.ARTIST_GRID_SIZE_LAND
|
||||
import code.name.monkey.retromusic.ARTIST_GRID_STYLE
|
||||
import code.name.monkey.retromusic.ARTIST_SONG_SORT_ORDER
|
||||
import code.name.monkey.retromusic.ARTIST_SORT_ORDER
|
||||
import code.name.monkey.retromusic.AUDIO_DUCKING
|
||||
import code.name.monkey.retromusic.AUTO_DOWNLOAD_IMAGES_POLICY
|
||||
import code.name.monkey.retromusic.App
|
||||
import code.name.monkey.retromusic.BLACK_THEME
|
||||
import code.name.monkey.retromusic.BLUETOOTH_PLAYBACK
|
||||
import code.name.monkey.retromusic.BLURRED_ALBUM_ART
|
||||
import code.name.monkey.retromusic.CAROUSEL_EFFECT
|
||||
import code.name.monkey.retromusic.CHOOSE_EQUALIZER
|
||||
import code.name.monkey.retromusic.CLASSIC_NOTIFICATION
|
||||
import code.name.monkey.retromusic.COLORED_APP_SHORTCUTS
|
||||
import code.name.monkey.retromusic.COLORED_NOTIFICATION
|
||||
import code.name.monkey.retromusic.DESATURATED_COLOR
|
||||
import code.name.monkey.retromusic.EXPAND_NOW_PLAYING_PANEL
|
||||
import code.name.monkey.retromusic.EXTRA_SONG_INFO
|
||||
import code.name.monkey.retromusic.FILTER_SONG
|
||||
import code.name.monkey.retromusic.GAP_LESS_PLAYBACK
|
||||
import code.name.monkey.retromusic.GENERAL_THEME
|
||||
import code.name.monkey.retromusic.GENRE_SORT_ORDER
|
||||
import code.name.monkey.retromusic.HOME_ALBUM_GRID_STYLE
|
||||
import code.name.monkey.retromusic.HOME_ARTIST_GRID_STYLE
|
||||
import code.name.monkey.retromusic.IGNORE_MEDIA_STORE_ARTWORK
|
||||
import code.name.monkey.retromusic.INITIALIZED_BLACKLIST
|
||||
import code.name.monkey.retromusic.KEEP_SCREEN_ON
|
||||
import code.name.monkey.retromusic.LANGUAGE_NAME
|
||||
import code.name.monkey.retromusic.LAST_ADDED_CUTOFF
|
||||
import code.name.monkey.retromusic.LAST_CHANGELOG_VERSION
|
||||
import code.name.monkey.retromusic.LAST_PAGE
|
||||
import code.name.monkey.retromusic.LAST_SLEEP_TIMER_VALUE
|
||||
import code.name.monkey.retromusic.LIBRARY_CATEGORIES
|
||||
import code.name.monkey.retromusic.LOCK_SCREEN
|
||||
import code.name.monkey.retromusic.LYRICS_OPTIONS
|
||||
import code.name.monkey.retromusic.NEXT_SLEEP_TIMER_ELAPSED_REALTIME
|
||||
import code.name.monkey.retromusic.NOW_PLAYING_SCREEN_ID
|
||||
import code.name.monkey.retromusic.PAUSE_ON_ZERO_VOLUME
|
||||
import code.name.monkey.retromusic.PLAYLIST_SORT_ORDER
|
||||
import code.name.monkey.retromusic.R
|
||||
import code.name.monkey.retromusic.RECENTLY_PLAYED_CUTOFF
|
||||
import code.name.monkey.retromusic.SAF_SDCARD_URI
|
||||
import code.name.monkey.retromusic.SLEEP_TIMER_FINISH_SONG
|
||||
import code.name.monkey.retromusic.SONG_GRID_SIZE
|
||||
import code.name.monkey.retromusic.SONG_GRID_SIZE_LAND
|
||||
import code.name.monkey.retromusic.SONG_GRID_STYLE
|
||||
import code.name.monkey.retromusic.SONG_SORT_ORDER
|
||||
import code.name.monkey.retromusic.START_DIRECTORY
|
||||
import code.name.monkey.retromusic.TAB_TEXT_MODE
|
||||
import code.name.monkey.retromusic.TOGGLE_ADD_CONTROLS
|
||||
import code.name.monkey.retromusic.TOGGLE_FULL_SCREEN
|
||||
import code.name.monkey.retromusic.TOGGLE_HEADSET
|
||||
import code.name.monkey.retromusic.TOGGLE_HOME_BANNER
|
||||
import code.name.monkey.retromusic.TOGGLE_SHUFFLE
|
||||
import code.name.monkey.retromusic.TOGGLE_VOLUME
|
||||
import code.name.monkey.retromusic.USER_NAME
|
||||
import code.name.monkey.retromusic.*
|
||||
import code.name.monkey.retromusic.extensions.getIntRes
|
||||
import code.name.monkey.retromusic.extensions.getStringOrDefault
|
||||
import code.name.monkey.retromusic.fragments.AlbumCoverStyle
|
||||
|
@ -84,13 +15,7 @@ import code.name.monkey.retromusic.fragments.NowPlayingScreen
|
|||
import code.name.monkey.retromusic.fragments.folder.FoldersFragment
|
||||
import code.name.monkey.retromusic.helper.SortOrder.*
|
||||
import code.name.monkey.retromusic.model.CategoryInfo
|
||||
import code.name.monkey.retromusic.transform.CascadingPageTransformer
|
||||
import code.name.monkey.retromusic.transform.DepthTransformation
|
||||
import code.name.monkey.retromusic.transform.HingeTransformation
|
||||
import code.name.monkey.retromusic.transform.HorizontalFlipTransformation
|
||||
import code.name.monkey.retromusic.transform.NormalPageTransformer
|
||||
import code.name.monkey.retromusic.transform.VerticalFlipTransformation
|
||||
import code.name.monkey.retromusic.transform.VerticalStackTransformer
|
||||
import code.name.monkey.retromusic.transform.*
|
||||
import code.name.monkey.retromusic.util.theme.ThemeMode
|
||||
import com.google.android.material.bottomnavigation.LabelVisibilityMode
|
||||
import com.google.gson.Gson
|
||||
|
@ -183,13 +108,6 @@ object PreferenceUtil {
|
|||
putString(SAF_SDCARD_URI, value)
|
||||
}
|
||||
|
||||
|
||||
val selectedEqualizer
|
||||
get() = sharedPreferences.getStringOrDefault(
|
||||
CHOOSE_EQUALIZER,
|
||||
"system"
|
||||
)
|
||||
|
||||
val autoDownloadImagesPolicy
|
||||
get() = sharedPreferences.getStringOrDefault(
|
||||
AUTO_DOWNLOAD_IMAGES_POLICY,
|
||||
|
@ -458,11 +376,6 @@ object PreferenceUtil {
|
|||
putInt(LAST_SLEEP_TIMER_VALUE, value)
|
||||
}
|
||||
|
||||
var lastPage
|
||||
get() = sharedPreferences.getInt(LAST_PAGE, R.id.action_song)
|
||||
set(value) = sharedPreferences.edit {
|
||||
putInt(LAST_PAGE, value)
|
||||
}
|
||||
|
||||
var nextSleepTimerElapsedRealTime
|
||||
get() = sharedPreferences.getInt(
|
||||
|
@ -639,32 +552,9 @@ object PreferenceUtil {
|
|||
}
|
||||
|
||||
fun getRecentlyPlayedCutoffTimeMillis(): Long {
|
||||
return getCutoffTimeMillis(RECENTLY_PLAYED_CUTOFF)
|
||||
}
|
||||
|
||||
fun getRecentlyPlayedCutoffText(context: Context): String? {
|
||||
return getCutoffText(RECENTLY_PLAYED_CUTOFF, context)
|
||||
}
|
||||
|
||||
private fun getCutoffText(
|
||||
cutoff: String,
|
||||
context: Context
|
||||
): String? {
|
||||
return when (sharedPreferences.getString(cutoff, "")) {
|
||||
"today" -> context.getString(R.string.today)
|
||||
"this_week" -> context.getString(R.string.this_week)
|
||||
"past_seven_days" -> context.getString(R.string.past_seven_days)
|
||||
"past_three_months" -> context.getString(R.string.past_three_months)
|
||||
"this_year" -> context.getString(R.string.this_year)
|
||||
"this_month" -> context.getString(R.string.this_month)
|
||||
else -> context.getString(R.string.this_month)
|
||||
}
|
||||
}
|
||||
|
||||
private fun getCutoffTimeMillis(cutoff: String): Long {
|
||||
val calendarUtil = CalendarUtil()
|
||||
val interval: Long
|
||||
interval = when (sharedPreferences.getString(cutoff, "")) {
|
||||
interval = when (sharedPreferences.getString(RECENTLY_PLAYED_CUTOFF, "")) {
|
||||
"today" -> calendarUtil.elapsedToday
|
||||
"this_week" -> calendarUtil.elapsedWeek
|
||||
"past_seven_days" -> calendarUtil.getElapsedDays(7)
|
||||
|
@ -690,5 +580,4 @@ object PreferenceUtil {
|
|||
}
|
||||
return (System.currentTimeMillis() - interval) / 1000
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue