mirrors/grayjay
0
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-09-22 09:19:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issue where Scan QR button vanishes due to missing owner activity and fixed issue where remembered devices do not show until at least one normal device is found.

Browse source
This commit is contained in:
Koen J 2025-07-29 10:58:41 +02:00
commit a2970b86ee
4 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/com/futo/platformplayer/UIDialogs.kt
View file

@ -424,7 +424,7 @@ class UIDialogs {
} }
fun showCastingDialog(context: Context) { fun showCastingDialog(context: Context, ownerActivity: Activity? = null) {
val d = StateCasting.instance.activeDevice; val d = StateCasting.instance.activeDevice;
if (d != null) { if (d != null) {
val dialog = ConnectedCastingDialog(context); val dialog = ConnectedCastingDialog(context);
@ -432,6 +432,7 @@ class UIDialogs {
dialog.setOwnerActivity(context) dialog.setOwnerActivity(context)
} }
registerDialogOpened(dialog); registerDialogOpened(dialog);
ownerActivity?.let { dialog.setOwnerActivity(it) }
dialog.setOnDismissListener { registerDialogClosed(dialog) }; dialog.setOnDismissListener { registerDialogClosed(dialog) };
dialog.show(); dialog.show();
} else { } else {
@ -444,21 +445,24 @@ class UIDialogs {
if (c is Activity) { if (c is Activity) {
dialog.setOwnerActivity(c); dialog.setOwnerActivity(c);
} }
ownerActivity?.let { dialog.setOwnerActivity(it) }
dialog.setOnDismissListener { registerDialogClosed(dialog) }; dialog.setOnDismissListener { registerDialogClosed(dialog) };
dialog.show(); dialog.show();
} }
} }
fun showCastingTutorialDialog(context: Context) { fun showCastingTutorialDialog(context: Context, ownerActivity: Activity? = null) {
val dialog = CastingHelpDialog(context); val dialog = CastingHelpDialog(context);
registerDialogOpened(dialog); registerDialogOpened(dialog);
ownerActivity?.let { dialog.setOwnerActivity(it) }
dialog.setOnDismissListener { registerDialogClosed(dialog) }; dialog.setOnDismissListener { registerDialogClosed(dialog) };
dialog.show(); dialog.show();
} }
fun showCastingAddDialog(context: Context) { fun showCastingAddDialog(context: Context, ownerActivity: Activity? = null) {
val dialog = CastingAddDialog(context); val dialog = CastingAddDialog(context);
registerDialogOpened(dialog); registerDialogOpened(dialog);
ownerActivity?.let { dialog.setOwnerActivity(it) }
dialog.setOnDismissListener { registerDialogClosed(dialog) }; dialog.setOnDismissListener { registerDialogClosed(dialog) };
dialog.show(); dialog.show();
} }

4
app/src/main/java/com/futo/platformplayer/dialogs/CastingAddDialog.kt
View file

@ -106,7 +106,7 @@ class CastingAddDialog(context: Context?) : AlertDialog(context) {
}; };
_buttonTutorial.setOnClickListener { _buttonTutorial.setOnClickListener {
UIDialogs.showCastingTutorialDialog(context) UIDialogs.showCastingTutorialDialog(context, ownerActivity)
dismiss() dismiss()
} }
} }
@ -130,7 +130,7 @@ class CastingAddDialog(context: Context?) : AlertDialog(context) {
private fun performDismiss(shouldShowCastingDialog: Boolean = true) { private fun performDismiss(shouldShowCastingDialog: Boolean = true) {
if (shouldShowCastingDialog) { if (shouldShowCastingDialog) {
UIDialogs.showCastingDialog(context); UIDialogs.showCastingDialog(context, ownerActivity);
} }
dismiss(); dismiss();

2
app/src/main/java/com/futo/platformplayer/dialogs/CastingHelpDialog.kt
View file

@ -53,7 +53,7 @@ class CastingHelpDialog(context: Context?) : AlertDialog(context) {
findViewById<BigButton>(R.id.button_close).onClick.subscribe { findViewById<BigButton>(R.id.button_close).onClick.subscribe {
dismiss() dismiss()
UIDialogs.showCastingAddDialog(context) UIDialogs.showCastingAddDialog(context, ownerActivity)
} }
} }

5
app/src/main/java/com/futo/platformplayer/dialogs/ConnectCastingDialog.kt
View file

@ -83,7 +83,7 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
_buttonClose.setOnClickListener { dismiss(); }; _buttonClose.setOnClickListener { dismiss(); };
_buttonAdd.setOnClickListener { _buttonAdd.setOnClickListener {
UIDialogs.showCastingAddDialog(context); UIDialogs.showCastingAddDialog(context, ownerActivity);
dismiss(); dismiss();
}; };
@ -139,9 +139,6 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
} }
} }
} }
_textNoDevicesFound.visibility = if (_devices.isEmpty()) View.VISIBLE else View.GONE;
_recyclerDevices.visibility = if (_devices.isNotEmpty()) View.VISIBLE else View.GONE;
} }
override fun dismiss() { override fun dismiss() {