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

Merge branch 'format' into 'develop'

Browse Source 
Formatting changes

See merge request ultrasonic/ultrasonic!885
This commit is contained in:
birdbird 2022-12-11 09:12:02 +00:00
commit 946cf8db5a
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SubsonicResponse.kt
View File

@ -25,7 +25,7 @@ open class SubsonicResponse(
companion object { companion object {
fun getStatusFromJson(jsonValue: String) = fun getStatusFromJson(jsonValue: String) =
values().firstOrNull { it.jsonValue == jsonValue } values().firstOrNull { it.jsonValue == jsonValue }
?: throw IllegalArgumentException("Unknown status value: $jsonValue") ?: throw IllegalArgumentException("Unknown status value: $jsonValue")
class StatusJsonDeserializer : JsonDeserializer<Status>() { class StatusJsonDeserializer : JsonDeserializer<Status>() {
override fun deserialize(p: JsonParser, ctxt: DeserializationContext?): Status { override fun deserialize(p: JsonParser, ctxt: DeserializationContext?): Status {

2
detekt-config.yml
View File

@ -7,8 +7,6 @@ build:
potential-bugs: potential-bugs:
active: true active: true
DuplicateCaseInWhenExpression:
active: true
EqualsWithHashCodeExist: EqualsWithHashCodeExist:
active: true active: true
ExplicitGarbageCollectionCall: ExplicitGarbageCollectionCall:

9
ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/CustomNotificationProvider.kt
View File

@ -9,8 +9,8 @@ package org.moire.ultrasonic.playback
import android.content.Context import android.content.Context
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import androidx.media3.common.HeartRating import androidx.media3.common.HeartRating
import androidx.media3.common.util.UnstableApi
import androidx.media3.common.Player import androidx.media3.common.Player
import androidx.media3.common.util.UnstableApi
import androidx.media3.session.CommandButton import androidx.media3.session.CommandButton
import androidx.media3.session.MediaNotification import androidx.media3.session.MediaNotification
import androidx.media3.session.MediaSession import androidx.media3.session.MediaSession
@ -23,7 +23,8 @@ import org.moire.ultrasonic.service.MediaPlayerController
import org.moire.ultrasonic.util.toTrack import org.moire.ultrasonic.util.toTrack
@UnstableApi @UnstableApi
class CustomNotificationProvider(ctx: Context?) : DefaultMediaNotificationProvider2(Builder(ctx)), KoinComponent { class CustomNotificationProvider(ctx: Context?) :
DefaultMediaNotificationProvider2(Builder(ctx)), KoinComponent {
/* /*
* It is currently not possible to edit a MediaItem after creation so the isRated value * It is currently not possible to edit a MediaItem after creation so the isRated value
@ -85,9 +86,9 @@ class CustomNotificationProvider(ctx: Context?) : DefaultMediaNotificationProvid
val commands = super.getMediaButtons(playerCommands, customLayout, playWhenReady) val commands = super.getMediaButtons(playerCommands, customLayout, playWhenReady)
commands.forEachIndexed { index, command -> commands.forEachIndexed { index, command ->
command.extras.putInt(androidx.media3.session.DefaultMediaNotificationProvider.COMMAND_KEY_COMPACT_VIEW_INDEX, index) command.extras.putInt(COMMAND_KEY_COMPACT_VIEW_INDEX, index)
} }
return commands return commands
} }
} }

1
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaylistTimeline.kt
View File

@ -15,7 +15,6 @@ import androidx.media3.common.Timeline
import androidx.media3.common.util.Assertions import androidx.media3.common.util.Assertions
import androidx.media3.common.util.Util import androidx.media3.common.util.Util
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import java.util.Arrays
/** /**
* This class wraps a simple playlist provided as List<MediaItem> * This class wraps a simple playlist provided as List<MediaItem>