diff --git a/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt b/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt
index 0d46f6a925..407c135495 100644
--- a/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt
@@ -43,7 +43,7 @@ import app.aaps.plugins.configuration.maintenance.MaintenancePlugin
import app.aaps.plugins.constraints.safety.SafetyPlugin
import app.aaps.plugins.insulin.InsulinOrefFreePeakPlugin
import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin
-import app.aaps.plugins.main.general.garmin.GarminPlugin
+import app.aaps.plugins.sync.garmin.GarminPlugin
import app.aaps.plugins.main.general.wear.WearPlugin
import app.aaps.plugins.sensitivity.SensitivityAAPSPlugin
import app.aaps.plugins.sensitivity.SensitivityOref1Plugin
diff --git a/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt b/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt
index 8430e9eab3..02ab7bd4c6 100644
--- a/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt
+++ b/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt
@@ -22,7 +22,7 @@ import app.aaps.plugins.insulin.InsulinOrefRapidActingPlugin
import app.aaps.plugins.insulin.InsulinOrefUltraRapidActingPlugin
import app.aaps.plugins.main.general.actions.ActionsPlugin
import app.aaps.plugins.main.general.food.FoodPlugin
-import app.aaps.plugins.main.general.garmin.GarminPlugin
+import app.aaps.plugins.sync.garmin.GarminPlugin
import app.aaps.plugins.main.general.overview.OverviewPlugin
import app.aaps.plugins.main.general.persistentNotification.PersistentNotificationPlugin
import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin
diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/di/PluginsModule.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/di/PluginsModule.kt
index bb02312d79..0d9b1f930b 100644
--- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/di/PluginsModule.kt
+++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/di/PluginsModule.kt
@@ -2,7 +2,6 @@ package app.aaps.plugins.main.di
import app.aaps.core.interfaces.iob.IobCobCalculator
import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
-import app.aaps.plugins.main.general.garmin.GarminModule
import app.aaps.plugins.main.general.persistentNotification.DummyService
import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin
import app.aaps.plugins.main.general.wear.WearFragment
@@ -24,7 +23,6 @@ import dagger.android.ContributesAndroidInjector
ActionsModule::class,
WearModule::class,
OverviewModule::class,
- GarminModule::class,
]
)
diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/GarminModule.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/GarminModule.kt
deleted file mode 100644
index 255ceceadb..0000000000
--- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/GarminModule.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.aaps.plugins.main.general.garmin
-
-import dagger.Binds
-import dagger.Module
-
-@Module
-abstract class GarminModule {
- @Suppress("unused")
- @Binds abstract fun bindLoopHub(loopHub: LoopHubImpl): LoopHub
-}
\ No newline at end of file
diff --git a/plugins/main/src/main/res/values/strings.xml b/plugins/main/src/main/res/values/strings.xml
index 18af69163d..9f1b4c6556 100644
--- a/plugins/main/src/main/res/values/strings.xml
+++ b/plugins/main/src/main/res/values/strings.xml
@@ -401,8 +401,5 @@
DEFAULT RANGE
target
Rate: %1$.2fU/h (%2$.2f%%) \nDuration %3$d min
- Garmin
- Connection to Garmin device (Fenix, Edge, …)
- Garmin settings
diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/di/SyncModule.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/di/SyncModule.kt
index aa8fd81445..409af55495 100644
--- a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/di/SyncModule.kt
+++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/di/SyncModule.kt
@@ -7,6 +7,8 @@ import app.aaps.core.interfaces.nsclient.ProcessedDeviceStatusData
import app.aaps.core.interfaces.nsclient.StoreDataForDb
import app.aaps.core.interfaces.sync.DataSyncSelectorXdrip
import app.aaps.core.interfaces.sync.XDripBroadcast
+import app.aaps.plugins.sync.garmin.LoopHub
+import app.aaps.plugins.sync.garmin.LoopHubImpl
import app.aaps.plugins.sync.nsShared.NSClientFragment
import app.aaps.plugins.sync.nsShared.StoreDataForDbImpl
import app.aaps.plugins.sync.nsclient.data.NSSettingsStatusImpl
@@ -82,6 +84,7 @@ abstract class SyncModule {
@Binds fun bindDataSyncSelectorXdripInterface(dataSyncSelectorXdripImpl: DataSyncSelectorXdripImpl): DataSyncSelectorXdrip
@Binds fun bindStoreDataForDb(storeDataForDbImpl: StoreDataForDbImpl): StoreDataForDb
@Binds fun bindXDripBroadcastInterface(xDripBroadcastImpl: XdripPlugin): XDripBroadcast
+ @Binds fun bindLoopHub(loopHub: LoopHubImpl): LoopHub
}
}
\ No newline at end of file
diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/DeltaVarEncodedList.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/DeltaVarEncodedList.kt
similarity index 99%
rename from plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/DeltaVarEncodedList.kt
rename to plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/DeltaVarEncodedList.kt
index 9934bd0215..ab82262a2b 100644
--- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/DeltaVarEncodedList.kt
+++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/DeltaVarEncodedList.kt
@@ -1,4 +1,4 @@
-package app.aaps.plugins.main.general.garmin
+package app.aaps.plugins.sync.garmin
import java.nio.ByteBuffer
import java.nio.ByteOrder
diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/GarminPlugin.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/GarminPlugin.kt
similarity index 98%
rename from plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/GarminPlugin.kt
rename to plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/GarminPlugin.kt
index 6a87777301..da1d4f084e 100644
--- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/GarminPlugin.kt
+++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/GarminPlugin.kt
@@ -1,4 +1,4 @@
-package app.aaps.plugins.main.general.garmin
+package app.aaps.plugins.sync.garmin
import androidx.annotation.VisibleForTesting
import app.aaps.core.interfaces.db.GlucoseUnit
@@ -13,7 +13,7 @@ import app.aaps.core.interfaces.rx.events.EventNewBG
import app.aaps.core.interfaces.rx.events.EventPreferenceChange
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.database.entities.GlucoseValue
-import app.aaps.plugins.main.R
+import app.aaps.plugins.sync.R
import com.google.gson.JsonObject
import dagger.android.HasAndroidInjector
import io.reactivex.rxjava3.disposables.CompositeDisposable
@@ -47,7 +47,7 @@ class GarminPlugin @Inject constructor(
private val sp: SP,
) : PluginBase(
PluginDescription()
- .mainType(PluginType.GENERAL)
+ .mainType(PluginType.SYNC)
.pluginName(R.string.garmin)
.shortName(R.string.garmin)
.description(R.string.garmin_description)
diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/HttpServer.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/HttpServer.kt
similarity index 99%
rename from plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/HttpServer.kt
rename to plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/HttpServer.kt
index fa44d60597..de327c909c 100644
--- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/HttpServer.kt
+++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/HttpServer.kt
@@ -1,4 +1,4 @@
-package app.aaps.plugins.main.general.garmin
+package app.aaps.plugins.sync.garmin
import android.os.StrictMode
import androidx.annotation.VisibleForTesting
diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/LoopHub.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/LoopHub.kt
similarity index 96%
rename from plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/LoopHub.kt
rename to plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/LoopHub.kt
index 6397049377..69f2f44a62 100644
--- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/LoopHub.kt
+++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/LoopHub.kt
@@ -1,4 +1,4 @@
-package app.aaps.plugins.main.general.garmin
+package app.aaps.plugins.sync.garmin
import app.aaps.core.interfaces.db.GlucoseUnit
import app.aaps.core.interfaces.profile.Profile
diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/LoopHubImpl.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/LoopHubImpl.kt
similarity index 98%
rename from plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/LoopHubImpl.kt
rename to plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/LoopHubImpl.kt
index 672b5a86c3..e762d27b49 100644
--- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/garmin/LoopHubImpl.kt
+++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/garmin/LoopHubImpl.kt
@@ -1,4 +1,4 @@
-package app.aaps.plugins.main.general.garmin
+package app.aaps.plugins.sync.garmin
import androidx.annotation.VisibleForTesting
import app.aaps.core.interfaces.aps.Loop
diff --git a/plugins/sync/src/main/res/values/strings.xml b/plugins/sync/src/main/res/values/strings.xml
index 72f0a1e164..1d16bfab7c 100644
--- a/plugins/sync/src/main/res/values/strings.xml
+++ b/plugins/sync/src/main/res/values/strings.xml
@@ -182,4 +182,8 @@
Data Broadcaster
Broadcast data to other apps like Garmin watch
+
+ Garmin
+ Connection to Garmin device (Fenix, Edge, …)
+ Garmin settings
\ No newline at end of file
diff --git a/plugins/main/src/main/res/xml/pref_garmin.xml b/plugins/sync/src/main/res/xml/pref_garmin.xml
similarity index 100%
rename from plugins/main/src/main/res/xml/pref_garmin.xml
rename to plugins/sync/src/main/res/xml/pref_garmin.xml
diff --git a/plugins/main/src/test/kotlin/app/aaps/plugins/main/general/garmin/DeltaVarEncodedListTest.kt b/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/garmin/DeltaVarEncodedListTest.kt
similarity index 99%
rename from plugins/main/src/test/kotlin/app/aaps/plugins/main/general/garmin/DeltaVarEncodedListTest.kt
rename to plugins/sync/src/test/kotlin/app/aaps/plugins/sync/garmin/DeltaVarEncodedListTest.kt
index 56e410c943..1902fdc4ec 100644
--- a/plugins/main/src/test/kotlin/app/aaps/plugins/main/general/garmin/DeltaVarEncodedListTest.kt
+++ b/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/garmin/DeltaVarEncodedListTest.kt
@@ -1,4 +1,4 @@
-package app.aaps.plugins.main.general.garmin
+package app.aaps.plugins.sync.garmin
import org.junit.jupiter.api.Assertions.assertArrayEquals
diff --git a/plugins/main/src/test/kotlin/app/aaps/plugins/main/general/garmin/GarminPluginTest.kt b/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/garmin/GarminPluginTest.kt
similarity index 98%
rename from plugins/main/src/test/kotlin/app/aaps/plugins/main/general/garmin/GarminPluginTest.kt
rename to plugins/sync/src/test/kotlin/app/aaps/plugins/sync/garmin/GarminPluginTest.kt
index 31aae82f97..c0af17edfa 100644
--- a/plugins/main/src/test/kotlin/app/aaps/plugins/main/general/garmin/GarminPluginTest.kt
+++ b/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/garmin/GarminPluginTest.kt
@@ -1,4 +1,4 @@
-package app.aaps.plugins.main.general.garmin
+package app.aaps.plugins.sync.garmin
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.rx.events.EventNewBG
diff --git a/plugins/main/src/test/kotlin/app/aaps/plugins/main/general/garmin/HttpServerTest.kt b/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/garmin/HttpServerTest.kt
similarity index 98%
rename from plugins/main/src/test/kotlin/app/aaps/plugins/main/general/garmin/HttpServerTest.kt
rename to plugins/sync/src/test/kotlin/app/aaps/plugins/sync/garmin/HttpServerTest.kt
index 8219e476cb..d89dfa9156 100644
--- a/plugins/main/src/test/kotlin/app/aaps/plugins/main/general/garmin/HttpServerTest.kt
+++ b/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/garmin/HttpServerTest.kt
@@ -1,4 +1,4 @@
-package app.aaps.plugins.main.general.garmin
+package app.aaps.plugins.sync.garmin
import app.aaps.shared.tests.TestBase
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/plugins/main/src/test/kotlin/app/aaps/plugins/main/general/garmin/LoopHubTest.kt b/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/garmin/LoopHubTest.kt
similarity index 99%
rename from plugins/main/src/test/kotlin/app/aaps/plugins/main/general/garmin/LoopHubTest.kt
rename to plugins/sync/src/test/kotlin/app/aaps/plugins/sync/garmin/LoopHubTest.kt
index a812f0cbef..6f1cccad86 100644
--- a/plugins/main/src/test/kotlin/app/aaps/plugins/main/general/garmin/LoopHubTest.kt
+++ b/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/garmin/LoopHubTest.kt
@@ -1,4 +1,4 @@
-package app.aaps.plugins.main.general.garmin
+package app.aaps.plugins.sync.garmin
import app.aaps.core.interfaces.aps.APSResult