app/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'kotlin-android-extensions'
     id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlin_version"
 }
 

app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerActivity.kt

@@ -47,10 +47,10 @@ import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.ui.StyledPlayerControlView
 import com.google.android.exoplayer2.util.Util
+import kotlinx.android.synthetic.main.activity_player.*
+import kotlinx.android.synthetic.main.player_controls.*
 import kotlinx.coroutines.launch
 import org.mosad.teapod.R
-import org.mosad.teapod.databinding.ActivityPlayerBinding
-import org.mosad.teapod.databinding.PlayerControlsBinding
 import org.mosad.teapod.parser.crunchyroll.NoneEpisode
 import org.mosad.teapod.preferences.Preferences
 import org.mosad.teapod.ui.activity.player.fragment.EpisodeListDialogFragment
@@ -65,8 +65,6 @@ import kotlin.concurrent.scheduleAtFixedRate
 class PlayerActivity : AppCompatActivity() {
 
     private val model: PlayerViewModel by viewModels()
-    private lateinit var playerBinding: ActivityPlayerBinding
-    private lateinit var controlsBinding: PlayerControlsBinding
 
     private lateinit var controller: StyledPlayerControlView
     private lateinit var gestureDetector: GestureDetectorCompat
@@ -84,11 +82,6 @@ class PlayerActivity : AppCompatActivity() {
         setContentView(R.layout.activity_player)
         hideBars() // Initial hide the bars
 
-        playerBinding = ActivityPlayerBinding.bind(findViewById(R.id.player_root))
-
-        println(findViewById(R.id.player_controls_root))
-        controlsBinding = PlayerControlsBinding.bind(findViewById(R.id.player_controls_root))
-
         model.loadMediaAsync(
             intent.getStringExtra(getString(R.string.intent_season_id)) ?: "",
             intent.getStringExtra(getString(R.string.intent_episode_id)) ?: ""
@@ -96,7 +89,7 @@ class PlayerActivity : AppCompatActivity() {
         model.currentEpisodeChangedListener.add { onMediaChanged() }
         gestureDetector = GestureDetectorCompat(this, PlayerGestureListener())
 
-        controller = playerBinding.videoView.findViewById(R.id.exo_controller)
+        controller = video_view.findViewById(R.id.exo_controller)
         controller.isAnimationEnabled = false // disable controls (time-bar) animation
 
         initExoPlayer() // call in onCreate, exoplayer lives in view model
@@ -113,7 +106,7 @@ class PlayerActivity : AppCompatActivity() {
         super.onStart()
         if (Util.SDK_INT > 23) {
             initPlayer()
-            playerBinding.videoView.onResume()
+            video_view?.onResume()
         }
     }
 
@@ -123,7 +116,7 @@ class PlayerActivity : AppCompatActivity() {
 
         if (Util.SDK_INT <= 23) {
             initPlayer()
-            playerBinding.videoView.onResume()
+            video_view?.onResume()
         }
     }
 
@@ -175,7 +168,7 @@ class PlayerActivity : AppCompatActivity() {
             } else {
                 val width = model.player.videoFormat?.width ?: 0
                 val height = model.player.videoFormat?.height ?: 0
-                val contentFrame: View = playerBinding.videoView.findViewById(R.id.exo_content_frame)
+                val contentFrame: View = video_view.findViewById(R.id.exo_content_frame)
                 val contentRect = with(contentFrame) {
                     val (x, y) = intArrayOf(0, 0).also(::getLocationInWindow)
                     Rect(x, y, x + width, y + height)
@@ -199,9 +192,7 @@ class PlayerActivity : AppCompatActivity() {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
 
         // Hide the full-screen UI (controls, etc.) while in picture-in-picture mode.
-        playerBinding.videoView.useController = !isInPictureInPictureMode
+        video_view.useController = !isInPictureInPictureMode
-
-        // TODO also hide language settings/episodes list
     }
 
     private fun initPlayer() {
@@ -223,13 +214,17 @@ class PlayerActivity : AppCompatActivity() {
             override fun onPlaybackStateChanged(state: Int) {
                 super.onPlaybackStateChanged(state)
 
-                playerBinding.loading.visibility = when (state) {
+                loading.visibility = when (state) {
                     ExoPlayer.STATE_READY -> View.GONE
                     ExoPlayer.STATE_BUFFERING -> View.VISIBLE
                     else -> View.GONE
                 }
 
-                controlsBinding.exoPlayPause.isVisible = !playerBinding.loading.isVisible
+                exo_play_pause.visibility = when (loading.visibility) {
+                    View.GONE -> View.VISIBLE
+                    View.VISIBLE -> View.INVISIBLE
+                    else -> View.VISIBLE
+                }
 
                 if (state == ExoPlayer.STATE_ENDED && hasNextEpisode() && Preferences.autoplay) {
                     playNextEpisode()
@@ -244,10 +239,10 @@ class PlayerActivity : AppCompatActivity() {
 
     @SuppressLint("ClickableViewAccessibility")
     private fun initVideoView() {
-        playerBinding.videoView.player = model.player
+        video_view.player = model.player
 
         // when the player controls get hidden, hide the bars too
-        playerBinding.videoView.setControllerVisibilityListener {
+        video_view.setControllerVisibilityListener {
             when (it) {
                 View.GONE -> {
                     hideBars()
@@ -257,23 +252,23 @@ class PlayerActivity : AppCompatActivity() {
             }
         }
 
-        playerBinding.videoView.setOnTouchListener { _, event ->
+        video_view.setOnTouchListener { _, event ->
             gestureDetector.onTouchEvent(event)
             true
         }
     }
 
     private fun initActions() {
-        controlsBinding.exoClosePlayer.setOnClickListener {
+        exo_close_player.setOnClickListener {
             this.finish()
         }
-        controlsBinding.rwd10.setOnButtonClickListener { rewind() }
+        rwd_10.setOnButtonClickListener { rewind() }
-        controlsBinding.ffwd10.setOnButtonClickListener { fastForward() }
+        ffwd_10.setOnButtonClickListener { fastForward() }
-        playerBinding.buttonNextEp.setOnClickListener { playNextEpisode() }
+        button_next_ep.setOnClickListener { playNextEpisode() }
-        playerBinding.buttonSkipOp.setOnClickListener { skipOpening() }
+        button_skip_op.setOnClickListener { skipOpening() }
-        controlsBinding.buttonLanguage.setOnClickListener { showLanguageSettings() }
+        button_language.setOnClickListener { showLanguageSettings() }
-        controlsBinding.buttonEpisodes.setOnClickListener { showEpisodesList() }
+        button_episodes.setOnClickListener { showEpisodesList() }
-        controlsBinding.buttonNextEpC.setOnClickListener { playNextEpisode() }
+        button_next_ep_c.setOnClickListener { playNextEpisode() }
     }
 
     private fun initGUI() {
@@ -291,7 +286,7 @@ class PlayerActivity : AppCompatActivity() {
         timerUpdates = Timer().scheduleAtFixedRate(0, 500) {
             lifecycleScope.launch {
                 val currentPosition = model.player.currentPosition
-                val btnNextEpIsVisible = playerBinding.buttonNextEp.isVisible
+                val btnNextEpIsVisible = button_next_ep.isVisible
                 val controlsVisible = controller.isVisible
 
                 // make sure remaining time is > 0
@@ -315,12 +310,10 @@ class PlayerActivity : AppCompatActivity() {
                 model.currentEpisodeMeta?.let {
                     if (it.openingDuration > 0 &&
                         currentPosition in it.openingStart..(it.openingStart + 10000) &&
-                        !playerBinding.buttonSkipOp.isVisible
+                        !button_skip_op.isVisible
                     ) {
                         showButtonSkipOp()
-                    } else if (playerBinding.buttonSkipOp.isVisible &&
+                    } else if (button_skip_op.isVisible && currentPosition !in it.openingStart..(it.openingStart + 10000)) {
-                        currentPosition !in it.openingStart..(it.openingStart + 10000)
-                    ) {
                         // the button should only be visible, if currentEpisodeMeta != null
                         hideButtonSkipOp()
                     }
@@ -335,7 +328,7 @@ class PlayerActivity : AppCompatActivity() {
     }
 
     private fun onPauseOnStop() {
-        playerBinding.videoView.onPause()
+        video_view?.onPause()
         model.player.pause()
         timerUpdates.cancel()
     }
@@ -350,7 +343,7 @@ class PlayerActivity : AppCompatActivity() {
         val seconds = TimeUnit.MILLISECONDS.toSeconds(remainingTime) % 60
 
         // if remaining time is below 60 minutes, don't show hours
-        controlsBinding.exoRemaining.text = if (TimeUnit.MILLISECONDS.toMinutes(remainingTime) < 60) {
+        exo_remaining.text = if (TimeUnit.MILLISECONDS.toMinutes(remainingTime) < 60) {
             getString(R.string.time_min_sec, minutes, seconds)
         } else {
             getString(R.string.time_hour_min_sec, hours, minutes, seconds)
@@ -368,10 +361,10 @@ class PlayerActivity : AppCompatActivity() {
             this.finish()
         }
 
-        controlsBinding.exoTextTitle.text = model.getMediaTitle()
+        exo_text_title.text = model.getMediaTitle()
 
         // hide the next episode button, if there is none
-        controlsBinding.buttonNextEpC.isVisible = hasNextEpisode()
+        button_next_ep_c.visibility = if (hasNextEpisode()) View.VISIBLE else View.GONE
     }
 
     /**
@@ -391,36 +384,36 @@ class PlayerActivity : AppCompatActivity() {
         model.seekToOffset(rwdTime)
 
         // hide/show needed components
-        playerBinding.exoDoubleTapIndicator.visibility = View.VISIBLE
+        exo_double_tap_indicator.visibility = View.VISIBLE
-        playerBinding.ffwd10Indicator.visibility = View.INVISIBLE
+        ffwd_10_indicator.visibility = View.INVISIBLE
-        controlsBinding.rwd10.visibility = View.INVISIBLE
+        rwd_10.visibility = View.INVISIBLE
 
-        playerBinding.rwd10Indicator.onAnimationEndCallback = {
+        rwd_10_indicator.onAnimationEndCallback = {
-            playerBinding.exoDoubleTapIndicator.visibility = View.GONE
+            exo_double_tap_indicator.visibility = View.GONE
-            playerBinding.ffwd10Indicator.visibility = View.VISIBLE
+            ffwd_10_indicator.visibility = View.VISIBLE
-            controlsBinding.rwd10.visibility = View.VISIBLE
+            rwd_10.visibility = View.VISIBLE
         }
 
         // run animation
-        playerBinding.rwd10Indicator.runOnClickAnimation()
+        rwd_10_indicator.runOnClickAnimation()
     }
 
     private fun fastForward() {
         model.seekToOffset(fwdTime)
 
         // hide/show needed components
-        playerBinding.exoDoubleTapIndicator.visibility = View.VISIBLE
+        exo_double_tap_indicator.visibility = View.VISIBLE
-        playerBinding.rwd10Indicator.visibility = View.INVISIBLE
+        rwd_10_indicator.visibility = View.INVISIBLE
-        controlsBinding.ffwd10.visibility = View.INVISIBLE
+        ffwd_10.visibility = View.INVISIBLE
 
-        playerBinding.ffwd10Indicator.onAnimationEndCallback = {
+        ffwd_10_indicator.onAnimationEndCallback = {
-            playerBinding.exoDoubleTapIndicator.visibility = View.GONE
+            exo_double_tap_indicator.visibility = View.GONE
-            playerBinding.rwd10Indicator.visibility = View.VISIBLE
+            rwd_10_indicator.visibility = View.VISIBLE
-            controlsBinding.ffwd10.visibility = View.VISIBLE
+            ffwd_10.visibility = View.VISIBLE
         }
 
         // run animation
-        playerBinding.ffwd10Indicator.runOnClickAnimation()
+        ffwd_10_indicator.runOnClickAnimation()
     }
 
     private fun playNextEpisode() {
@@ -441,10 +434,10 @@ class PlayerActivity : AppCompatActivity() {
      * TODO improve the show animation
      */
     private fun showButtonNextEp() {
-        playerBinding.buttonNextEp.isVisible = true
+        button_next_ep.isVisible = true
-        playerBinding.buttonNextEp.alpha = 0.0f
+        button_next_ep.alpha = 0.0f
 
-        playerBinding.buttonNextEp.animate()
+        button_next_ep.animate()
             .alpha(1.0f)
             .setListener(null)
     }
@@ -454,33 +447,33 @@ class PlayerActivity : AppCompatActivity() {
      * TODO improve the hide animation
      */
     private fun hideButtonNextEp() {
-        playerBinding.buttonNextEp.animate()
+        button_next_ep.animate()
             .alpha(0.0f)
             .setListener(object : AnimatorListenerAdapter() {
                 override fun onAnimationEnd(animation: Animator?) {
                     super.onAnimationEnd(animation)
-                    playerBinding.buttonNextEp.isVisible = false
+                    button_next_ep.isVisible = false
                 }
             })
 
     }
 
     private fun showButtonSkipOp() {
-        playerBinding.buttonSkipOp.isVisible = true
+        button_skip_op.isVisible = true
-        playerBinding.buttonSkipOp.alpha = 0.0f
+        button_skip_op.alpha = 0.0f
 
-        playerBinding.buttonSkipOp.animate()
+        button_skip_op.animate()
             .alpha(1.0f)
             .setListener(null)
     }
 
     private fun hideButtonSkipOp() {
-        playerBinding.buttonSkipOp.animate()
+        button_skip_op.animate()
             .alpha(0.0f)
             .setListener(object : AnimatorListenerAdapter() {
                 override fun onAnimationEnd(animation: Animator?) {
                     super.onAnimationEnd(animation)
-                    playerBinding.buttonSkipOp.isVisible = false
+                    button_skip_op.isVisible = false
                 }
             })
 
@@ -523,7 +516,7 @@ class PlayerActivity : AppCompatActivity() {
          */
         override fun onDoubleTap(e: MotionEvent?): Boolean {
             val eventPosX = e?.x?.toInt() ?: 0
-            val viewCenterX = playerBinding.videoView.measuredWidth / 2
+            val viewCenterX = video_view.measuredWidth / 2
 
             // if the event position is on the left side rewind, if it's on the right forward
             if (eventPosX < viewCenterX) rewind() else fastForward()

app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerViewModel.kt

@@ -37,7 +37,10 @@ import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.mosad.teapod.R
-import org.mosad.teapod.parser.crunchyroll.*
+import org.mosad.teapod.parser.crunchyroll.Crunchyroll
+import org.mosad.teapod.parser.crunchyroll.NoneEpisode
+import org.mosad.teapod.parser.crunchyroll.NoneEpisodes
+import org.mosad.teapod.parser.crunchyroll.NonePlayback
 import org.mosad.teapod.preferences.Preferences
 import org.mosad.teapod.util.metadb.EpisodeMeta
 import org.mosad.teapod.util.metadb.Meta
@@ -64,8 +67,6 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
         internal set
     var currentEpisodeMeta: EpisodeMeta? = null
         internal set
-    var currentPlayheads: PlayheadsMap = mutableMapOf()
-        internal set
 //    var tmdbTVSeason: TMDBTVSeason? =null
 //        internal set
 
@@ -120,15 +121,7 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
 
     fun loadMediaAsync(seasonId: String, episodeId: String) = viewModelScope.launch {
         episodes = Crunchyroll.episodes(seasonId)
-
+        mediaMeta = loadMediaMeta(episodes.items.first().seriesId)
-        listOf(
-            viewModelScope.launch { mediaMeta = loadMediaMeta(episodes.items.first().seriesId) },
-            viewModelScope.launch {
-                val episodeIDs = episodes.items.map { it.id }
-                currentPlayheads = Crunchyroll.playheads(episodeIDs)
-            }
-        ).joinAll()
-
 
         Log.d(classTag, "meta: $mediaMeta")
 
@@ -278,11 +271,6 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
             viewModelScope.launch { Crunchyroll.postPlayheads(currentEpisode.id, playhead.toInt()) }
             Log.i(javaClass.name, "Set playhead for episode ${currentEpisode.id} to $playhead sec.")
         }
-
-        viewModelScope.launch {
-            val episodeIDs = episodes.items.map { it.id }
-            currentPlayheads = Crunchyroll.playheads(episodeIDs)
-        }
     }
 
 }

app/src/main/java/org/mosad/teapod/ui/activity/player/fragment/EpisodeListDialogFragment.kt

@@ -43,7 +43,7 @@ class EpisodeListDialogFragment : DialogFragment()  {
         val adapterRecEpisodes = EpisodeItemAdapter(
             model.episodes.items,
             null,
-            model.currentPlayheads.toMap(),
+            mapOf(),
             EpisodeItemAdapter.OnClickListener { episode ->
                 dismiss()
                 model.setCurrentEpisode(episode.id, startPlayback = true)

app/src/main/java/org/mosad/teapod/util/adapter/EpisodeItemAdapter.kt

@@ -51,7 +51,7 @@ class EpisodeItemAdapter(
                 (holder as EpisodeViewHolder).bind(episode, playhead, tmdbEpisode)
             }
             ViewType.PLAYER.ordinal -> {
-                (holder as PlayerEpisodeViewHolder).bind(episode, playhead, currentSelected)
+                (holder as PlayerEpisodeViewHolder).bind(episode, currentSelected)
             }
         }
     }
@@ -122,7 +122,7 @@ class EpisodeItemAdapter(
         RecyclerView.ViewHolder(binding.root) {
 
         // -1, since position should never be < 0
-        fun bind(episode: Episode, playhead: PlayheadObject?, currentSelected: Int) {
+        fun bind(episode: Episode, currentSelected: Int) {
             val context = binding.root.context
 
             val titleText = if (episode.episodeNumber != null) {
@@ -145,14 +145,6 @@ class EpisodeItemAdapter(
                     .into(binding.imageEpisode)
             }
 
-            // add watched progress
-            val playheadProgress = playhead?.playhead?.let {
-                ((it.toFloat() / (episode.durationMs / 1000)) * 100).toInt()
-            } ?: 0
-            binding.progressPlayhead.setProgressCompat(playheadProgress, false)
-            binding.progressPlayhead.visibility = if (playheadProgress <= 0)
-                View.GONE  else View.VISIBLE
-
             // hide the play icon, if it's the current episode
             binding.imageEpisodePlay.visibility = if (currentSelected == bindingAdapterPosition) {
                 View.GONE

app/src/main/res/layout/activity_player.xml

@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/player_root"
+    android:id="@+id/player_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#000000"

app/src/main/res/layout/item_episode_player.xml

@@ -26,16 +26,7 @@
             android:background="@drawable/bg_circle__black_transparent_24dp"
             android:contentDescription="@string/button_play"
             app:srcCompat="@drawable/ic_baseline_play_arrow_24"
-            app:tint="@color/player_white" />
+            app:tint="#FFFFFF" />
-
-        <com.google.android.material.progressindicator.LinearProgressIndicator
-            android:id="@+id/progress_playhead"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:max="100"
-            app:trackColor="#00FFFFFF"
-            app:trackThickness="2dp" />
     </FrameLayout>
 
     <TextView

app/src/main/res/layout/player_controls.xml

@@ -2,7 +2,6 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/player_controls_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#73000000">
@@ -95,12 +94,11 @@
         android:layout_marginEnd="12dp"
         android:layout_marginBottom="@dimen/player_styled_progress_margin_bottom">
 
-        <com.google.android.exoplayer2.ui.DefaultTimeBar
+        <View
-            android:id="@id/exo_progress"
+            android:id="@+id/exo_progress_placeholder"
             android:layout_width="0dp"
             android:layout_height="@dimen/player_styled_progress_layout_height"
-            android:contentDescription="@string/desc_time_bar"
+            android:layout_marginBottom="2dp"
-            app:bar_height="3dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/exo_remaining"
             app:layout_constraintStart_toStartOf="parent"
@@ -109,10 +107,9 @@
         <TextView
             android:id="@+id/exo_remaining"
             style="@style/ExoStyledControls.TimeText.Position"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
-            app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/values-de-rDE/strings.xml

@@ -84,7 +84,6 @@
     <string name="episodes">Folgen</string>
     <string name="episode">Folge</string>
     <string name="no_subtitles">Aus</string>
-    <string name="desc_time_bar">Zeitleiste</string>
 
     <!-- Onboarding -->
     <string name="skip">Überspringen</string>

app/src/main/res/values/strings.xml

@@ -106,7 +106,6 @@
     <string name="episodes">Episodes</string>
     <string name="episode">Episode</string>
     <string name="no_subtitles">None</string>
-    <string name="desc_time_bar">time bar</string>
 
     <!-- Onboarding -->
     <string name="skip">Skip</string>

app/src/main/res/values/styles.xml

@@ -51,7 +51,7 @@
     </style>
 
     <!-- player theme -->
-    <style name="PlayerTheme" parent="AppTheme">
+    <style name="PlayerTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowFullscreen">true</item>
@@ -86,8 +86,7 @@
         <item name="android:popupBackground">?themeSecondary</item>
     </style>
 
-    <!-- fullscreen dialog fragments -->
+    <style name="FullScreenDialogStyle" parent="Theme.MaterialComponents.Light.NoActionBar">
-    <style name="FullScreenDialogStyle" parent="AppTheme">
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowBackground">@android:color/transparent</item>