[Android] Prevent hud to be displayed between videos if video_transition_show is disabled

[Nicolas Pomepuy]

vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Fri Aug  7 09:07:58 2020 +0200| [c2de1f46b0a7cba0c083956147502605b0ce2066] | committer: Nicolas Pomepuy

Prevent hud to be displayed between videos if video_transition_show is disabled

> https://code.videolan.org/videolan/vlc-android/commit/c2de1f46b0a7cba0c083956147502605b0ce2066
---

 application/tools/src/main/java/org/videolan/tools/Settings.kt        | 1 +
 .../vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt | 2 +-
 .../src/org/videolan/vlc/gui/video/VideoPlayerOverlayDelegate.kt      | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

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 c3646b3f9..cada8c50c 100644
--- a/application/tools/src/main/java/org/videolan/tools/Settings.kt
+++ b/application/tools/src/main/java/org/videolan/tools/Settings.kt
@@ -80,6 +80,7 @@ const val LOGIN_STORE = "store_login"
 const val KEY_PLAYBACK_RATE = "playback_rate"
 const val KEY_PLAYBACK_SPEED_PERSIST = "playback_speed"
 const val KEY_VIDEO_APP_SWITCH = "video_action_switch"
+const val VIDEO_TRANSITION_SHOW = "video_transition_show"
 const val RESULT_RESCAN = Activity.RESULT_FIRST_USER + 1
 const val RESULT_RESTART = Activity.RESULT_FIRST_USER + 2
 const val RESULT_RESTART_APP = Activity.RESULT_FIRST_USER + 3
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt b/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt
index 393ce9951..0645f9139 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt
@@ -541,7 +541,7 @@ open class VideoPlayerActivity : AppCompatActivity(), PlaybackService.Callback,
                 overlayDelegate.playlistAdapter.currentIndex = currentMediaPosition
                 overlayDelegate.playlistContainer.setGone()
             }
-            if (settings.getBoolean("video_transition_show", true)) showTitle()
+            if (settings.getBoolean(VIDEO_TRANSITION_SHOW, true)) showTitle()
             initUI()
             lastTime = -1
             forcedTime = lastTime
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerOverlayDelegate.kt b/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerOverlayDelegate.kt
index 4e3f05c93..dfeb9d126 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerOverlayDelegate.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerOverlayDelegate.kt
@@ -366,7 +366,7 @@ class VideoPlayerOverlayDelegate (private val player: VideoPlayerActivity) {
                     hudBinding.abRepeatMarkerA.visibility = if (abvalues.start == -1L) View.GONE else View.VISIBLE
                     hudBinding.abRepeatMarkerB.visibility = if (abvalues.stop == -1L) View.GONE else View.VISIBLE
                     service.manageAbRepeatStep(hudBinding.abRepeatReset, hudBinding.abRepeatStop, hudBinding.abRepeatContainer, abRepeatAddMarker)
-                    showOverlayTimeout(if (abvalues.start == -1L || abvalues.stop == -1L) VideoPlayerActivity.OVERLAY_INFINITE else VideoPlayerActivity.OVERLAY_TIMEOUT)
+                    if (player.settings.getBoolean(VIDEO_TRANSITION_SHOW, true)) showOverlayTimeout(if (abvalues.start == -1L || abvalues.stop == -1L) VideoPlayerActivity.OVERLAY_INFINITE else VideoPlayerActivity.OVERLAY_TIMEOUT)
                 })
                 service.playlistManager.abRepeatOn.observe(player, Observer {
                     hudBinding.abRepeatMarkerGuidelineContainer.visibility = if (it) View.VISIBLE else View.GONE
@@ -394,7 +394,7 @@ class VideoPlayerOverlayDelegate (private val player: VideoPlayerActivity) {
                 updateOrientationIcon()
                 overlayBackground = player.findViewById(R.id.player_overlay_background)
                 if (!AndroidDevices.isChromeBook && !player.isTv
-                        && Settings.getInstance(player).getBoolean("enable_casting", true)) {
+                        && player.settings.getBoolean("enable_casting", true)) {
                     PlaybackService.renderer.observe(player, Observer { rendererItem -> hudRightBinding.videoRenderer.setImageDrawable(AppCompatResources.getDrawable(player, if (rendererItem == null) R.drawable.ic_player_renderer else R.drawable.ic_player_renderer_on)) })
                     RendererDelegate.renderers.observe(player, Observer<List<RendererItem>> { rendererItems -> updateRendererVisibility() })
                 }