From 1f8bb954a0627d43bd9ec1dbe6793331fe9d918b Mon Sep 17 00:00:00 2001
From: Xilin Jia <6257601+XilinJia@users.noreply.github.com>
Date: Sat, 13 Apr 2024 19:45:51 +0000
Subject: [PATCH] 4.8.0 commit

---
 README.md                                     |   4 +
 app/build.gradle                              |   5 +-
 app/src/main/AndroidManifest.xml              |   3 +-
 .../podcini/playback/PlaybackController.kt    |   8 +
 .../playback/service/PlaybackService.kt       |   1 +
 .../PlaybackServiceNotificationBuilder.kt     |  37 +-
 .../podcini/preferences/UserPreferences.kt    |  19 +
 .../fragments/PlaybackPreferencesFragment.kt  |  12 +-
 .../mdiq/podcini/ui/activity/MainActivity.kt  |   3 +
 .../activity/PlaybackSpeedDialogActivity.kt   |   2 +-
 .../ui/activity/SelectSubscriptionActivity.kt |   6 +-
 .../ui/activity/VideoplayerActivity.kt        | 596 ++++--------------
 .../podcini/ui/dialog/VariableSpeedDialog.kt  |  21 +-
 .../mdiq/podcini/ui/dialog/VideoModeDialog.kt |  33 +
 .../ui/fragment/AudioPlayerFragment.kt        |  36 +-
 .../ui/fragment/PlayerDetailsFragment.kt      |  12 +-
 .../ui/fragment/VideoEpisodeFragment.kt       | 571 +++++++++++++++++
 .../podcini/ui/view/AspectRatioVideoView.kt   |  19 +-
 .../mdiq/podcini/ui/widget/WidgetUpdater.kt   |  33 +-
 .../res/drawable/baseline_fullscreen_24.xml   |  10 +
 .../res/layout/video_episode_fragment.xml     | 196 ++++++
 .../main/res/layout/videoplayer_activity.xml  | 169 +----
 .../mipmap-xxxhdpi/ic_launcher_monochrome.png | Bin 10627 -> 0 bytes
 app/src/main/res/values/arrays.xml            |  11 +
 app/src/main/res/values/strings.xml           |   6 +
 app/src/main/res/values/styles.xml            |  10 +
 app/src/main/res/xml/preferences_playback.xml |   5 +
 .../res/xml/preferences_user_interface.xml    |   2 +-
 changelog.md                                  |  14 +-
 .../android/en-US/changelogs/3020130.txt      |  12 +
 30 files changed, 1122 insertions(+), 734 deletions(-)
 create mode 100644 app/src/main/java/ac/mdiq/podcini/ui/dialog/VideoModeDialog.kt
 create mode 100644 app/src/main/java/ac/mdiq/podcini/ui/fragment/VideoEpisodeFragment.kt
 create mode 100644 app/src/main/res/drawable/baseline_fullscreen_24.xml
 create mode 100644 app/src/main/res/layout/video_episode_fragment.xml
 delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
 create mode 100644 fastlane/metadata/android/en-US/changelogs/3020130.txt

diff --git a/README.md b/README.md
index 4bfad593..04461830 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,10 @@ Even so, the database remains backward compatible, and AntennaPod's db can be ea
   * enabled intro- and end- skipping
   * mark as played when finished
   * streamed media is added to queue and is resumed after restart
+* new video episode view, with video player on top and episode descriptions in portrait mode
+* easy switches on video player to other video mode or audio only
+* default video player mode setting in preferences
+* when video mode is set to audio only, click on image on audio player on a video episode brings up the normal player detailed view
 
 ### Podcast/Episode list
 
diff --git a/app/build.gradle b/app/build.gradle
index f09c6907..37b7b5c8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -149,8 +149,8 @@ android {
         // Version code schema (not used):
         // "1.2.3-beta4"    -> 1020304
         // "1.2.3"          -> 1020395
-        versionCode 3020129
-        versionName "4.7.1"
+        versionCode 3020130
+        versionName "4.8.0"
 
         def commit = ""
         try {
@@ -238,6 +238,7 @@ dependencies {
     implementation "androidx.work:work-runtime:2.9.0"
     implementation "androidx.core:core-splashscreen:1.0.1"
     implementation 'androidx.documentfile:documentfile:1.0.1'
+    implementation 'androidx.webkit:webkit:1.9.0'
 
     implementation "com.google.android.material:material:1.11.0"
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a2b9ef2e..39b4ccdc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -246,11 +246,12 @@
                     android:value="ac.mdiq.podcini.ui.activity.PreferenceActivity"/>
         </activity>
 
+        <!--            android:screenOrientation="sensorLandscape"-->
+
         <activity
             android:name=".ui.activity.VideoplayerActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize"
             android:supportsPictureInPicture="true"
-            android:screenOrientation="sensorLandscape"
             android:exported="false">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/app/src/main/java/ac/mdiq/podcini/playback/PlaybackController.kt b/app/src/main/java/ac/mdiq/podcini/playback/PlaybackController.kt
index c887cf9b..f11d14e8 100644
--- a/app/src/main/java/ac/mdiq/podcini/playback/PlaybackController.kt
+++ b/app/src/main/java/ac/mdiq/podcini/playback/PlaybackController.kt
@@ -267,6 +267,14 @@ abstract class PlaybackController(private val activity: FragmentActivity) {
         }
     }
 
+    fun ensureService() {
+        if (media == null) return
+        if (playbackService == null) {
+            PlaybackServiceStarter(activity, media!!).start()
+            Log.w(TAG, "playbackservice was null, restarted!")
+        }
+    }
+
     fun playPause() {
         if (media == null) return
         if (playbackService == null) {
diff --git a/app/src/main/java/ac/mdiq/podcini/playback/service/PlaybackService.kt b/app/src/main/java/ac/mdiq/podcini/playback/service/PlaybackService.kt
index 2d036bf6..e3b82c63 100644
--- a/app/src/main/java/ac/mdiq/podcini/playback/service/PlaybackService.kt
+++ b/app/src/main/java/ac/mdiq/podcini/playback/service/PlaybackService.kt
@@ -1626,6 +1626,7 @@ class PlaybackService : MediaBrowserServiceCompat() {
             mediaPlayer?.setPlaybackParams(speed, isSkipSilence)
         } else {
             if (codeArray != null && codeArray.size == 3) {
+                Log.d(TAG, "setSpeed codeArray: ${codeArray[0]} ${codeArray[1]} ${codeArray[2]}")
                 if (codeArray[2]) setPlaybackSpeed(speed)
                 if (codeArray[1]) {
                     var item = (playable as? FeedMedia)?.item ?: currentitem
diff --git a/app/src/main/java/ac/mdiq/podcini/playback/service/PlaybackServiceNotificationBuilder.kt b/app/src/main/java/ac/mdiq/podcini/playback/service/PlaybackServiceNotificationBuilder.kt
index 50577a23..2d2b6e46 100644
--- a/app/src/main/java/ac/mdiq/podcini/playback/service/PlaybackServiceNotificationBuilder.kt
+++ b/app/src/main/java/ac/mdiq/podcini/playback/service/PlaybackServiceNotificationBuilder.kt
@@ -62,28 +62,21 @@ class PlaybackServiceNotificationBuilder(private val context: Context) {
         val iconSize = (128 * context.resources.displayMetrics.density).toInt()
         val options = RequestOptions().centerCrop()
         try {
-            var imgLoc = playable?.getImageLocation()
-            when {
-                !imgLoc.isNullOrBlank() -> {
-                    cachedIcon = Glide.with(context)
-                        .asBitmap()
-                        .load(imgLoc)
-                        .apply(options)
-                        .submit(iconSize, iconSize)
-                        .get()
-                }
-                playable != null -> {
-                    imgLoc = ImageResourceUtils.getFallbackImageLocation(playable!!)
-                    if (!imgLoc.isNullOrBlank()) {
-                        cachedIcon = Glide.with(context)
-                            .asBitmap()
-                            .load(imgLoc)
-                            .apply(options)
-                            .submit(iconSize, iconSize)
-                            .get()
-                    }
-                }
-            }
+            val imgLoc = playable?.getImageLocation()
+            val imgLoc1 = ImageResourceUtils.getFallbackImageLocation(playable!!)
+            Log.d(TAG, "loadIcon imgLoc $imgLoc $imgLoc1")
+            cachedIcon = Glide.with(context)
+                .asBitmap()
+                .load(imgLoc)
+                .error(Glide.with(context)
+                    .asBitmap()
+                    .load(imgLoc1)
+                    .apply(options)
+                    .submit(iconSize, iconSize)
+                    .get())
+                .apply(options)
+                .submit(iconSize, iconSize)
+                .get()
         } catch (ignore: InterruptedException) {
             Log.e(TAG, "Media icon loader was interrupted")
         } catch (tr: Throwable) {
diff --git a/app/src/main/java/ac/mdiq/podcini/preferences/UserPreferences.kt b/app/src/main/java/ac/mdiq/podcini/preferences/UserPreferences.kt
index af830e41..1190e4f6 100644
--- a/app/src/main/java/ac/mdiq/podcini/preferences/UserPreferences.kt
+++ b/app/src/main/java/ac/mdiq/podcini/preferences/UserPreferences.kt
@@ -111,6 +111,7 @@ object UserPreferences {
     private const val PREF_FAST_FORWARD_SECS = "prefFastForwardSecs"
     private const val PREF_REWIND_SECS = "prefRewindSecs"
     private const val PREF_QUEUE_LOCKED = "prefQueueLocked"
+    private const val PREF_VIDEO_MODE = "prefVideoPlaybackMode"
 
     // Experimental
     const val EPISODE_CLEANUP_QUEUE: Int = -1
@@ -410,6 +411,17 @@ object UserPreferences {
             }
         }
 
+    val videoPlayMode: Int
+        get() {
+            try {
+                return prefs.getString(PREF_VIDEO_MODE, "1")!!.toInt()
+            } catch (e: NumberFormatException) {
+                Log.e(TAG, Log.getStackTraceString(e))
+                setVideoMode(1)
+                return 1
+            }
+        }
+
     @JvmStatic
     var videoPlaybackSpeed: Float
         get() {
@@ -661,6 +673,13 @@ object UserPreferences {
             .apply()
     }
 
+    @JvmStatic
+    fun setVideoMode(mode: Int) {
+        prefs.edit()
+            .putString(PREF_VIDEO_MODE, mode.toString())
+            .apply()
+    }
+
     @JvmStatic
     fun setAutodownloadSelectedNetworks(value: Array<String?>?) {
         prefs.edit()
diff --git a/app/src/main/java/ac/mdiq/podcini/preferences/fragments/PlaybackPreferencesFragment.kt b/app/src/main/java/ac/mdiq/podcini/preferences/fragments/PlaybackPreferencesFragment.kt
index d9ef558c..8122a21c 100644
--- a/app/src/main/java/ac/mdiq/podcini/preferences/fragments/PlaybackPreferencesFragment.kt
+++ b/app/src/main/java/ac/mdiq/podcini/preferences/fragments/PlaybackPreferencesFragment.kt
@@ -5,10 +5,7 @@ import ac.mdiq.podcini.preferences.UsageStatistics
 import ac.mdiq.podcini.preferences.UsageStatistics.doNotAskAgain
 import ac.mdiq.podcini.preferences.UserPreferences
 import ac.mdiq.podcini.ui.activity.PreferenceActivity
-import ac.mdiq.podcini.ui.dialog.EditFallbackSpeedDialog
-import ac.mdiq.podcini.ui.dialog.EditForwardSpeedDialog
-import ac.mdiq.podcini.ui.dialog.SkipPreferenceDialog
-import ac.mdiq.podcini.ui.dialog.VariableSpeedDialog
+import ac.mdiq.podcini.ui.dialog.*
 import ac.mdiq.podcini.util.event.UnreadItemsUpdateEvent
 import android.app.Activity
 import android.os.Build
@@ -47,6 +44,12 @@ class PlaybackPreferencesFragment : PreferenceFragmentCompat() {
                 SkipPreferenceDialog.showSkipPreference(requireContext(), SkipPreferenceDialog.SkipDirection.SKIP_REWIND, null)
                 true
             }
+        findPreference<Preference>(PREF_PLAYBACK_VIDEO_MODE_LAUNCHER)?.onPreferenceClickListener =
+            Preference.OnPreferenceClickListener {
+                VideoModeDialog.showDialog(requireContext())
+                true
+            }
+
         findPreference<Preference>(PREF_PLAYBACK_SPEED_FORWARD_LAUNCHER)!!.onPreferenceClickListener =
             Preference.OnPreferenceClickListener {
                 EditForwardSpeedDialog(requireActivity()).show()
@@ -138,5 +141,6 @@ class PlaybackPreferencesFragment : PreferenceFragmentCompat() {
         private const val PREF_PLAYBACK_SPEED_FORWARD_LAUNCHER = "prefPlaybackSpeedForwardLauncher"
         private const val PREF_PLAYBACK_FAST_FORWARD_DELTA_LAUNCHER = "prefPlaybackFastForwardDeltaLauncher"
         private const val PREF_PLAYBACK_PREFER_STREAMING = "prefStreamOverDownload"
+        private const val PREF_PLAYBACK_VIDEO_MODE_LAUNCHER = "prefPlaybackVideoModeLauncher"
     }
 }
diff --git a/app/src/main/java/ac/mdiq/podcini/ui/activity/MainActivity.kt b/app/src/main/java/ac/mdiq/podcini/ui/activity/MainActivity.kt
index e5600a95..b62ad692 100644
--- a/app/src/main/java/ac/mdiq/podcini/ui/activity/MainActivity.kt
+++ b/app/src/main/java/ac/mdiq/podcini/ui/activity/MainActivity.kt
@@ -286,6 +286,9 @@ class MainActivity : CastEnabledActivity() {
          }
         override fun onSlide(view: View, slideOffset: Float) {
             val audioPlayer = supportFragmentManager.findFragmentByTag(AudioPlayerFragment.TAG) as? AudioPlayerFragment ?: return
+//            if (slideOffset == 0.0f) { //STATE_COLLAPSED
+//                audioPlayer.scrollToTop()
+//            }
             audioPlayer.fadePlayerToToolbar(slideOffset)
         }
     }
diff --git a/app/src/main/java/ac/mdiq/podcini/ui/activity/PlaybackSpeedDialogActivity.kt b/app/src/main/java/ac/mdiq/podcini/ui/activity/PlaybackSpeedDialogActivity.kt
index 661bc743..d3a1fa57 100644
--- a/app/src/main/java/ac/mdiq/podcini/ui/activity/PlaybackSpeedDialogActivity.kt
+++ b/app/src/main/java/ac/mdiq/podcini/ui/activity/PlaybackSpeedDialogActivity.kt
@@ -11,7 +11,7 @@ class PlaybackSpeedDialogActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         setTheme(getTranslucentTheme(this))
         super.onCreate(savedInstanceState)
-        val speedDialog: VariableSpeedDialog? = VariableSpeedDialog.newInstance(booleanArrayOf(false, false, true), 2)
+        val speedDialog: VariableSpeedDialog? = VariableSpeedDialog.newInstance(booleanArrayOf(true, true, true), 2)
         speedDialog?.show(supportFragmentManager, null)
     }
 
diff --git a/app/src/main/java/ac/mdiq/podcini/ui/activity/SelectSubscriptionActivity.kt b/app/src/main/java/ac/mdiq/podcini/ui/activity/SelectSubscriptionActivity.kt
index d25ce3ad..5d98816a 100644
--- a/app/src/main/java/ac/mdiq/podcini/ui/activity/SelectSubscriptionActivity.kt
+++ b/app/src/main/java/ac/mdiq/podcini/ui/activity/SelectSubscriptionActivity.kt
@@ -113,15 +113,13 @@ class SelectSubscriptionActivity : AppCompatActivity() {
             .apply(RequestOptions.overrideOf(iconSize, iconSize))
             .listener(object : RequestListener<Bitmap?> {
                 @UnstableApi override fun onLoadFailed(e: GlideException?, model: Any?,
-                                                       target: Target<Bitmap?>, isFirstResource: Boolean
-                ): Boolean {
+                                                       target: Target<Bitmap?>, isFirstResource: Boolean): Boolean {
                     addShortcut(feed, null)
                     return true
                 }
 
                 @UnstableApi override fun onResourceReady(resource: Bitmap, model: Any,
-                                                          target: Target<Bitmap?>, dataSource: DataSource, isFirstResource: Boolean
-                ): Boolean {
+                                                          target: Target<Bitmap?>, dataSource: DataSource, isFirstResource: Boolean): Boolean {
                     addShortcut(feed, resource)
                     return true
                 }
diff --git a/app/src/main/java/ac/mdiq/podcini/ui/activity/VideoplayerActivity.kt b/app/src/main/java/ac/mdiq/podcini/ui/activity/VideoplayerActivity.kt
index 959aa21e..46358742 100644
--- a/app/src/main/java/ac/mdiq/podcini/ui/activity/VideoplayerActivity.kt
+++ b/app/src/main/java/ac/mdiq/podcini/ui/activity/VideoplayerActivity.kt
@@ -1,107 +1,106 @@
 package ac.mdiq.podcini.ui.activity
 
 import ac.mdiq.podcini.R
+import ac.mdiq.podcini.databinding.VideoplayerActivityBinding
+import ac.mdiq.podcini.playback.cast.CastEnabledActivity
 import ac.mdiq.podcini.playback.service.PlaybackService.Companion.getPlayerActivityIntent
 import ac.mdiq.podcini.playback.service.PlaybackService.Companion.isCasting
-import ac.mdiq.podcini.storage.DBReader
+import ac.mdiq.podcini.preferences.UserPreferences.videoPlayMode
 import ac.mdiq.podcini.storage.DBWriter
-import ac.mdiq.podcini.util.Converter.getDurationStringLong
-import ac.mdiq.podcini.util.FeedItemUtil.getLinkWithFallback
-import ac.mdiq.podcini.util.IntentUtils.openInBrowser
-import ac.mdiq.podcini.util.ShareUtils.hasLinkToShare
-import ac.mdiq.podcini.util.TimeSpeedConverter
-import ac.mdiq.podcini.ui.utils.PictureInPictureUtil
-import ac.mdiq.podcini.playback.PlaybackController
-import ac.mdiq.podcini.databinding.VideoplayerActivityBinding
-import ac.mdiq.podcini.ui.dialog.*
-import ac.mdiq.podcini.util.event.playback.BufferUpdateEvent
-import ac.mdiq.podcini.util.event.playback.PlaybackPositionEvent
-import ac.mdiq.podcini.util.event.playback.PlaybackServiceEvent
-import ac.mdiq.podcini.util.event.playback.SleepTimerUpdatedEvent
-import ac.mdiq.podcini.ui.fragment.ChaptersFragment
 import ac.mdiq.podcini.storage.model.feed.FeedItem
 import ac.mdiq.podcini.storage.model.feed.FeedMedia
 import ac.mdiq.podcini.storage.model.playback.Playable
-import ac.mdiq.podcini.playback.base.PlayerStatus
-import ac.mdiq.podcini.playback.cast.CastEnabledActivity
-import ac.mdiq.podcini.preferences.UserPreferences.fastForwardSecs
-import ac.mdiq.podcini.preferences.UserPreferences.rewindSecs
-import ac.mdiq.podcini.preferences.UserPreferences.setShowRemainTimeSetting
-import ac.mdiq.podcini.preferences.UserPreferences.shouldShowRemainingTime
-import ac.mdiq.podcini.ui.activity.appstartintent.MainActivityStarter
+import ac.mdiq.podcini.ui.dialog.*
+import ac.mdiq.podcini.ui.fragment.ChaptersFragment
+import ac.mdiq.podcini.ui.fragment.VideoEpisodeFragment
+import ac.mdiq.podcini.ui.utils.PictureInPictureUtil
+import ac.mdiq.podcini.util.FeedItemUtil.getLinkWithFallback
+import ac.mdiq.podcini.util.IntentUtils.openInBrowser
+import ac.mdiq.podcini.util.ShareUtils.hasLinkToShare
 import ac.mdiq.podcini.util.event.MessageEvent
 import ac.mdiq.podcini.util.event.PlayerErrorEvent
+import ac.mdiq.podcini.util.event.playback.PlaybackServiceEvent
+import ac.mdiq.podcini.util.event.playback.SleepTimerUpdatedEvent
 import android.content.DialogInterface
 import android.content.Intent
+import android.content.pm.ActivityInfo
 import android.graphics.PixelFormat
 import android.graphics.drawable.ColorDrawable
 import android.media.AudioManager
 import android.os.Build
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.util.Log
 import android.view.*
-import android.view.View.OnTouchListener
-import android.view.animation.*
+import android.view.MenuItem.SHOW_AS_ACTION_NEVER
 import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.SeekBar
-import android.widget.SeekBar.OnSeekBarChangeListener
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import androidx.media3.common.util.UnstableApi
 import com.bumptech.glide.Glide
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
-import io.reactivex.schedulers.Schedulers
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
+
 /**
  * Activity for playing video files.
  */
 @UnstableApi
-class VideoplayerActivity : CastEnabledActivity(), OnSeekBarChangeListener {
+class VideoplayerActivity : CastEnabledActivity() {
 
     private var _binding: VideoplayerActivityBinding? = null
     private val binding get() = _binding!!
 
-    /**
-     * True if video controls are currently visible.
-     */
-    private var videoControlsShowing = true
-    private var videoSurfaceCreated = false
-    private var destroyingDueToReload = false
-    private var lastScreenTap: Long = 0
-    private val videoControlsHider = Handler(Looper.getMainLooper())
-    private var controller: PlaybackController? = null
-    private var showTimeLeft = false
-    private var isFavorite = false
-    private var switchToAudioOnly = false
-    private var disposable: Disposable? = null
-    private var prog = 0f
+    lateinit var videoEpisodeFragment: VideoEpisodeFragment
+
+    var videoMode = 0
+    var switchToAudioOnly = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-        window.addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN)
-        // has to be called before setting layout content
-        supportRequestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY)
-        setTheme(R.style.Theme_Podcini_VideoPlayer)
+
+        videoMode = intent.getIntExtra("fullScreenMode",0)
+        if (videoMode == 0) {
+            videoMode = videoPlayMode
+            if (videoMode == AUDIO_ONLY) {
+                switchToAudioOnly = true
+                finish()
+            }
+            if (videoMode != FULL_SCREEN_VIEW && videoMode != WINDOW_VIEW) {
+                Log.i(TAG, "videoMode not selected, use window mode")
+                videoMode = WINDOW_VIEW
+            }
+        }
+
+        when (videoMode) {
+            FULL_SCREEN_VIEW -> {
+                window.addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN)
+                // has to be called before setting layout content
+                supportRequestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY)
+                setTheme(R.style.Theme_Podcini_VideoPlayer)
+                requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+                window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
+                window.setFormat(PixelFormat.TRANSPARENT)
+            }
+            WINDOW_VIEW -> {
+                supportRequestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY)
+                setTheme(R.style.Theme_Podcini_VideoEpisode)
+                requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+                window.setFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN, WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN)
+                window.setFormat(PixelFormat.TRANSPARENT)
+            }
+        }
         super.onCreate(savedInstanceState)
 
-        window.setFormat(PixelFormat.TRANSPARENT)
         _binding = VideoplayerActivityBinding.inflate(LayoutInflater.from(this))
         setContentView(binding.root)
-        setupView()
         supportActionBar?.setBackgroundDrawable(ColorDrawable(-0x80000000))
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        controller = newPlaybackController()
-        controller!!.init()
-        loadMediaInfo()
+        val fm = supportFragmentManager
+        val transaction = fm.beginTransaction()
+        videoEpisodeFragment = VideoEpisodeFragment()
+        transaction.replace(R.id.main_view, videoEpisodeFragment, VideoEpisodeFragment.TAG)
+        transaction.commit()
     }
 
     @UnstableApi
@@ -111,7 +110,7 @@ class VideoplayerActivity : CastEnabledActivity(), OnSeekBarChangeListener {
         if (isCasting) {
             val intent = getPlayerActivityIntent(this)
             if (intent.component?.className != VideoplayerActivity::class.java.name) {
-                destroyingDueToReload = true
+                videoEpisodeFragment.destroyingDueToReload = true
                 finish()
                 startActivity(intent)
             }
@@ -120,21 +119,17 @@ class VideoplayerActivity : CastEnabledActivity(), OnSeekBarChangeListener {
 
     override fun onDestroy() {
         super.onDestroy()
+        window.clearFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN)
+        window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+        window.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN)
         _binding = null
-        controller?.release()
-        controller = null // prevent leak
-        disposable?.dispose()
     }
 
     @UnstableApi
     override fun onStop() {
         EventBus.getDefault().unregister(this)
         super.onStop()
-        if (!PictureInPictureUtil.isInPictureInPictureMode(this)) {
-            videoControlsHider.removeCallbacks(hideVideoControls)
-        }
-        // Controller released; we will not receive buffering updates
-        binding.progressBar.visibility = View.GONE
     }
 
     public override fun onUserLeaveHint() {
@@ -146,20 +141,9 @@ class VideoplayerActivity : CastEnabledActivity(), OnSeekBarChangeListener {
     @UnstableApi
     override fun onStart() {
         super.onStart()
-        onPositionObserverUpdate()
         EventBus.getDefault().register(this)
     }
 
-    @UnstableApi
-    override fun onPause() {
-        if (!PictureInPictureUtil.isInPictureInPictureMode(this)) {
-            if (controller?.status == PlayerStatus.PLAYING) {
-                controller!!.pause()
-            }
-        }
-        super.onPause()
-    }
-
     override fun onTrimMemory(level: Int) {
         super.onTrimMemory(level)
         Glide.get(this).trimMemory(level)
@@ -170,47 +154,11 @@ class VideoplayerActivity : CastEnabledActivity(), OnSeekBarChangeListener {
         Glide.get(this).clearMemory()
     }
 
-    @UnstableApi
-    private fun newPlaybackController(): PlaybackController {
-        return object : PlaybackController(this@VideoplayerActivity) {
-            override fun updatePlayButtonShowsPlay(showPlay: Boolean) {
-                binding.playButton.setIsShowPlay(showPlay)
-                if (showPlay) {
-                    window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-                } else {
-                    window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-                    setupVideoAspectRatio()
-                    if (videoSurfaceCreated && controller != null) {
-                        Log.d(TAG, "Videosurface already created, setting videosurface now")
-                        controller!!.setVideoSurface(binding.videoView.holder)
-                    }
-                }
-            }
-
-            override fun loadMediaInfo() {
-                this@VideoplayerActivity.loadMediaInfo()
-            }
-
-            override fun onPlaybackEnd() {
-                finish()
-            }
-        }
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    @Suppress("unused")
-    fun bufferUpdate(event: BufferUpdateEvent) {
-        when {
-            event.hasStarted() -> {
-                binding.progressBar.visibility = View.VISIBLE
-            }
-            event.hasEnded() -> {
-                binding.progressBar.visibility = View.INVISIBLE
-            }
-            else -> {
-                binding.sbPosition.secondaryProgress = (event.progress * binding.sbPosition.max).toInt()
-            }
-        }
+    fun toggleViews() {
+        val newIntent = Intent(this, VideoplayerActivity::class.java)
+        newIntent.putExtra("fullScreenMode", if (videoMode == FULL_SCREEN_VIEW) WINDOW_VIEW else FULL_SCREEN_VIEW)
+        finish()
+        startActivity(newIntent)
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -221,266 +169,6 @@ class VideoplayerActivity : CastEnabledActivity(), OnSeekBarChangeListener {
         }
     }
 
-    @UnstableApi
-    private fun loadMediaInfo() {
-        Log.d(TAG, "loadMediaInfo()")
-        if (controller?.getMedia() == null) return
-
-        if (controller!!.status == PlayerStatus.PLAYING && !controller!!.isPlayingVideoLocally) {
-            Log.d(TAG, "Closing, no longer video")
-            destroyingDueToReload = true
-            finish()
-            MainActivityStarter(this).withOpenPlayer().start()
-            return
-        }
-        showTimeLeft = shouldShowRemainingTime()
-        onPositionObserverUpdate()
-        checkFavorite()
-        val media = controller!!.getMedia()
-        if (media != null) {
-            supportActionBar!!.subtitle = media.getEpisodeTitle()
-            supportActionBar!!.title = media.getFeedTitle()
-        }
-    }
-
-    @UnstableApi
-    private fun setupView() {
-        showTimeLeft = shouldShowRemainingTime()
-        Log.d("timeleft", if (showTimeLeft) "true" else "false")
-        binding.durationLabel.setOnClickListener {
-            showTimeLeft = !showTimeLeft
-            val media = controller?.getMedia() ?: return@setOnClickListener
-
-            val converter = TimeSpeedConverter(controller!!.currentPlaybackSpeedMultiplier)
-            val length: String
-            if (showTimeLeft) {
-                val remainingTime = converter.convert(media.getDuration() - media.getPosition())
-                length = "-" + getDurationStringLong(remainingTime)
-            } else {
-                val duration = converter.convert(media.getDuration())
-                length = getDurationStringLong(duration)
-            }
-            binding.durationLabel.text = length
-
-            setShowRemainTimeSetting(showTimeLeft)
-            Log.d("timeleft on click", if (showTimeLeft) "true" else "false")
-        }
-
-        binding.sbPosition.setOnSeekBarChangeListener(this)
-        binding.rewindButton.setOnClickListener { onRewind() }
-        binding.rewindButton.setOnLongClickListener {
-            SkipPreferenceDialog.showSkipPreference(this@VideoplayerActivity,
-                SkipPreferenceDialog.SkipDirection.SKIP_REWIND, null)
-            true
-        }
-        binding.playButton.setIsVideoScreen(true)
-        binding.playButton.setOnClickListener { onPlayPause() }
-        binding.fastForwardButton.setOnClickListener { onFastForward() }
-        binding.fastForwardButton.setOnLongClickListener {
-            SkipPreferenceDialog.showSkipPreference(this@VideoplayerActivity,
-                SkipPreferenceDialog.SkipDirection.SKIP_FORWARD, null)
-            false
-        }
-        // To suppress touches directly below the slider
-        binding.bottomControlsContainer.setOnTouchListener { _: View?, _: MotionEvent? -> true }
-        binding.bottomControlsContainer.fitsSystemWindows = true
-        binding.videoView.holder.addCallback(surfaceHolderCallback)
-        binding.videoView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-
-        setupVideoControlsToggler()
-        window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
-
-        binding.videoPlayerContainer.setOnTouchListener(onVideoviewTouched)
-        binding.videoPlayerContainer.viewTreeObserver.addOnGlobalLayoutListener {
-            binding.videoView.setAvailableSize(
-                binding.videoPlayerContainer.width.toFloat(), binding.videoPlayerContainer.height.toFloat())
-        }
-    }
-
-    private val hideVideoControls = Runnable {
-        if (videoControlsShowing) {
-            Log.d(TAG, "Hiding video controls")
-            supportActionBar?.hide()
-            hideVideoControls(true)
-            videoControlsShowing = false
-        }
-    }
-
-    private val onVideoviewTouched = OnTouchListener { v: View, event: MotionEvent ->
-        if (event.action != MotionEvent.ACTION_DOWN) return@OnTouchListener false
-
-        if (PictureInPictureUtil.isInPictureInPictureMode(this)) return@OnTouchListener true
-
-        videoControlsHider.removeCallbacks(hideVideoControls)
-
-        if (System.currentTimeMillis() - lastScreenTap < 300) {
-            if (event.x > v.measuredWidth / 2.0f) {
-                onFastForward()
-                showSkipAnimation(true)
-            } else {
-                onRewind()
-                showSkipAnimation(false)
-            }
-            if (videoControlsShowing) {
-                supportActionBar?.hide()
-                hideVideoControls(false)
-                videoControlsShowing = false
-            }
-            return@OnTouchListener true
-        }
-
-        toggleVideoControlsVisibility()
-        if (videoControlsShowing) setupVideoControlsToggler()
-
-        lastScreenTap = System.currentTimeMillis()
-        true
-    }
-
-    private fun showSkipAnimation(isForward: Boolean) {
-        val skipAnimation = AnimationSet(true)
-        skipAnimation.addAnimation(ScaleAnimation(1f, 2f, 1f, 2f,
-            Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f))
-        skipAnimation.addAnimation(AlphaAnimation(1f, 0f))
-        skipAnimation.fillAfter = false
-        skipAnimation.duration = 800
-
-        val params = binding.skipAnimationImage.layoutParams as FrameLayout.LayoutParams
-        if (isForward) {
-            binding.skipAnimationImage.setImageResource(R.drawable.ic_fast_forward_video_white)
-            params.gravity = Gravity.RIGHT or Gravity.CENTER_VERTICAL
-        } else {
-            binding.skipAnimationImage.setImageResource(R.drawable.ic_fast_rewind_video_white)
-            params.gravity = Gravity.LEFT or Gravity.CENTER_VERTICAL
-        }
-
-        binding.skipAnimationImage.visibility = View.VISIBLE
-        binding.skipAnimationImage.layoutParams = params
-        binding.skipAnimationImage.startAnimation(skipAnimation)
-        skipAnimation.setAnimationListener(object : Animation.AnimationListener {
-            override fun onAnimationStart(animation: Animation) {
-            }
-
-            override fun onAnimationEnd(animation: Animation) {
-                binding.skipAnimationImage.visibility = View.GONE
-            }
-
-            override fun onAnimationRepeat(animation: Animation) {
-            }
-        })
-    }
-
-    private fun setupVideoControlsToggler() {
-        videoControlsHider.removeCallbacks(hideVideoControls)
-        videoControlsHider.postDelayed(hideVideoControls, 2500)
-    }
-
-    @UnstableApi
-    private fun setupVideoAspectRatio() {
-        if (videoSurfaceCreated && controller != null) {
-            val videoSize = controller!!.videoSize
-            if (videoSize != null && videoSize.first > 0 && videoSize.second > 0) {
-                Log.d(TAG, "Width,height of video: " + videoSize.first + ", " + videoSize.second)
-                binding.videoView.setVideoSize(videoSize.first, videoSize.second)
-            } else {
-                Log.e(TAG, "Could not determine video size")
-            }
-        }
-    }
-
-    private fun toggleVideoControlsVisibility() {
-        if (videoControlsShowing) {
-            supportActionBar?.hide()
-            hideVideoControls(true)
-        } else {
-            supportActionBar?.show()
-            showVideoControls()
-        }
-        videoControlsShowing = !videoControlsShowing
-    }
-
-    @UnstableApi
-    fun onRewind() {
-        if (controller == null) return
-
-        val curr = controller!!.position
-        controller!!.seekTo(curr - rewindSecs * 1000)
-        setupVideoControlsToggler()
-    }
-
-    @UnstableApi
-    fun onPlayPause() {
-        if (controller == null) return
-
-        controller!!.playPause()
-        setupVideoControlsToggler()
-    }
-
-    @UnstableApi
-    fun onFastForward() {
-        if (controller == null) return
-
-        val curr = controller!!.position
-        controller!!.seekTo(curr + fastForwardSecs * 1000)
-        setupVideoControlsToggler()
-    }
-
-    private val surfaceHolderCallback: SurfaceHolder.Callback = object : SurfaceHolder.Callback {
-        override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
-            holder.setFixedSize(width, height)
-        }
-
-        @UnstableApi
-        override fun surfaceCreated(holder: SurfaceHolder) {
-            Log.d(TAG, "Videoview holder created")
-            videoSurfaceCreated = true
-            if (controller?.status == PlayerStatus.PLAYING) {
-                controller!!.setVideoSurface(holder)
-            }
-            setupVideoAspectRatio()
-        }
-
-        override fun surfaceDestroyed(holder: SurfaceHolder) {
-            Log.d(TAG, "Videosurface was destroyed")
-            videoSurfaceCreated = false
-            if (controller != null && !destroyingDueToReload && !switchToAudioOnly) {
-                controller!!.notifyVideoSurfaceAbandoned()
-            }
-        }
-    }
-
-    private fun showVideoControls() {
-        binding.bottomControlsContainer.visibility = View.VISIBLE
-        binding.controlsContainer.visibility = View.VISIBLE
-        val animation = AnimationUtils.loadAnimation(this, R.anim.fade_in)
-        if (animation != null) {
-            binding.bottomControlsContainer.startAnimation(animation)
-            binding.controlsContainer.startAnimation(animation)
-        }
-        binding.videoView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
-    }
-
-    private fun hideVideoControls(showAnimation: Boolean) {
-        if (showAnimation) {
-            val animation = AnimationUtils.loadAnimation(this, R.anim.fade_out)
-            if (animation != null) {
-                binding.bottomControlsContainer.startAnimation(animation)
-                binding.controlsContainer.startAnimation(animation)
-            }
-        }
-        window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_LOW_PROFILE
-                or View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION)
-        binding.bottomControlsContainer.fitsSystemWindows = true
-
-        binding.bottomControlsContainer.visibility = View.GONE
-        binding.controlsContainer.visibility = View.GONE
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onEventMainThread(event: PlaybackPositionEvent?) {
-        onPositionObserverUpdate()
-    }
-
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onPlaybackServiceChanged(event: PlaybackServiceEvent) {
         if (event.action == PlaybackServiceEvent.Action.SERVICE_SHUT_DOWN) {
@@ -516,9 +204,9 @@ class VideoplayerActivity : CastEnabledActivity(), OnSeekBarChangeListener {
     @UnstableApi
     override fun onPrepareOptionsMenu(menu: Menu): Boolean {
         super.onPrepareOptionsMenu(menu)
-        if (controller == null) return false
+        val controller = videoEpisodeFragment.controller ?: return false
 
-        val media = controller!!.getMedia()
+        val media = controller.getMedia()
         val isFeedMedia = (media is FeedMedia)
 
         menu.findItem(R.id.open_feed_item).setVisible(isFeedMedia) // FeedMedia implies it belongs to a Feed
@@ -533,22 +221,33 @@ class VideoplayerActivity : CastEnabledActivity(), OnSeekBarChangeListener {
         menu.findItem(R.id.add_to_favorites_item).setVisible(false)
         menu.findItem(R.id.remove_from_favorites_item).setVisible(false)
         if (isFeedMedia) {
-            menu.findItem(R.id.add_to_favorites_item).setVisible(!isFavorite)
-            menu.findItem(R.id.remove_from_favorites_item).setVisible(isFavorite)
+            menu.findItem(R.id.add_to_favorites_item).setVisible(!videoEpisodeFragment.isFavorite)
+            menu.findItem(R.id.remove_from_favorites_item).setVisible(videoEpisodeFragment.isFavorite)
         }
 
-        menu.findItem(R.id.set_sleeptimer_item).setVisible(!controller!!.sleepTimerActive())
-        menu.findItem(R.id.disable_sleeptimer_item).setVisible(controller!!.sleepTimerActive())
-
+        menu.findItem(R.id.set_sleeptimer_item).setVisible(!controller.sleepTimerActive())
+        menu.findItem(R.id.disable_sleeptimer_item).setVisible(controller.sleepTimerActive())
         menu.findItem(R.id.player_switch_to_audio_only).setVisible(true)
 
-        menu.findItem(R.id.audio_controls).setVisible(controller!!.audioTracks.size >= 2)
+        menu.findItem(R.id.audio_controls).setVisible(controller.audioTracks.size >= 2)
         menu.findItem(R.id.playback_speed).setVisible(true)
         menu.findItem(R.id.player_show_chapters).setVisible(true)
+
+        if (videoMode == WINDOW_VIEW) {
+            menu.findItem(R.id.add_to_favorites_item).setShowAsAction(SHOW_AS_ACTION_NEVER)
+            menu.findItem(R.id.remove_from_favorites_item).setShowAsAction(SHOW_AS_ACTION_NEVER)
+            menu.findItem(R.id.set_sleeptimer_item).setShowAsAction(SHOW_AS_ACTION_NEVER)
+            menu.findItem(R.id.disable_sleeptimer_item).setShowAsAction(SHOW_AS_ACTION_NEVER)
+            menu.findItem(R.id.player_switch_to_audio_only).setShowAsAction(SHOW_AS_ACTION_NEVER)
+            menu.findItem(R.id.open_feed_item).setShowAsAction(SHOW_AS_ACTION_NEVER)
+            menu.findItem(R.id.share_item).setShowAsAction(SHOW_AS_ACTION_NEVER)
+        }
         return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val controller = videoEpisodeFragment.controller
+
         // some options option requires FeedItem
         when {
             item.itemId == R.id.player_switch_to_audio_only -> {
@@ -571,17 +270,17 @@ class VideoplayerActivity : CastEnabledActivity(), OnSeekBarChangeListener {
                 return false
             }
             else -> {
-                val media = controller?.getMedia() ?: return false
+                val media = controller.getMedia() ?: return false
                 val feedItem = getFeedItem(media) // some options option requires FeedItem
                 when {
                     item.itemId == R.id.add_to_favorites_item && feedItem != null -> {
                         DBWriter.addFavoriteItem(feedItem)
-                        isFavorite = true
+                            videoEpisodeFragment.isFavorite = true
                         invalidateOptionsMenu()
                     }
                     item.itemId == R.id.remove_from_favorites_item && feedItem != null -> {
                         DBWriter.removeFavoriteItem(feedItem)
-                        isFavorite = false
+                            videoEpisodeFragment.isFavorite = false
                         invalidateOptionsMenu()
                     }
                     item.itemId == R.id.disable_sleeptimer_item || item.itemId == R.id.set_sleeptimer_item -> {
@@ -615,93 +314,10 @@ class VideoplayerActivity : CastEnabledActivity(), OnSeekBarChangeListener {
         }
     }
 
-    fun onPositionObserverUpdate() {
-        if (controller == null) return
-
-        val converter = TimeSpeedConverter(controller!!.currentPlaybackSpeedMultiplier)
-        val currentPosition = converter.convert(controller!!.position)
-        val duration = converter.convert(controller!!.duration)
-        val remainingTime = converter.convert(
-            controller!!.duration - controller!!.position)
-        //        Log.d(TAG, "currentPosition " + Converter.getDurationStringLong(currentPosition));
-        if (currentPosition == Playable.INVALID_TIME || duration == Playable.INVALID_TIME) {
-            Log.w(TAG, "Could not react to position observer update because of invalid time")
-            return
-        }
-        binding.positionLabel.text = getDurationStringLong(currentPosition)
-        if (showTimeLeft) {
-            binding.durationLabel.text = "-" + getDurationStringLong(remainingTime)
-        } else {
-            binding.durationLabel.text = getDurationStringLong(duration)
-        }
-        updateProgressbarPosition(currentPosition, duration)
-    }
-
-    private fun updateProgressbarPosition(position: Int, duration: Int) {
-        Log.d(TAG, "updateProgressbarPosition($position, $duration)")
-        val progress = (position.toFloat()) / duration
-        binding.sbPosition.progress = (progress * binding.sbPosition.max).toInt()
-    }
-
-    override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
-        if (controller == null) return
-
-        if (fromUser) {
-            prog = progress / (seekBar.max.toFloat())
-            val converter = TimeSpeedConverter(controller!!.currentPlaybackSpeedMultiplier)
-            val position = converter.convert((prog * controller!!.duration).toInt())
-            binding.seekPositionLabel.text = getDurationStringLong(position)
-        }
-    }
-
-    override fun onStartTrackingTouch(seekBar: SeekBar) {
-        binding.seekCardView.scaleX = .8f
-        binding.seekCardView.scaleY = .8f
-        binding.seekCardView.animate()
-            .setInterpolator(FastOutSlowInInterpolator())
-            .alpha(1f).scaleX(1f).scaleY(1f)
-            .setDuration(200)
-            .start()
-        videoControlsHider.removeCallbacks(hideVideoControls)
-    }
-
-    override fun onStopTrackingTouch(seekBar: SeekBar) {
-        if (controller != null) {
-            controller!!.seekTo((prog * controller!!.duration).toInt())
-        }
-        binding.seekCardView.scaleX = 1f
-        binding.seekCardView.scaleY = 1f
-        binding.seekCardView.animate()
-            .setInterpolator(FastOutSlowInInterpolator())
-            .alpha(0f).scaleX(.8f).scaleY(.8f)
-            .setDuration(200)
-            .start()
-        setupVideoControlsToggler()
-    }
-
-    private fun checkFavorite() {
-        val feedItem = getFeedItem(controller?.getMedia()) ?: return
-        disposable?.dispose()
-
-        disposable = Observable.fromCallable { DBReader.getFeedItem(feedItem.id) }
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(
-                { item: FeedItem? ->
-                    if (item != null) {
-                        val isFav = item.isTagged(FeedItem.TAG_FAVORITE)
-                        if (isFavorite != isFav) {
-                            isFavorite = isFav
-                            invalidateOptionsMenu()
-                        }
-                    }
-                }, { error: Throwable? -> Log.e(TAG, Log.getStackTraceString(error)) })
-    }
-
     private fun compatEnterPictureInPicture() {
         if (PictureInPictureUtil.supportsPictureInPicture(this) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            supportActionBar?.hide()
-            hideVideoControls(false)
+            if (videoMode == FULL_SCREEN_VIEW) supportActionBar?.hide()
+            videoEpisodeFragment.hideVideoControls(false)
             enterPictureInPictureMode()
         }
     }
@@ -715,18 +331,18 @@ class VideoplayerActivity : CastEnabledActivity(), OnSeekBarChangeListener {
 
         when (keyCode) {
             KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE -> {
-                onPlayPause()
-                toggleVideoControlsVisibility()
+                videoEpisodeFragment.onPlayPause()
+                videoEpisodeFragment.toggleVideoControlsVisibility()
                 return true
             }
             KeyEvent.KEYCODE_J, KeyEvent.KEYCODE_A, KeyEvent.KEYCODE_COMMA -> {
-                onRewind()
-                showSkipAnimation(false)
+                videoEpisodeFragment.onRewind()
+                videoEpisodeFragment.showSkipAnimation(false)
                 return true
             }
             KeyEvent.KEYCODE_K, KeyEvent.KEYCODE_D, KeyEvent.KEYCODE_PERIOD -> {
-                onFastForward()
-                showSkipAnimation(true)
+                videoEpisodeFragment.onFastForward()
+                videoEpisodeFragment.showSkipAnimation(true)
                 return true
             }
             KeyEvent.KEYCODE_F, KeyEvent.KEYCODE_ESCAPE -> {
@@ -756,7 +372,8 @@ class VideoplayerActivity : CastEnabledActivity(), OnSeekBarChangeListener {
         }
         //Go to x% of video:
         if (keyCode >= KeyEvent.KEYCODE_0 && keyCode <= KeyEvent.KEYCODE_9) {
-            controller?.seekTo((0.1f * (keyCode - KeyEvent.KEYCODE_0) * controller!!.duration).toInt())
+            val controller = videoEpisodeFragment.controller
+            controller?.seekTo((0.1f * (keyCode - KeyEvent.KEYCODE_0) * controller.duration).toInt())
             return true
         }
         return super.onKeyUp(keyCode, event)
@@ -764,23 +381,26 @@ class VideoplayerActivity : CastEnabledActivity(), OnSeekBarChangeListener {
 
     companion object {
         private const val TAG = "VideoplayerActivity"
+        const val WINDOW_VIEW = 1
+        const val FULL_SCREEN_VIEW = 2
+        const val AUDIO_ONLY = 3
 
         private fun getWebsiteLinkWithFallback(media: Playable?): String? {
-            when {
+            return when {
                 media == null -> {
-                    return null
+                    null
                 }
                 !media.getWebsiteLink().isNullOrBlank() -> {
-                    return media.getWebsiteLink()
+                    media.getWebsiteLink()
                 }
                 media is FeedMedia -> {
-                    return getLinkWithFallback(media.item)
+                    getLinkWithFallback(media.item)
                 }
-                else -> return null
+                else -> null
             }
         }
 
-        private fun getFeedItem(playable: Playable?): FeedItem? {
+        fun getFeedItem(playable: Playable?): FeedItem? {
             return if (playable is FeedMedia) {
                 playable.item
             } else {
diff --git a/app/src/main/java/ac/mdiq/podcini/ui/dialog/VariableSpeedDialog.kt b/app/src/main/java/ac/mdiq/podcini/ui/dialog/VariableSpeedDialog.kt
index f66b9b6f..8aaee9ef 100644
--- a/app/src/main/java/ac/mdiq/podcini/ui/dialog/VariableSpeedDialog.kt
+++ b/app/src/main/java/ac/mdiq/podcini/ui/dialog/VariableSpeedDialog.kt
@@ -104,9 +104,6 @@ open class VariableSpeedDialog : BottomSheetDialogFragment() {
                 binding.global.isChecked = true
             }
         }
-//        if (!settingCode[0]) binding.currentAudio.visibility = View.INVISIBLE
-//        if (!settingCode[1]) binding.currentPodcast.visibility = View.INVISIBLE
-//        if (!settingCode[2]) binding.global.visibility = View.INVISIBLE
 
         speedSeekBar = binding.speedSeekBar
         speedSeekBar.setProgressChangedListener { multiplier: Float ->
@@ -184,9 +181,11 @@ open class VariableSpeedDialog : BottomSheetDialogFragment() {
                 true
             }
             holder.chip.setOnClickListener { Handler(Looper.getMainLooper()).postDelayed({
-                if (binding.currentAudio.isChecked) settingCode[0] = true
-                if (binding.currentPodcast.isChecked) settingCode[1] = true
-                if (binding.global.isChecked) settingCode[2] = true
+                Log.d("VariableSpeedDialog", "holder.chip settingCode0: ${settingCode[0]} ${settingCode[1]} ${settingCode[2]}")
+                settingCode[0] = binding.currentAudio.isChecked
+                settingCode[1] = binding.currentPodcast.isChecked
+                settingCode[2] = binding.global.isChecked
+                Log.d("VariableSpeedDialog", "holder.chip settingCode: ${settingCode[0]} ${settingCode[1]} ${settingCode[2]}")
 
                 if (controller != null) {
                     dismiss()
@@ -203,13 +202,17 @@ open class VariableSpeedDialog : BottomSheetDialogFragment() {
             return selectedSpeeds[position].hashCode().toLong()
         }
 
-        inner class ViewHolder internal constructor(var chip: Chip) : RecyclerView.ViewHolder(
-            chip)
+        inner class ViewHolder internal constructor(var chip: Chip) : RecyclerView.ViewHolder(chip)
     }
 
     companion object {
+        /**
+         *  @param settingCode_ array at input indicate which categories can be set, at output which categories are changed
+        * @param index_default indicates which category is checked by default
+         */
         fun newInstance(settingCode_: BooleanArray? = null, index_default: Int? = null): VariableSpeedDialog? {
-            val settingCode = settingCode_ ?: BooleanArray(3){false}
+            val settingCode = settingCode_ ?: BooleanArray(3){true}
+            Log.d("VariableSpeedDialog", "newInstance settingCode: ${settingCode[0]} ${settingCode[1]} ${settingCode[2]}")
             if (settingCode.size != 3) {
                 Log.e("VariableSpeedDialog", "wrong settingCode dimension")
                 return null
diff --git a/app/src/main/java/ac/mdiq/podcini/ui/dialog/VideoModeDialog.kt b/app/src/main/java/ac/mdiq/podcini/ui/dialog/VideoModeDialog.kt
new file mode 100644
index 00000000..c69ac5f6
--- /dev/null
+++ b/app/src/main/java/ac/mdiq/podcini/ui/dialog/VideoModeDialog.kt
@@ -0,0 +1,33 @@
+package ac.mdiq.podcini.ui.dialog
+
+import android.content.Context
+import android.content.DialogInterface
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import ac.mdiq.podcini.R
+import ac.mdiq.podcini.util.event.UnreadItemsUpdateEvent
+import ac.mdiq.podcini.preferences.UserPreferences.feedOrder
+import ac.mdiq.podcini.preferences.UserPreferences.setFeedOrder
+import ac.mdiq.podcini.preferences.UserPreferences.setVideoMode
+import ac.mdiq.podcini.preferences.UserPreferences.videoPlayMode
+import org.greenrobot.eventbus.EventBus
+
+object VideoModeDialog {
+    fun showDialog(context: Context) {
+        val dialog = MaterialAlertDialogBuilder(context)
+        dialog.setTitle(context.getString(R.string.pref_playback_video_mode))
+        dialog.setNegativeButton(android.R.string.cancel) { d: DialogInterface, _: Int -> d.dismiss() }
+
+        val selected = videoPlayMode
+        val entryValues = listOf(*context.resources.getStringArray(R.array.video_mode_options_values))
+        val selectedIndex =  entryValues.indexOf("" + selected)
+
+        val items = context.resources.getStringArray(R.array.video_mode_options)
+        dialog.setSingleChoiceItems(items, selectedIndex) { d: DialogInterface, which: Int ->
+            if (selectedIndex != which) {
+                setVideoMode(entryValues[which].toInt())
+            }
+            d.dismiss()
+        }
+        dialog.show()
+    }
+}
diff --git a/app/src/main/java/ac/mdiq/podcini/ui/fragment/AudioPlayerFragment.kt b/app/src/main/java/ac/mdiq/podcini/ui/fragment/AudioPlayerFragment.kt
index f4061f25..4da2f77d 100644
--- a/app/src/main/java/ac/mdiq/podcini/ui/fragment/AudioPlayerFragment.kt
+++ b/app/src/main/java/ac/mdiq/podcini/ui/fragment/AudioPlayerFragment.kt
@@ -6,11 +6,14 @@ import ac.mdiq.podcini.databinding.InternalPlayerFragmentBinding
 import ac.mdiq.podcini.feed.util.ImageResourceUtils
 import ac.mdiq.podcini.feed.util.PlaybackSpeedUtils
 import ac.mdiq.podcini.playback.PlaybackController
+import ac.mdiq.podcini.playback.PlaybackController.Companion
+import ac.mdiq.podcini.playback.PlaybackServiceStarter
 import ac.mdiq.podcini.playback.base.PlayerStatus
 import ac.mdiq.podcini.playback.cast.CastEnabledActivity
 import ac.mdiq.podcini.preferences.UserPreferences
 import ac.mdiq.podcini.receiver.MediaButtonReceiver
 import ac.mdiq.podcini.playback.service.PlaybackService
+import ac.mdiq.podcini.preferences.UserPreferences.videoPlayMode
 import ac.mdiq.podcini.storage.model.feed.Chapter
 import ac.mdiq.podcini.storage.model.feed.FeedItem
 import ac.mdiq.podcini.storage.model.feed.FeedMedia
@@ -23,6 +26,7 @@ import ac.mdiq.podcini.ui.dialog.SkipPreferenceDialog
 import ac.mdiq.podcini.ui.dialog.SleepTimerDialog
 import ac.mdiq.podcini.ui.dialog.VariableSpeedDialog
 import ac.mdiq.podcini.ui.actions.menuhandler.FeedItemMenuHandler
+import ac.mdiq.podcini.ui.activity.VideoplayerActivity.Companion.AUDIO_ONLY
 import ac.mdiq.podcini.ui.view.ChapterSeekBar
 import ac.mdiq.podcini.ui.view.PlayButton
 import ac.mdiq.podcini.util.ChapterUtils
@@ -97,7 +101,6 @@ class AudioPlayerFragment : Fragment(), SeekBar.OnSeekBarChangeListener, Toolbar
     private var currentMedia: Playable? = null
     private var currentitem: FeedItem? = null
 
-    @SuppressLint("WrongConstant")
     override fun onCreateView(inflater: LayoutInflater,
                               container: ViewGroup?,
                               savedInstanceState: Bundle?
@@ -447,6 +450,11 @@ class AudioPlayerFragment : Fragment(), SeekBar.OnSeekBarChangeListener, Toolbar
         }
     }
 
+    @JvmOverloads
+    fun scrollToTop() {
+        itemDescFrag.scrollToTop()
+    }
+
     fun fadePlayerToToolbar(slideOffset: Float) {
         val playerFadeProgress = (max(0.0, min(0.2, (slideOffset - 0.2f).toDouble())) / 0.2f).toFloat()
         val player = playerView1
@@ -515,9 +523,12 @@ class AudioPlayerFragment : Fragment(), SeekBar.OnSeekBarChangeListener, Toolbar
                 Log.d(TAG, "internalPlayerFragment was clicked")
                 val media = controller?.getMedia()
                 if (media != null) {
-                    if (media.getMediaType() == MediaType.AUDIO) {
+                    if (media.getMediaType() == MediaType.AUDIO || videoPlayMode == AUDIO_ONLY) {
+                        controller!!.ensureService()
                         (activity as MainActivity).bottomSheet.setState(BottomSheetBehavior.STATE_EXPANDED)
                     } else {
+                        controller?.playPause()
+//                        controller!!.ensureService()
                         val intent = PlaybackService.getPlayerActivityIntent(requireContext(), media)
                         startActivity(intent)
                     }
@@ -712,19 +723,17 @@ class AudioPlayerFragment : Fragment(), SeekBar.OnSeekBarChangeListener, Toolbar
                 .fitCenter()
                 .dontAnimate()
 
-            val imgLoc = ImageResourceUtils.getEpisodeListImageLocation(media)
+            val imgLoc = ImageResourceUtils.getEpisodeListImageLocation(media) + "sdfsdf"
             val imgLocFB = ImageResourceUtils.getFallbackImageLocation(media)
-            when {
-                !imgLoc.isNullOrBlank() -> Glide.with(this)
-                    .load(imgLoc)
-                    .apply(options)
-                    .into(imgvCover)
-                !imgLocFB.isNullOrBlank() -> Glide.with(this)
+
+            Glide.with(this)
+                .load(imgLoc)
+                .error(Glide.with(this)
                     .load(imgLocFB)
-                    .apply(options)
-                    .into(imgvCover)
-                else -> imgvCover.setImageResource(R.mipmap.ic_launcher)
-            }
+                    .error(R.mipmap.ic_launcher)
+                    .apply(options))
+                .apply(options)
+                .into(imgvCover)
 
             if (controller?.isPlayingVideoLocally == true) {
                 (activity as MainActivity).bottomSheet.setLocked(true)
@@ -747,7 +756,6 @@ class AudioPlayerFragment : Fragment(), SeekBar.OnSeekBarChangeListener, Toolbar
         }
     }
 
-
     companion object {
         const val TAG: String = "AudioPlayerFragment"
     }
diff --git a/app/src/main/java/ac/mdiq/podcini/ui/fragment/PlayerDetailsFragment.kt b/app/src/main/java/ac/mdiq/podcini/ui/fragment/PlayerDetailsFragment.kt
index 07864010..b2120f94 100644
--- a/app/src/main/java/ac/mdiq/podcini/ui/fragment/PlayerDetailsFragment.kt
+++ b/app/src/main/java/ac/mdiq/podcini/ui/fragment/PlayerDetailsFragment.kt
@@ -316,7 +316,6 @@ class PlayerDetailsFragment : Fragment() {
 
     @UnstableApi private fun seekToPrevChapter() {
         val curr: Chapter? = currentChapter
-
         if (controller == null || curr == null || displayedChapterIndex == -1) return
 
         when {
@@ -353,8 +352,8 @@ class PlayerDetailsFragment : Fragment() {
         val prefs = requireActivity().getSharedPreferences(PREF, Activity.MODE_PRIVATE)
         val editor = prefs.edit()
         if (controller?.getMedia() != null) {
-            Log.d(TAG, "Saving scroll position: " + webvDescription.scrollY)
-            editor.putInt(PREF_SCROLL_Y, webvDescription.scrollY)
+            Log.d(TAG, "Saving scroll position: " + binding.itemDescriptionFragment.scrollY)
+            editor.putInt(PREF_SCROLL_Y, binding.itemDescriptionFragment.scrollY)
             editor.putString(PREF_PLAYABLE_ID, controller!!.getMedia()!!.getIdentifier().toString())
         } else {
             Log.d(TAG, "savePreferences was called while media or webview was null")
@@ -374,11 +373,12 @@ class PlayerDetailsFragment : Fragment() {
             if (scrollY != -1) {
                 if (id == controller?.getMedia()?.getIdentifier()?.toString()) {
                     Log.d(TAG, "Restored scroll Position: $scrollY")
-                    webvDescription.scrollTo(webvDescription.scrollX, scrollY)
+                    binding.itemDescriptionFragment.scrollTo(binding.itemDescriptionFragment.scrollX, scrollY)
                     return true
                 }
                 Log.d(TAG, "reset scroll Position: 0")
-                webvDescription.scrollTo(webvDescription.scrollX, 0)
+                binding.itemDescriptionFragment.scrollTo(0, 0)
+
                 return true
             }
         }
@@ -386,7 +386,7 @@ class PlayerDetailsFragment : Fragment() {
     }
 
     fun scrollToTop() {
-        webvDescription.scrollTo(0, 0)
+        binding.itemDescriptionFragment.scrollTo(0, 0)
         savePreference()
     }
 
diff --git a/app/src/main/java/ac/mdiq/podcini/ui/fragment/VideoEpisodeFragment.kt b/app/src/main/java/ac/mdiq/podcini/ui/fragment/VideoEpisodeFragment.kt
new file mode 100644
index 00000000..43dfb88b
--- /dev/null
+++ b/app/src/main/java/ac/mdiq/podcini/ui/fragment/VideoEpisodeFragment.kt
@@ -0,0 +1,571 @@
+package ac.mdiq.podcini.ui.fragment
+
+import ac.mdiq.podcini.R
+import ac.mdiq.podcini.databinding.VideoEpisodeFragmentBinding
+import ac.mdiq.podcini.playback.PlaybackController
+import ac.mdiq.podcini.playback.base.PlayerStatus
+import ac.mdiq.podcini.preferences.UserPreferences.fastForwardSecs
+import ac.mdiq.podcini.preferences.UserPreferences.rewindSecs
+import ac.mdiq.podcini.preferences.UserPreferences.setShowRemainTimeSetting
+import ac.mdiq.podcini.preferences.UserPreferences.shouldShowRemainingTime
+import ac.mdiq.podcini.storage.DBReader
+import ac.mdiq.podcini.storage.model.feed.FeedItem
+import ac.mdiq.podcini.storage.model.playback.Playable
+import ac.mdiq.podcini.ui.activity.VideoplayerActivity
+import ac.mdiq.podcini.ui.activity.appstartintent.MainActivityStarter
+import ac.mdiq.podcini.ui.dialog.SkipPreferenceDialog
+import ac.mdiq.podcini.ui.utils.PictureInPictureUtil
+import ac.mdiq.podcini.ui.utils.ShownotesCleaner
+import ac.mdiq.podcini.ui.view.ShownotesWebView
+import ac.mdiq.podcini.util.Converter.getDurationStringLong
+import ac.mdiq.podcini.util.TimeSpeedConverter
+import ac.mdiq.podcini.util.event.playback.BufferUpdateEvent
+import ac.mdiq.podcini.util.event.playback.PlaybackPositionEvent
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import android.view.*
+import android.view.animation.*
+import android.widget.FrameLayout
+import android.widget.SeekBar
+import android.widget.SeekBar.OnSeekBarChangeListener
+import androidx.annotation.OptIn
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat.invalidateOptionsMenu
+import androidx.fragment.app.Fragment
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator
+import androidx.media3.common.util.UnstableApi
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.Disposable
+import io.reactivex.schedulers.Schedulers
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+
+@UnstableApi
+class VideoEpisodeFragment : Fragment(), OnSeekBarChangeListener {
+    private var _binding: VideoEpisodeFragmentBinding? = null
+    private val binding get() = _binding!!
+    private lateinit var root: ViewGroup
+
+    /**
+     * True if video controls are currently visible.
+     */
+    private var videoControlsShowing = true
+    private var videoSurfaceCreated = false
+    private var lastScreenTap: Long = 0
+    private val videoControlsHider = Handler(Looper.getMainLooper())
+    private var showTimeLeft = false
+    private var disposable: Disposable? = null
+    private var prog = 0f
+
+    private var itemsLoaded = false
+    private var item: FeedItem? = null
+    private var webviewData: String? = null
+    private lateinit var webvDescription: ShownotesWebView
+
+    var destroyingDueToReload = false
+    var controller: PlaybackController? = null
+    var isFavorite = false
+
+    @OptIn(UnstableApi::class) override fun onCreateView(inflater: LayoutInflater,
+                                                         container: ViewGroup?,
+                                                         savedInstanceState: Bundle?): View {
+        super.onCreateView(inflater, container, savedInstanceState)
+        _binding = VideoEpisodeFragmentBinding.inflate(LayoutInflater.from(requireContext()))
+        root = binding.root
+
+        controller = newPlaybackController()
+        controller!!.init()
+//        loadMediaInfo()
+
+        setupView()
+
+        return root
+    }
+
+    @OptIn(UnstableApi::class) private fun newPlaybackController(): PlaybackController {
+        return object : PlaybackController(requireActivity()) {
+            override fun updatePlayButtonShowsPlay(showPlay: Boolean) {
+                Log.d(TAG, "updatePlayButtonShowsPlay called")
+                binding.playButton.setIsShowPlay(showPlay)
+                if (showPlay) {
+                    (activity as AppCompatActivity).window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+                } else {
+                    (activity as AppCompatActivity).window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+                    setupVideoAspectRatio()
+                    if (videoSurfaceCreated && controller != null) {
+                        Log.d(TAG, "Videosurface already created, setting videosurface now")
+                        controller!!.setVideoSurface(binding.videoView.holder)
+                    }
+                }
+            }
+
+            override fun loadMediaInfo() {
+                this@VideoEpisodeFragment.loadMediaInfo()
+            }
+
+            override fun onPlaybackEnd() {
+                activity?.finish()
+            }
+        }
+    }
+
+    @UnstableApi
+    override fun onStart() {
+        super.onStart()
+        onPositionObserverUpdate()
+        EventBus.getDefault().register(this)
+    }
+
+    @UnstableApi
+    override fun onPause() {
+        if (!PictureInPictureUtil.isInPictureInPictureMode(requireActivity())) {
+            if (controller?.status == PlayerStatus.PLAYING) {
+                controller!!.pause()
+            }
+        }
+        super.onPause()
+    }
+
+    @UnstableApi
+    override fun onStop() {
+        EventBus.getDefault().unregister(this)
+        super.onStop()
+        if (!PictureInPictureUtil.isInPictureInPictureMode(requireActivity())) {
+            videoControlsHider.removeCallbacks(hideVideoControls)
+        }
+        // Controller released; we will not receive buffering updates
+        binding.progressBar.visibility = View.GONE
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        root.removeView(webvDescription)
+        webvDescription.destroy()
+        _binding = null
+        controller?.release()
+        controller = null // prevent leak
+        disposable?.dispose()
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    @Suppress("unused")
+    fun bufferUpdate(event: BufferUpdateEvent) {
+        when {
+            event.hasStarted() -> {
+                binding.progressBar.visibility = View.VISIBLE
+            }
+            event.hasEnded() -> {
+                binding.progressBar.visibility = View.INVISIBLE
+            }
+            else -> {
+                binding.sbPosition.secondaryProgress = (event.progress * binding.sbPosition.max).toInt()
+            }
+        }
+    }
+
+    private fun setupVideoAspectRatio() {
+        if (videoSurfaceCreated && controller != null) {
+            val videoSize = controller!!.videoSize
+            if (videoSize != null && videoSize.first > 0 && videoSize.second > 0) {
+                Log.d(TAG, "Width,height of video: " + videoSize.first + ", " + videoSize.second)
+                val videoWidth = resources.displayMetrics.widthPixels
+                val videoHeight = (videoWidth.toFloat() / videoSize.first * videoSize.second).toInt()
+                Log.d(TAG, "Width,height of video: " + videoWidth + ", " + videoHeight)
+                binding.videoView.setVideoSize(videoWidth, videoHeight)
+//                binding.videoView.setVideoSize(videoSize.first, videoSize.second)
+//                binding.videoView.setVideoSize(-1, -1)
+            } else {
+                Log.e(TAG, "Could not determine video size")
+                val videoWidth = resources.displayMetrics.widthPixels
+                val videoHeight = (videoWidth.toFloat() / 16 * 9).toInt()
+                Log.d(TAG, "Width,height of video: " + videoWidth + ", " + videoHeight)
+                binding.videoView.setVideoSize(videoWidth, videoHeight)
+            }
+        }
+    }
+
+    @OptIn(UnstableApi::class) private fun loadMediaInfo() {
+        Log.d(TAG, "loadMediaInfo called")
+        if (controller?.getMedia() == null) return
+
+        if (controller!!.status == PlayerStatus.PLAYING && !controller!!.isPlayingVideoLocally) {
+            Log.d(TAG, "Closing, no longer video")
+            destroyingDueToReload = true
+            activity?.finish()
+            MainActivityStarter(requireContext()).withOpenPlayer().start()
+            return
+        }
+        showTimeLeft = shouldShowRemainingTime()
+        onPositionObserverUpdate()
+        load()
+        val media = controller!!.getMedia()
+        if (media != null) {
+            (activity as AppCompatActivity).supportActionBar!!.subtitle = media.getEpisodeTitle()
+            (activity as AppCompatActivity).supportActionBar!!.title = media.getFeedTitle()
+        }
+    }
+
+    @UnstableApi private fun load() {
+        disposable?.dispose()
+        Log.d(TAG, "load() called")
+
+        disposable = Observable.fromCallable<FeedItem?> { this.loadInBackground() }
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ result: FeedItem? ->
+                item = result
+                Log.d(TAG, "load() item ${item?.id}")
+                if (item != null) {
+                    val isFav = item!!.isTagged(FeedItem.TAG_FAVORITE)
+                    if (isFavorite != isFav) {
+                        isFavorite = isFav
+                        invalidateOptionsMenu(requireActivity())
+                    }
+                }
+                onFragmentLoaded()
+                itemsLoaded = true
+            }, { error: Throwable? ->
+                Log.e(TAG, Log.getStackTraceString(error))
+            })
+    }
+
+    private fun loadInBackground(): FeedItem? {
+        val feedItem = VideoplayerActivity.getFeedItem(controller?.getMedia())
+        if (feedItem != null) {
+            val duration = feedItem.media?.getDuration()?: Int.MAX_VALUE
+            DBReader.loadDescriptionOfFeedItem(feedItem)
+            webviewData = ShownotesCleaner(requireContext(), feedItem.description?:"", duration).processShownotes()
+        }
+        return feedItem
+    }
+
+    @UnstableApi private fun onFragmentLoaded() {
+        if (webviewData != null && !itemsLoaded) {
+            webvDescription.loadDataWithBaseURL("https://127.0.0.1", webviewData!!, "text/html", "utf-8", "about:blank")
+        }
+    }
+
+    @UnstableApi
+    private fun setupView() {
+        showTimeLeft = shouldShowRemainingTime()
+        Log.d(TAG, "setupView showTimeLeft: $showTimeLeft")
+
+        binding.durationLabel.setOnClickListener {
+            showTimeLeft = !showTimeLeft
+            val media = controller?.getMedia() ?: return@setOnClickListener
+
+            val converter = TimeSpeedConverter(controller!!.currentPlaybackSpeedMultiplier)
+            val length: String
+            if (showTimeLeft) {
+                val remainingTime = converter.convert(media.getDuration() - media.getPosition())
+                length = "-" + getDurationStringLong(remainingTime)
+            } else {
+                val duration = converter.convert(media.getDuration())
+                length = getDurationStringLong(duration)
+            }
+            binding.durationLabel.text = length
+
+            setShowRemainTimeSetting(showTimeLeft)
+            Log.d("timeleft on click", if (showTimeLeft) "true" else "false")
+        }
+
+        binding.sbPosition.setOnSeekBarChangeListener(this)
+        binding.rewindButton.setOnClickListener { onRewind() }
+        binding.rewindButton.setOnLongClickListener {
+            SkipPreferenceDialog.showSkipPreference(requireContext(),
+                SkipPreferenceDialog.SkipDirection.SKIP_REWIND, null)
+            true
+        }
+        binding.playButton.setIsVideoScreen(true)
+        binding.playButton.setOnClickListener { onPlayPause() }
+        binding.fastForwardButton.setOnClickListener { onFastForward() }
+        binding.fastForwardButton.setOnLongClickListener {
+            SkipPreferenceDialog.showSkipPreference(requireContext(),
+                SkipPreferenceDialog.SkipDirection.SKIP_FORWARD, null)
+            false
+        }
+        // To suppress touches directly below the slider
+        binding.bottomControlsContainer.setOnTouchListener { _: View?, _: MotionEvent? -> true }
+        binding.videoView.holder.addCallback(surfaceHolderCallback)
+        binding.bottomControlsContainer.fitsSystemWindows = true
+//        binding.videoView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+
+        setupVideoControlsToggler()
+//        (activity as AppCompatActivity).window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
+
+        binding.videoPlayerContainer.setOnTouchListener(onVideoviewTouched)
+        binding.videoPlayerContainer.viewTreeObserver.addOnGlobalLayoutListener {
+            binding.videoView.setAvailableSize(
+                binding.videoPlayerContainer.width.toFloat(), binding.videoPlayerContainer.height.toFloat())
+        }
+
+        webvDescription = binding.webvDescription
+//        webvDescription.setTimecodeSelectedListener { time: Int? ->
+//            val cMedia = controller?.getMedia()
+//            if (item?.media?.getIdentifier() == cMedia?.getIdentifier()) {
+//                controller?.seekTo(time ?: 0)
+//            } else {
+//                (activity as MainActivity).showSnackbarAbovePlayer(R.string.play_this_to_seek_position,
+//                    Snackbar.LENGTH_LONG)
+//            }
+//        }
+//        registerForContextMenu(webvDescription)
+//        webvDescription.visibility = View.GONE
+
+        binding.toggleViews.setOnClickListener {
+            (activity as? VideoplayerActivity)?.toggleViews()
+        }
+        binding.audioOnly.setOnClickListener {
+            (activity as? VideoplayerActivity)?.switchToAudioOnly = true
+            (activity as? VideoplayerActivity)?.finish()
+        }
+
+    }
+
+    private val onVideoviewTouched = View.OnTouchListener { v: View, event: MotionEvent ->
+        if (event.action != MotionEvent.ACTION_DOWN) return@OnTouchListener false
+
+        if (PictureInPictureUtil.isInPictureInPictureMode(requireActivity())) return@OnTouchListener true
+
+        videoControlsHider.removeCallbacks(hideVideoControls)
+
+        if (System.currentTimeMillis() - lastScreenTap < 300) {
+            if (event.x > v.measuredWidth / 2.0f) {
+                onFastForward()
+                showSkipAnimation(true)
+            } else {
+                onRewind()
+                showSkipAnimation(false)
+            }
+            if (videoControlsShowing) {
+                hideVideoControls(false)
+                if ((activity as VideoplayerActivity).videoMode == VideoplayerActivity.FULL_SCREEN_VIEW)
+                        (activity as AppCompatActivity).supportActionBar?.hide()
+                videoControlsShowing = false
+            }
+            return@OnTouchListener true
+        }
+
+        toggleVideoControlsVisibility()
+        if (videoControlsShowing) setupVideoControlsToggler()
+
+        lastScreenTap = System.currentTimeMillis()
+        true
+    }
+
+    fun toggleVideoControlsVisibility() {
+        if (videoControlsShowing) {
+            hideVideoControls(true)
+            if ((activity as VideoplayerActivity).videoMode == VideoplayerActivity.FULL_SCREEN_VIEW)
+                    (activity as AppCompatActivity).supportActionBar?.hide()
+        } else {
+            showVideoControls()
+            (activity as AppCompatActivity).supportActionBar?.show()
+        }
+        videoControlsShowing = !videoControlsShowing
+    }
+
+    fun showSkipAnimation(isForward: Boolean) {
+        val skipAnimation = AnimationSet(true)
+        skipAnimation.addAnimation(ScaleAnimation(1f, 2f, 1f, 2f,
+            Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f))
+        skipAnimation.addAnimation(AlphaAnimation(1f, 0f))
+        skipAnimation.fillAfter = false
+        skipAnimation.duration = 800
+
+        val params = binding.skipAnimationImage.layoutParams as FrameLayout.LayoutParams
+        if (isForward) {
+            binding.skipAnimationImage.setImageResource(R.drawable.ic_fast_forward_video_white)
+            params.gravity = Gravity.RIGHT or Gravity.CENTER_VERTICAL
+        } else {
+            binding.skipAnimationImage.setImageResource(R.drawable.ic_fast_rewind_video_white)
+            params.gravity = Gravity.LEFT or Gravity.CENTER_VERTICAL
+        }
+
+        binding.skipAnimationImage.visibility = View.VISIBLE
+        binding.skipAnimationImage.layoutParams = params
+        binding.skipAnimationImage.startAnimation(skipAnimation)
+        skipAnimation.setAnimationListener(object : Animation.AnimationListener {
+            override fun onAnimationStart(animation: Animation) {
+            }
+
+            override fun onAnimationEnd(animation: Animation) {
+                binding.skipAnimationImage.visibility = View.GONE
+            }
+
+            override fun onAnimationRepeat(animation: Animation) {
+            }
+        })
+    }
+
+    private val surfaceHolderCallback: SurfaceHolder.Callback = object : SurfaceHolder.Callback {
+        override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
+            holder.setFixedSize(width, height)
+        }
+
+        @UnstableApi
+        override fun surfaceCreated(holder: SurfaceHolder) {
+            Log.d(TAG, "Videoview holder created")
+            videoSurfaceCreated = true
+            if (controller?.status == PlayerStatus.PLAYING) {
+                controller!!.setVideoSurface(holder)
+            }
+            setupVideoAspectRatio()
+        }
+
+        override fun surfaceDestroyed(holder: SurfaceHolder) {
+            Log.d(TAG, "Videosurface was destroyed")
+            videoSurfaceCreated = false
+            if (controller != null && !destroyingDueToReload && !(activity as VideoplayerActivity).switchToAudioOnly) {
+                controller!!.notifyVideoSurfaceAbandoned()
+            }
+        }
+    }
+
+    @UnstableApi
+    fun onRewind() {
+        if (controller == null) return
+
+        val curr = controller!!.position
+        controller!!.seekTo(curr - rewindSecs * 1000)
+        setupVideoControlsToggler()
+    }
+
+    @UnstableApi
+    fun onPlayPause() {
+        if (controller == null) return
+
+        controller!!.playPause()
+        setupVideoControlsToggler()
+    }
+
+    @UnstableApi
+    fun onFastForward() {
+        if (controller == null) return
+
+        val curr = controller!!.position
+        controller!!.seekTo(curr + fastForwardSecs * 1000)
+        setupVideoControlsToggler()
+    }
+
+    private fun setupVideoControlsToggler() {
+        videoControlsHider.removeCallbacks(hideVideoControls)
+        videoControlsHider.postDelayed(hideVideoControls, 2500)
+    }
+
+    private val hideVideoControls = Runnable {
+        if (videoControlsShowing) {
+            Log.d(TAG, "Hiding video controls")
+            hideVideoControls(true)
+            if ((activity as VideoplayerActivity).videoMode == VideoplayerActivity.FULL_SCREEN_VIEW)
+                    (activity as? AppCompatActivity)?.supportActionBar?.hide()
+            videoControlsShowing = false
+        }
+    }
+
+    private fun showVideoControls() {
+        binding.bottomControlsContainer.visibility = View.VISIBLE
+        binding.controlsContainer.visibility = View.VISIBLE
+        val animation = AnimationUtils.loadAnimation(requireContext(), R.anim.fade_in)
+        if (animation != null) {
+            binding.bottomControlsContainer.startAnimation(animation)
+            binding.controlsContainer.startAnimation(animation)
+        }
+        (activity as AppCompatActivity).window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
+//        binding.videoView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
+        binding.bottomControlsContainer.fitsSystemWindows = true
+    }
+
+    fun hideVideoControls(showAnimation: Boolean) {
+        if (showAnimation) {
+            val animation = AnimationUtils.loadAnimation(requireContext(), R.anim.fade_out)
+            if (animation != null) {
+                binding.bottomControlsContainer.startAnimation(animation)
+                binding.controlsContainer.startAnimation(animation)
+            }
+        }
+        (activity as AppCompatActivity).window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
+//        (activity as AppCompatActivity).window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_LOW_PROFILE
+//                or View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+//                or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION)
+        binding.bottomControlsContainer.fitsSystemWindows = true
+
+        binding.bottomControlsContainer.visibility = View.GONE
+        binding.controlsContainer.visibility = View.GONE
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onEventMainThread(event: PlaybackPositionEvent?) {
+        onPositionObserverUpdate()
+    }
+
+    fun onPositionObserverUpdate() {
+        if (controller == null) return
+
+        val converter = TimeSpeedConverter(controller!!.currentPlaybackSpeedMultiplier)
+        val currentPosition = converter.convert(controller!!.position)
+        val duration = converter.convert(controller!!.duration)
+        val remainingTime = converter.convert(controller!!.duration - controller!!.position)
+        //        Log.d(TAG, "currentPosition " + Converter.getDurationStringLong(currentPosition));
+        if (currentPosition == Playable.INVALID_TIME || duration == Playable.INVALID_TIME) {
+            Log.w(TAG, "Could not react to position observer update because of invalid time")
+            return
+        }
+        binding.positionLabel.text = getDurationStringLong(currentPosition)
+        if (showTimeLeft) {
+            binding.durationLabel.text = "-" + getDurationStringLong(remainingTime)
+        } else {
+            binding.durationLabel.text = getDurationStringLong(duration)
+        }
+        updateProgressbarPosition(currentPosition, duration)
+    }
+
+    private fun updateProgressbarPosition(position: Int, duration: Int) {
+        Log.d(TAG, "updateProgressbarPosition($position, $duration)")
+        val progress = (position.toFloat()) / duration
+        binding.sbPosition.progress = (progress * binding.sbPosition.max).toInt()
+    }
+
+    override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+        if (controller == null) return
+
+        if (fromUser) {
+            prog = progress / (seekBar.max.toFloat())
+            val converter = TimeSpeedConverter(controller!!.currentPlaybackSpeedMultiplier)
+            val position = converter.convert((prog * controller!!.duration).toInt())
+            binding.seekPositionLabel.text = getDurationStringLong(position)
+        }
+    }
+
+    override fun onStartTrackingTouch(seekBar: SeekBar) {
+        binding.seekCardView.scaleX = .8f
+        binding.seekCardView.scaleY = .8f
+        binding.seekCardView.animate()
+            .setInterpolator(FastOutSlowInInterpolator())
+            .alpha(1f).scaleX(1f).scaleY(1f)
+            .setDuration(200)
+            .start()
+        videoControlsHider.removeCallbacks(hideVideoControls)
+    }
+
+    override fun onStopTrackingTouch(seekBar: SeekBar) {
+        controller?.seekTo((prog * controller!!.duration).toInt())
+
+        binding.seekCardView.scaleX = 1f
+        binding.seekCardView.scaleY = 1f
+        binding.seekCardView.animate()
+            .setInterpolator(FastOutSlowInInterpolator())
+            .alpha(0f).scaleX(.8f).scaleY(.8f)
+            .setDuration(200)
+            .start()
+        setupVideoControlsToggler()
+    }
+
+    companion object {
+        const val TAG = "VideoplayerFragment"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ac/mdiq/podcini/ui/view/AspectRatioVideoView.kt b/app/src/main/java/ac/mdiq/podcini/ui/view/AspectRatioVideoView.kt
index cd07e0d0..bcaa975f 100644
--- a/app/src/main/java/ac/mdiq/podcini/ui/view/AspectRatioVideoView.kt
+++ b/app/src/main/java/ac/mdiq/podcini/ui/view/AspectRatioVideoView.kt
@@ -2,13 +2,14 @@ package ac.mdiq.podcini.ui.view
 
 import android.content.Context
 import android.util.AttributeSet
+import android.util.Log
 import android.widget.VideoView
 import kotlin.math.ceil
 
 class AspectRatioVideoView @JvmOverloads constructor(context: Context,
                                                      attrs: AttributeSet? = null,
-                                                     defStyle: Int = 0
-) : VideoView(context, attrs, defStyle) {
+                                                     defStyle: Int = 0)
+    : VideoView(context, attrs, defStyle) {
 
     private var mVideoWidth = 0
     private var mVideoHeight = 0
@@ -20,7 +21,7 @@ class AspectRatioVideoView @JvmOverloads constructor(context: Context,
             super.onMeasure(widthMeasureSpec, heightMeasureSpec)
             return
         }
-
+        Log.d(TAG, "onMeasure $mAvailableWidth $mAvailableHeight")
         if (mAvailableWidth < 0 || mAvailableHeight < 0) {
             mAvailableWidth = width.toFloat()
             mAvailableHeight = height.toFloat()
@@ -54,6 +55,7 @@ class AspectRatioVideoView @JvmOverloads constructor(context: Context,
         // Set the new video size
         mVideoWidth = videoWidth
         mVideoHeight = videoHeight
+        Log.d(TAG, "setVideoSize $mVideoWidth $mVideoHeight")
 
         /*
          * If this isn't set the video is stretched across the
@@ -64,8 +66,8 @@ class AspectRatioVideoView @JvmOverloads constructor(context: Context,
          */
         holder.setFixedSize(videoWidth, videoHeight)
 
-        requestLayout()
-        invalidate()
+//        requestLayout()
+//        invalidate()
     }
 
     /**
@@ -76,6 +78,11 @@ class AspectRatioVideoView @JvmOverloads constructor(context: Context,
     fun setAvailableSize(width: Float, height: Float) {
         mAvailableWidth = width
         mAvailableHeight = height
-        requestLayout()
+        Log.d(TAG, "setAvailableSize $mAvailableWidth $mAvailableHeight")
+//        requestLayout()
+    }
+
+    companion object {
+        private const val TAG = "AspectRatioVideoView"
     }
 }
diff --git a/app/src/main/java/ac/mdiq/podcini/ui/widget/WidgetUpdater.kt b/app/src/main/java/ac/mdiq/podcini/ui/widget/WidgetUpdater.kt
index b881bae5..1e5a61a3 100644
--- a/app/src/main/java/ac/mdiq/podcini/ui/widget/WidgetUpdater.kt
+++ b/app/src/main/java/ac/mdiq/podcini/ui/widget/WidgetUpdater.kt
@@ -53,7 +53,7 @@ object WidgetUpdater {
         val views = RemoteViews(context.packageName, R.layout.player_widget)
 
         if (widgetState.media != null) {
-            val icon: Bitmap?
+            var icon: Bitmap? = null
             val iconSize = context.resources.getDimensionPixelSize(android.R.dimen.app_icon_size)
             views.setOnClickPendingIntent(R.id.layout_left, startMediaPlayer)
             views.setOnClickPendingIntent(R.id.imgvCover, startMediaPlayer)
@@ -65,26 +65,21 @@ object WidgetUpdater {
                 .transform(FitCenter(), RoundedCorners(radius))
 
             try {
-                var imgLoc = widgetState.media.getImageLocation()
-                if (imgLoc != null) {
-                    icon = Glide.with(context)
+                val imgLoc = widgetState.media.getImageLocation()
+                val imgLoc1 = getFallbackImageLocation(widgetState.media)
+                icon = Glide.with(context)
+                    .asBitmap()
+                    .load(imgLoc)
+                    .error(Glide.with(context)
                         .asBitmap()
-                        .load(imgLoc)
+                        .load(imgLoc1)
                         .apply(options)
-                        .submit(iconSize, iconSize)
-                        .get(500, TimeUnit.MILLISECONDS)
-                    views.setImageViewBitmap(R.id.imgvCover, icon)
-                } else {
-                    imgLoc = getFallbackImageLocation(widgetState.media)
-                    if (imgLoc != null) {
-                        icon = Glide.with(context)
-                            .asBitmap()
-                            .load(imgLoc)
-                            .apply(options)
-                            .submit(iconSize, iconSize)[500, TimeUnit.MILLISECONDS]
-                        views.setImageViewBitmap(R.id.imgvCover, icon)
-                    } else views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher)
-                }
+                        .submit(iconSize, iconSize)[500, TimeUnit.MILLISECONDS])
+                    .apply(options)
+                    .submit(iconSize, iconSize)
+                    .get(500, TimeUnit.MILLISECONDS)
+                if (icon != null) views.setImageViewBitmap(R.id.imgvCover, icon)
+                else views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher)
             } catch (tr1: Throwable) {
                 Log.e(TAG, "Error loading the media icon for the widget", tr1)
             }
diff --git a/app/src/main/res/drawable/baseline_fullscreen_24.xml b/app/src/main/res/drawable/baseline_fullscreen_24.xml
new file mode 100644
index 00000000..c19ee7b2
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_fullscreen_24.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24"
+        android:width="24dp"
+        xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFFFF"
+          android:strokeColor="#505050"
+          android:strokeWidth="0.75"
+          android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+</vector>
diff --git a/app/src/main/res/layout/video_episode_fragment.xml b/app/src/main/res/layout/video_episode_fragment.xml
new file mode 100644
index 00000000..1039ef0d
--- /dev/null
+++ b/app/src/main/res/layout/video_episode_fragment.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:background="@color/black"
+                android:id="@+id/videoEpisodeContainer">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/black"
+        android:id="@+id/videoPlayerContainer">
+
+        <ac.mdiq.podcini.ui.view.AspectRatioVideoView
+            android:id="@+id/videoView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:indeterminateOnly="true"
+            android:visibility="invisible" />
+
+        <LinearLayout
+            android:id="@+id/controlsContainer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layoutDirection="ltr"
+            android:background="@android:color/transparent"
+            android:padding="16dp"
+            android:orientation="horizontal">
+
+            <ImageButton
+                android:id="@+id/audioOnly"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="6dp"
+                android:layout_gravity="center_vertical"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/player_switch_to_audio_only"
+                app:srcCompat="@drawable/baseline_audiotrack_24" />
+
+            <ImageButton
+                android:id="@+id/rewindButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="6dp"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/rewind_label"
+                app:srcCompat="@drawable/ic_fast_rewind_video_white" />
+
+            <ac.mdiq.podcini.ui.view.PlayButton
+                android:id="@+id/playButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="6dp"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/pause_label"
+                app:srcCompat="@drawable/ic_pause_video_white" />
+
+            <ImageButton
+                android:id="@+id/fastForwardButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="6dp"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/fast_forward_label"
+                app:srcCompat="@drawable/ic_fast_forward_video_white" />
+
+            <ImageButton
+                android:id="@+id/toggleViews"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="6dp"
+                android:layout_gravity="center_vertical"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/toggle_video_views"
+                app:srcCompat="@drawable/baseline_fullscreen_24" />
+
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/skipAnimationImage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:padding="64dp"
+            android:layout_gravity="center"/>
+
+        <LinearLayout
+            android:id="@+id/bottomControlsContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|center"
+            android:orientation="vertical">
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/seekCardView"
+                android:alpha="0"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="12dp"
+                android:layout_gravity="center"
+                app:cardCornerRadius="8dp"
+                app:cardBackgroundColor="?attr/seek_background"
+                app:cardElevation="0dp"
+                tools:alpha="1">
+
+                <TextView
+                    android:id="@+id/seekPositionLabel"
+                    android:gravity="center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="24dp"
+                    android:paddingTop="4dp"
+                    android:paddingRight="24dp"
+                    android:paddingBottom="4dp"
+                    android:textColor="@color/white"
+                    android:textSize="24sp"
+                    tools:text="1:06:29" />
+
+            </androidx.cardview.widget.CardView>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="#80000000"
+                android:layoutDirection="ltr"
+                android:paddingTop="8dp">
+
+                <TextView
+                    android:id="@+id/positionLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginTop="4dp"
+                    android:text="@string/position_default_label"
+                    android:textColor="@color/white"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/durationLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginTop="4dp"
+                    android:text="@string/position_default_label"
+                    android:textColor="@color/white"
+                    android:textStyle="bold" />
+
+                <SeekBar
+                    android:id="@+id/sbPosition"
+                    android:layout_width="0px"
+                    android:layout_height="wrap_content"
+                    android:layout_toLeftOf="@+id/durationLabel"
+                    android:layout_toStartOf="@+id/durationLabel"
+                    android:layout_toRightOf="@+id/positionLabel"
+                    android:layout_toEndOf="@+id/positionLabel"
+                    android:layout_centerInParent="true"
+                    android:max="500" />
+
+            </RelativeLayout>
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+    <ac.mdiq.podcini.ui.view.ShownotesWebView
+        android:id="@+id/webvDescription"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/videoPlayerContainer"
+        android:foreground="?android:windowContentOverlay" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/videoplayer_activity.xml b/app/src/main/res/layout/videoplayer_activity.xml
index 43c1c6bf..ff180ef9 100644
--- a/app/src/main/res/layout/videoplayer_activity.xml
+++ b/app/src/main/res/layout/videoplayer_activity.xml
@@ -1,162 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/black"
-    android:orientation="vertical"
-    android:id="@+id/videoPlayerContainer">
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:background="@color/black"
+             android:id="@+id/videoPlayerContainer"
+             android:windowActionBarOverlay="true">
 
-    <ac.mdiq.podcini.ui.view.AspectRatioVideoView
-        android:id="@+id/videoView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center" />
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminateOnly="true"
-        android:visibility="invisible" />
-
-    <LinearLayout
-        android:id="@+id/controlsContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layoutDirection="ltr"
-        android:background="@android:color/transparent"
-        android:padding="16dp"
-        android:orientation="horizontal">
-
-        <ImageButton
-            android:id="@+id/rewindButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/rewind_label"
-            app:srcCompat="@drawable/ic_fast_rewind_video_white" />
-
-        <ac.mdiq.podcini.ui.view.PlayButton
-            android:id="@+id/playButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/pause_label"
-            app:srcCompat="@drawable/ic_pause_video_white" />
-
-        <ImageButton
-            android:id="@+id/fastForwardButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/fast_forward_label"
-            app:srcCompat="@drawable/ic_fast_forward_video_white" />
-
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/skipAnimationImage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:padding="64dp"
-        android:layout_gravity="center"/>
-
-    <LinearLayout
-        android:id="@+id/bottomControlsContainer"
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/main_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center"
-        android:orientation="vertical">
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/seekCardView"
-            android:alpha="0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="12dp"
-            android:layout_gravity="center"
-            app:cardCornerRadius="8dp"
-            app:cardBackgroundColor="?attr/seek_background"
-            app:cardElevation="0dp"
-            tools:alpha="1">
-
-            <TextView
-                android:id="@+id/seekPositionLabel"
-                android:gravity="center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="24dp"
-                android:paddingTop="4dp"
-                android:paddingRight="24dp"
-                android:paddingBottom="4dp"
-                android:textColor="@color/white"
-                android:textSize="24sp"
-                tools:text="1:06:29" />
-
-        </androidx.cardview.widget.CardView>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="#80000000"
-            android:layoutDirection="ltr"
-            android:paddingTop="8dp">
-
-            <TextView
-                android:id="@+id/positionLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:layout_marginBottom="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginTop="4dp"
-                android:text="@string/position_default_label"
-                android:textColor="@color/white"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/durationLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentTop="true"
-                android:layout_marginBottom="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginTop="4dp"
-                android:text="@string/position_default_label"
-                android:textColor="@color/white"
-                android:textStyle="bold" />
-
-            <SeekBar
-                android:id="@+id/sbPosition"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_toLeftOf="@+id/durationLabel"
-                android:layout_toStartOf="@+id/durationLabel"
-                android:layout_toRightOf="@+id/positionLabel"
-                android:layout_toEndOf="@+id/positionLabel"
-                android:layout_centerInParent="true"
-                android:max="500" />
-
-        </RelativeLayout>
-
-    </LinearLayout>
+        android:layout_height="match_parent"
+        android:foreground="?android:windowContentOverlay"
+        tools:background="@android:color/holo_red_dark"
+        android:windowActionBarOverlay="true"/>
 
 </FrameLayout>
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
deleted file mode 100644
index ae9ba36ea25fa5fb517b9bb2f87e2cbe91ebb6eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10627
zcmeHt<y%x=^zRHqN{4hQ0@CHsp;FQU(kUr064E`R0)v1k-3Urcr{o9&D5*&2Fo;NZ
z4KUo}_ul8Z|G|B8e=p9NXZBe;*4m%7_KF?*SYMO!2I~zF2t=v%NX-ZY0@wU|NQr@#
zZ~Eebzz>=CBMV;;h^pt`1Mc@Kbpje${M60;jJ;g^0-wHc1_cHNin@7v_&PrIb{6$|
z;hMdp$O-~+gS6BhJPFF#UI@-8QV%}e_v#U+xVW87dgJB&#|*?Y$TuJOFfX4ms2SRQ
zq=mjmi^TFtWVNW>lMt2Y<7MUf@Un&bCGzfr2i{<?MRW}XDe_zAcS)%$yiZ_^i%V;X
zfl^@ZFaMEKUz_k?iGYc+oprgcs*v&>RyHm!&7@D0pQZnTA0<8M1|{Ete*d4>|H$C~
zF%C9ZdLkW-pohdtpfXwyf;r*STA~`VJ){6v1$eU-+f`YF%0<a~OL-5bB(foT2gB#h
zRx92`f15r#JNwYjJq)#igo4_1!xYJ;-{Oah)4*n6CITkCuuF!PCWC4*=vUCMQZ`5)
z=@$7GL@|}L=F8s@j3#OZMUAkdk&<`2!(z{>zDaNa8HMCQV9@Dhh6@pI;yopdnuCB5
zD+_UkMsGCg5TOc(z@fwnIet0_U-$|_3@k$#AZrv(oDn?}cDuor=<+K%GVvuzti=oy
z+zWI{4SeJPKK@*RPtkmBJhzXL^lpaqgY&tiqaLaDfPRSw3+_#!d}D`MLR#wKAK}T~
zhcVG`aPj0YgbK2FV@n=W+km}|v4cCtu4<HN5ocI7vhLl+bfBmpoH`X%;6>^%DsxFp
z?IR^A)OeP}?G`+EIvC~1!Wah+gxGy8Qiq~J#yX4yT;M$EzX*!5e6ZK;yi_gUyeN%{
zmzs2g)+)Vw<!;o4-Th1mP0AqQF+n-VFKcPycE&UAny>KwI>A#~^^je{2$_A?QyQHY
zoBEfhmMEOs&!tA35{h$ys2y^4$1vM4%a=lY*hB%8Pn@Ux7opq2)RHm%H4sW|lF*e_
zdN<M_@v2gfaOPuhY3o&!+CHWqvgya^^R^z&1J@x|qHzl*&iIohft4G&KoCJ#d+0C(
z*x`$Q)F?t|eM#2|im63;qIM0!gq^&nxE2gx2WQ+PefMIR?Xz^62=Q@uFUGyhKuchK
zFg|9{^+{u;p5k@r3A&&AEmaP<o$hP`WNT%K02hD3+GFa`MDMR&+%j}o55gQMcX~!|
zBfHTtbW)8GUlPoXF5S88j4cHqy04n#Ypu`Hk4i3oRU<~}6}Ck;dp3`Is8E9lvtL~c
zuefgEM-)Mo2np1^N7*1d;yjCU|2~8<!hqHv6mzT>=<g7`Pg=<7wCyPAN+9+%^xHjd
z;tb+dEi`X@V$~VzDOeN2MJ!r*Chz-`3YCqx)?5&|kO7HtkNnjNcZR#s<msh|SXLWd
zpVF<RD-&K8k9jmW&=>yLe?LB#6-n(ayEm+Tr6c4FFI%!Dxn%Qidc9<j!*RinwMgfz
zW7!M9P>##x)i4B+@73N2|Bo(z5pro$)Y+vE6Ktt7y6$mc!zxbQO2u8%`0!_Y373z6
zj8)=kPYpW0JY4D`#1ouFM0Li@bfPrNd}C($5i-~UR}&Wry9sHHc0-q#saNRj?l#Au
zR9X7z<kFC&@Mjm4Xo;u?CR9I>-o(XOeaN2g)%rW9!WaYQJYVZqO-lQxDK>!zgXr^y
zqVHGQa4GSL<I&&IQ*_wdgC&kZ&aDK~`56gH@1}R3q9U;u@q#|Y#g=ag@Pf5nLdeQl
z6|F5}Axlzr@~w>NwSI((!IlBR<?ti__E+<JI7XkD!ex`CV03*gJ>7*O-B~{xe+R{q
zaloOic=4^&LslPlj%S<yIqBty{=BY=V$}-o%)7hBTO^K3S$9LZp|Z%r7s%TwDikOz
zT_#dU5Nn_%oxeJgs1%n_3_CV$xyq9;FY);J&l{WA+uvAHcXmN1PmkP<%LyR5ER(l9
zMHhJsss|AecrRJFz^JL3`gJZn&XQ1(rA4YhEI}L~dP`)R^<%UbRsU==<Si85Pbc-m
zA5Mwz=U1M*mB+iF$IjRpmw}kqOKER?Gyi<E@wxVE^FE?1I}+R1yd~oRa;xw!Tjpyj
z4w0Et!(`zTbwob4?lSiL4i)E3DPAwk39R*o9x;NuxXa(n{|Nqc3?t3a6@~;HQ(+)v
zSI^W~>^B^!F|gKMqc%_wvA4$>?dog>>F4i>@vHSSEfi;8(fy|gE8J0QeWP+Mt>ft1
zD`8%$qWp<qHCDjlXjeimb9P8<#rPM|e+KH7!yNd|ZeTF6*PNe<)ZT^Do(a|}_=--`
z$mYtP&G$~A`DpWF%3Ohd;cr@6JL4)4C6Y2}Lnk17#@)z<eR#iQ?i^wTJ_=r=3K9lo
zLsSSkr)u**#@aD|%44<{^r7)~=vVfH<aJ}3jdw{dMQVdT@w$R``9~Hg$4<~x<9hNZ
zzRW(0x>-<&Zii+5v`C9dj56mPs&9FDl7*6^w{JkM@u2>9%S@;)y84U<CPFjGq~nbW
zM?O;f@%zmzkg;bqjD;b`4_c#`P@BxwLEG9eMY)8N9&+sFIe`x{ED@ZrT!KE9wt+pI
zx8)wrk`h05u*1r1i~3WkJeZ%H^V$UM5-twx**3IL$VRs)`q3ybspy`@=}?0@v&9(`
zKoH$}XyWwFqO;I>VyvtFm2!J1^Zp;)H|4IK50}JeIu2_ND#JW3lNSMhS8ia)P*(yx
zV~>5w4C{}HTcf5b)rxQt(NiJl_}@D5`auu2s4l%6`mw~}VGFz{oxdmS9-&z8_6F?{
z)IByf@U>3!!;Y&(=O(FrV*HtM=O1f7%KZ+NlEmtB7-lX-47#MABX;ROi@cYTgK(3^
zzxP}|mcy~xR`XC<B!&cm6{CYZgPpkS4jC{i@(p&>K?Y;y_s{^T38zkqw4ex+zsSDs
zN>u}`o);90!>Mfdcr^Z1iPhmvKU!{_Bo-xX5`uN5oPGHs{9KJyo;bsF^$=Ad-w-Kk
zc-hzljnyNM0qBZbQ}4$3&!DdtA3hmsi7Az*u7$kda1aRKaR`PT@T}k)Y;zt73*f7$
ztB-ZDEf3d?ux7|wZNR#@@hO1PK^06*DvYv<Ub4R|6I=3DGQ)!^D}qbE?XaMZIW9u)
z)Jpl*+3%fjTx2J3(K1CZPR2~(*bNIS(304kIrZS4pW=X#PIiQ+-)!p0&3HPWB9oIk
zn;|RH5ZXJ{5}mQYp=TXx^lJtABa)~#%xX|w4Vn~jd1bACu6yW#?sz(OgF;--mCa%8
z>3YFZGo5R-yJdFBO=udJA9PKXqjf!aFM+o4_R@Wro>(r?=<hZ3=jxNg?<x>{WzDvv
zgQnZI9s4+U;4OD~uVTgaDsDl~@dkMb)gh{CXVgBL_@!#BbN7RBW_JEG92LKdGZ$n>
zCn8}1;YBw}?SZ2nNC%ri7L#NdDQR8pEi)-&7hY}NY>EW$_n8ke@7bY*k}s6rlkQX`
zT?`*E7usUtfd5oM0{*XXAdEuP^Ie|Kli9&s_joDs$|2g6m??w55fcOD?TPbyty$CK
z-r~M8?c90290cr-gm+!!7|znsc+)>musbz$<Vfd7>rVkB1UsU$9oNruA+a(QmU-l1
zah^m`B{<o=fIlO8{q>D-*{uuHgHEOxnr7vxI<DGR^=L}8@MkX9>2Xqs?qDe6YWkf#
z_4yj>!AaEl@0{FLjv&g~!Aj>*o-|{rPX0g;d6@#a5=W56)45k=Ds5(})(^)ITIV;9
zzBU+se#U8-BD0c!3&SR~9`6yzl1)>}$`n*nB71tEGXCrn1<$7x`tLabt1Q=pZ{7`s
zSgFARs~TxBS11KKoE%5ctt)}&69yji*%Eo#Kc+MhGQ3Cil8$JRF$3XeZLiHW+Hd)*
zxu;2q>-m$ec7;b~ge*6b`*fL@EpeyKM~eWmS>~V!lP;*{L4?!cEHZrtWa5W-M$lTo
z`K2^}8vClUqZKlpB+quslxIZMKV0>SV9%Y{x40s|52@N?L(ZB{y`{x4F)W>*vF>I0
z<Ai-9s)BWeLN~eT!zJH>V`+2T?u1`tk9=%UgyhyTkwlMN($3V>mPSW8o|=ZqGi^Gq
zl#YkR9;YH!+;08TRgy%qmj_Pmx3!{)mMbxwjp&G%<qr($k62W_bTC$3H(F!9>hiho
zn*uJ@8Wn?``eF;hD0d6zs(LDr)fHT3F+)&lnrxHS`I1KP-eS)3XN)9vT0M3w--MC{
zqDvEKk}Ap-A>hkx4AXCZ{)?JGtVG2uddMV@wmwyKu&w$|0DfX`wL9Q~#$*SIr4WC>
zE-W$=F00=$K<Py^x$y)49F>^dH&$mi_FU(Z6@6M4U2W8)<>Zg^J<a|j3rw(@ubrbh
zzBbq-v4^ADHn^>=CJ+`~T4T2X9S>#<;PElhi*<FSQhP3mB3$hno-CJ*ytCT-dN=pk
z?)kfzP<n6Ir*n;^fkj&Dqwl1|S?nE*?PI!|N}Q;ix>^0^I<IW)eMTP3XHvt|hWI>|
znxSkmpva|yD_TFRv0VN2(H|fAmG5;^h;OS}Ko2(sx;}aHkq~6xY_d_i@_1nC;#l|)
z%^&MLVTHKh$DcA{l`H0AL!$C;?<~$bfmSXFy&pWCqb#kz*nNQ+=x#Fj&W@aQgqI!Z
zVV-OV|LQ1IoeQL$>%VZ0#1J|J96DpaEZCxlJc8Lk27E4({d8TRFvwX?XZ$^3@ZwBC
zczRcMW{PcBayVNvD=<pKfcpCCYpEGh+0vTr)$xu&_wo)zee9T3q}mMKa#&%&av6H)
z^B?Fv<6J^(^XU`NfNQ^$z{0nu@B~>1tRcbB^d|cNb-~DQ8f;-79oGl_h0d}`0(|b-
ztkmYdQf3hSHARi5Lzj@0{*x0ii9~b!kSVVID9AyV)sXR!<M|xOjH#h5cG@)es^`!K
zLw#e`h8m{BZd>IXirGZb3w9E#MZHlW0Nhp93VNx@e#VBYTdRPlU6)Y@`DFkS9pQLm
zxl93TNFC`M;Z<p${B#*S|8tzOItndZ5D*03QhSYFylLksV3^y5wpCkAgRL<%&GGs(
zxW55Q&uU-qrz@*weqTfv#q(+lWsmmJ!+(_?Zn?@Qa_1$8d_H5<G(OS!7KU;A?ua<x
zs3e{yl|pG)t)Ex3f=ypgv#3cd>-<v;MpPiP?n1{gA{kLBbR2opu&hgMeQ82hJF-|i
zG8#%qQS-A&?`a$BT9@_`L)&5~G<O0SI>KpEc0Dtlb2rV}<72l^)OOx``8SVoQjO0y
z?v676qJ3`s!$rVb{Xq7QF@9+6A`_B{9W6c7Sg0s@Tpe$`e(EVRpcAgQ#yU{dF~b+k
z?v8Au(VSvMvuRYPo7<}5v-?I;w(qnh+>J`@2#@eBEbk}&ewEf5Gd=HP^P<ZUeQPV}
zVMi!|${+_-I-Q+s^(24Q+n-1uV(HeV!Y$%Iz28^h2W!l(Mr&JBa~TTDM75i{+c$9>
zBoU9NoBHZYl6W}m_0aE~;R#h^mSJ&HBoa^iy8~QH-rk1YZ?3R*52lou1GZX8_(~!B
zJGMIj+9~D^2TQkVU;n(8_h%?@njyvh@M=;mv!ncoCcxC(xDpkFnem`Jg<&$t?r&KT
zKxihd(96kj!`EZ0rGv(rwC*X|14fQ8UjdY-0PGYwZdl4fJpEVjs`B^`K$N6MsB^a~
z+ELy^qM01MqlK^kVn>?}KiPQykCS{6S9_iT5SvZWpcB-^p4Y0bnx`vlJZ~srkiSGK
zasGBU4VxSzQ^Vk*2KB0nm9Nitvv7NWxAUlN?FcKo)MN75`S;3irbkq!u56=}cZHwT
zGdj1KyBfWqq8Nxwn*emdFBSiBH1GKHgPG53JHLJITlk+u%vC+i=LJh^;DxvF-2uMA
zlb_%G;|rJAd8FqeUo@x!rK<8YFBpYE`^<42L$<9zC`}IxRcSaa8cJ*$0_|5S`$$?e
zv3F6{cbGS}>wIFa9oc04klhgAJmf=-%}KVp8*c(@m;aL4zftlYq(z9;M`j9K%?#My
ze9ZITWG)@t{tT;L%21cvyrVC1m3?Dw>!)=`=^xfp@UX_cxEMikl!n>53T`XYU|rUI
z{ziMt!~7ZTO`?%c_fXn_l=}T3V*_9$sF{oXsgZOVYc`8$<qy{;R!8A;TTzIo0jK8r
zsA<5va@zm4L(|T2eW#h|Ij1UK?o<BblGgAvA58yEoX8i31L;Cm?c%ZjyBXPFX&nyr
zyJR)z=v48{9q#M56}n6WGQ6i>1e{5}*Y|^gy?_RMDhC52;{X*(YK^L>YpJnGc-7x;
z_E$<Lp*EE>-Zn=LNmg`xQ>S9O!sp)-IvAY~|G}oP-9VQ^T{i1-dzmGT!0z*pUD2rR
zI&uNk^U*Z0bm2eYu-XG?Fk@&6)!w+<?Nv(8V8cOTZB?)|w)=E_X+~EY^0|-0|3Bb*
z-VR7QcF+Fp1G0WRT{Stuzsr9eZ_K0vKYg;%b`K>A%rsqGlPgt2`%fo$Q=aEdr(L?U
zGZ{90+%`<v{$Q0VgrGM4+dQsWS|1)kZh!GIU<Gyl-O(bUE>3T^cx2fViUP4c?-G0_
zl~^a!kvXq(&USPt1(=r$xSi=n8xxRLG23W63Jtt@?uz2nv;H|&!8%y({`#LGQ~lWI
zf1n}^JH?J0D*o<_?Iby$yHcWeEN#@gRFB#o`M0>T8XNMMQIlAJUQ_^Pwqn$K4XDut
zDh;qK4zzok6vgISuTTZ!*+iZcTXxeY@n|1i!K+M3lt#w?ww1e?@^8F}owKz~A+~7>
zDKY1q-cNe*C5MKX-*2wEUe^f$X^3CR{RFEj#zkGP-AI}3KUUsDxo_dy$Ye`uw%NXm
z2|*`}g-(=mSv3jy62O{_O-j@)%09x$C!#P{I1sMF8f?^O4yIkkXY?Z-p0@RaMhDry
zF<22?m~4ddg&N!PI-2CEpC{R@Fa6Y&E`iCc8#!c}{Zs4bI&eFNCXuUzU_O2tohQ7D
zIdbm=s2s(w_50xIrW+R`9J6`vq~FABnN06E2>(_XqY%$Enf6=)P$G2KP9scyFDBM8
z^U2})Z2358O$nF;SXv@!0?a@R78n57V|Ivc5!e*R*CKemP_Rw%?J9GTc3P>n%XXV$
zD{X#_M80ABAW$lKEWc<h--eP5pziAR)H$EY%?yh@s5fhSui#PE_<AaCNTMBnKq-4_
zRHE_Q5&1zBIJ(d*_O0)yhYYdsAs~4LIeQp$!gXt>Wk8&XV9WajKDUZG?6c~HBixF<
zueRNlsp*1pRi&AgjyU5(dtJA$vF84}$d6mP%qTuo41M38(}4S-^ITHSS^^hAlPF9<
z|1x)cF9$Hc<%m)VpwA_03qSsa3r4#T(AL2&Te`yhr+dr8XsT9`Jm`7M3BO?p?ouPg
ztNlFS&;4;eh%TtaC?NcsV&S|Y<@Nn@VG0M9x}&~76Q!sAsj`IT^)=g!=s$6_RMmEy
zg6T|#C;lRk&SXVK=r<5ODmR7cmy$5x(pgi4HL6}D@Xe+_k&Wb&JHENgTjGA9k+MCW
zO&vxV<P<Z7C*J!-we4zztM?V%r_kjY0sZ=vd}D4~HCN#aXi>lUVQU*W()New=GIiK
zANg{bcHfaDcDH2w70NE~nM$(gO?~Z1Q>YUVEeVDfi)%Em2}ym)@>E#+a9TM@j=XWi
z(s^(H{W7<G2j`sMf(w2ZwaRgkG2(Hz+RhD52Cv=U9~)3&eW>zr3$rtfrfOz&4xi+!
zVi3q&wb2=eZLP*!_M-NQsvFzqkZT4ye0}?+ua)hzc3o>D$P_y<jaA@)f|2lNhe$j9
zCc$T+WX^Vp(SVnzXA<(*pWfl)1Ikl^NYm*P^N{MwjK;7a_F4%Smc7(Z$~t|f2eT_E
z+VQrb!>E)frtu2mLSi5X`Xrmq%sFMA-e1)J#-%>)cCAt;lL4XV#`2-e9jbuzowICr
z70%XAzJU$_a}#vfgsyZ-ia8)2_iCfLh6Jfn=Py-oJwCbgU@`o%(mMXL)B*_DC%gof
z^4gjH4H&{x(-Je<^?I?J+~HiDr#+&#C(s|ClM`B@{Z_<U>+*$!)f6alV#VXg;nr$z
zXjkHLkpP9bNcAAyu);5m+Cl}m8I8h<%SR`<dz*U)>E`<sbKL2)iMgw5B4B(*h)xV>
zxA;=mGQl$5Jwpd+xtN94b&cyjF(~kSKfwbxsKomA#p-cQ9sSr%Lk|h8q_-}Z@8>mc
z$8v<*P%)^6Jx}CuF|BWulkm-KelvREi&=?U$x5(^6|&IoBx$B&i`voSc%Su$LU*u@
z>&z+U1nT+}l<zWOwK-bYy!SFA-1#!JB_-94E`&&q<fV>i>m_CFrF8PBF%WJ>NNYnb
zjhSsN--3%%&+qKDbvKdFHJ-YMkV{Q@<!mR-Jh2#z(Hz~oPL20)rV@K5^~>X$CMbN_
z+{Hu8;q+-NNvxFHSWnCA()F-3S(qg@%$~Y+Lee^wGIlOI(0XT->rNWPYp0-^12IU~
zcTZpVrhedXKO@@6b{)J}#z?ocHe;EX5i4S6xv72I+Ea`9mtP;8%P@jzrZy$2DLMy$
z%$nW$6~)A-1-RKNrE`%dze~t<+kAe$w%0OIuxnSu&`{u$g>U8Q2QC#;EGssj&A(z<
z3t7X4_g<C;o3q-2xQ1Dg(Q)A7b!**os1RtEXi|@L(65STgkB`;z?HWsyN&=RU7gz)
zZ+<Z3x#3}_#U5H3F7VqDrQ-iAQhqP_Q|+^F0DGCjcc?IF%0bu6drZMSnUgN4Q{<*`
z6KH3rVA~dL<YZQ_<kYS#K`&I6)YX0!^ta{+HbfGkH`J2%AadjhhkCQG^Mz4_@ymZK
z4gXfe%D*-8`ZPE86Sklx%-@*^0PjHBD=cxw<XcN}yF){VGE)dVgK}FlvfJZU?Q-$>
zcV^ox1dulvc#D4Fu-^Ad9etk98WquInH$6-rgSJhA(RnJf_)<PX-<qd*^_4nxA9_C
zSL6_RgPWXuE|I=|#WL`{8>uYhSGjQETq?H$L1g;9G}tINfBOzm=S<I9zV2%Svmz#&
zlb$&NYB6}VW02cTpoY+=AfUoTyzgRad0kcfd6;dfu=zme6vBU}BVcmsof{WsSD_&i
zbe0WB3CUugmC%a<?7kfbkckU$t}?%W{&jYh!}tf^X5ru(gze68>Qhzhh2e{jUq4YF
z?&TJZX#;&KKmH9+*!_rn_|?V(>>`KEk-^U)>s>qKU$wLrR}i7Tl3h8S-*HY))Ng$|
z9nVvl1TLOw&G%Fo0Oe6$`gfa4I&CW}=9wRCOh{q|wHz~q29aL3sYC+zT|$<$%4t_c
z)s8pR98QefS!(?P9Y(z0jJLMbnUTk~b+-zB`71dGMm4XS@@?KLltkVW8bOU$OwpTJ
zrC25eX&j()mKn<YeVnUD9KD%rTxQ>A=mn5fx0QvGH$=Y!7uzn}pJ$usZACX74!2R4
zJeoXMPG7gJ33><6PQRXx`tlUW1*mxi=4grDDxda2-Qu`tL7KnZl>E3kk%nsg{p9u1
z&6W?2TywNUu~O2_Tc|g^2_BY-clFyf`y=!V=js|XQl!LFamH9VBc?W*Q9XC2tK5yE
z->;{N{HVo{7MhcYh4eeeQf!Ba>M^BuPq6J=xGbwWkn3HbxFlOOtJ0m#4&upK3RbI6
zZVWSjapECwadYFMF}{U(KXB5&r&rdSa3PX*3@M2k?`{4rSMLkj*A@Qw@Ip6$Ai&_S
zYfk&CZ@Nc~cM9^Ccy=5r+?4m{MIFEI=6^3ED+4^bvWh_PlGfifRBXhg!CzqP`f3v!
z>zRsdI2W+f$Iz;wS#)$l{0%-=`!9F>od9}gHQo~sI^1k}sryfV%{f0@Fd$pv;Ge6o
z&m=hyN8~CuV<Dp~_4@y1={@-Z?zmWI*2#D?E)39C4kaVD>2Vehw@^bT(AJx}c?~!B
z<L(z%#vXdITq)nrv0(dM;PKDRu!zv!dTEvQV`_x{%DI#FG~|56PoF34vTi|3(Rk?H
zm-rT;ee&L9Ivgv%G(IQyN4gVSU?LVZmxK!;tj)=&-D;K(P8D<)=F%USozW<PqyU!)
z2>-haKq}WJZ>RQpYLYDcf#M;~!N?B4q8}F+4=t-ELTBS5e?5=EN_}r@Ibb8Z(p__U
zLFMnI#-J|>r4Ev*ebO4x9RyO=YZeOrbd%Y>eEGRr>WOeQXoQf{YFgPtt8yw%DD)T<
zJU5`@T4hDw8@r^wc+u00e6?#NsH0Vu_FbDYllP@338%rhV@@RzIvNqbeNJNB^#+eu
z3ofpT&>YX&;`Nr{6HOXw4?22+A^Hv5d(YX&lHnc<FU8@9(aJ#CaKSPA)i<*0v42yk
zpo`wxRI2Z;HG1*}24VvF`|N|tZa{RQdY+jhH)<W%JN!&0XR23_I!Yc^efC1*t{o?C
z=pmt%XYd9i0MJ~MchczdfnotanCWEi+;<f_U`u&WI2gZiw$!_4#3c(cR+%?wF9>f{
z<x2ly74%@SH+AaQ_Wz+0Lij4Q|1pbojfze$2O>N%9mEvaOAKcBBI2&c`5tqt9e|_<
zqC9DN{uj(X84Iqq8|3LUP}1t#E{+~U2Z#N!B1dtdK?y@~LV=Ko_dg88{^7_4{n>X>
zSS6DEOsKH6eOv}O<w>vAg#{Ls2S-)n{ux=(s`l6T7$&sQqCpZ){&W9m7ny8$T7D>#
zVQtTz(GpO0PDw^6WiI$uCTVX2N1ufWR>vu|vb-@qNUnx@@AxIYXavZKeyD_mMXy&l
zD?Sn?S)5nRR{*C6uupyBq7O97HGoyMyxD1fJnCfSz=ZWg86!&gkK5jzvATFDIh<ns
zc-!@X>Pu^?)+d(XfCQ`ZRZfR!Z_&L6ros;|Y(mJzzE$>hj-vZNT_9IGz9-tzuC!&E
zhqOJ%9(t}VKWP4mzV^KT<lD3p)=>x>JoQ`Cbo=XSNBknemS`d2_(2<UIw+Dn4B7fX
zv@!`eYIqH}1K4)tS4XKzPMzBa5&h1T?vLg{idl<QZE_hgOk$lkf_V3JjaX&#5pJUA
zyb^PAZ-PE{#4LJH??f#(N?H*ZY}O77phVERo4-)>67Bb5fYb2HA7$+4X#o@%wV>2A
zYOTyJEyk0#HarPI^~aLmHK>r_F8jAzx~BX$mR;trpz)p%POV6HdF_cWuS=gM`TMNa
z%#zA_|9JJTj@h1-&%(7UI&+DKk`m}6%t({ECc}Jm|4+*W(qe<-6(@2$RZ5&P?v;4E
zizB#J$<{p&T>Nx-Y<lawW9+dvnPCt2A$GtJD6cYf*!T$y%K@8CQ72l(ezW4&g?jo}
zjw9TSx#iBJLYJ$1o(|I8=1*_x$Kt6t(IUBCmJG{NNs4MCF_t6HCs7LVM$w9sWeaq;
zolX+2;whOo*xSV@Qk19M4Zypz1(VrZ`amBWJ!?#h!k$xM-PMSi|3!osT`=5yv5oMI
z%*SpvSS<=Kg3L-}ks4j#$E9XDLPHvbJx=_kX>CDWkcfNx5^nw&3AEJ5T=;XiUhJAz
zwq6))Y{g?y8+LUq;$t?YhpulQgsY<*io4o2H86e{>d>&^)L;SP4AxZ&-AYy-m%DSk
zN5>i%da^6nqj-<-+eed`XS;2&;;p^_Laf|27u#=~g*{Z6qFrtmE)XlL2Dow;!{oe<
zNTZ1f@zVZVkw3}r;^4u1)Tq+2K+iW!=81h=Q76qEmVN?wztX4MpE~D<3iw#;-3?uM
zV;z%mEU!P;T76g315Sy;&v8P#M4g#GMn8mQPg9JgGTD^>y9JTb`1@GT;gxy?C#W-T
zJbe)94!Dz(!XVps<7R_{G0AnE(Q7N=?(XqGt5e5MfLqM71)yL=b`|uqC<{orLM>v_
z6M51wmdzAr+D3MO$OZBs#yZjj5qcwUzl0;W_>QEQfa05Q0hd_o6XP628L!1$M>X%8
zQ>wUpdMJI{L7@(`7r0wdmqwlFe5TF+CBF3i3SFV)`(U5dWH>oJE>ow8$6fU;@6oDy
zy8BBh@y6Sm*a02p&OL$_x-&N;J6pdpK4yD&^~tfxpITQ#>K3luR0bQG<paEGjUW1Y
zQ+u9CVRg;>lp@IyhxEAj<v>N8(P_A|*w$Ju-jg8W-FSMo+`TnGYF~{3kwuRgRwNxm
zl|{<9%2?BBCSFd!T|t^Ot8f1>9sS(sP3_ot@pDxYbAc*}z5P{(uAjH)--VIk*wxCO
z*c%M>{*rt1f;?HFZy{9c%ZFm1x0z=x1p~-WK=G>)#(#T=iYUOkcdaug=oKfC7-47A
zo6#>xq^*wdxQfI_<tWgvnjm3s8i~W{m>89%j`WN#jbW!|Vt?qNJTkUBqhjE<B%SIh
z`AJzWfMz_uu|)y|x>VkL9|N1#>(PhZT%aY0J~#sUgI4Q1g*auKggu9b>j~7&#^H|~
x49Zn>?FiRO%K9xQu4R-=@jtKsPh@~sF_abY^OVRF2QE;8wAA(0svg?E{9jrk1mgez

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 104811f7..1c6d8470 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -177,6 +177,17 @@
         <item>@string/add_feed_label</item>
     </string-array>
 
+    <string-array name="video_mode_options">
+        <item>@string/pref_video_mode_small_window</item>
+        <item>@string/pref_video_mode_full_screen</item>
+        <item>@string/pref_video_mode_audio_only</item>
+    </string-array>
+    <string-array name="video_mode_options_values">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
     <string-array name="nav_drawer_feed_order_options">
         <item>@string/drawer_feed_order_unplayed_episodes</item>
         <item>@string/drawer_feed_order_alphabetical</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e6d593c1..9ae6fc9b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -487,6 +487,11 @@
     <string name="pref_fast_forward_sum">Customize the number of seconds to jump forward when the fast forward button is clicked</string>
     <string name="pref_rewind">Rewind skip time</string>
     <string name="pref_rewind_sum">Customize the number of seconds to jump backwards when the rewind button is clicked</string>
+    <string name="pref_playback_video_mode">Video play mode</string>
+    <string name="pref_playback_video_mode_sum">Choose how video episode is played by default</string>
+    <string name="pref_video_mode_full_screen">Full screen</string>
+    <string name="pref_video_mode_small_window">Small window</string>
+    <string name="pref_video_mode_audio_only">Audio only</string>
     <string name="pref_expandNotify_title">High notification priority</string>
     <string name="pref_expandNotify_sum">This usually expands the notification to show playback buttons.</string>
     <string name="pref_persistNotify_title">Persistent playback controls</string>
@@ -688,6 +693,7 @@
     <string name="toolbar_back_button_content_description">Back</string>
     <string name="rewind_label">Rewind</string>
     <string name="fast_forward_label">Fast forward</string>
+    <string name="toggle_video_views">Toggle video views</string>
     <string name="increase_speed">Increase speed</string>
     <string name="decrease_speed">Decrease speed</string>
     <string name="media_type_video_label">Video</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 329f306c..b672b111 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -227,6 +227,16 @@
         <item name="windowSplashScreenAnimatedIcon">@drawable/launcher_animate</item>
     </style>
 
+    <style name="Theme.Podcini.VideoEpisode" parent="@style/Theme.Podcini.Dark">
+        <item name="android:fitsSystemWindows">true</item>
+<!--        <item name="android:windowActionModeOverlay">true</item>-->
+<!--        <item name="android:windowActionBarOverlay">true</item>-->
+<!--        <item name="android:windowActionBar">true</item>-->
+<!--        <item name="windowActionModeOverlay">true</item>-->
+<!--        <item name="windowActionBar">true</item>-->
+        <item name="windowActionBarOverlay">true</item>
+    </style>
+
     <style name="Theme.Podcini.VideoPlayer" parent="@style/Theme.Podcini.Dark">
         <item name="windowActionBarOverlay">true</item>
     </style>
diff --git a/app/src/main/res/xml/preferences_playback.xml b/app/src/main/res/xml/preferences_playback.xml
index 4b98baae..4ed2b16f 100644
--- a/app/src/main/res/xml/preferences_playback.xml
+++ b/app/src/main/res/xml/preferences_playback.xml
@@ -61,6 +61,11 @@
                 android:key="prefStreamOverDownload"
                 android:summary="@string/pref_stream_over_download_sum"
                 android:title="@string/pref_stream_over_download_title"/>
+        <Preference
+            android:title="@string/pref_playback_video_mode"
+            android:key="prefPlaybackVideoModeLauncher"
+            android:summary="@string/pref_playback_video_mode_sum"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/reassign_hardware_buttons">
diff --git a/app/src/main/res/xml/preferences_user_interface.xml b/app/src/main/res/xml/preferences_user_interface.xml
index b6afa89a..bc1b1429 100644
--- a/app/src/main/res/xml/preferences_user_interface.xml
+++ b/app/src/main/res/xml/preferences_user_interface.xml
@@ -44,7 +44,7 @@
             android:title="@string/pref_nav_drawer_feed_counter_title"
             android:key="prefDrawerFeedIndicator"
             android:summary="@string/pref_nav_drawer_feed_counter_sum"
-            android:defaultValue="1"/>
+            android:defaultValue="2"/>
 <!--        <Preference-->
 <!--            android:title="@string/pref_filter_feed_title"-->
 <!--            android:key="prefSubscriptionsFilter"-->
diff --git a/changelog.md b/changelog.md
index 7c1fce41..d79cbca4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -260,4 +260,16 @@
 * enabled speed setting for podcast in video player
 * fixed bug of receiving null view in function requiring non-null in subscriptions page
 * set Counter default to number of SHOW_UNPLAYED
-* removed FeedCounter.SHOW_NEW, NewEpisodesNotification, and associated notifications settings
\ No newline at end of file
+* removed FeedCounter.SHOW_NEW, NewEpisodesNotification, and associated notifications settings
+
+## 4.8.0
+
+* fixed empty player detailed view on first start
+* player detailed view scrolls to the top on a new episode
+* created video episode view, with video player on top and episode descriptions in portrait mode
+* added video player mode setting in preferences, set to small window by default
+* added on video controller easy switches to other video mode or audio only
+* when video mode is set to audio only, click on image on audio player on a video episode brings up the normal player detailed view
+* webkit updated to Androidx
+* fixed bug in setting speed to wrong categories
+* improved fetching of episode images when invalid addresses are given
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/3020130.txt b/fastlane/metadata/android/en-US/changelogs/3020130.txt
new file mode 100644
index 00000000..d9667c54
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/3020130.txt
@@ -0,0 +1,12 @@
+ 
+Version 4.8.0 brings several changes:
+
+* fixed empty player detailed view on first start
+* player detailed view scrolls to the top on a new episode
+* created video episode view, with video player on top and episode descriptions in portrait mode
+* added video player mode setting in preferences, set to small window by default
+* added on video controller easy switches to other video mode or audio only
+* when video mode is set to audio only, click on image on audio player on a video episode brings up the normal player detailed view
+* webkit updated to Androidx
+* fixed bug in setting speed to wrong categories
+* improved fetching of episode images when invalid addresses are given