refactor: remove arguments from dialog fragment constructors

app/src/main/java/com/github/libretube/constants/IntentData.kt

@@ -3,6 +3,7 @@
 object IntentData {
     const val downloadData = "downloadData"
     const val playerData = "playerData"
+    const val id = "id"
     const val videoId = "videoId"
     const val channelId = "channelId"
     const val channelName = "channelName"
@@ -15,4 +16,17 @@
     const val comment = "comment"
     const val minimizeByDefault = "minimizeByDefault"
     const val query = "query"
+    const val playlistDescription = "playlistDescription"
+    const val playlistName = "playlistName"
+    const val shareObjectType = "shareObjectType"
+    const val shareData = "shareData"
+    const val currentPosition = "currentPosition"
+    const val duration = "duration"
+    const val updateInfo = "updateInfo"
+    const val requestKey = "requestKey"
+    const val backupFile = "backupFile"
+    const val playlistTask = "playlistTask"
+    const val loginTask = "loginTask"
+    const val logoutTask = "logoutTask"
+    const val color = "color"
 }

app/src/main/java/com/github/libretube/obj/ShareData.kt

@@ -1,8 +1,12 @@
 package com.github.libretube.obj
 
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class ShareData(
     val currentChannel: String? = null,
     val currentVideo: String? = null,
     val currentPlaylist: String? = null,
     var currentPosition: Long? = null
-)
+) : Parcelable

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

@@ -5,6 +5,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.api.obj.Playlists
+import com.github.libretube.constants.IntentData
 import com.github.libretube.databinding.PlaylistsRowBinding
 import com.github.libretube.enums.PlaylistType
 import com.github.libretube.helpers.ImageHelper
@@ -51,25 +52,42 @@ class PlaylistsAdapter(
                 NavigationHelper.navigatePlaylist(root.context, playlist.id, playlistType)
             }
 
+            val fragmentManager = (root.context as BaseActivity).supportFragmentManager
+            fragmentManager.setFragmentResultListener(
+                IntentData.requestKey,
+                (root.context as BaseActivity)
+            ) { _, resultBundle ->
+                val newPlaylistDescription =
+                    resultBundle.getString(IntentData.playlistDescription)
+                val newPlaylistName =
+                    resultBundle.getString(IntentData.playlistName)
+                val isPlaylistToBeDeleted =
+                    resultBundle.getBoolean(IntentData.playlistTask)
+
+                newPlaylistDescription?.let {
+                    playlistDescription.text = it
+                    playlist.shortDescription = it
+                }
+
+                newPlaylistName?.let {
+                    playlistTitle.text = it
+                    playlist.name = it
+                }
+
+                if (isPlaylistToBeDeleted) {
+                    // try to refresh the playlists in the library on deletion success
+                    onDelete(position, root.context as BaseActivity)
+                }
+            }
+
             root.setOnLongClickListener {
                 val playlistOptionsDialog = PlaylistOptionsBottomSheet(
                     playlistId = playlist.id!!,
                     playlistName = playlist.name!!,
-                    playlistType = playlistType,
-                    onDelete = {
-                        onDelete(position, root.context as BaseActivity)
-                    },
-                    onRename = {
-                        playlistTitle.text = it
-                        playlist.name = it
-                    },
-                    onChangeDescription = {
-                        playlistDescription.text = it
-                        playlist.shortDescription = it
-                    }
+                    playlistType = playlistType
                 )
                 playlistOptionsDialog.show(
-                    (root.context as BaseActivity).supportFragmentManager,
+                    fragmentManager,
                     PlaylistOptionsBottomSheet::class.java.name
                 )
                 true

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

@@ -14,6 +14,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import com.github.libretube.R
 import com.github.libretube.api.PlaylistsHelper
 import com.github.libretube.api.RetrofitInstance
+import com.github.libretube.constants.IntentData
 import com.github.libretube.databinding.DialogAddToPlaylistBinding
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.toastFromMainDispatcher
@@ -24,20 +25,31 @@ import kotlinx.coroutines.launch
 
 /**
  * Dialog to insert new videos to a playlist
- * @param videoId The id of the video to add. If non is provided, insert the whole playing queue
+ * videoId: The id of the video to add. If non is provided, insert the whole playing queue
  */
-class AddToPlaylistDialog(
-    private val videoId: String? = null
-) : DialogFragment() {
+class AddToPlaylistDialog : DialogFragment() {
+    private var videoId: String? = null
     private val viewModel: PlaylistViewModel by activityViewModels()
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        videoId = arguments?.getString(IntentData.videoId)
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val binding = DialogAddToPlaylistBinding.inflate(layoutInflater)
 
-        binding.createPlaylist.setOnClickListener {
-            CreatePlaylistDialog {
+        childFragmentManager.setFragmentResultListener(
+            IntentData.requestKey,
+            this
+        ) { _, resultBundle ->
+            val addedToPlaylist = resultBundle.getBoolean(IntentData.playlistTask)
+            if (addedToPlaylist) {
                 fetchPlaylists(binding)
-            }.show(childFragmentManager, null)
+            }
+        }
+        binding.createPlaylist.setOnClickListener {
+            CreatePlaylistDialog().show(childFragmentManager, null)
         }
 
         fetchPlaylists(binding)
@@ -93,7 +105,7 @@ class AddToPlaylistDialog(
         val streams = when {
             videoId != null -> listOfNotNull(
                 runCatching {
-                    RetrofitInstance.api.getStreams(videoId!!).toStreamItem(videoId)
+                    RetrofitInstance.api.getStreams(videoId!!).toStreamItem(videoId!!)
                 }.getOrNull()
             )
 

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

@@ -3,22 +3,26 @@ package com.github.libretube.ui.dialogs
 import android.app.Dialog
 import android.os.Bundle
 import androidx.annotation.StringRes
+import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.setFragmentResult
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
+import com.github.libretube.constants.IntentData
 import com.github.libretube.db.DatabaseHolder.Database
 import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.obj.BackupFile
 import com.github.libretube.obj.PreferenceItem
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonNull
 import kotlinx.serialization.json.JsonPrimitive
 
-class BackupDialog(
-    private val createBackupFile: (BackupFile) -> Unit
-) : DialogFragment() {
+class BackupDialog : DialogFragment() {
     sealed class BackupOption(
         @StringRes val name: Int,
         val onSelected: suspend (BackupFile) -> Unit
@@ -97,7 +101,13 @@ class BackupDialog(
                     backupOptions.forEachIndexed { index, option ->
                         if (selected[index]) option.onSelected(backupFile)
                     }
-                    createBackupFile(backupFile)
+                    val encodedBackupFile = Json.encodeToString(backupFile)
+                    withContext(Dispatchers.Main) {
+                        setFragmentResult(
+                            IntentData.requestKey,
+                            bundleOf(IntentData.backupFile to encodedBackupFile)
+                        )
+                    }
                 }
             }
             .create()

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

@@ -1,32 +1,36 @@
 package com.github.libretube.ui.dialogs
 
 import android.app.Dialog
-import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
 import android.widget.SeekBar
 import android.widget.Toast
+import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.setFragmentResult
 import com.github.libretube.R
+import com.github.libretube.constants.IntentData
 import com.github.libretube.databinding.DialogColorPickerBinding
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
-class ColorPickerDialog(
-    private val context: Context,
-    private val initialColor: Int,
-    private val onColorSelectedListener: OnColorSelectedListener
-) : DialogFragment(), SeekBar.OnSeekBarChangeListener {
+class ColorPickerDialog : DialogFragment(), SeekBar.OnSeekBarChangeListener {
+    private var initialColor: Int? = null
 
     private var _binding: DialogColorPickerBinding? = null
     private val binding get() = _binding!!
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        initialColor = arguments?.getInt(IntentData.color)!!
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         _binding = DialogColorPickerBinding.inflate(layoutInflater)
 
         // Set initial color
-        setColor(initialColor)
+        setColor(initialColor!!)
 
         binding.alphaSeekBar.setOnSeekBarChangeListener(this)
         binding.redSeekBar.setOnSeekBarChangeListener(this)
@@ -74,7 +78,11 @@ class ColorPickerDialog(
         return MaterialAlertDialogBuilder(requireContext())
             .setView(binding.root)
             .setPositiveButton(R.string.okay) { _, _ ->
-                onColorSelectedListener.onColorSelected(getColor())
+                val color = getColor()
+                setFragmentResult(
+                    IntentData.requestKey,
+                    bundleOf(IntentData.color to color)
+                )
             }
             .setNegativeButton(R.string.cancel, null)
             .show()
@@ -134,8 +142,4 @@ class ColorPickerDialog(
     private fun colorToString(color: Int): String {
         return String.format("#%08X", color)
     }
-
-    fun interface OnColorSelectedListener {
-        fun onColorSelected(color: Int)
-    }
 }

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

@@ -3,10 +3,13 @@ package com.github.libretube.ui.dialogs
 import android.app.Dialog
 import android.os.Bundle
 import android.widget.Toast
+import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.setFragmentResult
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
 import com.github.libretube.api.PlaylistsHelper
+import com.github.libretube.constants.IntentData
 import com.github.libretube.databinding.DialogCreatePlaylistBinding
 import com.github.libretube.extensions.toastFromMainDispatcher
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -15,9 +18,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
-class CreatePlaylistDialog(
-    private val onSuccess: () -> Unit = {}
-) : DialogFragment() {
+class CreatePlaylistDialog : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val binding = DialogCreatePlaylistBinding.inflate(layoutInflater)
 
@@ -34,7 +35,10 @@ class CreatePlaylistDialog(
                         }.getOrNull()
                     }
                     if (playlistId != null) {
-                        onSuccess()
+                        setFragmentResult(
+                            IntentData.requestKey,
+                            bundleOf(IntentData.playlistTask to true)
+                        )
                     }
                     appContext?.toastFromMainDispatcher(
                         if (playlistId != null) R.string.playlistCloned else R.string.server_error
@@ -66,7 +70,12 @@ class CreatePlaylistDialog(
                     appContext?.toastFromMainDispatcher(
                         if (playlistId != null) R.string.playlistCreated else R.string.unknown_error
                     )
-                    playlistId?.let { onSuccess() }
+                    playlistId?.let {
+                        setFragmentResult(
+                            IntentData.requestKey,
+                            bundleOf(IntentData.playlistTask to true)
+                        )
+                    }
                     dismiss()
                 }
             } else {

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

@@ -4,13 +4,16 @@ import android.app.Dialog
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
+import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.setFragmentResult
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.github.libretube.R
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.obj.DeleteUserRequest
+import com.github.libretube.constants.IntentData
 import com.github.libretube.databinding.DialogDeleteAccountBinding
 import com.github.libretube.extensions.TAG
 import com.github.libretube.helpers.PreferenceHelper
@@ -19,9 +22,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class DeleteAccountDialog(
-    private val onLogout: () -> Unit
-) : DialogFragment() {
+class DeleteAccountDialog : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val binding = DialogDeleteAccountBinding.inflate(layoutInflater)
 
@@ -59,7 +60,10 @@ class DeleteAccountDialog(
                 }
                 Toast.makeText(context, R.string.success, Toast.LENGTH_SHORT).show()
 
-                onLogout.invoke()
+                setFragmentResult(
+                    IntentData.requestKey,
+                    bundleOf(IntentData.logoutTask to true)
+                )
                 dialog?.dismiss()
             }
         }