[Android] Add a disclaimer for the moved settings in the video preferences
Nicolas Pomepuy
git at videolan.org
Fri Feb 28 10:58:03 UTC 2025
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Tue Feb 25 15:30:31 2025 +0100| [4a1b49220b47c0e7814b582426bbb384b83998c9] | committer: Duncan McNamara
Add a disclaimer for the moved settings in the video preferences
> https://code.videolan.org/videolan/vlc-android/commit/4a1b49220b47c0e7814b582426bbb384b83998c9
---
application/resources/src/main/res/values/strings.xml | 1 +
application/tools/src/main/java/org/videolan/tools/Settings.kt | 1 +
application/vlc-android/src/org/videolan/vlc/StartActivity.kt | 2 ++
.../src/org/videolan/vlc/gui/preferences/PreferencesVideo.kt | 8 ++++++++
4 files changed, 12 insertions(+)
diff --git a/application/resources/src/main/res/values/strings.xml b/application/resources/src/main/res/values/strings.xml
index f77f166a20..9d368f4af3 100644
--- a/application/resources/src/main/res/values/strings.xml
+++ b/application/resources/src/main/res/values/strings.xml
@@ -1355,4 +1355,5 @@
<string name="queue_format">Queue format</string>
<string name="queue_format_short_desc">Queue position</string>
<string name="queue_format_long_desc">Queue position / Queue size</string>
+ <string name="video_settings_disclaimer">Some settings have been moved to the video controls settings in the video player.</string>
</resources>
diff --git a/application/tools/src/main/java/org/videolan/tools/Settings.kt b/application/tools/src/main/java/org/videolan/tools/Settings.kt
index cec79485a0..21d0863cca 100644
--- a/application/tools/src/main/java/org/videolan/tools/Settings.kt
+++ b/application/tools/src/main/java/org/videolan/tools/Settings.kt
@@ -154,6 +154,7 @@ const val ENCRYPTED_KEY_NAME = "encryption_key"
const val PREF_TIPS_SHOWN = "video_player_tips_shown"
const val PREF_WIDGETS_TIPS_SHOWN = "widgets_tips_shown"
const val PREF_RESTORE_VIDEO_TIPS_SHOWN = "pref_restore_video_tips_shown"
+const val PREF_SHOW_VIDEO_SETTINGS_DISCLAIMER = "pref_show_video_settings_disclaimer"
const val PREF_TV_UI = "tv_ui"
const val PLAYLIST_MODE_VIDEO = "playlist_mode_video"
diff --git a/application/vlc-android/src/org/videolan/vlc/StartActivity.kt b/application/vlc-android/src/org/videolan/vlc/StartActivity.kt
index c7f7c9439a..80c9260459 100644
--- a/application/vlc-android/src/org/videolan/vlc/StartActivity.kt
+++ b/application/vlc-android/src/org/videolan/vlc/StartActivity.kt
@@ -64,6 +64,7 @@ import org.videolan.tools.AppScope
import org.videolan.tools.BETA_WELCOME
import org.videolan.tools.KEY_CURRENT_SETTINGS_VERSION
import org.videolan.tools.KEY_TV_ONBOARDING_DONE
+import org.videolan.tools.PREF_SHOW_VIDEO_SETTINGS_DISCLAIMER
import org.videolan.tools.Settings
import org.videolan.tools.awaitAppIsForegroung
import org.videolan.tools.getContextWithLocale
@@ -183,6 +184,7 @@ class StartActivity : FragmentActivity() {
val tv = showTvUi()
if (upgrade && (tv || !firstRun)) settings.putSingle(PREF_FIRST_RUN, currentVersionNumber)
val removeOldDevices = savedVersionNumber in 3028201..3028399
+ settings.putSingle(PREF_SHOW_VIDEO_SETTINGS_DISCLAIMER, savedVersionNumber < 3060330 && !firstRun)
// Route search query
if (Intent.ACTION_SEARCH == action || ACTION_SEARCH_GMS == action) {
intent.setClassName(applicationContext, if (tv) TV_SEARCH_ACTIVITY else MOBILE_SEARCH_ACTIVITY)
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesVideo.kt b/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesVideo.kt
index 6a17ec917a..d65668a5d1 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesVideo.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesVideo.kt
@@ -30,8 +30,11 @@ import kotlinx.coroutines.launch
import org.videolan.libvlc.util.AndroidUtil
import org.videolan.resources.VLCInstance
import org.videolan.tools.POPUP_FORCE_LEGACY
+import org.videolan.tools.PREF_SHOW_VIDEO_SETTINGS_DISCLAIMER
+import org.videolan.tools.Settings
import org.videolan.tools.putSingle
import org.videolan.vlc.R
+import org.videolan.vlc.gui.helpers.UiTools
import org.videolan.vlc.gui.helpers.restartMediaPlayer
import org.videolan.vlc.util.Permissions
@@ -44,6 +47,11 @@ class PreferencesVideo : BasePreferenceFragment(), SharedPreferences.OnSharedPre
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
findPreference<Preference>(POPUP_FORCE_LEGACY)?.isVisible = AndroidUtil.isOOrLater
+ if (Settings.getInstance(requireContext()).getBoolean(PREF_SHOW_VIDEO_SETTINGS_DISCLAIMER, false)) {
+ UiTools.snackerConfirm(requireActivity(), requireActivity().getString(R.string.video_settings_disclaimer), indefinite = true) {
+ Settings.getInstance(requireContext()).putSingle(PREF_SHOW_VIDEO_SETTINGS_DISCLAIMER, false)
+ }
+ }
}
override fun onStart() {
More information about the Android
mailing list