Merge branch 'dev' into smoothing

app/build.gradle

@@ -197,11 +197,11 @@ dependencies {
     implementation project(':plugins:aps')
     implementation project(':plugins:automation')
     implementation project(':plugins:configuration')
+    implementation project(':plugins:constraints')
     implementation project(':plugins:main')
     implementation project(':plugins:openhumans')
     implementation project(':plugins:sensitivity')
     implementation project(':plugins:smoothing')
-    implementation project(':plugins:support')
     implementation project(':plugins:sync')
     implementation project(':implementation')
     implementation project(':database:entities')

app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt

@@ -21,8 +21,8 @@ import info.nightscout.core.validators.di.ValidatorsModule
 import info.nightscout.database.impl.DatabaseModule
 import info.nightscout.implementation.di.ImplementationModule
 import info.nightscout.plugins.aps.di.ApsModule
+import info.nightscout.plugins.constraints.di.PluginsConstraintsModule
 import info.nightscout.plugins.di.PluginsModule
-import info.nightscout.plugins.support.di.PluginsSupportModule
 import info.nightscout.plugins.sync.di.SyncModule
 import info.nightscout.pump.combo.di.ComboModule
 import info.nightscout.pump.combov2.di.ComboV2Module
@@ -62,7 +62,7 @@ import javax.inject.Singleton
         SharedImplModule::class,
         UiModule::class,
         ValidatorsModule::class,
-        PluginsSupportModule::class,
+        PluginsConstraintsModule::class,
         SyncModule::class,
         WorkflowModule::class,
 

app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt

@@ -11,7 +11,6 @@ import info.nightscout.androidaps.insight.database.InsightDatabaseDao
 import info.nightscout.androidaps.insight.database.InsightDbHelper
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.database.impl.AppRepository
-import info.nightscout.implementation.constraints.ConstraintsImpl
 import info.nightscout.implementation.iob.GlucoseStatusProviderImpl
 import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck
 import info.nightscout.interfaces.constraints.Constraint
@@ -34,6 +33,7 @@ import info.nightscout.interfaces.utils.HardLimits
 import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
+import info.nightscout.plugins.constraints.ConstraintsImpl
 import info.nightscout.plugins.constraints.objectives.ObjectivesPlugin
 import info.nightscout.plugins.constraints.objectives.objectives.Objective
 import info.nightscout.plugins.constraints.safety.SafetyPlugin
@@ -103,33 +103,33 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
 
     @BeforeEach
     fun prepare() {
-        `when`(rh.gs(info.nightscout.plugins.R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
-        `when`(rh.gs(info.nightscout.plugins.R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
         `when`(rh.gs(info.nightscout.core.ui.R.string.no_valid_basal_rate)).thenReturn("No valid basal rate read from pump")
         `when`(rh.gs(info.nightscout.plugins.aps.R.string.autosens_disabled_in_preferences)).thenReturn("Autosens disabled in preferences")
         `when`(rh.gs(info.nightscout.plugins.aps.R.string.smb_disabled_in_preferences)).thenReturn("SMB disabled in preferences")
         `when`(rh.gs(info.nightscout.core.ui.R.string.pumplimit)).thenReturn("pump limit")
         `when`(rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value")
-        `when`(rh.gs(info.nightscout.plugins.R.string.maxvalueinpreferences)).thenReturn("max value in preferences")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.maxvalueinpreferences)).thenReturn("max value in preferences")
         `when`(rh.gs(info.nightscout.plugins.aps.R.string.max_basal_multiplier)).thenReturn("max basal multiplier")
         `when`(rh.gs(info.nightscout.plugins.aps.R.string.max_daily_basal_multiplier)).thenReturn("max daily basal multiplier")
         `when`(rh.gs(info.nightscout.core.ui.R.string.pumplimit)).thenReturn("pump limit")
         `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbolus)).thenReturn("Limiting bolus to %.1f U because of %s")
-        `when`(rh.gs(info.nightscout.plugins.R.string.hardlimit)).thenReturn("hard limit")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.hardlimit)).thenReturn("hard limit")
         `when`(rh.gs(info.nightscout.core.utils.R.string.key_child)).thenReturn("child")
-        `when`(rh.gs(info.nightscout.plugins.R.string.limitingcarbs)).thenReturn("Limiting carbs to %d g because of %s")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.limitingcarbs)).thenReturn("Limiting carbs to %d g because of %s")
         `when`(rh.gs(info.nightscout.plugins.aps.R.string.limiting_iob)).thenReturn("Limiting IOB to %.1f U because of %s")
         `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
         `when`(rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value")
-        `when`(rh.gs(info.nightscout.plugins.R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode")
         `when`(rh.gs(info.nightscout.core.ui.R.string.pumplimit)).thenReturn("pump limit")
-        `when`(rh.gs(info.nightscout.plugins.R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
         `when`(rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
         `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbolus)).thenReturn("Limiting bolus to %1\$.1f U because of %2\$s")
         `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(context.getString(info.nightscout.pump.combo.R.string.combo_pump_unsupported_operation)).thenReturn("Requested operation not supported by pump")
-        `when`(rh.gs(info.nightscout.plugins.R.string.objectivenotstarted)).thenReturn("Objective %1\$d not started")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.objectivenotstarted)).thenReturn("Objective %1\$d not started")
 
         // RS constructor
         `when`(sp.getString(R.string.key_danars_name, "")).thenReturn("")
@@ -242,7 +242,8 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
                 hardLimits,
                 ConfigImpl(fileListProvider),
                 iobCobCalculator,
-                dateUtil
+                dateUtil,
+                uiInteraction
             )
         val constraintsPluginsList = ArrayList<PluginBase>()
         constraintsPluginsList.add(safetyPlugin)

app/src/test/java/info/nightscout/androidaps/plugins/safety/SafetyPluginTest.kt

@@ -14,8 +14,8 @@ import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.profiling.Profiler
 import info.nightscout.interfaces.pump.defs.PumpDescription
+import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.interfaces.utils.HardLimits
-import info.nightscout.plugins.R
 import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.plugins.constraints.safety.SafetyPlugin
@@ -39,6 +39,7 @@ class SafetyPluginTest : TestBaseWithProfile() {
     @Mock lateinit var repository: AppRepository
     @Mock lateinit var glucoseStatusProvider: GlucoseStatusProvider
     @Mock lateinit var bgQualityCheck: BgQualityCheck
+    @Mock lateinit var uiInteraction: UiInteraction
 
     private lateinit var hardLimits: HardLimits
     private lateinit var safetyPlugin: SafetyPlugin
@@ -50,24 +51,24 @@ class SafetyPluginTest : TestBaseWithProfile() {
 
     @BeforeEach
     fun prepare() {
-        `when`(rh.gs(R.string.hardlimit)).thenReturn("hard limit")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.hardlimit)).thenReturn("hard limit")
         `when`(rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value")
         `when`(rh.gs(info.nightscout.core.ui.R.string.pumplimit)).thenReturn("pump limit")
-        `when`(rh.gs(R.string.maxvalueinpreferences)).thenReturn("max value in preferences")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.maxvalueinpreferences)).thenReturn("max value in preferences")
         `when`(rh.gs(info.nightscout.plugins.aps.R.string.max_daily_basal_multiplier)).thenReturn("max daily basal multiplier")
         `when`(rh.gs(info.nightscout.plugins.aps.R.string.max_basal_multiplier)).thenReturn("max basal multiplier")
         `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbolus)).thenReturn("Limiting bolus to %1\$.1f U because of %2\$s")
         `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(rh.gs(info.nightscout.core.ui.R.string.limiting_iob)).thenReturn("Limiting IOB to %1\$.1f U because of %2\$s")
-        `when`(rh.gs(R.string.limitingcarbs)).thenReturn("Limiting carbs to %1\$d g because of %2\$s")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.limitingcarbs)).thenReturn("Limiting carbs to %1\$d g because of %2\$s")
         `when`(rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
-        `when`(rh.gs(R.string.pumpisnottempbasalcapable)).thenReturn("Pump is not temp basal capable")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.pumpisnottempbasalcapable)).thenReturn("Pump is not temp basal capable")
         `when`(rh.gs(info.nightscout.plugins.aps.R.string.increasing_max_basal)).thenReturn("Increasing max basal value because setting is lower than your max basal in profile")
         `when`(rh.gs(info.nightscout.plugins.aps.R.string.smb_disabled_in_preferences)).thenReturn("SMB disabled in preferences")
-        `when`(rh.gs(R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
-        `when`(rh.gs(R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
-        `when`(rh.gs(R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
-        `when`(rh.gs(R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode")
+        `when`(rh.gs(info.nightscout.plugins.constraints.R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode")
         `when`(rh.gs(info.nightscout.core.utils.R.string.key_child)).thenReturn("child")
         `when`(rh.gs(info.nightscout.core.ui.R.string.lowglucosesuspend)).thenReturn("Low Glucose Suspend")
 
@@ -75,7 +76,7 @@ class SafetyPluginTest : TestBaseWithProfile() {
         `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription)
         `when`(config.APS).thenReturn(true)
         hardLimits = HardLimitsMock(sp, rh)
-        safetyPlugin = SafetyPlugin(injector, aapsLogger, rh, sp, rxBus, constraintChecker, activePlugin, hardLimits, config, iobCobCalculator, dateUtil)
+        safetyPlugin = SafetyPlugin(injector, aapsLogger, rh, sp, rxBus, constraintChecker, activePlugin, hardLimits, config, iobCobCalculator, dateUtil, uiInteraction)
         openAPSAMAPlugin = OpenAPSAMAPlugin(
             injector, aapsLogger, rxBus, constraintChecker, rh, profileFunction, context, activePlugin, iobCobCalculator, hardLimits, profiler, fabricPrivacy,
             dateUtil, repository, glucoseStatusProvider, sp

core/interfaces/src/main/java/info/nightscout/interfaces/actions/Actions.kt

@@ -0,0 +1,3 @@
+package info.nightscout.interfaces.actions
+
+interface Actions

core/interfaces/src/main/java/info/nightscout/interfaces/db/PersistenceLayer.kt

@@ -5,6 +5,7 @@ import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.BolusCalculatorResult
 import info.nightscout.database.entities.Carbs
+import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.interfaces.queue.Callback
@@ -20,4 +21,5 @@ interface PersistenceLayer {
 
     fun getTemporaryTargetActiveAt(timestamp: Long): Single<ValueWrapper<TemporaryTarget>>
     fun getUserEntryFilteredDataFromTime(timestamp: Long): Single<List<UserEntry>>
+    fun getEffectiveProfileSwitchActiveAt(timestamp: Long): Single<ValueWrapper<EffectiveProfileSwitch>>
 }

core/ui/src/main/res/drawable/ic_trending_flat_white_48dp.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="?attr/defaultTextColor"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="?attr/defaultTextColor"
+        android:pathData="M22,12l-4,-4v3H3v2h15v3z" />
+</vector>

core/ui/src/main/res/values/strings.xml

@@ -165,6 +165,9 @@
     <string name="isf_short">ISF</string>
     <string name="canceling_tbr_failed">Canceling of temporary basal failed</string>
     <string name="canceling_eb_failed">Canceling of extended bolus failed</string>
+    <string name="virtualpump_uploadstatus_title">Upload status to NS</string>
+    <string name="suspendloop_label">Disabled/Suspended loop</string>
+    <string name="iob_label">Insulin on Board (IOB)</string>
 
     <!--    Protection-->
     <string name="wrongpassword">Wrong password</string>

core/utils/src/main/res/values/keys.xml

@@ -145,5 +145,8 @@
     <string name="key_protection_timeout" translatable="false">protection_timeout</string>
     <string name="key_objectiveuseloop" translatable="false">ObjectivesLoopUsed</string>
     <string name="key_ObjectivesmanualEnacts" translatable="false">ObjectivesmanualEnacts</string>
+    <string name="key_objectiveuseactions" translatable="false">ObjectivesActionsUsed</string>
+    <string name="key_objectiveusescale" translatable="false">ObjectivesScaleUsed</string>
+    <string name="key_virtual_pump_upload_status" translatable="false">virtualpump_uploadstatus</string>
 
 </resources>

crowdin.yml

@@ -27,8 +27,8 @@ files:
     translation: /plugins/sync/src/main/res/values-%android_code%/strings.xml
     translate_attributes: 0
     content_segmentation: 0
-  - source: /plugins/support/src/main/res/values/strings.xml
+  - source: /plugins/constraints/src/main/res/values/strings.xml
-    translation: /plugins/support/src/main/res/values-%android_code%/strings.xml
+    translation: /plugins/constraints/src/main/res/values-%android_code%/strings.xml
   - source: /core/graph/src/main/res/values/strings.xml
     translation: /core/graph/src/main/res/values-%android_code%/strings.xml
   - source: /core/interfaces/src/main/res/values/strings.xml

implementation/src/main/java/info/nightscout/implementation/db/PersistenceLayerImpl.kt

@@ -6,6 +6,7 @@ import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.BolusCalculatorResult
 import info.nightscout.database.entities.Carbs
+import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.impl.AppRepository
@@ -68,4 +69,5 @@ class PersistenceLayerImpl @Inject constructor(
 
     override fun getTemporaryTargetActiveAt(timestamp: Long): Single<ValueWrapper<TemporaryTarget>> = repository.getTemporaryTargetActiveAt(timestamp)
     override fun getUserEntryFilteredDataFromTime(timestamp: Long): Single<List<UserEntry>> = repository.getUserEntryFilteredDataFromTime(timestamp)
+    override fun getEffectiveProfileSwitchActiveAt(timestamp: Long): Single<ValueWrapper<EffectiveProfileSwitch>> = repository.getEffectiveProfileSwitchActiveAt(timestamp)
 }

implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt

@@ -14,7 +14,6 @@ import info.nightscout.implementation.TrendCalculatorImpl
 import info.nightscout.implementation.UserEntryLoggerImpl
 import info.nightscout.implementation.XDripBroadcastImpl
 import info.nightscout.implementation.androidNotification.NotificationHolderImpl
-import info.nightscout.implementation.constraints.ConstraintsImpl
 import info.nightscout.implementation.db.PersistenceLayerImpl
 import info.nightscout.implementation.iob.GlucoseStatusProviderImpl
 import info.nightscout.implementation.logging.LoggerUtilsImpl
@@ -47,7 +46,6 @@ import info.nightscout.interfaces.LocalAlertUtils
 import info.nightscout.interfaces.NotificationHolder
 import info.nightscout.interfaces.Translator
 import info.nightscout.interfaces.XDripBroadcast
-import info.nightscout.interfaces.constraints.Constraints
 import info.nightscout.interfaces.db.PersistenceLayer
 import info.nightscout.interfaces.iob.GlucoseStatusProvider
 import info.nightscout.interfaces.logging.LoggerUtils
@@ -121,7 +119,6 @@ abstract class ImplementationModule {
         @Binds fun bindIconsProviderInterface(iconsProvider: IconsProviderImplementation): IconsProvider
         @Binds fun bindNotificationHolderInterface(notificationHolder: NotificationHolderImpl): NotificationHolder
         @Binds fun bindCommandQueue(commandQueue: CommandQueueImplementation): CommandQueue
-        @Binds fun bindsConstraints(constraintsImpl: ConstraintsImpl): Constraints
         @Binds fun bindsProfileFunction(profileFunctionImpl: ProfileFunctionImpl): ProfileFunction
         @Binds fun bindsStorage(fileStorage: FileStorage): Storage
         @Binds fun bindsReceiverStatusStore(receiverStatusStoreImpl: ReceiverStatusStoreImpl): ReceiverStatusStore

implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt

@@ -81,7 +81,7 @@ class UserEntryPresentationHelperImpl @Inject constructor(
         Sources.Maintenance         -> info.nightscout.core.ui.R.drawable.ic_maintenance
         Sources.NSClient            -> info.nightscout.core.ui.R.drawable.ic_nightscout_syncs
         Sources.NSProfile           -> R.drawable.ic_nightscout_profile
-        Sources.Objectives          -> R.drawable.ic_graduation
+        Sources.Objectives          -> info.nightscout.core.ui.R.drawable.ic_graduation
         Sources.Pump                -> info.nightscout.core.ui.R.drawable.ic_generic_icon
         Sources.Dana                -> info.nightscout.core.ui.R.drawable.ic_danars_128
         Sources.DanaR               -> info.nightscout.core.ui.R.drawable.ic_danars_128

plugins/constraints/build.gradle

@@ -12,7 +12,7 @@ apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
 apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
 android {
-    namespace 'info.nightscout.plugins.support'
+    namespace 'info.nightscout.plugins.constraints'
 }
 
 dependencies {
@@ -20,6 +20,7 @@ dependencies {
     implementation project(':core:interfaces')
     implementation project(':core:ui')
     implementation project(':core:utils')
+    implementation project(':core:validators')
     implementation project(':database:entities')
 
     // Phone checker

plugins/constraints/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+
+</manifest>

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsImpl.kt

@@ -1,4 +1,4 @@
-package info.nightscout.implementation.constraints
+package info.nightscout.plugins.constraints
 
 import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.interfaces.constraints.Constraints

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt

@@ -12,7 +12,7 @@ import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.source.DexcomBoyda
-import info.nightscout.plugins.support.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventBucketedDataCreated

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/ObjectivesModule.kt

@@ -0,0 +1,25 @@
+package info.nightscout.plugins.constraints.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+@Suppress("unused")
+abstract class ObjectivesModule {
+
+    @ContributesAndroidInjector abstract fun contributesObjectivesFragment(): info.nightscout.plugins.constraints.objectives.ObjectivesFragment
+    @ContributesAndroidInjector abstract fun contributesObjectivesExamDialog(): info.nightscout.plugins.constraints.objectives.activities.ObjectivesExamDialog
+    @ContributesAndroidInjector abstract fun contributesNtpProgressDialog(): info.nightscout.plugins.constraints.objectives.dialogs.NtpProgressDialog
+
+    @ContributesAndroidInjector abstract fun objectiveInjector(): info.nightscout.plugins.constraints.objectives.objectives.Objective
+    @ContributesAndroidInjector abstract fun objective0Injector(): info.nightscout.plugins.constraints.objectives.objectives.Objective0
+    @ContributesAndroidInjector abstract fun objective1Injector(): info.nightscout.plugins.constraints.objectives.objectives.Objective1
+    @ContributesAndroidInjector abstract fun objective2Injector(): info.nightscout.plugins.constraints.objectives.objectives.Objective2
+    @ContributesAndroidInjector abstract fun objective3Injector(): info.nightscout.plugins.constraints.objectives.objectives.Objective3
+    @ContributesAndroidInjector abstract fun objective4Injector(): info.nightscout.plugins.constraints.objectives.objectives.Objective4
+    @ContributesAndroidInjector abstract fun objective5Injector(): info.nightscout.plugins.constraints.objectives.objectives.Objective5
+    @ContributesAndroidInjector abstract fun objective6Injector(): info.nightscout.plugins.constraints.objectives.objectives.Objective6
+    @ContributesAndroidInjector abstract fun objective7Injector(): info.nightscout.plugins.constraints.objectives.objectives.Objective7
+    @ContributesAndroidInjector abstract fun objective9Injector(): info.nightscout.plugins.constraints.objectives.objectives.Objective9
+    @ContributesAndroidInjector abstract fun objective10Injector(): info.nightscout.plugins.constraints.objectives.objectives.Objective10
+}

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt

@@ -1,25 +1,28 @@
-package info.nightscout.plugins.support.di
+package info.nightscout.plugins.constraints.di
 
 import dagger.Binds
 import dagger.Module
 import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck
+import info.nightscout.interfaces.constraints.Constraints
 import info.nightscout.interfaces.versionChecker.VersionCheckerUtils
 import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
 import info.nightscout.plugins.constraints.versionChecker.VersionCheckerUtilsImpl
 
 @Module(
     includes = [
-        PluginsSupportModule.Bindings::class
+        PluginsConstraintsModule.Bindings::class,
+        ObjectivesModule::class
     ]
 )
 
 @Suppress("unused")
-abstract class PluginsSupportModule {
+abstract class PluginsConstraintsModule {
 
     @Module
     interface Bindings {
 
         @Binds fun bindProcessedDeviceStatusData(versionCheckerUtils: VersionCheckerUtilsImpl): VersionCheckerUtils
         @Binds fun bindBgQualityCheck(bgQualityCheck: BgQualityCheckPlugin): BgQualityCheck
+        @Binds fun bindsConstraints(constraintsImpl: info.nightscout.plugins.constraints.ConstraintsImpl): Constraints
     }
 }

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt

@@ -9,7 +9,7 @@ import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.plugins.support.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.interfaces.ResourceHelper

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt

@@ -24,13 +24,13 @@ import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.receivers.ReceiverStatusStore
 import info.nightscout.interfaces.utils.HtmlHelper
-import info.nightscout.plugins.R
+import info.nightscout.plugins.constraints.R
+import info.nightscout.plugins.constraints.databinding.ObjectivesFragmentBinding
+import info.nightscout.plugins.constraints.databinding.ObjectivesItemBinding
 import info.nightscout.plugins.constraints.objectives.activities.ObjectivesExamDialog
 import info.nightscout.plugins.constraints.objectives.dialogs.NtpProgressDialog
 import info.nightscout.plugins.constraints.objectives.events.EventObjectivesUpdateGui
 import info.nightscout.plugins.constraints.objectives.objectives.Objective.ExamTask
-import info.nightscout.plugins.databinding.ObjectivesFragmentBinding
-import info.nightscout.plugins.databinding.ObjectivesItemBinding
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventNtpStatus

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt

@@ -15,7 +15,7 @@ import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.plugins.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.plugins.constraints.objectives.objectives.Objective
 import info.nightscout.plugins.constraints.objectives.objectives.Objective0
 import info.nightscout.plugins.constraints.objectives.objectives.Objective1
@@ -47,7 +47,7 @@ class ObjectivesPlugin @Inject constructor(
         .fragmentClass(ObjectivesFragment::class.qualifiedName)
         .alwaysEnabled(config.APS)
         .showInList(config.APS)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_graduation)
+        .pluginIcon(info.nightscout.core.ui.R.drawable.ic_graduation)
         .pluginName(info.nightscout.core.ui.R.string.objectives)
         .shortName(R.string.objectives_shortname)
         .description(R.string.description_objectives),
@@ -91,9 +91,9 @@ class ObjectivesPlugin @Inject constructor(
         sp.putBoolean(info.nightscout.core.utils.R.string.key_objectiveusedisconnect, false)
         sp.putBoolean(info.nightscout.core.utils.R.string.key_objectiveusereconnect, false)
         sp.putBoolean(info.nightscout.core.utils.R.string.key_objectiveusetemptarget, false)
-        sp.putBoolean(R.string.key_objectiveuseactions, false)
+        sp.putBoolean(info.nightscout.core.utils.R.string.key_objectiveuseactions, false)
         sp.putBoolean(info.nightscout.core.utils.R.string.key_objectiveuseloop, false)
-        sp.putBoolean(R.string.key_objectiveusescale, false)
+        sp.putBoolean(info.nightscout.core.utils.R.string.key_objectiveusescale, false)
     }
 
     fun allPriorAccomplished(position: Int): Boolean {

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt

@@ -6,12 +6,12 @@ import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.plugins.R
+import info.nightscout.plugins.constraints.R
+import info.nightscout.plugins.constraints.databinding.ObjectivesExamFragmentBinding
 import info.nightscout.plugins.constraints.objectives.events.EventObjectivesUpdateGui
 import info.nightscout.plugins.constraints.objectives.objectives.Objective
 import info.nightscout.plugins.constraints.objectives.objectives.Objective.ExamTask
 import info.nightscout.plugins.constraints.objectives.objectives.Objective.Option
-import info.nightscout.plugins.databinding.ObjectivesExamFragmentBinding
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.utils.DateUtil

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt

@@ -7,7 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.plugins.databinding.DialogNtpProgressBinding
+import info.nightscout.plugins.constraints.databinding.DialogNtpProgressBinding
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventNtpStatus

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt

@@ -7,7 +7,7 @@ import android.widget.TextView
 import androidx.annotation.StringRes
 import androidx.fragment.app.FragmentActivity
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.shared.utils.DateUtil

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt

@@ -2,20 +2,20 @@ package info.nightscout.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.database.ValueWrapper
-import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.aps.Loop
+import info.nightscout.interfaces.db.PersistenceLayer
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.plugins.R
+import info.nightscout.interfaces.pump.VirtualPump
-import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.plugins.constraints.R
 import javax.inject.Inject
 
 class Objective0(injector: HasAndroidInjector) : Objective(injector, "config", R.string.objectives_0_objective, R.string.objectives_0_gate) {
 
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var virtualPumpPlugin: VirtualPumpPlugin
+    @Inject lateinit var virtualPumpPlugin: VirtualPump
-    @Inject lateinit var repository: AppRepository
+    @Inject lateinit var persistenceLayer: PersistenceLayer
     @Inject lateinit var loop: Loop
     @Inject lateinit var iobCobCalculator: IobCobCalculator
 
@@ -30,9 +30,9 @@ class Objective0(injector: HasAndroidInjector) : Objective(injector, "config", R
                 return activePlugin.firstActiveSync?.hasWritePermission == true
             }
         })
-        tasks.add(object : Task(this, R.string.virtualpump_uploadstatus_title) {
+        tasks.add(object : Task(this, info.nightscout.core.ui.R.string.virtualpump_uploadstatus_title) {
             override fun isCompleted(): Boolean {
-                return sp.getBoolean(R.string.key_virtual_pump_upload_status, false)
+                return sp.getBoolean(info.nightscout.core.utils.R.string.key_virtual_pump_upload_status, false)
             }
 
             override fun shouldBeIgnored(): Boolean {
@@ -62,7 +62,7 @@ class Objective0(injector: HasAndroidInjector) : Objective(injector, "config", R
         })
         tasks.add(object : Task(this, info.nightscout.core.ui.R.string.activate_profile) {
             override fun isCompleted(): Boolean {
-                return repository.getEffectiveProfileSwitchActiveAt(dateUtil.now()).blockingGet() is ValueWrapper.Existing
+                return persistenceLayer.getEffectiveProfileSwitchActiveAt(dateUtil.now()).blockingGet() is ValueWrapper.Existing
             }
         })
     }

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective1.kt

@@ -1,13 +1,17 @@
 package info.nightscout.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
+import info.nightscout.interfaces.actions.Actions
-import info.nightscout.plugins.general.actions.ActionsPlugin
+import info.nightscout.interfaces.plugin.ActivePlugin
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.plugins.constraints.R
 import javax.inject.Inject
 
 class Objective1 @Inject constructor(injector: HasAndroidInjector) : Objective(injector, "usage", R.string.objectives_usage_objective, R.string.objectives_usage_gate) {
 
-    @Inject lateinit var actionsPlugin: ActionsPlugin
+    @Inject lateinit var activePlugin: ActivePlugin
+    val actionsPlugin: PluginBase
+        get() = activePlugin.getSpecificPluginsListByInterface(Actions::class.java)[0]
 
     init {
         tasks.add(object : Task(this, R.string.objectives_useprofileswitch) {
@@ -32,7 +36,7 @@ class Objective1 @Inject constructor(injector: HasAndroidInjector) : Objective(i
         }.hint(Hint(R.string.usetemptarget_hint)))
         tasks.add(object : Task(this, R.string.objectives_useactions) {
             override fun isCompleted(): Boolean {
-                return sp.getBoolean(R.string.key_objectiveuseactions, false) && actionsPlugin.isEnabled() && actionsPlugin.isFragmentVisible()
+                return sp.getBoolean(info.nightscout.core.utils.R.string.key_objectiveuseactions, false) && actionsPlugin.isEnabled() && actionsPlugin.isFragmentVisible()
             }
         }.hint(Hint(R.string.useaction_hint)))
         tasks.add(object : Task(this, R.string.objectives_useloop) {
@@ -42,7 +46,7 @@ class Objective1 @Inject constructor(injector: HasAndroidInjector) : Objective(i
         }.hint(Hint(R.string.useaction_hint)))
         tasks.add(object : Task(this, R.string.objectives_usescale) {
             override fun isCompleted(): Boolean {
-                return sp.getBoolean(R.string.key_objectiveusescale, false)
+                return sp.getBoolean(info.nightscout.core.utils.R.string.key_objectiveusescale, false)
             }
         }.hint(Hint(R.string.usescale_hint)))
     }

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective10.kt

@@ -1,7 +1,7 @@
 package info.nightscout.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.shared.utils.T
 
 class Objective10(injector: HasAndroidInjector) : Objective(injector, "auto", R.string.objectives_auto_objective, R.string.objectives_auto_gate) {

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective2.kt

@@ -1,7 +1,7 @@
 package info.nightscout.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
+import info.nightscout.plugins.constraints.R
 
 @Suppress("SpellCheckingInspection")
 class Objective2(injector: HasAndroidInjector) : Objective(injector, "exam", R.string.objectives_exam_objective, R.string.objectives_exam_gate) {
@@ -172,7 +172,7 @@ class Objective2(injector: HasAndroidInjector) : Objective(injector, "exam", R.s
             .option(Option(R.string.wronginsulin_prime, true))
             .option(Option(R.string.wrongcarbs_donothing, false))
         )
-        tasks.add(ExamTask(this, R.string.iob_label, R.string.blank, "iob")
+        tasks.add(ExamTask(this, info.nightscout.core.ui.R.string.iob_label, R.string.blank, "iob")
             .option(Option(R.string.iob_value, true))
             .option(Option(R.string.iob_hightemp, false))
             .option(Option(R.string.iob_negiob, true))

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective3.kt

@@ -2,7 +2,7 @@ package info.nightscout.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.interfaces.plugin.ActivePlugin
-import info.nightscout.plugins.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.shared.utils.T
 import javax.inject.Inject
 

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt

@@ -1,7 +1,7 @@
 package info.nightscout.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
+import info.nightscout.plugins.constraints.R
 
 @Suppress("SpellCheckingInspection")
 class Objective4(injector: HasAndroidInjector) : Objective(injector, "maxbasal", R.string.objectives_maxbasal_objective, R.string.objectives_maxbasal_gate)

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt

@@ -2,7 +2,7 @@ package info.nightscout.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.plugins.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.plugins.constraints.safety.SafetyPlugin
 import info.nightscout.shared.utils.T
 import javax.inject.Inject

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt

@@ -2,7 +2,7 @@ package info.nightscout.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.interfaces.constraints.Constraints
-import info.nightscout.plugins.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.shared.utils.T
 import javax.inject.Inject
 

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective7.kt

@@ -1,7 +1,7 @@
 package info.nightscout.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.shared.utils.T
 
 class Objective7(injector: HasAndroidInjector) : Objective(injector, "autosens", R.string.objectives_autosens_objective, R.string.objectives_autosens_gate) {

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective9.kt

@@ -1,7 +1,7 @@
 package info.nightscout.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.plugins.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.shared.utils.T
 
 class Objective9(injector: HasAndroidInjector) : Objective(injector, "smb", R.string.objectives_smb_objective, R.string.objectives_smb_gate) {

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt

@@ -8,7 +8,7 @@ import info.nightscout.interfaces.constraints.Constraints
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.plugins.support.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.shared.interfaces.ResourceHelper
 import javax.inject.Inject

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt

@@ -1,7 +1,6 @@
 package info.nightscout.plugins.constraints.safety
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.extensions.putDouble
 import info.nightscout.core.extensions.putInt
 import info.nightscout.core.extensions.putString
@@ -20,10 +19,11 @@ import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.pump.defs.PumpDescription
+import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.interfaces.utils.DecimalFormatter
 import info.nightscout.interfaces.utils.HardLimits
 import info.nightscout.interfaces.utils.Round
-import info.nightscout.plugins.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.shared.interfaces.ResourceHelper
@@ -45,7 +45,8 @@ class SafetyPlugin @Inject constructor(
     private val hardLimits: HardLimits,
     private val config: Config,
     private val iobCobCalculator: IobCobCalculator,
-    private val dateUtil: DateUtil
+    private val dateUtil: DateUtil,
+    private val uiInteraction: UiInteraction
 ) : PluginBase(
     PluginDescription()
     .mainType(PluginType.CONSTRAINTS)
@@ -70,8 +71,7 @@ class SafetyPlugin @Inject constructor(
         if (mode == "open") value.set(aapsLogger, false, rh.gs(R.string.closedmodedisabledinpreferences), this)
         if (!config.isEngineeringModeOrRelease()) {
             if (value.value()) {
-                val n = Notification(Notification.TOAST_ALARM, rh.gs(R.string.closed_loop_disabled_on_dev_branch), Notification.NORMAL)
+                uiInteraction.addNotification(Notification.TOAST_ALARM, rh.gs(R.string.closed_loop_disabled_on_dev_branch), Notification.NORMAL)
-                rxBus.send(EventNewNotification(n))
             }
             value.set(aapsLogger, false, rh.gs(R.string.closed_loop_disabled_on_dev_branch), this)
         }

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt

@@ -12,7 +12,7 @@ import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.ui.UiInteraction
-import info.nightscout.plugins.support.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt

@@ -12,7 +12,7 @@ import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.ui.UiInteraction
-import info.nightscout.plugins.support.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.interfaces.ResourceHelper

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt

@@ -10,7 +10,7 @@ import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.interfaces.versionChecker.VersionCheckerUtils
-import info.nightscout.plugins.support.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.shared.interfaces.ResourceHelper

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt

@@ -8,7 +8,7 @@ import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.receivers.ReceiverStatusStore
 import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.interfaces.versionChecker.VersionCheckerUtils
-import info.nightscout.plugins.support.R
+import info.nightscout.plugins.constraints.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.interfaces.ResourceHelper

plugins/constraints/src/main/res/layout/objectives_exam_fragment.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="constraints.objectives.activities.ObjectivesExamDialog">
+    tools:context=".constraints.objectives.activities.ObjectivesExamDialog">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"