diff --git a/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt index c3265444c4..cac098422d 100644 --- a/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt +++ b/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt @@ -11,7 +11,6 @@ import info.nightscout.androidaps.diaconn.di.DiaconnG8Module import info.nightscout.androidaps.insight.di.InsightDatabaseModule import info.nightscout.androidaps.insight.di.InsightModule import info.nightscout.androidaps.plugin.general.openhumans.di.OpenHumansModule -import info.nightscout.androidaps.plugins.pump.common.di.PumpCommonModule import info.nightscout.androidaps.plugins.pump.common.di.RileyLinkModule import info.nightscout.androidaps.plugins.pump.eopatch.dagger.EopatchModule import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule @@ -26,6 +25,7 @@ import info.nightscout.plugins.aps.di.ApsModule import info.nightscout.plugins.di.PluginsModule import info.nightscout.pump.combo.di.ComboModule import info.nightscout.pump.combov2.di.ComboV2Module +import info.nightscout.pump.common.di.PumpCommonModule import info.nightscout.pump.dana.di.DanaHistoryModule import info.nightscout.pump.dana.di.DanaModule import info.nightscout.rx.di.RxModule @@ -78,7 +78,7 @@ import javax.inject.Singleton OmnipodDashModule::class, OmnipodErosModule::class, PumpCommonModule::class, - RileyLinkModule::class, + RileyLinkModule::class ] ) diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt index 111357c571..92a904bf3b 100644 --- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt @@ -140,7 +140,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() { danaPump = DanaPump(aapsLogger, sp, dateUtil, profileInstantiator) objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, rh, activePlugin, sp, config) comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, rh, profileFunction, sp, commandQueue, pumpSync, dateUtil, ruffyScripter, activityNames) - danaRPlugin = DanaRPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, rh, constraintChecker, activePlugin, sp, commandQueue, danaPump, dateUtil, fabricPrivacy, pumpSync) + danaRPlugin = DanaRPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, rh, constraintChecker, activePlugin, sp, commandQueue, danaPump, dateUtil, fabricPrivacy, pumpSync, activityNames) danaRSPlugin = DanaRSPlugin( injector, diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/pump/BlePreCheck.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/BlePreCheck.kt new file mode 100644 index 0000000000..f76fb88d76 --- /dev/null +++ b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/BlePreCheck.kt @@ -0,0 +1,7 @@ +package info.nightscout.interfaces.pump + +import androidx.appcompat.app.AppCompatActivity + +interface BlePreCheck { + fun prerequisitesCheck(activity: AppCompatActivity): Boolean +} \ No newline at end of file diff --git a/core/core-main/src/main/res/drawable/pillborder.xml b/core/ui/src/main/res/drawable/pillborder.xml similarity index 100% rename from core/core-main/src/main/res/drawable/pillborder.xml rename to core/ui/src/main/res/drawable/pillborder.xml diff --git a/implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt b/implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt index c98f9f50a1..2429ebce9b 100644 --- a/implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt +++ b/implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt @@ -25,6 +25,7 @@ import info.nightscout.implementation.profile.ProfileStoreObject import info.nightscout.implementation.profiling.ProfilerImpl import info.nightscout.implementation.protection.PasswordCheckImpl import info.nightscout.implementation.protection.ProtectionCheckImpl +import info.nightscout.implementation.pump.BlePreCheckImpl import info.nightscout.implementation.pump.DetailedBolusInfoStorageImpl import info.nightscout.implementation.pump.PumpSyncImplementation import info.nightscout.implementation.pump.TemporaryBasalStorageImpl @@ -52,6 +53,7 @@ import info.nightscout.interfaces.profile.ProfileInstantiator import info.nightscout.interfaces.profiling.Profiler import info.nightscout.interfaces.protection.PasswordCheck import info.nightscout.interfaces.protection.ProtectionCheck +import info.nightscout.interfaces.pump.BlePreCheck import info.nightscout.interfaces.pump.DetailedBolusInfoStorage import info.nightscout.interfaces.pump.PumpSync import info.nightscout.interfaces.pump.TemporaryBasalStorage @@ -95,6 +97,7 @@ abstract class ImplementationModule { @Binds fun bindHardLimits(hardLimitsImpl: HardLimitsImpl): HardLimits @Binds fun bindResourceHelper(resourceHelperImpl: ResourceHelperImpl): ResourceHelper @Binds fun bindProfileStoreInstantiator(profileStoreInstantiatorImpl: ProfileInstantiatorImpl): ProfileInstantiator + @Binds fun bindBlePreCheck(blePreCheckImpl: BlePreCheckImpl): BlePreCheck @Binds fun bindTrendCalculatorInterface(trendCalculator: TrendCalculatorImpl): TrendCalculator @Binds fun bindTddCalculatorInterface(tddCalculator: TddCalculatorImpl): TddCalculator diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt b/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt similarity index 94% rename from core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt rename to implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt index 4a2ee08ed0..484d6704b2 100644 --- a/core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt +++ b/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.ble +package info.nightscout.implementation.pump import android.Manifest import android.bluetooth.BluetoothManager @@ -14,15 +14,16 @@ import androidx.core.content.ContextCompat import info.nightscout.core.main.R import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.utils.extensions.safeEnable +import info.nightscout.interfaces.pump.BlePreCheck import info.nightscout.shared.interfaces.ResourceHelper import javax.inject.Inject import javax.inject.Singleton @Singleton -class BlePreCheck @Inject constructor( +class BlePreCheckImpl @Inject constructor( private val context: Context, private val rh: ResourceHelper -) { +) : BlePreCheck { companion object { @@ -30,7 +31,7 @@ class BlePreCheck @Inject constructor( private const val PERMISSION_REQUEST_BLUETOOTH = 30242 // arbitrary. } - fun prerequisitesCheck(activity: AppCompatActivity): Boolean { + override fun prerequisitesCheck(activity: AppCompatActivity): Boolean { if (!activity.packageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) { OKDialog.show(activity, rh.gs(R.string.message), rh.gs(R.string.ble_not_supported)) return false diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java index 0261e14c15..c107ba4e2d 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java @@ -33,13 +33,13 @@ import java.util.List; import javax.inject.Inject; import info.nightscout.androidaps.insight.R; -import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck; import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService; import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState; import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator; import info.nightscout.core.activities.NoSplashAppCompatActivity; import info.nightscout.core.utils.extensions.BluetoothAdapterExtensionKt; import info.nightscout.core.utils.extensions.IntentExtensionKt; +import info.nightscout.interfaces.pump.BlePreCheck; import info.nightscout.interfaces.pump.PumpSync; public class InsightPairingActivity extends NoSplashAppCompatActivity implements InsightConnectionService.StateCallback, View.OnClickListener, InsightConnectionService.ExceptionCallback { diff --git a/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt index 42a9f5abe3..5827c3570a 100644 --- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt +++ b/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt @@ -23,10 +23,10 @@ import androidx.core.app.ActivityCompat import info.nightscout.androidaps.danars.R import info.nightscout.androidaps.danars.databinding.DanarsBlescannerActivityBinding import info.nightscout.androidaps.danars.events.EventDanaRSDeviceChange -import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck import info.nightscout.core.activities.NoSplashAppCompatActivity import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.core.utils.extensions.safeEnable +import info.nightscout.interfaces.pump.BlePreCheck import info.nightscout.shared.sharedPreferences.SP import java.util.regex.Pattern import javax.inject.Inject diff --git a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt index 8ab19fa585..4e1930bd2f 100644 --- a/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt +++ b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt @@ -26,10 +26,10 @@ import androidx.core.app.ActivityCompat import info.nightscout.androidaps.diaconn.R import info.nightscout.androidaps.diaconn.databinding.DiaconnG8BlescannerActivityBinding import info.nightscout.androidaps.diaconn.events.EventDiaconnG8DeviceChange -import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck import info.nightscout.core.activities.NoSplashAppCompatActivity import info.nightscout.core.ui.toast.ToastUtils import info.nightscout.core.utils.extensions.safeEnable +import info.nightscout.interfaces.pump.BlePreCheck import info.nightscout.shared.sharedPreferences.SP import java.util.UUID import javax.inject.Inject diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt index d29e02ab61..6242337a46 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt @@ -7,9 +7,6 @@ import android.os.IBinder import android.os.SystemClock import androidx.preference.Preference import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.plugins.pump.common.PumpPluginAbstract -import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus -import info.nightscout.androidaps.plugins.pump.common.defs.PumpDriverState import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice @@ -19,10 +16,6 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.Riley import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ResetRileyLinkConfigurationTask import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ServiceTaskExecutor import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.WakeAndTuneTask -import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryTBR -import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncEntriesCreator -import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage -import info.nightscout.androidaps.plugins.pump.common.utils.ProfileUtil import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryResult import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData @@ -64,6 +57,11 @@ import info.nightscout.interfaces.pump.defs.PumpType import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.interfaces.ui.ActivityNames import info.nightscout.interfaces.utils.TimeChangeType +import info.nightscout.pump.common.data.PumpStatus +import info.nightscout.pump.common.defs.PumpDriverState +import info.nightscout.pump.common.sync.PumpDbEntryTBR +import info.nightscout.pump.common.sync.PumpSyncStorage +import info.nightscout.pump.common.utils.ProfileUtil import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventRefreshButtonState @@ -109,7 +107,7 @@ class MedtronicPumpPlugin @Inject constructor( aapsSchedulers: AapsSchedulers, pumpSync: PumpSync, pumpSyncStorage: PumpSyncStorage -) : PumpPluginAbstract( +) : info.nightscout.pump.common.PumpPluginAbstract( PluginDescription() // .mainType(PluginType.PUMP) // .fragmentClass(MedtronicFragment::class.java.name) // @@ -120,7 +118,7 @@ class MedtronicPumpPlugin @Inject constructor( .description(R.string.description_pump_medtronic), // PumpType.MEDTRONIC_522_722, // we default to most basic model, correct model from config is loaded later injector, rh, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy, dateUtil, aapsSchedulers, pumpSync, pumpSyncStorage -), Pump, RileyLinkPumpDevice, PumpSyncEntriesCreator { +), Pump, RileyLinkPumpDevice, info.nightscout.pump.common.sync.PumpSyncEntriesCreator { private var rileyLinkMedtronicService: RileyLinkMedtronicService? = null diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt index 1c2dc301f2..dfa5305d4f 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt @@ -1,8 +1,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump -import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType -import java.util.* +import info.nightscout.pump.common.defs.PumpHistoryEntryGroup /** * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt index 98f43463ee..06ec15cd7c 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt @@ -3,10 +3,6 @@ package info.nightscout.androidaps.plugins.pump.medtronic.data import com.google.gson.Gson import com.google.gson.GsonBuilder import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry -import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryBolus -import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryTBR -import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage import info.nightscout.androidaps.plugins.pump.medtronic.R import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.MedtronicPumpHistoryDecoder import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry @@ -31,6 +27,11 @@ import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.pump.DetailedBolusInfo import info.nightscout.interfaces.pump.PumpSync import info.nightscout.interfaces.pump.defs.PumpType +import info.nightscout.pump.common.sync.PumpDbEntry +import info.nightscout.pump.common.sync.PumpDbEntryBolus +import info.nightscout.pump.common.sync.PumpDbEntryCarbs +import info.nightscout.pump.common.sync.PumpDbEntryTBR +import info.nightscout.pump.common.sync.PumpSyncStorage import info.nightscout.pump.core.utils.StringUtil import info.nightscout.rx.bus.RxBus import info.nightscout.rx.logging.AAPSLogger @@ -580,13 +581,15 @@ class MedtronicHistoryData @Inject constructor( if (bolus.containsDecodedData("Estimate")) { val bolusWizard = bolus.decodedData["Estimate"] as BolusWizardDTO - pumpSyncStorage.addCarbs(info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryCarbs( + pumpSyncStorage.addCarbs( + PumpDbEntryCarbs( tryToGetByLocalTime(bolus.atechDateTime), bolusWizard.carbs.toDouble(), medtronicPumpStatus.pumpType, medtronicPumpStatus.serialNumber, bolus.pumpId - )) + ) + ) } } diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt index 5c96e90983..d6e289c038 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.data.dto -import info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil +import info.nightscout.pump.common.defs.TempBasalPair import info.nightscout.pump.core.utils.ByteUtil import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt index 38dd6fecbb..a4acac3fd5 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt @@ -12,12 +12,11 @@ import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import dagger.android.DaggerActivity -import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup import info.nightscout.androidaps.plugins.pump.medtronic.R import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData +import info.nightscout.pump.common.defs.PumpHistoryEntryGroup import info.nightscout.shared.interfaces.ResourceHelper -import java.util.* import javax.inject.Inject class MedtronicHistoryActivity : DaggerActivity() { diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt index 13b96f1b89..9ab0f30eb9 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt @@ -1,15 +1,16 @@ package info.nightscout.androidaps.plugins.pump.medtronic.driver -import info.nightscout.interfaces.pump.defs.PumpType import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice -import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryTBR import info.nightscout.androidaps.plugins.pump.medtronic.defs.BasalProfileStatus import info.nightscout.androidaps.plugins.pump.medtronic.defs.BatteryType import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst +import info.nightscout.interfaces.pump.defs.PumpType +import info.nightscout.pump.common.data.PumpStatus +import info.nightscout.pump.common.sync.PumpDbEntryTBR import info.nightscout.pump.core.defs.PumpDeviceState import info.nightscout.rx.bus.RxBus import info.nightscout.shared.interfaces.ResourceHelper @@ -27,7 +28,7 @@ class MedtronicPumpStatus @Inject constructor(private val rh: ResourceHelper, private val sp: SP, private val rxBus: RxBus, private val rileyLinkUtil: RileyLinkUtil -) : info.nightscout.androidaps.plugins.pump.common.data.PumpStatus(PumpType.MEDTRONIC_522_722) { +) : PumpStatus(PumpType.MEDTRONIC_522_722) { var errorDescription: String? = null lateinit var serialNumber: String //? = null diff --git a/pump/medtronic/src/test/java/info/nightscout/androidaps/TestBase.kt b/pump/medtronic/src/test/java/info/nightscout/androidaps/TestBase.kt index 57d2aec6f4..0748da255e 100644 --- a/pump/medtronic/src/test/java/info/nightscout/androidaps/TestBase.kt +++ b/pump/medtronic/src/test/java/info/nightscout/androidaps/TestBase.kt @@ -3,13 +3,13 @@ package info.nightscout.androidaps import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil -import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.MedtronicPumpHistoryDecoder import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntryType import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.pump.PumpSync +import info.nightscout.pump.common.sync.PumpSyncStorage import info.nightscout.pump.core.utils.ByteUtil import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.TestAapsSchedulers diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt index 21374189e6..4aac876c3a 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt @@ -11,8 +11,6 @@ import android.widget.Spinner import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup -import info.nightscout.androidaps.plugins.pump.common.utils.ProfileUtil import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType import info.nightscout.androidaps.plugins.pump.omnipod.dash.R import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.DashHistory @@ -25,6 +23,8 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.TempBas import info.nightscout.core.activities.NoSplashAppCompatActivity import info.nightscout.core.utils.DateTimeUtil import info.nightscout.interfaces.pump.defs.PumpType +import info.nightscout.pump.common.defs.PumpHistoryEntryGroup +import info.nightscout.pump.common.utils.ProfileUtil import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.logging.LTag import java.util.Calendar diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt index e7b5b99756..686e334c7d 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt @@ -1,8 +1,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation import android.os.Bundle -import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.PodActivationWizardActivity +import info.nightscout.interfaces.pump.BlePreCheck import javax.inject.Inject class DashPodActivationWizardActivity : PodActivationWizardActivity() { diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java index b5bacf3834..ebedab282c 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java @@ -31,7 +31,6 @@ import javax.inject.Inject; import javax.inject.Singleton; import dagger.android.HasAndroidInjector; -import info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair; import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil; @@ -98,6 +97,7 @@ import info.nightscout.interfaces.ui.ActivityNames; import info.nightscout.interfaces.utils.DecimalFormatter; import info.nightscout.interfaces.utils.Round; import info.nightscout.interfaces.utils.TimeChangeType; +import info.nightscout.pump.common.defs.TempBasalPair; import info.nightscout.rx.AapsSchedulers; import info.nightscout.rx.bus.RxBus; import info.nightscout.rx.events.EventAppExit; @@ -1079,17 +1079,17 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley @NonNull @Override public PumpEnactResult setExtendedBolus(double insulin, int durationInMinutes) { aapsLogger.debug(LTag.PUMP, "setExtendedBolus [OmnipodPumpPlugin] - Not implemented."); - return getOperationNotSupportedWithCustomText(info.nightscout.androidaps.plugins.pump.common.R.string.pump_operation_not_supported_by_pump_driver); + return getOperationNotSupportedWithCustomText(info.nightscout.pump.common.R.string.pump_operation_not_supported_by_pump_driver); } @NonNull @Override public PumpEnactResult cancelExtendedBolus() { aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus [OmnipodPumpPlugin] - Not implemented."); - return getOperationNotSupportedWithCustomText(info.nightscout.androidaps.plugins.pump.common.R.string.pump_operation_not_supported_by_pump_driver); + return getOperationNotSupportedWithCustomText(info.nightscout.pump.common.R.string.pump_operation_not_supported_by_pump_driver); } @NonNull @Override public PumpEnactResult loadTDDs() { aapsLogger.debug(LTag.PUMP, "loadTDDs [OmnipodPumpPlugin] - Not implemented."); - return getOperationNotSupportedWithCustomText(info.nightscout.androidaps.plugins.pump.common.R.string.pump_operation_not_supported_by_pump_driver); + return getOperationNotSupportedWithCustomText(info.nightscout.pump.common.R.string.pump_operation_not_supported_by_pump_driver); } @Override diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java index 740d5108fb..ee4e57269f 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java @@ -5,8 +5,8 @@ import androidx.annotation.StringRes; import java.util.HashMap; import java.util.Map; -import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup; import info.nightscout.androidaps.plugins.pump.omnipod.eros.R; +import info.nightscout.pump.common.defs.PumpHistoryEntryGroup; /** * Created by andy on 24.11.2019 diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java index d549d1721b..6dc91e4298 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java @@ -14,7 +14,6 @@ import javax.inject.Inject; import javax.inject.Singleton; import dagger.android.HasAndroidInjector; -import info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair; import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType; import info.nightscout.androidaps.plugins.pump.omnipod.eros.R; import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.OmnipodErosStorageKeys; @@ -71,6 +70,7 @@ import info.nightscout.interfaces.pump.PumpEnactResult; import info.nightscout.interfaces.pump.PumpSync; import info.nightscout.interfaces.pump.defs.PumpType; import info.nightscout.interfaces.ui.ActivityNames; +import info.nightscout.pump.common.defs.TempBasalPair; import info.nightscout.pump.core.utils.ByteUtil; import info.nightscout.rx.AapsSchedulers; import info.nightscout.rx.bus.RxBus; diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java index f5bf3b4c6f..528f00f5cc 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java @@ -22,9 +22,6 @@ import java.util.List; import javax.inject.Inject; -import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup; -import info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair; -import info.nightscout.androidaps.plugins.pump.common.utils.ProfileUtil; import info.nightscout.androidaps.plugins.pump.omnipod.eros.R; import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.PodHistoryEntryType; import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.ErosHistory; @@ -33,6 +30,9 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil import info.nightscout.core.activities.NoSplashAppCompatActivity; import info.nightscout.interfaces.profile.Profile; import info.nightscout.interfaces.pump.defs.PumpType; +import info.nightscout.pump.common.defs.PumpHistoryEntryGroup; +import info.nightscout.pump.common.defs.TempBasalPair; +import info.nightscout.pump.common.utils.ProfileUtil; import info.nightscout.rx.logging.AAPSLogger; import info.nightscout.rx.logging.LTag; import info.nightscout.shared.interfaces.ResourceHelper; diff --git a/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt index b9c85fc777..5b3767f07c 100644 --- a/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt +++ b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt @@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.androidaps.TestBase -import info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager import info.nightscout.interfaces.plugin.ActivePlugin @@ -13,6 +12,7 @@ import info.nightscout.interfaces.pump.PumpSync import info.nightscout.interfaces.pump.defs.PumpType import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.interfaces.ui.ActivityNames +import info.nightscout.pump.common.defs.TempBasalPair import info.nightscout.rx.TestAapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.shared.interfaces.ResourceHelper diff --git a/pump/pump-common/build.gradle b/pump/pump-common/build.gradle index d336da7c88..5ce3d74b80 100644 --- a/pump/pump-common/build.gradle +++ b/pump/pump-common/build.gradle @@ -12,11 +12,10 @@ apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" android { - namespace 'info.nightscout.androidaps.plugins.pump.common' + namespace 'info.nightscout.pump.common' } dependencies { - implementation project(':core:core-main') implementation project(':core:interfaces') implementation project(':core:utils') implementation project(':app-wear-shared:shared') diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/PumpDriverConfiguration.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/PumpDriverConfiguration.kt deleted file mode 100644 index c5f28a4645..0000000000 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/PumpDriverConfiguration.kt +++ /dev/null @@ -1,11 +0,0 @@ -package info.nightscout.androidaps.plugins.pump.common.driver - -import info.nightscout.androidaps.plugins.pump.common.driver.history.PumpHistoryDataProvider - -interface PumpDriverConfiguration { - - fun getPumpBLESelector(): PumpBLESelector - - fun getPumpHistoryDataProvider(): PumpHistoryDataProvider - -} \ No newline at end of file diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpDataConverter.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpDataConverter.kt deleted file mode 100644 index 0c8c8d1b25..0000000000 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpDataConverter.kt +++ /dev/null @@ -1,4 +0,0 @@ -package info.nightscout.androidaps.plugins.pump.common.driver.history - -interface PumpDataConverter { -} \ No newline at end of file diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt similarity index 97% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt index 395dc49d66..57901356a4 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common +package info.nightscout.pump.common import android.content.Context import android.content.Intent @@ -6,10 +6,6 @@ import android.content.ServiceConnection import android.text.format.DateFormat import com.google.gson.GsonBuilder import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus -import info.nightscout.androidaps.plugins.pump.common.defs.PumpDriverState -import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryCarbs -import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.interfaces.constraints.Constraints import info.nightscout.interfaces.plugin.ActivePlugin @@ -27,6 +23,10 @@ import info.nightscout.interfaces.pump.defs.PumpType import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.interfaces.utils.DecimalFormatter.to0Decimal import info.nightscout.interfaces.utils.DecimalFormatter.to2Decimal +import info.nightscout.pump.common.data.PumpStatus +import info.nightscout.pump.common.defs.PumpDriverState +import info.nightscout.pump.common.sync.PumpDbEntryCarbs +import info.nightscout.pump.common.sync.PumpSyncStorage import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventAppExit @@ -61,7 +61,7 @@ abstract class PumpPluginAbstract protected constructor( var aapsSchedulers: AapsSchedulers, var pumpSync: PumpSync, var pumpSyncStorage: PumpSyncStorage -) : PumpPluginBase(pluginDescription, injector, aapsLogger, rh, commandQueue), Pump, Constraints, info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncEntriesCreator { +) : PumpPluginBase(pluginDescription, injector, aapsLogger, rh, commandQueue), Pump, Constraints, info.nightscout.pump.common.sync.PumpSyncEntriesCreator { protected val disposable = CompositeDisposable() diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BondStateReceiver.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt similarity index 95% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BondStateReceiver.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt index ad0d7d61c8..480de2adb1 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BondStateReceiver.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.ble +package info.nightscout.pump.common.ble import android.bluetooth.BluetoothDevice import android.content.Context @@ -6,8 +6,8 @@ import android.content.Intent import androidx.annotation.StringRes import com.google.gson.Gson import dagger.android.DaggerBroadcastReceiver -import info.nightscout.androidaps.plugins.pump.common.events.EventPumpConnectionParametersChanged import info.nightscout.core.utils.extensions.safeGetParcelableExtra +import info.nightscout.pump.common.events.EventPumpConnectionParametersChanged import info.nightscout.rx.bus.RxBus import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/data/PumpStatus.kt similarity index 90% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/data/PumpStatus.kt index 8bcd1816ae..f2829bb298 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/data/PumpStatus.kt @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.common.data +package info.nightscout.pump.common.data -import info.nightscout.androidaps.plugins.pump.common.defs.PumpRunningState import info.nightscout.interfaces.pump.defs.PumpType -import java.util.* +import info.nightscout.pump.common.defs.PumpRunningState +import java.util.Date /** * Created by andy on 4/28/18. diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpTimeDifferenceDto.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/data/PumpTimeDifferenceDto.kt similarity index 90% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpTimeDifferenceDto.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/data/PumpTimeDifferenceDto.kt index 561967c714..afe4910c27 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpTimeDifferenceDto.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/data/PumpTimeDifferenceDto.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.data +package info.nightscout.pump.common.data import org.joda.time.DateTime import org.joda.time.Seconds diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/BasalProfileStatus.java b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/BasalProfileStatus.java similarity index 70% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/BasalProfileStatus.java rename to pump/pump-common/src/main/java/info/nightscout/pump/common/defs/BasalProfileStatus.java index 0d56ee4ef8..f180acb7d8 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/BasalProfileStatus.java +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/BasalProfileStatus.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.defs; +package info.nightscout.pump.common.defs; /** * Created by andy on 1/20/19. diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt similarity index 90% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt index 02cdfe1d32..9a64674591 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt @@ -1,6 +1,6 @@ -package info.nightscout.androidaps.plugins.pump.common.defs +package info.nightscout.pump.common.defs -import info.nightscout.androidaps.plugins.pump.common.R +import info.nightscout.pump.common.R // TODO there are 3 classes now, that do similar things, sort of, need to define exact rules: PumpDeviceState, PumpDriverState, PumpStatusState diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpHistoryEntryGroup.kt similarity index 96% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpHistoryEntryGroup.kt index f1aeda210b..c14391b8eb 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpHistoryEntryGroup.kt @@ -1,6 +1,6 @@ -package info.nightscout.androidaps.plugins.pump.common.defs +package info.nightscout.pump.common.defs -import info.nightscout.androidaps.plugins.pump.common.R +import info.nightscout.pump.common.R import info.nightscout.shared.interfaces.ResourceHelper import kotlin.streams.toList diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpRunningState.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpRunningState.kt similarity index 80% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpRunningState.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpRunningState.kt index f9dcabbf98..94b8ff3cd9 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpRunningState.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpRunningState.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.defs +package info.nightscout.pump.common.defs // TODO there are 3 classes now, that do similar things, sort of, need to define exact rules: PumpDeviceState, PumpDriverState, PumpStatusState diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpStatusType.kt similarity index 62% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpStatusType.kt index 8a6c1a6a9a..719d5b0fe6 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpStatusType.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.defs +package info.nightscout.pump.common.defs enum class PumpStatusType(val status: String) { diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTypeGroupConfig.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpTypeGroupConfig.kt similarity index 59% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTypeGroupConfig.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpTypeGroupConfig.kt index cc553c732f..4b418bccee 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTypeGroupConfig.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpTypeGroupConfig.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.defs +package info.nightscout.pump.common.defs enum class PumpTypeGroupConfig { All, diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpUpdateFragmentType.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpUpdateFragmentType.kt similarity index 92% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpUpdateFragmentType.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpUpdateFragmentType.kt index 0558597127..2d68ae117d 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpUpdateFragmentType.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpUpdateFragmentType.kt @@ -1,6 +1,6 @@ -package info.nightscout.androidaps.plugins.pump.common.defs +package info.nightscout.pump.common.defs -import java.util.* +import java.util.Arrays enum class PumpUpdateFragmentType { None, diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/TempBasalPair.kt similarity index 93% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/defs/TempBasalPair.kt index 320be53927..b1898979e4 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/TempBasalPair.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.defs +package info.nightscout.pump.common.defs import com.google.gson.annotations.Expose diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/PumpCommonModule.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/di/PumpCommonModule.kt similarity index 79% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/PumpCommonModule.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/di/PumpCommonModule.kt index aec51092f8..196295cbeb 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/PumpCommonModule.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/di/PumpCommonModule.kt @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.pump.common.di +package info.nightscout.pump.common.di import dagger.Module import dagger.Provides -import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage import info.nightscout.interfaces.pump.PumpSync +import info.nightscout.pump.common.sync.PumpSyncStorage import info.nightscout.rx.logging.AAPSLogger import info.nightscout.shared.sharedPreferences.SP import javax.inject.Singleton diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/PumpDriverConfiguration.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/PumpDriverConfiguration.kt new file mode 100644 index 0000000000..1b2a168b7b --- /dev/null +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/PumpDriverConfiguration.kt @@ -0,0 +1,12 @@ +package info.nightscout.pump.common.driver + +import info.nightscout.pump.common.driver.ble.PumpBLESelector +import info.nightscout.pump.common.driver.history.PumpHistoryDataProvider + +interface PumpDriverConfiguration { + + fun getPumpBLESelector(): PumpBLESelector + + fun getPumpHistoryDataProvider(): PumpHistoryDataProvider + +} \ No newline at end of file diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/PumpDriverConfigurationCapable.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/PumpDriverConfigurationCapable.kt similarity index 63% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/PumpDriverConfigurationCapable.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/driver/PumpDriverConfigurationCapable.kt index 3c8e66fde3..f1826ef1a6 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/PumpDriverConfigurationCapable.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/PumpDriverConfigurationCapable.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.driver +package info.nightscout.pump.common.driver interface PumpDriverConfigurationCapable { diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelector.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/ble/PumpBLESelector.kt similarity index 97% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelector.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/driver/ble/PumpBLESelector.kt index 8d21266920..a0487d3aed 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelector.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/ble/PumpBLESelector.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.driver +package info.nightscout.pump.common.driver.ble import android.bluetooth.BluetoothDevice import android.bluetooth.le.ScanFilter diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelectorAbstract.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/ble/PumpBLESelectorAbstract.kt similarity index 94% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelectorAbstract.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/driver/ble/PumpBLESelectorAbstract.kt index 55f62f0b6e..4d1ae9412f 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelectorAbstract.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/ble/PumpBLESelectorAbstract.kt @@ -1,16 +1,15 @@ -package info.nightscout.androidaps.plugins.pump.common.driver.ble +package info.nightscout.pump.common.driver.ble import android.bluetooth.BluetoothDevice import android.bluetooth.le.ScanFilter import android.bluetooth.le.ScanSettings import android.content.Context import android.widget.Toast -import info.nightscout.shared.interfaces.ResourceHelper -import info.nightscout.androidaps.plugins.pump.common.R -import info.nightscout.androidaps.plugins.pump.common.driver.PumpBLESelector +import info.nightscout.pump.common.R import info.nightscout.rx.bus.RxBus import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag +import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.sharedPreferences.SP abstract class PumpBLESelectorAbstract constructor( diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpDataConverter.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpDataConverter.kt new file mode 100644 index 0000000000..5b8c29e342 --- /dev/null +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpDataConverter.kt @@ -0,0 +1,4 @@ +package info.nightscout.pump.common.driver.history + +interface PumpDataConverter { +} \ No newline at end of file diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryDataProvider.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpHistoryDataProvider.kt similarity index 88% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryDataProvider.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpHistoryDataProvider.kt index 6f2389338e..b73943cdae 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryDataProvider.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpHistoryDataProvider.kt @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.common.driver.history +package info.nightscout.pump.common.driver.history import androidx.annotation.StringRes -import info.nightscout.androidaps.plugins.pump.common.R -import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup +import info.nightscout.pump.common.R +import info.nightscout.pump.common.defs.PumpHistoryEntryGroup interface PumpHistoryDataProvider { diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryDataProviderAbstract.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpHistoryDataProviderAbstract.kt similarity index 91% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryDataProviderAbstract.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpHistoryDataProviderAbstract.kt index 53dbbc0aba..9affc65cf8 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryDataProviderAbstract.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpHistoryDataProviderAbstract.kt @@ -1,7 +1,8 @@ -package info.nightscout.androidaps.plugins.pump.common.driver.history +package info.nightscout.pump.common.driver.history -import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup -import java.util.* +import info.nightscout.pump.common.defs.PumpHistoryEntryGroup +import java.util.Calendar +import java.util.GregorianCalendar abstract class PumpHistoryDataProviderAbstract : PumpHistoryDataProvider { diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryEntry.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpHistoryEntry.kt similarity index 69% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryEntry.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpHistoryEntry.kt index abfd781c18..a0b45c0acd 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryEntry.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/driver/history/PumpHistoryEntry.kt @@ -1,6 +1,6 @@ -package info.nightscout.androidaps.plugins.pump.common.driver.history +package info.nightscout.pump.common.driver.history -import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup +import info.nightscout.pump.common.defs.PumpHistoryEntryGroup import info.nightscout.shared.interfaces.ResourceHelper interface PumpHistoryEntry { diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventBondChanged.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventBondChanged.kt similarity index 69% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventBondChanged.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventBondChanged.kt index 2f22f9fe02..65c02b013c 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventBondChanged.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventBondChanged.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.events +package info.nightscout.pump.common.events import info.nightscout.rx.events.Event diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpChanged.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpChanged.kt similarity index 78% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpChanged.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpChanged.kt index dc4c2f1086..b43b7d1046 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpChanged.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpChanged.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.events +package info.nightscout.pump.common.events import info.nightscout.rx.events.Event diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpConnectionParametersChanged.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpConnectionParametersChanged.kt similarity index 61% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpConnectionParametersChanged.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpConnectionParametersChanged.kt index 55402e1467..7f4f58c13d 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpConnectionParametersChanged.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpConnectionParametersChanged.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.events +package info.nightscout.pump.common.events import info.nightscout.rx.events.Event diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpFragmentValuesChanged.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpFragmentValuesChanged.kt similarity index 64% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpFragmentValuesChanged.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpFragmentValuesChanged.kt index 4e69bd8de5..d3a96037f3 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpFragmentValuesChanged.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/events/EventPumpFragmentValuesChanged.kt @@ -1,6 +1,6 @@ -package info.nightscout.androidaps.plugins.pump.common.events +package info.nightscout.pump.common.events -import info.nightscout.androidaps.plugins.pump.common.defs.PumpUpdateFragmentType +import info.nightscout.pump.common.defs.PumpUpdateFragmentType import info.nightscout.rx.events.Event class EventPumpFragmentValuesChanged : Event { diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpDbEntry.kt similarity index 93% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpDbEntry.kt index fd720626b5..7ed79f6179 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpDbEntry.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.sync +package info.nightscout.pump.common.sync import info.nightscout.interfaces.pump.DetailedBolusInfo import info.nightscout.interfaces.pump.PumpSync @@ -77,10 +77,11 @@ data class PumpDbEntryCarbs(var date: Long, var pumpId: Long? = null) { constructor(detailedBolusInfo: DetailedBolusInfo, - creator: PumpSyncEntriesCreator) : this(detailedBolusInfo.timestamp, - detailedBolusInfo.carbs, - creator.model(), - creator.serialNumber()) + creator: info.nightscout.pump.common.sync.PumpSyncEntriesCreator + ) : this(detailedBolusInfo.timestamp, + detailedBolusInfo.carbs, + creator.model(), + creator.serialNumber()) } data class PumpDbEntryTBR(override var temporaryId: Long, diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncEntriesCreator.java b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncEntriesCreator.java similarity index 76% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncEntriesCreator.java rename to pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncEntriesCreator.java index 7682e0993d..7125ec413e 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncEntriesCreator.java +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncEntriesCreator.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.sync; +package info.nightscout.pump.common.sync; import info.nightscout.interfaces.pump.defs.PumpType; diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncStorage.kt similarity index 96% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncStorage.kt index cac90a3158..b997135870 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncStorage.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.sync +package info.nightscout.pump.common.sync import com.thoughtworks.xstream.XStream import com.thoughtworks.xstream.security.AnyTypePermission @@ -108,7 +108,7 @@ class PumpSyncStorage @Inject constructor( return pumpSyncStorageTBR } - fun addBolusWithTempId(detailedBolusInfo: DetailedBolusInfo, writeToInternalHistory: Boolean, creator: PumpSyncEntriesCreator): Boolean { + fun addBolusWithTempId(detailedBolusInfo: DetailedBolusInfo, writeToInternalHistory: Boolean, creator: info.nightscout.pump.common.sync.PumpSyncEntriesCreator): Boolean { val temporaryId = creator.generateTempId(detailedBolusInfo.timestamp) val result = pumpSync.addBolusWithTempId( detailedBolusInfo.timestamp, @@ -155,7 +155,7 @@ class PumpSyncStorage @Inject constructor( "carbs=${carbsDto.carbs}, pumpSerial=${carbsDto.serialNumber}] - Result: $result") } - fun addTemporaryBasalRateWithTempId(temporaryBasal: PumpDbEntryTBR, writeToInternalHistory: Boolean, creator: PumpSyncEntriesCreator): Boolean { + fun addTemporaryBasalRateWithTempId(temporaryBasal: PumpDbEntryTBR, writeToInternalHistory: Boolean, creator: info.nightscout.pump.common.sync.PumpSyncEntriesCreator): Boolean { val timeNow: Long = System.currentTimeMillis() val temporaryId = creator.generateTempId(timeNow) diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpBLEConfigActivity.kt similarity index 95% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpBLEConfigActivity.kt index 69c0094873..52ac11c8d1 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpBLEConfigActivity.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.ui +package info.nightscout.pump.common.ui import android.annotation.SuppressLint import android.bluetooth.BluetoothAdapter @@ -21,18 +21,17 @@ import android.widget.AdapterView.OnItemClickListener import android.widget.BaseAdapter import android.widget.TextView import dagger.android.support.DaggerAppCompatActivity -import info.nightscout.androidaps.plugins.pump.common.R -import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck -import info.nightscout.androidaps.plugins.pump.common.databinding.PumpBleConfigActivityBinding -import info.nightscout.androidaps.plugins.pump.common.driver.PumpBLESelector -import info.nightscout.androidaps.plugins.pump.common.driver.PumpBLESelectorText -import info.nightscout.androidaps.plugins.pump.common.driver.PumpDriverConfigurationCapable import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.interfaces.plugin.ActivePlugin +import info.nightscout.interfaces.pump.BlePreCheck +import info.nightscout.pump.common.R +import info.nightscout.pump.common.databinding.PumpBleConfigActivityBinding +import info.nightscout.pump.common.driver.PumpDriverConfigurationCapable +import info.nightscout.pump.common.driver.ble.PumpBLESelector +import info.nightscout.pump.common.driver.ble.PumpBLESelectorText import info.nightscout.rx.bus.RxBus import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag -import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.sharedPreferences.SP import org.apache.commons.lang3.StringUtils import javax.inject.Inject @@ -40,7 +39,6 @@ import javax.inject.Inject @SuppressLint("MissingPermission") class PumpBLEConfigActivity : DaggerAppCompatActivity() { - @Inject lateinit var resourceHelper: ResourceHelper @Inject lateinit var activePlugin: ActivePlugin @Inject lateinit var sp: SP @Inject lateinit var blePreCheck: BlePreCheck diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpHistoryActivity.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpHistoryActivity.kt similarity index 92% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpHistoryActivity.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpHistoryActivity.kt index 9cf0e69b4a..8943d4a01a 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpHistoryActivity.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpHistoryActivity.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.ui +package info.nightscout.pump.common.ui import android.content.Context import android.os.Bundle @@ -12,14 +12,14 @@ import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import dagger.android.support.DaggerAppCompatActivity -import info.nightscout.androidaps.plugins.pump.common.R -import info.nightscout.androidaps.plugins.pump.common.databinding.PumpHistoryActivityBinding -import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup -import info.nightscout.androidaps.plugins.pump.common.driver.PumpDriverConfigurationCapable -import info.nightscout.androidaps.plugins.pump.common.driver.history.PumpHistoryDataProvider -import info.nightscout.androidaps.plugins.pump.common.driver.history.PumpHistoryEntry -import info.nightscout.androidaps.plugins.pump.common.driver.history.PumpHistoryText import info.nightscout.interfaces.plugin.ActivePlugin +import info.nightscout.pump.common.R +import info.nightscout.pump.common.databinding.PumpHistoryActivityBinding +import info.nightscout.pump.common.defs.PumpHistoryEntryGroup +import info.nightscout.pump.common.driver.PumpDriverConfigurationCapable +import info.nightscout.pump.common.driver.history.PumpHistoryDataProvider +import info.nightscout.pump.common.driver.history.PumpHistoryEntry +import info.nightscout.pump.common.driver.history.PumpHistoryText import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ResourceHelper diff --git a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/utils/ProfileUtil.kt similarity index 98% rename from pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt rename to pump/pump-common/src/main/java/info/nightscout/pump/common/utils/ProfileUtil.kt index b4a1a14a7e..ae36570483 100644 --- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/utils/ProfileUtil.kt @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.pump.common.utils +package info.nightscout.pump.common.utils import info.nightscout.interfaces.profile.Profile import info.nightscout.interfaces.profile.Profile.ProfileValue diff --git a/pump/pump-common/src/main/res/layout/pump_history_activity.xml b/pump/pump-common/src/main/res/layout/pump_history_activity.xml index 0202071a6f..8ad30c66f3 100644 --- a/pump/pump-common/src/main/res/layout/pump_history_activity.xml +++ b/pump/pump-common/src/main/res/layout/pump_history_activity.xml @@ -39,9 +39,9 @@