Merge pull request #888 from Bnyro/master

show the already played time on the video thumbnail

app/src/main/java/com/github/libretube/adapters/ChannelAdapter.kt

@@ -11,6 +11,7 @@ import com.github.libretube.obj.StreamItem
 import com.github.libretube.util.ConnectionHelper
 import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.formatShort
+import com.github.libretube.util.setWatchProgressLength
 
 class ChannelAdapter(
     private val videoFeed: MutableList<StreamItem>,
@@ -46,12 +47,13 @@ class ChannelAdapter(
             root.setOnClickListener {
                 NavigationHelper.navigateVideo(root.context, trending.url)
             }
-            root.setOnLongClickListener {
             val videoId = trending.url!!.replace("/watch?v=", "")
+            root.setOnLongClickListener {
                 VideoOptionsDialog(videoId, root.context)
                     .show(childFragmentManager, "VideoOptionsDialog")
                 true
             }
+            watchProgress.setWatchProgressLength(videoId, trending.duration!!)
         }
     }
 }

app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt

@@ -19,6 +19,7 @@ import com.github.libretube.util.ConnectionHelper
 import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.RetrofitInstance
 import com.github.libretube.util.formatShort
+import com.github.libretube.util.setWatchProgressLength
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -101,8 +102,8 @@ class SearchAdapter(
             root.setOnClickListener {
                 NavigationHelper.navigateVideo(root.context, item.url)
             }
-            root.setOnLongClickListener {
             val videoId = item.url!!.replace("/watch?v=", "")
+            root.setOnLongClickListener {
                 VideoOptionsDialog(videoId, root.context)
                     .show(childFragmentManager, "VideoOptionsDialog")
                 true
@@ -110,6 +111,7 @@ class SearchAdapter(
             channelImage.setOnClickListener {
                 NavigationHelper.navigateChannel(root.context, item.uploaderUrl)
             }
+            watchProgress.setWatchProgressLength(videoId, item.duration!!)
         }
     }
 

app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt

@@ -12,6 +12,7 @@ import com.github.libretube.obj.StreamItem
 import com.github.libretube.util.ConnectionHelper
 import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.formatShort
+import com.github.libretube.util.setWatchProgressLength
 
 class TrendingAdapter(
     private val streamItems: List<StreamItem>,
@@ -51,12 +52,13 @@ class TrendingAdapter(
             root.setOnClickListener {
                 NavigationHelper.navigateVideo(root.context, trending.url)
             }
-            root.setOnLongClickListener {
             val videoId = trending.url!!.replace("/watch?v=", "")
+            root.setOnLongClickListener {
                 VideoOptionsDialog(videoId, root.context)
                     .show(childFragmentManager, "VideoOptionsDialog")
                 true
             }
+            watchProgress.setWatchProgressLength(videoId, trending.duration!!)
         }
     }
 }

app/src/main/java/com/github/libretube/adapters/WatchHistoryAdapter.kt

@@ -10,6 +10,7 @@ import com.github.libretube.dialogs.VideoOptionsDialog
 import com.github.libretube.obj.WatchHistoryItem
 import com.github.libretube.util.ConnectionHelper
 import com.github.libretube.util.NavigationHelper
+import com.github.libretube.util.setWatchProgressLength
 
 class WatchHistoryAdapter(
     private val watchHistory: MutableList<WatchHistoryItem>,
@@ -52,6 +53,8 @@ class WatchHistoryAdapter(
                     .show(childFragmentManager, "VideoOptionsDialog")
                 true
             }
+
+            watchProgress.setWatchProgressLength(video.videoId!!, video.duration.toLong())
         }
     }
 

app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt

@@ -853,6 +853,7 @@ class PlayerFragment : Fragment() {
     private fun playNextVideo() {
         // check whether there is a new video in the queue
         // by making sure that the next and the current video aren't the same
+        saveWatchPosition()
         if (videoId != nextStreamId) {
             // save the id of the next stream as videoId and load the next video
             videoId = nextStreamId

app/src/main/java/com/github/libretube/util/SetWatchProgressLength.kt

@@ -0,0 +1,35 @@
+package com.github.libretube.util
+
+import android.view.View
+import android.view.ViewTreeObserver
+import com.github.libretube.preferences.PreferenceHelper
+
+/**
+ * shows the already watched time under the video
+ */
+fun View?.setWatchProgressLength(videoId: String, duration: Long) {
+    val view = this!!
+    val positions = PreferenceHelper.getWatchPositions()
+    var newWidth: Long? = null
+    view.getViewTreeObserver()
+        .addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
+            override fun onGlobalLayout() {
+                this@setWatchProgressLength.getViewTreeObserver().removeOnGlobalLayoutListener(this)
+                positions.forEach {
+                    if (it.videoId == videoId) {
+                        newWidth = (width * (it.position / (duration))) / 1000
+                        return@forEach
+                    }
+                }
+                if (newWidth != null) {
+                    val lp = view.layoutParams
+                    lp.apply {
+                        width = newWidth!!.toInt()
+                    }
+                    view.layoutParams = lp
+                } else {
+                    view.visibility = View.GONE
+                }
+            }
+        })
+}

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

@@ -25,11 +25,18 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:orientation="vertical">
+
             <androidx.cardview.widget.CardView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
+                android:layout_gravity="end"
-            android:layout_margin="5dp"
+                android:layout_marginEnd="5dp"
+                android:layout_marginBottom="5dp"
                 app:cardBackgroundColor="@color/duration_background_color"
                 app:cardCornerRadius="8dp"
                 app:cardElevation="0dp">
@@ -38,15 +45,23 @@
                     android:id="@+id/thumbnail_duration"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                android:paddingStart="6dp"
+                    android:paddingHorizontal="6dp"
-                android:paddingTop="2dp"
+                    android:paddingVertical="2dp"
-                android:paddingEnd="6dp"
-                android:paddingBottom="2dp"
                     android:textColor="@color/duration_text_color"
+                    android:textSize="11sp"
                     tools:text="05:36" />
 
             </androidx.cardview.widget.CardView>
 
+            <View
+                android:id="@+id/watch_progress"
+                android:layout_width="match_parent"
+                android:layout_height="5dp"
+                android:layout_gravity="bottom"
+                android:background="@android:color/holo_red_dark" />
+
+        </LinearLayout>
+
     </androidx.cardview.widget.CardView>
 
 

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

@@ -35,12 +35,18 @@
             android:layout_height="match_parent"
             tools:srcCompat="@tools:sample/backgrounds/scenic" />
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:orientation="vertical">
+
             <androidx.cardview.widget.CardView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
+                android:layout_gravity="end"
                 android:layout_marginEnd="5dp"
-            android:layout_marginBottom="3dp"
+                android:layout_marginBottom="5dp"
                 app:cardBackgroundColor="@color/duration_background_color"
                 app:cardCornerRadius="8dp"
                 app:cardElevation="0dp">
@@ -49,16 +55,23 @@
                     android:id="@+id/thumbnail_duration"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                android:paddingStart="6dp"
+                    android:paddingHorizontal="6dp"
-                android:paddingTop="2dp"
+                    android:paddingVertical="2dp"
-                android:paddingEnd="6dp"
-                android:paddingBottom="2dp"
                     android:textColor="@color/duration_text_color"
                     android:textSize="11sp"
                     tools:text="05:36" />
 
             </androidx.cardview.widget.CardView>
 
+            <View
+                android:id="@+id/watch_progress"
+                android:layout_width="match_parent"
+                android:layout_height="4dp"
+                android:layout_gravity="bottom"
+                android:background="@android:color/holo_red_dark" />
+
+        </LinearLayout>
+
     </com.google.android.material.card.MaterialCardView>
 
     <TextView