From 51e576a91e73f98f916f06282b3d67de298fb01a Mon Sep 17 00:00:00 2001 From: tzugen Date: Mon, 4 Dec 2023 10:55:00 +0100 Subject: [PATCH] Update formatting --- .../ultrasonic/adapters/TrackViewHolder.kt | 19 +++++++++---------- .../ultrasonic/fragment/PlayerFragment.kt | 14 ++++++++++---- .../service/MediaLibrarySessionCallback.kt | 5 +++-- .../ultrasonic/util/MediaItemConverter.kt | 1 - 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt index 32d50565..436f8d23 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt @@ -80,12 +80,7 @@ class TrackViewHolder(val view: View) : private var rxBusSubscription: CompositeDisposable? = null @Suppress("ComplexMethod") - fun setSong( - song: Track, - checkable: Boolean, - draggable: Boolean, - isSelected: Boolean = false - ) { + fun setSong(song: Track, checkable: Boolean, draggable: Boolean, isSelected: Boolean = false) { entry = song val entryDescription = Util.readableEntryDescription(song) @@ -239,19 +234,23 @@ class TrackViewHolder(val view: View) : 3 -> R.drawable.rating_star_3 4 -> R.drawable.rating_star_4 5 -> R.drawable.rating_star_5 - else -> { R.drawable.rating_star_0 } + else -> { + R.drawable.rating_star_0 + } } val layers = if (starred) { arrayOf( ResourcesCompat.getDrawable(view.resources, ratingDrawable, null)!!, ResourcesCompat.getDrawable( - view.resources, R.drawable.rating_heart_mini_overlay, null - )!!, + view.resources, + R.drawable.rating_heart_mini_overlay, + null + )!! ) } else { arrayOf( - ResourcesCompat.getDrawable(view.resources, ratingDrawable, null)!!, + ResourcesCompat.getDrawable(view.resources, ratingDrawable, null)!! ) } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt index 44383d5d..6f83ecfc 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt @@ -287,7 +287,9 @@ class PlayerFragment : fullHeartDrawable = ResourcesCompat.getDrawable(resources, fullHeart, null)!! setLayerDrawableColors(hollowHeartDrawable as LayerDrawable) setLayerDrawableColors( - fullHeartDrawable as LayerDrawable, RM.attr.colorAccent, RM.attr.colorSurface + fullHeartDrawable as LayerDrawable, + RM.attr.colorAccent, + RM.attr.colorSurface ) fiveStar1ImageView.setOnClickListener { setSongRating(1) } @@ -1278,8 +1280,11 @@ class PlayerFragment : fiveStar4ImageView.setImageDrawable(getStarForRating(rating, 3)) fiveStar5ImageView.setImageDrawable(getStarForRating(rating, 4)) - if (isHeartSet) heartRatingImageView.setImageDrawable(fullHeartDrawable) - else heartRatingImageView.setImageDrawable(hollowHeartDrawable) + if (isHeartSet) { + heartRatingImageView.setImageDrawable(fullHeartDrawable) + } else { + heartRatingImageView.setImageDrawable(hollowHeartDrawable) + } } private fun getStarForRating(rating: Int, position: Int): Drawable { @@ -1317,7 +1322,8 @@ class PlayerFragment : RxBus.ratingSubmitter.onNext( RatingUpdate( - currentSong!!.id, HeartRating(currentSong?.starred ?: false) + currentSong!!.id, + HeartRating(currentSong?.starred ?: false) ) ) } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaLibrarySessionCallback.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaLibrarySessionCallback.kt index 858f69bb..07cb97f3 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaLibrarySessionCallback.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaLibrarySessionCallback.kt @@ -322,10 +322,11 @@ class MediaLibrarySessionCallback : } ) .setIconResId( - if (willHeart) + if (willHeart) { R.drawable.rating_star_hollow - else + } else { R.drawable.rating_star_full + } ) .setSessionCommand(sessionCommand) .setEnabled(true) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/MediaItemConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/MediaItemConverter.kt index a8f5bc38..8afccdd9 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/MediaItemConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/MediaItemConverter.kt @@ -169,7 +169,6 @@ fun MediaItem.setRating(rating: Int) { */ @Suppress("ComplexMethod") fun MediaItem.toTrack(cacheResult: Boolean = true): Track { - // Check Cache val cachedTrack = MediaItemConverter.trackCache[mediaId]?.get() if (cachedTrack != null) return cachedTrack