Merge remote-tracking branch 'origin/master'

fast4x · Jul 28, 2024 · f55affa · f55affa
2 parents a553714 + 7b2eb9e
commit f55affa
Show file tree

Hide file tree

Showing 39 changed files with 198 additions and 112 deletions.
diff --git a/app/src/main/kotlin/it/fast4x/rimusic/ui/screens/player/PlayerModern.kt b/app/src/main/kotlin/it/fast4x/rimusic/ui/screens/player/PlayerModern.kt
@@ -980,7 +980,7 @@ fun PlayerModern(
 
 
     if (!isGradientBackgroundEnabled) {
-        if (playerBackgroundColors == PlayerBackgroundColors.BlurredCoverColor && (playerType == PlayerType.Essential || showthumbnail || isLandscape)) {
+        if (playerBackgroundColors == PlayerBackgroundColors.BlurredCoverColor && (playerType == PlayerType.Essential || showthumbnail)) {
             containerModifier = containerModifier
                 .background(dynamicColorPalette.background1)
                 .paint(
@@ -1740,17 +1740,103 @@ fun PlayerModern(
         }
 
         val thumbnailRoundness by rememberPreference(thumbnailRoundnessKey, ThumbnailRoundness.Heavy)
-        val playerTimelineType by rememberPreference(playerTimelineTypeKey, PlayerTimelineType.Default)
-        val playerPlayButtonType by rememberPreference(playerPlayButtonTypeKey,PlayerPlayButtonType.Rectangular)
         val thumbnailType by rememberPreference(thumbnailTypeKey, ThumbnailType.Modern)
-        val prevNextSongs by rememberPreference(prevNextSongsKey, PrevNextSongs.twosongs)
         val statsfornerds by rememberPreference(statsfornerdsKey, false)
 
 
         if (discoverIsEnabled) ApplyDiscoverToQueue()
 
 
         if (isLandscape) {
+         Box{
+             if (playerBackgroundColors == PlayerBackgroundColors.BlurredCoverColor && playerType == PlayerType.Modern && !showthumbnail) {
+                 val fling = PagerDefaults.flingBehavior(
+                     state = pagerState,
+                     snapPositionalThreshold = 0.20f
+                 )
+                 HorizontalPager(
+                     state = pagerState,
+                     beyondViewportPageCount = 1,
+                     flingBehavior = fling,
+                     modifier = Modifier
+                 ) { it ->
+
+                     LaunchedEffect(mediaItem.mediaId) {
+                         pagerState.animateScrollToPage(binder.player.currentMediaItemIndex)
+                     }
+
+                     LaunchedEffect(pagerState.settledPage) {
+                         var previousPage = pagerState.settledPage
+                         var previousID = mediaItem.mediaId
+                         snapshotFlow { pagerState.settledPage }.collect {
+                             if (previousPage != it) {
+                                 if (previousID != binder.player.getMediaItemAt(it).mediaId) binder.player.forcePlayAtIndex(mediaItems, it)
+                             }
+                             previousPage = it;
+                             previousID = mediaItem.mediaId
+                         }
+                     }
+
+                     AsyncImage(
+                         model = ImageRequest.Builder(LocalContext.current)
+                             .data(binder.player.getMediaItemAt(it).mediaMetadata.artworkUri.toString().resize(1200, 1200))
+                             .transformations(
+                                 listOf(
+                                     if (showthumbnail) {
+                                         BlurTransformation(
+                                             scale = 0.5f,
+                                             radius = blurStrength.toInt(),
+                                             //darkenFactor = blurDarkenFactor
+                                         )
+
+                                     } else
+                                         BlurTransformation(
+                                             scale = 0.5f,
+                                             //radius = blurStrength2.toInt(),
+                                             radius = if ((isShowingLyrics && !isShowingVisualizer) || !noblur) blurStrength.toInt() else 0,
+                                             //darkenFactor = blurDarkenFactor
+                                         )
+                                 )
+                             )
+                             .build(),
+                         contentDescription = "",
+                         contentScale = ContentScale.Crop,
+                         modifier = Modifier
+                             .fillMaxHeight()
+                             .combinedClickable(
+                                 interactionSource = remember { MutableInteractionSource() },
+                                 indication = null,
+                                 onClick = {
+                                     if (thumbnailTapEnabled) {
+                                         if (isShowingVisualizer) isShowingVisualizer = false
+                                         isShowingLyrics = !isShowingLyrics
+                                     }
+                                 },
+                                 onDoubleClick = {
+                                     if (!showlyricsthumbnail && !showvisthumbnail)
+                                         showthumbnail = !showthumbnail
+                                 }
+                             )
+                     )
+                 }
+                 Column(modifier = Modifier
+                     .matchParentSize()
+                     .background(
+                         Brush.verticalGradient(
+                             0.0f to Color.Transparent,
+                             1.0f to if (bottomgradient) if (colorPaletteMode == ColorPaletteMode.Light) Color.White.copy(
+                                 if (isLandscape) 0.8f else 0.75f
+                             ) else Color.Black.copy(if (isLandscape) 0.8f else 0.75f) else Color.Transparent,
+                             startY = if (isLandscape) 600f else if (expandedplayer) 1300f else 950f,
+                             endY = POSITIVE_INFINITY
+                         )
+                     )
+                     .background(
+                         if (bottomgradient) if (isLandscape) if (colorPaletteMode == ColorPaletteMode.Light) Color.White.copy(
+                             0.25f
+                         ) else Color.Black.copy(0.25f) else Color.Transparent else Color.Transparent
+                     )){}
+             }
             Row(
                 verticalAlignment = Alignment.CenterVertically,
                 modifier = containerModifier
@@ -1912,7 +1998,7 @@ fun PlayerModern(
                                              pagerState.animateScrollToPage(binder.player.currentMediaItemIndex)
                                          }
 
-                                         LaunchedEffect(pagerState.settledPage, ) {
+                                         LaunchedEffect(pagerState.settledPage) {
                                              var previousPage = pagerState.settledPage
                                              var previousID = mediaItem.mediaId
                                              snapshotFlow { pagerState.settledPage }.collect {
@@ -2030,12 +2116,12 @@ fun PlayerModern(
                             }
                         }
                     }
-                    if (playerType == PlayerType.Essential || isShowingVisualizer || !showthumbnail) {
+                    if (playerType == PlayerType.Essential || isShowingVisualizer) {
                         controlsContent(
                             modifier = Modifier
                                 .padding(vertical = 8.dp)
-                                .fillMaxHeight()
-                                .weight(1f)
+                                .conditional(playerType == PlayerType.Essential) {fillMaxHeight()}
+                                .conditional(playerType == PlayerType.Essential) {weight(1f)}
                         )
                     } else {
                         key(pagerState.currentPage) {
@@ -2071,8 +2157,8 @@ fun PlayerModern(
                         modifier = Modifier
                     )
                 }
-
             }
+         }
         } else {
            Box {
                if (playerBackgroundColors == PlayerBackgroundColors.BlurredCoverColor && playerType == PlayerType.Modern && !showthumbnail) {

diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
@@ -419,7 +419,7 @@
     <string name="lang_danish">Danish</string>
     <string name="lang_serbian_latin">Serbian Latin</string>
     <string name="item_deselect">Deselect</string>
-    <string name="show_next_songs_in_player">Show Mini Queue in Player</string>
+    <string name="show_next_songs_in_player">Show next songs in player</string>
     <string name="show_remaining_song_time">Show remaining song time</string>
     <string name="full_screen">Full screen</string>
     <string name="click_lyrics_text">Click lyrics text</string>
@@ -636,7 +636,7 @@
     <string name="buttonzoomout">Button Zoom Out Animation</string>
     <string name="thumbnailpause">Shrink thumbnail when paused</string>
     <string name="upnext">Up Next</string>
-    <string name="showtwosongs">Number of Songs in Mini Queue(1 to 9)</string>
+    <string name="showtwosongs">Show Next two Songs in Queue</string>
     <string name="showalbumcover">Show Album Cover</string>
     <string name="do_not_translate">Do not translate</string>
     <string name="info_sleep_timer_delayed_at_end_of_song">Sleep timer delayed at end of song</string>

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -419,7 +419,7 @@
     <string name="lang_danish">Danish</string>
     <string name="lang_serbian_latin">Serbian Latin</string>
     <string name="item_deselect">Deselect</string>
-    <string name="show_next_songs_in_player">Show Mini Queue in Player</string>
+    <string name="show_next_songs_in_player">Show next songs in player</string>
     <string name="show_remaining_song_time">Show remaining song time</string>
     <string name="full_screen">Full screen</string>
     <string name="click_lyrics_text">Click lyrics text</string>
@@ -636,7 +636,7 @@
     <string name="buttonzoomout">Button Zoom Out Animation</string>
     <string name="thumbnailpause">Shrink thumbnail when paused</string>
     <string name="upnext">Up Next</string>
-    <string name="showtwosongs">Number of Songs in Mini Queue(1 to 9)</string>
+    <string name="showtwosongs">Show Next two Songs in Queue</string>
     <string name="showalbumcover">Show Album Cover</string>
     <string name="do_not_translate">Do not translate</string>
     <string name="info_sleep_timer_delayed_at_end_of_song">Sleep timer delayed at end of song</string>

diff --git a/app/src/main/res/values-ba/strings.xml b/app/src/main/res/values-ba/strings.xml
@@ -419,7 +419,7 @@
     <string name="lang_danish">Danish</string>
     <string name="lang_serbian_latin">Serbian Latin</string>
     <string name="item_deselect">Deselect</string>
-    <string name="show_next_songs_in_player">Show Mini Queue in Player</string>
+    <string name="show_next_songs_in_player">Show next songs in player</string>
     <string name="show_remaining_song_time">Show remaining song time</string>
     <string name="full_screen">Full screen</string>
     <string name="click_lyrics_text">Click lyrics text</string>
@@ -636,7 +636,7 @@
     <string name="buttonzoomout">Button Zoom Out Animation</string>
     <string name="thumbnailpause">Shrink thumbnail when paused</string>
     <string name="upnext">Up Next</string>
-    <string name="showtwosongs">Number of Songs in Mini Queue(1 to 9)</string>
+    <string name="showtwosongs">Show Next two Songs in Queue</string>
     <string name="showalbumcover">Show Album Cover</string>
     <string name="do_not_translate">Do not translate</string>
     <string name="info_sleep_timer_delayed_at_end_of_song">Sleep timer delayed at end of song</string>

diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
@@ -419,7 +419,7 @@
     <string name="lang_danish">ড্যানিশ</string>
     <string name="lang_serbian_latin">সার্বিয়ান ল্যাটিন</string>
     <string name="item_deselect">ডি-সিলেক্ট</string>
-    <string name="show_next_songs_in_player">Show Mini Queue in Player</string>
+    <string name="show_next_songs_in_player">পরের গান প্লেয়ারে দেখান</string>
     <string name="show_remaining_song_time">গানের কতটুকু সময় বাকি আছে দেখান</string>
     <string name="full_screen">ফুল স্ক্রিন</string>
     <string name="click_lyrics_text">লিরিক টেক্সটে ক্লিক করুন</string>
@@ -636,7 +636,7 @@
     <string name="buttonzoomout">Button Zoom Out Animation</string>
     <string name="thumbnailpause">Shrink thumbnail when paused</string>
     <string name="upnext">Up Next</string>
-    <string name="showtwosongs">Number of Songs in Mini Queue(1 to 9)</string>
+    <string name="showtwosongs">Show Next two Songs in Queue</string>
     <string name="showalbumcover">Show Album Cover</string>
     <string name="do_not_translate">Do not translate</string>
     <string name="info_sleep_timer_delayed_at_end_of_song">Sleep timer delayed at end of song</string>

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -419,7 +419,7 @@
     <string name="lang_danish">Dánština (Dansk)</string>
     <string name="lang_serbian_latin">Srbská latinka (Srpski latinica)</string>
     <string name="item_deselect">Odznačit</string>
-    <string name="show_next_songs_in_player">Show Mini Queue in Player</string>
+    <string name="show_next_songs_in_player">Zobrazení dalších skladeb v přehrávači</string>
     <string name="show_remaining_song_time">Zobrazit zbývající čas skladby</string>
     <string name="full_screen">Celá obrazovka</string>
     <string name="click_lyrics_text">Klikněte na text písňového textu</string>
@@ -636,7 +636,7 @@
     <string name="buttonzoomout">Animace oddálení tlačítka</string>
     <string name="thumbnailpause">Zmenšit miniaturu při pozastavení</string>
     <string name="upnext">Další</string>
-    <string name="showtwosongs">Number of Songs in Mini Queue(1 to 9)</string>
+    <string name="showtwosongs">Zobrazit další dvě skladby ve frontě</string>
     <string name="showalbumcover">Zobrazit obal alba</string>
     <string name="do_not_translate">Nepřekládat</string>
     <string name="info_sleep_timer_delayed_at_end_of_song">Časovač spánku byl odložen na konec skladby</string>

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
@@ -419,7 +419,7 @@
     <string name="lang_danish">Dansk</string>
     <string name="lang_serbian_latin">Serbisk latin</string>
     <string name="item_deselect">Fravælg</string>
-    <string name="show_next_songs_in_player">Show Mini Queue in Player</string>
+    <string name="show_next_songs_in_player">Vis næste sange i afspiller</string>
     <string name="show_remaining_song_time">Vis resterende sangtid</string>
     <string name="full_screen">Fuld skærm</string>
     <string name="click_lyrics_text">Klik på sangtekst</string>
@@ -636,7 +636,7 @@
     <string name="buttonzoomout">Button Zoom Out Animation</string>
     <string name="thumbnailpause">Shrink thumbnail when paused</string>
     <string name="upnext">Den Næste</string>
-    <string name="showtwosongs">Number of Songs in Mini Queue(1 to 9)</string>
+    <string name="showtwosongs">Vis de næste to sange i køen</string>
     <string name="showalbumcover">Vis Albumcover</string>
     <string name="do_not_translate">Oversæt ikke</string>
     <string name="info_sleep_timer_delayed_at_end_of_song">Søvntimer forsinket ved sangens slutning</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -419,7 +419,7 @@
     <string name="lang_danish">Dänisch (Dansk)</string>
     <string name="lang_serbian_latin">Serbisch - Latein (srpski)</string>
     <string name="item_deselect">Auswahl aufheben</string>
-    <string name="show_next_songs_in_player">Show Mini Queue in Player</string>
+    <string name="show_next_songs_in_player">Nächste Titel im Player anzeigen</string>
     <string name="show_remaining_song_time">Verbleibende Songzeit anzeigen</string>
     <string name="full_screen">Vollbild</string>
     <string name="click_lyrics_text">Tippe auf Songtext</string>
@@ -636,7 +636,7 @@
     <string name="buttonzoomout">Animation des Zoom-Buttons</string>
     <string name="thumbnailpause">Thumbnail verkleinern, wenn pausiert</string>
     <string name="upnext">Als nächstes</string>
-    <string name="showtwosongs">Number of Songs in Mini Queue(1 to 9)</string>
+    <string name="showtwosongs">Zeige die nächsten zwei Songs in der Warteschlange an</string>
     <string name="showalbumcover">Albumcover anzeigen</string>
     <string name="do_not_translate">Nicht übersetzen</string>
     <string name="info_sleep_timer_delayed_at_end_of_song">Schlaf-Timer erst am Ende des Songs beenden</string>

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
@@ -419,7 +419,7 @@
     <string name="lang_danish">Danish (Dansk)</string>
     <string name="lang_serbian_latin">Serbian Latin (Gajeva latinica)</string>
     <string name="item_deselect">Deselect</string>
-    <string name="show_next_songs_in_player">Show Mini Queue in Player</string>
+    <string name="show_next_songs_in_player">Show next song queue</string>
     <string name="show_remaining_song_time">Show remaining song duration</string>
     <string name="full_screen">Full screen</string>
     <string name="click_lyrics_text">Jump to lyrics by pressing the line</string>
@@ -636,7 +636,7 @@
     <string name="buttonzoomout">Button Zoom Out Animation</string>
     <string name="thumbnailpause">Shrink thumbnail when paused</string>
     <string name="upnext">Up Next</string>
-    <string name="showtwosongs">Number of Songs in Mini Queue(1 to 9)</string>
+    <string name="showtwosongs">Show Next two Songs in Queue</string>
     <string name="showalbumcover">Show Album Cover</string>
     <string name="do_not_translate">Do not translate</string>
     <string name="info_sleep_timer_delayed_at_end_of_song">Sleep timer delayed at end of song</string>

diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
@@ -419,7 +419,7 @@
     <string name="lang_danish">Danish</string>
     <string name="lang_serbian_latin">Serbian Latin</string>
     <string name="item_deselect">Deselect</string>
-    <string name="show_next_songs_in_player">Show Mini Queue in Player</string>
+    <string name="show_next_songs_in_player">Show next songs in player</string>
     <string name="show_remaining_song_time">Show remaining song time</string>
     <string name="full_screen">Full screen</string>
     <string name="click_lyrics_text">Click lyrics text</string>
@@ -636,7 +636,7 @@
     <string name="buttonzoomout">Button Zoom Out Animation</string>
     <string name="thumbnailpause">Shrink thumbnail when paused</string>
     <string name="upnext">Up Next</string>
-    <string name="showtwosongs">Number of Songs in Mini Queue(1 to 9)</string>
+    <string name="showtwosongs">Show Next two Songs in Queue</string>
     <string name="showalbumcover">Show Album Cover</string>
     <string name="do_not_translate">Do not translate</string>
     <string name="info_sleep_timer_delayed_at_end_of_song">Sleep timer delayed at end of song</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -419,7 +419,7 @@
     <string name="lang_danish">Danés</string>
     <string name="lang_serbian_latin">Serbio latino</string>
     <string name="item_deselect">Deseleccionar</string>
-    <string name="show_next_songs_in_player">Show Mini Queue in Player</string>
+    <string name="show_next_songs_in_player">Mostrar las siguientes canciones en el reproductor</string>
     <string name="show_remaining_song_time">Mostrar el tiempo restante de las canciones</string>
     <string name="full_screen">Pantalla completa</string>
     <string name="click_lyrics_text">Texto de la letra</string>
@@ -636,7 +636,7 @@
     <string name="buttonzoomout">Animación de salida del botón de zoom</string>
     <string name="thumbnailpause">Achicar miniatura al pausar</string>
     <string name="upnext">A continuación</string>
-    <string name="showtwosongs">Number of Songs in Mini Queue(1 to 9)</string>
+    <string name="showtwosongs">Mostrar las siguientes dos canciones de la lista</string>
     <string name="showalbumcover">Mostrar la portada del álbum</string>
     <string name="do_not_translate">No traducir</string>
     <string name="info_sleep_timer_delayed_at_end_of_song">Temporizador de sueño retrasado al finalizar canción</string>