caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-27 11:27:55 +02:00
parent 7760014eea
commit ffdd07b61a
41 changed files with 78 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/layout/activity_historybrowse.xml
View file

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="info.nightscout.androidaps.app.aaps.activities.HistoryBrowseActivity">
tools:context=".activities.HistoryBrowseActivity">
<LinearLayout
android:layout_width="match_parent"

2
core/interfaces/src/main/kotlin/app/aaps/core/interfaces/constraints/ConstraintsChecker.kt
View file

@ -8,7 +8,7 @@ import app.aaps.core.interfaces.profile.Profile
* Every function has a param from previous chained call
* Function can limit the value even more and add another reason of restriction
*
* see [info.nightscout.plugins.constraints.ConstraintsCheckerImpl]
* see [app.aaps.plugins.constraints.ConstraintsCheckerImpl]
* which iterates over all registered plugins with [ConstraintsChecker] implemented
*/
interface ConstraintsChecker : PluginConstraints {

2
plugins/constraints/build.gradle
View file

@ -12,7 +12,7 @@ apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
android {
namespace 'info.nightscout.plugins.constraints'
namespace 'app.aaps.plugins.constraints'
}
dependencies {

2
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
View file

@ -18,8 +18,8 @@ import app.aaps.core.interfaces.rx.events.EventBucketedDataCreated
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.plugins.constraints.R
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject

2
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/dstHelper/DstHelperPlugin.kt
View file

@ -13,8 +13,8 @@ import app.aaps.core.interfaces.plugin.PluginType
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.T
import app.aaps.plugins.constraints.R
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import java.util.Calendar
import javax.inject.Inject
import javax.inject.Singleton

6
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesFragment.kt
View file

@ -32,14 +32,14 @@ import app.aaps.core.utils.HtmlHelper
import app.aaps.database.entities.UserEntry.Action
import app.aaps.database.entities.UserEntry.Sources
import app.aaps.database.entities.ValueWithUnit
import app.aaps.plugins.constraints.R
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 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 app.aaps.plugins.constraints.databinding.ObjectivesFragmentBinding
import app.aaps.plugins.constraints.databinding.ObjectivesItemBinding
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject

4
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesPlugin.kt
View file

@ -18,8 +18,7 @@ import app.aaps.core.interfaces.plugin.PluginDescription
import app.aaps.core.interfaces.plugin.PluginType
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 app.aaps.plugins.constraints.R
import app.aaps.plugins.constraints.objectives.objectives.Objective
import app.aaps.plugins.constraints.objectives.objectives.Objective0
import app.aaps.plugins.constraints.objectives.objectives.Objective1
@ -32,6 +31,7 @@ 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 dagger.android.HasAndroidInjector
import javax.inject.Inject
import javax.inject.Singleton

6
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt
View file

@ -8,14 +8,14 @@ import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
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 app.aaps.plugins.constraints.R
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 dagger.android.support.DaggerDialogFragment
import app.aaps.plugins.constraints.databinding.ObjectivesExamFragmentBinding
import javax.inject.Inject
class ObjectivesExamDialog : DaggerDialogFragment() {

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

@ -13,7 +13,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventNtpStatus
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import dagger.android.support.DaggerDialogFragment
import info.nightscout.plugins.constraints.databinding.DialogNtpProgressBinding
import app.aaps.plugins.constraints.databinding.DialogNtpProgressBinding
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject

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

@ -10,8 +10,8 @@ import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.plugins.constraints.R
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import javax.inject.Inject
import kotlin.math.floor

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

@ -8,8 +8,8 @@ import app.aaps.core.interfaces.plugin.PluginBase
import app.aaps.core.interfaces.pump.VirtualPump
import app.aaps.core.interfaces.sync.Tidepool
import app.aaps.database.ValueWrapper
import app.aaps.plugins.constraints.R
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import javax.inject.Inject
class Objective0(injector: HasAndroidInjector) : Objective(injector, "config", R.string.objectives_0_objective, R.string.objectives_0_gate) {

3
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective1.kt
View file

@ -1,10 +1,9 @@
package app.aaps.plugins.constraints.objectives.objectives
import app.aaps.core.interfaces.actions.Actions
import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.plugin.PluginBase
import app.aaps.plugins.constraints.R
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import javax.inject.Inject
class Objective1 @Inject constructor(injector: HasAndroidInjector) : Objective(injector, "usage", R.string.objectives_usage_objective, R.string.objectives_usage_gate) {

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

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

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

@ -1,8 +1,8 @@
package app.aaps.plugins.constraints.objectives.objectives
import app.aaps.core.interfaces.utils.T
import app.aaps.plugins.constraints.R
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
class Objective11(injector: HasAndroidInjector) : Objective(injector, "dyn_isf", R.string.objectives_dyn_isf_objective, R.string.objectives_dyn_isf_gate) {

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

@ -1,7 +1,7 @@
package app.aaps.plugins.constraints.objectives.objectives
import app.aaps.plugins.constraints.R
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
@Suppress("SpellCheckingInspection")
class Objective2(injector: HasAndroidInjector) : Objective(injector, "exam", R.string.objectives_exam_objective, R.string.objectives_exam_gate) {

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

@ -2,8 +2,8 @@ package app.aaps.plugins.constraints.objectives.objectives
import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.utils.T
import app.aaps.plugins.constraints.R
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import javax.inject.Inject
@Suppress("SpellCheckingInspection")

4
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective4.kt
View file

@ -1,12 +1,12 @@
package app.aaps.plugins.constraints.objectives.objectives
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.interfaces.constraints.PluginConstraints
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.profile.ProfileFunction
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.plugins.constraints.R
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import javax.inject.Inject
@Suppress("SpellCheckingInspection")

6
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/objectives/Objective5.kt
View file

@ -1,11 +1,11 @@
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 app.aaps.core.main.constraints.ConstraintObject
import app.aaps.plugins.constraints.R
import app.aaps.plugins.constraints.safety.SafetyPlugin
import dagger.android.HasAndroidInjector
import javax.inject.Inject
@Suppress("SpellCheckingInspection")

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

@ -3,8 +3,8 @@ package app.aaps.plugins.constraints.objectives.objectives
import app.aaps.core.interfaces.aps.ApsMode
import app.aaps.core.interfaces.constraints.ConstraintsChecker
import app.aaps.core.interfaces.utils.T
import app.aaps.plugins.constraints.R
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import javax.inject.Inject
@Suppress("SpellCheckingInspection")

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

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

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

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

2
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt
View file

@ -8,9 +8,9 @@ import app.aaps.core.interfaces.plugin.PluginBase
import app.aaps.core.interfaces.plugin.PluginDescription
import app.aaps.core.interfaces.plugin.PluginType
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.plugins.constraints.R
import com.scottyab.rootbeer.RootBeer
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import javax.inject.Inject
import javax.inject.Singleton

16
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/safety/SafetyPlugin.kt
View file

@ -1,12 +1,5 @@
package app.aaps.plugins.constraints.safety
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.utils.extensions.putDouble
import app.aaps.core.main.utils.extensions.putInt
import app.aaps.core.main.utils.extensions.putString
import app.aaps.core.main.utils.extensions.storeDouble
import app.aaps.core.main.utils.extensions.storeInt
import app.aaps.core.main.utils.extensions.storeString
import app.aaps.core.interfaces.aps.ApsMode
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.constraints.Constraint
@ -29,8 +22,15 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.HardLimits
import app.aaps.core.interfaces.utils.Round
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.utils.extensions.putDouble
import app.aaps.core.main.utils.extensions.putInt
import app.aaps.core.main.utils.extensions.putString
import app.aaps.core.main.utils.extensions.storeDouble
import app.aaps.core.main.utils.extensions.storeInt
import app.aaps.core.main.utils.extensions.storeString
import app.aaps.plugins.constraints.R
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import org.json.JSONObject
import javax.inject.Inject
import javax.inject.Singleton

2
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
View file

@ -14,8 +14,8 @@ import app.aaps.core.interfaces.plugin.PluginType
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.plugins.constraints.R
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import org.spongycastle.util.encoders.Hex
import java.io.ByteArrayOutputStream
import java.io.File

2
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/storage/StorageConstraintPlugin.kt
View file

@ -14,8 +14,8 @@ import app.aaps.core.interfaces.plugin.PluginDescription
import app.aaps.core.interfaces.plugin.PluginType
import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.plugins.constraints.R
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import javax.inject.Inject
import javax.inject.Singleton

2
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt
View file

@ -14,8 +14,8 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils
import app.aaps.plugins.constraints.R
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import java.util.concurrent.TimeUnit
import javax.inject.Inject
import javax.inject.Singleton

2
plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt
View file

@ -12,8 +12,8 @@ import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils
import app.aaps.plugins.constraints.R
import dagger.Lazy
import info.nightscout.plugins.constraints.R
import java.io.IOException
import java.net.URL
import java.util.concurrent.TimeUnit

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

@ -4,7 +4,7 @@
style="@style/StyleDialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="info.nightscout.plugins.constraints.app.aaps.plugins.constraints.objectives.dialogs.NtpProgressDialog">
tools:context=".objectives.dialogs.NtpProgressDialog">
<RelativeLayout
style="@style/StyleDialogHeader"
@ -48,7 +48,7 @@
android:layout_gravity="center_horizontal"
android:paddingStart="10dp"
android:paddingEnd="10dp"
tools:text="Delivering 1.9U"/>
tools:text="Delivering 1.9U" />
<ProgressBar
android:id="@+id/progressbar"

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

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

16
plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/ConstraintsCheckerImplTest.kt
View file

@ -96,33 +96,33 @@ class ConstraintsCheckerImplTest : TestBaseWithProfile() {
@BeforeEach
fun prepare() {
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
`when`(rh.gs(app.aaps.core.ui.R.string.no_valid_basal_rate)).thenReturn("No valid basal rate read from pump")
`when`(rh.gs(app.aaps.plugins.aps.R.string.autosens_disabled_in_preferences)).thenReturn("Autosens disabled in preferences")
`when`(rh.gs(app.aaps.plugins.aps.R.string.smb_disabled_in_preferences)).thenReturn("SMB disabled in preferences")
`when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit")
`when`(rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value")
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.maxvalueinpreferences)).thenReturn("max value in preferences")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.maxvalueinpreferences)).thenReturn("max value in preferences")
`when`(rh.gs(app.aaps.plugins.aps.R.string.max_basal_multiplier)).thenReturn("max basal multiplier")
`when`(rh.gs(app.aaps.plugins.aps.R.string.max_daily_basal_multiplier)).thenReturn("max daily basal multiplier")
`when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit")
`when`(rh.gs(app.aaps.core.ui.R.string.limitingbolus)).thenReturn("Limiting bolus to %.1f U because of %s")
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.hardlimit)).thenReturn("hard limit")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.hardlimit)).thenReturn("hard limit")
`when`(rh.gs(info.nightscout.core.utils.R.string.key_child)).thenReturn("child")
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.limitingcarbs)).thenReturn("Limiting carbs to %d g because of %s")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.limitingcarbs)).thenReturn("Limiting carbs to %d g because of %s")
`when`(rh.gs(app.aaps.plugins.aps.R.string.limiting_iob)).thenReturn("Limiting IOB to %.1f U because of %s")
`when`(rh.gs(app.aaps.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
`when`(rh.gs(app.aaps.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
`when`(rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value")
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode")
`when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit")
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
`when`(rh.gs(app.aaps.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
`when`(rh.gs(app.aaps.core.ui.R.string.limitingbolus)).thenReturn("Limiting bolus to %1\$.1f U because of %2\$s")
`when`(rh.gs(app.aaps.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
`when`(context.getString(info.nightscout.pump.combo.R.string.combo_pump_unsupported_operation)).thenReturn("Requested operation not supported by pump")
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.objectivenotstarted)).thenReturn("Objective %1\$d not started")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.objectivenotstarted)).thenReturn("Objective %1\$d not started")
// RS constructor
`when`(sp.getString(R.string.key_danars_name, "")).thenReturn("")

2
plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt
View file

@ -11,11 +11,11 @@ import app.aaps.core.interfaces.utils.T
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.database.entities.GlucoseValue
import app.aaps.plugins.constraints.R
import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.constraints.R
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.mockito.ArgumentMatchers.any

7
plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
View file

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

16
plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/safety/SafetyPluginTest.kt
View file

@ -50,24 +50,24 @@ class SafetyPluginTest : TestBaseWithProfile() {
@BeforeEach
fun prepare() {
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.hardlimit)).thenReturn("hard limit")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.hardlimit)).thenReturn("hard limit")
`when`(rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value")
`when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit")
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.maxvalueinpreferences)).thenReturn("max value in preferences")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.maxvalueinpreferences)).thenReturn("max value in preferences")
`when`(rh.gs(app.aaps.plugins.aps.R.string.max_daily_basal_multiplier)).thenReturn("max daily basal multiplier")
`when`(rh.gs(app.aaps.plugins.aps.R.string.max_basal_multiplier)).thenReturn("max basal multiplier")
`when`(rh.gs(app.aaps.core.ui.R.string.limitingbolus)).thenReturn("Limiting bolus to %1\$.1f U because of %2\$s")
`when`(rh.gs(app.aaps.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
`when`(rh.gs(app.aaps.core.ui.R.string.limiting_iob)).thenReturn("Limiting IOB to %1\$.1f U because of %2\$s")
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.limitingcarbs)).thenReturn("Limiting carbs to %1\$d g because of %2\$s")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.limitingcarbs)).thenReturn("Limiting carbs to %1\$d g because of %2\$s")
`when`(rh.gs(app.aaps.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.pumpisnottempbasalcapable)).thenReturn("Pump is not temp basal capable")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.pumpisnottempbasalcapable)).thenReturn("Pump is not temp basal capable")
`when`(rh.gs(app.aaps.plugins.aps.R.string.increasing_max_basal)).thenReturn("Increasing max basal value because setting is lower than your max basal in profile")
`when`(rh.gs(app.aaps.plugins.aps.R.string.smb_disabled_in_preferences)).thenReturn("SMB disabled in preferences")
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
`when`(rh.gs(info.nightscout.plugins.constraints.R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
`when`(rh.gs(app.aaps.plugins.constraints.R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode")
`when`(rh.gs(info.nightscout.core.utils.R.string.key_child)).thenReturn("child")
`when`(rh.gs(app.aaps.core.ui.R.string.lowglucosesuspend)).thenReturn("Low Glucose Suspend")

5
plugins/main/src/main/res/xml/pref_overview.xml
View file

@ -139,7 +139,7 @@
<Preference
android:key="quickwizard"
android:title="@string/quickwizard_settings">
<intent android:action="info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity" />
<intent android:action="app.aaps.ui.activities.QuickWizardListActivity" />
</Preference>
<androidx.preference.PreferenceScreen
@ -464,8 +464,7 @@
<Preference
android:key="@string/key_statuslights_copy_ns"
android:dependency="@string/key_show_statuslights"
android:title="@string/statuslights_copy_ns">
</Preference>
android:title="@string/statuslights_copy_ns"></Preference>
</androidx.preference.PreferenceScreen>

2
plugins/main/src/main/res/xml/pref_smscommunicator.xml
View file

@ -39,7 +39,7 @@
android:dependency="@string/key_smscommunicator_remote_commands_allowed"
android:key="otpsetup"
android:title="@string/smscommunicator_tab_otp_label">
<intent android:action="info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity" />
<intent android:action="app.aaps.plugins.main.general.smsCommunicator.activities.SmsCommunicatorOtpActivity" />
</Preference>
<SwitchPreference

4
plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclientV3/NSClientV3PluginTest.kt
View file

@ -1,5 +1,6 @@
package app.aaps.plugins.sync.nsclientV3
import app.aaps.core.interfaces.db.PersistenceLayer
import app.aaps.core.interfaces.insulin.Insulin
import app.aaps.core.interfaces.logging.UserEntryLogger
import app.aaps.core.interfaces.nsclient.StoreDataForDb
@ -57,6 +58,7 @@ internal class NSClientV3PluginTest : TestBaseWithProfile() {
@Mock lateinit var nsDeviceStatusHandler: NSDeviceStatusHandler
@Mock lateinit var nsIncomingDataProcessor: NsIncomingDataProcessor
@Mock lateinit var repository: AppRepository
@Mock lateinit var persistenceLayer: PersistenceLayer
@Mock lateinit var insulin: Insulin
private lateinit var storeDataForDb: StoreDataForDb
@ -81,7 +83,7 @@ internal class NSClientV3PluginTest : TestBaseWithProfile() {
sut =
NSClientV3Plugin(
injector, aapsLogger, aapsSchedulers, rxBus, rh, context, fabricPrivacy,
sp, receiverDelegate, config, dateUtil, uiInteraction, dataSyncSelectorV3, repository,
sp, receiverDelegate, config, dateUtil, uiInteraction, dataSyncSelectorV3, persistenceLayer,
nsDeviceStatusHandler, nsClientSource, nsIncomingDataProcessor, storeDataForDb, decimalFormatter
)
sut.nsAndroidClient = nsAndroidClient

5
plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt
View file

@ -7,6 +7,7 @@ import androidx.work.WorkContinuation
import androidx.work.WorkManager
import androidx.work.testing.TestListenableWorkerBuilder
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.db.PersistenceLayer
import app.aaps.core.interfaces.nsclient.StoreDataForDb
import app.aaps.core.interfaces.receivers.ReceiverStatusStore
import app.aaps.core.interfaces.resources.ResourceHelper
@ -56,7 +57,7 @@ internal class LoadBgWorkerTest : TestBase() {
@Mock lateinit var config: Config
@Mock lateinit var uiInteraction: UiInteraction
@Mock lateinit var dataSyncSelectorV3: DataSyncSelectorV3
@Mock lateinit var repository: AppRepository
@Mock lateinit var persistenceLayer: PersistenceLayer
@Mock lateinit var receiverStatusStore: ReceiverStatusStore
@Mock lateinit var nsClientSource: NSClientSource
@Mock lateinit var workManager: WorkManager
@ -101,7 +102,7 @@ internal class LoadBgWorkerTest : TestBase() {
receiverDelegate = ReceiverDelegate(rxBus, rh, sp, receiverStatusStore, aapsSchedulers, fabricPrivacy)
nsClientV3Plugin = NSClientV3Plugin(
injector, aapsLogger, aapsSchedulers, rxBus, rh, context, fabricPrivacy,
sp, receiverDelegate, config, dateUtil, uiInteraction, dataSyncSelectorV3, repository,
sp, receiverDelegate, config, dateUtil, uiInteraction, dataSyncSelectorV3, persistenceLayer,
nsDeviceStatusHandler, nsClientSource, nsIncomingDataProcessor, storeDataForDb, decimalFormatter
)
nsClientV3Plugin.newestDataOnServer = LastModified(LastModified.Collections())

2
pump/medtronic/src/main/res/xml/pref_medtronic.xml
View file

@ -94,7 +94,7 @@
android:key="@string/key_rileylink_mac_address"
android:summary=""
android:title="@string/rileylink_configuration">
<intent android:action="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEConfigActivity" />
<intent android:action="info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEConfigActivity" />
</Preference>
<SwitchPreference
android:defaultValue="false"

2
pump/omnipod-eros/src/main/res/xml/omnipod_eros_preferences.xml
View file

@ -12,7 +12,7 @@
android:enabled="true"
android:key="@string/key_rileylink_mac_address"
android:title="@string/rileylink_configuration">
<intent android:action="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEConfigActivity" />
<intent android:action="info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEConfigActivity" />
</Preference>
<SwitchPreference

2
wear/src/main/res/xml/display_preferences.xml
View file

@ -110,7 +110,7 @@
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on" />
<info.nightscout.androidaps.interaction.utils.WatchfaceSettingsPreference
<app.aaps.wear.interaction.utils.WatchfaceSettingsPreference
android:defaultValue="1"
android:entries="@array/input_design"
android:entryValues="@array/input_design_values"

2
wear/src/main/res/xml/others_preferences.xml
View file

@ -10,7 +10,7 @@
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on" />
<info.nightscout.androidaps.interaction.utils.VersionPreference
<app.aaps.wear.interaction.utils.VersionPreference
android:defaultValue="1"
android:entries="@array/input_design"
android:entryValues="@array/input_design_values"