From f21ed9aa2ad4422ce01b9b555a57c63bcf65b39f Mon Sep 17 00:00:00 2001 From: Marcus Hanestad Date: Thu, 4 Sep 2025 13:52:38 +0200 Subject: [PATCH] casting: undo even more formatting --- .../platformplayer/dialogs/ConnectCastingDialog.kt | 10 ++++------ .../platformplayer/dialogs/ConnectedCastingDialog.kt | 12 +++++------- app/src/stable/assets/sources/apple-podcasts | 2 +- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/dialogs/ConnectCastingDialog.kt b/app/src/main/java/com/futo/platformplayer/dialogs/ConnectCastingDialog.kt index 52136d0e..28f2f989 100644 --- a/app/src/main/java/com/futo/platformplayer/dialogs/ConnectCastingDialog.kt +++ b/app/src/main/java/com/futo/platformplayer/dialogs/ConnectCastingDialog.kt @@ -183,21 +183,19 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) { } private fun buildUnifiedList(): List { - val unifiedList = mutableListOf() - val onlineDevices = StateCasting.instance.devices.values.associateBy { it.name } val rememberedDevices = StateCasting.instance.getRememberedCastingDevices().associateBy { it.name } + val unifiedList = mutableListOf() + val intersectionNames = _devices.intersect(_rememberedDevices) 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 for (name in onlineOnlyNames) { - onlineDevices[name]?.let { unifiedList.add(DeviceAdapterEntry(it, false, true )) } + onlineDevices[name]?.let { unifiedList.add(DeviceAdapterEntry(it, false, true)) } } val rememberedOnlyNames = _rememberedDevices - _devices diff --git a/app/src/main/java/com/futo/platformplayer/dialogs/ConnectedCastingDialog.kt b/app/src/main/java/com/futo/platformplayer/dialogs/ConnectedCastingDialog.kt index 65667f5b..90f09a05 100644 --- a/app/src/main/java/com/futo/platformplayer/dialogs/ConnectedCastingDialog.kt +++ b/app/src/main/java/com/futo/platformplayer/dialogs/ConnectedCastingDialog.kt @@ -122,7 +122,7 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) { super.show(); Logger.i(TAG, "Dialog shown."); - StateCasting.instance.onActiveDeviceVolumeChanged.remove(this) + StateCasting.instance.onActiveDeviceVolumeChanged.remove(this); StateCasting.instance.onActiveDeviceVolumeChanged.subscribe { _sliderVolume.value = it.toFloat().coerceAtLeast(0.0f).coerceAtMost(_sliderVolume.valueTo); }; @@ -139,12 +139,10 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) { _sliderPosition.valueTo = dur }; - val ad = StateCasting.instance.activeDevice - if (ad != null) { - _device = ad - } - val isConnected = ad != null && ad.connectionState == CastConnectionState.CONNECTED - setLoading(!isConnected) + _device = StateCasting.instance.activeDevice; + val d = _device; + val isConnected = d != null && d.connectionState == CastConnectionState.CONNECTED; + setLoading(!isConnected); StateCasting.instance.onActiveDeviceConnectionStateChanged.subscribe(this) { _, connectionState -> StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) { setLoading(connectionState != CastConnectionState.CONNECTED); }; updateDevice(); diff --git a/app/src/stable/assets/sources/apple-podcasts b/app/src/stable/assets/sources/apple-podcasts index 8cff240c..089987f0 160000 --- a/app/src/stable/assets/sources/apple-podcasts +++ b/app/src/stable/assets/sources/apple-podcasts @@ -1 +1 @@ -Subproject commit 8cff240ca7e9089ab26c03f78b6104d9cc2162fe +Subproject commit 089987f007319cf22972090a0cb09afd8c008adb