[Android] Refactor the showSnackOrDialog method in UiTools
Nicolas Pomepuy
git at videolan.org
Thu Jun 4 12:32:44 UTC 2026
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Jun 4 11:50:44 2026 +0200| [e249d724a87f6dabc3737cf824c06ea0bd760be4] | committer: Nicolas Pomepuy
Refactor the showSnackOrDialog method in UiTools
> https://code.videolan.org/videolan/vlc-android/commit/e249d724a87f6dabc3737cf824c06ea0bd760be4
---
.../vlc/gui/dialogs/EqualizerFragmentDialog.kt | 22 ++--------------------
.../src/org/videolan/vlc/gui/helpers/UiTools.kt | 18 ++++++++++++++++++
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/dialogs/EqualizerFragmentDialog.kt b/application/vlc-android/src/org/videolan/vlc/gui/dialogs/EqualizerFragmentDialog.kt
index b7945d9dd6..dc179ed282 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/dialogs/EqualizerFragmentDialog.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/dialogs/EqualizerFragmentDialog.kt
@@ -165,7 +165,7 @@ class EqualizerFragmentDialog : VLCBottomSheetDialogFragment(), Slider.OnChangeL
binding.equalizerSettings.setOnClickListener {
if (requireActivity() is VideoPlayerActivity)
- showSnackOrDialog(getString(R.string.equalizer_leave_warning)) {
+ UiTools.showSnackOrDialog(requireActivity(), R.string.equalizer,getString(R.string.equalizer_leave_warning), binding.contextMenuItemSnackbarHost) {
startActivity(Intent(requireActivity(), EqualizerSettingsActivity::class.java))
}
else
@@ -189,7 +189,7 @@ class EqualizerFragmentDialog : VLCBottomSheetDialogFragment(), Slider.OnChangeL
} else {
getString(R.string.confirm_delete_vlc_eq)
}
- showSnackOrDialog(message) {
+ UiTools.showSnackOrDialog(requireActivity(),R.string.equalizer, message, binding.contextMenuItemSnackbarHost) {
viewModel.deleteEqualizer(requireActivity())
}
}
@@ -215,24 +215,6 @@ class EqualizerFragmentDialog : VLCBottomSheetDialogFragment(), Slider.OnChangeL
}
- private fun showSnackOrDialog(message: String, listener: () -> Unit) {
- if (!Settings.showTvUi)
- UiTools.snackerConfirm(requireActivity(), message, forcedView = binding.contextMenuItemSnackbarHost, action = listener)
- else {
- AlertDialog.Builder(requireActivity())
- .setTitle(R.string.equalizer)
- .setMessage(message)
- .setCancelable(true)
- .setPositiveButton(R.string.ok) { _, _ ->
- listener()
- }
- .setNegativeButton(R.string.cancel) { _, _ ->
-
- }
- .show()
- }
- }
-
private fun fillPreamp() {
// preamp
binding.equalizerPreamp.value = viewModel.getCurrentEqualizer().equalizerEntry.preamp.roundToInt().toFloat()
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.kt b/application/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.kt
index 0e949578c0..1daf4ba7ed 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.kt
@@ -426,6 +426,24 @@ object UiTools {
snack.show()
}
+ fun showSnackOrDialog(activity: Activity, @StringRes title: Int, message: String, forcedView: View?, listener: () -> Unit) {
+ if (!Settings.showTvUi)
+ snackerConfirm(activity, message, forcedView = forcedView, action = listener)
+ else {
+ AlertDialog.Builder(activity)
+ .setTitle(title)
+ .setMessage(message)
+ .setCancelable(true)
+ .setPositiveButton(R.string.ok) { _, _ ->
+ listener()
+ }
+ .setNegativeButton(R.string.cancel) { _, _ ->
+
+ }
+ .show()
+ }
+ }
+
/**
* Get a resource id from an attribute id.
*
More information about the Android
mailing list