Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

all: format/syntax fixes

Browse source
This commit is contained in:
Alexander Capehart 2024-08-29 21:07:32 -06:00
parent 48568d2a1d
commit 2857f7d92c
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
2 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/org/oxycblt/auxio/music/service/MediaItemTranslation.kt
View file

@ -108,19 +108,19 @@ enum class BrowserOption(val actionId: String, val labelRes: Int, val iconRes: I
ARTIST_DETAILS( ARTIST_DETAILS(
BuildConfig.APPLICATION_ID + ".menu.ARTIST_DETAILS", BuildConfig.APPLICATION_ID + ".menu.ARTIST_DETAILS",
R.string.lbl_artist_details, R.string.lbl_artist_details,
R.drawable.ic_artist_24), R.drawable.ic_artist_24);
companion object { companion object {
val ITEM_ID_MAP =
val ITEM_ID_MAP = mapOf( mapOf(
R.id.action_play to BrowserOption.PLAY, R.id.action_play to PLAY,
R.id.action_shuffle to BrowserOption.SHUFFLE, R.id.action_shuffle to SHUFFLE,
R.id.action_play_next to BrowserOption.PLAY_NEXT, R.id.action_play_next to PLAY_NEXT,
R.id.action_queue_add to BrowserOption.ADD_TO_QUEUE, R.id.action_queue_add to ADD_TO_QUEUE,
R.id.action_detail to BrowserOption.DETAILS, R.id.action_detail to DETAILS,
R.id.action_album_details to BrowserOption.ALBUM_DETAILS, R.id.action_album_details to ALBUM_DETAILS,
R.id.action_artist_details to BrowserOption.ARTIST_DETAILS R.id.action_artist_details to ARTIST_DETAILS)
)} }
} }
typealias Sugar = Bundle.(Context) -> Unit typealias Sugar = Bundle.(Context) -> Unit
@ -137,11 +137,11 @@ private fun style(style: Int): Sugar = {
private fun menu(@MenuRes res: Int): Sugar = { context -> private fun menu(@MenuRes res: Int): Sugar = { context ->
@SuppressLint("RestrictedApi") val builder = MenuBuilder(context) @SuppressLint("RestrictedApi") val builder = MenuBuilder(context)
MenuInflater(context).inflate(res, builder) MenuInflater(context).inflate(res, builder)
val menuIds = builder.children.mapNotNullTo(ArrayList()){ val menuIds =
BrowserOption.ITEM_ID_MAP[it.itemId]?.actionId builder.children.mapNotNullTo(ArrayList()) {
} BrowserOption.ITEM_ID_MAP[it.itemId]?.actionId
putStringArrayList( }
MediaConstants.DESCRIPTION_EXTRAS_KEY_CUSTOM_BROWSER_ACTION_ID_LIST, menuIds) putStringArrayList(MediaConstants.DESCRIPTION_EXTRAS_KEY_CUSTOM_BROWSER_ACTION_ID_LIST, menuIds)
} }
private fun makeExtras(context: Context, vararg sugars: Sugar): Bundle { private fun makeExtras(context: Context, vararg sugars: Sugar): Bundle {

3
app/src/main/java/org/oxycblt/auxio/music/service/MusicServiceFragment.kt
View file

@ -88,7 +88,8 @@ constructor(
val actions = val actions =
BrowserOption.entries.mapTo(ArrayList()) { BrowserOption.entries.mapTo(ArrayList()) {
Bundle().apply { Bundle().apply {
putString(MediaConstants.EXTRAS_KEY_CUSTOM_BROWSER_ACTION_ID, it.actionId) putString(
MediaConstants.EXTRAS_KEY_CUSTOM_BROWSER_ACTION_ID, it.actionId)
putString( putString(
MediaConstants.EXTRAS_KEY_CUSTOM_BROWSER_ACTION_LABEL, MediaConstants.EXTRAS_KEY_CUSTOM_BROWSER_ACTION_LABEL,
context.getString(it.labelRes)) context.getString(it.labelRes))