From 259f84f3fe25a3fd8303581ff1ca52c4186a04fb Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 26 Sep 2023 12:56:07 +0200 Subject: [PATCH] :plugins:constraints cleanup --- app/src/main/kotlin/app/aaps/MainActivity.kt | 2 +- .../aaps/activities/MyPreferenceFragment.kt | 2 +- .../main/kotlin/app/aaps/di/AppComponent.kt | 2 +- .../kotlin/app/aaps/di/PluginsListModule.kt | 17 ++++++---- .../objectives/objectives/SntpClient.kt | 2 -- .../constraints/ConstraintsCheckerImpl.kt | 2 +- .../bgQualityCheck/BgQualityCheckPlugin.kt | 2 +- .../constraints/di/ObjectivesModule.kt | 32 +++++++++---------- .../di/PluginsConstraintsModule.kt | 8 ++--- .../constraints/dstHelper/DstHelperPlugin.kt | 2 +- .../objectives/ObjectivesFragment.kt | 10 +++--- .../objectives/ObjectivesPlugin.kt | 26 +++++++-------- .../constraints/objectives/SntpClient.kt | 2 +- .../activities/ObjectivesExamDialog.kt | 10 +++--- .../objectives/dialogs/NtpProgressDialog.kt | 2 +- .../events/EventObjectivesUpdateGui.kt | 2 +- .../objectives/objectives/Objective.kt | 2 +- .../objectives/objectives/Objective0.kt | 2 +- .../objectives/objectives/Objective1.kt | 2 +- .../objectives/objectives/Objective10.kt | 2 +- .../objectives/objectives/Objective11.kt | 2 +- .../objectives/objectives/Objective2.kt | 2 +- .../objectives/objectives/Objective3.kt | 2 +- .../objectives/objectives/Objective4.kt | 2 +- .../objectives/objectives/Objective5.kt | 4 +-- .../objectives/objectives/Objective6.kt | 2 +- .../objectives/objectives/Objective7.kt | 2 +- .../objectives/objectives/Objective9.kt | 2 +- .../objectives/objectives/SntpClient.kt | 2 ++ .../phoneChecker/PhoneCheckerPlugin.kt | 2 +- .../constraints/safety/SafetyPlugin.kt | 2 +- .../SignatureVerifierPlugin.kt | 2 +- .../storage/StorageConstraintPlugin.kt | 2 +- .../versionChecker/AllowedVersions.kt | 2 +- .../versionChecker/VersionCheckerPlugin.kt | 2 +- .../versionChecker/VersionCheckerUtilsImpl.kt | 2 +- .../main/res/layout/dialog_ntp_progress.xml | 2 +- .../main/res/layout/objectives_fragment.xml | 2 +- .../constraints/ConstraintsCheckerImplTest.kt | 9 +++--- .../BgQualityCheckPluginTest.kt | 3 +- .../dstHelper/DstHelperPluginTest.kt | 3 +- .../objectives/ObjectivesPluginTest.kt | 5 +-- .../constraints/objectives/SntpClientTest.kt | 3 +- .../constraints/safety/SafetyPluginTest.kt | 3 +- .../SignatureVerifierPluginTest.kt | 2 +- .../VersionCheckerUtilsKtTest.kt | 6 ++-- .../storage/StorageConstraintPluginTest.kt | 3 +- .../versionChecker/AllowedVersionsTest.kt | 4 +-- 48 files changed, 110 insertions(+), 100 deletions(-) delete mode 100644 plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/SntpClient.kt rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/ConstraintsCheckerImpl.kt (99%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt (99%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/di/ObjectivesModule.kt (53%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/di/PluginsConstraintsModule.kt (73%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/dstHelper/DstHelperPlugin.kt (98%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/ObjectivesFragment.kt (97%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/ObjectivesPlugin.kt (87%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/SntpClient.kt (99%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt (93%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt (98%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt (63%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/objectives/Objective.kt (99%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/objectives/Objective0.kt (98%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/objectives/Objective1.kt (97%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/objectives/Objective10.kt (87%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/objectives/Objective11.kt (87%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/objectives/Objective2.kt (99%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/objectives/Objective3.kt (95%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/objectives/Objective4.kt (95%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/objectives/Objective5.kt (89%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/objectives/Objective6.kt (94%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/objectives/Objective7.kt (87%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/objectives/Objective9.kt (87%) create mode 100644 plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/SntpClient.kt rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt (96%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/safety/SafetyPlugin.kt (99%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt (99%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/storage/StorageConstraintPlugin.kt (97%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/versionChecker/AllowedVersions.kt (96%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/versionChecker/VersionCheckerPlugin.kt (98%) rename plugins/constraints/src/main/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt (99%) rename plugins/constraints/src/test/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/ConstraintsCheckerImplTest.kt (98%) rename plugins/constraints/src/test/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt (99%) rename plugins/constraints/src/test/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/dstHelper/DstHelperPluginTest.kt (96%) rename plugins/constraints/src/test/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/ObjectivesPluginTest.kt (94%) rename plugins/constraints/src/test/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/objectives/SntpClientTest.kt (89%) rename plugins/constraints/src/test/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/safety/SafetyPluginTest.kt (99%) rename plugins/constraints/src/test/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt (95%) rename plugins/constraints/src/test/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/signatureVerifier/VersionCheckerUtilsKtTest.kt (98%) rename plugins/constraints/src/test/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/storage/StorageConstraintPluginTest.kt (94%) rename plugins/constraints/src/test/{java/info/nightscout => kotlin/app/aaps}/plugins/constraints/versionChecker/AllowedVersionsTest.kt (96%) diff --git a/app/src/main/kotlin/app/aaps/MainActivity.kt b/app/src/main/kotlin/app/aaps/MainActivity.kt index 96744efb95..c9d420fe8a 100644 --- a/app/src/main/kotlin/app/aaps/MainActivity.kt +++ b/app/src/main/kotlin/app/aaps/MainActivity.kt @@ -70,7 +70,7 @@ import com.joanzapata.iconify.fonts.FontAwesomeModule import info.nightscout.androidaps.BuildConfig import info.nightscout.androidaps.R import info.nightscout.androidaps.databinding.ActivityMainBinding -import info.nightscout.plugins.constraints.signatureVerifier.SignatureVerifierPlugin +import app.aaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin import info.nightscout.ui.activities.ProfileHelperActivity import info.nightscout.ui.activities.StatsActivity import info.nightscout.ui.activities.TreatmentsActivity diff --git a/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt b/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt index c71b7eda1f..65517d989a 100644 --- a/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt +++ b/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt @@ -48,7 +48,7 @@ import info.nightscout.androidaps.plugins.pump.eopatch.EopatchPumpPlugin import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin import info.nightscout.insulin.InsulinOrefFreePeakPlugin -import info.nightscout.plugins.constraints.safety.SafetyPlugin +import app.aaps.plugins.constraints.safety.SafetyPlugin import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin import info.nightscout.plugins.general.wear.WearPlugin import info.nightscout.plugins.sync.nsclient.NSClientPlugin diff --git a/app/src/main/kotlin/app/aaps/di/AppComponent.kt b/app/src/main/kotlin/app/aaps/di/AppComponent.kt index 4971b924a5..527064379f 100644 --- a/app/src/main/kotlin/app/aaps/di/AppComponent.kt +++ b/app/src/main/kotlin/app/aaps/di/AppComponent.kt @@ -22,7 +22,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.di.OmnipodDashModule import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule import info.nightscout.database.impl.DatabaseModule import info.nightscout.insulin.di.InsulinModule -import info.nightscout.plugins.constraints.di.PluginsConstraintsModule +import app.aaps.plugins.constraints.di.PluginsConstraintsModule import info.nightscout.plugins.di.PluginsModule import info.nightscout.plugins.sync.di.OpenHumansModule import info.nightscout.plugins.sync.di.SyncModule diff --git a/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt b/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt index a89810a1a5..f4bc792f53 100644 --- a/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt +++ b/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt @@ -25,10 +25,13 @@ import info.nightscout.insulin.InsulinLyumjevPlugin import info.nightscout.insulin.InsulinOrefFreePeakPlugin import info.nightscout.insulin.InsulinOrefRapidActingPlugin import info.nightscout.insulin.InsulinOrefUltraRapidActingPlugin -import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin -import info.nightscout.plugins.constraints.objectives.ObjectivesPlugin -import info.nightscout.plugins.constraints.safety.SafetyPlugin -import info.nightscout.plugins.constraints.signatureVerifier.SignatureVerifierPlugin +import app.aaps.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin +import app.aaps.plugins.constraints.dstHelper.DstHelperPlugin +import app.aaps.plugins.constraints.objectives.ObjectivesPlugin +import app.aaps.plugins.constraints.safety.SafetyPlugin +import app.aaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin +import app.aaps.plugins.constraints.storage.StorageConstraintPlugin +import app.aaps.plugins.constraints.versionChecker.VersionCheckerPlugin import info.nightscout.plugins.general.actions.ActionsPlugin import info.nightscout.plugins.general.food.FoodPlugin import info.nightscout.plugins.general.overview.OverviewPlugin @@ -274,7 +277,7 @@ abstract class PluginsListModule { @NotNSClient @IntoMap @IntKey(270) - abstract fun bindVersionCheckerPlugin(plugin: info.nightscout.plugins.constraints.versionChecker.VersionCheckerPlugin): PluginBase + abstract fun bindVersionCheckerPlugin(plugin: VersionCheckerPlugin): PluginBase @Binds @NotNSClient @@ -286,7 +289,7 @@ abstract class PluginsListModule { @APS @IntoMap @IntKey(290) - abstract fun bindStorageConstraintPlugin(plugin: info.nightscout.plugins.constraints.storage.StorageConstraintPlugin): PluginBase + abstract fun bindStorageConstraintPlugin(plugin: StorageConstraintPlugin): PluginBase @Binds @APS @@ -358,7 +361,7 @@ abstract class PluginsListModule { @AllConfigs @IntoMap @IntKey(380) - abstract fun bindDstHelperPlugin(plugin: info.nightscout.plugins.constraints.dstHelper.DstHelperPlugin): PluginBase + abstract fun bindDstHelperPlugin(plugin: DstHelperPlugin): PluginBase @Binds @AllConfigs diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/SntpClient.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/SntpClient.kt deleted file mode 100644 index 635720be75..0000000000 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/SntpClient.kt +++ /dev/null @@ -1,2 +0,0 @@ -package info.nightscout.plugins.constraints.objectives.objectives - diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/ConstraintsCheckerImpl.kt similarity index 99% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/ConstraintsCheckerImpl.kt index 7e84b9b4d9..331c6812da 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/ConstraintsCheckerImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints +package app.aaps.plugins.constraints import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.interfaces.constraints.Constraint diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt similarity index 99% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt index 961de52165..bd77df8941 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.bgQualityCheck +package app.aaps.plugins.constraints.bgQualityCheck import androidx.annotation.DrawableRes import app.aaps.core.main.utils.fabric.FabricPrivacy diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/ObjectivesModule.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/di/ObjectivesModule.kt similarity index 53% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/ObjectivesModule.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/di/ObjectivesModule.kt index 898f8a5151..f44ca172e9 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/ObjectivesModule.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/di/ObjectivesModule.kt @@ -1,22 +1,22 @@ -package info.nightscout.plugins.constraints.di +package app.aaps.plugins.constraints.di import dagger.Module import dagger.android.ContributesAndroidInjector -import info.nightscout.plugins.constraints.objectives.ObjectivesFragment -import info.nightscout.plugins.constraints.objectives.activities.ObjectivesExamDialog -import info.nightscout.plugins.constraints.objectives.dialogs.NtpProgressDialog -import info.nightscout.plugins.constraints.objectives.objectives.Objective -import info.nightscout.plugins.constraints.objectives.objectives.Objective0 -import info.nightscout.plugins.constraints.objectives.objectives.Objective1 -import info.nightscout.plugins.constraints.objectives.objectives.Objective10 -import info.nightscout.plugins.constraints.objectives.objectives.Objective11 -import info.nightscout.plugins.constraints.objectives.objectives.Objective2 -import info.nightscout.plugins.constraints.objectives.objectives.Objective3 -import info.nightscout.plugins.constraints.objectives.objectives.Objective4 -import info.nightscout.plugins.constraints.objectives.objectives.Objective5 -import info.nightscout.plugins.constraints.objectives.objectives.Objective6 -import info.nightscout.plugins.constraints.objectives.objectives.Objective7 -import info.nightscout.plugins.constraints.objectives.objectives.Objective9 +import app.aaps.plugins.constraints.objectives.ObjectivesFragment +import app.aaps.plugins.constraints.objectives.activities.ObjectivesExamDialog +import app.aaps.plugins.constraints.objectives.dialogs.NtpProgressDialog +import app.aaps.plugins.constraints.objectives.objectives.Objective +import app.aaps.plugins.constraints.objectives.objectives.Objective0 +import app.aaps.plugins.constraints.objectives.objectives.Objective1 +import app.aaps.plugins.constraints.objectives.objectives.Objective10 +import app.aaps.plugins.constraints.objectives.objectives.Objective11 +import app.aaps.plugins.constraints.objectives.objectives.Objective2 +import app.aaps.plugins.constraints.objectives.objectives.Objective3 +import app.aaps.plugins.constraints.objectives.objectives.Objective4 +import app.aaps.plugins.constraints.objectives.objectives.Objective5 +import app.aaps.plugins.constraints.objectives.objectives.Objective6 +import app.aaps.plugins.constraints.objectives.objectives.Objective7 +import app.aaps.plugins.constraints.objectives.objectives.Objective9 @Module @Suppress("unused") diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/di/PluginsConstraintsModule.kt similarity index 73% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/di/PluginsConstraintsModule.kt index 251f4a4464..2893e33526 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/di/PluginsConstraintsModule.kt @@ -1,13 +1,13 @@ -package info.nightscout.plugins.constraints.di +package app.aaps.plugins.constraints.di import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils import dagger.Binds import dagger.Module -import info.nightscout.plugins.constraints.ConstraintsCheckerImpl -import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin -import info.nightscout.plugins.constraints.versionChecker.VersionCheckerUtilsImpl +import app.aaps.plugins.constraints.ConstraintsCheckerImpl +import app.aaps.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin +import app.aaps.plugins.constraints.versionChecker.VersionCheckerUtilsImpl @Module( includes = [ diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/dstHelper/DstHelperPlugin.kt similarity index 98% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/dstHelper/DstHelperPlugin.kt index d502fc91c2..03f272b393 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/dstHelper/DstHelperPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.dstHelper +package app.aaps.plugins.constraints.dstHelper import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.constraints.Constraint diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesFragment.kt similarity index 97% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesFragment.kt index 2ff18f015c..333e03528a 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesFragment.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives +package app.aaps.plugins.constraints.objectives import android.annotation.SuppressLint import android.graphics.Typeface @@ -36,10 +36,10 @@ import dagger.android.support.DaggerFragment 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 app.aaps.plugins.constraints.objectives.activities.ObjectivesExamDialog +import app.aaps.plugins.constraints.objectives.dialogs.NtpProgressDialog +import app.aaps.plugins.constraints.objectives.events.EventObjectivesUpdateGui +import app.aaps.plugins.constraints.objectives.objectives.Objective.ExamTask import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesPlugin.kt similarity index 87% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesPlugin.kt index 3e058cb88c..30865eb712 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives +package app.aaps.plugins.constraints.objectives import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.constraints.Constraint @@ -20,18 +20,18 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.HasAndroidInjector 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 -import info.nightscout.plugins.constraints.objectives.objectives.Objective10 -import info.nightscout.plugins.constraints.objectives.objectives.Objective11 -import info.nightscout.plugins.constraints.objectives.objectives.Objective2 -import info.nightscout.plugins.constraints.objectives.objectives.Objective3 -import info.nightscout.plugins.constraints.objectives.objectives.Objective4 -import info.nightscout.plugins.constraints.objectives.objectives.Objective5 -import info.nightscout.plugins.constraints.objectives.objectives.Objective6 -import info.nightscout.plugins.constraints.objectives.objectives.Objective7 -import info.nightscout.plugins.constraints.objectives.objectives.Objective9 +import app.aaps.plugins.constraints.objectives.objectives.Objective +import app.aaps.plugins.constraints.objectives.objectives.Objective0 +import app.aaps.plugins.constraints.objectives.objectives.Objective1 +import app.aaps.plugins.constraints.objectives.objectives.Objective10 +import app.aaps.plugins.constraints.objectives.objectives.Objective11 +import app.aaps.plugins.constraints.objectives.objectives.Objective2 +import app.aaps.plugins.constraints.objectives.objectives.Objective3 +import app.aaps.plugins.constraints.objectives.objectives.Objective4 +import app.aaps.plugins.constraints.objectives.objectives.Objective5 +import app.aaps.plugins.constraints.objectives.objectives.Objective6 +import app.aaps.plugins.constraints.objectives.objectives.Objective7 +import app.aaps.plugins.constraints.objectives.objectives.Objective9 import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/SntpClient.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/SntpClient.kt similarity index 99% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/SntpClient.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/SntpClient.kt index b8abcafb34..2b39f80d34 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/SntpClient.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/SntpClient.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives +package app.aaps.plugins.constraints.objectives import android.os.SystemClock import app.aaps.core.interfaces.logging.AAPSLogger diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt similarity index 93% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt index 8e7c451e01..d8055d9908 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives.activities +package app.aaps.plugins.constraints.objectives.activities import android.os.Bundle import android.view.LayoutInflater @@ -12,10 +12,10 @@ import dagger.android.support.DaggerDialogFragment import app.aaps.core.ui.toast.ToastUtils 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 app.aaps.plugins.constraints.objectives.events.EventObjectivesUpdateGui +import app.aaps.plugins.constraints.objectives.objectives.Objective +import app.aaps.plugins.constraints.objectives.objectives.Objective.ExamTask +import app.aaps.plugins.constraints.objectives.objectives.Objective.Option import javax.inject.Inject class ObjectivesExamDialog : DaggerDialogFragment() { diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt similarity index 98% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt index c86be2321a..37fd6367b6 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives.dialogs +package app.aaps.plugins.constraints.objectives.dialogs import android.os.Bundle import android.os.SystemClock diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt similarity index 63% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt index 4108467b05..df12cb05f3 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives.events +package app.aaps.plugins.constraints.objectives.events import app.aaps.core.interfaces.rx.events.EventUpdateGui diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective.kt similarity index 99% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective.kt index 600d0f975a..0cfda1c065 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives.objectives +package app.aaps.plugins.constraints.objectives.objectives import android.content.Context import android.text.util.Linkify diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective0.kt similarity index 98% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective0.kt index e487400646..3a0fdd1ee6 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective0.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives.objectives +package app.aaps.plugins.constraints.objectives.objectives import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.db.PersistenceLayer diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective1.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective1.kt similarity index 97% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective1.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective1.kt index def521e4a9..538ab68159 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective1.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective1.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives.objectives +package app.aaps.plugins.constraints.objectives.objectives import app.aaps.core.interfaces.actions.Actions import app.aaps.core.interfaces.plugin.ActivePlugin diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective10.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective10.kt similarity index 87% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective10.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective10.kt index 3636ecbb55..351e892b2d 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective10.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective10.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives.objectives +package app.aaps.plugins.constraints.objectives.objectives import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective11.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective11.kt similarity index 87% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective11.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective11.kt index c5f514506a..d4b69aa31c 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective11.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective11.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives.objectives +package app.aaps.plugins.constraints.objectives.objectives import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective2.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective2.kt similarity index 99% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective2.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective2.kt index 634f5761f4..d2a4cc9b11 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective2.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective2.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives.objectives +package app.aaps.plugins.constraints.objectives.objectives import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective3.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective3.kt similarity index 95% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective3.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective3.kt index 33faedadfb..624ac67c9f 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective3.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective3.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives.objectives +package app.aaps.plugins.constraints.objectives.objectives import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.utils.T diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective4.kt similarity index 95% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective4.kt index ad7bdf86aa..601c4b187f 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective4.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives.objectives +package app.aaps.plugins.constraints.objectives.objectives import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.interfaces.constraints.PluginConstraints diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective5.kt similarity index 89% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective5.kt index 8e66cf7d04..5cf2bc827b 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective5.kt @@ -1,11 +1,11 @@ -package info.nightscout.plugins.constraints.objectives.objectives +package app.aaps.plugins.constraints.objectives.objectives import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R -import info.nightscout.plugins.constraints.safety.SafetyPlugin +import app.aaps.plugins.constraints.safety.SafetyPlugin import javax.inject.Inject @Suppress("SpellCheckingInspection") diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective6.kt similarity index 94% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective6.kt index f69eed7f63..306cf0cd73 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective6.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives.objectives +package app.aaps.plugins.constraints.objectives.objectives import app.aaps.core.interfaces.aps.ApsMode import app.aaps.core.interfaces.constraints.ConstraintsChecker diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective7.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective7.kt similarity index 87% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective7.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective7.kt index 6fcabafacb..455aff0d2c 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective7.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective7.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives.objectives +package app.aaps.plugins.constraints.objectives.objectives import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective9.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective9.kt similarity index 87% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective9.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective9.kt index bfcaf443bb..5adcf3cbba 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective9.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective9.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.objectives.objectives +package app.aaps.plugins.constraints.objectives.objectives import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector diff --git a/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/SntpClient.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/SntpClient.kt new file mode 100644 index 0000000000..e3e29b6b3f --- /dev/null +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/SntpClient.kt @@ -0,0 +1,2 @@ +package app.aaps.plugins.constraints.objectives.objectives + diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt similarity index 96% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt index ebcbb45d04..0e39c35e71 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.phoneChecker +package app.aaps.plugins.constraints.phoneChecker import android.content.Context import android.os.Build diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/safety/SafetyPlugin.kt similarity index 99% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/safety/SafetyPlugin.kt index aa2c3df943..4edd033796 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/safety/SafetyPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.safety +package app.aaps.plugins.constraints.safety import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.utils.extensions.putDouble diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt similarity index 99% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt index 416f007190..f5595de5cb 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.signatureVerifier +package app.aaps.plugins.constraints.signatureVerifier import android.content.Context import android.content.pm.PackageManager diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/storage/StorageConstraintPlugin.kt similarity index 97% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/storage/StorageConstraintPlugin.kt index 7a1bab0a5e..4f1814b42a 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/storage/StorageConstraintPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.storage +package app.aaps.plugins.constraints.storage import android.os.Environment import android.os.StatFs diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersions.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/AllowedVersions.kt similarity index 96% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersions.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/AllowedVersions.kt index 1491168093..de331c6bd5 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersions.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/AllowedVersions.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.versionChecker +package app.aaps.plugins.constraints.versionChecker import org.joda.time.LocalDate import org.json.JSONArray diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt similarity index 98% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt index da48a3e034..896021d51b 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.versionChecker +package app.aaps.plugins.constraints.versionChecker import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.constraints.Constraint diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt similarity index 99% rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt rename to plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt index 01155ce2db..c8a285338b 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.constraints.versionChecker +package app.aaps.plugins.constraints.versionChecker import android.os.Build import app.aaps.core.interfaces.configuration.Config diff --git a/plugins/constraints/src/main/res/layout/dialog_ntp_progress.xml b/plugins/constraints/src/main/res/layout/dialog_ntp_progress.xml index 34a8db1d5b..5341a85a72 100644 --- a/plugins/constraints/src/main/res/layout/dialog_ntp_progress.xml +++ b/plugins/constraints/src/main/res/layout/dialog_ntp_progress.xml @@ -4,7 +4,7 @@ style="@style/StyleDialog" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="info.nightscout.plugins.constraints.objectives.dialogs.NtpProgressDialog"> + tools:context="info.nightscout.plugins.constraints.app.aaps.plugins.constraints.objectives.dialogs.NtpProgressDialog"> + tools:context="info.nightscout.plugins.constraints.app.aaps.plugins.constraints.objectives.ObjectivesFragment">