From 7cccff8a713fb1a3947e7a9a6ef5a58fe95962df Mon Sep 17 00:00:00 2001 From: darken Date: Wed, 19 Jan 2022 19:37:32 +0100 Subject: [PATCH] Remove NoPairedDevice card, too missleading. --- .../capod/main/ui/overview/OverviewAdapter.kt | 2 - .../main/ui/overview/OverviewFragmentVM.kt | 7 +-- .../ui/overview/cards/NoPairedDeviceCardVH.kt | 35 ------------ .../layout/overview_nopaireddevice_item.xml | 55 ------------------- app/src/main/res/values/strings.xml | 4 +- 5 files changed, 2 insertions(+), 101 deletions(-) delete mode 100644 app/src/main/java/eu/darken/capod/main/ui/overview/cards/NoPairedDeviceCardVH.kt delete mode 100644 app/src/main/res/layout/overview_nopaireddevice_item.xml diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewAdapter.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewAdapter.kt index 1593597d..4dafad34 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewAdapter.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewAdapter.kt @@ -13,7 +13,6 @@ import eu.darken.capod.common.lists.modular.mods.DataBinderMod import eu.darken.capod.common.lists.modular.mods.TypedVHCreatorMod import eu.darken.capod.main.ui.overview.cards.BluetoothDisabledVH import eu.darken.capod.main.ui.overview.cards.MissingMainDeviceVH -import eu.darken.capod.main.ui.overview.cards.NoPairedDeviceCardVH import eu.darken.capod.main.ui.overview.cards.PermissionCardVH import eu.darken.capod.main.ui.overview.cards.pods.BasicSingleApplePodsCardVH import eu.darken.capod.main.ui.overview.cards.pods.DualApplePodsCardVH @@ -34,7 +33,6 @@ class OverviewAdapter @Inject constructor() : modules.add(TypedVHCreatorMod({ data[it] is SingleApplePodsCardVH.Item }) { SingleApplePodsCardVH(it) }) modules.add(TypedVHCreatorMod({ data[it] is BasicSingleApplePodsCardVH.Item }) { BasicSingleApplePodsCardVH(it) }) modules.add(TypedVHCreatorMod({ data[it] is UnknownPodDeviceCardVH.Item }) { UnknownPodDeviceCardVH(it) }) - modules.add(TypedVHCreatorMod({ data[it] is NoPairedDeviceCardVH.Item }) { NoPairedDeviceCardVH(it) }) modules.add(TypedVHCreatorMod({ data[it] is MissingMainDeviceVH.Item }) { MissingMainDeviceVH(it) }) modules.add(TypedVHCreatorMod({ data[it] is BluetoothDisabledVH.Item }) { BluetoothDisabledVH(it) }) } diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt index 125b6682..937abeac 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt @@ -19,7 +19,6 @@ import eu.darken.capod.main.core.MonitorMode import eu.darken.capod.main.core.PermissionTool import eu.darken.capod.main.ui.overview.cards.BluetoothDisabledVH import eu.darken.capod.main.ui.overview.cards.MissingMainDeviceVH -import eu.darken.capod.main.ui.overview.cards.NoPairedDeviceCardVH import eu.darken.capod.main.ui.overview.cards.PermissionCardVH import eu.darken.capod.main.ui.overview.cards.pods.* import eu.darken.capod.monitor.core.PodMonitor @@ -153,11 +152,7 @@ class OverviewFragmentVM @Inject constructor( if (permissions.isEmpty()) { if (!isBluetoothEnabled) { items.add(0, BluetoothDisabledVH.Item) - } else if (!showAll && items.none { it is PodDeviceVH.Item }) { - NoPairedDeviceCardVH.Item { - generalSettings.showAll.value = true - }.run { items.add(this) } - } else if (showAll && mainPod == null) { + } else if (mainPod == null) { items.add(0, MissingMainDeviceVH.Item) } } diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/NoPairedDeviceCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/NoPairedDeviceCardVH.kt deleted file mode 100644 index 0ad9d21f..00000000 --- a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/NoPairedDeviceCardVH.kt +++ /dev/null @@ -1,35 +0,0 @@ -package eu.darken.capod.main.ui.overview.cards - -import android.view.ViewGroup -import eu.darken.capod.R -import eu.darken.capod.common.lists.binding -import eu.darken.capod.common.lists.differ.DifferItem -import eu.darken.capod.databinding.OverviewNopaireddeviceItemBinding -import eu.darken.capod.main.ui.overview.OverviewAdapter - -class NoPairedDeviceCardVH(parent: ViewGroup) : - OverviewAdapter.BaseVH( - R.layout.overview_nopaireddevice_item, - parent - ) { - - override val viewBinding = lazy { - OverviewNopaireddeviceItemBinding.bind(itemView) - } - - override val onBindData: OverviewNopaireddeviceItemBinding.( - item: Item, - payloads: List - ) -> Unit = binding(payload = true) { item -> - showAllAction.setOnClickListener { item.onShowAll() } - } - - data class Item( - val onShowAll: () -> Unit - ) : OverviewAdapter.Item { - override val stableId: Long = Item::class.hashCode().toLong() - - override val payloadProvider: ((DifferItem, DifferItem) -> DifferItem?) - get() = { old, new -> if (new::class.isInstance(old)) new else null } - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/overview_nopaireddevice_item.xml b/app/src/main/res/layout/overview_nopaireddevice_item.xml deleted file mode 100644 index 5f0e7928..00000000 --- a/app/src/main/res/layout/overview_nopaireddevice_item.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2e0a5d97..6896ec06 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -71,9 +71,7 @@ Microphone Yours - No paired device connected. - Connect a paired device or enable the \'Show all\' option. - Missing main device + No primary device All detected devices are unlikely to be yours. Power on and connect your device or adjust the settings. Settings