Attempt to fix #447, #439 string issues

Signed-off-by: enricocid <[email protected]>
enricocid · Aug 2, 2022 · 9355032 · 9355032
1 parent ba83113
commit 9355032
Show file tree

Hide file tree

Showing 55 changed files with 135 additions and 164 deletions.
diff --git a/project/app/src/main/java/com/iven/musicplayergo/dialogs/NowPlaying.kt b/project/app/src/main/java/com/iven/musicplayergo/dialogs/NowPlaying.kt
@@ -5,10 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageButton
-import android.widget.LinearLayout
-import android.widget.SeekBar
-import android.widget.TextView
+import android.widget.*
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.iven.musicplayergo.GoConstants
 import com.iven.musicplayergo.GoPreferences
@@ -96,7 +93,8 @@ class NowPlaying: BottomSheetDialogFragment() {
                     dismiss()
                 }
                 setOnLongClickListener {
-                    R.string.open_details_fragment.toToast(requireContext())
+                    Toast.makeText(requireContext(), getString(R.string.open_details_fragment), Toast.LENGTH_SHORT)
+                        .show()
                     return@setOnLongClickListener false
                 }
             }
@@ -180,14 +178,21 @@ class NowPlaying: BottomSheetDialogFragment() {
                     isChecked = GoPreferences.getPrefsInstance().continueOnEnd
                     setOnCheckedChangeListener { _, isChecked ->
                         GoPreferences.getPrefsInstance().continueOnEnd = isChecked
-                        getString(if (isChecked) {
-                            R.string.pause_on_end_disabled
-                        } else {
-                            R.string.pause_on_end
-                        }).toToast(requireContext())
+                        Toast.makeText(
+                            requireContext(),
+                            getString(
+                                if (isChecked) {
+                                    R.string.pause_on_end_disabled
+                                } else {
+                                    R.string.pause_on_end
+                                }
+                            ),
+                            Toast.LENGTH_SHORT
+                        ).show()
                     }
                     setOnLongClickListener { switch ->
-                        switch.contentDescription.toString().toToast(requireContext())
+                        Toast.makeText(requireContext(), switch.contentDescription, Toast.LENGTH_SHORT)
+                            .show()
                         return@setOnLongClickListener true
                     }
                 }
@@ -199,7 +204,8 @@ class NowPlaying: BottomSheetDialogFragment() {
         val iterator = imageButtons.iterator()
         while (iterator.hasNext()) {
             iterator.next().setOnLongClickListener { btn ->
-                btn.contentDescription.toString().toToast(requireContext())
+                Toast.makeText(requireContext(), btn.contentDescription, Toast.LENGTH_SHORT)
+                    .show()
                 return@setOnLongClickListener true
             }
         }
@@ -376,7 +382,11 @@ class NowPlaying: BottomSheetDialogFragment() {
                     loadNpCover(song)
                 }
                 // load album/song info
-                _nowPlayingBinding?.npSong?.text = song.title
+                _nowPlayingBinding?.npSong?.text = if (GoPreferences.getPrefsInstance().songsVisualization == GoConstants.FN) {
+                    song.displayName.toFilenameWithoutExtension()
+                } else {
+                    song.title
+                }
                 _nowPlayingBinding?.npArtistAlbum?.text =
                     getString(
                         R.string.artist_and_album,

diff --git a/project/app/src/main/java/com/iven/musicplayergo/dialogs/RecyclerSheet.kt b/project/app/src/main/java/com/iven/musicplayergo/dialogs/RecyclerSheet.kt
@@ -46,7 +46,7 @@ class RecyclerSheet: BottomSheetDialogFragment() {
     var onQueueCancelled: (() -> Unit)? = null
     var onFavoritesDialogCancelled: (() -> Unit)? = null
     var onSleepTimerDialogCancelled: (() -> Unit)? = null
-    var onSleepTimerEnabled: ((Boolean) -> Unit)? = null
+    var onSleepTimerEnabled: ((Boolean, String) -> Unit)? = null
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
@@ -242,8 +242,8 @@ class RecyclerSheet: BottomSheetDialogFragment() {
                     }
                     btnPositive.setOnClickListener {
                         mMediaControlInterface.onGetMediaPlayerHolder()?.run {
-                            val isEnabled = pauseBySleepTimer(sleepTimerAdapter.getSelectedSleepTimerValue(), sleepTimerAdapter.getSelectedSleepTimer())
-                            onSleepTimerEnabled?.invoke(isEnabled)
+                            val isEnabled = pauseBySleepTimer(sleepTimerAdapter.getSelectedSleepTimerValue())
+                            onSleepTimerEnabled?.invoke(isEnabled, sleepTimerAdapter.getSelectedSleepTimer())
                         }
                         dismiss()
                     }
@@ -264,7 +264,7 @@ class RecyclerSheet: BottomSheetDialogFragment() {
                         contentDescription = getString(R.string.sleeptimer_cancel_desc)
                         setOnClickListener {
                             mMediaControlInterface.onGetMediaPlayerHolder()?.cancelSleepTimer()
-                            onSleepTimerEnabled?.invoke(false)
+                            onSleepTimerEnabled?.invoke(false, "")
                             dismiss()
                         }
                     }

diff --git a/project/app/src/main/java/com/iven/musicplayergo/extensions/ViewExts.kt b/project/app/src/main/java/com/iven/musicplayergo/extensions/ViewExts.kt
@@ -5,7 +5,6 @@ import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Dialog
-import android.content.Context
 import android.content.res.ColorStateList
 import android.content.res.Resources
 import android.graphics.Bitmap
@@ -19,7 +18,6 @@ import android.view.*
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
-import android.widget.Toast
 import androidx.appcompat.view.menu.MenuBuilder
 import androidx.appcompat.widget.Toolbar
 import androidx.core.animation.doOnEnd
@@ -239,14 +237,6 @@ fun View.handleViewVisibility(show: Boolean) {
     }
 }
 
-fun String.toToast(context: Context) {
-    Toast.makeText(context, this, Toast.LENGTH_SHORT).show()
-}
-
-fun Int.toToast(context: Context) {
-    Toast.makeText(context, this, Toast.LENGTH_SHORT).show()
-}
-
 fun View.safeClickListener(safeClickListener: (view: View) -> Unit) {
     this.setOnClickListener {
         if (!SingleClickHelper.isBlockingClick()) {

diff --git a/project/app/src/main/java/com/iven/musicplayergo/fragments/EqFragment.kt b/project/app/src/main/java/com/iven/musicplayergo/fragments/EqFragment.kt
@@ -11,6 +11,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.shape.CornerFamily
@@ -23,7 +24,6 @@ import com.iven.musicplayergo.R
 import com.iven.musicplayergo.databinding.FragmentEqualizerBinding
 import com.iven.musicplayergo.extensions.afterMeasured
 import com.iven.musicplayergo.extensions.createCircularReveal
-import com.iven.musicplayergo.extensions.toToast
 import com.iven.musicplayergo.ui.MediaControlInterface
 import com.iven.musicplayergo.ui.UIControlInterface
 import com.iven.musicplayergo.utils.Theming
@@ -263,7 +263,8 @@ class EqFragment : Fragment() {
 
         } catch (e: UnsupportedOperationException) {
             e.printStackTrace()
-            R.string.error_eq.toToast(requireContext())
+            Toast.makeText(requireContext(), getString(R.string.error_eq), Toast.LENGTH_SHORT)
+                .show()
         }
     }
 

diff --git a/project/app/src/main/java/com/iven/musicplayergo/player/EqualizerUtils.kt b/project/app/src/main/java/com/iven/musicplayergo/player/EqualizerUtils.kt
@@ -6,9 +6,9 @@ import android.content.Context
 import android.content.Intent
 import android.media.MediaPlayer
 import android.media.audiofx.AudioEffect
+import android.widget.Toast
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.iven.musicplayergo.R
-import com.iven.musicplayergo.extensions.toToast
 
 
 object EqualizerUtils {
@@ -44,7 +44,11 @@ object EqualizerUtils {
     @JvmStatic
     fun openEqualizer(activity: Activity, mediaPlayer: MediaPlayer) {
         when (mediaPlayer.audioSessionId) {
-            AudioEffect.ERROR_BAD_VALUE -> R.string.error_bad_id.toToast(activity)
+            AudioEffect.ERROR_BAD_VALUE -> Toast.makeText(
+                activity,
+                activity.getString(R.string.error_bad_id),
+                Toast.LENGTH_SHORT
+            ).show()
             else -> {
                 try {
                     Intent(AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL).apply {

diff --git a/project/app/src/main/java/com/iven/musicplayergo/player/MediaPlayerHolder.kt b/project/app/src/main/java/com/iven/musicplayergo/player/MediaPlayerHolder.kt
@@ -38,7 +38,6 @@ import com.iven.musicplayergo.GoPreferences
 import com.iven.musicplayergo.R
 import com.iven.musicplayergo.extensions.toContentUri
 import com.iven.musicplayergo.extensions.toSavedMusic
-import com.iven.musicplayergo.extensions.toToast
 import com.iven.musicplayergo.extensions.waitForCover
 import com.iven.musicplayergo.models.Music
 import com.iven.musicplayergo.models.SavedEqualizerSettings
@@ -375,10 +374,9 @@ class MediaPlayerHolder:
                     if (GoPreferences.getPrefsInstance().onListEnded == GoConstants.CONTINUE) {
                         skip(isNext = true)
                     } else {
-                        synchronized(pauseMediaPlayer()) {
-                            mMusicNotificationManager.cancelNotification()
-                            R.string.error_list_ended.toToast(mPlayerService)
-                        }
+                        GoPreferences.getPrefsInstance().hasCompletedPlayback = true
+                        pauseMediaPlayer()
+                        mediaPlayerInterface.onListEnded()
                     }
                 } else {
                     skip(isNext = true)
@@ -482,7 +480,7 @@ class MediaPlayerHolder:
                 tryToGetAudioFocus()
             }
             val hasCompletedPlayback = GoPreferences.getPrefsInstance().hasCompletedPlayback
-            if (!continueOnEnd && isSongFromPrefs && hasCompletedPlayback || !continueOnEnd && hasCompletedPlayback) {
+            if (!continueOnEnd && isSongFromPrefs && hasCompletedPlayback || !continueOnEnd && hasCompletedPlayback || GoPreferences.getPrefsInstance().onListEnded != GoConstants.CONTINUE && hasCompletedPlayback) {
                 GoPreferences.getPrefsInstance().hasCompletedPlayback = false
                 skip(isNext = true)
             } else {
@@ -836,7 +834,7 @@ class MediaPlayerHolder:
         mSleepTimer?.cancel()
     }
 
-    fun pauseBySleepTimer(minutes: Long, label: String) : Boolean {
+    fun pauseBySleepTimer(minutes: Long) : Boolean {
         return if (isPlaying) {
             mSleepTimer = object : CountDownTimer(TimeUnit.MINUTES.toMillis(minutes), 1000) {
                 override fun onTick(p0: Long) {
@@ -852,10 +850,8 @@ class MediaPlayerHolder:
                     cancelSleepTimer()
                 }
             }.start()
-            mPlayerService.getString(R.string.sleeptimer_enabled, label).toToast(mPlayerService)
             true
         } else {
-            R.string.error_bad_id.toToast(mPlayerService)
             false
         }
     }
@@ -886,11 +882,10 @@ class MediaPlayerHolder:
             isLooping -> {
                 isLooping = false
                 toastMessage = R.string.repeat_disabled
-                toastMessage.toToast(mPlayerService)
             }
             else -> isRepeat1X = true
         }
-        toastMessage.toToast(mPlayerService)
+        mediaPlayerInterface.onRepeat(toastMessage)
     }
 
     fun repeat(updatePlaybackStatus: Boolean) {

diff --git a/project/app/src/main/java/com/iven/musicplayergo/player/MediaPlayerInterface.kt b/project/app/src/main/java/com/iven/musicplayergo/player/MediaPlayerInterface.kt
@@ -11,4 +11,6 @@ interface MediaPlayerInterface {
     fun onUpdateSleepTimerCountdown(value: Long)
     fun onStopSleepTimer()
     fun onUpdateFavorites()
+    fun onRepeat(toastMessage: Int)
+    fun onListEnded()
 }
diff --git a/project/app/src/main/java/com/iven/musicplayergo/player/MusicNotificationManager.kt b/project/app/src/main/java/com/iven/musicplayergo/player/MusicNotificationManager.kt
@@ -18,6 +18,7 @@ import androidx.media.app.NotificationCompat.MediaStyle
 import com.iven.musicplayergo.GoConstants
 import com.iven.musicplayergo.GoPreferences
 import com.iven.musicplayergo.R
+import com.iven.musicplayergo.extensions.toFilenameWithoutExtension
 import com.iven.musicplayergo.extensions.waitForCover
 import com.iven.musicplayergo.models.NotificationAction
 import com.iven.musicplayergo.ui.MainActivity
@@ -98,12 +99,6 @@ class MusicNotificationManager(private val playerService: PlayerService) {
         }
     }
 
-    fun cancelNotification() {
-        with(NotificationManagerCompat.from(playerService)) {
-            cancel(GoConstants.NOTIFICATION_ID)
-        }
-    }
-
     fun updateNotification() {
         if (::mNotificationBuilder.isInitialized) {
             mNotificationBuilder.setOngoing(playerService.mediaPlayerHolder.isPlaying)
@@ -143,7 +138,11 @@ class MusicNotificationManager(private val playerService: PlayerService) {
                 .setContentTitle(
                     playerService.getString(
                         R.string.song_title_notification,
-                        song.title
+                        if (GoPreferences.getPrefsInstance().songsVisualization == GoConstants.FN) {
+                            song.displayName.toFilenameWithoutExtension()
+                        } else {
+                            song.title
+                        }
                     ).parseAsHtml()
                 )
                 .setSubText(song.album)

diff --git a/project/app/src/main/java/com/iven/musicplayergo/player/PlayerService.kt b/project/app/src/main/java/com/iven/musicplayergo/player/PlayerService.kt
@@ -15,9 +15,7 @@ import android.view.KeyEvent
 import androidx.core.content.getSystemService
 import com.iven.musicplayergo.GoConstants
 import com.iven.musicplayergo.GoPreferences
-import com.iven.musicplayergo.R
 import com.iven.musicplayergo.extensions.toSavedMusic
-import com.iven.musicplayergo.extensions.toToast
 import com.iven.musicplayergo.utils.Lists
 import com.iven.musicplayergo.utils.Versioning
 
@@ -273,7 +271,6 @@ class PlayerService : Service() {
                 }
             }
         } catch (e: Exception) {
-            R.string.error_media_buttons.toToast(this)
             e.printStackTrace()
             return false
         }

diff --git a/project/app/src/main/java/com/iven/musicplayergo/preferences/AccentsAdapter.kt b/project/app/src/main/java/com/iven/musicplayergo/preferences/AccentsAdapter.kt
@@ -5,14 +5,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
+import android.widget.Toast
 import androidx.core.graphics.ColorUtils
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.card.MaterialCardView
 import com.iven.musicplayergo.GoPreferences
 import com.iven.musicplayergo.R
 import com.iven.musicplayergo.extensions.handleViewVisibility
 import com.iven.musicplayergo.extensions.toContrastColor
-import com.iven.musicplayergo.extensions.toToast
 import com.iven.musicplayergo.extensions.updateIconTint
 import com.iven.musicplayergo.utils.Theming
 
@@ -65,7 +65,8 @@ class AccentsAdapter(private val activity: Activity) :
                 }
 
                 setOnLongClickListener {
-                    accentFullName.toToast(activity)
+                    Toast.makeText(activity, accentFullName, Toast.LENGTH_SHORT)
+                        .show()
                     return@setOnLongClickListener true
                 }
             }

diff --git a/project/app/src/main/java/com/iven/musicplayergo/preferences/ActiveTabsAdapter.kt b/project/app/src/main/java/com/iven/musicplayergo/preferences/ActiveTabsAdapter.kt
@@ -10,7 +10,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.iven.musicplayergo.GoConstants
 import com.iven.musicplayergo.GoPreferences
 import com.iven.musicplayergo.R
-import com.iven.musicplayergo.extensions.toToast
 import com.iven.musicplayergo.extensions.updateIconTint
 import com.iven.musicplayergo.utils.Theming
 
@@ -88,7 +87,6 @@ class ActiveTabsAdapter(private val ctx: Context) :
                         mActiveItems.add(toggledItem)
                     }
                     if (mActiveItems.size < 2) {
-                        R.string.active_fragments_pref_warning.toToast(context)
                         mActiveItems.add(toggledItem)
                         manageTabStatus(selected = true, tabDragHandle, tabText, tabImageButton)
                     }

diff --git a/project/app/src/main/java/com/iven/musicplayergo/preferences/NotificationActionsAdapter.kt b/project/app/src/main/java/com/iven/musicplayergo/preferences/NotificationActionsAdapter.kt
@@ -5,12 +5,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
+import android.widget.Toast
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.radiobutton.MaterialRadioButton
 import com.iven.musicplayergo.GoConstants
 import com.iven.musicplayergo.GoPreferences
 import com.iven.musicplayergo.R
-import com.iven.musicplayergo.extensions.toToast
 import com.iven.musicplayergo.models.NotificationAction
 import com.iven.musicplayergo.player.MediaPlayerHolder
 import com.iven.musicplayergo.utils.Theming
@@ -69,7 +69,11 @@ class NotificationActionsAdapter(private val ctx: Context, private val mediaPlay
                 }
 
                 setOnLongClickListener {
-                    Theming.getNotificationActionTitle(mActions[absoluteAdapterPosition].first).toToast(ctx)
+                    Toast.makeText(
+                        ctx,
+                        Theming.getNotificationActionTitle(mActions[absoluteAdapterPosition].first),
+                        Toast.LENGTH_SHORT
+                    ).show()
                     return@setOnLongClickListener true
                 }
             }