Fixed thumbnail size in player #3368 and enable stat for nerd in vimu…

…sic mode
fast4x · Aug 24, 2024 · 62da49b · 62da49b
1 parent f311a75
commit 62da49b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 49 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
@@ -1181,6 +1181,13 @@ fun PlayerModern(
 
                     )
                 }
+                .padding(
+                    vertical = playerThumbnailSize.size.dp,
+                    horizontal = playerThumbnailSize.size.dp
+                )
+                .thumbnailpause(
+                    shouldBePlaying = shouldBePlaying
+                )
 
         )
     }
@@ -1946,21 +1953,7 @@ fun PlayerModern(
                             //.padding(vertical = 10.dp)
                         ) {
                             if ((!isShowingLyrics && !isShowingVisualizer) || (isShowingVisualizer && showvisthumbnail) || (isShowingLyrics && showlyricsthumbnail))
-                                thumbnailContent(
-                                    /*
-                                    KOTLIN 2
-                                    modifier = Modifier
-                                        .padding(
-                                            vertical = playerThumbnailSize.size.dp,
-                                            horizontal = playerThumbnailSize.size.dp
-                                        )
-                                        .thumbnailpause(
-                                            shouldBePlaying = shouldBePlaying
-                                        )
-                                    //.padding(horizontal = 10.dp)
-
-                                     */
-                                )
+                                thumbnailContent()
                         }
                     }
                     if (isShowingVisualizer && !showvisthumbnail && playerType == PlayerType.Essential) {
@@ -2219,15 +2212,7 @@ fun PlayerModern(
                              */
                         )
                     } else {
-                         //KOTLIN 2
-                        /*
-                        key(pagerState.currentPage) {
-                            val index = if (pagerState.currentPage > mediaItems.size - 1) 0 else
-                                pagerState.currentPage
 
-                            if (index >= 0 && mediaItems.size > 0)
-
-                         */
                                 Controls(
                                     navController = navController,
                                     onCollapse = onDismiss,
@@ -2252,7 +2237,6 @@ fun PlayerModern(
                                         .padding(vertical = 8.dp),
                                     onBlurScaleChange = { blurStrength = it }
                                 )
-                        //}
 
                     }
                     if (!showthumbnail) {
@@ -2262,9 +2246,7 @@ fun PlayerModern(
                             onDismiss = {}
                         )
                     }
-                    actionsBarContent(
-                        //modifier = Modifier
-                    )
+                    actionsBarContent()
                 }
             }
          }
@@ -2738,16 +2720,6 @@ fun PlayerModern(
                              */
                         )
                     } else {
-                         //KOTLIN 2
-                        /*
-                        key(pagerState.currentPage) {
-
-                            val index = if (pagerState.currentPage > mediaItems.size - 1) 0 else
-                                pagerState.currentPage
-
-                            if (index >= 0 && mediaItems.size > 0)
-
-                         */
                                 Controls(
                                     navController = navController,
                                     onCollapse = onDismiss,
@@ -2774,7 +2746,6 @@ fun PlayerModern(
                                             //.weight(1f),
                                         onBlurScaleChange = { blurStrength = it }
                                 )
-                        //}
 
                     }
                 }

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
@@ -679,18 +679,20 @@ fun AppearanceSettings() {
                     onCheckedChange = { noblur = it }
                 )
 
-            if (filter.isNullOrBlank() || stringResource(R.string.statsfornerdsplayer).contains(
-                    filterCharSequence,
-                    true
-                )
-            )
-                SwitchSettingEntry(
-                    title = stringResource(R.string.statsfornerdsplayer),
-                    text = "",
-                    isChecked = statsfornerds,
-                    onCheckedChange = { statsfornerds = it }
-                )
+
         }
+        if (filter.isNullOrBlank() || stringResource(R.string.statsfornerdsplayer).contains(
+                filterCharSequence,
+                true
+            )
+        )
+            SwitchSettingEntry(
+                title = stringResource(R.string.statsfornerdsplayer),
+                text = "",
+                isChecked = statsfornerds,
+                onCheckedChange = { statsfornerds = it }
+            )
+
         if (!showlyricsthumbnail && !isLandscape)
             if (filter.isNullOrBlank() || stringResource(R.string.expandedlyrics).contains(
                     filterCharSequence,