New Crowdin updates

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/FullLyricsSheetModern.kt

@@ -51,7 +51,7 @@ import it.fast4x.rimusic.ui.styling.Dimensions
 import it.fast4x.rimusic.ui.styling.collapsedPlayerProgressBar
 import it.fast4x.rimusic.ui.styling.px
 import it.fast4x.rimusic.utils.DisposableListener
-import it.fast4x.rimusic.utils.clickLyricsTextKey
+import it.fast4x.rimusic.utils.clickOnLyricsTextKey
 import it.fast4x.rimusic.utils.colorPaletteNameKey
 import it.fast4x.rimusic.utils.forceSeekToNext
 import it.fast4x.rimusic.utils.forceSeekToPrevious
@@ -118,7 +118,7 @@ fun FullLyricsSheetModern(
      */
 
     val colorPaletteName by rememberPreference(colorPaletteNameKey, ColorPaletteName.Dynamic)
-    val clickLyricsText by rememberPreference(clickLyricsTextKey, true)
+    val clickLyricsText by rememberPreference(clickOnLyricsTextKey, true)
 
     Box(
         modifier = Modifier

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/PlayerModern.kt

@@ -10,7 +10,6 @@ import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
-import androidx.compose.animation.core.updateTransition
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -124,7 +123,6 @@ import it.fast4x.rimusic.ui.components.themed.PlayerMenu
 import it.fast4x.rimusic.ui.components.themed.SecondaryTextButton
 import it.fast4x.rimusic.ui.components.themed.animateBrushRotation
 import it.fast4x.rimusic.ui.styling.Dimensions
-import it.fast4x.rimusic.ui.styling.LocalAppearance
 import it.fast4x.rimusic.ui.styling.collapsedPlayerProgressBar
 import it.fast4x.rimusic.ui.styling.dynamicColorPaletteOf
 import it.fast4x.rimusic.ui.styling.favoritesOverlay
@@ -196,7 +194,6 @@ import dev.chrisbanes.haze.HazeState
 import dev.chrisbanes.haze.haze
 import dev.chrisbanes.haze.hazeChild
 import it.fast4x.rimusic.enums.CarouselSize
-import it.fast4x.rimusic.enums.ClickLyricsText
 import it.fast4x.rimusic.enums.PlayerType
 import it.fast4x.rimusic.enums.QueueType
 import it.fast4x.rimusic.enums.SongsNumber
@@ -219,7 +216,7 @@ import it.fast4x.rimusic.utils.carouselSizeKey
 import it.fast4x.rimusic.cleanPrefix
 import it.fast4x.rimusic.utils.textoutlineKey
 import kotlin.Float.Companion.POSITIVE_INFINITY
-import it.fast4x.rimusic.utils.clickLyricsTextKey
+import it.fast4x.rimusic.utils.clickOnLyricsTextKey
 import it.fast4x.rimusic.utils.controlsExpandedKey
 import it.fast4x.rimusic.utils.disableScrollingTextKey
 import it.fast4x.rimusic.utils.discoverKey
@@ -279,8 +276,8 @@ fun PlayerModern(
         PlayerThumbnailSize.Biggest
     )
 
-    var disablePlayerHorizontalSwipe by rememberPreference(disablePlayerHorizontalSwipeKey, false)
-    var showlyricsthumbnail by rememberPreference(showlyricsthumbnailKey, false)
+    val disablePlayerHorizontalSwipe by rememberPreference(disablePlayerHorizontalSwipeKey, false)
+    val showlyricsthumbnail by rememberPreference(showlyricsthumbnailKey, false)
     val binder = LocalPlayerServiceBinder.current
 
     binder?.player ?: return
@@ -294,7 +291,7 @@ fun PlayerModern(
         mutableStateOf(binder.player.shouldBePlaying)
     }
 
-    val shouldBePlayingTransition = updateTransition(shouldBePlaying, label = "shouldBePlaying")
+    //val shouldBePlayingTransition = updateTransition(shouldBePlaying, label = "shouldBePlaying")
 
     var isRotated by rememberSaveable { mutableStateOf(false) }
     val rotationAngle by animateFloatAsState(
@@ -321,11 +318,11 @@ fun PlayerModern(
     var isShowingLyrics by rememberSaveable {
         mutableStateOf(false)
     }
-    var showvisthumbnail by rememberPreference(showvisthumbnailKey, false)
+    val showvisthumbnail by rememberPreference(showvisthumbnailKey, false)
     var isShowingVisualizer by remember {
         mutableStateOf(false)
     }
-    var expandedlyrics by rememberPreference(expandedlyricsKey, true)
+    val expandedlyrics by rememberPreference(expandedlyricsKey, true)
 
     if (showBlurPlayerDialog) {
 
@@ -361,8 +358,8 @@ fun PlayerModern(
         mutableStateOf<PlaybackException?>(binder.player.playerError)
     }
 
-    var queueDurationExpanded by rememberPreference(queueDurationExpandedKey, true)
-    var miniQueueExpanded by rememberPreference(miniQueueExpandedKey, true)
+    val queueDurationExpanded by rememberPreference(queueDurationExpandedKey, true)
+    val miniQueueExpanded by rememberPreference(miniQueueExpandedKey, true)
 
 
     binder.player.DisposableListener {
@@ -405,7 +402,7 @@ fun PlayerModern(
         mutableStateOf(false)
     }
 
-    val sleepTimerMillisLeft by (binder?.sleepTimerMillisLeft
+    val sleepTimerMillisLeft by (binder.sleepTimerMillisLeft
         ?: flowOf(null))
         .collectAsState(initial = null)
 
@@ -440,7 +437,7 @@ fun PlayerModern(
             }
         )
     }
-    var actionspacedevenly by rememberPreference(actionspacedevenlyKey, false)
+    val actionspacedevenly by rememberPreference(actionspacedevenlyKey, false)
     var expandedplayer by rememberPreference(expandedplayerKey, false)
 
     if (expandedlyrics && !isLandscape) {
@@ -535,14 +532,14 @@ fun PlayerModern(
     var showCircularSlider by remember {
         mutableStateOf(false)
     }
-    var showsongs by rememberPreference(showsongsKey, SongsNumber.`2`)
-    var showalbumcover by rememberPreference(showalbumcoverKey, true)
+    val showsongs by rememberPreference(showsongsKey, SongsNumber.`2`)
+    val showalbumcover by rememberPreference(showalbumcoverKey, true)
     val tapqueue by rememberPreference(tapqueueKey, true)
     val swipeUpQueue by rememberPreference(swipeUpQueueKey, true)
-    var playerType by rememberPreference(playerTypeKey, PlayerType.Essential)
-    var queueType by rememberPreference(queueTypeKey, QueueType.Essential)
-    var noblur by rememberPreference(noblurKey, true)
-    var fadingedge by rememberPreference(fadingedgeKey, false)
+    val playerType by rememberPreference(playerTypeKey, PlayerType.Essential)
+    val queueType by rememberPreference(queueTypeKey, QueueType.Essential)
+    val noblur by rememberPreference(noblurKey, true)
+    val fadingedge by rememberPreference(fadingedgeKey, false)
     val configuration = LocalConfiguration.current
     val screenWidth = configuration.screenWidthDp.dp
 
@@ -653,7 +650,7 @@ fun PlayerModern(
                                 + formatAsDuration(timeRemaining.toLong())
                                 + " " + stringResource(R.string.end_of_song),
                         onClick = {
-                            binder?.startSleepTimer(timeRemaining.toLong())
+                            binder.startSleepTimer(timeRemaining.toLong())
                             isShowingSleepTimerDialog = false
                         }
                     )
@@ -678,7 +675,7 @@ fun PlayerModern(
                     IconButton(
                         enabled = amount > 0,
                         onClick = {
-                            binder?.startSleepTimer(amount * 5 * 60 * 1000L)
+                            binder.startSleepTimer(amount * 5 * 60 * 1000L)
                             isShowingSleepTimerDialog = false
                         },
                         icon = R.drawable.checkmark,
@@ -827,15 +824,15 @@ fun PlayerModern(
         //.padding(bottom = bottomDp)
         .padding(bottom = 0.dp)
     var deltaX by remember { mutableStateOf(0f) }
-    var blackgradient by rememberPreference(blackgradientKey, false)
-    var bottomgradient by rememberPreference(bottomgradientKey, false)
-    var disableScrollingText by rememberPreference(disableScrollingTextKey, false)
+    val blackgradient by rememberPreference(blackgradientKey, false)
+    val bottomgradient by rememberPreference(bottomgradientKey, false)
+    val disableScrollingText by rememberPreference(disableScrollingTextKey, false)
 
     var discoverIsEnabled by rememberPreference(discoverKey, false)
     val hapticFeedback = LocalHapticFeedback.current
-    var titleExpanded by rememberPreference(titleExpandedKey, true)
-    var timelineExpanded by rememberPreference(timelineExpandedKey, true)
-    var controlsExpanded by rememberPreference(controlsExpandedKey, true)
+    val titleExpanded by rememberPreference(titleExpandedKey, true)
+    val timelineExpanded by rememberPreference(timelineExpandedKey, true)
+    val controlsExpanded by rememberPreference(controlsExpandedKey, true)
 
 
 
@@ -1457,7 +1454,7 @@ fun PlayerModern(
                                 color = colorPalette().accent,
                                 enabled = true,
                                 onClick = {
-                                    binder?.player?.shuffleQueue()
+                                    binder.player?.shuffleQueue()
                                     //binder.player.forceSeekToNext()
                                 },
                                 modifier = Modifier
@@ -1618,12 +1615,12 @@ fun PlayerModern(
                 }
             }
         }
-        val binder = LocalPlayerServiceBinder.current
-        val player = binder?.player ?: return
-        val clickLyricsText by rememberPreference(clickLyricsTextKey, true)
+        //val binder = LocalPlayerServiceBinder.current
+        val player = binder.player ?: return
+        val clickLyricsText by rememberPreference(clickOnLyricsTextKey, true)
         var extraspace by rememberPreference(extraspaceKey, false)
-        val nextMediaItemIndex = binder.player.nextMediaItemIndex
-        val prevMediaItemIndex = binder.player.previousMediaItemIndex
+        //val nextMediaItemIndex = binder.player.nextMediaItemIndex
+        //val prevMediaItemIndex = binder.player.previousMediaItemIndex
         /*
         val nextMediaItem = if (binder.player.hasNextMediaItem())
             binder.player.getMediaItemAt(binder.player.nextMediaItemIndex)

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/Thumbnail.kt

@@ -60,7 +60,7 @@ import it.fast4x.rimusic.ui.components.themed.SmartMessage
 import it.fast4x.rimusic.ui.styling.Dimensions
 import it.fast4x.rimusic.ui.styling.px
 import it.fast4x.rimusic.utils.DisposableListener
-import it.fast4x.rimusic.utils.clickLyricsTextKey
+import it.fast4x.rimusic.utils.clickOnLyricsTextKey
 import it.fast4x.rimusic.utils.currentWindow
 import it.fast4x.rimusic.utils.doubleShadowDrop
 import it.fast4x.rimusic.utils.isLandscape
@@ -132,7 +132,7 @@ fun Thumbnail(
         mutableStateOf(true)
     }
 
-    val clickLyricsText by rememberPreference(clickLyricsTextKey, true)
+    val clickLyricsText by rememberPreference(clickOnLyricsTextKey, true)
     var showvisthumbnail by rememberPreference(showvisthumbnailKey, false)
     //var expandedlyrics by rememberPreference(expandedlyricsKey,false)
 

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/settings/AppearanceSettings.kt

@@ -78,7 +78,7 @@ import it.fast4x.rimusic.utils.bottomgradientKey
 import it.fast4x.rimusic.utils.buttonzoomoutKey
 import it.fast4x.rimusic.utils.carouselKey
 import it.fast4x.rimusic.utils.carouselSizeKey
-import it.fast4x.rimusic.utils.clickLyricsTextKey
+import it.fast4x.rimusic.utils.clickOnLyricsTextKey
 import it.fast4x.rimusic.utils.controlsExpandedKey
 import it.fast4x.rimusic.utils.disablePlayerHorizontalSwipeKey
 import it.fast4x.rimusic.utils.disableScrollingTextKey
@@ -256,7 +256,7 @@ fun DefaultAppearanceSettings() {
     showNextSongsInPlayer = false
     var showRemainingSongTime by rememberPreference(showRemainingSongTimeKey, true)
     showRemainingSongTime = true
-    var clickLyricsText by rememberPreference(clickLyricsTextKey, true)
+    var clickLyricsText by rememberPreference(clickOnLyricsTextKey, true)
     clickLyricsText = true
     var showBackgroundLyrics by rememberPreference(showBackgroundLyricsKey, false)
     showBackgroundLyrics = false
@@ -430,7 +430,7 @@ fun AppearanceSettings(
     )
     var showNextSongsInPlayer by rememberPreference(showNextSongsInPlayerKey, false)
     var showRemainingSongTime by rememberPreference(showRemainingSongTimeKey, true)
-    var clickLyricsText by rememberPreference(clickLyricsTextKey, true)
+    var clickLyricsText by rememberPreference(clickOnLyricsTextKey, true)
     var showBackgroundLyrics by rememberPreference(showBackgroundLyricsKey, false)
     var searching by rememberSaveable { mutableStateOf(false) }
     var filter: String? by rememberSaveable { mutableStateOf(null) }

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/settings/UiSettings.kt

@@ -106,7 +106,7 @@ import it.fast4x.rimusic.utils.blackgradientKey
 import it.fast4x.rimusic.utils.buttonzoomoutKey
 import it.fast4x.rimusic.utils.carouselKey
 import it.fast4x.rimusic.utils.carouselSizeKey
-import it.fast4x.rimusic.utils.clickLyricsTextKey
+import it.fast4x.rimusic.utils.clickOnLyricsTextKey
 import it.fast4x.rimusic.utils.closeWithBackButtonKey
 import it.fast4x.rimusic.utils.closebackgroundPlayerKey
 import it.fast4x.rimusic.utils.colorPaletteModeKey
@@ -481,7 +481,7 @@ fun DefaultUiSettings() {
     effectRotationEnabled = true
     var thumbnailTapEnabled by rememberPreference(thumbnailTapEnabledKey, false)
     thumbnailTapEnabled = false
-    var clickLyricsText by rememberPreference(clickLyricsTextKey, true)
+    var clickLyricsText by rememberPreference(clickOnLyricsTextKey, true)
     clickLyricsText = true
     var backgroundProgress by rememberPreference(
         backgroundProgressKey,
@@ -720,7 +720,7 @@ fun UiSettings(
     var disableScrollingText by rememberPreference(disableScrollingTextKey, false)
     var effectRotationEnabled by rememberPreference(effectRotationKey, true)
     var thumbnailTapEnabled by rememberPreference(thumbnailTapEnabledKey, false)
-    var clickLyricsText by rememberPreference(clickLyricsTextKey, true)
+    var clickLyricsText by rememberPreference(clickOnLyricsTextKey, true)
     var backgroundProgress by rememberPreference(
         backgroundProgressKey,
         BackgroundProgress.MiniPlayer

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/utils/Preferences.kt

@@ -141,7 +141,7 @@ const val showRemainingSongTimeKey = "showRemainingSongTime"
 const val lyricsFontSizeKey = "lyricsFontSize"
 const val showBackgroundLyricsKey = "showBackgroundLyrics"
 const val includeLocalSongsKey = "includeLocalSongs"
-const val clickLyricsTextKey = "clickLyricsText"
+const val clickOnLyricsTextKey = "clickOnLyricsText"
 const val defaultFolderKey = "defaultFolder"
 const val menuStyleKey = "menuStyle"
 const val shakeEventEnabledKey = "shakeEventEnabled"

composeApp/src/androidMain/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#4FC17C</color>
+</resources>

composeApp/src/androidMain/res/drawable/ic_launcher_foreground.xml

@@ -3,7 +3,19 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <path
-      android:pathData="M54.01,24C37.44,24 24,37.42 24,54C24,70.57 37.43,84 54.01,84C57.27,84 60.51,83.47 63.6,82.43L59.13,74.7C58.9,74.29 58.75,73.84 58.69,73.38C58.63,72.92 58.66,72.44 58.79,71.99C58.92,71.55 59.13,71.13 59.42,70.76C59.71,70.39 60.07,70.08 60.49,69.85C62.18,68.91 64.31,69.55 65.28,71.23L69.99,79.39C78.41,74.08 84,64.7 84,54.01C84.02,37.42 70.58,24 54.01,24ZM61.05,63.98C61.05,64.68 60.86,65.37 60.51,65.98C60.11,66.67 59.52,67.22 58.81,67.57C58.09,67.92 57.29,68.06 56.51,67.95C55.85,67.87 55.23,67.62 54.69,67.23C54.16,66.85 53.72,66.34 53.43,65.75C53.14,65.15 53,64.5 53.02,63.84C53.04,63.18 53.23,62.53 53.56,61.96C53.89,61.39 54.35,60.91 54.91,60.56C55.47,60.21 56.11,60.01 56.77,59.96C57.43,59.92 58.09,60.04 58.69,60.31C59.29,60.59 59.82,61 60.22,61.53C60.75,62.24 61.04,63.09 61.05,63.98ZM75.08,53.73C75.08,54.93 74.76,56.1 74.16,57.14C73.55,58.17 72.69,59.03 71.65,59.62L67.75,61.87C67.35,62.11 66.91,62.27 66.44,62.34C65.98,62.41 65.51,62.38 65.06,62.26C64.61,62.14 64.18,61.94 63.81,61.65C63.44,61.37 63.13,61.02 62.89,60.61C62.66,60.21 62.51,59.76 62.45,59.29C62.39,58.83 62.42,58.36 62.55,57.91C62.81,57 63.41,56.23 64.24,55.76L65.6,54.97C65.83,54.84 66.02,54.65 66.16,54.42C66.29,54.19 66.36,53.93 66.36,53.67C66.36,53.4 66.3,53.14 66.17,52.91C66.04,52.68 65.85,52.49 65.62,52.35L48.56,42.14C48.33,42 48.06,41.93 47.79,41.93C47.52,41.92 47.25,41.99 47.02,42.12C46.78,42.26 46.59,42.45 46.45,42.68C46.31,42.92 46.24,43.18 46.24,43.45V69.83C46.24,70.77 45.87,71.66 45.21,72.33C44.55,72.99 43.65,73.36 42.71,73.36C41.78,73.36 40.88,72.99 40.22,72.33C39.56,71.66 39.18,70.77 39.18,69.83V40.4C39.17,39.2 39.49,38.01 40.09,36.97C40.69,35.92 41.56,35.06 42.61,34.46L42.65,34.44C43.71,33.83 44.91,33.52 46.12,33.53C47.34,33.54 48.53,33.88 49.57,34.52L71.74,47.78C72.77,48.39 73.62,49.26 74.21,50.3C74.8,51.35 75.1,52.53 75.08,53.73Z"
-      android:fillColor="#ffffff"/>
+  <group android:scaleX="1.25"
+      android:scaleY="1.25"
+      android:translateX="-13.5"
+      android:translateY="-13.5">
+    <group>
+      <clip-path
+          android:pathData="M29,29h50v50h-50z"/>
+      <path
+          android:pathData="M54,79C67.81,79 79,67.81 79,54C79,40.19 67.81,29 54,29C40.19,29 29,40.19 29,54C29,67.81 40.19,79 54,79Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M54,29C40.2,29 29,40.18 29,54C29,67.82 40.19,79 54,79C56.72,79 59.42,78.56 61.99,77.69L58.27,71.25C58.07,70.91 57.95,70.54 57.89,70.15C57.85,69.77 57.88,69.37 57.98,69C58.09,68.62 58.27,68.27 58.51,67.97C58.75,67.66 59.05,67.4 59.39,67.21C60.81,66.43 62.58,66.96 63.38,68.36L67.31,75.16C74.32,70.74 78.98,62.91 78.98,54.01C79,40.18 67.8,29 54,29ZM59.86,62.31C59.86,62.9 59.71,63.48 59.41,63.99C59.08,64.56 58.59,65.02 58,65.31C57.4,65.6 56.74,65.71 56.08,65.63C55.35,65.53 54.67,65.19 54.16,64.67C53.64,64.15 53.3,63.48 53.21,62.75C53.11,62.02 53.26,61.28 53.63,60.64C53.99,60 54.56,59.5 55.24,59.22C55.92,58.94 56.68,58.89 57.39,59.08C58.1,59.27 58.73,59.69 59.17,60.27C59.61,60.86 59.85,61.58 59.86,62.31ZM71.55,53.77C71.55,54.77 71.29,55.75 70.78,56.62C70.28,57.48 69.56,58.19 68.69,58.69L65.45,60.56C65.11,60.76 64.74,60.89 64.36,60.95C63.97,61 63.58,60.98 63.2,60.88C62.83,60.78 62.47,60.61 62.16,60.38C61.85,60.14 61.59,59.85 61.4,59.51C61.2,59.17 61.08,58.8 61.03,58.41C60.98,58.02 61.01,57.63 61.11,57.26C61.33,56.5 61.83,55.86 62.52,55.47L63.65,54.81C63.84,54.7 64,54.54 64.12,54.35C64.23,54.16 64.29,53.94 64.29,53.72C64.29,53.5 64.23,53.29 64.13,53.09C64.02,52.9 63.86,52.74 63.67,52.63L49.46,44.12C49.26,44 49.04,43.94 48.82,43.94C48.59,43.94 48.37,43.99 48.17,44.1C47.98,44.21 47.81,44.37 47.7,44.57C47.59,44.76 47.53,44.98 47.53,45.21V67.19C47.53,67.97 47.22,68.72 46.67,69.27C46.12,69.82 45.37,70.13 44.59,70.13C43.81,70.13 43.06,69.82 42.51,69.27C41.96,68.72 41.65,67.97 41.65,67.19V42.67C41.64,41.66 41.9,40.68 42.4,39.81C42.9,38.93 43.63,38.21 44.5,37.72L44.54,37.7C45.42,37.19 46.42,36.93 47.43,36.94C48.45,36.95 49.44,37.24 50.31,37.76L68.77,48.82C69.63,49.32 70.34,50.05 70.83,50.92C71.31,51.79 71.57,52.77 71.55,53.77Z"
+          android:fillColor="#58CC86"/>
+    </group>
+  </group>
 </vector>

composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>