[Android] Typo: "Controls Settings" to "Control Settings"
Duncan McNamara
git at videolan.org
Tue Jun 13 05:30:41 UTC 2023
vlc-android | branch: master | Duncan McNamara <dcn.mcnamara at gmail.com> | Mon Jun 12 16:52:10 2023 +0200| [ade88e1e240b16ba47c0e124780c2eca7c22f39d] | committer: Nicolas Pomepuy
Typo: "Controls Settings" to "Control Settings"
> https://code.videolan.org/videolan/vlc-android/commit/ade88e1e240b16ba47c0e124780c2eca7c22f39d
---
application/resources/src/main/res/values/strings.xml | 3 ++-
.../org/videolan/vlc/gui/helpers/PlayerOptionsDelegate.kt | 12 ++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/application/resources/src/main/res/values/strings.xml b/application/resources/src/main/res/values/strings.xml
index 74a9d5d41f..f86b716e85 100644
--- a/application/resources/src/main/res/values/strings.xml
+++ b/application/resources/src/main/res/values/strings.xml
@@ -1006,7 +1006,8 @@
<string name="permission">Permission</string>
<string name="customize">Customize</string>
<string name="selection_count">%d selected</string>
- <string name="controls_setting">Controls settings</string>
+ <string name="control_setting">Control settings</string>
+ <string name="controls_setting">Controls settings</string> <!-- Unused -->
<string name="gestures">Gestures</string>
<string name="player_controls">Player controls</string>
<string name="video_double_tap_jump_delay">Double tap time delay</string>
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/helpers/PlayerOptionsDelegate.kt b/application/vlc-android/src/org/videolan/vlc/gui/helpers/PlayerOptionsDelegate.kt
index c653f0d182..c01ef35b0f 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/helpers/PlayerOptionsDelegate.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/helpers/PlayerOptionsDelegate.kt
@@ -63,8 +63,8 @@ private const val ID_VIDEO_STATS = 15L
private const val ID_SHOW_VIDEO_TIPS = 16L
private const val ID_SHOW_AUDIO_TIPS = 17L
private const val ID_SHOW_PLAYLIST_TIPS = 18L
-private const val ID_VIDEO_CONTROLS_SETTING = 19L
-private const val ID_AUDIO_CONTROLS_SETTING = 20L
+private const val ID_VIDEO_CONTROL_SETTING = 19L
+private const val ID_AUDIO_CONTROL_SETTING = 20L
@SuppressLint("ShowToast")
class PlayerOptionsDelegate(val activity: FragmentActivity, val service: PlaybackService, private val showABReapeat:Boolean = true) : LifecycleObserver {
@@ -113,13 +113,13 @@ class PlayerOptionsDelegate(val activity: FragmentActivity, val service: Playbac
if (service.playlistManager.player.canDoPassthrough() && settings.getString("aout", "0") != "2")
options.add(PlayerOption(ID_PASSTHROUGH, R.drawable.ic_passthrough, res.getString(R.string.audio_digital_title)))
if (video)
- options.add(PlayerOption(ID_VIDEO_CONTROLS_SETTING, R.drawable.ic_video_controls, res.getString(R.string.controls_setting)))
+ options.add(PlayerOption(ID_VIDEO_CONTROL_SETTING, R.drawable.ic_video_controls, res.getString(R.string.control_setting)))
if (!Settings.showTvUi) {
if (video) {
options.add(PlayerOption(ID_SHOW_VIDEO_TIPS, R.drawable.ic_videotips, res.getString(R.string.tips_title)))
} else {
- options.add(PlayerOption(ID_AUDIO_CONTROLS_SETTING, R.drawable.ic_audio_controls, res.getString(R.string.controls_setting)))
+ options.add(PlayerOption(ID_AUDIO_CONTROL_SETTING, R.drawable.ic_audio_controls, res.getString(R.string.control_setting)))
options.add(PlayerOption(ID_SHOW_AUDIO_TIPS, R.drawable.ic_audiotips, res.getString(R.string.audio_player_tips)))
options.add(PlayerOption(ID_SHOW_PLAYLIST_TIPS, R.drawable.ic_playlisttips, res.getString(R.string.playlist_tips)))
}
@@ -235,12 +235,12 @@ class PlayerOptionsDelegate(val activity: FragmentActivity, val service: Playbac
hide()
bookmarkClickedListener.invoke()
}
- ID_VIDEO_CONTROLS_SETTING -> {
+ ID_VIDEO_CONTROL_SETTING -> {
hide()
val videoControlsSettingsDialog = VideoControlsSettingsDialog()
videoControlsSettingsDialog.show(activity.supportFragmentManager, "fragment_video_controls_settings")
}
- ID_AUDIO_CONTROLS_SETTING -> {
+ ID_AUDIO_CONTROL_SETTING -> {
hide()
val audioControlsSettingsDialog = AudioControlsSettingsDialog()
audioControlsSettingsDialog.show(activity.supportFragmentManager, "fragment_audio_controls_settings")
More information about the Android
mailing list