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

Hide the all playlist mode settings and migrate to default actions

parent dc191de6
No related branches found
No related tags found
1 merge request!2168New default playback actions
Pipeline #580187 passed with stage
in 5 minutes and 20 seconds
......@@ -71,6 +71,8 @@ class PreferencesUi : BasePreferenceFragment(), SharedPreferences.OnSharedPrefer
super.onCreate(savedInstanceState)
prepareLocaleList()
setupTheme()
findPreference<Preference>("playlist_mode_video")?.isVisible = false
findPreference<Preference>("playlist_mode_audio")?.isVisible = false
}
override fun onCreatePreferences(bundle: Bundle?, s: String?) {
......
......@@ -36,8 +36,6 @@ import org.videolan.medialibrary.interfaces.Medialibrary
import org.videolan.medialibrary.interfaces.media.Playlist
import org.videolan.resources.AndroidDevices
import org.videolan.resources.util.getFromMl
import org.videolan.tools.PLAYLIST_MODE_AUDIO
import org.videolan.tools.PLAYLIST_MODE_VIDEO
import org.videolan.tools.KEY_APP_THEME
import org.videolan.tools.KEY_CURRENT_MAJOR_VERSION
import org.videolan.tools.KEY_CURRENT_SETTINGS_VERSION
......@@ -46,18 +44,22 @@ import org.videolan.tools.KEY_PLAYBACK_SPEED_AUDIO_GLOBAL_VALUE
import org.videolan.tools.KEY_PLAYBACK_SPEED_VIDEO_GLOBAL
import org.videolan.tools.KEY_PLAYBACK_SPEED_VIDEO_GLOBAL_VALUE
import org.videolan.tools.KEY_VIDEO_CONFIRM_RESUME
import org.videolan.tools.PLAYLIST_MODE_AUDIO
import org.videolan.tools.PLAYLIST_MODE_VIDEO
import org.videolan.tools.SCREENSHOT_MODE
import org.videolan.tools.Settings
import org.videolan.tools.VIDEO_HUD_TIMEOUT
import org.videolan.tools.coerceInOrDefault
import org.videolan.tools.putSingle
import org.videolan.tools.toInt
import org.videolan.vlc.gui.helpers.DefaultPlaybackAction
import org.videolan.vlc.gui.helpers.DefaultPlaybackActionMediaType
import org.videolan.vlc.gui.onboarding.ONBOARDING_DONE_KEY
import org.videolan.vlc.isVLC4
import java.io.File
import java.io.IOException
private const val CURRENT_VERSION = 14
private const val CURRENT_VERSION = 15
object VersionMigration {
......@@ -120,6 +122,10 @@ object VersionMigration {
migrateToVersion14(settings)
}
if (lastVersion < 15) {
migrateToVersion15(settings)
}
//Major version upgrade
if (lastMajorVersion == 3 && currentMajorVersion == 4) {
migrateToVlc4(settings)
......@@ -365,6 +371,27 @@ object VersionMigration {
}
}
/**
* Migrate after implementation of the default playback actions
*
*/
private fun migrateToVersion15(settings: SharedPreferences) {
Log.i(this::class.java.simpleName, "Migrate after implementation of the default playback actions")
if (settings.contains("playlist_mode_video") && settings.getBoolean("playlist_mode_video", false)) {
settings.edit(true) {
putString(DefaultPlaybackActionMediaType.VIDEO.defaultActionKey, DefaultPlaybackAction.PLAY_ALL.name)
}
}
if (settings.contains("playlist_mode_audio") && settings.getBoolean("playlist_mode_audio", false)) {
DefaultPlaybackActionMediaType.entries.filter { it.allowPlayAll }.forEach {
settings.edit(true) {
putString(DefaultPlaybackActionMediaType.TRACK.defaultActionKey, DefaultPlaybackAction.PLAY_ALL.name)
}
}
}
}
/**
* Migration to vlc 4
* ⚠️⚠️⚠️ This should not be destructive! Any first install will run this.
......
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