Skip to content
Snippets Groups Projects
Commit a61d3c76 authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Use time for the default bookmark naming

Fixes #2242
parent 8f250981
No related branches found
No related tags found
No related merge requests found
......@@ -849,6 +849,7 @@
<string name="add_to_existing_playlist">Add to existing playlist</string>
<string name="bookmarks_title">Bookmarks</string>
<string name="no_bookmark">No bookmark yet</string>
<string name="bookmark_default_name">Bookmark at %s</string>
<string name="bookmark_name">Bookmark %s</string>
<string name="add_bookmark">Add bookmark</string>
<string name="optional_features">Optional features</string>
......
......@@ -12,6 +12,7 @@ import android.view.KeyEvent
import androidx.core.net.toUri
import androidx.lifecycle.lifecycleScope
import kotlinx.coroutines.*
import org.videolan.medialibrary.Tools
import org.videolan.medialibrary.interfaces.Medialibrary
import org.videolan.medialibrary.interfaces.media.MediaWrapper
import org.videolan.medialibrary.media.MediaLibraryItem
......@@ -119,7 +120,7 @@ internal class MediaSessionCallback(private val playbackService: PlaybackService
val context = playbackService.applicationContext
playbackService.currentMediaWrapper?.let {
val bookmark = it.addBookmark(playbackService.getTime())
val bookmarkName = context.getString(R.string.bookmark_name, it.bookmarks.size.toString())
val bookmarkName = context.getString(R.string.bookmark_default_name, Tools.millisToString(playbackService.getTime()))
bookmark?.setName(bookmarkName)
playbackService.displayPlaybackMessage(R.string.saved, bookmarkName)
}
......
......@@ -34,6 +34,7 @@ import kotlinx.coroutines.flow.onCompletion
import kotlinx.coroutines.flow.onEach
import org.videolan.libvlc.MediaPlayer
import org.videolan.libvlc.interfaces.IMedia
import org.videolan.medialibrary.Tools
import org.videolan.medialibrary.interfaces.media.Bookmark
import org.videolan.tools.livedata.LiveDataset
import org.videolan.vlc.BuildConfig
......@@ -114,7 +115,7 @@ class BookmarkModel : ViewModel(), PlaybackService.Callback {
viewModelScope.launch {
withContext(Dispatchers.IO) {
val bookmark = it.addBookmark(service!!.getTime())
bookmark?.setName(context.getString(R.string.bookmark_name, it.bookmarks.size.toString()))
bookmark?.setName(context.getString(R.string.bookmark_default_name, Tools.millisToString(service!!.getTime())))
}
refresh()
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment