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

Merge pull request #4078 from Bnyro/master

Browse Source 
Fix download dialog appearance with large font size
This commit is contained in:
Bnyro 2023-06-23 17:03:25 +02:00 committed by GitHub
commit 795e24d2b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/github/libretube/ui/dialogs/DownloadDialog.kt
View File

@ -8,6 +8,7 @@ import android.util.Log
import android.view.View import android.view.View
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
import android.widget.Toast import android.widget.Toast
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
@ -34,6 +35,7 @@ import java.io.IOException
class DownloadDialog( class DownloadDialog(
private val videoId: String, private val videoId: String,
) : DialogFragment() { ) : DialogFragment() {
private var onDownloadConfirm = {}
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val binding = DialogDownloadBinding.inflate(layoutInflater) val binding = DialogDownloadBinding.inflate(layoutInflater)
@ -60,7 +62,13 @@ class DownloadDialog(
return MaterialAlertDialogBuilder(requireContext()) return MaterialAlertDialogBuilder(requireContext())
.setView(binding.root) .setView(binding.root)
.setPositiveButton(R.string.download, null)
.show() .show()
.apply {
getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
onDownloadConfirm.invoke()
}
}
} }
private fun fetchAvailableSources(binding: DialogDownloadBinding) { private fun fetchAvailableSources(binding: DialogDownloadBinding) {
@ -143,10 +151,10 @@ class DownloadDialog(
restorePreviousSelections(binding, videoStreams, audioStreams, subtitles) restorePreviousSelections(binding, videoStreams, audioStreams, subtitles)
binding.download.setOnClickListener { onDownloadConfirm = onDownloadConfirm@ {
if (binding.fileName.text.toString().isEmpty()) { if (binding.fileName.text.toString().isEmpty()) {
Toast.makeText(context, R.string.invalid_filename, Toast.LENGTH_SHORT).show() Toast.makeText(context, R.string.invalid_filename, Toast.LENGTH_SHORT).show()
return@setOnClickListener return@onDownloadConfirm
} }
val videoPosition = binding.videoSpinner.selectedItemPosition - 1 val videoPosition = binding.videoSpinner.selectedItemPosition - 1
@ -155,7 +163,7 @@ class DownloadDialog(
if (listOf(videoPosition, audioPosition, subtitlePosition).all { it == -1 }) { if (listOf(videoPosition, audioPosition, subtitlePosition).all { it == -1 }) {
Toast.makeText(context, R.string.nothing_selected, Toast.LENGTH_SHORT).show() Toast.makeText(context, R.string.nothing_selected, Toast.LENGTH_SHORT).show()
return@setOnClickListener return@onDownloadConfirm
} }
val videoStream = videoStreams.getOrNull(videoPosition) val videoStream = videoStreams.getOrNull(videoPosition)

8
app/src/main/res/layout/dialog_download.xml
View File

@ -47,12 +47,4 @@
app:icon="@drawable/ic_caption" app:icon="@drawable/ic_caption"
app:hint="@string/captions" /> app:hint="@string/captions" />
<Button
android:id="@+id/download"
style="@style/CustomDialogButton"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="15dp"
android:text="@string/download" />
</LinearLayout> </LinearLayout>