Skip to content
Snippets Groups Projects
Commit 871e8c6b authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

Reorganize audio preferences

parent 77970abe
No related branches found
No related tags found
1 merge request!134Preferences refactoring
Pipeline #7626 passed with stage
in 3 minutes and 48 seconds
......@@ -4,11 +4,16 @@
android:key="audio_category"
android:title="@string/audio_prefs_category">
<SwitchPreference
<CheckBoxPreference
android:defaultValue="true"
android:key="audio_resume_card"
android:title="@string/audio_resume_card_title"
android:summary="@string/audio_resume_card_summary"/>
android:key="resume_playback"
android:summary="@string/resume_playback_summary"
android:title="@string/resume_playback_title" />
<CheckBoxPreference
android:defaultValue="false"
android:key="playback_speed"
android:summary="@string/playback_speed_summary"
android:title="@string/playback_speed_title" />
<CheckBoxPreference
android:defaultValue="false"
......@@ -20,28 +25,11 @@
android:defaultValue="false"
android:key="audio_digital_output"
android:title="@string/audio_digital_title" />
<CheckBoxPreference
android:defaultValue="false"
android:key="artists_show_all"
android:summary="@string/artists_show_all_summary"
android:title="@string/artists_show_all_title" />
<CheckBoxPreference
android:defaultValue="true"
android:key="lockscreen_cover"
android:summary="@string/lockscreen_cover_summary"
android:title="@string/lockscreen_cover_title" />
<CheckBoxPreference
android:defaultValue="false"
android:key="audio_save_repeat"
android:summary="@string/audio_save_repeat_summary"
android:title="@string/audio_save_repeat_title" />
<ListPreference
android:defaultValue="0"
android:entries="@array/audio_title_alignment_list"
android:entryValues="@array/audio_title_alignment_values"
android:key="audio_title_alignment"
android:persistent="true"
android:title="@string/audio_title_alignment" />
<PreferenceCategory
android:title="@string/headset_prefs_category"
......
......@@ -21,24 +21,12 @@
android:key="set_locale"
android:title="@string/set_locale" />
<CheckBoxPreference
android:defaultValue="true"
android:key="resume_playback"
android:summary="@string/resume_playback_summary"
android:title="@string/resume_playback_title" />
<CheckBoxPreference
android:defaultValue="true"
android:key="browser_show_all_files"
android:summary="@string/browser_show_all_summary"
android:title="@string/browser_show_all_title" />
<CheckBoxPreference
android:defaultValue="true"
android:key="blurred_cover_background"
android:summary="@string/blurred_cover_background_summary"
android:title="@string/blurred_cover_background_title" />
<PreferenceCategory
android:title="@string/video"
android:key="ui_video_category">
......@@ -68,4 +56,36 @@
android:summary="@string/force_list_portrait_summary"
android:title="@string/force_list_portrait" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/audio"
android:key="ui_audio_category">
<CheckBoxPreference
android:defaultValue="true"
android:key="blurred_cover_background"
android:summary="@string/blurred_cover_background_summary"
android:title="@string/blurred_cover_background_title" />
<SwitchPreference
android:defaultValue="true"
android:key="audio_resume_card"
android:title="@string/audio_resume_card_title"
android:summary="@string/audio_resume_card_summary"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="lockscreen_cover"
android:summary="@string/lockscreen_cover_summary"
android:title="@string/lockscreen_cover_title" />
<CheckBoxPreference
android:defaultValue="false"
android:key="artists_show_all"
android:summary="@string/artists_show_all_summary"
android:title="@string/artists_show_all_title" />
<ListPreference
android:defaultValue="0"
android:entries="@array/audio_title_alignment_list"
android:entryValues="@array/audio_title_alignment_values"
android:key="audio_title_alignment"
android:persistent="true"
android:title="@string/audio_title_alignment" />
</PreferenceCategory>
</PreferenceScreen>
......@@ -32,25 +32,20 @@ import kotlinx.coroutines.ObsoleteCoroutinesApi
import org.videolan.libvlc.util.AndroidUtil
import org.videolan.libvlc.util.HWDecoderUtil
import org.videolan.vlc.R
import org.videolan.vlc.util.AUDIO_DUCKING
import org.videolan.vlc.util.KEY_ARTISTS_SHOW_ALL
import org.videolan.vlc.util.VLCInstance
import org.videolan.vlc.util.*
@ExperimentalCoroutinesApi
@ObsoleteCoroutinesApi
class PreferencesAudio : BasePreferenceFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
override fun getXml(): Int {
return R.xml.preferences_audio
}
override fun getXml() = R.xml.preferences_audio
override fun getTitleId(): Int {
return R.string.audio_prefs_category
}
override fun getTitleId() = R.string.audio_prefs_category
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
findPreference(AUDIO_DUCKING).isVisible = !AndroidUtil.isOOrLater
findPreference(RESUME_PLAYBACK).isVisible = AndroidDevices.isPhone
val aout = HWDecoderUtil.getAudioOutputFromDevice()
if (aout != HWDecoderUtil.AudioOutput.ALL) {
/* no AudioOutput choice */
......@@ -97,7 +92,6 @@ class PreferencesAudio : BasePreferenceFragment(), SharedPreferences.OnSharedPre
if (opensles) (findPreference("audio_digital_output") as CheckBoxPreference).isChecked = false
findPreference("audio_digital_output").isVisible = !opensles
}
KEY_ARTISTS_SHOW_ALL -> (activity as PreferencesActivity).updateArtists()
"audio_digital_output" -> updatePassThroughSummary()
}
}
......
......@@ -46,7 +46,6 @@ class PreferencesUi : BasePreferenceFragment(), SharedPreferences.OnSharedPrefer
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
findPreference(RESUME_PLAYBACK).isVisible = AndroidDevices.isPhone
prepareLocaleList()
setupTheme()
}
......@@ -96,6 +95,7 @@ class PreferencesUi : BasePreferenceFragment(), SharedPreferences.OnSharedPrefer
return true
}
"media_seen" -> activity!!.setResult(RESULT_UPDATE_SEEN_MEDIA)
KEY_ARTISTS_SHOW_ALL -> (activity as PreferencesActivity).updateArtists()
}
return super.onPreferenceTreeClick(preference)
}
......
......@@ -33,6 +33,7 @@ import org.videolan.libvlc.util.AndroidUtil
import org.videolan.libvlc.util.HWDecoderUtil
import org.videolan.vlc.R
import org.videolan.vlc.util.AUDIO_DUCKING
import org.videolan.vlc.util.RESUME_PLAYBACK
import org.videolan.vlc.util.VLCInstance
@ExperimentalCoroutinesApi
......@@ -54,9 +55,8 @@ class PreferencesAudio : BasePreferenceFragment(), SharedPreferences.OnSharedPre
findPreference("enable_headset_detection").isVisible = false
findPreference("enable_play_on_headset_insertion").isVisible = false
findPreference("headset_prefs_category").isVisible = false
findPreference("lockscreen_cover").isVisible = false
findPreference(RESUME_PLAYBACK).isVisible = false
findPreference(AUDIO_DUCKING).isVisible = !AndroidUtil.isOOrLater
findPreference("audio_resume_card").isVisible = false
val aout = HWDecoderUtil.getAudioOutputFromDevice()
if (aout != HWDecoderUtil.AudioOutput.ALL) {
......
......@@ -51,13 +51,15 @@ class PreferencesUi : BasePreferenceFragment(), SharedPreferences.OnSharedPrefer
}
override fun onCreate(savedInstanceState: Bundle?) {
Settings.getInstance(activity).run {
if (!contains(FORCE_PLAY_ALL)) edit().putBoolean(FORCE_PLAY_ALL, true).apply()
}
super.onCreate(savedInstanceState)
findPreference("ui_audio_category").isVisible = false
findPreference(FORCE_LIST_PORTRAIT).isVisible = false
findPreference(PREF_TV_UI).isVisible = AndroidDevices.hasTsp
findPreference(KEY_APP_THEME).isVisible = false
findPreference("blurred_cover_background").isVisible = false
findPreference(RESUME_PLAYBACK).isVisible = false
prepareLocaleList()
}
......
......@@ -42,9 +42,6 @@ class PreferencesVideo : BasePreferenceFragment() {
override fun getTitleId() = R.string.video_prefs_category
override fun onCreate(savedInstanceState: Bundle?) {
Settings.getInstance(activity).run {
if (!contains(FORCE_PLAY_ALL)) edit().putBoolean(FORCE_PLAY_ALL, true).apply()
}
super.onCreate(savedInstanceState)
findPreference("secondary_display_category").isVisible = false
......
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