cleanup

.idea/dictionaries/project_dictionary.xml

@@ -31,6 +31,7 @@
       <w>cellnovo</w>
       <w>chek</w>
       <w>clearalarm</w>
+      <w>combov</w>
       <w>crashlytics</w>
       <w>danar</w>
       <w>danars</w>
@@ -55,18 +56,22 @@
       <w>eveningoutpost</w>
       <w>eversense</w>
       <w>extendedbolus</w>
+      <w>fiasp</w>
       <w>fileprovider</w>
       <w>firebase</w>
       <w>glimp</w>
       <w>glunovo</w>
+      <w>glycemia</w>
       <w>gson</w>
       <w>hmac</w>
+      <w>humalog</w>
       <w>iage</w>
       <w>infinivocgm</w>
       <w>insulet</w>
       <w>intelligo</w>
       <w>iobtotal</w>
       <w>joda</w>
+      <w>joul</w>
       <w>libre</w>
       <w>listdelimiter</w>
       <w>localprofile</w>
@@ -74,6 +79,7 @@
       <w>mdtp</w>
       <w>medtronic</w>
       <w>mgdl</w>
+      <w>miao</w>
       <w>misformatted</w>
       <w>mmol</w>
       <w>motol</w>
@@ -82,6 +88,8 @@
       <w>netratio</w>
       <w>nightscout</w>
       <w>notif</w>
+      <w>novolog</w>
+      <w>novorapid</w>
       <w>nsclient</w>
       <w>oaps</w>
       <w>okcancel</w>
@@ -107,9 +115,12 @@
       <w>rileylink</w>
       <w>roboelectric</w>
       <w>rozman</w>
+      <w>sbat</w>
+      <w>setupwizard</w>
       <w>sgvs</w>
       <w>shortgramm</w>
       <w>sitechange</w>
+      <w>skippable</w>
       <w>smscommunicator</w>
       <w>sntp</w>
       <w>sooil</w>

app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt

@@ -39,7 +39,11 @@ import info.nightscout.interfaces.protection.ProtectionCheck.ProtectionType.CUST
 import info.nightscout.interfaces.protection.ProtectionCheck.ProtectionType.CUSTOM_PIN
 import info.nightscout.interfaces.protection.ProtectionCheck.ProtectionType.NONE
 import info.nightscout.plugins.aps.loop.LoopPlugin
+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.safety.SafetyPlugin
+import info.nightscout.plugins.general.autotune.AutotunePlugin
 import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.plugins.general.wear.WearPlugin
 import info.nightscout.plugins.general.xdripStatusline.StatusLinePlugin
@@ -83,7 +87,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     @Inject lateinit var config: Config
 
     @Inject lateinit var automationPlugin: AutomationPlugin
-    @Inject lateinit var autotunePlugin: info.nightscout.plugins.general.autotune.AutotunePlugin
+    @Inject lateinit var autotunePlugin: AutotunePlugin
     @Inject lateinit var danaRPlugin: DanaRPlugin
     @Inject lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
     @Inject lateinit var danaRv2Plugin: DanaRv2Plugin
@@ -96,9 +100,9 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     @Inject lateinit var medtronicPumpPlugin: MedtronicPumpPlugin
     @Inject lateinit var nsClientPlugin: NSClientPlugin
     @Inject lateinit var nsClientV3Plugin: NSClientV3Plugin
-    @Inject lateinit var openAPSAMAPlugin: info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
+    @Inject lateinit var openAPSAMAPlugin: OpenAPSAMAPlugin
-    @Inject lateinit var openAPSSMBPlugin: info.nightscout.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
+    @Inject lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
-    @Inject lateinit var openAPSSMBDynamicISFPlugin: info.nightscout.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
+    @Inject lateinit var openAPSSMBDynamicISFPlugin: OpenAPSSMBDynamicISFPlugin
     @Inject lateinit var safetyPlugin: SafetyPlugin
     @Inject lateinit var sensitivityAAPSPlugin: SensitivityAAPSPlugin
     @Inject lateinit var sensitivityOref1Plugin: SensitivityOref1Plugin

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

@@ -3,7 +3,6 @@ package info.nightscout.androidaps.di
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.activities.MyPreferenceFragment
-import info.nightscout.configuration.maintenance.MaintenanceFragment
 
 @Module
 @Suppress("unused")
@@ -11,6 +10,4 @@ abstract class FragmentsModule {
 
     @ContributesAndroidInjector abstract fun contributesPreferencesFragment(): MyPreferenceFragment
 
-    @ContributesAndroidInjector abstract fun contributesMaintenanceFragment(): MaintenanceFragment
-
 }

plugins/configuration/src/main/java/info/nightscout/configuration/di/ConfigurationModule.kt

@@ -8,6 +8,7 @@ import info.nightscout.configuration.configBuilder.ConfigBuilderFragment
 import info.nightscout.configuration.configBuilder.ConfigBuilderPlugin
 import info.nightscout.configuration.configBuilder.RunningConfigurationImpl
 import info.nightscout.configuration.maintenance.ImportExportPrefsImpl
+import info.nightscout.configuration.maintenance.MaintenanceFragment
 import info.nightscout.configuration.maintenance.PrefFileListProviderImpl
 import info.nightscout.configuration.maintenance.activities.PrefImportListActivity
 import info.nightscout.configuration.maintenance.formats.EncryptedPrefsFormat
@@ -25,6 +26,7 @@ import info.nightscout.interfaces.maintenance.PrefFileListProvider
 )
 abstract class ConfigurationModule {
 
+    @ContributesAndroidInjector abstract fun contributesMaintenanceFragment(): MaintenanceFragment
     @ContributesAndroidInjector abstract fun contributesConfigBuilderFragment(): ConfigBuilderFragment
     @ContributesAndroidInjector abstract fun contributesCsvExportWorker(): ImportExportPrefsImpl.CsvExportWorker
     @ContributesAndroidInjector abstract fun contributesPrefImportListActivity(): PrefImportListActivity