videolan
/
vlc-android
mirror of https://gitea.goldendeliverer.com/videolan/vlc-android.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Migrate all the settings keys from Constants to Settings

merge-requests/2298/head
Nicolas Pomepuy 1 year ago
parent
ff75755687
commit
10ce8d996e
14 changed files with 93 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      application/remote-access-server/src/main/java/org/videolan/vlc/remoteaccessserver/RemoteAccessRouting.kt
  2. 17
      application/resources/src/main/java/org/videolan/resources/Constants.kt
  3. 18
      application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesAdvanced.kt
  4. 18
      application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesFragment.kt
  5. 17
      application/tools/src/main/java/org/videolan/tools/Settings.kt
  6. 2
      application/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.kt
  7. 27
      application/vlc-android/src/org/videolan/vlc/gui/HistoryFragment.kt
  8. 2
      application/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.kt
  9. 4
      application/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.kt
  10. 18
      application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAdvanced.kt
  11. 18
      application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesFragment.kt
  12. 6
      application/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt
  13. 18
      application/vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
  14. 2
      application/vlc-android/src/org/videolan/vlc/viewmodels/mobile/AudioBrowserViewModel.kt

4
application/remote-access-server/src/main/java/org/videolan/vlc/remoteaccessserver/RemoteAccessRouting.kt
View File

@ -80,8 +80,6 @@ import org.videolan.medialibrary.media.MediaLibraryItem
import org.videolan.medialibrary.media.Storage import org.videolan.medialibrary.media.Storage
import org.videolan.resources.AndroidDevices import org.videolan.resources.AndroidDevices
import org.videolan.resources.AppContextProvider import org.videolan.resources.AppContextProvider
import org.videolan.resources.KEY_CURRENT_AUDIO
import org.videolan.resources.KEY_CURRENT_MEDIA
import org.videolan.resources.PLAYLIST_TYPE_AUDIO import org.videolan.resources.PLAYLIST_TYPE_AUDIO
import org.videolan.resources.PLAYLIST_TYPE_VIDEO import org.videolan.resources.PLAYLIST_TYPE_VIDEO
import org.videolan.resources.util.await import org.videolan.resources.util.await
@ -91,6 +89,8 @@ import org.videolan.tools.AppScope
import org.videolan.tools.CloseableUtils import org.videolan.tools.CloseableUtils
import org.videolan.tools.HttpImageLoader import org.videolan.tools.HttpImageLoader
import org.videolan.tools.KEY_ARTISTS_SHOW_ALL import org.videolan.tools.KEY_ARTISTS_SHOW_ALL
import org.videolan.tools.KEY_CURRENT_AUDIO
import org.videolan.tools.KEY_CURRENT_MEDIA
import org.videolan.tools.KEY_VIDEO_APP_SWITCH import org.videolan.tools.KEY_VIDEO_APP_SWITCH
import org.videolan.tools.REMOTE_ACCESS_FILE_BROWSER_CONTENT import org.videolan.tools.REMOTE_ACCESS_FILE_BROWSER_CONTENT
import org.videolan.tools.REMOTE_ACCESS_HISTORY_CONTENT import org.videolan.tools.REMOTE_ACCESS_HISTORY_CONTENT

17
application/resources/src/main/java/org/videolan/resources/Constants.kt
View File

@ -123,21 +123,6 @@ const val PLAY_DISABLE_HARDWARE = "disable_hardware"
// MRLPanelFragment // MRLPanelFragment
const val KEY_MRL = "mrl" const val KEY_MRL = "mrl"
// AUDIO category
const val KEY_AUDIO_CURRENT_TAB = "key_audio_current_tab"
const val KEY_AUDIO_ALBUM_SONG_CURRENT_TAB = "key_audio_album_song_current_tab"
// Playback settings category
const val KEY_AUDIO_LAST_PLAYLIST = "audio_list"
const val KEY_MEDIA_LAST_PLAYLIST = "media_list"
const val KEY_MEDIA_LAST_PLAYLIST_RESUME = "media_list_resume"
const val KEY_CURRENT_AUDIO = "current_song"
const val KEY_CURRENT_MEDIA = "current_media"
const val KEY_CURRENT_MEDIA_RESUME = "current_media_resume"
const val KEY_CURRENT_AUDIO_RESUME_TITLE = "key_current_audio_resume_title"
const val KEY_CURRENT_AUDIO_RESUME_ARTIST = "key_current_audio_resume_artist"
const val KEY_CURRENT_AUDIO_RESUME_THUMB = "key_current_audio_resume_thumb"
// Info Activity // Info Activity
const val TAG_ITEM = "ML_ITEM" const val TAG_ITEM = "ML_ITEM"
@ -186,8 +171,6 @@ const val KEY_GROUPING = "key_grouping"
const val KEY_ANIMATED = "key_animated" const val KEY_ANIMATED = "key_animated"
const val FAVORITE_TITLE = "favorite_title" const val FAVORITE_TITLE = "favorite_title"
const val KEY_VIDEOS_CARDS = "video_display_in_cards"
const val KEY_GROUP_VIDEOS = "video_min_group_length"
const val GROUP_VIDEOS_NONE = "-1" const val GROUP_VIDEOS_NONE = "-1"
const val GROUP_VIDEOS_FOLDER = "0" const val GROUP_VIDEOS_FOLDER = "0"
const val GROUP_VIDEOS_NAME = "6" const val GROUP_VIDEOS_NAME = "6"

18
application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesAdvanced.kt
View File

@ -51,15 +51,6 @@ import kotlinx.coroutines.withContext
import org.videolan.medialibrary.interfaces.Medialibrary import org.videolan.medialibrary.interfaces.Medialibrary
import org.videolan.resources.AndroidDevices import org.videolan.resources.AndroidDevices
import org.videolan.resources.EXPORT_SETTINGS_FILE import org.videolan.resources.EXPORT_SETTINGS_FILE
import org.videolan.resources.KEY_AUDIO_LAST_PLAYLIST
import org.videolan.resources.KEY_CURRENT_AUDIO
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_ARTIST
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_THUMB
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_TITLE
import org.videolan.resources.KEY_CURRENT_MEDIA
import org.videolan.resources.KEY_CURRENT_MEDIA_RESUME
import org.videolan.resources.KEY_MEDIA_LAST_PLAYLIST
import org.videolan.resources.KEY_MEDIA_LAST_PLAYLIST_RESUME
import org.videolan.resources.ROOM_DATABASE import org.videolan.resources.ROOM_DATABASE
import org.videolan.resources.SCHEME_PACKAGE import org.videolan.resources.SCHEME_PACKAGE
import org.videolan.resources.VLCInstance import org.videolan.resources.VLCInstance
@ -67,11 +58,20 @@ import org.videolan.tools.BitmapCache
import org.videolan.tools.DAV1D_THREAD_NUMBER import org.videolan.tools.DAV1D_THREAD_NUMBER
import org.videolan.tools.KEY_AOUT import org.videolan.tools.KEY_AOUT
import org.videolan.tools.KEY_AUDIO_DIGITAL_OUTPUT import org.videolan.tools.KEY_AUDIO_DIGITAL_OUTPUT
import org.videolan.tools.KEY_AUDIO_LAST_PLAYLIST
import org.videolan.tools.KEY_CURRENT_AUDIO
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_ARTIST
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_THUMB
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_TITLE
import org.videolan.tools.KEY_CURRENT_MEDIA
import org.videolan.tools.KEY_CURRENT_MEDIA_RESUME
import org.videolan.tools.KEY_CUSTOM_LIBVLC_OPTIONS import org.videolan.tools.KEY_CUSTOM_LIBVLC_OPTIONS
import org.videolan.tools.KEY_DEBLOCKING import org.videolan.tools.KEY_DEBLOCKING
import org.videolan.tools.KEY_ENABLE_FRAME_SKIP import org.videolan.tools.KEY_ENABLE_FRAME_SKIP
import org.videolan.tools.KEY_ENABLE_TIME_STRETCHING_AUDIO import org.videolan.tools.KEY_ENABLE_TIME_STRETCHING_AUDIO
import org.videolan.tools.KEY_ENABLE_VERBOSE_MODE import org.videolan.tools.KEY_ENABLE_VERBOSE_MODE
import org.videolan.tools.KEY_MEDIA_LAST_PLAYLIST
import org.videolan.tools.KEY_MEDIA_LAST_PLAYLIST_RESUME
import org.videolan.tools.KEY_NETWORK_CACHING_VALUE import org.videolan.tools.KEY_NETWORK_CACHING_VALUE
import org.videolan.tools.KEY_OPENGL import org.videolan.tools.KEY_OPENGL
import org.videolan.tools.KEY_PREFER_SMBV1 import org.videolan.tools.KEY_PREFER_SMBV1

18
application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesFragment.kt
View File

@ -35,16 +35,16 @@ import androidx.preference.CheckBoxPreference
import androidx.preference.Preference import androidx.preference.Preference
import androidx.preference.PreferenceScreen import androidx.preference.PreferenceScreen
import org.videolan.medialibrary.interfaces.Medialibrary import org.videolan.medialibrary.interfaces.Medialibrary
import org.videolan.resources.KEY_AUDIO_LAST_PLAYLIST
import org.videolan.resources.KEY_CURRENT_AUDIO
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_ARTIST
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_THUMB
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_TITLE
import org.videolan.resources.KEY_CURRENT_MEDIA
import org.videolan.resources.KEY_CURRENT_MEDIA_RESUME
import org.videolan.resources.KEY_MEDIA_LAST_PLAYLIST
import org.videolan.resources.KEY_MEDIA_LAST_PLAYLIST_RESUME
import org.videolan.tools.AUDIO_RESUME_PLAYBACK import org.videolan.tools.AUDIO_RESUME_PLAYBACK
import org.videolan.tools.KEY_AUDIO_LAST_PLAYLIST
import org.videolan.tools.KEY_CURRENT_AUDIO
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_ARTIST
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_THUMB
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_TITLE
import org.videolan.tools.KEY_CURRENT_MEDIA
import org.videolan.tools.KEY_CURRENT_MEDIA_RESUME
import org.videolan.tools.KEY_MEDIA_LAST_PLAYLIST
import org.videolan.tools.KEY_MEDIA_LAST_PLAYLIST_RESUME
import org.videolan.tools.PLAYBACK_HISTORY import org.videolan.tools.PLAYBACK_HISTORY
import org.videolan.tools.RESULT_RESTART import org.videolan.tools.RESULT_RESTART
import org.videolan.tools.Settings import org.videolan.tools.Settings

17
application/tools/src/main/java/org/videolan/tools/Settings.kt
View File

@ -121,6 +121,21 @@ const val KEY_SHOW_WHATS_NEW = "show_whats_new"
const val KEY_LAST_UPDATE_TIME = "last_update_time" const val KEY_LAST_UPDATE_TIME = "last_update_time"
const val KEY_SHOW_UPDATE = "show_update" const val KEY_SHOW_UPDATE = "show_update"
// Playback settings category
const val KEY_AUDIO_LAST_PLAYLIST = "audio_list"
const val KEY_MEDIA_LAST_PLAYLIST = "media_list"
const val KEY_MEDIA_LAST_PLAYLIST_RESUME = "media_list_resume"
const val KEY_CURRENT_AUDIO = "current_song"
const val KEY_CURRENT_MEDIA = "current_media"
const val KEY_CURRENT_MEDIA_RESUME = "current_media_resume"
const val KEY_CURRENT_AUDIO_RESUME_TITLE = "key_current_audio_resume_title"
const val KEY_CURRENT_AUDIO_RESUME_ARTIST = "key_current_audio_resume_artist"
const val KEY_CURRENT_AUDIO_RESUME_THUMB = "key_current_audio_resume_thumb"
// AUDIO category
const val KEY_AUDIO_CURRENT_TAB = "key_audio_current_tab"
const val KEY_AUDIO_ALBUM_SONG_CURRENT_TAB = "key_audio_album_song_current_tab"
//UI //UI
const val LIST_TITLE_ELLIPSIZE = "list_title_ellipsize" const val LIST_TITLE_ELLIPSIZE = "list_title_ellipsize"
const val KEY_VIDEO_JUMP_DELAY = "video_jump_delay" const val KEY_VIDEO_JUMP_DELAY = "video_jump_delay"
@ -135,6 +150,8 @@ const val KEY_AUDIO_SHOW_BOOkMARK_BUTTONS = "audio_show_bookmark_buttons"
const val KEY_AUDIO_SHOW_BOOKMARK_MARKERS = "audio_show_bookmark_markers" const val KEY_AUDIO_SHOW_BOOKMARK_MARKERS = "audio_show_bookmark_markers"
const val KEY_PERSISTENT_INCOGNITO = "persistent_incognito" const val KEY_PERSISTENT_INCOGNITO = "persistent_incognito"
const val KEY_BROWSE_NETWORK = "browse_network" const val KEY_BROWSE_NETWORK = "browse_network"
const val KEY_VIDEOS_CARDS = "video_display_in_cards"
const val KEY_GROUP_VIDEOS = "video_min_group_length"
// AudioPlayer // AudioPlayer

2
application/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.kt
View File

@ -70,11 +70,11 @@ import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.videolan.medialibrary.interfaces.Medialibrary import org.videolan.medialibrary.interfaces.Medialibrary
import org.videolan.resources.KEY_CURRENT_AUDIO
import org.videolan.resources.util.getFromMl import org.videolan.resources.util.getFromMl
import org.videolan.resources.util.startMedialibrary import org.videolan.resources.util.startMedialibrary
import org.videolan.tools.AUDIO_RESUME_PLAYBACK import org.videolan.tools.AUDIO_RESUME_PLAYBACK
import org.videolan.tools.KEY_AUDIO_PLAYER_SHOW_COVER import org.videolan.tools.KEY_AUDIO_PLAYER_SHOW_COVER
import org.videolan.tools.KEY_CURRENT_AUDIO
import org.videolan.tools.PREF_AUDIOPLAYER_TIPS_SHOWN import org.videolan.tools.PREF_AUDIOPLAYER_TIPS_SHOWN
import org.videolan.tools.Settings import org.videolan.tools.Settings
import org.videolan.tools.dp import org.videolan.tools.dp

27
application/vlc-android/src/org/videolan/vlc/gui/HistoryFragment.kt
View File

@ -20,11 +20,15 @@
package org.videolan.vlc.gui package org.videolan.vlc.gui
import android.os.Bundle import android.os.Bundle
import android.view.* import android.view.LayoutInflater
import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.view.ActionMode import androidx.appcompat.view.ActionMode
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import androidx.fragment.app.setFragmentResultListener
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.ItemTouchHelper
@ -36,15 +40,26 @@ import kotlinx.coroutines.launch
import org.videolan.medialibrary.interfaces.Medialibrary import org.videolan.medialibrary.interfaces.Medialibrary
import org.videolan.medialibrary.interfaces.media.MediaWrapper import org.videolan.medialibrary.interfaces.media.MediaWrapper
import org.videolan.medialibrary.media.MediaLibraryItem import org.videolan.medialibrary.media.MediaLibraryItem
import org.videolan.resources.KEY_AUDIO_LAST_PLAYLIST import org.videolan.tools.KEY_AUDIO_LAST_PLAYLIST
import org.videolan.resources.KEY_MEDIA_LAST_PLAYLIST import org.videolan.tools.KEY_MEDIA_LAST_PLAYLIST
import org.videolan.tools.* import org.videolan.tools.KeyHelper
import org.videolan.tools.MultiSelectHelper
import org.videolan.tools.PLAYBACK_HISTORY
import org.videolan.tools.Settings
import org.videolan.tools.isStarted
import org.videolan.tools.retrieveParent
import org.videolan.vlc.R import org.videolan.vlc.R
import org.videolan.vlc.gui.browser.MediaBrowserFragment import org.videolan.vlc.gui.browser.MediaBrowserFragment
import org.videolan.vlc.gui.dialogs.CONFIRM_DELETE_DIALOG_RESULT import org.videolan.vlc.gui.dialogs.CONFIRM_DELETE_DIALOG_RESULT
import org.videolan.vlc.gui.dialogs.ConfirmDeleteDialog import org.videolan.vlc.gui.dialogs.ConfirmDeleteDialog
import org.videolan.vlc.gui.dialogs.RenameDialog import org.videolan.vlc.gui.dialogs.RenameDialog
import org.videolan.vlc.gui.helpers.* import org.videolan.vlc.gui.helpers.Click
import org.videolan.vlc.gui.helpers.ImageClick
import org.videolan.vlc.gui.helpers.LongClick
import org.videolan.vlc.gui.helpers.SimpleClick
import org.videolan.vlc.gui.helpers.SwipeDragItemTouchHelperCallback
import org.videolan.vlc.gui.helpers.UiTools
import org.videolan.vlc.gui.helpers.fillActionMode
import org.videolan.vlc.interfaces.IHistory import org.videolan.vlc.interfaces.IHistory
import org.videolan.vlc.interfaces.IListEventsHandler import org.videolan.vlc.interfaces.IListEventsHandler
import org.videolan.vlc.interfaces.IRefreshable import org.videolan.vlc.interfaces.IRefreshable

2
application/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.kt
View File

@ -45,8 +45,8 @@ import org.videolan.medialibrary.interfaces.Medialibrary
import org.videolan.medialibrary.interfaces.media.Album import org.videolan.medialibrary.interfaces.media.Album
import org.videolan.medialibrary.interfaces.media.MediaWrapper import org.videolan.medialibrary.interfaces.media.MediaWrapper
import org.videolan.medialibrary.media.MediaLibraryItem import org.videolan.medialibrary.media.MediaLibraryItem
import org.videolan.resources.KEY_AUDIO_ALBUM_SONG_CURRENT_TAB
import org.videolan.resources.util.parcelable import org.videolan.resources.util.parcelable
import org.videolan.tools.KEY_AUDIO_ALBUM_SONG_CURRENT_TAB
import org.videolan.tools.Settings import org.videolan.tools.Settings
import org.videolan.tools.dp import org.videolan.tools.dp
import org.videolan.tools.putSingle import org.videolan.tools.putSingle

4
application/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.kt
View File

@ -50,10 +50,10 @@ import org.videolan.medialibrary.interfaces.Medialibrary
import org.videolan.medialibrary.interfaces.media.MediaWrapper import org.videolan.medialibrary.interfaces.media.MediaWrapper
import org.videolan.medialibrary.media.MediaLibraryItem import org.videolan.medialibrary.media.MediaLibraryItem
import org.videolan.resources.AppContextProvider import org.videolan.resources.AppContextProvider
import org.videolan.resources.KEY_AUDIO_CURRENT_TAB
import org.videolan.resources.KEY_AUDIO_LAST_PLAYLIST
import org.videolan.resources.util.waitForML import org.videolan.resources.util.waitForML
import org.videolan.tools.KEY_ARTISTS_SHOW_ALL import org.videolan.tools.KEY_ARTISTS_SHOW_ALL
import org.videolan.tools.KEY_AUDIO_CURRENT_TAB
import org.videolan.tools.KEY_AUDIO_LAST_PLAYLIST
import org.videolan.tools.RESULT_RESTART import org.videolan.tools.RESULT_RESTART
import org.videolan.tools.Settings import org.videolan.tools.Settings
import org.videolan.tools.putSingle import org.videolan.tools.putSingle

18
application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAdvanced.kt
View File

@ -51,15 +51,6 @@ import kotlinx.coroutines.withContext
import org.videolan.medialibrary.interfaces.Medialibrary import org.videolan.medialibrary.interfaces.Medialibrary
import org.videolan.resources.AndroidDevices import org.videolan.resources.AndroidDevices
import org.videolan.resources.EXPORT_SETTINGS_FILE import org.videolan.resources.EXPORT_SETTINGS_FILE
import org.videolan.resources.KEY_AUDIO_LAST_PLAYLIST
import org.videolan.resources.KEY_CURRENT_AUDIO
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_ARTIST
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_THUMB
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_TITLE
import org.videolan.resources.KEY_CURRENT_MEDIA
import org.videolan.resources.KEY_CURRENT_MEDIA_RESUME
import org.videolan.resources.KEY_MEDIA_LAST_PLAYLIST
import org.videolan.resources.KEY_MEDIA_LAST_PLAYLIST_RESUME
import org.videolan.resources.ROOM_DATABASE import org.videolan.resources.ROOM_DATABASE
import org.videolan.resources.SCHEME_PACKAGE import org.videolan.resources.SCHEME_PACKAGE
import org.videolan.resources.VLCInstance import org.videolan.resources.VLCInstance
@ -67,11 +58,20 @@ import org.videolan.tools.BitmapCache
import org.videolan.tools.DAV1D_THREAD_NUMBER import org.videolan.tools.DAV1D_THREAD_NUMBER
import org.videolan.tools.KEY_AOUT import org.videolan.tools.KEY_AOUT
import org.videolan.tools.KEY_AUDIO_DIGITAL_OUTPUT import org.videolan.tools.KEY_AUDIO_DIGITAL_OUTPUT
import org.videolan.tools.KEY_AUDIO_LAST_PLAYLIST
import org.videolan.tools.KEY_CURRENT_AUDIO
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_ARTIST
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_THUMB
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_TITLE
import org.videolan.tools.KEY_CURRENT_MEDIA
import org.videolan.tools.KEY_CURRENT_MEDIA_RESUME
import org.videolan.tools.KEY_CUSTOM_LIBVLC_OPTIONS import org.videolan.tools.KEY_CUSTOM_LIBVLC_OPTIONS
import org.videolan.tools.KEY_DEBLOCKING import org.videolan.tools.KEY_DEBLOCKING
import org.videolan.tools.KEY_ENABLE_FRAME_SKIP import org.videolan.tools.KEY_ENABLE_FRAME_SKIP
import org.videolan.tools.KEY_ENABLE_TIME_STRETCHING_AUDIO import org.videolan.tools.KEY_ENABLE_TIME_STRETCHING_AUDIO
import org.videolan.tools.KEY_ENABLE_VERBOSE_MODE import org.videolan.tools.KEY_ENABLE_VERBOSE_MODE
import org.videolan.tools.KEY_MEDIA_LAST_PLAYLIST
import org.videolan.tools.KEY_MEDIA_LAST_PLAYLIST_RESUME
import org.videolan.tools.KEY_NETWORK_CACHING_VALUE import org.videolan.tools.KEY_NETWORK_CACHING_VALUE
import org.videolan.tools.KEY_OPENGL import org.videolan.tools.KEY_OPENGL
import org.videolan.tools.KEY_PREFER_SMBV1 import org.videolan.tools.KEY_PREFER_SMBV1

18
application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesFragment.kt
View File

@ -36,17 +36,17 @@ import androidx.preference.ListPreference
import androidx.preference.Preference import androidx.preference.Preference
import org.videolan.libvlc.util.AndroidUtil import org.videolan.libvlc.util.AndroidUtil
import org.videolan.medialibrary.interfaces.Medialibrary import org.videolan.medialibrary.interfaces.Medialibrary
import org.videolan.resources.KEY_AUDIO_LAST_PLAYLIST
import org.videolan.resources.KEY_CURRENT_AUDIO
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_ARTIST
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_THUMB
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_TITLE
import org.videolan.resources.KEY_CURRENT_MEDIA
import org.videolan.resources.KEY_CURRENT_MEDIA_RESUME
import org.videolan.resources.KEY_MEDIA_LAST_PLAYLIST
import org.videolan.resources.KEY_MEDIA_LAST_PLAYLIST_RESUME
import org.videolan.resources.util.parcelable import org.videolan.resources.util.parcelable
import org.videolan.tools.AUDIO_RESUME_PLAYBACK import org.videolan.tools.AUDIO_RESUME_PLAYBACK
import org.videolan.tools.KEY_AUDIO_LAST_PLAYLIST
import org.videolan.tools.KEY_CURRENT_AUDIO
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_ARTIST
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_THUMB
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_TITLE
import org.videolan.tools.KEY_CURRENT_MEDIA
import org.videolan.tools.KEY_CURRENT_MEDIA_RESUME
import org.videolan.tools.KEY_MEDIA_LAST_PLAYLIST
import org.videolan.tools.KEY_MEDIA_LAST_PLAYLIST_RESUME
import org.videolan.tools.PLAYBACK_HISTORY import org.videolan.tools.PLAYBACK_HISTORY
import org.videolan.tools.RESULT_RESTART import org.videolan.tools.RESULT_RESTART
import org.videolan.tools.Settings import org.videolan.tools.Settings

6
application/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt
View File

@ -59,9 +59,6 @@ import org.videolan.resources.GROUP_VIDEOS_NONE
import org.videolan.resources.KEY_FOLDER import org.videolan.resources.KEY_FOLDER
import org.videolan.resources.KEY_GROUP import org.videolan.resources.KEY_GROUP
import org.videolan.resources.KEY_GROUPING import org.videolan.resources.KEY_GROUPING
import org.videolan.resources.KEY_GROUP_VIDEOS
import org.videolan.resources.KEY_MEDIA_LAST_PLAYLIST
import org.videolan.resources.KEY_VIDEOS_CARDS
import org.videolan.resources.MOVIEPEDIA_ACTIVITY import org.videolan.resources.MOVIEPEDIA_ACTIVITY
import org.videolan.resources.MOVIEPEDIA_MEDIA import org.videolan.resources.MOVIEPEDIA_MEDIA
import org.videolan.resources.PLAYLIST_TYPE_VIDEO import org.videolan.resources.PLAYLIST_TYPE_VIDEO
@ -70,7 +67,10 @@ import org.videolan.resources.util.parcelable
import org.videolan.resources.util.parcelableArray import org.videolan.resources.util.parcelableArray
import org.videolan.resources.util.waitForML import org.videolan.resources.util.waitForML
import org.videolan.tools.KEY_CASTING_AUDIO_ONLY import org.videolan.tools.KEY_CASTING_AUDIO_ONLY
import org.videolan.tools.KEY_GROUP_VIDEOS
import org.videolan.tools.KEY_MEDIA_LAST_PLAYLIST
import org.videolan.tools.KEY_MEDIA_SEEN import org.videolan.tools.KEY_MEDIA_SEEN
import org.videolan.tools.KEY_VIDEOS_CARDS
import org.videolan.tools.MultiSelectHelper import org.videolan.tools.MultiSelectHelper
import org.videolan.tools.PLAYBACK_HISTORY import org.videolan.tools.PLAYBACK_HISTORY
import org.videolan.tools.RESULT_RESTART import org.videolan.tools.RESULT_RESTART

18
application/vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
View File

@ -33,15 +33,6 @@ import org.videolan.medialibrary.interfaces.media.MediaWrapper
import org.videolan.resources.AndroidDevices import org.videolan.resources.AndroidDevices
import org.videolan.resources.AppContextProvider import org.videolan.resources.AppContextProvider
import org.videolan.resources.EXIT_PLAYER import org.videolan.resources.EXIT_PLAYER
import org.videolan.resources.KEY_AUDIO_LAST_PLAYLIST
import org.videolan.resources.KEY_CURRENT_AUDIO
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_ARTIST
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_THUMB
import org.videolan.resources.KEY_CURRENT_AUDIO_RESUME_TITLE
import org.videolan.resources.KEY_CURRENT_MEDIA
import org.videolan.resources.KEY_CURRENT_MEDIA_RESUME
import org.videolan.resources.KEY_MEDIA_LAST_PLAYLIST
import org.videolan.resources.KEY_MEDIA_LAST_PLAYLIST_RESUME
import org.videolan.resources.PLAYLIST_TYPE_AUDIO import org.videolan.resources.PLAYLIST_TYPE_AUDIO
import org.videolan.resources.PLAYLIST_TYPE_VIDEO import org.videolan.resources.PLAYLIST_TYPE_VIDEO
import org.videolan.resources.PLAY_FROM_SERVICE import org.videolan.resources.PLAY_FROM_SERVICE
@ -58,9 +49,18 @@ import org.videolan.tools.HTTP_USER_AGENT
import org.videolan.tools.KEY_ALWAYS_FAST_SEEK import org.videolan.tools.KEY_ALWAYS_FAST_SEEK
import org.videolan.tools.KEY_AUDIO_CONFIRM_RESUME import org.videolan.tools.KEY_AUDIO_CONFIRM_RESUME
import org.videolan.tools.KEY_AUDIO_FORCE_SHUFFLE import org.videolan.tools.KEY_AUDIO_FORCE_SHUFFLE
import org.videolan.tools.KEY_AUDIO_LAST_PLAYLIST
import org.videolan.tools.KEY_CURRENT_AUDIO
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_ARTIST
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_THUMB
import org.videolan.tools.KEY_CURRENT_AUDIO_RESUME_TITLE
import org.videolan.tools.KEY_CURRENT_MEDIA
import org.videolan.tools.KEY_CURRENT_MEDIA_RESUME
import org.videolan.tools.KEY_INCOGNITO import org.videolan.tools.KEY_INCOGNITO
import org.videolan.tools.KEY_INCOGNITO_PLAYBACK_SPEED_AUDIO_GLOBAL_VALUE import org.videolan.tools.KEY_INCOGNITO_PLAYBACK_SPEED_AUDIO_GLOBAL_VALUE
import org.videolan.tools.KEY_INCOGNITO_PLAYBACK_SPEED_VIDEO_GLOBAL_VALUE import org.videolan.tools.KEY_INCOGNITO_PLAYBACK_SPEED_VIDEO_GLOBAL_VALUE
import org.videolan.tools.KEY_MEDIA_LAST_PLAYLIST
import org.videolan.tools.KEY_MEDIA_LAST_PLAYLIST_RESUME
import org.videolan.tools.KEY_PLAYBACK_SPEED_AUDIO_GLOBAL import org.videolan.tools.KEY_PLAYBACK_SPEED_AUDIO_GLOBAL
import org.videolan.tools.KEY_PLAYBACK_SPEED_AUDIO_GLOBAL_VALUE 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

2
application/vlc-android/src/org/videolan/vlc/viewmodels/mobile/AudioBrowserViewModel.kt
View File

@ -26,8 +26,8 @@ import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.videolan.medialibrary.interfaces.media.Playlist import org.videolan.medialibrary.interfaces.media.Playlist
import org.videolan.resources.KEY_AUDIO_CURRENT_TAB
import org.videolan.tools.KEY_ARTISTS_SHOW_ALL import org.videolan.tools.KEY_ARTISTS_SHOW_ALL
import org.videolan.tools.KEY_AUDIO_CURRENT_TAB
import org.videolan.tools.KEY_AUDIO_RESUME_CARD import org.videolan.tools.KEY_AUDIO_RESUME_CARD
import org.videolan.tools.Settings import org.videolan.tools.Settings
import org.videolan.vlc.gui.audio.AudioBrowserFragment import org.videolan.vlc.gui.audio.AudioBrowserFragment

Write Preview
Loading…
Cancel
Save