[Android] Fix the bookmark navigation buttons visibility
Nicolas Pomepuy
git at videolan.org
Fri Feb 28 12:32:39 UTC 2025
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Fri Feb 28 11:49:30 2025 +0100| [6c180c8c232068cfe0c438b4b550e63ec49cae02] | committer: Duncan McNamara
Fix the bookmark navigation buttons visibility
> https://code.videolan.org/videolan/vlc-android/commit/6c180c8c232068cfe0c438b4b550e63ec49cae02
---
.../src/org/videolan/vlc/gui/audio/AudioPlayer.kt | 49 ++++++++++++++++------
1 file changed, 37 insertions(+), 12 deletions(-)
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt b/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt
index 7210e084a4..12046f8133 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt
@@ -55,17 +55,39 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
import androidx.window.layout.FoldingFeature
import androidx.window.layout.WindowInfoTracker
import com.google.android.material.bottomsheet.BottomSheetBehavior
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Runnable
+import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
import org.videolan.libvlc.MediaPlayer
import org.videolan.medialibrary.Tools
import org.videolan.medialibrary.interfaces.media.Bookmark
import org.videolan.medialibrary.interfaces.media.MediaWrapper
import org.videolan.medialibrary.media.MediaLibraryItem
-import org.videolan.resources.*
+import org.videolan.resources.AppContextProvider
+import org.videolan.resources.TAG_ITEM
import org.videolan.resources.util.parcelable
-import org.videolan.tools.*
+import org.videolan.tools.AUDIO_HINGE_ON_RIGHT
+import org.videolan.tools.AUDIO_PLAY_PROGRESS_MODE
+import org.videolan.tools.KEY_AUDIO_SHOW_BOOKMARK_MARKERS
+import org.videolan.tools.KEY_AUDIO_SHOW_BOOkMARK_BUTTONS
+import org.videolan.tools.KEY_PLAYBACK_SPEED_AUDIO_GLOBAL
+import org.videolan.tools.KEY_SHOW_TRACK_INFO
+import org.videolan.tools.PREF_PLAYLIST_TIPS_SHOWN
+import org.videolan.tools.PREF_RESTORE_VIDEO_TIPS_SHOWN
+import org.videolan.tools.RESTORE_BACKGROUND_VIDEO
+import org.videolan.tools.SHOW_REMAINING_TIME
+import org.videolan.tools.Settings
+import org.videolan.tools.copy
+import org.videolan.tools.dp
+import org.videolan.tools.formatRateString
+import org.videolan.tools.putSingle
+import org.videolan.tools.setGone
+import org.videolan.tools.setVisible
import org.videolan.vlc.PlaybackService
import org.videolan.vlc.R
import org.videolan.vlc.databinding.AudioPlayerBinding
@@ -79,8 +101,12 @@ import org.videolan.vlc.gui.dialogs.RENAME_DIALOG_MEDIA
import org.videolan.vlc.gui.dialogs.RENAME_DIALOG_NEW_NAME
import org.videolan.vlc.gui.dialogs.SleepTimerDialog
import org.videolan.vlc.gui.dialogs.showContext
-import org.videolan.vlc.gui.helpers.*
import org.videolan.vlc.gui.helpers.AudioUtil.setRingtone
+import org.videolan.vlc.gui.helpers.BookmarkListDelegate
+import org.videolan.vlc.gui.helpers.PlayerOptionsDelegate
+import org.videolan.vlc.gui.helpers.SwipeDragItemTouchHelperCallback
+import org.videolan.vlc.gui.helpers.TalkbackUtil
+import org.videolan.vlc.gui.helpers.UiTools
import org.videolan.vlc.gui.helpers.UiTools.addToPlaylist
import org.videolan.vlc.gui.helpers.UiTools.isTablet
import org.videolan.vlc.gui.helpers.UiTools.showPinIfNeeded
@@ -91,7 +117,13 @@ import org.videolan.vlc.manageAbRepeatStep
import org.videolan.vlc.media.PlaylistManager
import org.videolan.vlc.media.PlaylistManager.Companion.hasMedia
import org.videolan.vlc.util.ContextOption
-import org.videolan.vlc.util.ContextOption.*
+import org.videolan.vlc.util.ContextOption.CTX_ADD_TO_PLAYLIST
+import org.videolan.vlc.util.ContextOption.CTX_GO_TO_FOLDER
+import org.videolan.vlc.util.ContextOption.CTX_INFORMATION
+import org.videolan.vlc.util.ContextOption.CTX_REMOVE_FROM_PLAYLIST
+import org.videolan.vlc.util.ContextOption.CTX_SET_RINGTONE
+import org.videolan.vlc.util.ContextOption.CTX_SHARE
+import org.videolan.vlc.util.ContextOption.CTX_STOP_AFTER_THIS
import org.videolan.vlc.util.FlagSet
import org.videolan.vlc.util.TextUtils
import org.videolan.vlc.util.launchWhenStarted
@@ -459,13 +491,6 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, IAudioPlay
binding.audioRewind10.contentDescription = getString(R.string.talkback_action_rewind, Settings.audioJumpDelay.toString())
updateBackground()
- if (isShowingCover()) {
- val seekButtonVisibility = if (::bookmarkListDelegate.isInitialized && bookmarkListDelegate.visible) View.GONE else View.VISIBLE
- binding.audioRewindBookmark.visibility = seekButtonVisibility
- binding.audioForwardBookmark.visibility = seekButtonVisibility
- binding.audioRewind10.visibility = seekButtonVisibility
- binding.audioForward10.visibility = seekButtonVisibility
- }
}
private var wasPlaying = true
More information about the Android
mailing list