Merge pull request #2378 from aneesh1122/master

modified expanded player
fast4x · Jun 20, 2024 · 9d367a8 · 9d367a8
2 parents 5cc315d + 73d3f38
commit 9d367a8
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 19 deletions.
diff --git a/app/src/main/kotlin/it/fast4x/rimusic/ui/screens/player/Controls.kt b/app/src/main/kotlin/it/fast4x/rimusic/ui/screens/player/Controls.kt
@@ -114,7 +114,7 @@ import it.fast4x.rimusic.utils.trackLoopEnabledKey
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
-import it.fast4x.rimusic.utils.expandedlyricsKey
+import it.fast4x.rimusic.utils.expandedplayerKey
 import it.fast4x.rimusic.utils.showlyricsthumbnailKey
 
 
@@ -174,7 +174,7 @@ fun Controls(
     var effectRotationEnabled by rememberPreference(effectRotationKey, true)
     var disableScrollingText by rememberPreference(disableScrollingTextKey, false)
     var playerTimelineType by rememberPreference(playerTimelineTypeKey, PlayerTimelineType.Default)
-    var expandedlyrics by rememberPreference(expandedlyricsKey, false)
+    var expandedplayer by rememberPreference(expandedplayerKey, false)
 
 
     val scope = rememberCoroutineScope()
@@ -254,7 +254,7 @@ fun Controls(
     var playerSwapControlsWithTimeline by rememberPreference(playerSwapControlsWithTimelineKey, false)
     var showlyricsthumbnail by rememberPreference(showlyricsthumbnailKey, true)
 
-if(expandedlyrics && !showlyricsthumbnail)
+if(expandedplayer)
 
     Column(
 
@@ -288,12 +288,20 @@ if(expandedlyrics && !showlyricsthumbnail)
                 artist = artist,
                 artistIds = artistIds,
             )
+        Spacer(
+            modifier = Modifier
+                .height(10.dp)
+        )
         GetSeekBar(
             position = position,
             duration = duration,
             media = media,
             mediaId = mediaId
         )
+        Spacer(
+            modifier = Modifier
+                .height(10.dp)
+        )
         GetControls(
             binder = binder,
             position = position,

diff --git a/app/src/main/kotlin/it/fast4x/rimusic/ui/screens/player/Lyrics.kt b/app/src/main/kotlin/it/fast4x/rimusic/ui/screens/player/Lyrics.kt
@@ -948,6 +948,7 @@ fun Lyrics(
                     .align(Alignment.BottomStart)
                     .fillMaxWidth(if (trailingContent == null) 0.30f else 0.22f)
             ) {
+                if (showlyricsthumbnail)
                 IconButton(
                     icon = R.drawable.minmax,
                     color = DefaultDarkColorPalette.text,

diff --git a/app/src/main/kotlin/it/fast4x/rimusic/ui/screens/player/Player.kt b/app/src/main/kotlin/it/fast4x/rimusic/ui/screens/player/Player.kt
@@ -151,6 +151,8 @@ import it.fast4x.rimusic.utils.disablePlayerHorizontalSwipeKey
 import it.fast4x.rimusic.utils.downloadedStateMedia
 import it.fast4x.rimusic.utils.durationTextToMillis
 import it.fast4x.rimusic.utils.effectRotationKey
+import it.fast4x.rimusic.utils.expandedplayerKey
+import it.fast4x.rimusic.utils.expandedplayertoggleKey
 import it.fast4x.rimusic.utils.forceSeekToNext
 import it.fast4x.rimusic.utils.formatAsDuration
 import it.fast4x.rimusic.utils.formatAsTime
@@ -424,6 +426,7 @@ fun Player(
 
 
     var trackLoopEnabled by rememberPreference(trackLoopEnabledKey, defaultValue = false)
+    var expandedplayer by rememberPreference(expandedplayerKey, false)
 
 
     var likedAt by rememberSaveable {
@@ -449,6 +452,7 @@ fun Player(
     val showButtonPlayerDownload by rememberPreference(showButtonPlayerDownloadKey, true)
     val showButtonPlayerLoop by rememberPreference(showButtonPlayerLoopKey, true)
     val showButtonPlayerLyrics by rememberPreference(showButtonPlayerLyricsKey, true)
+    val expandedplayertoggle by rememberPreference(expandedplayertoggleKey, true)
     val showButtonPlayerShuffle by rememberPreference(showButtonPlayerShuffleKey, true)
     val showButtonPlayerSleepTimer by rememberPreference(showButtonPlayerSleepTimerKey, false)
     val showButtonPlayerMenu by rememberPreference(showButtonPlayerMenuKey, false)
@@ -1634,6 +1638,18 @@ fun Player(
                                     .size(24.dp),
                             )
 
+                        if (expandedplayertoggle)
+                            IconButton(
+                                icon = R.drawable.minmax,
+                                color = if (expandedplayer) colorPalette.text else colorPalette.textDisabled,
+                                enabled = true,
+                                onClick = {
+                                    expandedplayer = !expandedplayer
+                                },
+                                modifier = Modifier
+                                    .size(20.dp),
+                            )
+
 
                         if (playerVisualizerType != PlayerVisualizerType.Disabled)
                             IconButton(

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
@@ -196,6 +196,8 @@ import androidx.compose.ui.graphics.StrokeJoin
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.text.TextStyle
 import it.fast4x.rimusic.utils.actionspacedevenlyKey
+import it.fast4x.rimusic.utils.expandedplayerKey
+import it.fast4x.rimusic.utils.expandedplayertoggleKey
 //import it.fast4x.rimusic.utils.blurStrength2Key
 import it.fast4x.rimusic.utils.showthumbnailKey
 import it.fast4x.rimusic.utils.showlyricsthumbnailKey
@@ -460,6 +462,7 @@ fun PlayerModern(
 
 
     var trackLoopEnabled by rememberPreference(trackLoopEnabledKey, defaultValue = false)
+    var expandedplayer by rememberPreference(expandedplayerKey, false)
 
 
     var likedAt by rememberSaveable {
@@ -486,6 +489,7 @@ fun PlayerModern(
     val showButtonPlayerDownload by rememberPreference(showButtonPlayerDownloadKey, true)
     val showButtonPlayerLoop by rememberPreference(showButtonPlayerLoopKey, true)
     val showButtonPlayerLyrics by rememberPreference(showButtonPlayerLyricsKey, true)
+    val expandedplayertoggle by rememberPreference(expandedplayertoggleKey, true)
     val showButtonPlayerShuffle by rememberPreference(showButtonPlayerShuffleKey, true)
     val showButtonPlayerSleepTimer by rememberPreference(showButtonPlayerSleepTimerKey, false)
     val showButtonPlayerMenu by rememberPreference(showButtonPlayerMenuKey, false)
@@ -1318,6 +1322,18 @@ fun PlayerModern(
                                     .size(24.dp),
                             )
 
+                        if (expandedplayertoggle)
+                            IconButton(
+                                icon = R.drawable.minmax,
+                                color = if (expandedplayer) colorPalette.text else colorPalette.textDisabled,
+                                enabled = true,
+                                onClick = {
+                                    expandedplayer = !expandedplayer
+                                },
+                                modifier = Modifier
+                                    .size(20.dp),
+                            )
+
 
                         if (playerVisualizerType != PlayerVisualizerType.Disabled)
                             IconButton(

diff --git a/app/src/main/kotlin/it/fast4x/rimusic/ui/screens/settings/AppearanceSettings.kt b/app/src/main/kotlin/it/fast4x/rimusic/ui/screens/settings/AppearanceSettings.kt
@@ -72,7 +72,7 @@ import it.fast4x.rimusic.utils.disableScrollingTextKey
 import it.fast4x.rimusic.utils.effectRotationKey
 import it.fast4x.rimusic.utils.iconLikeTypeKey
 import it.fast4x.rimusic.utils.actionspacedevenlyKey
-import it.fast4x.rimusic.utils.expandedlyricsKey
+import it.fast4x.rimusic.utils.expandedplayertoggleKey
 import it.fast4x.rimusic.utils.isAtLeastAndroid13
 import it.fast4x.rimusic.utils.isShowingThumbnailInLockscreenKey
 import it.fast4x.rimusic.utils.lastPlayerPlayButtonTypeKey
@@ -173,6 +173,7 @@ fun AppearanceSettings() {
     var showButtonPlayerDownload by rememberPreference(showButtonPlayerDownloadKey, true)
     var showButtonPlayerLoop by rememberPreference(showButtonPlayerLoopKey, true)
     var showButtonPlayerLyrics by rememberPreference(showButtonPlayerLyricsKey, true)
+    var expandedplayertoggle by rememberPreference(expandedplayertoggleKey,true)
     var showButtonPlayerShuffle by rememberPreference(showButtonPlayerShuffleKey, true)
     var showButtonPlayerSleepTimer by rememberPreference(showButtonPlayerSleepTimerKey, false)
     var showButtonPlayerMenu by rememberPreference(showButtonPlayerMenuKey, false)
@@ -236,7 +237,6 @@ fun AppearanceSettings() {
         true
     )
     var actionspacedevenly by rememberPreference(actionspacedevenlyKey, false)
-    var expandedlyrics by rememberPreference(expandedlyricsKey, false)
 
     Column(
         modifier = Modifier
@@ -427,17 +427,6 @@ fun AppearanceSettings() {
                 )
 
 
-       if (filter.isNullOrBlank() || stringResource(R.string.expandedlyrics).contains(
-                filterCharSequence,
-                true
-                )
-           )
-            SwitchSettingEntry(
-                title = stringResource(R.string.expandedlyrics),
-                text = stringResource(R.string.expandedlyricsinfo),
-                isChecked = expandedlyrics,
-                onCheckedChange = { expandedlyrics = it }
-            )
         if(showthumbnail)
             if (filter.isNullOrBlank() || stringResource(R.string.player_thumbnail_size).contains(
                     filterCharSequence,
@@ -962,6 +951,18 @@ fun AppearanceSettings() {
                 onCheckedChange = { showButtonPlayerLyrics = it }
             )
 
+        if (filter.isNullOrBlank() || stringResource(R.string.expandedplayer).contains(
+                filterCharSequence,
+                true
+            )
+        )
+            SwitchSettingEntry(
+                title = stringResource(R.string.expandedplayer),
+                text = "",
+                isChecked = expandedplayertoggle,
+                onCheckedChange = { expandedplayertoggle = it }
+            )
+
         if (filter.isNullOrBlank() || stringResource(R.string.action_bar_show_sleep_timer_button).contains(
                 filterCharSequence,
                 true

diff --git a/app/src/main/kotlin/it/fast4x/rimusic/utils/Preferences.kt b/app/src/main/kotlin/it/fast4x/rimusic/utils/Preferences.kt
@@ -196,7 +196,8 @@ const val lyricsColorKey = "lyricsColor"
 const val transparentbarKey = "transparentbar"
 const val isShowingLyricsKey = "isShowingLyrics"
 const val actionspacedevenlyKey = "actionspacedevenly"
-const val expandedlyricsKey = "expandedlyrics"
+const val expandedplayerKey = "expandedplayer"
+const val expandedplayertoggleKey = "expandedplayertoggle"
 /**** CUSTOM THEME **** */
 
 const val parentalControlEnabledKey = "parentalControlEnabled"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -603,8 +603,7 @@
     <string name="transparentbar">Transparent Timeline Bar</string>
     <string name="timelinesize">Player Timeline Size</string>
     <string name="actionspacedevenly">Spaced Evenly</string>
-    <string name="expandedlyrics">Expanded view of lyrics</string>
-    <string name="expandedlyricsinfo">Works only when lyrics thumbnail is disabled</string>
+    <string name="expandedplayer">Expanded Player</string>
 
 
 </resources>