Minor fixes

Signed-off-by: enricocid <enrico2588@gmail.com>
enricocid · Aug 18, 2021 · e5e1e6e · e5e1e6e
1 parent 7388eea
commit e5e1e6e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
   <!-- Latest Release -->
     <a href="https://github.com/enricocid/Music-Player-GO/releases">
       <img alt="GitHub release"
-      src="https://img.shields.io/static/v1?label=Tag&message=v4.4.3&color=58F5D1">
+      src="https://img.shields.io/static/v1?label=Tag&message=v4.4.4&color=58F5D1">
     </a>
    <!-- Minimum SDK -->
     <img alt="Minimum SDK" src="https://img.shields.io/static/v1?label=API&message=21&color=32B5ED">

diff --git a/fastlane/metadata/android/en-US/changelogs/166.txt b/fastlane/metadata/android/en-US/changelogs/166.txt
@@ -0,0 +1 @@
+Minor fixes
diff --git a/fastlane/metadata/android/it/changelogs/166.txt b/fastlane/metadata/android/it/changelogs/166.txt
@@ -0,0 +1 @@
+Piccole correzioni
diff --git a/project/app/build.gradle b/project/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.iven.musicplayergo"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 165
-        versionName "4.4.3"
+        versionCode 166
+        versionName "4.4.4"
 
         vectorDrawables.useSupportLibrary true
     }

diff --git a/project/app/src/main/java/com/iven/musicplayergo/ui/MainActivity.kt b/project/app/src/main/java/com/iven/musicplayergo/ui/MainActivity.kt
@@ -708,10 +708,10 @@ class MainActivity : AppCompatActivity(), UIControlInterface, MediaControlInterf
                 setupNPCoverLayout()
 
                 mNpBinding.npPlayingSongContainer.setOnClickListener {
-                    mNpDialog.dismiss()
                     mNpDialog.onDismiss {
                         openPlayingArtistAlbum()
                     }
+                    mNpDialog.dismiss()
                 }
 
                 mNpControlsBinding.npSkipPrev.setOnClickListener { skip(false) }
@@ -1267,7 +1267,6 @@ class MainActivity : AppCompatActivity(), UIControlInterface, MediaControlInterf
                 synchronized(mMediaPlayerHolder.onOpenEqualizerCustom()) {
                     if (!sEqFragmentExpanded) {
                         mEqualizerFragment = EqFragment.newInstance()
-                        mNpDialog.dismiss()
                         mNpDialog.onDismiss {
                             sCloseDetailsFragment = !sDetailsFragmentExpanded
                             if (sAllowCommit) {
@@ -1277,6 +1276,7 @@ class MainActivity : AppCompatActivity(), UIControlInterface, MediaControlInterf
                                 )
                             }
                         }
+                        mNpDialog.dismiss()
                     }
                 }
             } else {
@@ -1340,14 +1340,14 @@ class MainActivity : AppCompatActivity(), UIControlInterface, MediaControlInterf
 
             mMediaPlayerHolder.run {
 
-                if (isQueue == null) {
-                    setQueueEnabled(true)
-                }
-
                 if (clearQueue) {
                     queueSongs.clear()
                 }
 
+                if (isQueue == null) {
+                    setQueueEnabled(true)
+                }
+
                 isSingleSong?.let { song ->
                     if (!queueSongs.contains(song)) {
                         addFilteredSongsToQueue(null, song)
@@ -1370,14 +1370,13 @@ class MainActivity : AppCompatActivity(), UIControlInterface, MediaControlInterf
                     startSongFromQueue(song, launchedBy)
 
                     if (::mFavoritesDialog.isInitialized && mFavoritesDialog.isShowing) {
-                        mFavoritesDialog.dismiss()
                         mFavoritesDialog.onDismiss {
                             openQueueDialog()
                         }
-                        return
+                        mFavoritesDialog.dismiss()
+                    } else {
+                        openQueueDialog()
                     }
-
-                    openQueueDialog()
                 }
             }
         }