From 3257fb9153de9881a21fdb354c7aff24bd9f1f24 Mon Sep 17 00:00:00 2001 From: tzugen Date: Wed, 26 May 2021 23:18:51 +0200 Subject: [PATCH] Make Entry always have an id --- .../main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt | 2 +- .../org/moire/ultrasonic/domain/APIMusicDirectoryConverter.kt | 3 +-- .../kotlin/org/moire/ultrasonic/fragment/AlbumRowAdapter.kt | 2 +- .../kotlin/org/moire/ultrasonic/fragment/ArtistRowAdapter.kt | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt index 7523dd12..0a5295dd 100644 --- a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt +++ b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt @@ -36,7 +36,7 @@ class MusicDirectory { } data class Entry( - override var id: String? = null, + override var id: String, var parent: String? = null, var isDirectory: Boolean = false, var title: String? = null, diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverter.kt index 72c6e00c..adff7ee5 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverter.kt @@ -13,8 +13,7 @@ internal val dateFormat: DateFormat by lazy { SimpleDateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.getDefault()) } -fun MusicDirectoryChild.toDomainEntity(): MusicDirectory.Entry = MusicDirectory.Entry().apply { - id = this@toDomainEntity.id +fun MusicDirectoryChild.toDomainEntity(): MusicDirectory.Entry = MusicDirectory.Entry(id).apply { parent = this@toDomainEntity.parent isDirectory = this@toDomainEntity.isDir title = this@toDomainEntity.title diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumRowAdapter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumRowAdapter.kt index 2a5f1c46..e3974614 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumRowAdapter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumRowAdapter.kt @@ -57,7 +57,7 @@ class AlbumRowAdapter( imageLoader.loadImage( holder.coverArt, - MusicDirectory.Entry().apply { coverArt = holder.coverArtId }, + MusicDirectory.Entry("-1").apply { coverArt = holder.coverArtId }, false, 0, false, true, R.drawable.unknown_album ) } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ArtistRowAdapter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ArtistRowAdapter.kt index dfd86ef9..30f76f4e 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ArtistRowAdapter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ArtistRowAdapter.kt @@ -62,7 +62,7 @@ class ArtistRowAdapter( holder.coverArt.visibility = View.VISIBLE imageLoader.loadImage( holder.coverArt, - MusicDirectory.Entry().apply { coverArt = holder.coverArtId }, + MusicDirectory.Entry("-1").apply { coverArt = holder.coverArtId }, false, 0, false, true, R.drawable.ic_contact_picture ) } else {