caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:plugins:constraints cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-26 12:56:07 +02:00
parent 9c6030ce0b
commit 259f84f3fe
48 changed files with 110 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/app/aaps/MainActivity.kt
View file

@ -70,7 +70,7 @@ import com.joanzapata.iconify.fonts.FontAwesomeModule
import info.nightscout.androidaps.BuildConfig import info.nightscout.androidaps.BuildConfig
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.androidaps.databinding.ActivityMainBinding 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.ProfileHelperActivity
import info.nightscout.ui.activities.StatsActivity import info.nightscout.ui.activities.StatsActivity
import info.nightscout.ui.activities.TreatmentsActivity import info.nightscout.ui.activities.TreatmentsActivity

2
app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt
View file

@ -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.insight.LocalInsightPlugin
import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
import info.nightscout.insulin.InsulinOrefFreePeakPlugin 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.smsCommunicator.SmsCommunicatorPlugin
import info.nightscout.plugins.general.wear.WearPlugin import info.nightscout.plugins.general.wear.WearPlugin
import info.nightscout.plugins.sync.nsclient.NSClientPlugin import info.nightscout.plugins.sync.nsclient.NSClientPlugin

2
app/src/main/kotlin/app/aaps/di/AppComponent.kt
View file

@ -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.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule
import info.nightscout.database.impl.DatabaseModule import info.nightscout.database.impl.DatabaseModule
import info.nightscout.insulin.di.InsulinModule 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.di.PluginsModule
import info.nightscout.plugins.sync.di.OpenHumansModule import info.nightscout.plugins.sync.di.OpenHumansModule
import info.nightscout.plugins.sync.di.SyncModule import info.nightscout.plugins.sync.di.SyncModule

17
app/src/main/kotlin/app/aaps/di/PluginsListModule.kt
View file

@ -25,10 +25,13 @@ import info.nightscout.insulin.InsulinLyumjevPlugin
import info.nightscout.insulin.InsulinOrefFreePeakPlugin import info.nightscout.insulin.InsulinOrefFreePeakPlugin
import info.nightscout.insulin.InsulinOrefRapidActingPlugin import info.nightscout.insulin.InsulinOrefRapidActingPlugin
import info.nightscout.insulin.InsulinOrefUltraRapidActingPlugin import info.nightscout.insulin.InsulinOrefUltraRapidActingPlugin
import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin import app.aaps.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
import info.nightscout.plugins.constraints.objectives.ObjectivesPlugin import app.aaps.plugins.constraints.dstHelper.DstHelperPlugin
import info.nightscout.plugins.constraints.safety.SafetyPlugin import app.aaps.plugins.constraints.objectives.ObjectivesPlugin
import info.nightscout.plugins.constraints.signatureVerifier.SignatureVerifierPlugin 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.actions.ActionsPlugin
import info.nightscout.plugins.general.food.FoodPlugin import info.nightscout.plugins.general.food.FoodPlugin
import info.nightscout.plugins.general.overview.OverviewPlugin import info.nightscout.plugins.general.overview.OverviewPlugin
@ -274,7 +277,7 @@ abstract class PluginsListModule {
@NotNSClient @NotNSClient
@IntoMap @IntoMap
@IntKey(270) @IntKey(270)
abstract fun bindVersionCheckerPlugin(plugin: info.nightscout.plugins.constraints.versionChecker.VersionCheckerPlugin): PluginBase abstract fun bindVersionCheckerPlugin(plugin: VersionCheckerPlugin): PluginBase
@Binds @Binds
@NotNSClient @NotNSClient
@ -286,7 +289,7 @@ abstract class PluginsListModule {
@APS @APS
@IntoMap @IntoMap
@IntKey(290) @IntKey(290)
abstract fun bindStorageConstraintPlugin(plugin: info.nightscout.plugins.constraints.storage.StorageConstraintPlugin): PluginBase abstract fun bindStorageConstraintPlugin(plugin: StorageConstraintPlugin): PluginBase
@Binds @Binds
@APS @APS
@ -358,7 +361,7 @@ abstract class PluginsListModule {
@AllConfigs @AllConfigs
@IntoMap @IntoMap
@IntKey(380) @IntKey(380)
abstract fun bindDstHelperPlugin(plugin: info.nightscout.plugins.constraints.dstHelper.DstHelperPlugin): PluginBase abstract fun bindDstHelperPlugin(plugin: DstHelperPlugin): PluginBase
@Binds @Binds
@AllConfigs @AllConfigs

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/SntpClient.kt
View file

@ -1,2 +0,0 @@
package info.nightscout.plugins.constraints.objectives.objectives

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/ConstraintsCheckerImpl.kt
View file

@ -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.main.constraints.ConstraintObject
import app.aaps.core.interfaces.constraints.Constraint import app.aaps.core.interfaces.constraints.Constraint

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.bgQualityCheck package app.aaps.plugins.constraints.bgQualityCheck
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.utils.fabric.FabricPrivacy

32
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/ObjectivesModule.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/di/ObjectivesModule.kt
View file

@ -1,22 +1,22 @@
package info.nightscout.plugins.constraints.di package app.aaps.plugins.constraints.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector
import info.nightscout.plugins.constraints.objectives.ObjectivesFragment import app.aaps.plugins.constraints.objectives.ObjectivesFragment
import info.nightscout.plugins.constraints.objectives.activities.ObjectivesExamDialog import app.aaps.plugins.constraints.objectives.activities.ObjectivesExamDialog
import info.nightscout.plugins.constraints.objectives.dialogs.NtpProgressDialog import app.aaps.plugins.constraints.objectives.dialogs.NtpProgressDialog
import info.nightscout.plugins.constraints.objectives.objectives.Objective import app.aaps.plugins.constraints.objectives.objectives.Objective
import info.nightscout.plugins.constraints.objectives.objectives.Objective0 import app.aaps.plugins.constraints.objectives.objectives.Objective0
import info.nightscout.plugins.constraints.objectives.objectives.Objective1 import app.aaps.plugins.constraints.objectives.objectives.Objective1
import info.nightscout.plugins.constraints.objectives.objectives.Objective10 import app.aaps.plugins.constraints.objectives.objectives.Objective10
import info.nightscout.plugins.constraints.objectives.objectives.Objective11 import app.aaps.plugins.constraints.objectives.objectives.Objective11
import info.nightscout.plugins.constraints.objectives.objectives.Objective2 import app.aaps.plugins.constraints.objectives.objectives.Objective2
import info.nightscout.plugins.constraints.objectives.objectives.Objective3 import app.aaps.plugins.constraints.objectives.objectives.Objective3
import info.nightscout.plugins.constraints.objectives.objectives.Objective4 import app.aaps.plugins.constraints.objectives.objectives.Objective4
import info.nightscout.plugins.constraints.objectives.objectives.Objective5 import app.aaps.plugins.constraints.objectives.objectives.Objective5
import info.nightscout.plugins.constraints.objectives.objectives.Objective6 import app.aaps.plugins.constraints.objectives.objectives.Objective6
import info.nightscout.plugins.constraints.objectives.objectives.Objective7 import app.aaps.plugins.constraints.objectives.objectives.Objective7
import info.nightscout.plugins.constraints.objectives.objectives.Objective9 import app.aaps.plugins.constraints.objectives.objectives.Objective9
@Module @Module
@Suppress("unused") @Suppress("unused")

8
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/di/PluginsConstraintsModule.kt
View file

@ -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.bgQualityCheck.BgQualityCheck
import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.constraints.ConstraintsChecker
import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
import info.nightscout.plugins.constraints.ConstraintsCheckerImpl import app.aaps.plugins.constraints.ConstraintsCheckerImpl
import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin import app.aaps.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
import info.nightscout.plugins.constraints.versionChecker.VersionCheckerUtilsImpl import app.aaps.plugins.constraints.versionChecker.VersionCheckerUtilsImpl
@Module( @Module(
includes = [ includes = [

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/dstHelper/DstHelperPlugin.kt
View file

@ -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.aps.Loop
import app.aaps.core.interfaces.constraints.Constraint import app.aaps.core.interfaces.constraints.Constraint

10
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.objectives package app.aaps.plugins.constraints.objectives
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.graphics.Typeface import android.graphics.Typeface
@ -36,10 +36,10 @@ import dagger.android.support.DaggerFragment
import info.nightscout.plugins.constraints.R import info.nightscout.plugins.constraints.R
import info.nightscout.plugins.constraints.databinding.ObjectivesFragmentBinding import info.nightscout.plugins.constraints.databinding.ObjectivesFragmentBinding
import info.nightscout.plugins.constraints.databinding.ObjectivesItemBinding import info.nightscout.plugins.constraints.databinding.ObjectivesItemBinding
import info.nightscout.plugins.constraints.objectives.activities.ObjectivesExamDialog import app.aaps.plugins.constraints.objectives.activities.ObjectivesExamDialog
import info.nightscout.plugins.constraints.objectives.dialogs.NtpProgressDialog import app.aaps.plugins.constraints.objectives.dialogs.NtpProgressDialog
import info.nightscout.plugins.constraints.objectives.events.EventObjectivesUpdateGui import app.aaps.plugins.constraints.objectives.events.EventObjectivesUpdateGui
import info.nightscout.plugins.constraints.objectives.objectives.Objective.ExamTask import app.aaps.plugins.constraints.objectives.objectives.Objective.ExamTask
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject import javax.inject.Inject

26
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesPlugin.kt
View file

@ -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.configuration.Config
import app.aaps.core.interfaces.constraints.Constraint 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 app.aaps.core.interfaces.sharedPreferences.SP
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R import info.nightscout.plugins.constraints.R
import info.nightscout.plugins.constraints.objectives.objectives.Objective import app.aaps.plugins.constraints.objectives.objectives.Objective
import info.nightscout.plugins.constraints.objectives.objectives.Objective0 import app.aaps.plugins.constraints.objectives.objectives.Objective0
import info.nightscout.plugins.constraints.objectives.objectives.Objective1 import app.aaps.plugins.constraints.objectives.objectives.Objective1
import info.nightscout.plugins.constraints.objectives.objectives.Objective10 import app.aaps.plugins.constraints.objectives.objectives.Objective10
import info.nightscout.plugins.constraints.objectives.objectives.Objective11 import app.aaps.plugins.constraints.objectives.objectives.Objective11
import info.nightscout.plugins.constraints.objectives.objectives.Objective2 import app.aaps.plugins.constraints.objectives.objectives.Objective2
import info.nightscout.plugins.constraints.objectives.objectives.Objective3 import app.aaps.plugins.constraints.objectives.objectives.Objective3
import info.nightscout.plugins.constraints.objectives.objectives.Objective4 import app.aaps.plugins.constraints.objectives.objectives.Objective4
import info.nightscout.plugins.constraints.objectives.objectives.Objective5 import app.aaps.plugins.constraints.objectives.objectives.Objective5
import info.nightscout.plugins.constraints.objectives.objectives.Objective6 import app.aaps.plugins.constraints.objectives.objectives.Objective6
import info.nightscout.plugins.constraints.objectives.objectives.Objective7 import app.aaps.plugins.constraints.objectives.objectives.Objective7
import info.nightscout.plugins.constraints.objectives.objectives.Objective9 import app.aaps.plugins.constraints.objectives.objectives.Objective9
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/SntpClient.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/SntpClient.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.objectives package app.aaps.plugins.constraints.objectives
import android.os.SystemClock import android.os.SystemClock
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger

10
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.objectives.activities package app.aaps.plugins.constraints.objectives.activities
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
@ -12,10 +12,10 @@ import dagger.android.support.DaggerDialogFragment
import app.aaps.core.ui.toast.ToastUtils import app.aaps.core.ui.toast.ToastUtils
import info.nightscout.plugins.constraints.R import info.nightscout.plugins.constraints.R
import info.nightscout.plugins.constraints.databinding.ObjectivesExamFragmentBinding import info.nightscout.plugins.constraints.databinding.ObjectivesExamFragmentBinding
import info.nightscout.plugins.constraints.objectives.events.EventObjectivesUpdateGui import app.aaps.plugins.constraints.objectives.events.EventObjectivesUpdateGui
import info.nightscout.plugins.constraints.objectives.objectives.Objective import app.aaps.plugins.constraints.objectives.objectives.Objective
import info.nightscout.plugins.constraints.objectives.objectives.Objective.ExamTask import app.aaps.plugins.constraints.objectives.objectives.Objective.ExamTask
import info.nightscout.plugins.constraints.objectives.objectives.Objective.Option import app.aaps.plugins.constraints.objectives.objectives.Objective.Option
import javax.inject.Inject import javax.inject.Inject
class ObjectivesExamDialog : DaggerDialogFragment() { class ObjectivesExamDialog : DaggerDialogFragment() {

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt
View file

@ -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.Bundle
import android.os.SystemClock import android.os.SystemClock

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt
View file

@ -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 import app.aaps.core.interfaces.rx.events.EventUpdateGui

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.objectives.objectives package app.aaps.plugins.constraints.objectives.objectives
import android.content.Context import android.content.Context
import android.text.util.Linkify import android.text.util.Linkify

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective0.kt
View file

@ -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.aps.Loop
import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.db.PersistenceLayer

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective1.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective1.kt
View file

@ -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.actions.Actions
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective10.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective10.kt
View file

@ -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 app.aaps.core.interfaces.utils.T
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective11.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective11.kt
View file

@ -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 app.aaps.core.interfaces.utils.T
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective2.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective2.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.objectives.objectives package app.aaps.plugins.constraints.objectives.objectives
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R import info.nightscout.plugins.constraints.R

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective3.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective3.kt
View file

@ -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.plugin.ActivePlugin
import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.T

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective4.kt
View file

@ -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.main.constraints.ConstraintObject
import app.aaps.core.interfaces.constraints.PluginConstraints import app.aaps.core.interfaces.constraints.PluginConstraints

4
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective5.kt
View file

@ -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.main.constraints.ConstraintObject
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.T
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R import info.nightscout.plugins.constraints.R
import info.nightscout.plugins.constraints.safety.SafetyPlugin import app.aaps.plugins.constraints.safety.SafetyPlugin
import javax.inject.Inject import javax.inject.Inject
@Suppress("SpellCheckingInspection") @Suppress("SpellCheckingInspection")

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective6.kt
View file

@ -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.aps.ApsMode
import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.constraints.ConstraintsChecker

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective7.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective7.kt
View file

@ -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 app.aaps.core.interfaces.utils.T
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective9.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective9.kt
View file

@ -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 app.aaps.core.interfaces.utils.T
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector

2
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/SntpClient.kt Normal file
View file

@ -0,0 +1,2 @@
package app.aaps.plugins.constraints.objectives.objectives

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.phoneChecker package app.aaps.plugins.constraints.phoneChecker
import android.content.Context import android.content.Context
import android.os.Build import android.os.Build

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/safety/SafetyPlugin.kt
View file

@ -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.constraints.ConstraintObject
import app.aaps.core.main.utils.extensions.putDouble import app.aaps.core.main.utils.extensions.putDouble

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.signatureVerifier package app.aaps.plugins.constraints.signatureVerifier
import android.content.Context import android.content.Context
import android.content.pm.PackageManager import android.content.pm.PackageManager

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/storage/StorageConstraintPlugin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.storage package app.aaps.plugins.constraints.storage
import android.os.Environment import android.os.Environment
import android.os.StatFs import android.os.StatFs

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersions.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/AllowedVersions.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.versionChecker package app.aaps.plugins.constraints.versionChecker
import org.joda.time.LocalDate import org.joda.time.LocalDate
import org.json.JSONArray import org.json.JSONArray

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt
View file

@ -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.configuration.Config
import app.aaps.core.interfaces.constraints.Constraint import app.aaps.core.interfaces.constraints.Constraint

2
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt → plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.versionChecker package app.aaps.plugins.constraints.versionChecker
import android.os.Build import android.os.Build
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config

2
plugins/constraints/src/main/res/layout/dialog_ntp_progress.xml
View file

@ -4,7 +4,7 @@
style="@style/StyleDialog" style="@style/StyleDialog"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="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">
<RelativeLayout <RelativeLayout
style="@style/StyleDialogHeader" style="@style/StyleDialogHeader"

2
plugins/constraints/src/main/res/layout/objectives_fragment.xml
View file

@ -3,7 +3,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
tools:context="info.nightscout.plugins.constraints.objectives.ObjectivesFragment"> tools:context="info.nightscout.plugins.constraints.app.aaps.plugins.constraints.objectives.ObjectivesFragment">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

9
plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt → plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/ConstraintsCheckerImplTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints package app.aaps.plugins.constraints
import app.aaps.core.interfaces.aps.ApsMode import app.aaps.core.interfaces.aps.ApsMode
import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck
@ -21,6 +21,7 @@ import app.aaps.implementation.iob.GlucoseStatusProviderImpl
import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
import app.aaps.plugins.constraints.ConstraintsCheckerImpl
import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
@ -31,9 +32,9 @@ import info.nightscout.androidaps.insight.database.InsightDatabaseDao
import info.nightscout.androidaps.insight.database.InsightDbHelper import info.nightscout.androidaps.insight.database.InsightDbHelper
import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.plugins.constraints.objectives.ObjectivesPlugin import app.aaps.plugins.constraints.objectives.ObjectivesPlugin
import info.nightscout.plugins.constraints.objectives.objectives.Objective import app.aaps.plugins.constraints.objectives.objectives.Objective
import info.nightscout.plugins.constraints.safety.SafetyPlugin import app.aaps.plugins.constraints.safety.SafetyPlugin
import info.nightscout.pump.combo.ComboPlugin import info.nightscout.pump.combo.ComboPlugin
import info.nightscout.pump.combo.ruffyscripter.RuffyScripter import info.nightscout.pump.combo.ruffyscripter.RuffyScripter
import info.nightscout.pump.dana.DanaPump import info.nightscout.pump.dana.DanaPump

3
plugins/constraints/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt → plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.bgQualityCheck package app.aaps.plugins.constraints.bgQualityCheck
import app.aaps.core.interfaces.aps.AutosensDataStore import app.aaps.core.interfaces.aps.AutosensDataStore
import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck
@ -11,6 +11,7 @@ import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.database.entities.GlucoseValue import app.aaps.database.entities.GlucoseValue
import app.aaps.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector

3
plugins/constraints/src/test/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPluginTest.kt → plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/dstHelper/DstHelperPluginTest.kt
View file

@ -1,9 +1,10 @@
package info.nightscout.plugins.constraints.dstHelper package app.aaps.plugins.constraints.dstHelper
import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.aps.Loop
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.plugins.constraints.dstHelper.DstHelperPlugin
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector

5
plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt → plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.objectives package app.aaps.plugins.constraints.objectives
import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
@ -7,12 +7,13 @@ import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.plugins.constraints.objectives.ObjectivesPlugin
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R import info.nightscout.plugins.constraints.R
import info.nightscout.plugins.constraints.objectives.objectives.Objective import app.aaps.plugins.constraints.objectives.objectives.Objective
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.mockito.Mock import org.mockito.Mock

3
plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/SntpClientTest.kt → plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/objectives/SntpClientTest.kt
View file

@ -1,6 +1,7 @@
package info.nightscout.plugins.constraints.objectives package app.aaps.plugins.constraints.objectives
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.plugins.constraints.objectives.SntpClient
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test

3
plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt → plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/safety/SafetyPluginTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.safety package app.aaps.plugins.constraints.safety
import app.aaps.core.interfaces.aps.ApsMode import app.aaps.core.interfaces.aps.ApsMode
import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck
@ -14,6 +14,7 @@ import app.aaps.core.interfaces.utils.HardLimits
import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import app.aaps.plugins.constraints.safety.SafetyPlugin
import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector

2
plugins/constraints/src/test/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt → plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.signatureVerifier package app.aaps.plugins.constraints.signatureVerifier
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat

6
plugins/constraints/src/test/java/info/nightscout/plugins/constraints/signatureVerifier/VersionCheckerUtilsKtTest.kt → plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/signatureVerifier/VersionCheckerUtilsKtTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.constraints.signatureVerifier package app.aaps.plugins.constraints.signatureVerifier
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.receivers.ReceiverStatusStore import app.aaps.core.interfaces.receivers.ReceiverStatusStore
@ -10,8 +10,8 @@ import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.Lazy import dagger.Lazy
import info.nightscout.plugins.constraints.versionChecker.VersionCheckerUtilsImpl import app.aaps.plugins.constraints.versionChecker.VersionCheckerUtilsImpl
import info.nightscout.plugins.constraints.versionChecker.numericVersionPart import app.aaps.plugins.constraints.versionChecker.numericVersionPart
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.mockito.ArgumentMatchers.anyInt import org.mockito.ArgumentMatchers.anyInt

3
plugins/constraints/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt → plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/storage/StorageConstraintPluginTest.kt
View file

@ -1,9 +1,10 @@
package info.nightscout.plugins.constraints.storage package app.aaps.plugins.constraints.storage
import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.plugins.constraints.storage.StorageConstraintPlugin
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector

4
plugins/constraints/src/test/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersionsTest.kt → plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/versionChecker/AllowedVersionsTest.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.plugins.constraints.versionChecker package app.aaps.plugins.constraints.versionChecker
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import info.nightscout.plugins.constraints.versionChecker.AllowedVersions import app.aaps.plugins.constraints.versionChecker.AllowedVersions
import org.joda.time.LocalDate import org.joda.time.LocalDate
import org.json.JSONArray import org.json.JSONArray
import org.json.JSONObject import org.json.JSONObject