From 477774078a531577b5abd699c2e12fe077703a91 Mon Sep 17 00:00:00 2001 From: darken Date: Tue, 18 Jan 2022 14:41:49 +0100 Subject: [PATCH] Refactoring of reaction package --- .../eu/darken/capod/monitor/core/worker/MonitorWorker.kt | 2 +- .../eu/darken/capod/reaction/{core => }/ReactionHub.kt | 8 ++++---- .../capod/reaction/{core => }/autoconnect/AutoConnect.kt | 4 ++-- .../{core => }/autoconnect/AutoConnectCondition.kt | 2 +- .../capod/reaction/{core => }/playpause/PlayPause.kt | 4 ++-- .../capod/reaction/{core => }/popup/PopUpReaction.kt | 8 ++------ .../capod/reaction/{core => settings}/ReactionSettings.kt | 4 ++-- .../settings => settings/ui}/ReactionSettingsFragment.kt | 6 +++--- .../ui}/ReactionSettingsFragmentVM.kt | 2 +- app/src/main/res/xml/preferences_index.xml | 2 +- 10 files changed, 19 insertions(+), 23 deletions(-) rename app/src/main/java/eu/darken/capod/reaction/{core => }/ReactionHub.kt (77%) rename app/src/main/java/eu/darken/capod/reaction/{core => }/autoconnect/AutoConnect.kt (96%) rename app/src/main/java/eu/darken/capod/reaction/{core => }/autoconnect/AutoConnectCondition.kt (93%) rename app/src/main/java/eu/darken/capod/reaction/{core => }/playpause/PlayPause.kt (96%) rename app/src/main/java/eu/darken/capod/reaction/{core => }/popup/PopUpReaction.kt (87%) rename app/src/main/java/eu/darken/capod/reaction/{core => settings}/ReactionSettings.kt (93%) rename app/src/main/java/eu/darken/capod/reaction/{ui/settings => settings/ui}/ReactionSettingsFragment.kt (95%) rename app/src/main/java/eu/darken/capod/reaction/{ui/settings => settings/ui}/ReactionSettingsFragmentVM.kt (94%) 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 2896648f..60173162 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 @@ -20,7 +20,7 @@ import eu.darken.capod.main.core.MonitorMode import eu.darken.capod.main.core.PermissionTool import eu.darken.capod.monitor.core.* import eu.darken.capod.monitor.ui.MonitorNotifications -import eu.darken.capod.reaction.core.ReactionHub +import eu.darken.capod.reaction.ReactionHub import kotlinx.coroutines.cancel import kotlinx.coroutines.cancelChildren import kotlinx.coroutines.delay diff --git a/app/src/main/java/eu/darken/capod/reaction/core/ReactionHub.kt b/app/src/main/java/eu/darken/capod/reaction/ReactionHub.kt similarity index 77% rename from app/src/main/java/eu/darken/capod/reaction/core/ReactionHub.kt rename to app/src/main/java/eu/darken/capod/reaction/ReactionHub.kt index eecd1893..61dc9c5d 100644 --- a/app/src/main/java/eu/darken/capod/reaction/core/ReactionHub.kt +++ b/app/src/main/java/eu/darken/capod/reaction/ReactionHub.kt @@ -1,11 +1,11 @@ -package eu.darken.capod.reaction.core +package eu.darken.capod.reaction import dagger.Reusable import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.common.flow.setupCommonEventHandlers -import eu.darken.capod.reaction.core.autoconnect.AutoConnect -import eu.darken.capod.reaction.core.playpause.PlayPause -import eu.darken.capod.reaction.core.popup.PopUpReaction +import eu.darken.capod.reaction.autoconnect.AutoConnect +import eu.darken.capod.reaction.playpause.PlayPause +import eu.darken.capod.reaction.popup.PopUpReaction import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import javax.inject.Inject diff --git a/app/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnect.kt b/app/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnect.kt similarity index 96% rename from app/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnect.kt rename to app/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnect.kt index e66d6726..5a1beb2f 100644 --- a/app/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnect.kt +++ b/app/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnect.kt @@ -1,4 +1,4 @@ -package eu.darken.capod.reaction.core.autoconnect +package eu.darken.capod.reaction.autoconnect import eu.darken.capod.common.bluetooth.BluetoothManager2 import eu.darken.capod.common.debug.logging.log @@ -8,7 +8,7 @@ import eu.darken.capod.main.core.GeneralSettings import eu.darken.capod.monitor.core.PodMonitor import eu.darken.capod.pods.core.HasEarDetection import eu.darken.capod.pods.core.apple.DualApplePods -import eu.darken.capod.reaction.core.ReactionSettings +import eu.darken.capod.reaction.settings.ReactionSettings import kotlinx.coroutines.flow.* import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnectCondition.kt b/app/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnectCondition.kt similarity index 93% rename from app/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnectCondition.kt rename to app/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnectCondition.kt index 80ebd4c7..14c3e702 100644 --- a/app/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnectCondition.kt +++ b/app/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnectCondition.kt @@ -1,4 +1,4 @@ -package eu.darken.capod.reaction.core.autoconnect +package eu.darken.capod.reaction.autoconnect import androidx.annotation.StringRes import com.squareup.moshi.Json diff --git a/app/src/main/java/eu/darken/capod/reaction/core/playpause/PlayPause.kt b/app/src/main/java/eu/darken/capod/reaction/playpause/PlayPause.kt similarity index 96% rename from app/src/main/java/eu/darken/capod/reaction/core/playpause/PlayPause.kt rename to app/src/main/java/eu/darken/capod/reaction/playpause/PlayPause.kt index 495dae1d..75d63382 100644 --- a/app/src/main/java/eu/darken/capod/reaction/core/playpause/PlayPause.kt +++ b/app/src/main/java/eu/darken/capod/reaction/playpause/PlayPause.kt @@ -1,4 +1,4 @@ -package eu.darken.capod.reaction.core.playpause +package eu.darken.capod.reaction.playpause import dagger.Reusable import eu.darken.capod.common.MediaControl @@ -10,7 +10,7 @@ import eu.darken.capod.common.flow.setupCommonEventHandlers import eu.darken.capod.common.flow.withPrevious import eu.darken.capod.monitor.core.PodMonitor import eu.darken.capod.pods.core.HasEarDetection -import eu.darken.capod.reaction.core.ReactionSettings +import eu.darken.capod.reaction.settings.ReactionSettings import kotlinx.coroutines.flow.* import javax.inject.Inject diff --git a/app/src/main/java/eu/darken/capod/reaction/core/popup/PopUpReaction.kt b/app/src/main/java/eu/darken/capod/reaction/popup/PopUpReaction.kt similarity index 87% rename from app/src/main/java/eu/darken/capod/reaction/core/popup/PopUpReaction.kt rename to app/src/main/java/eu/darken/capod/reaction/popup/PopUpReaction.kt index b4079e8f..a89fc6c7 100644 --- a/app/src/main/java/eu/darken/capod/reaction/core/popup/PopUpReaction.kt +++ b/app/src/main/java/eu/darken/capod/reaction/popup/PopUpReaction.kt @@ -1,16 +1,14 @@ -package eu.darken.capod.reaction.core.popup +package eu.darken.capod.reaction.popup -import eu.darken.capod.common.bluetooth.BluetoothManager2 import eu.darken.capod.common.debug.logging.Logging.Priority.INFO import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE 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.common.flow.withPrevious -import eu.darken.capod.main.core.GeneralSettings import eu.darken.capod.monitor.core.PodMonitor import eu.darken.capod.pods.core.apple.DualApplePods -import eu.darken.capod.reaction.core.ReactionSettings +import eu.darken.capod.reaction.settings.ReactionSettings import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.flatMapLatest @@ -20,9 +18,7 @@ import javax.inject.Singleton @Singleton class PopUpReaction @Inject constructor( - private val bluetoothManager: BluetoothManager2, private val podMonitor: PodMonitor, - private val generalSettings: GeneralSettings, private val reactionSettings: ReactionSettings ) { diff --git a/app/src/main/java/eu/darken/capod/reaction/core/ReactionSettings.kt b/app/src/main/java/eu/darken/capod/reaction/settings/ReactionSettings.kt similarity index 93% rename from app/src/main/java/eu/darken/capod/reaction/core/ReactionSettings.kt rename to app/src/main/java/eu/darken/capod/reaction/settings/ReactionSettings.kt index fb69654f..63e3c5f9 100644 --- a/app/src/main/java/eu/darken/capod/reaction/core/ReactionSettings.kt +++ b/app/src/main/java/eu/darken/capod/reaction/settings/ReactionSettings.kt @@ -1,4 +1,4 @@ -package eu.darken.capod.reaction.core +package eu.darken.capod.reaction.settings import android.content.Context import android.content.SharedPreferences @@ -8,7 +8,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext import eu.darken.androidstarter.common.preferences.Settings import eu.darken.capod.common.preferences.PreferenceStoreMapper import eu.darken.capod.common.preferences.createFlowPreference -import eu.darken.capod.reaction.core.autoconnect.AutoConnectCondition +import eu.darken.capod.reaction.autoconnect.AutoConnectCondition import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/eu/darken/capod/reaction/ui/settings/ReactionSettingsFragment.kt b/app/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragment.kt similarity index 95% rename from app/src/main/java/eu/darken/capod/reaction/ui/settings/ReactionSettingsFragment.kt rename to app/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragment.kt index d70c641a..836fdc46 100644 --- a/app/src/main/java/eu/darken/capod/reaction/ui/settings/ReactionSettingsFragment.kt +++ b/app/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragment.kt @@ -1,4 +1,4 @@ -package eu.darken.capod.reaction.ui.settings +package eu.darken.capod.reaction.settings.ui import android.os.Bundle import android.view.View @@ -16,8 +16,8 @@ import eu.darken.capod.common.upgrade.isPro import eu.darken.capod.main.core.GeneralSettings import eu.darken.capod.main.core.MonitorMode import eu.darken.capod.main.ui.settings.general.DeviceSelectionDialogFactory -import eu.darken.capod.reaction.core.ReactionSettings -import eu.darken.capod.reaction.core.autoconnect.AutoConnectCondition +import eu.darken.capod.reaction.autoconnect.AutoConnectCondition +import eu.darken.capod.reaction.settings.ReactionSettings import kotlinx.coroutines.runBlocking import javax.inject.Inject diff --git a/app/src/main/java/eu/darken/capod/reaction/ui/settings/ReactionSettingsFragmentVM.kt b/app/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragmentVM.kt similarity index 94% rename from app/src/main/java/eu/darken/capod/reaction/ui/settings/ReactionSettingsFragmentVM.kt rename to app/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragmentVM.kt index a7d2ff2f..91b3a5b4 100644 --- a/app/src/main/java/eu/darken/capod/reaction/ui/settings/ReactionSettingsFragmentVM.kt +++ b/app/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragmentVM.kt @@ -1,4 +1,4 @@ -package eu.darken.capod.reaction.ui.settings +package eu.darken.capod.reaction.settings.ui import androidx.lifecycle.SavedStateHandle import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/app/src/main/res/xml/preferences_index.xml b/app/src/main/res/xml/preferences_index.xml index a3467367..3b034803 100644 --- a/app/src/main/res/xml/preferences_index.xml +++ b/app/src/main/res/xml/preferences_index.xml @@ -9,7 +9,7 @@