Refactoring of reaction package

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

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

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

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

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
 

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
 ) {
 

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
 

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
 

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

app/src/main/res/xml/preferences_index.xml

@@ -9,7 +9,7 @@
 
     <Preference
         android:icon="@drawable/ic_baseline_widgets_24"
-        app:fragment="eu.darken.capod.reaction.ui.settings.ReactionSettingsFragment"
+        app:fragment="eu.darken.capod.reaction.settings.ui.ReactionSettingsFragment"
         app:summary="@string/settings_reaction_description"
         app:title="@string/settings_reaction_label" />