From db80fa1b46997c0e01868cf937b7b76d199d5313 Mon Sep 17 00:00:00 2001 From: Matthias Urhahn Date: Thu, 2 Mar 2023 16:39:11 +0100 Subject: [PATCH] Wear: Remove unused code (#104) * Wear: Remove unused code * Remove more code --- .../capod/monitor/core/MonitorComponent.kt | 18 ------------- .../capod/monitor/core/MonitorModule.kt | 16 ----------- .../darken/capod/monitor/core/MonitorScope.kt | 8 ------ .../darken/capod/wear/core/MonitorWorker.kt | 14 ---------- .../wear/core/MonitorWorkerEntryPoint.kt | 9 ------- .../wear/ui/overview/OverviewFragmentVM.kt | 27 ++----------------- .../monitor/core/worker/MonitorWorker.kt | 10 ------- .../core/worker/MonitorWorkerEntryPoint.kt | 9 ------- 8 files changed, 2 insertions(+), 109 deletions(-) delete mode 100644 app-common/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt delete mode 100644 app-common/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt delete mode 100644 app-common/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt delete mode 100644 app-wear/src/main/java/eu/darken/capod/wear/core/MonitorWorkerEntryPoint.kt delete mode 100644 app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt diff --git a/app-common/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt b/app-common/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt deleted file mode 100644 index 70214807..00000000 --- a/app-common/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.darken.capod.monitor.core - -import dagger.BindsInstance -import dagger.hilt.DefineComponent -import dagger.hilt.components.SingletonComponent - -@MonitorScope -@DefineComponent(parent = SingletonComponent::class) -interface MonitorComponent { - - @DefineComponent.Builder - interface Builder { - - fun coroutineScope(@BindsInstance coroutineScope: MonitorCoroutineScope): Builder - - fun build(): MonitorComponent - } -} \ No newline at end of file diff --git a/app-common/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt b/app-common/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt deleted file mode 100644 index 67e1926b..00000000 --- a/app-common/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt +++ /dev/null @@ -1,16 +0,0 @@ -package eu.darken.capod.monitor.core - -import dagger.Binds -import dagger.Module -import dagger.hilt.InstallIn -import kotlinx.coroutines.CoroutineScope - -@InstallIn(MonitorComponent::class) -@Module() -abstract class ProcessorModule { - - @Binds - @MonitorScope - abstract fun processorScope(scope: MonitorCoroutineScope): CoroutineScope - -} diff --git a/app-common/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt b/app-common/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt deleted file mode 100644 index f17af6a7..00000000 --- a/app-common/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt +++ /dev/null @@ -1,8 +0,0 @@ -package eu.darken.capod.monitor.core - -import javax.inject.Qualifier - -@Qualifier -@MustBeDocumented -@Retention(AnnotationRetention.RUNTIME) -annotation class MonitorScope \ No newline at end of file diff --git a/app-wear/src/main/java/eu/darken/capod/wear/core/MonitorWorker.kt b/app-wear/src/main/java/eu/darken/capod/wear/core/MonitorWorker.kt index 15b049b7..d6fa89ee 100644 --- a/app-wear/src/main/java/eu/darken/capod/wear/core/MonitorWorker.kt +++ b/app-wear/src/main/java/eu/darken/capod/wear/core/MonitorWorker.kt @@ -6,8 +6,6 @@ import androidx.work.CoroutineWorker import androidx.work.WorkerParameters import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import dagger.hilt.EntryPoints -import eu.darken.capod.common.bluetooth.BluetoothManager2 import eu.darken.capod.common.coroutine.DispatcherProvider import eu.darken.capod.common.debug.Bugs import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE @@ -15,9 +13,7 @@ import eu.darken.capod.common.debug.logging.Logging.Priority.WARN import eu.darken.capod.common.debug.logging.log import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.common.flow.setupCommonEventHandlers -import eu.darken.capod.main.core.GeneralSettings import eu.darken.capod.main.core.PermissionTool -import eu.darken.capod.monitor.core.MonitorComponent import eu.darken.capod.monitor.core.MonitorCoroutineScope import eu.darken.capod.monitor.core.PodMonitor import kotlinx.coroutines.* @@ -31,22 +27,12 @@ import kotlinx.coroutines.flow.take class MonitorWorker @AssistedInject constructor( @Assisted private val context: Context, @Assisted private val params: WorkerParameters, - monitorComponentBuilder: MonitorComponent.Builder, private val dispatcherProvider: DispatcherProvider, - private val generalSettings: GeneralSettings, private val permissionTool: PermissionTool, private val podMonitor: PodMonitor, - private val bluetoothManager: BluetoothManager2, ) : CoroutineWorker(context, params) { private val workerScope = MonitorCoroutineScope() - private val monitorComponent = monitorComponentBuilder - .coroutineScope(workerScope) - .build() - - private val entryPoint by lazy { - EntryPoints.get(monitorComponent, MonitorWorkerEntryPoint::class.java) - } private var finishedWithError = false diff --git a/app-wear/src/main/java/eu/darken/capod/wear/core/MonitorWorkerEntryPoint.kt b/app-wear/src/main/java/eu/darken/capod/wear/core/MonitorWorkerEntryPoint.kt deleted file mode 100644 index fddc55e4..00000000 --- a/app-wear/src/main/java/eu/darken/capod/wear/core/MonitorWorkerEntryPoint.kt +++ /dev/null @@ -1,9 +0,0 @@ -package eu.darken.capod.wear.core - -import dagger.hilt.EntryPoint -import dagger.hilt.InstallIn -import eu.darken.capod.monitor.core.MonitorComponent - -@InstallIn(MonitorComponent::class) -@EntryPoint -interface MonitorWorkerEntryPoint \ No newline at end of file diff --git a/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/OverviewFragmentVM.kt b/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/OverviewFragmentVM.kt index a6a7577e..4ae9de9e 100644 --- a/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/OverviewFragmentVM.kt +++ b/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/OverviewFragmentVM.kt @@ -13,13 +13,9 @@ import eu.darken.capod.common.flow.throttleLatest import eu.darken.capod.common.livedata.SingleLiveEvent import eu.darken.capod.common.permissions.Permission import eu.darken.capod.common.uix.ViewModel3 -import eu.darken.capod.main.core.GeneralSettings import eu.darken.capod.main.core.PermissionTool -import eu.darken.capod.monitor.core.PodDeviceCache import eu.darken.capod.monitor.core.PodMonitor import eu.darken.capod.pods.core.DualPodDevice -import eu.darken.capod.pods.core.PodDevice -import eu.darken.capod.pods.core.PodFactory import eu.darken.capod.pods.core.SinglePodDevice import eu.darken.capod.wear.ui.overview.cards.BluetoothDisabledVH import eu.darken.capod.wear.ui.overview.cards.MissingMainDeviceVH @@ -38,11 +34,8 @@ class OverviewFragmentVM @Inject constructor( dispatcherProvider: DispatcherProvider, private val podMonitor: PodMonitor, private val permissionTool: PermissionTool, - private val generalSettings: GeneralSettings, debugSettings: DebugSettings, private val bluetoothManager: BluetoothManager2, - private val podDeviceCache: PodDeviceCache, - private val podFactory: PodFactory ) : ViewModel3(dispatcherProvider = dispatcherProvider) { private val updateTicker = channelFlow { @@ -54,30 +47,14 @@ class OverviewFragmentVM @Inject constructor( val requestPermissionEvent = SingleLiveEvent() - private val pods: Flow> = permissionTool.missingPermissions - .flatMapLatest { permissions -> - if (permissions.isNotEmpty()) { - return@flatMapLatest flowOf(emptyList()) - } - - generalSettings.showAll.flow.flatMapLatest { showAll -> - if (showAll) { - podMonitor.devices - } else { - podMonitor.mainDevice.map { mainDevice -> - mainDevice?.let { listOf(it) } ?: emptyList() - } - } - } - } - .catch { errorEvents.postValue(it) } + private val mainDevice = podMonitor.mainDevice.throttleLatest(1000) val listItems: LiveData> = combine( updateTicker, permissionTool.missingPermissions, debugSettings.isDebugModeEnabled.flow, bluetoothManager.isBluetoothEnabled, - podMonitor.mainDevice.throttleLatest(1000), + mainDevice, ) { _, permissions, isDebugMode, isBluetoothEnabled, _ -> val items = mutableListOf() diff --git a/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt b/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt index 1c46de3f..d61aff02 100644 --- a/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt +++ b/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt @@ -8,7 +8,6 @@ import androidx.work.CoroutineWorker import androidx.work.WorkerParameters import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import dagger.hilt.EntryPoints import eu.darken.capod.common.bluetooth.BluetoothManager2 import eu.darken.capod.common.coroutine.DispatcherProvider import eu.darken.capod.common.debug.Bugs @@ -23,7 +22,6 @@ import eu.darken.capod.main.core.GeneralSettings import eu.darken.capod.main.core.MonitorMode import eu.darken.capod.main.core.PermissionTool import eu.darken.capod.main.ui.widget.WidgetManager -import eu.darken.capod.monitor.core.MonitorComponent import eu.darken.capod.monitor.core.MonitorCoroutineScope import eu.darken.capod.monitor.core.PodMonitor import eu.darken.capod.monitor.ui.MonitorNotifications @@ -39,7 +37,6 @@ import kotlinx.coroutines.flow.* class MonitorWorker @AssistedInject constructor( @Assisted private val context: Context, @Assisted private val params: WorkerParameters, - monitorComponentBuilder: MonitorComponent.Builder, private val dispatcherProvider: DispatcherProvider, private val monitorNotifications: MonitorNotifications, private val notificationManager: NotificationManager, @@ -55,13 +52,6 @@ class MonitorWorker @AssistedInject constructor( ) : CoroutineWorker(context, params) { private val workerScope = MonitorCoroutineScope() - private val monitorComponent = monitorComponentBuilder - .coroutineScope(workerScope) - .build() - - private val entryPoint by lazy { - EntryPoints.get(monitorComponent, MonitorWorkerEntryPoint::class.java) - } private var finishedWithError = false diff --git a/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt b/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt deleted file mode 100644 index 3b9c3d36..00000000 --- a/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt +++ /dev/null @@ -1,9 +0,0 @@ -package eu.darken.capod.monitor.core.worker - -import dagger.hilt.EntryPoint -import dagger.hilt.InstallIn -import eu.darken.capod.monitor.core.MonitorComponent - -@InstallIn(MonitorComponent::class) -@EntryPoint -interface MonitorWorkerEntryPoint \ No newline at end of file