From ff6d2fe22884ba129d622f2fca262d6b695ad436 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Sat, 28 Dec 2024 09:53:16 -0500 Subject: [PATCH] music: move cover impl to image --- app/src/main/java/org/oxycblt/auxio/IntegerTable.kt | 2 +- app/src/main/java/org/oxycblt/auxio/image/CoverMode.kt | 6 +++--- app/src/main/java/org/oxycblt/auxio/image/ImageSettings.kt | 4 ++-- .../org/oxycblt/auxio/{music => image}/covers/CoverSilo.kt | 2 +- .../org/oxycblt/auxio/{music => image}/covers/CoverUtil.kt | 2 +- .../org/oxycblt/auxio/{music => image}/covers/NullCovers.kt | 2 +- .../oxycblt/auxio/{music => image}/covers/SiloedCovers.kt | 2 +- .../main/java/org/oxycblt/auxio/music/MusicRepository.kt | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) rename app/src/main/java/org/oxycblt/auxio/{music => image}/covers/CoverSilo.kt (97%) rename app/src/main/java/org/oxycblt/auxio/{music => image}/covers/CoverUtil.kt (85%) rename app/src/main/java/org/oxycblt/auxio/{music => image}/covers/NullCovers.kt (95%) rename app/src/main/java/org/oxycblt/auxio/{music => image}/covers/SiloedCovers.kt (98%) diff --git a/app/src/main/java/org/oxycblt/auxio/IntegerTable.kt b/app/src/main/java/org/oxycblt/auxio/IntegerTable.kt index 3708fb92e..e33205029 100644 --- a/app/src/main/java/org/oxycblt/auxio/IntegerTable.kt +++ b/app/src/main/java/org/oxycblt/auxio/IntegerTable.kt @@ -124,7 +124,7 @@ object IntegerTable { /** CoverMode.Off */ const val COVER_MODE_OFF = 0xA11C /** CoverMode.MediaStore */ - const val COVER_MODE_MEDIA_STORE = 0xA11D + const val COVER_MODE_FAST = 0xA11D /** CoverMode.Quality */ const val COVER_MODE_QUALITY = 0xA11E /** PlaySong.FromAll */ diff --git a/app/src/main/java/org/oxycblt/auxio/image/CoverMode.kt b/app/src/main/java/org/oxycblt/auxio/image/CoverMode.kt index 1daaddc91..e28ddf55b 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/CoverMode.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/CoverMode.kt @@ -29,7 +29,7 @@ enum class CoverMode { /** Do not load album covers ("Off"). */ OFF, /** Load covers from the fast, but lower-quality media store database ("Fast"). */ - MEDIA_STORE, + FAST, /** Load high-quality covers directly from music files ("Quality"). */ QUALITY; @@ -42,7 +42,7 @@ enum class CoverMode { get() = when (this) { OFF -> IntegerTable.COVER_MODE_OFF - MEDIA_STORE -> IntegerTable.COVER_MODE_MEDIA_STORE + FAST -> IntegerTable.COVER_MODE_FAST QUALITY -> IntegerTable.COVER_MODE_QUALITY } @@ -57,7 +57,7 @@ enum class CoverMode { fun fromIntCode(intCode: Int) = when (intCode) { IntegerTable.COVER_MODE_OFF -> OFF - IntegerTable.COVER_MODE_MEDIA_STORE -> MEDIA_STORE + IntegerTable.COVER_MODE_FAST -> FAST IntegerTable.COVER_MODE_QUALITY -> QUALITY else -> null } diff --git a/app/src/main/java/org/oxycblt/auxio/image/ImageSettings.kt b/app/src/main/java/org/oxycblt/auxio/image/ImageSettings.kt index 92195625e..1ebbcf7b5 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/ImageSettings.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/ImageSettings.kt @@ -49,7 +49,7 @@ class ImageSettingsImpl @Inject constructor(@ApplicationContext context: Context get() = CoverMode.fromIntCode( sharedPreferences.getInt(getString(R.string.set_key_cover_mode), Int.MIN_VALUE)) - ?: CoverMode.MEDIA_STORE + ?: CoverMode.FAST override val forceSquareCovers: Boolean get() = sharedPreferences.getBoolean(getString(R.string.set_key_square_covers), false) @@ -64,7 +64,7 @@ class ImageSettingsImpl @Inject constructor(@ApplicationContext context: Context when { !sharedPreferences.getBoolean(OLD_KEY_SHOW_COVERS, true) -> CoverMode.OFF !sharedPreferences.getBoolean(OLD_KEY_QUALITY_COVERS, true) -> - CoverMode.MEDIA_STORE + CoverMode.FAST else -> CoverMode.QUALITY } diff --git a/app/src/main/java/org/oxycblt/auxio/music/covers/CoverSilo.kt b/app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt similarity index 97% rename from app/src/main/java/org/oxycblt/auxio/music/covers/CoverSilo.kt rename to app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt index 8067b5c78..9d7413f65 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/covers/CoverSilo.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.music.covers +package org.oxycblt.auxio.image.covers import java.util.UUID import org.oxycblt.musikr.cover.CoverParams diff --git a/app/src/main/java/org/oxycblt/auxio/music/covers/CoverUtil.kt b/app/src/main/java/org/oxycblt/auxio/image/covers/CoverUtil.kt similarity index 85% rename from app/src/main/java/org/oxycblt/auxio/music/covers/CoverUtil.kt rename to app/src/main/java/org/oxycblt/auxio/image/covers/CoverUtil.kt index 2eaf76942..e556124dc 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/covers/CoverUtil.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/covers/CoverUtil.kt @@ -1,4 +1,4 @@ -package org.oxycblt.auxio.music.covers +package org.oxycblt.auxio.image.covers import android.content.Context import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/org/oxycblt/auxio/music/covers/NullCovers.kt b/app/src/main/java/org/oxycblt/auxio/image/covers/NullCovers.kt similarity index 95% rename from app/src/main/java/org/oxycblt/auxio/music/covers/NullCovers.kt rename to app/src/main/java/org/oxycblt/auxio/image/covers/NullCovers.kt index 38306694a..b97d274f2 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/covers/NullCovers.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/covers/NullCovers.kt @@ -1,4 +1,4 @@ -package org.oxycblt.auxio.music.covers +package org.oxycblt.auxio.image.covers import android.content.Context import org.oxycblt.musikr.cover.Cover diff --git a/app/src/main/java/org/oxycblt/auxio/music/covers/SiloedCovers.kt b/app/src/main/java/org/oxycblt/auxio/image/covers/SiloedCovers.kt similarity index 98% rename from app/src/main/java/org/oxycblt/auxio/music/covers/SiloedCovers.kt rename to app/src/main/java/org/oxycblt/auxio/image/covers/SiloedCovers.kt index 141638721..2448845ed 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/covers/SiloedCovers.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/covers/SiloedCovers.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.music.covers +package org.oxycblt.auxio.image.covers import android.content.Context import java.io.File diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt index 0b0a8dc3c..8fc2c9839 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt @@ -28,8 +28,8 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.withContext import kotlinx.coroutines.yield import org.oxycblt.auxio.music.MusicRepository.IndexingWorker -import org.oxycblt.auxio.music.covers.CoverSilo -import org.oxycblt.auxio.music.covers.SiloedCovers +import org.oxycblt.auxio.image.covers.CoverSilo +import org.oxycblt.auxio.image.covers.SiloedCovers import org.oxycblt.musikr.IndexingProgress import org.oxycblt.musikr.Interpretation import org.oxycblt.musikr.Library