kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 08:20:32 +05:30
Code Issues Projects Releases Wiki Activity

refactor: use Bundle for DialogFragment arguments

Browse Source 
- ColorPickerDialog
- DeletePlaylistDialog
- RenamePlaylistDialog
This commit is contained in:
Ansh Tyagi 2023-09-05 18:11:42 +05:30 committed by Bnyro
parent 1044fcd153
commit f260c48f0a
8 changed files with 117 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ object IntentData {
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"
@ -27,4 +28,5 @@ object IntentData {
const val playlistTask = "playlistTask"
const val loginTask = "loginTask"
const val logoutTask = "logoutTask"
const val color = "color"
}

5
app/src/main/java/com/github/libretube/extensions/Bundle.kt
View File

@ -3,8 +3,6 @@ package com.github.libretube.extensions
import android.os.Build
import android.os.Bundle
import android.os.Parcelable
import androidx.annotation.OptIn
import androidx.core.os.BuildCompat
import androidx.core.os.BundleCompat
import java.io.Serializable
@ -12,9 +10,8 @@ inline fun <reified T : Parcelable> Bundle.parcelable(key: String?): T? {
return BundleCompat.getParcelable(this, key, T::class.java)
}
@OptIn(BuildCompat.PrereleaseSdkCheck::class)
inline fun <reified T : Serializable> Bundle.serializable(key: String): T? {
return if (BuildCompat.isAtLeastU()) {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
getSerializable(key, T::class.java)
} else {
@Suppress("DEPRECATION")

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

@ -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

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

@ -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)
}
}

26
app/src/main/java/com/github/libretube/ui/dialogs/DeletePlaylistDialog.kt
View File

@ -2,10 +2,14 @@ package com.github.libretube.ui.dialogs
import android.app.Dialog
import android.os.Bundle
import androidx.core.os.bundleOf
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.setFragmentResult
import com.github.libretube.R
import com.github.libretube.api.PlaylistsHelper
import com.github.libretube.constants.IntentData
import com.github.libretube.enums.PlaylistType
import com.github.libretube.extensions.serializable
import com.github.libretube.extensions.toastFromMainDispatcher
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlinx.coroutines.CoroutineScope
@ -13,11 +17,16 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
class DeletePlaylistDialog(
private val playlistId: String,
private val playlistType: PlaylistType,
private val onSuccess: () -> Unit
) : DialogFragment() {
class DeletePlaylistDialog : DialogFragment() {
private lateinit var playlistId: String
private lateinit var playlistType: PlaylistType
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
arguments?.let {
playlistId = it.getString(IntentData.playlistId)!!
playlistType = it.serializable(IntentData.playlistType)!!
}
}
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
return MaterialAlertDialogBuilder(requireContext())
.setTitle(R.string.deletePlaylist)
@ -30,9 +39,10 @@ class DeletePlaylistDialog(
if (success) R.string.success else R.string.fail
)
withContext(Dispatchers.Main) {
runCatching {
onSuccess.invoke()
}
setFragmentResult(
IntentData.requestKey,
bundleOf(IntentData.playlistTask to true)
)
}
}
}

24
app/src/main/java/com/github/libretube/ui/dialogs/RenamePlaylistDialog.kt
View File

@ -6,10 +6,13 @@ import android.os.Bundle
import android.text.InputType
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.lifecycleScope
import com.github.libretube.R
import com.github.libretube.api.PlaylistsHelper
import com.github.libretube.constants.IntentData
import com.github.libretube.databinding.DialogTextPreferenceBinding
import com.github.libretube.extensions.TAG
import com.github.libretube.extensions.toastFromMainDispatcher
@ -18,11 +21,17 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
class RenamePlaylistDialog(
private val playlistId: String,
private val currentPlaylistName: String,
private val onSuccess: (String) -> Unit
) : DialogFragment() {
class RenamePlaylistDialog : DialogFragment() {
private lateinit var playlistId: String
private lateinit var currentPlaylistName: String
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
arguments?.let {
playlistId = it.getString(IntentData.playlistId)!!
currentPlaylistName = it.getString(IntentData.playlistName)!!
}
}
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val binding = DialogTextPreferenceBinding.inflate(layoutInflater)
binding.input.inputType = InputType.TYPE_CLASS_TEXT
@ -62,7 +71,10 @@ class RenamePlaylistDialog(
}
if (success) {
appContext.toastFromMainDispatcher(R.string.success)
onSuccess.invoke(newPlaylistName)
setFragmentResult(
IntentData.requestKey,
bundleOf(IntentData.playlistName to newPlaylistName)
)
} else {
appContext.toastFromMainDispatcher(R.string.server_error)
}

34
app/src/main/java/com/github/libretube/ui/sheets/PlaylistOptionsBottomSheet.kt
View File

@ -102,15 +102,23 @@ class PlaylistOptionsBottomSheet(
}
getString(R.string.deletePlaylist) -> {
DeletePlaylistDialog(playlistId, playlistType) {
// try to refresh the playlists in the library on deletion success
onDelete()
}.show(parentFragmentManager, null)
val bundle = bundleOf(
IntentData.playlistId to playlistId,
IntentData.playlistType to playlistType
)
val newDeletePlaylistDialog = DeletePlaylistDialog()
newDeletePlaylistDialog.arguments = bundle
newDeletePlaylistDialog.show(parentFragmentManager, null)
}
getString(R.string.renamePlaylist) -> {
RenamePlaylistDialog(playlistId, playlistName, onRename)
.show(parentFragmentManager, null)
val bundle = bundleOf(
IntentData.playlistId to playlistId,
IntentData.playlistName to playlistName
)
val newRenamePlaylistDialog = RenamePlaylistDialog()
newRenamePlaylistDialog.arguments = bundle
newRenamePlaylistDialog.show(parentFragmentManager, null)
}
getString(R.string.change_playlist_description) -> {
@ -118,17 +126,9 @@ class PlaylistOptionsBottomSheet(
IntentData.playlistId to playlistId,
IntentData.playlistDescription to ""
)
val newShareDialog = PlaylistDescriptionDialog()
newShareDialog.arguments = bundle
newShareDialog.show(parentFragmentManager, null)
parentFragmentManager.setFragmentResultListener(
IntentData.requestKey,
this
) { _, resultBundle ->
val newDescription =
resultBundle.getString(IntentData.playlistDescription)!!
onChangeDescription.invoke(newDescription)
}
val newPlaylistDescriptionDialog = PlaylistDescriptionDialog()
newPlaylistDescriptionDialog.arguments = bundle
newPlaylistDescriptionDialog.show(parentFragmentManager, null)
}
else -> {

19
app/src/main/java/com/github/libretube/ui/views/ColorPreference.kt
View File

@ -7,9 +7,11 @@ import android.util.AttributeSet
import android.view.View
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import androidx.core.os.bundleOf
import androidx.preference.Preference
import androidx.preference.PreferenceViewHolder
import com.github.libretube.R
import com.github.libretube.constants.IntentData
import com.github.libretube.ui.dialogs.ColorPickerDialog
class ColorPreference(context: Context, attrs: AttributeSet) : Preference(context, attrs) {
@ -60,11 +62,18 @@ class ColorPreference(context: Context, attrs: AttributeSet) : Preference(contex
private fun showColorPickerDialog() {
(if (currentColor is Int) currentColor else Color.BLACK)?.let {
val dialog = ColorPickerDialog(context, it) { color -> setColor(color) }
dialog.show(
(context as AppCompatActivity).supportFragmentManager,
this::class.java.name
)
val bundle = bundleOf(IntentData.color to it)
val dialog = ColorPickerDialog()
val fragmentManager = (context as AppCompatActivity).supportFragmentManager
fragmentManager.setFragmentResultListener(
IntentData.requestKey,
context as AppCompatActivity
) { _, resultBundle ->
val newColor = resultBundle.getInt(IntentData.color)
setColor(newColor)
}
dialog.arguments = bundle
dialog.show(fragmentManager, this::class.java.name)
}
}