Merge pull request #1911 from Bnyro/master

Allow creating playlists from the add to playlist dialog

app/src/main/java/com/github/libretube/ui/adapters/ChaptersAdapter.kt

@@ -5,6 +5,7 @@ import android.text.format.DateUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.github.libretube.api.obj.ChapterSegment
 import com.github.libretube.databinding.ChapterColumnBinding
 import com.github.libretube.ui.viewholders.ChaptersViewHolder
 import com.github.libretube.util.ImageHelper
@@ -12,7 +13,7 @@ import com.github.libretube.util.ThemeHelper
 import com.google.android.exoplayer2.ExoPlayer
 
 class ChaptersAdapter(
-    private val chapters: List<com.github.libretube.api.obj.ChapterSegment>,
+    private val chapters: List<ChapterSegment>,
     private val exoPlayer: ExoPlayer
 ) : RecyclerView.Adapter<ChaptersViewHolder>() {
     private var selectedPosition = 0

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

@@ -6,7 +6,6 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 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
@@ -14,6 +13,7 @@ import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.databinding.PlaylistRowBinding
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.toID
+import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.extensions.setFormattedDuration
 import com.github.libretube.ui.extensions.setWatchProgressLength
 import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
@@ -30,8 +30,7 @@ import java.io.IOException
 class PlaylistAdapter(
     private val videoFeed: MutableList<StreamItem>,
     private val playlistId: String,
-    private val isOwner: Boolean,
+    private val isOwner: Boolean
-    private val childFragmentManager: FragmentManager
 ) : RecyclerView.Adapter<PlaylistViewHolder>() {
 
     override fun getItemCount(): Int {
@@ -64,7 +63,10 @@ class PlaylistAdapter(
             val videoName = streamItem.title!!
             root.setOnLongClickListener {
                 VideoOptionsBottomSheet(videoId, videoName)
-                    .show(childFragmentManager, VideoOptionsBottomSheet::class.java.name)
+                    .show(
+                        (root.context as BaseActivity).supportFragmentManager,
+                        VideoOptionsBottomSheet::class.java.name
+                    )
                 true
             }
 

app/src/main/java/com/github/libretube/ui/adapters/PlaylistsAdapter.kt

@@ -4,7 +4,6 @@ import android.app.Activity
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.api.RetrofitInstance
@@ -12,6 +11,7 @@ import com.github.libretube.api.obj.PlaylistId
 import com.github.libretube.api.obj.Playlists
 import com.github.libretube.databinding.PlaylistsRowBinding
 import com.github.libretube.extensions.TAG
+import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet
 import com.github.libretube.ui.viewholders.PlaylistsViewHolder
 import com.github.libretube.util.ImageHelper
@@ -25,8 +25,7 @@ import retrofit2.HttpException
 import java.io.IOException
 
 class PlaylistsAdapter(
-    private val playlists: MutableList<Playlists>,
+    private val playlists: MutableList<Playlists>
-    private val childFragmentManager: FragmentManager
 ) : RecyclerView.Adapter<PlaylistsViewHolder>() {
 
     override fun getItemCount(): Int {
@@ -81,7 +80,7 @@ class PlaylistsAdapter(
                     isOwner = true
                 )
                 playlistOptionsDialog.show(
-                    childFragmentManager,
+                    (root.context as BaseActivity).supportFragmentManager,
                     PlaylistOptionsBottomSheet::class.java.name
                 )
                 true

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

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.api.obj.ContentItem
@@ -13,6 +12,7 @@ import com.github.libretube.databinding.PlaylistsRowBinding
 import com.github.libretube.databinding.VideoRowBinding
 import com.github.libretube.extensions.formatShort
 import com.github.libretube.extensions.toID
+import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.extensions.setFormattedDuration
 import com.github.libretube.ui.extensions.setWatchProgressLength
 import com.github.libretube.ui.extensions.setupSubscriptionButton
@@ -24,8 +24,7 @@ import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.TextUtils
 
 class SearchAdapter(
-    private val searchItems: MutableList<ContentItem>,
+    private val searchItems: MutableList<ContentItem>
-    private val childFragmentManager: FragmentManager
 ) :
     RecyclerView.Adapter<SearchViewHolder>() {
 
@@ -101,7 +100,7 @@ class SearchAdapter(
             val videoName = item.title!!
             root.setOnLongClickListener {
                 VideoOptionsBottomSheet(videoId, videoName)
-                    .show(childFragmentManager, VideoOptionsBottomSheet::class.java.name)
+                    .show((root.context as BaseActivity).supportFragmentManager, VideoOptionsBottomSheet::class.java.name)
                 true
             }
             channelContainer.setOnClickListener {
@@ -148,7 +147,7 @@ class SearchAdapter(
                 val playlistId = item.url!!.toID()
                 val playlistName = item.name!!
                 PlaylistOptionsBottomSheet(playlistId, playlistName, false)
-                    .show(childFragmentManager, PlaylistOptionsBottomSheet::class.java.name)
+                    .show((root.context as BaseActivity).supportFragmentManager, PlaylistOptionsBottomSheet::class.java.name)
                 true
             }
         }

app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt

@@ -6,7 +6,6 @@ import android.text.format.DateUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -19,6 +18,7 @@ import com.github.libretube.databinding.VideoRowBinding
 import com.github.libretube.extensions.formatShort
 import com.github.libretube.extensions.toDp
 import com.github.libretube.extensions.toID
+import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.extensions.setFormattedDuration
 import com.github.libretube.ui.extensions.setWatchProgressLength
 import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
@@ -30,7 +30,6 @@ import com.github.libretube.util.TextUtils
 
 class VideosAdapter(
     private val streamItems: MutableList<StreamItem>,
-    private val childFragmentManager: FragmentManager,
     private val showAllAtOnce: Boolean = true,
     private val forceMode: ForceMode = ForceMode.NONE
 ) : RecyclerView.Adapter<VideosViewHolder>() {
@@ -113,7 +112,7 @@ class VideosAdapter(
                 if (videoId == null || videoName == null) return@setOnLongClickListener true
 
                 VideoOptionsBottomSheet(videoId, videoName)
-                    .show(childFragmentManager, VideoOptionsBottomSheet::class.java.name)
+                    .show((root.context as BaseActivity).supportFragmentManager, VideoOptionsBottomSheet::class.java.name)
 
                 true
             }
@@ -154,7 +153,7 @@ class VideosAdapter(
             root.setOnLongClickListener {
                 if (videoId == null || videoName == null) return@setOnLongClickListener true
                 VideoOptionsBottomSheet(videoId, videoName)
-                    .show(childFragmentManager, VideoOptionsBottomSheet::class.java.name)
+                    .show((root.context as BaseActivity).supportFragmentManager, VideoOptionsBottomSheet::class.java.name)
 
                 true
             }

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

@@ -2,11 +2,11 @@ package com.github.libretube.ui.adapters
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.databinding.WatchHistoryRowBinding
 import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.db.obj.WatchHistoryItem
+import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.extensions.setFormattedDuration
 import com.github.libretube.ui.extensions.setWatchProgressLength
 import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
@@ -15,8 +15,7 @@ import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NavigationHelper
 
 class WatchHistoryAdapter(
-    private val watchHistory: MutableList<WatchHistoryItem>,
+    private val watchHistory: MutableList<WatchHistoryItem>
-    private val childFragmentManager: FragmentManager
 ) :
     RecyclerView.Adapter<WatchHistoryViewHolder>() {
 
@@ -56,7 +55,7 @@ class WatchHistoryAdapter(
             }
             root.setOnLongClickListener {
                 VideoOptionsBottomSheet(video.videoId, video.title!!)
-                    .show(childFragmentManager, VideoOptionsBottomSheet::class.java.name)
+                    .show((root.context as BaseActivity).supportFragmentManager, VideoOptionsBottomSheet::class.java.name)
                 true
             }
 

app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt

@@ -38,6 +38,14 @@ class AddToPlaylistDialog : DialogFragment() {
         binding = DialogAddtoplaylistBinding.inflate(layoutInflater)
         binding.title.text = ThemeHelper.getStyledAppName(requireContext())
 
+        binding.createPlaylist.setOnClickListener {
+            parentFragment?.childFragmentManager?.let {
+                CreatePlaylistDialog {
+                    fetchPlaylists()
+                }.show(it, null)
+            }
+        }
+
         token = PreferenceHelper.getToken()
 
         if (token != "") fetchPlaylists()

app/src/main/java/com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt

@@ -8,16 +8,18 @@ import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
 import com.github.libretube.api.RetrofitInstance
+import com.github.libretube.api.obj.Playlists
 import com.github.libretube.databinding.DialogCreatePlaylistBinding
 import com.github.libretube.extensions.TAG
-import com.github.libretube.ui.fragments.LibraryFragment
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import retrofit2.HttpException
 import java.io.IOException
 
-class CreatePlaylistDialog : DialogFragment() {
+class CreatePlaylistDialog(
+    private val onSuccess: () -> Unit = {}
+) : DialogFragment() {
     private var token: String = ""
     private lateinit var binding: DialogCreatePlaylistBinding
 
@@ -53,7 +55,7 @@ class CreatePlaylistDialog : DialogFragment() {
             val response = try {
                 RetrofitInstance.authApi.createPlaylist(
                     token,
-                    com.github.libretube.api.obj.Playlists(name = name)
+                    Playlists(name = name)
                 )
             } catch (e: IOException) {
                 println(e)
@@ -73,8 +75,7 @@ class CreatePlaylistDialog : DialogFragment() {
             }
             // refresh the playlists in the library
             try {
-                val parent = parentFragment as LibraryFragment
+                onSuccess.invoke()
-                parent.fetchPlaylists()
             } catch (e: Exception) {
                 Log.e(TAG(), e.toString())
             }

app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt

@@ -183,7 +183,6 @@ class ChannelFragment : BaseFragment() {
                 // recyclerview of the videos by the channel
                 channelAdapter = VideosAdapter(
                     response.relatedStreams.orEmpty().toMutableList(),
-                    childFragmentManager,
                     forceMode = VideosAdapter.Companion.ForceMode.CHANNEL
                 )
                 binding.channelRecView.adapter = channelAdapter
@@ -229,8 +228,7 @@ class ChannelFragment : BaseFragment() {
             }
 
             val adapter = SearchAdapter(
-                response.content.toMutableList(),
+                response.content.toMutableList()
-                childFragmentManager
             )
 
             runOnUiThread {

app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt

@@ -80,7 +80,6 @@ class HomeFragment : BaseFragment() {
                 binding.featuredRV.layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
                 binding.featuredRV.adapter = VideosAdapter(
                     feed.toMutableList(),
-                    childFragmentManager,
                     forceMode = VideosAdapter.Companion.ForceMode.HOME
                 )
             }
@@ -96,7 +95,6 @@ class HomeFragment : BaseFragment() {
                 binding.trendingRV.layoutManager = GridLayoutManager(context, 2)
                 binding.trendingRV.adapter = VideosAdapter(
                     trending.toMutableList(),
-                    childFragmentManager,
                     forceMode = VideosAdapter.Companion.ForceMode.TRENDING
                 )
             }
@@ -109,7 +107,7 @@ class HomeFragment : BaseFragment() {
             runOnUiThread {
                 makeVisible(binding.playlistsRV, binding.playlistsTV)
                 binding.playlistsRV.layoutManager = LinearLayoutManager(context)
-                binding.playlistsRV.adapter = PlaylistsAdapter(playlists.toMutableList(), childFragmentManager)
+                binding.playlistsRV.adapter = PlaylistsAdapter(playlists.toMutableList())
                 binding.playlistsRV.adapter?.registerAdapterDataObserver(object :
                         RecyclerView.AdapterDataObserver() {
                         override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {

app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt

@@ -82,7 +82,9 @@ class LibraryFragment : BaseFragment() {
                 fetchPlaylists()
             }
             binding.createPlaylist.setOnClickListener {
-                val newFragment = CreatePlaylistDialog()
+                val newFragment = CreatePlaylistDialog {
+                    fetchPlaylists()
+                }
                 newFragment.show(childFragmentManager, CreatePlaylistDialog::class.java.name)
             }
         } else {
@@ -133,8 +135,7 @@ class LibraryFragment : BaseFragment() {
                 }
 
                 val playlistsAdapter = PlaylistsAdapter(
-                    playlists.toMutableList(),
+                    playlists.toMutableList()
-                    childFragmentManager
                 )
 
                 // listen for playlists to become deleted

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

@@ -977,13 +977,11 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
         if (PlayerHelper.alternativeVideoLayout) {
             binding.alternativeTrendingRec.adapter = VideosAdapter(
                 relatedStreams.orEmpty().toMutableList(),
-                childFragmentManager,
                 forceMode = VideosAdapter.Companion.ForceMode.RELATED
             )
         } else {
             binding.relatedRecView.adapter = VideosAdapter(
-                relatedStreams.orEmpty().toMutableList(),
+                relatedStreams.orEmpty().toMutableList()
-                childFragmentManager
             )
         }
     }

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

@@ -123,9 +123,10 @@ class PlaylistFragment : BaseFragment() {
                 }
 
                 binding.playAll.setOnClickListener {
+                    if (response.relatedStreams.orEmpty().isEmpty()) return@setOnClickListener
                     NavigationHelper.navigateVideo(
                         requireContext(),
-                        response.relatedStreams?.first()?.url?.toID(),
+                        response.relatedStreams!!.first().url?.toID(),
                         playlistId
                     )
                 }
@@ -156,8 +157,7 @@ class PlaylistFragment : BaseFragment() {
                 playlistAdapter = PlaylistAdapter(
                     response.relatedStreams.orEmpty().toMutableList(),
                     playlistId!!,
-                    isOwner,
+                    isOwner
-                    childFragmentManager
                 )
 
                 // listen for playlist items to become deleted

app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt

@@ -96,7 +96,7 @@ class SearchResultFragment : BaseFragment() {
             runOnUiThread {
                 if (response.items?.isNotEmpty() == true) {
                     binding.searchRecycler.layoutManager = LinearLayoutManager(requireContext())
-                    searchAdapter = SearchAdapter(response.items, childFragmentManager)
+                    searchAdapter = SearchAdapter(response.items)
                     binding.searchRecycler.adapter = searchAdapter
                 } else {
                     binding.searchContainer.visibility = View.GONE

app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt

@@ -155,7 +155,6 @@ class SubscriptionsFragment : BaseFragment() {
         binding.subProgress.visibility = View.GONE
         subscriptionAdapter = VideosAdapter(
             sortedFeed.toMutableList(),
-            childFragmentManager,
             showAllAtOnce = false
         )
         binding.subFeed.adapter = subscriptionAdapter

app/src/main/java/com/github/libretube/ui/fragments/TrendsFragment.kt

@@ -85,8 +85,7 @@ class TrendsFragment : BaseFragment() {
                 }
 
                 binding.recview.adapter = VideosAdapter(
-                    response.toMutableList(),
+                    response.toMutableList()
-                    childFragmentManager
                 )
 
                 binding.recview.layoutManager = VideosAdapter.getLayout(requireContext())

app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt

@@ -41,8 +41,7 @@ class WatchHistoryFragment : BaseFragment() {
         }
 
         val watchHistoryAdapter = WatchHistoryAdapter(
-            watchHistory.toMutableList(),
+            watchHistory.toMutableList()
-            childFragmentManager
         )
 
         val itemTouchCallback = object : ItemTouchHelper.SimpleCallback(

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

@@ -24,10 +24,23 @@
         android:paddingEnd="40dp"
         tools:ignore="RtlSymmetry" />
 
-    <Button
+    <LinearLayout
-        android:id="@+id/addToPlaylist"
+        android:layout_width="wrap_content"
-        style="@style/CustomDialogButton"
+        android:layout_height="match_parent"
-        android:layout_marginEnd="16dp"
+        android:layout_gravity="end"
-        android:text="@string/addToPlaylist" />
+        android:layout_marginEnd="16dp">
+
+        <Button
+            android:id="@+id/create_playlist"
+            style="@style/CustomDialogButton"
+            android:text="@string/createPlaylist"
+            android:layout_marginEnd="8dp"/>
+
+        <Button
+            android:id="@+id/addToPlaylist"
+            style="@style/CustomDialogButton"
+            android:text="@string/addToPlaylist" />
+
+    </LinearLayout>
 
 </LinearLayout>