From 3dbf49510ab164c4e5247cfd2bfb9424d8a4d6c0 Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Sun, 5 Mar 2023 18:08:34 +0530 Subject: [PATCH 1/7] Inline CreatePlaylistDialog binding field. --- .../com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt index d78b3de47..1bd9f8d36 100644 --- a/app/src/main/java/com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt +++ b/app/src/main/java/com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt @@ -18,10 +18,8 @@ import okhttp3.HttpUrl.Companion.toHttpUrlOrNull class CreatePlaylistDialog( private val onSuccess: () -> Unit = {} ) : DialogFragment() { - private lateinit var binding: DialogCreatePlaylistBinding - override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogCreatePlaylistBinding.inflate(layoutInflater) + val binding = DialogCreatePlaylistBinding.inflate(layoutInflater) binding.clonePlaylist.setOnClickListener { val playlistUrl = binding.playlistUrl.text.toString().toHttpUrlOrNull() From f8994a08af28820846ea9d479e07f13fb5f9163c Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Sun, 5 Mar 2023 18:45:27 +0530 Subject: [PATCH 2/7] Inline DeleteAccountDialog binding field. --- .../com/github/libretube/ui/dialogs/DeleteAccountDialog.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/DeleteAccountDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/DeleteAccountDialog.kt index 7be649dea..0919b10bd 100644 --- a/app/src/main/java/com/github/libretube/ui/dialogs/DeleteAccountDialog.kt +++ b/app/src/main/java/com/github/libretube/ui/dialogs/DeleteAccountDialog.kt @@ -17,10 +17,8 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder class DeleteAccountDialog( private val onLogout: () -> Unit ) : DialogFragment() { - private lateinit var binding: DialogDeleteAccountBinding - override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogDeleteAccountBinding.inflate(layoutInflater) + val binding = DialogDeleteAccountBinding.inflate(layoutInflater) binding.cancelButton.setOnClickListener { dialog?.dismiss() From 7b2b252657961f6d1f7afe90610daeedac87fe4a Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Sun, 5 Mar 2023 18:48:18 +0530 Subject: [PATCH 3/7] Inline DownloadDialog binding field. --- .../github/libretube/ui/dialogs/DownloadDialog.kt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/DownloadDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/DownloadDialog.kt index 4648dd170..f7a586892 100644 --- a/app/src/main/java/com/github/libretube/ui/dialogs/DownloadDialog.kt +++ b/app/src/main/java/com/github/libretube/ui/dialogs/DownloadDialog.kt @@ -27,12 +27,10 @@ import retrofit2.HttpException class DownloadDialog( private val videoId: String ) : DialogFragment() { - private lateinit var binding: DialogDownloadBinding - override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogDownloadBinding.inflate(layoutInflater) + val binding = DialogDownloadBinding.inflate(layoutInflater) - fetchAvailableSources() + fetchAvailableSources(binding) binding.fileName.filters += InputFilter { source, start, end, _, _, _ -> if (source.isNullOrBlank()) { @@ -58,7 +56,7 @@ class DownloadDialog( .show() } - private fun fetchAvailableSources() { + private fun fetchAvailableSources(binding: DialogDownloadBinding) { lifecycleScope.launchWhenCreated { val response = try { RetrofitInstance.api.getStreams(videoId) @@ -72,11 +70,11 @@ class DownloadDialog( Toast.makeText(context, R.string.server_error, Toast.LENGTH_SHORT).show() return@launchWhenCreated } - initDownloadOptions(response) + initDownloadOptions(binding, response) } } - private fun initDownloadOptions(streams: Streams) { + private fun initDownloadOptions(binding: DialogDownloadBinding, streams: Streams) { binding.fileName.setText(streams.title) val videoStreams = streams.videoStreams.filter { @@ -126,7 +124,7 @@ class DownloadDialog( binding.audioSpinner.adapter = audioArrayAdapter binding.subtitleSpinner.adapter = subtitleArrayAdapter - restorePreviousSelections(videoStreams, audioStreams, subtitles) + restorePreviousSelections(binding, videoStreams, audioStreams, subtitles) binding.download.setOnClickListener { if (binding.fileName.text.toString().isEmpty()) { @@ -185,6 +183,7 @@ class DownloadDialog( * Restore the download selections from a previous session */ private fun restorePreviousSelections( + binding: DialogDownloadBinding, videoStreams: List, audioStreams: List, subtitles: List From 4c56089b4ca9f5289bb611b86e26f05cd61cc873 Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Sun, 5 Mar 2023 18:49:43 +0530 Subject: [PATCH 4/7] Inline LoginDialog binding field. --- .../main/java/com/github/libretube/ui/dialogs/LoginDialog.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt index c48626922..324f174e1 100644 --- a/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt +++ b/app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt @@ -22,10 +22,8 @@ import retrofit2.HttpException class LoginDialog( private val onLogin: () -> Unit ) : DialogFragment() { - private lateinit var binding: DialogLoginBinding - override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogLoginBinding.inflate(layoutInflater) + val binding = DialogLoginBinding.inflate(layoutInflater) binding.login.setOnClickListener { val email = binding.username.text?.toString() From 38a5dc29332aa0e2ffc354c38e767ffdfda0a20f Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Sun, 5 Mar 2023 18:50:28 +0530 Subject: [PATCH 5/7] Inline LogoutDialog binding field. --- .../main/java/com/github/libretube/ui/dialogs/LogoutDialog.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/LogoutDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/LogoutDialog.kt index bae6ae263..fad01e4fe 100644 --- a/app/src/main/java/com/github/libretube/ui/dialogs/LogoutDialog.kt +++ b/app/src/main/java/com/github/libretube/ui/dialogs/LogoutDialog.kt @@ -13,11 +13,9 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder class LogoutDialog( private val onLogout: () -> Unit ) : DialogFragment() { - private lateinit var binding: DialogLogoutBinding - @SuppressLint("SetTextI18n") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogLogoutBinding.inflate(layoutInflater) + val binding = DialogLogoutBinding.inflate(layoutInflater) val user = PreferenceHelper.getUsername() From 00b5d0a12a05f04d78f35791681c725e8067bf61 Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Sun, 5 Mar 2023 18:51:38 +0530 Subject: [PATCH 6/7] Inline NavBarOptionsDialog binding field. --- .../com/github/libretube/ui/dialogs/NavBarOptionsDialog.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/NavBarOptionsDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/NavBarOptionsDialog.kt index 181394b3a..ae0ad9a44 100644 --- a/app/src/main/java/com/github/libretube/ui/dialogs/NavBarOptionsDialog.kt +++ b/app/src/main/java/com/github/libretube/ui/dialogs/NavBarOptionsDialog.kt @@ -13,13 +13,9 @@ import com.github.libretube.ui.adapters.NavBarOptionsAdapter import com.google.android.material.dialog.MaterialAlertDialogBuilder class NavBarOptionsDialog : DialogFragment() { - private lateinit var binding: DialogNavbarOptionsBinding - override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogNavbarOptionsBinding.inflate(layoutInflater) - + val binding = DialogNavbarOptionsBinding.inflate(layoutInflater) val options = NavBarHelper.getNavBarItems(requireContext()) - val adapter = NavBarOptionsAdapter( options.toMutableList(), NavBarHelper.getStartFragmentId(requireContext()) From f938e16a83b5dc860495fa9e284eb0e9729f580f Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Sun, 5 Mar 2023 18:54:20 +0530 Subject: [PATCH 7/7] Inline AddToPlaylistDialog binding field, fix file name. --- .../libretube/ui/dialogs/AddToPlaylistDialog.kt | 11 +++++------ ...g_addtoplaylist.xml => dialog_add_to_playlist.xml} | 0 2 files changed, 5 insertions(+), 6 deletions(-) rename app/src/main/res/layout/{dialog_addtoplaylist.xml => dialog_add_to_playlist.xml} (100%) diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt index 26a954c3b..25c7a1c7c 100644 --- a/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt +++ b/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt @@ -12,7 +12,7 @@ import androidx.lifecycle.lifecycleScope import com.github.libretube.R import com.github.libretube.api.PlaylistsHelper import com.github.libretube.api.RetrofitInstance -import com.github.libretube.databinding.DialogAddtoplaylistBinding +import com.github.libretube.databinding.DialogAddToPlaylistBinding import com.github.libretube.extensions.TAG import com.github.libretube.extensions.toastFromMainThread import com.github.libretube.ui.models.PlaylistViewModel @@ -27,26 +27,25 @@ import kotlinx.coroutines.launch class AddToPlaylistDialog( private val videoId: String? = null ) : DialogFragment() { - private lateinit var binding: DialogAddtoplaylistBinding private val viewModel: PlaylistViewModel by activityViewModels() override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogAddtoplaylistBinding.inflate(layoutInflater) + val binding = DialogAddToPlaylistBinding.inflate(layoutInflater) binding.createPlaylist.setOnClickListener { CreatePlaylistDialog { - fetchPlaylists() + fetchPlaylists(binding) }.show(childFragmentManager, null) } - fetchPlaylists() + fetchPlaylists(binding) return MaterialAlertDialogBuilder(requireContext()) .setView(binding.root) .show() } - private fun fetchPlaylists() { + private fun fetchPlaylists(binding: DialogAddToPlaylistBinding) { lifecycleScope.launchWhenCreated { val response = try { PlaylistsHelper.getPlaylists() diff --git a/app/src/main/res/layout/dialog_addtoplaylist.xml b/app/src/main/res/layout/dialog_add_to_playlist.xml similarity index 100% rename from app/src/main/res/layout/dialog_addtoplaylist.xml rename to app/src/main/res/layout/dialog_add_to_playlist.xml