Skip to content

Commit 0ec87de

Browse files
committed
Make ktlint happy
1 parent d62b9f1 commit 0ec87de

File tree

7 files changed

+13
-9
lines changed

7 files changed

+13
-9
lines changed

app/src/main/java/de/maniac103/squeezeclient/cometd/ConnectionHelper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import de.maniac103.squeezeclient.SqueezeClientApplication
2121
import de.maniac103.squeezeclient.cometd.request.ChangePlaybackStateRequest
2222
import de.maniac103.squeezeclient.cometd.request.ClearPlaylistRequest
2323
import de.maniac103.squeezeclient.cometd.request.ExecuteActionRequest
24-
import de.maniac103.squeezeclient.cometd.request.FetchTrackInfoRequest
2524
import de.maniac103.squeezeclient.cometd.request.FetchAlbumInfoRequest
2625
import de.maniac103.squeezeclient.cometd.request.FetchHomeMenuRequest
2726
import de.maniac103.squeezeclient.cometd.request.FetchItemsForActionRequest
2827
import de.maniac103.squeezeclient.cometd.request.FetchSongInfosForDownloadRequest
28+
import de.maniac103.squeezeclient.cometd.request.FetchTrackInfoRequest
2929
import de.maniac103.squeezeclient.cometd.request.LibrarySearchRequest
3030
import de.maniac103.squeezeclient.cometd.request.LocalSearchRequest
3131
import de.maniac103.squeezeclient.cometd.request.MenuStatusRequest

app/src/main/java/de/maniac103/squeezeclient/cometd/response/AlbumInfoListResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ data class AlbumInfoListResponse(
3333
)
3434

3535
fun yearsById() = items.associate { it.id to it.year }
36-
}
36+
}

app/src/main/java/de/maniac103/squeezeclient/cometd/response/JiveHomeItemListResponse.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ data class JiveHomeItemListResponse(
4646
data class HomeMenuItemResponse(
4747
val id: String,
4848
val node: String,
49-
val text: String = "", // Omitted in case of 'remove' messages
49+
// Omitted in case of 'remove' messages
50+
val text: String = "",
5051
val weight: Int = 0,
5152
val window: Window? = null
5253
// All action related attributes are handled manually. This includes:

app/src/main/java/de/maniac103/squeezeclient/cometd/response/SlimBrowseListResponse.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ data class SlimBrowseListResponse(
7474
// slider, min, max, initial, sliderIcons
7575
)
7676

77-
fun asModelItems(json: Json, infoProvider: ((JsonObject) -> String?)? = null): SlimBrowseItemList {
77+
fun asModelItems(
78+
json: Json,
79+
infoProvider: (JsonObject) -> String? = { null }
80+
): SlimBrowseItemList {
7881
val modelItems = items.filter { it.isNotEmpty() }.mapIndexed { index, itemObject ->
7982
val item = json.decodeFromJsonElement<Item>(itemObject)
8083
val textLines = item.text.split("\n", limit = 2)
@@ -87,7 +90,7 @@ data class SlimBrowseListResponse(
8790
SlimBrowseListResponse(items = it).asModelItems(json, infoProvider).items
8891
}
8992
val extraInfo = (itemObject["commonParams"] as? JsonObject)
90-
?.let { infoProvider?.invoke(it) }
93+
?.let { infoProvider(it) }
9194

9295
SlimBrowseItemList.SlimBrowseItem(
9396
offset + index,

app/src/main/java/de/maniac103/squeezeclient/cometd/response/TrackInfoListResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ data class TrackInfoListResponse(
3939
fun durationsById() = items.associate {
4040
it.id to it.duration.seconds
4141
}
42-
}
42+
}

app/src/main/java/de/maniac103/squeezeclient/service/MediaService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ import de.maniac103.squeezeclient.model.PlayerId
6464
import de.maniac103.squeezeclient.model.PlayerStatus
6565
import de.maniac103.squeezeclient.model.Playlist
6666
import de.maniac103.squeezeclient.ui.MainActivity
67+
import kotlin.time.Duration.Companion.minutes
6768
import kotlin.time.DurationUnit
6869
import kotlinx.coroutines.CoroutineScope
6970
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -73,7 +74,6 @@ import kotlinx.coroutines.flow.flatMapLatest
7374
import kotlinx.coroutines.guava.future
7475
import kotlinx.coroutines.launch
7576
import kotlinx.datetime.Clock
76-
import kotlin.time.Duration.Companion.minutes
7777

7878
class MediaService : MediaSessionService(), LifecycleOwner, MediaSession.Callback {
7979
private val dispatcher = ServiceLifecycleDispatcher(this)

app/src/main/java/de/maniac103/squeezeclient/ui/ServerSetupActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@ import de.maniac103.squeezeclient.extfuncs.prefs
3737
import de.maniac103.squeezeclient.extfuncs.putServerConfig
3838
import de.maniac103.squeezeclient.extfuncs.serverConfig
3939
import de.maniac103.squeezeclient.model.ServerConfiguration
40-
import kotlinx.coroutines.CoroutineScope
4140
import java.net.DatagramPacket
4241
import java.net.DatagramSocket
4342
import java.net.InetAddress
43+
import java.net.SocketException
4444
import kotlin.time.Duration.Companion.seconds
45+
import kotlinx.coroutines.CoroutineScope
4546
import kotlinx.coroutines.Dispatchers
4647
import kotlinx.coroutines.Job
4748
import kotlinx.coroutines.cancel
@@ -54,7 +55,6 @@ import kotlinx.coroutines.plus
5455
import kotlinx.coroutines.withContext
5556
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
5657
import okhttp3.internal.and
57-
import java.net.SocketException
5858

5959
class ServerSetupActivity : AppCompatActivity() {
6060
private lateinit var binding: ActivityServerSetupBinding

0 commit comments

Comments
 (0)