Merge pull request #39 from enteraname74/develop

v0.9.1

core-ui/src/commonMain/kotlin/com/github/enteraname74/soulsearching/coreui/UiConstants.kt

@@ -38,6 +38,7 @@ object UiConstants {
      * Define the sizes of images in the application.
      */
     object ImageSize {
+        val verySmall: Dp = 12.dp
         val small: Dp = 16.dp
         val smallPlus: Dp = 24.dp
         val medium: Dp = 32.dp

core-ui/src/commonMain/kotlin/com/github/enteraname74/soulsearching/coreui/bottomsheet/SoulBottomSheetHandler.kt

@@ -1,7 +1,5 @@
 package com.github.enteraname74.soulsearching.coreui.bottomsheet
 
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.rememberModalBottomSheetState
@@ -35,7 +33,6 @@ fun SoulBottomSheetHandler(
         containerColor = colors.containerColor,
         contentColor = colors.contentColor,
         dragHandle = null,
-        windowInsets = WindowInsets.displayCutout
     ) {
         content(closeWithAnim)
     }

core-ui/src/commonMain/kotlin/com/github/enteraname74/soulsearching/coreui/button/SoulButton.kt

@@ -3,16 +3,15 @@ package com.github.enteraname74.soulsearching.coreui.button
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.LocalMinimumInteractiveComponentEnforcement
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.input.pointer.PointerIcon
 import androidx.compose.ui.input.pointer.pointerHoverIcon
+import androidx.compose.ui.unit.Dp
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SoulButton(
     onClick: () -> Unit,
@@ -24,7 +23,7 @@ fun SoulButton(
     content: @Composable () -> Unit,
 ) {
     CompositionLocalProvider(
-        LocalMinimumInteractiveComponentEnforcement provides false,
+        LocalMinimumInteractiveComponentSize provides Dp.Unspecified,
     ) {
         Button(
             onClick = onClick,

core-ui/src/commonMain/kotlin/com/github/enteraname74/soulsearching/coreui/slider/SoulSlider.kt

@@ -2,6 +2,7 @@ package com.github.enteraname74.soulsearching.coreui.slider
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -10,6 +11,7 @@ import androidx.compose.material3.SliderDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import com.github.enteraname74.soulsearching.coreui.UiConstants
 import com.github.enteraname74.soulsearching.coreui.theme.color.SoulSearchingColorTheme
@@ -45,13 +47,27 @@ fun SoulSlider(
             SliderDefaults.Thumb(
                 interactionSource = interactionSource,
                 modifier = Modifier
-                    .size(UiConstants.ImageSize.small)
                     .padding(
-                        start = 4.dp,
-                        top = 4.dp
+                        top = 2.dp,
                     ),
+                thumbSize = DpSize(
+                    width = UiConstants.ImageSize.verySmall,
+                    height = UiConstants.ImageSize.verySmall
+                ),
                 colors = sliderColors
             )
+        },
+        track = {
+            SliderDefaults.Track(
+                sliderState = it,
+                trackInsideCornerSize = 0.dp,
+                drawStopIndicator = null,
+                thumbTrackGapSize = 0.dp,
+                modifier = Modifier.height(TrackHeight),
+                colors = sliderColors,
+            )
         }
     )
-}
+}
+
+private val TrackHeight = 3.dp

core-ui/src/commonMain/kotlin/com/github/enteraname74/soulsearching/coreui/strings/FrStrings.kt

@@ -200,7 +200,7 @@ object FrStrings : Strings {
         when (total) {
             0 -> "Aucune musique supprimée"
             1 -> "1 musique a été supprimée car elle n'existe plus sur l'appareil"
-            else -> "$total musiques ont été supprimées car elles n\\'existent plus sur l\\'appareil"
+            else -> "$total musiques ont été supprimées car elles n'existent plus sur l'appareil"
         }
 
     override fun plays(total: Int): String =

core-ui/src/commonMain/kotlin/com/github/enteraname74/soulsearching/coreui/textfield/SoulDropdownTextField.kt

@@ -52,7 +52,10 @@ fun SoulDropdownTextField(
         TextField(
             interactionSource = interactionSource,
             modifier = Modifier
-                .menuAnchor()
+                .menuAnchor(
+                    type = MenuAnchorType.PrimaryEditable,
+                    enabled = true
+                )
                 .focusRequester(focusRequester),
             value = value,
             onValueChange = {

desktopApp/io.github.enteraname74.soulsearching.yml

@@ -1,7 +1,6 @@
 app-id: io.github.enteraname74.soulsearching
 runtime: org.freedesktop.Platform
 runtime-version: '23.08'
-version: '0.9.0'
 sdk: org.freedesktop.Sdk
 command: SoulSearching
 build-options:
@@ -39,7 +38,7 @@ modules:
       - cp -ru * /app
     sources:
       - type: archive
-        path: build/distributions/soulsearching-0.9.0-linux.tar.gz
+        path: build/distributions/soulsearching-0.9.1-linux.tar.gz
       - type: file
         path: src/main/composeResources/drawable/app_icon_bg.png
       - type: file

domain/src/commonMain/kotlin/com/github/enteraname74/domain/di/DomainModule.kt

@@ -65,6 +65,7 @@ val domainModule = module {
     singleOf(::UpsertArtistUseCase)
 
     // Folder
+    singleOf(::DeleteAllFoldersUseCase)
     singleOf(::DeleteFolderUseCase)
     singleOf(::GetAllFoldersUseCase)
     singleOf(::GetHiddenFoldersPathUseCase)

domain/src/commonMain/kotlin/com/github/enteraname74/domain/model/Cover.kt

@@ -6,7 +6,7 @@ sealed interface Cover {
 
     fun isEmpty(): Boolean
 
-    data class FileCover(
+    data class CoverFile(
         val initialCoverPath: String? = null,
         val fileCoverId: UUID? = null,
     ): Cover {

domain/src/commonMain/kotlin/com/github/enteraname74/domain/repository/FolderRepository.kt

@@ -16,6 +16,8 @@ interface FolderRepository {
      */
     suspend fun delete(folder: Folder)
 
+    suspend fun deleteAll(folders: List<Folder>)
+
     /**
      * Retrieves a flow of all Folder.
      */

domain/src/commonMain/kotlin/com/github/enteraname74/domain/usecase/album/GetNumberOfAlbumsWithCoverIdUseCase.kt

@@ -10,6 +10,6 @@ class GetNumberOfAlbumsWithCoverIdUseCase(
 ) {
     suspend operator fun invoke(coverId: UUID): Int {
         val allAlbums = albumRepository.getAll().first()
-        return allAlbums.count { (it.cover as? Cover.FileCover)?.fileCoverId == coverId }
+        return allAlbums.count { (it.cover as? Cover.CoverFile)?.fileCoverId == coverId }
     }
 }

domain/src/commonMain/kotlin/com/github/enteraname74/domain/usecase/album/UpdateAlbumCoverUseCase.kt

@@ -16,7 +16,7 @@ class UpdateAlbumCoverUseCase(
         val album: Album = albumRepository.getFromId(albumId = albumId).first() ?: return
         albumRepository.upsert(
             album = album.copy(
-                cover = Cover.FileCover(fileCoverId = newCoverId),
+                cover = Cover.CoverFile(fileCoverId = newCoverId),
             )
         )
     }

domain/src/commonMain/kotlin/com/github/enteraname74/domain/usecase/artist/UpdateArtistCoverUseCase.kt

@@ -16,7 +16,7 @@ class UpdateArtistCoverUseCase(
         val artist: Artist = artistRepository.getFromId(artistId = artistId).first() ?: return
         artistRepository.upsert(
             artist = artist.copy(
-                cover = Cover.FileCover(fileCoverId = newCoverId),
+                cover = Cover.CoverFile(fileCoverId = newCoverId),
             )
         )
     }

domain/src/commonMain/kotlin/com/github/enteraname74/domain/usecase/cover/IsCoverUsedUseCase.kt

@@ -15,8 +15,8 @@ class IsCoverUsedUseCase(
     private val getNumberOfAlbumsWithCoverIdUseCase: GetNumberOfAlbumsWithCoverIdUseCase,
 ) {
     suspend operator fun invoke(coverId: UUID): Boolean =
-        musicRepository.getAll().first().any { (it.cover as? Cover.FileCover)?.fileCoverId == coverId }
+        musicRepository.getAll().first().any { (it.cover as? Cover.CoverFile)?.fileCoverId == coverId }
                 || getNumberOfAlbumsWithCoverIdUseCase(coverId = coverId) > 0
-                || artistRepository.getAll().first().any { (it.cover as? Cover.FileCover)?.fileCoverId == coverId }
-                || playlistRepository.getAll().first().any { (it.cover as? Cover.FileCover)?.fileCoverId == coverId }
+                || artistRepository.getAll().first().any { (it.cover as? Cover.CoverFile)?.fileCoverId == coverId }
+                || playlistRepository.getAll().first().any { (it.cover as? Cover.CoverFile)?.fileCoverId == coverId }
 }

domain/src/commonMain/kotlin/com/github/enteraname74/domain/usecase/folder/DeleteAllFoldersUseCase.kt

@@ -0,0 +1,11 @@
+package com.github.enteraname74.domain.usecase.folder
+
+import com.github.enteraname74.domain.model.Folder
+import com.github.enteraname74.domain.repository.FolderRepository
+
+class DeleteAllFoldersUseCase(
+    private val folderRepository: FolderRepository
+) {
+    suspend operator fun invoke(folders: List<Folder>) =
+        folderRepository.deleteAll(folders = folders)
+}

domain/src/commonMain/kotlin/com/github/enteraname74/domain/usecase/music/UpdateAlbumOfMusicUseCase.kt

@@ -40,8 +40,8 @@ class UpdateAlbumOfMusicUseCase(
         if (newMusicAlbum == null) {
             newMusicAlbum = Album(
                 albumName = newAlbumName,
-                cover = (legacyMusic.cover as? Cover.FileCover)?.fileCoverId?.let {
-                    Cover.FileCover(fileCoverId = it)
+                cover = (legacyMusic.cover as? Cover.CoverFile)?.fileCoverId?.let {
+                    Cover.CoverFile(fileCoverId = it)
                 }
             )
             albumRepository.upsert(album = newMusicAlbum)

domain/src/commonMain/kotlin/com/github/enteraname74/domain/util/LocalDatabaseVersion.kt

@@ -1,5 +1,5 @@
 package com.github.enteraname74.domain.util
 
 object LocalDatabaseVersion {
-    const val version: Int = 17
+    const val VERSION: Int = 18
 }

features/filemanager/build.gradle.kts

@@ -30,6 +30,8 @@ kotlin {
         commonMain.dependencies {
             implementation(project(":domain"))
             implementation(compose.runtime)
+            implementation(compose.ui)
+            implementation(libs.components.resources)
             implementation(libs.koin.core)
             implementation(libs.jaudiotagger)
             implementation(libs.coroutines.core)

features/filemanager/src/androidMain/kotlin/com/github/enteraname74/soulsearching/features/filemanager/cover/CachedCoverManagerAndroidImpl.kt

@@ -0,0 +1,21 @@
+package com.github.enteraname74.soulsearching.features.filemanager.cover
+
+import android.media.MediaMetadataRetriever
+import androidx.compose.ui.graphics.ImageBitmap
+import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.decodeToImageBitmap
+
+class CachedCoverManagerAndroidImpl : CachedCoverManager() {
+    @OptIn(ExperimentalResourceApi::class)
+    override fun fetchCoverOfMusicFile(musicPath: String): ImageBitmap? =
+        try {
+            val mediaMetadataRetriever = MediaMetadataRetriever()
+            mediaMetadataRetriever.setDataSource(musicPath)
+            val data: ImageBitmap? = mediaMetadataRetriever.embeddedPicture?.decodeToImageBitmap()
+            data?.let { cachedImages[musicPath] = it }
+            data
+        } catch (e: Exception) {
+            println("CoverUtilsImpl -- Error while fetching song's cover: ${e.message}")
+            null
+        }
+}

features/filemanager/src/androidMain/kotlin/com/github/enteraname74/soulsearching/features/filemanager/cover/CoverFileManagerAndroidImpl.kt

@@ -1,9 +1,6 @@
 package com.github.enteraname74.soulsearching.features.filemanager.cover
 
 import android.content.Context
-import com.github.enteraname74.domain.model.Cover
-import com.github.enteraname74.domain.model.Music
-import com.github.enteraname74.soulsearching.features.filemanager.util.MusicCoverUtils
 import java.io.File
 
 internal class CoverFileManagerAndroidImpl(
@@ -20,14 +17,6 @@ internal class CoverFileManagerAndroidImpl(
         return folder
     }
 
-    override fun getCleanFileCoverForMusic(music: Music): Cover.FileCover {
-        val albumId = MusicCoverUtils.getAlbumIdFromMusicPath(context, music.path) ?: return Cover.FileCover()
-        val path = MusicCoverUtils.getMusicFileCoverPath(context, albumId) ?: return Cover.FileCover()
-        return Cover.FileCover(
-            initialCoverPath = path,
-        )
-    }
-
     companion object {
         private const val COVER_FOLDER = "covers"
     }

features/filemanager/src/androidMain/kotlin/com/github/enteraname74/soulsearching/features/filemanager/di/FileManagerPlatformModule.android.kt

@@ -4,6 +4,8 @@ import org.koin.core.module.Module
 import org.koin.dsl.module
 import com.github.enteraname74.soulsearching.features.filemanager.cover.CoverFileManager
 import com.github.enteraname74.soulsearching.features.filemanager.cover.CoverFileManagerAndroidImpl
+import com.github.enteraname74.soulsearching.features.filemanager.cover.CachedCoverManager
+import com.github.enteraname74.soulsearching.features.filemanager.cover.CachedCoverManagerAndroidImpl
 import com.github.enteraname74.soulsearching.features.filemanager.musicfetching.MusicFetcher
 import com.github.enteraname74.soulsearching.features.filemanager.musicfetching.MusicFetcherAndroidImpl
 import org.koin.core.module.dsl.singleOf
@@ -12,4 +14,5 @@ import org.koin.dsl.bind
 internal actual val fileManagerPlatformModule: Module = module {
     singleOf(::CoverFileManagerAndroidImpl) bind CoverFileManager::class
     singleOf(::MusicFetcherAndroidImpl) bind MusicFetcher::class
+    singleOf(::CachedCoverManagerAndroidImpl) bind CachedCoverManager::class
 }