From 0b99bfdfa0a2185779ec5d154bfaff97d2aa798a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 6 Nov 2022 12:35:23 +0100
Subject: [PATCH 1/2] new playlist layout

---
 .../libretube/ui/adapters/PlaylistAdapter.kt  | 11 +++--
 .../ui/fragments/PlaylistFragment.kt          | 36 ++++++++------
 app/src/main/res/layout/fragment_playlist.xml | 48 ++++++++++++++++---
 app/src/main/res/values/strings.xml           |  2 +
 app/src/main/res/values/style.xml             |  6 +--
 5 files changed, 76 insertions(+), 27 deletions(-)

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
index f6d5a05db..5f498bfdb 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt
@@ -1,6 +1,7 @@
 package com.github.libretube.ui.adapters
 
 import android.app.Activity
+import android.content.Context
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -28,7 +29,6 @@ class PlaylistAdapter(
     private val videoFeed: MutableList<com.github.libretube.api.obj.StreamItem>,
     private val playlistId: String,
     private val isOwner: Boolean,
-    private val activity: Activity,
     private val childFragmentManager: FragmentManager
 ) : RecyclerView.Adapter<PlaylistViewHolder>() {
 
@@ -69,16 +69,19 @@ class PlaylistAdapter(
             if (isOwner) {
                 deletePlaylist.visibility = View.VISIBLE
                 deletePlaylist.setOnClickListener {
-                    removeFromPlaylist(position)
+                    removeFromPlaylist(root.context, position)
                 }
             }
             watchProgress.setWatchProgressLength(videoId, streamItem.duration!!)
         }
     }
 
-    fun removeFromPlaylist(position: Int) {
+    fun removeFromPlaylist(context: Context, position: Int) {
         videoFeed.removeAt(position)
-        activity.runOnUiThread { notifyDataSetChanged() }
+        (context as Activity).runOnUiThread {
+            notifyItemRemoved(position)
+            notifyItemRangeChanged(position, itemCount)
+        }
         CoroutineScope(Dispatchers.IO).launch {
             try {
                 RetrofitInstance.authApi.removeFromPlaylist(
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
index e2bdb0c0f..580698e6a 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
@@ -1,5 +1,6 @@
 package com.github.libretube.ui.fragments
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -18,6 +19,8 @@ import com.github.libretube.extensions.toID
 import com.github.libretube.ui.adapters.PlaylistAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet
+import com.github.libretube.util.ImageHelper
+import com.github.libretube.util.NavigationHelper
 import retrofit2.HttpException
 import java.io.IOException
 
@@ -58,6 +61,7 @@ class PlaylistFragment : BaseFragment() {
         fetchPlaylist()
     }
 
+    @SuppressLint("SetTextI18n")
     private fun fetchPlaylist() {
         lifecycleScope.launchWhenCreated {
             val response = try {
@@ -79,27 +83,31 @@ class PlaylistFragment : BaseFragment() {
             playlistName = response.name
             isLoading = false
             runOnUiThread {
+                ImageHelper.loadImage(response.thumbnailUrl, binding.thumbnail)
                 binding.playlistProgress.visibility = View.GONE
                 binding.playlistName.text = response.name
-                binding.uploader.text = response.uploader
-                binding.videoCount.text =
-                    getString(R.string.videoCount, response.videos.toString())
+                binding.playlistInfo.text = response.uploader + " • " + getString(R.string.videoCount, response.videos.toString())
 
                 // show playlist options
                 binding.optionsMenu.setOnClickListener {
-                    val optionsDialog =
-                        PlaylistOptionsBottomSheet(playlistId!!, playlistName!!, isOwner)
-                    optionsDialog.show(
+                    PlaylistOptionsBottomSheet(playlistId!!, playlistName!!, isOwner).show(
                         childFragmentManager,
                         PlaylistOptionsBottomSheet::class.java.name
                     )
                 }
 
+                binding.playAll.setOnClickListener {
+                    NavigationHelper.navigateVideo(
+                        requireContext(),
+                        response.relatedStreams?.first()?.toID(),
+                        playlistId
+                    )
+                }
+
                 playlistAdapter = PlaylistAdapter(
-                    response.relatedStreams!!.toMutableList(),
+                    response.relatedStreams.orEmpty().toMutableList(),
                     playlistId!!,
                     isOwner,
-                    requireActivity(),
                     childFragmentManager
                 )
 
@@ -107,11 +115,11 @@ class PlaylistFragment : BaseFragment() {
                 playlistAdapter!!.registerAdapterDataObserver(object :
                         RecyclerView.AdapterDataObserver() {
                         override fun onChanged() {
-                            binding.videoCount.text =
-                                getString(
-                                    R.string.videoCount,
-                                    playlistAdapter!!.itemCount.toString()
-                                )
+                            binding.playlistInfo.text =
+                                binding.playlistInfo.text.split(" • ").first() + " • " + getString(
+                                R.string.videoCount,
+                                playlistAdapter!!.itemCount.toString()
+                            )
                         }
                     })
 
@@ -150,7 +158,7 @@ class PlaylistFragment : BaseFragment() {
                             direction: Int
                         ) {
                             val position = viewHolder.absoluteAdapterPosition
-                            playlistAdapter!!.removeFromPlaylist(position)
+                            playlistAdapter!!.removeFromPlaylist(requireContext(), position)
                         }
                     }
 
diff --git a/app/src/main/res/layout/fragment_playlist.xml b/app/src/main/res/layout/fragment_playlist.xml
index c39957aa3..c3a7894e7 100644
--- a/app/src/main/res/layout/fragment_playlist.xml
+++ b/app/src/main/res/layout/fragment_playlist.xml
@@ -1,5 +1,6 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -23,11 +24,23 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
+            <com.google.android.material.imageview.ShapeableImageView
+                android:id="@+id/thumbnail"
+                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.ExtraLarge"
+                tools:src="@tools:sample/backgrounds/scenic" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:padding="8dp">
+                android:paddingHorizontal="15dp"
+                android:layout_marginTop="8dp">
 
                 <TextView
                     android:id="@+id/playlist_name"
@@ -48,17 +61,40 @@
             </LinearLayout>
 
             <TextView
-                android:id="@+id/uploader"
+                android:id="@+id/playlistInfo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
+                android:paddingHorizontal="15dp"
+                android:paddingVertical="8dp"
                 android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/video_count"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp" />
+                android:layout_marginVertical="10dp"
+                android:orientation="horizontal">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/play_all"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="10dp"
+                    android:layout_weight="1"
+                    android:text="@string/play_all"
+                    app:icon="@drawable/ic_playlist" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/shuffle"
+                    style="@style/Widget.Material3.Button"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="10dp"
+                    android:layout_weight="1"
+                    android:text="@string/shuffle"
+                    app:icon="@drawable/ic_shuffle" />
+
+            </LinearLayout>
 
             <RelativeLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6ee7f5fb4..7573c7e9e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -359,6 +359,8 @@
     <string name="confirm_unsubscribe">Are you sure you want to unsubscribe %1$s?</string>
     <string name="confirm_unsubscribing">Confirm unsubscribing</string>
     <string name="confirm_unsubscribing_summary">Show a confirmation dialog before unsubscribing.</string>
+    <string name="shuffle">Shuffle</string>
+    <string name="play_all">Play all</string>
 
     <!-- Notification channel strings -->
     <string name="download_channel_name">Download Service</string>
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 265f3a9c4..a78db0a98 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -195,12 +195,12 @@
 
     </style>
 
-    <style name="ElevatedIconButton" parent="@style/Widget.Material3.Button.IconButton.Filled.Tonal">
+    <style name="ElevatedIconButton" parent="@style/Widget.Material3.Button.IconButton">
 
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingStart">15dp</item>
-        <item name="android:paddingEnd">15dp</item>
+        <item name="android:paddingStart">10dp</item>
+        <item name="android:paddingEnd">10dp</item>
         <item name="android:stateListAnimator">@null</item>
         <item name="cardCornerRadius">25dp</item>
         <item name="android:drawableTint" tools:targetApi="m">?android:attr/textColorPrimary</item>

From 7bdcf9e3bd347948dadd38d5c313d734a3440b45 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 6 Nov 2022 12:53:41 +0100
Subject: [PATCH 2/2] add a share button

---
 .../java/com/github/libretube/extensions/ToID.kt    |  3 +--
 .../main/java/com/github/libretube/obj/ShareData.kt |  7 ++++---
 .../github/libretube/ui/adapters/PlaylistAdapter.kt |  3 ++-
 .../com/github/libretube/ui/dialogs/ShareDialog.kt  |  9 ++++-----
 .../github/libretube/ui/fragments/PlayerFragment.kt |  4 ++--
 .../libretube/ui/fragments/PlaylistFragment.kt      | 13 ++++++++++++-
 app/src/main/res/drawable/ic_share_outlined.xml     | 12 ++++++++++++
 app/src/main/res/layout/dialog_share.xml            |  4 ++--
 app/src/main/res/layout/fragment_playlist.xml       |  6 +++---
 app/src/main/res/values/strings.xml                 |  1 -
 10 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_share_outlined.xml

diff --git a/app/src/main/java/com/github/libretube/extensions/ToID.kt b/app/src/main/java/com/github/libretube/extensions/ToID.kt
index df7b284e0..b3439cb72 100644
--- a/app/src/main/java/com/github/libretube/extensions/ToID.kt
+++ b/app/src/main/java/com/github/libretube/extensions/ToID.kt
@@ -3,9 +3,8 @@ package com.github.libretube.extensions
 /**
  * format a Piped route to an ID
  */
-fun Any.toID(): String {
+fun String.toID(): String {
     return this
-        .toString()
         .replace("/watch?v=", "") // videos
         .replace("/channel/", "") // channels
         .replace("/playlist?list=", "") // playlists
diff --git a/app/src/main/java/com/github/libretube/obj/ShareData.kt b/app/src/main/java/com/github/libretube/obj/ShareData.kt
index 8ad00bb5a..532558af0 100644
--- a/app/src/main/java/com/github/libretube/obj/ShareData.kt
+++ b/app/src/main/java/com/github/libretube/obj/ShareData.kt
@@ -1,7 +1,8 @@
 package com.github.libretube.obj
 
 data class ShareData(
-    val currentChannel: String ? = null,
-    val currentVideo: String ? = null,
-    val currentPlaylist: String ? = null
+    val currentChannel: String? = null,
+    val currentVideo: String? = null,
+    val currentPlaylist: String? = null,
+    var currentPosition: Long? = null
 )
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
index 5f498bfdb..bdba61772 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt
@@ -9,6 +9,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.api.RetrofitInstance
+import com.github.libretube.api.obj.PlaylistId
 import com.github.libretube.databinding.PlaylistRowBinding
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.setFormattedDuration
@@ -86,7 +87,7 @@ class PlaylistAdapter(
             try {
                 RetrofitInstance.authApi.removeFromPlaylist(
                     PreferenceHelper.getToken(),
-                    com.github.libretube.api.obj.PlaylistId(
+                    PlaylistId(
                         playlistId = playlistId,
                         index = position
                     )
diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/ShareDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/ShareDialog.kt
index bb686a45f..1e42c2689 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/ShareDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/ShareDialog.kt
@@ -20,8 +20,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 class ShareDialog(
     private val id: String,
     private val shareObjectType: ShareObjectType,
-    private val shareData: ShareData,
-    private val position: Long? = null
+    private val shareData: ShareData
 ) : DialogFragment() {
     private var binding: DialogShareBinding? = null
 
@@ -35,7 +34,7 @@ class ShareDialog(
         // add instanceUrl option if custom instance frontend url available
         if (instanceUrl != "") shareOptions += getString(R.string.instance)
 
-        if (shareObjectType == ShareObjectType.VIDEO && position != null) {
+        if (shareObjectType == ShareObjectType.VIDEO) {
             setupTimeStampBinding()
         }
 
@@ -57,7 +56,7 @@ class ShareDialog(
                 }
                 var url = "$host$path"
 
-                if (shareObjectType == ShareObjectType.VIDEO && position != null && binding!!.timeCodeSwitch.isChecked) {
+                if (shareObjectType == ShareObjectType.VIDEO && binding!!.timeCodeSwitch.isChecked) {
                     url += "&t=${binding!!.timeStamp.text}"
                 }
 
@@ -85,7 +84,7 @@ class ShareDialog(
         binding!!.timeCodeSwitch.setOnCheckedChangeListener { _, isChecked ->
             binding!!.timeStampLayout.visibility = if (isChecked) View.VISIBLE else View.GONE
         }
-        binding!!.timeStamp.setText(position.toString())
+        binding!!.timeStamp.setText((shareData.currentPosition ?: 0L).toString())
         if (binding!!.timeCodeSwitch.isChecked) binding!!.timeStampLayout.visibility = View.VISIBLE
     }
 
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
index 3e8c61ec1..6daac4b26 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
@@ -363,12 +363,12 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
 
         // share button
         binding.relPlayerShare.setOnClickListener {
+            shareData.currentPosition = exoPlayer.currentPosition / 1000
             val shareDialog =
                 ShareDialog(
                     videoId!!,
                     ShareObjectType.VIDEO,
-                    shareData,
-                    exoPlayer.currentPosition / 1000
+                    shareData
                 )
             shareDialog.show(childFragmentManager, ShareDialog::class.java.name)
         }
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
index 580698e6a..b4544288a 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
@@ -14,10 +14,13 @@ import com.github.libretube.R
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.constants.IntentData
 import com.github.libretube.databinding.FragmentPlaylistBinding
+import com.github.libretube.enums.ShareObjectType
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.toID
+import com.github.libretube.obj.ShareData
 import com.github.libretube.ui.adapters.PlaylistAdapter
 import com.github.libretube.ui.base.BaseFragment
+import com.github.libretube.ui.dialogs.ShareDialog
 import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet
 import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NavigationHelper
@@ -99,11 +102,19 @@ class PlaylistFragment : BaseFragment() {
                 binding.playAll.setOnClickListener {
                     NavigationHelper.navigateVideo(
                         requireContext(),
-                        response.relatedStreams?.first()?.toID(),
+                        response.relatedStreams?.first()?.url?.toID(),
                         playlistId
                     )
                 }
 
+                binding.share.setOnClickListener {
+                    ShareDialog(
+                        playlistId!!,
+                        ShareObjectType.PLAYLIST,
+                        ShareData(currentPlaylist = response.name)
+                    ).show(childFragmentManager, null)
+                }
+
                 playlistAdapter = PlaylistAdapter(
                     response.relatedStreams.orEmpty().toMutableList(),
                     playlistId!!,
diff --git a/app/src/main/res/drawable/ic_share_outlined.xml b/app/src/main/res/drawable/ic_share_outlined.xml
new file mode 100644
index 000000000..8a0cf890a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share_outlined.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14,9L14,5l8,7 -8,7L14,15S2,14.069 2,19.737C2,8.4 14,9 14,9Z"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"/>
+</vector>
diff --git a/app/src/main/res/layout/dialog_share.xml b/app/src/main/res/layout/dialog_share.xml
index 371a4c138..436338da9 100644
--- a/app/src/main/res/layout/dialog_share.xml
+++ b/app/src/main/res/layout/dialog_share.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:paddingBottom="25dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -33,7 +34,6 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="25dp"
         android:layout_marginTop="5dp"
-        android:layout_marginBottom="25dp"
         android:hint="@string/time_code"
         android:visibility="gone">
 
diff --git a/app/src/main/res/layout/fragment_playlist.xml b/app/src/main/res/layout/fragment_playlist.xml
index c3a7894e7..3f9ed8024 100644
--- a/app/src/main/res/layout/fragment_playlist.xml
+++ b/app/src/main/res/layout/fragment_playlist.xml
@@ -85,14 +85,14 @@
                     app:icon="@drawable/ic_playlist" />
 
                 <com.google.android.material.button.MaterialButton
-                    android:id="@+id/shuffle"
+                    android:id="@+id/share"
                     style="@style/Widget.Material3.Button"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="10dp"
                     android:layout_weight="1"
-                    android:text="@string/shuffle"
-                    app:icon="@drawable/ic_shuffle" />
+                    android:text="@string/share"
+                    app:icon="@drawable/ic_share_outlined" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7573c7e9e..fe3fb8831 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -359,7 +359,6 @@
     <string name="confirm_unsubscribe">Are you sure you want to unsubscribe %1$s?</string>
     <string name="confirm_unsubscribing">Confirm unsubscribing</string>
     <string name="confirm_unsubscribing_summary">Show a confirmation dialog before unsubscribing.</string>
-    <string name="shuffle">Shuffle</string>
     <string name="play_all">Play all</string>
 
     <!-- Notification channel strings -->