kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-13 13:50:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #6240 from Bnyro/master

Browse Source 
feat: show total playlist duration
This commit is contained in:
Bnyro 2024-07-15 14:50:37 +02:00 committed by GitHub
commit b9004ba93c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt
View File

@ -40,7 +40,7 @@ import kotlinx.coroutines.withContext
* playlists
*/
class PlaylistAdapter(
private val originalFeed: MutableList<StreamItem>,
val originalFeed: MutableList<StreamItem>,
private val sortedFeed: MutableList<StreamItem>,
private val playlistId: String,
private val playlistType: PlaylistType

11
app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
View File

@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.content.res.Configuration
import android.os.Bundle
import android.os.Parcelable
import android.text.format.DateUtils
import android.util.Log
import android.view.LayoutInflater
import android.view.View
@ -385,6 +386,8 @@ class PlaylistFragment : DynamicLayoutManagerFragment() {
val itemTouchHelper = ItemTouchHelper(itemTouchCallback)
itemTouchHelper.attachToRecyclerView(binding.playlistRecView)
}
updatePlaylistDuration()
}
@SuppressLint("StringFormatInvalid", "StringFormatMatches")
@ -416,10 +419,18 @@ class PlaylistFragment : DynamicLayoutManagerFragment() {
nextPage = response.nextpage
playlistAdapter?.updateItems(response.relatedStreams)
updatePlaylistDuration()
isLoading = false
}
}
@SuppressLint("SetTextI18n")
private fun updatePlaylistDuration() {
val totalDuration = playlistAdapter?.originalFeed?.sumOf { it.duration ?: 0 } ?: return
binding.playlistDuration.text = DateUtils.formatElapsedTime(totalDuration) +
if (nextPage != null) "+" else ""
}
override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig)
// manually restore the recyclerview state due to https://github.com/material-components/material-components-android/issues/3473

51
app/src/main/res/layout/fragment_playlist.xml
View File

@ -10,8 +10,8 @@
android:id="@+id/playlist_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_gravity="center" />
android:layout_gravity="center"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/playlist_recView"
@ -25,7 +25,8 @@
android:id="@+id/playlist_app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone">
android:visibility="gone"
tools:visibility="visible">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/playlist_collapsing_tb"
@ -39,16 +40,44 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/thumbnail"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:layout_marginVertical="10dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
app:shapeAppearanceOverlay="@style/ShapeAppearance.Material3.Corner.Small"
tools:src="@tools:sample/backgrounds/scenic" />
android:layout_marginHorizontal="14dp"
android:layout_marginVertical="10dp">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/thumbnail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
app:shapeAppearanceOverlay="@style/ShapeAppearance.Material3.Corner.Small"
tools:src="@tools:sample/backgrounds/scenic" />
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_marginEnd="5dp"
android:layout_marginBottom="5dp"
app:cardBackgroundColor="@color/duration_background_color"
app:cardCornerRadius="8dp"
app:cardElevation="0dp">
<TextView
android:id="@+id/playlist_duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="6dp"
android:paddingVertical="2dp"
android:textColor="@color/duration_text_color"
android:textSize="12sp"
tools:text="05:36" />
</androidx.cardview.widget.CardView>
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"