Fixed navigation bar

maxrave-dev · Jul 27, 2024 · 60b392d · 60b392d
1 parent 087756a
commit 60b392d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/app/src/main/java/com/maxrave/simpmusic/ui/MainActivity.kt b/app/src/main/java/com/maxrave/simpmusic/ui/MainActivity.kt
@@ -594,6 +594,7 @@ class MainActivity : AppCompatActivity() {
                                 binding.bottomNavigationView.animation = AnimationUtils.loadAnimation(this@MainActivity, R.anim.btt)
                                 binding.miniplayer.animation = AnimationUtils.loadAnimation(this@MainActivity, R.anim.btt)
                                 binding.miniplayer.visibility = View.VISIBLE
+                                binding.bottomNavigationView.visibility = View.VISIBLE
                             }
                         } else if (binding.bottomNavigationView.visibility != View.GONE &&
                             binding.miniplayer.visibility != View.GONE && !it ) {

diff --git a/app/src/main/java/com/maxrave/simpmusic/ui/screen/player/NowPlayingScreen.kt b/app/src/main/java/com/maxrave/simpmusic/ui/screen/player/NowPlayingScreen.kt
@@ -124,6 +124,7 @@ import com.maxrave.simpmusic.ui.component.LyricsView
 import com.maxrave.simpmusic.ui.component.MediaPlayerView
 import com.maxrave.simpmusic.ui.component.NowPlayingBottomSheet
 import com.maxrave.simpmusic.ui.theme.AppTheme
+import com.maxrave.simpmusic.ui.theme.blackMoreOverlay
 import com.maxrave.simpmusic.ui.theme.md_theme_dark_background
 import com.maxrave.simpmusic.ui.theme.overlay
 import com.maxrave.simpmusic.ui.theme.seed
@@ -656,8 +657,8 @@ fun NowPlayingScreen(
                                                         .background(
                                                             Brush.verticalGradient(
                                                                 colorStops = arrayOf(
-                                                                    0.03f to Color.DarkGray,
-                                                                    0.3f to overlay,
+                                                                    0.03f to blackMoreOverlay,
+                                                                    0.15f to overlay,
                                                                     0.8f to Color.Transparent,
                                                                 )
                                                             )

diff --git a/app/src/main/java/com/maxrave/simpmusic/ui/theme/Color.kt b/app/src/main/java/com/maxrave/simpmusic/ui/theme/Color.kt
@@ -40,5 +40,6 @@ val shimmerLine = Color(0xFF4D4848)
 
 val test = Color(0x00FFFFFF)
 val overlay = Color(0x32242424)
+val blackMoreOverlay = Color(0x8f242424)
 
 val seed = Color(0xFF8ECAE6)
diff --git a/app/src/main/java/com/maxrave/simpmusic/viewModel/SharedViewModel.kt b/app/src/main/java/com/maxrave/simpmusic/viewModel/SharedViewModel.kt
@@ -328,10 +328,11 @@ constructor(
                             }
 
                             is SimpleMediaState.Progress -> {
-                                if (mediaState.progress >= 0L) {
+                                if (mediaState.progress >= 0L && mediaState.progress != _timeline.value.current) {
                                     _timeline.update {
                                         it.copy(
-                                            current = mediaState.progress
+                                            current = mediaState.progress,
+                                            loading = false
                                         )
                                     }
                                 }