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

casting: undo even more formatting

Browse source
This commit is contained in:
Marcus Hanestad 2025-09-04 13:52:38 +02:00
commit f21ed9aa2a
3 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -183,16 +183,14 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
} }
private fun buildUnifiedList(): List<DeviceAdapterEntry> { private fun buildUnifiedList(): List<DeviceAdapterEntry> {
val unifiedList = mutableListOf<DeviceAdapterEntry>()
val onlineDevices = StateCasting.instance.devices.values.associateBy { it.name } val onlineDevices = StateCasting.instance.devices.values.associateBy { it.name }
val rememberedDevices = StateCasting.instance.getRememberedCastingDevices().associateBy { it.name } val rememberedDevices = StateCasting.instance.getRememberedCastingDevices().associateBy { it.name }
val unifiedList = mutableListOf<DeviceAdapterEntry>()
val intersectionNames = _devices.intersect(_rememberedDevices) val intersectionNames = _devices.intersect(_rememberedDevices)
for (name in intersectionNames) { for (name in intersectionNames) {
onlineDevices[name]?.let { unifiedList.add(DeviceAdapterEntry(it, true, true) onlineDevices[name]?.let { unifiedList.add(DeviceAdapterEntry(it, true, true)) }
)
}
} }
val onlineOnlyNames = _devices - _rememberedDevices val onlineOnlyNames = _devices - _rememberedDevices

12
app/src/main/java/com/futo/platformplayer/dialogs/ConnectedCastingDialog.kt
View file

@ -122,7 +122,7 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
super.show(); super.show();
Logger.i(TAG, "Dialog shown."); Logger.i(TAG, "Dialog shown.");
StateCasting.instance.onActiveDeviceVolumeChanged.remove(this) StateCasting.instance.onActiveDeviceVolumeChanged.remove(this);
StateCasting.instance.onActiveDeviceVolumeChanged.subscribe { StateCasting.instance.onActiveDeviceVolumeChanged.subscribe {
_sliderVolume.value = it.toFloat().coerceAtLeast(0.0f).coerceAtMost(_sliderVolume.valueTo); _sliderVolume.value = it.toFloat().coerceAtLeast(0.0f).coerceAtMost(_sliderVolume.valueTo);
}; };
@ -139,12 +139,10 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
_sliderPosition.valueTo = dur _sliderPosition.valueTo = dur
}; };
val ad = StateCasting.instance.activeDevice _device = StateCasting.instance.activeDevice;
if (ad != null) { val d = _device;
_device = ad val isConnected = d != null && d.connectionState == CastConnectionState.CONNECTED;
} setLoading(!isConnected);
val isConnected = ad != null && ad.connectionState == CastConnectionState.CONNECTED
setLoading(!isConnected)
StateCasting.instance.onActiveDeviceConnectionStateChanged.subscribe(this) { _, connectionState -> StateCasting.instance.onActiveDeviceConnectionStateChanged.subscribe(this) { _, connectionState ->
StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) { setLoading(connectionState != CastConnectionState.CONNECTED); }; StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) { setLoading(connectionState != CastConnectionState.CONNECTED); };
updateDevice(); updateDevice();

2
app/src/stable/assets/sources/apple-podcasts

@ -1 +1 @@
Subproject commit 8cff240ca7e9089ab26c03f78b6104d9cc2162fe Subproject commit 089987f007319cf22972090a0cb09afd8c008adb