third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-05-06 18:41:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update formatting

Browse Source
This commit is contained in:
tzugen 2023-12-04 10:55:00 +01:00
parent a63087ea61
commit 51e576a91e
No known key found for this signature in database
GPG Key ID: 61E9C34BC10EC930
4 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt
View File

@ -80,12 +80,7 @@ class TrackViewHolder(val view: View) :
private var rxBusSubscription: CompositeDisposable? = null private var rxBusSubscription: CompositeDisposable? = null
@Suppress("ComplexMethod") @Suppress("ComplexMethod")
fun setSong( fun setSong(song: Track, checkable: Boolean, draggable: Boolean, isSelected: Boolean = false) {
song: Track,
checkable: Boolean,
draggable: Boolean,
isSelected: Boolean = false
) {
entry = song entry = song
val entryDescription = Util.readableEntryDescription(song) val entryDescription = Util.readableEntryDescription(song)
@ -239,19 +234,23 @@ class TrackViewHolder(val view: View) :
3 -> R.drawable.rating_star_3 3 -> R.drawable.rating_star_3
4 -> R.drawable.rating_star_4 4 -> R.drawable.rating_star_4
5 -> R.drawable.rating_star_5 5 -> R.drawable.rating_star_5
else -> { R.drawable.rating_star_0 } else -> {
R.drawable.rating_star_0
}
} }
val layers = if (starred) { val layers = if (starred) {
arrayOf( arrayOf(
ResourcesCompat.getDrawable(view.resources, ratingDrawable, null)!!, ResourcesCompat.getDrawable(view.resources, ratingDrawable, null)!!,
ResourcesCompat.getDrawable( ResourcesCompat.getDrawable(
view.resources, R.drawable.rating_heart_mini_overlay, null view.resources,
)!!, R.drawable.rating_heart_mini_overlay,
null
)!!
) )
} else { } else {
arrayOf( arrayOf(
ResourcesCompat.getDrawable(view.resources, ratingDrawable, null)!!, ResourcesCompat.getDrawable(view.resources, ratingDrawable, null)!!
) )
} }

14
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt
View File

@ -287,7 +287,9 @@ class PlayerFragment :
fullHeartDrawable = ResourcesCompat.getDrawable(resources, fullHeart, null)!! fullHeartDrawable = ResourcesCompat.getDrawable(resources, fullHeart, null)!!
setLayerDrawableColors(hollowHeartDrawable as LayerDrawable) setLayerDrawableColors(hollowHeartDrawable as LayerDrawable)
setLayerDrawableColors( setLayerDrawableColors(
fullHeartDrawable as LayerDrawable, RM.attr.colorAccent, RM.attr.colorSurface fullHeartDrawable as LayerDrawable,
RM.attr.colorAccent,
RM.attr.colorSurface
) )
fiveStar1ImageView.setOnClickListener { setSongRating(1) } fiveStar1ImageView.setOnClickListener { setSongRating(1) }
@ -1278,8 +1280,11 @@ class PlayerFragment :
fiveStar4ImageView.setImageDrawable(getStarForRating(rating, 3)) fiveStar4ImageView.setImageDrawable(getStarForRating(rating, 3))
fiveStar5ImageView.setImageDrawable(getStarForRating(rating, 4)) fiveStar5ImageView.setImageDrawable(getStarForRating(rating, 4))
if (isHeartSet) heartRatingImageView.setImageDrawable(fullHeartDrawable) if (isHeartSet) {
else heartRatingImageView.setImageDrawable(hollowHeartDrawable) heartRatingImageView.setImageDrawable(fullHeartDrawable)
} else {
heartRatingImageView.setImageDrawable(hollowHeartDrawable)
}
} }
private fun getStarForRating(rating: Int, position: Int): Drawable { private fun getStarForRating(rating: Int, position: Int): Drawable {
@ -1317,7 +1322,8 @@ class PlayerFragment :
RxBus.ratingSubmitter.onNext( RxBus.ratingSubmitter.onNext(
RatingUpdate( RatingUpdate(
currentSong!!.id, HeartRating(currentSong?.starred ?: false) currentSong!!.id,
HeartRating(currentSong?.starred ?: false)
) )
) )
} }

5
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaLibrarySessionCallback.kt
View File

@ -322,10 +322,11 @@ class MediaLibrarySessionCallback :
} }
) )
.setIconResId( .setIconResId(
if (willHeart) if (willHeart) {
R.drawable.rating_star_hollow R.drawable.rating_star_hollow
else } else {
R.drawable.rating_star_full R.drawable.rating_star_full
}
) )
.setSessionCommand(sessionCommand) .setSessionCommand(sessionCommand)
.setEnabled(true) .setEnabled(true)

1
ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/MediaItemConverter.kt
View File

@ -169,7 +169,6 @@ fun MediaItem.setRating(rating: Int) {
*/ */
@Suppress("ComplexMethod") @Suppress("ComplexMethod")
fun MediaItem.toTrack(cacheResult: Boolean = true): Track { fun MediaItem.toTrack(cacheResult: Boolean = true): Track {
// Check Cache // Check Cache
val cachedTrack = MediaItemConverter.trackCache[mediaId]?.get() val cachedTrack = MediaItemConverter.trackCache[mediaId]?.get()
if (cachedTrack != null) return cachedTrack if (cachedTrack != null) return cachedTrack