Merge pull request #6754 from Bnyro/master

fix: overflowing downloads layout on some devices
libre-tube · Nov 18, 2024 · 7151496 · 7151496
2 parents 9a7a4dc + d23b64d
commit 7151496
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 158 deletions.
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt
@@ -12,7 +12,7 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.constants.IntentData
-import com.github.libretube.databinding.DownloadedMediaRowBinding
+import com.github.libretube.databinding.VideoRowBinding
 import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.db.obj.DownloadWithItems
 import com.github.libretube.extensions.formatAsFileSize
@@ -41,7 +41,7 @@ class DownloadsAdapter(
     private val toggleDownload: (DownloadWithItems) -> Boolean
 ) : RecyclerView.Adapter<DownloadsViewHolder>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DownloadsViewHolder {
-        val binding = DownloadedMediaRowBinding.inflate(
+        val binding = VideoRowBinding.inflate(
             LayoutInflater.from(parent.context),
             parent,
             false
@@ -53,9 +53,13 @@ class DownloadsAdapter(
     override fun onBindViewHolder(holder: DownloadsViewHolder, position: Int) {
         val download = downloads[position].download
         val items = downloads[position].downloadItems
+
         holder.binding.apply {
-            title.text = download.title
-            uploaderName.text = download.uploader
+            fileSize.isVisible = true
+
+            channelImageContainer.isGone = true
+            videoTitle.text = download.title
+            channelName.text = download.uploader
             videoInfo.text = download.uploadDate?.let { TextUtils.localizeDate(it) }
             watchProgress.setWatchProgressLength(download.videoId, download.duration ?: 0)
 
@@ -81,14 +85,14 @@ class DownloadsAdapter(
             } else {
                 downloadOverlay.isGone = true
                 fileSize.text = totalSizeInfo
-                durationContainer.isVisible = true
+                thumbnailDurationCard.isVisible = true
                 download.duration?.let {
                     thumbnailDuration.text = DateUtils.formatElapsedTime(it)
                 }
             }
 
             download.thumbnailPath?.let { path ->
-                ImageHelper.loadImage(path.toString(), thumbnailImage)
+                ImageHelper.loadImage(path.toString(), thumbnail)
             }
 
             progressBar.setOnClickListener {

diff --git a/app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt
@@ -81,7 +81,7 @@ class PlaylistAdapter(
         holder.binding.apply {
             videoTitle.text = streamItem.title
             videoInfo.text = streamItem.uploaderName
-            channelImage.isGone = true
+            channelImageContainer.isGone = true
 
             thumbnailDuration.setFormattedDuration(streamItem.duration ?: -1, streamItem.isShort, streamItem.uploaded)
 

diff --git a/app/src/main/java/com/github/libretube/ui/adapters/WatchHistoryAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/WatchHistoryAdapter.kt
@@ -68,7 +68,7 @@ class WatchHistoryAdapter(
             if (video.uploaderAvatar != null) {
                 ImageHelper.loadImage(video.uploaderAvatar, channelImage, true)
             } else {
-                channelImage.isGone = true
+                channelImageContainer.isGone = true
             }
 
             channelImage.setOnClickListener {

diff --git a/app/src/main/java/com/github/libretube/ui/viewholders/DownloadsViewHolder.kt b/app/src/main/java/com/github/libretube/ui/viewholders/DownloadsViewHolder.kt
@@ -1,8 +1,8 @@
 package com.github.libretube.ui.viewholders
 
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.databinding.DownloadedMediaRowBinding
+import com.github.libretube.databinding.VideoRowBinding
 
 class DownloadsViewHolder(
-    val binding: DownloadedMediaRowBinding
+    val binding: VideoRowBinding
 ) : RecyclerView.ViewHolder(binding.root)
diff --git a/app/src/main/res/layout/downloaded_media_row.xml b/app/src/main/res/layout/downloaded_media_row.xml
diff --git a/app/src/main/res/layout/video_row.xml b/app/src/main/res/layout/video_row.xml
@@ -66,6 +66,37 @@
                 app:layout_constraintStart_toStartOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/downloadOverlay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#BF000000"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:visibility="gone">
+
+            <ProgressBar
+                android:id="@+id/progressBar"
+                android:layout_width="52dp"
+                android:layout_height="52dp"
+                android:indeterminateOnly="false"
+                android:progressDrawable="@drawable/circular_progress"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/resumePauseBtn"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_download"
+                app:layout_constraintBottom_toBottomOf="@id/progressBar"
+                app:layout_constraintLeft_toLeftOf="@id/progressBar"
+                app:layout_constraintRight_toRightOf="@id/progressBar"
+                app:layout_constraintTop_toTopOf="@id/progressBar" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
     </androidx.cardview.widget.CardView>
 
     <TextView
@@ -108,7 +139,9 @@
             android:id="@+id/channel_image_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:cardCornerRadius="13.5dp">
+            app:cardCornerRadius="13.5dp"
+            android:layout_gravity="center"
+            android:layout_marginEnd="10dp">
 
             <ImageView
                 android:id="@+id/channel_image"
@@ -122,10 +155,22 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginStart="8dp"
             android:ellipsize="end"
+            tools:text="Uploader name"
             android:maxLines="1" />
 
+        <TextView
+            android:visibility="gone"
+            android:id="@+id/file_size"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="2"
+            tools:text="55MB/2050MB"
+            tools:visibility="visible"
+            android:textAlignment="viewEnd" />
+
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>