diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/ApsMode.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/ApsMode.kt index 2af064a34c..24ee4b3454 100644 --- a/core/interfaces/src/main/java/info/nightscout/interfaces/ApsMode.kt +++ b/core/interfaces/src/main/java/info/nightscout/interfaces/ApsMode.kt @@ -1,6 +1,6 @@ package info.nightscout.interfaces -enum class ApsMode() { +enum class ApsMode { OPEN, CLOSED, LGS, diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensResult.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensResult.kt index 3460b3e78e..f2dd39f830 100644 --- a/core/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensResult.kt +++ b/core/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensResult.kt @@ -1,22 +1,11 @@ package info.nightscout.interfaces.aps -import org.json.JSONObject - -class AutosensResult { +data class AutosensResult( //default values to show when autosens algorithm is not called - var ratio = 1.0 - var carbsAbsorbed = 0.0 - var sensResult = "autosens not available" - var pastSensitivity = "" - var ratioLimit = "" - - fun json(): JSONObject = JSONObject() - .put("ratio", ratio) - .put("ratioLimit", ratioLimit) - .put("pastSensitivity", pastSensitivity) - .put("sensResult", sensResult) - .put("ratio", ratio) - - override fun toString(): String = json().toString() -} \ No newline at end of file + var ratio: Double = 1.0, + var carbsAbsorbed: Double = 0.0, + var sensResult: String = "autosens not available", + var pastSensitivity: String = "", + var ratioLimit: String = "" +) \ No newline at end of file diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/NSAlarm.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/NSAlarm.kt index 18357c877f..d90b10ce02 100644 --- a/core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/NSAlarm.kt +++ b/core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/NSAlarm.kt @@ -1,9 +1,6 @@ package info.nightscout.interfaces.nsclient -import info.nightscout.interfaces.utils.JsonHelper -import org.json.JSONObject - -class NSAlarm(private var data: JSONObject) { +interface NSAlarm { /* { "level":2, @@ -18,24 +15,11 @@ class NSAlarm(private var data: JSONObject) { } */ - fun level(): Int = - JsonHelper.safeGetInt(data, "level", 0) - - fun group(): String = - JsonHelper.safeGetString(data, "group", "N/A") - - fun title(): String = - JsonHelper.safeGetString(data, "title", "N/A") - - fun message(): String = - JsonHelper.safeGetString(data, "message", "N/A") - - fun low() :Boolean = - JsonHelper.safeGetString(data, "eventName", "") == "low" - - fun high() :Boolean = - JsonHelper.safeGetString(data, "eventName", "") == "high" - - fun timeago() :Boolean = - JsonHelper.safeGetString(data, "eventName", "") == "timeago" + fun level(): Int + fun group(): String + fun title(): String + fun message(): String + fun low(): Boolean + fun high(): Boolean + fun timeago(): Boolean } \ No newline at end of file diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/NSSgv.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/NSSgv.kt index 3bdddfa462..bf7c81c965 100644 --- a/core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/NSSgv.kt +++ b/core/interfaces/src/main/java/info/nightscout/interfaces/nsclient/NSSgv.kt @@ -1,32 +1,19 @@ package info.nightscout.interfaces.nsclient -import info.nightscout.interfaces.utils.JsonHelper -import org.json.JSONObject - /** * * {"mgdl":105,"mills":1455136282375,"device":"xDrip-BluetoothWixel","direction":"Flat","filtered":98272,"unfiltered":98272,"noise":1,"rssi":100} */ @Suppress("SpellCheckingInspection") -class NSSgv(val data: JSONObject) { +interface NSSgv { val mgdl: Int? - get() = JsonHelper.safeGetIntAllowNull(data, "mgdl") val filtered: Int? - get() = JsonHelper.safeGetIntAllowNull(data, "filtered") val unfiltered: Int? - get() = JsonHelper.safeGetIntAllowNull(data, "unfiltered") val noise: Int? - get() = JsonHelper.safeGetIntAllowNull(data, "noise") val rssi: Int? - get() = JsonHelper.safeGetIntAllowNull(data, "rssi") val mills: Long? - get() = JsonHelper.safeGetLongAllowNull(data, "mills") val device: String? - get() = JsonHelper.safeGetStringAllowNull(data, "device", null) val direction: String? - get() = JsonHelper.safeGetStringAllowNull(data, "direction", null) val id: String? - get() = JsonHelper.safeGetStringAllowNull(data, "_id", null) - } \ No newline at end of file diff --git a/core/main/src/main/java/info/nightscout/core/extensions/ProfileSwitchExtension.kt b/core/main/src/main/java/info/nightscout/core/extensions/ProfileSwitchExtension.kt index 926b52c153..0fc2dd84a4 100644 --- a/core/main/src/main/java/info/nightscout/core/extensions/ProfileSwitchExtension.kt +++ b/core/main/src/main/java/info/nightscout/core/extensions/ProfileSwitchExtension.kt @@ -1,12 +1,12 @@ package info.nightscout.core.extensions import info.nightscout.core.profile.ProfileSealed +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.ProfileSwitch import info.nightscout.interfaces.Constants import info.nightscout.interfaces.GlucoseUnit import info.nightscout.interfaces.profile.PureProfile import info.nightscout.interfaces.utils.DecimalFormatter -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.shared.utils.DateUtil import info.nightscout.shared.utils.T import org.json.JSONObject diff --git a/core/main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt b/core/main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt index be814c2ea3..3c925fe15b 100644 --- a/core/main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt +++ b/core/main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt @@ -8,6 +8,7 @@ import info.nightscout.core.extensions.highValueToUnitsToString import info.nightscout.core.extensions.lowValueToUnitsToString import info.nightscout.core.iob.round import info.nightscout.core.ui.dialogs.OKDialog +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.extensions.formatColor import info.nightscout.database.entities.BolusCalculatorResult import info.nightscout.database.entities.OfflineEvent @@ -36,7 +37,6 @@ import info.nightscout.interfaces.queue.Callback import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.interfaces.ui.UiInteraction import info.nightscout.interfaces.utils.DecimalFormatter -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.interfaces.utils.Round import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventRefreshOverview diff --git a/core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt b/core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt index e529442e93..eeb936de5d 100644 --- a/core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt +++ b/core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt @@ -4,6 +4,8 @@ import dagger.android.HasAndroidInjector import info.nightscout.annotations.OpenForTesting import info.nightscout.core.extensions.valueToUnits import info.nightscout.core.iob.round +import info.nightscout.core.utils.JsonHelper.safeGetInt +import info.nightscout.core.utils.JsonHelper.safeGetString import info.nightscout.core.utils.MidnightUtils import info.nightscout.database.ValueWrapper import info.nightscout.interfaces.aps.Loop @@ -14,8 +16,6 @@ import info.nightscout.interfaces.iob.IobCobCalculator import info.nightscout.interfaces.plugin.PluginBase import info.nightscout.interfaces.profile.Profile import info.nightscout.interfaces.profile.ProfileFunction -import info.nightscout.interfaces.utils.JsonHelper.safeGetInt -import info.nightscout.interfaces.utils.JsonHelper.safeGetString import info.nightscout.rx.logging.AAPSLogger import info.nightscout.shared.sharedPreferences.SP import info.nightscout.shared.utils.DateUtil diff --git a/core/main/src/test/java/info/nightscout/core/utils/JsonHelperTest.kt b/core/main/src/test/java/info/nightscout/core/utils/JsonHelperTest.kt index 3681f7ef23..2b0c1e686f 100644 --- a/core/main/src/test/java/info/nightscout/core/utils/JsonHelperTest.kt +++ b/core/main/src/test/java/info/nightscout/core/utils/JsonHelperTest.kt @@ -1,6 +1,5 @@ package info.nightscout.core.utils -import info.nightscout.interfaces.utils.JsonHelper import org.json.JSONObject import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/utils/HtmlHelper.kt b/core/utils/src/main/java/info/nightscout/core/utils/HtmlHelper.kt similarity index 88% rename from core/interfaces/src/main/java/info/nightscout/interfaces/utils/HtmlHelper.kt rename to core/utils/src/main/java/info/nightscout/core/utils/HtmlHelper.kt index 004010e0bf..2802deb92e 100644 --- a/core/interfaces/src/main/java/info/nightscout/interfaces/utils/HtmlHelper.kt +++ b/core/utils/src/main/java/info/nightscout/core/utils/HtmlHelper.kt @@ -1,4 +1,4 @@ -package info.nightscout.interfaces.utils +package info.nightscout.core.utils import android.text.Html import android.text.SpannableStringBuilder diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/utils/JsonHelper.kt b/core/utils/src/main/java/info/nightscout/core/utils/JsonHelper.kt similarity index 99% rename from core/interfaces/src/main/java/info/nightscout/interfaces/utils/JsonHelper.kt rename to core/utils/src/main/java/info/nightscout/core/utils/JsonHelper.kt index a19e58b55e..fc7ecb608b 100644 --- a/core/interfaces/src/main/java/info/nightscout/interfaces/utils/JsonHelper.kt +++ b/core/utils/src/main/java/info/nightscout/core/utils/JsonHelper.kt @@ -1,4 +1,4 @@ -package info.nightscout.interfaces.utils +package info.nightscout.core.utils import org.json.JSONException import org.json.JSONObject diff --git a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt index 6889af489d..8025ad4e70 100644 --- a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt +++ b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt @@ -4,12 +4,12 @@ import androidx.collection.ArrayMap import dagger.android.HasAndroidInjector import info.nightscout.core.extensions.pureProfileFromJson import info.nightscout.core.profile.ProfileSealed +import info.nightscout.core.utils.JsonHelper import info.nightscout.interfaces.Config import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.profile.ProfileStore import info.nightscout.interfaces.profile.PureProfile import info.nightscout.interfaces.utils.HardLimits -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.rx.bus.RxBus import info.nightscout.rx.logging.AAPSLogger import info.nightscout.shared.interfaces.ResourceHelper diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt index 7d8a80b4c5..e66580353d 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt @@ -12,6 +12,7 @@ import info.nightscout.annotations.OpenForTesting import info.nightscout.core.events.EventNewNotification import info.nightscout.core.extensions.getCustomizedName import info.nightscout.core.profile.ProfileSealed +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.EffectiveProfileSwitch @@ -58,7 +59,6 @@ import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.interfaces.queue.CustomCommand import info.nightscout.interfaces.ui.UiInteraction import info.nightscout.interfaces.utils.DecimalFormatter -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventDismissBolusProgressIfRunning diff --git a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt b/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt index c13a78e140..6a2c4fe9d1 100644 --- a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt @@ -3,6 +3,7 @@ package info.nightscout.implementation.userEntry import android.text.Spanned import dagger.Reusable import info.nightscout.core.main.R +import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.ColorGroup @@ -13,7 +14,6 @@ import info.nightscout.interfaces.GlucoseUnit import info.nightscout.interfaces.Translator import info.nightscout.interfaces.userEntry.UserEntryPresentationHelper import info.nightscout.interfaces.utils.DecimalFormatter -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.shared.interfaces.ProfileUtil import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.utils.DateUtil diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java index 8225c18870..3ea11c6ec3 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java @@ -34,24 +34,22 @@ import info.nightscout.androidaps.plugins.pump.insight.exceptions.InsightExcepti import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.AppLayerErrorException; import info.nightscout.androidaps.plugins.pump.insight.utils.AlertUtils; import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator; -import info.nightscout.interfaces.utils.HtmlHelper; +import info.nightscout.core.utils.HtmlHelper; import info.nightscout.rx.logging.AAPSLogger; import info.nightscout.rx.logging.LTag; import info.nightscout.shared.interfaces.ResourceHelper; public class InsightAlertService extends DaggerService implements InsightConnectionService.StateCallback { + private static final int NOTIFICATION_ID = 31345; + private final LocalBinder localBinder = new LocalBinder(); + private final Object $alertLock = new Object[0]; + private final MutableLiveData alertLiveData = new MutableLiveData<>(); @Inject AAPSLogger aapsLogger; @Inject ResourceHelper rh; @Inject AlertUtils alertUtils; - - private static final int NOTIFICATION_ID = 31345; - - private final LocalBinder localBinder = new LocalBinder(); private boolean connectionRequested; - private final Object $alertLock = new Object[0]; private Alert alert = null; - private final MutableLiveData alertLiveData = new MutableLiveData<>(); private Thread thread; private Vibrator vibrator; private boolean vibrating; @@ -100,7 +98,7 @@ public class InsightAlertService extends DaggerService implements InsightConnect public void onCreate() { super.onCreate(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { - vibrator = ((VibratorManager)(getSystemService(Context.VIBRATOR_MANAGER_SERVICE))).getDefaultVibrator(); + vibrator = ((VibratorManager) (getSystemService(Context.VIBRATOR_MANAGER_SERVICE))).getDefaultVibrator(); } else { vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE); } diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java index e1cb05d8e7..6ec58bff24 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java @@ -22,7 +22,7 @@ import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService; import info.nightscout.androidaps.plugins.pump.insight.descriptors.Alert; import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertStatus; import info.nightscout.androidaps.plugins.pump.insight.utils.AlertUtils; -import info.nightscout.interfaces.utils.HtmlHelper; +import info.nightscout.core.utils.HtmlHelper; public class InsightAlertActivity extends DaggerAppCompatActivity { diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt index ab715bab53..c630615858 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt @@ -5,6 +5,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.core.extensions.convertedToAbsolute import info.nightscout.core.extensions.convertedToPercent import info.nightscout.core.ui.R +import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.GlucoseValue import info.nightscout.interfaces.aps.APSResult import info.nightscout.interfaces.constraints.Constraint @@ -15,7 +16,6 @@ import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.pump.defs.PumpDescription import info.nightscout.interfaces.utils.DecimalFormatter -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ResourceHelper diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt index 293e048e61..568819f482 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt @@ -15,6 +15,7 @@ import androidx.core.view.MenuProvider import androidx.lifecycle.Lifecycle import dagger.android.support.DaggerFragment import info.nightscout.core.utils.fabric.FabricPrivacy +import info.nightscout.interfaces.aps.AutosensResult import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.plugins.aps.databinding.OpenapsFragmentBinding import info.nightscout.plugins.aps.events.EventOpenAPSUpdateGui @@ -30,6 +31,7 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import org.json.JSONArray import org.json.JSONException +import org.json.JSONObject import javax.inject.Inject class OpenAPSFragment : DaggerFragment(), MenuProvider { @@ -64,7 +66,11 @@ class OpenAPSFragment : DaggerFragment(), MenuProvider { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - binding.swipeRefresh.setColorSchemeColors(rh.gac(context, android.R.attr.colorPrimaryDark), rh.gac(context, android.R.attr.colorPrimary), rh.gac(context,com.google.android.material.R.attr.colorSecondary)) + binding.swipeRefresh.setColorSchemeColors( + rh.gac(context, android.R.attr.colorPrimaryDark), + rh.gac(context, android.R.attr.colorPrimary), + rh.gac(context, com.google.android.material.R.attr.colorSecondary) + ) binding.swipeRefresh.setOnRefreshListener { binding.lastrun.text = rh.gs(R.string.executing) handler.post { activePlugin.activeAPS.invoke("OpenAPS swipe refresh", false) } @@ -156,6 +162,13 @@ class OpenAPSFragment : DaggerFragment(), MenuProvider { binding.swipeRefresh.isRefreshing = false } + private fun AutosensResult.json(): JSONObject = JSONObject() + .put("ratio", ratio) + .put("ratioLimit", ratioLimit) + .put("pastSensitivity", pastSensitivity) + .put("sensResult", sensResult) + .put("ratio", ratio) + @Synchronized private fun resetGUI(text: String) { if (_binding == null) return diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt index 0c4b99e3a7..031f100c20 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt @@ -14,11 +14,11 @@ import androidx.core.view.MenuProvider import androidx.lifecycle.Lifecycle import dagger.android.support.DaggerFragment import info.nightscout.core.pump.toHtml +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.interfaces.aps.Loop import info.nightscout.interfaces.constraints.Constraint import info.nightscout.interfaces.utils.DecimalFormatter -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.plugins.aps.R import info.nightscout.plugins.aps.databinding.LoopFragmentBinding import info.nightscout.plugins.aps.loop.events.EventLoopSetLastRunGui diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt index 2eb96c04d8..8603cd6d9c 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.aps.utils import android.text.Spanned -import info.nightscout.interfaces.utils.HtmlHelper +import info.nightscout.core.utils.HtmlHelper import info.nightscout.rx.logging.AAPSLogger import org.json.JSONArray import org.json.JSONException diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt index 46bd06c7ff..cf0bcb7208 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt @@ -7,6 +7,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.core.extensions.pureProfileFromJson import info.nightscout.core.profile.ProfileSealed import info.nightscout.core.ui.elements.WeekDay +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit import info.nightscout.interfaces.Config @@ -20,7 +21,6 @@ import info.nightscout.interfaces.plugin.PluginType import info.nightscout.interfaces.profile.Instantiator import info.nightscout.interfaces.profile.Profile import info.nightscout.interfaces.profile.ProfileFunction -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.interfaces.utils.MidnightTime import info.nightscout.plugins.aps.R import info.nightscout.plugins.general.autotune.data.ATProfile @@ -153,7 +153,7 @@ class AutotunePlugin @Inject constructor( } autotuneFS.exportPumpProfile(pumpProfile) - if (calcDays==0) { + if (calcDays == 0) { result = rh.gs(info.nightscout.core.ui.R.string.autotune_error_more_days) log(result) calculationRunning = false @@ -429,7 +429,7 @@ class AutotunePlugin @Inject constructor( } } for (i in days.weekdays.indices) - days.weekdays[i] = JsonHelper.safeGetBoolean(json, WeekDay.DayOfWeek.values()[i].name,true) + days.weekdays[i] = JsonHelper.safeGetBoolean(json, WeekDay.DayOfWeek.values()[i].name, true) result = JsonHelper.safeGetString(json, "result", "") updateButtonVisibility = JsonHelper.safeGetInt(json, "updateButtonVisibility") lastRunSuccess = true @@ -438,17 +438,17 @@ class AutotunePlugin @Inject constructor( } } - fun calcDays(daysBack:Int): Int { - var endTime = MidnightTime.calc(dateUtil.now()) + autotuneStartHour * 60 * 60 * 1000L - if (endTime > dateUtil.now()) endTime -= T.days(1).msecs() // Check if 4 AM is before now - val startTime = endTime - daysBack * T.days(1).msecs() - var result = 0 - for (i in 0 until daysBack) { - if (days.isSet(startTime + i * T.days(1).msecs())) - result++ - } - return result + fun calcDays(daysBack: Int): Int { + var endTime = MidnightTime.calc(dateUtil.now()) + autotuneStartHour * 60 * 60 * 1000L + if (endTime > dateUtil.now()) endTime -= T.days(1).msecs() // Check if 4 AM is before now + val startTime = endTime - daysBack * T.days(1).msecs() + var result = 0 + for (i in 0 until daysBack) { + if (days.isSet(startTime + i * T.days(1).msecs())) + result++ } + return result + } private fun log(message: String) { atLog("[Plugin] $message") diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/APSResultTest.kt b/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/APSResultTest.kt index 33864b225b..422da5253c 100644 --- a/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/APSResultTest.kt +++ b/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/APSResultTest.kt @@ -2,12 +2,12 @@ package info.nightscout.plugins.aps.loop import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector +import info.nightscout.core.utils.JsonHelper.safeGetDouble import info.nightscout.database.entities.TemporaryBasal import info.nightscout.interfaces.aps.APSResult import info.nightscout.interfaces.constraints.Constraint import info.nightscout.interfaces.constraints.Constraints import info.nightscout.interfaces.pump.defs.PumpType -import info.nightscout.interfaces.utils.JsonHelper.safeGetDouble import info.nightscout.sharedtests.TestBaseWithProfile import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt index 8bf18b6d83..daa4dd7287 100644 --- a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt +++ b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt @@ -1,11 +1,11 @@ package info.nightscout.plugins.general.autotune import info.nightscout.core.profile.ProfileSealed +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.data.Block import info.nightscout.database.entities.data.TargetBlock import info.nightscout.interfaces.GlucoseUnit import info.nightscout.interfaces.profile.PureProfile -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.plugins.general.autotune.data.ATProfile import info.nightscout.plugins.general.autotune.data.PreppedGlucose import info.nightscout.shared.utils.DateUtil diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt index b6127197e3..f5e0038be1 100644 --- a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt +++ b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt @@ -2,6 +2,7 @@ package info.nightscout.plugins.general.autotune import info.nightscout.core.extensions.shiftBlock import info.nightscout.core.profile.ProfileSealed +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.Carbs import info.nightscout.database.entities.GlucoseValue @@ -12,7 +13,6 @@ import info.nightscout.interfaces.GlucoseUnit import info.nightscout.interfaces.iob.IobTotal import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.profile.PureProfile -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.plugins.general.autotune.data.PreppedGlucose import info.nightscout.rx.logging.AAPSLogger import info.nightscout.shared.sharedPreferences.SP diff --git a/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt b/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt index 610ae67a12..0a4406b3b1 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt @@ -32,6 +32,7 @@ import info.nightscout.automation.events.EventAutomationUpdateGui import info.nightscout.automation.triggers.TriggerConnector import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.utils.ActionModeHelper +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources @@ -39,7 +40,6 @@ import info.nightscout.interfaces.dragHelpers.ItemTouchHelperAdapter import info.nightscout.interfaces.dragHelpers.OnStartDragListener import info.nightscout.interfaces.dragHelpers.SimpleItemTouchHelperCallback import info.nightscout.interfaces.logging.UserEntryLogger -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.shared.extensions.toVisibility @@ -104,17 +104,17 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener, MenuProvider { override fun onMenuItemSelected(item: MenuItem): Boolean = if (actionHelper.onOptionsItemSelected(item)) true else when (item.itemId) { - ID_MENU_RUN -> { + ID_MENU_RUN -> { Thread { automationPlugin.processActions() }.start() true } - ID_MENU_ADD -> { + ID_MENU_ADD -> { add() true } - else -> super.onContextItemSelected(item) + else -> super.onContextItemSelected(item) } @SuppressLint("NotifyDataSetChanged") diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt index eb87995ed2..64a648719a 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt @@ -8,11 +8,11 @@ import info.nightscout.automation.R import info.nightscout.automation.elements.InputString import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder +import info.nightscout.automation.ui.TimerUtil +import info.nightscout.core.utils.JsonHelper import info.nightscout.interfaces.Config import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.queue.Callback -import info.nightscout.interfaces.utils.JsonHelper -import info.nightscout.automation.ui.TimerUtil import info.nightscout.rx.bus.RxBus import info.nightscout.shared.utils.DateUtil import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt index 2bcd2b2e0e..7e30ba1f84 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt @@ -9,6 +9,7 @@ import info.nightscout.automation.elements.InputString import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.core.extensions.fromConstant +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit @@ -18,7 +19,6 @@ import info.nightscout.interfaces.iob.GlucoseStatusProvider import info.nightscout.interfaces.logging.UserEntryLogger import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.queue.Callback -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.rx.logging.LTag import info.nightscout.shared.sharedPreferences.SP import info.nightscout.shared.utils.DateUtil diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt index 1aed6376a0..2601c8d736 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt @@ -7,6 +7,7 @@ import info.nightscout.automation.R import info.nightscout.automation.elements.InputDuration import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.ValueWithUnit @@ -14,7 +15,6 @@ import info.nightscout.interfaces.aps.Loop import info.nightscout.interfaces.logging.UserEntryLogger import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.queue.Callback -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventRefreshOverview import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt index c3d07d8e15..c8d1700e04 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt @@ -8,12 +8,12 @@ import info.nightscout.automation.elements.InputString import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.core.events.EventNewNotification +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction import info.nightscout.interfaces.notifications.NotificationUserMessage import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.queue.Callback -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventRefreshOverview import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt index 82fc7e4a97..f051b81063 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt @@ -7,6 +7,7 @@ import info.nightscout.automation.R import info.nightscout.automation.elements.InputProfileName import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.ValueWithUnit @@ -15,7 +16,6 @@ import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.queue.Callback -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.rx.logging.LTag import info.nightscout.shared.utils.DateUtil import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt index 2e2de7f32f..4c488402c2 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt @@ -10,6 +10,7 @@ import info.nightscout.automation.elements.InputPercent import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.triggers.TriggerProfilePercent +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.ValueWithUnit @@ -17,7 +18,6 @@ import info.nightscout.interfaces.logging.UserEntryLogger import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.queue.Callback -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.rx.logging.LTag import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt index cd008a2e39..5b70267c56 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt @@ -9,12 +9,12 @@ import info.nightscout.automation.elements.InputWeekDay import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.core.ui.elements.WeekDay +import info.nightscout.core.utils.JsonHelper import info.nightscout.interfaces.autotune.Autotune import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.queue.Callback -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.sharedPreferences.SP @@ -89,7 +89,7 @@ class ActionRunAutotune(injector: HasAndroidInjector) : Action(injector) { override fun fromJSON(data: String): Action { val o = JSONObject(data) for (i in days.weekdays.indices) - days.weekdays[i] = JsonHelper.safeGetBoolean(o, WeekDay.DayOfWeek.values()[i].name,true) + days.weekdays[i] = JsonHelper.safeGetBoolean(o, WeekDay.DayOfWeek.values()[i].name, true) inputProfileName.value = JsonHelper.safeGetString(o, "profileToTune", "") defaultValue = JsonHelper.safeGetInt(o, "tunedays") if (defaultValue == 0) diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt index 051a2a0261..692ce192fe 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt @@ -6,10 +6,10 @@ import info.nightscout.automation.R import info.nightscout.automation.elements.InputString import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder +import info.nightscout.core.utils.JsonHelper import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.queue.Callback import info.nightscout.interfaces.smsCommunicator.SmsCommunicator -import info.nightscout.interfaces.utils.JsonHelper import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt index 96628ad1f7..da2f074488 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt @@ -11,6 +11,8 @@ import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.triggers.TriggerTempTarget import info.nightscout.core.extensions.friendlyDescription +import info.nightscout.core.utils.JsonHelper +import info.nightscout.core.utils.JsonHelper.safeGetDouble import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Sources @@ -24,8 +26,6 @@ import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.pump.PumpEnactResult import info.nightscout.interfaces.queue.Callback -import info.nightscout.interfaces.utils.JsonHelper -import info.nightscout.interfaces.utils.JsonHelper.safeGetDouble import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ProfileUtil import info.nightscout.shared.utils.DateUtil diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerAutosensValue.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerAutosensValue.kt index e37dcdd48c..8021265c1c 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerAutosensValue.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerAutosensValue.kt @@ -9,8 +9,8 @@ import info.nightscout.automation.elements.InputDouble import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.interfaces.utils.JsonHelper.safeGetDouble -import info.nightscout.interfaces.utils.JsonHelper.safeGetString +import info.nightscout.core.utils.JsonHelper.safeGetDouble +import info.nightscout.core.utils.JsonHelper.safeGetString import info.nightscout.rx.logging.LTag import org.json.JSONObject import java.text.DecimalFormat diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt index b4fb46ef43..3c1e0f3d66 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt @@ -16,7 +16,7 @@ import info.nightscout.automation.elements.InputDropdownMenu import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel import info.nightscout.core.ui.toast.ToastUtils -import info.nightscout.interfaces.utils.JsonHelper +import info.nightscout.core.utils.JsonHelper import info.nightscout.rx.events.EventBTChange import info.nightscout.rx.logging.LTag import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt index 82a80eca13..9076b3980e 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt @@ -9,9 +9,9 @@ import info.nightscout.automation.elements.InputBg import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel +import info.nightscout.core.utils.JsonHelper import info.nightscout.interfaces.Constants import info.nightscout.interfaces.GlucoseUnit -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.rx.logging.LTag import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt index f41adcbbac..d784811c5b 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt @@ -9,10 +9,10 @@ import info.nightscout.automation.elements.InputDuration import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel +import info.nightscout.core.utils.JsonHelper +import info.nightscout.core.utils.JsonHelper.safeGetString import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.Bolus -import info.nightscout.interfaces.utils.JsonHelper -import info.nightscout.interfaces.utils.JsonHelper.safeGetString import info.nightscout.rx.logging.LTag import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt index ed85079357..988bbbf5a7 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt @@ -9,8 +9,8 @@ import info.nightscout.automation.elements.InputDouble import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.interfaces.utils.JsonHelper -import info.nightscout.interfaces.utils.JsonHelper.safeGetDouble +import info.nightscout.core.utils.JsonHelper +import info.nightscout.core.utils.JsonHelper.safeGetDouble import info.nightscout.rx.logging.LTag import org.json.JSONObject import java.text.DecimalFormat diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt index b303d55f88..92c6100a1a 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt @@ -12,7 +12,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.dialogs.ChooseOperationDialog import info.nightscout.core.ui.elements.VerticalTextView -import info.nightscout.interfaces.utils.JsonHelper.safeGetString +import info.nightscout.core.utils.JsonHelper.safeGetString import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ResourceHelper import org.json.JSONArray diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt index 6365af9304..6f0ed7966c 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt @@ -10,9 +10,9 @@ import info.nightscout.automation.elements.InputDelta.DeltaType import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel +import info.nightscout.core.utils.JsonHelper import info.nightscout.interfaces.Constants import info.nightscout.interfaces.GlucoseUnit -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.rx.logging.LTag import org.json.JSONObject import java.text.DecimalFormat diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt index e1a6c4c919..df05a95613 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt @@ -10,7 +10,7 @@ import info.nightscout.automation.elements.InputDouble import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.interfaces.utils.JsonHelper +import info.nightscout.core.utils.JsonHelper import info.nightscout.rx.logging.LTag import org.json.JSONObject import java.text.DecimalFormat @@ -61,7 +61,7 @@ class TriggerHeartRate(injector: HasAndroidInjector) : Trigger(injector) { rh.gs(R.string.triggerHeartRateDesc, rh.gs(comparator.value.stringRes), heartRate.value) override fun icon(): Optional = Optional.of(info.nightscout.core.main.R.drawable.ic_cp_heart_rate) - + override fun duplicate(): Trigger { return TriggerHeartRate(injector).also { o -> o.heartRate.setValue(heartRate.value) diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt index 51d237edbf..077a5cf927 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt @@ -9,7 +9,7 @@ import info.nightscout.automation.elements.InputInsulin import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.interfaces.utils.JsonHelper +import info.nightscout.core.utils.JsonHelper import info.nightscout.rx.logging.LTag import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt index a199bf7d42..fadee002e0 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt @@ -12,7 +12,7 @@ import info.nightscout.automation.elements.InputString import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.interfaces.utils.JsonHelper +import info.nightscout.core.utils.JsonHelper import info.nightscout.rx.logging.LTag import org.json.JSONObject import java.text.DecimalFormat diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt index 55b996f188..0421b47b43 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt @@ -10,7 +10,7 @@ import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel import info.nightscout.core.profile.ProfileSealed -import info.nightscout.interfaces.utils.JsonHelper +import info.nightscout.core.utils.JsonHelper import info.nightscout.rx.logging.LTag import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt index 4312ed9cb2..5b640105a0 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt @@ -9,8 +9,8 @@ import info.nightscout.automation.elements.InputDuration import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.interfaces.utils.JsonHelper.safeGetInt -import info.nightscout.interfaces.utils.JsonHelper.safeGetString +import info.nightscout.core.utils.JsonHelper.safeGetInt +import info.nightscout.core.utils.JsonHelper.safeGetString import info.nightscout.rx.logging.LTag import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt index 805cf24fa4..45848ea9e7 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt @@ -9,8 +9,8 @@ import info.nightscout.automation.elements.InputWeekDay import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel import info.nightscout.core.ui.elements.WeekDay +import info.nightscout.core.utils.JsonHelper import info.nightscout.core.utils.MidnightUtils -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.interfaces.utils.MidnightTime import info.nightscout.rx.logging.LTag import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt index 140d1e5f35..50e605d5ac 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt @@ -7,8 +7,8 @@ import info.nightscout.automation.R import info.nightscout.automation.elements.ComparatorExists import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.ValueWrapper -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.rx.logging.LTag import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt index a03333ce87..763219fcb1 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt @@ -9,10 +9,10 @@ import info.nightscout.automation.elements.InputBg import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.ValueWrapper import info.nightscout.interfaces.Constants import info.nightscout.interfaces.GlucoseUnit -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.rx.logging.LTag import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt index 7b2d507815..07c5f0cc08 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt @@ -7,7 +7,7 @@ import info.nightscout.automation.R import info.nightscout.automation.elements.InputDateTime import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.interfaces.utils.JsonHelper +import info.nightscout.core.utils.JsonHelper import info.nightscout.rx.logging.LTag import info.nightscout.shared.utils.T import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt index 2f94ba9887..f7b7910960 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt @@ -7,8 +7,8 @@ import info.nightscout.automation.R import info.nightscout.automation.elements.InputTimeRange import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel +import info.nightscout.core.utils.JsonHelper.safeGetInt import info.nightscout.core.utils.MidnightUtils -import info.nightscout.interfaces.utils.JsonHelper.safeGetInt import info.nightscout.interfaces.utils.MidnightTime import info.nightscout.rx.logging.LTag import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt index 28f2addfb3..420b4a7e9c 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt @@ -9,8 +9,8 @@ import info.nightscout.automation.elements.InputString import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel +import info.nightscout.core.utils.JsonHelper import info.nightscout.interfaces.receivers.ReceiverStatusStore -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.rx.logging.LTag import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/MaintenanceFragment.kt b/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/MaintenanceFragment.kt index 48e152d2b4..a00baaca9b 100644 --- a/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/MaintenanceFragment.kt +++ b/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/MaintenanceFragment.kt @@ -12,6 +12,7 @@ import info.nightscout.configuration.databinding.MaintenanceFragmentBinding import info.nightscout.configuration.maintenance.activities.LogSettingActivity import info.nightscout.core.graph.OverviewData import info.nightscout.core.ui.dialogs.OKDialog +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources @@ -26,7 +27,6 @@ import info.nightscout.interfaces.protection.ProtectionCheck.Protection.PREFEREN import info.nightscout.interfaces.pump.PumpSync import info.nightscout.interfaces.sync.DataSyncSelectorXdrip import info.nightscout.interfaces.ui.UiInteraction -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventPreferenceChange diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt index 1494a61328..6c299b94c1 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt @@ -18,13 +18,13 @@ import androidx.recyclerview.widget.LinearSmoothScroller import androidx.recyclerview.widget.RecyclerView import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.ValueWithUnit import info.nightscout.interfaces.logging.UserEntryLogger import info.nightscout.interfaces.receivers.ReceiverStatusStore -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.plugins.constraints.R import info.nightscout.plugins.constraints.databinding.ObjectivesFragmentBinding import info.nightscout.plugins.constraints.databinding.ObjectivesItemBinding @@ -100,8 +100,8 @@ class ObjectivesFragment : DaggerFragment() { .toObservable(EventObjectivesUpdateGui::class.java) .observeOn(aapsSchedulers.main) .subscribe({ - binding.recyclerview.adapter?.notifyDataSetChanged() - }, fabricPrivacy::logException) + binding.recyclerview.adapter?.notifyDataSetChanged() + }, fabricPrivacy::logException) } @Synchronized @@ -224,7 +224,12 @@ class ObjectivesFragment : DaggerFragment() { val state = TextView(holder.binding.progress.context) state.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) val basicHTML = "%2\$s" - val formattedHTML = String.format(basicHTML, if (task.isCompleted()) rh.gac(context, info.nightscout.core.ui.R.attr.isCompletedColor) else rh.gac(context, info.nightscout.core.ui.R.attr.isNotCompletedColor), task.progress) + val formattedHTML = + String.format( + basicHTML, + if (task.isCompleted()) rh.gac(context, info.nightscout.core.ui.R.attr.isCompletedColor) else rh.gac(context, info.nightscout.core.ui.R.attr.isNotCompletedColor), + task.progress + ) state.text = HtmlHelper.fromHtml(formattedHTML) state.gravity = Gravity.END holder.binding.progress.addView(state, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT) @@ -333,8 +338,10 @@ class ObjectivesFragment : DaggerFragment() { holder.binding.unstart.setOnClickListener { activity?.let { activity -> OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.objectives), rh.gs(R.string.doyouwantresetstart), Runnable { - uel.log(Action.OBJECTIVE_UNSTARTED, Sources.Objectives, - ValueWithUnit.SimpleInt(position + 1)) + uel.log( + Action.OBJECTIVE_UNSTARTED, Sources.Objectives, + ValueWithUnit.SimpleInt(position + 1) + ) objective.startedOn = 0 scrollToCurrentObjective() rxBus.send(EventObjectivesUpdateGui()) diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt index 3b4ae53379..f06bb93822 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt @@ -35,6 +35,7 @@ import info.nightscout.core.ui.UIRunnable import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.elements.SingleClickButton import info.nightscout.core.ui.toast.ToastUtils +import info.nightscout.core.utils.JsonHelper import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.core.wizard.QuickWizard import info.nightscout.database.entities.UserEntry.Action @@ -66,7 +67,6 @@ import info.nightscout.interfaces.source.DexcomBoyda import info.nightscout.interfaces.source.XDripSource import info.nightscout.interfaces.ui.UiInteraction import info.nightscout.interfaces.utils.DecimalFormatter -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.interfaces.utils.TrendCalculator import info.nightscout.plugins.R import info.nightscout.plugins.databinding.OverviewFragmentBinding @@ -843,7 +843,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList if (it.value.originalPercentage != 100 || it.value.originalTimeshift != 0L || it.value.originalDuration != 0L) info.nightscout.core.ui.R.attr.ribbonWarningColor else info.nightscout.core.ui.R.attr.ribbonDefaultColor - } else info.nightscout.core.ui.R.attr.ribbonDefaultColor + } else info.nightscout.core.ui.R.attr.ribbonDefaultColor } ?: info.nightscout.core.ui.R.attr.ribbonCriticalColor val profileTextColor = profile?.let { @@ -1095,7 +1095,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList } binding.infoLayout.sensitivity.text = - lastAutosensData?.let { + lastAutosensData?.let { String.format(Locale.ENGLISH, "%.0f%%", it.autosensResult.ratio * 100) } ?: "" // Show variable sensitivity diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt index 613790698f..04221f3cba 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt @@ -5,10 +5,10 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import dagger.android.support.DaggerFragment +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.interfaces.smsCommunicator.Sms import info.nightscout.interfaces.smsCommunicator.SmsCommunicator -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.plugins.databinding.SmscommunicatorFragmentBinding import info.nightscout.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui import info.nightscout.rx.AapsSchedulers diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt index 1eece2e053..df21a75f78 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt @@ -8,6 +8,7 @@ import info.nightscout.core.extensions.pureProfileFromJson import info.nightscout.core.profile.ProfileSealed import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils +import info.nightscout.core.utils.JsonHelper import info.nightscout.interfaces.Config import info.nightscout.interfaces.Constants import info.nightscout.interfaces.GlucoseUnit @@ -24,7 +25,6 @@ import info.nightscout.interfaces.profile.ProfileStore import info.nightscout.interfaces.profile.PureProfile import info.nightscout.interfaces.utils.DecimalFormatter import info.nightscout.interfaces.utils.HardLimits -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.plugins.R import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventLocalProfileChanged diff --git a/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt index 28fb917fb8..ce62786154 100644 --- a/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt @@ -4,6 +4,7 @@ import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf import dagger.android.HasAndroidInjector +import info.nightscout.core.utils.JsonHelper.safeGetString import info.nightscout.core.utils.worker.LoggingWorker import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.impl.AppRepository @@ -14,7 +15,6 @@ import info.nightscout.interfaces.plugin.PluginBase import info.nightscout.interfaces.plugin.PluginDescription import info.nightscout.interfaces.plugin.PluginType import info.nightscout.interfaces.source.BgSource -import info.nightscout.interfaces.utils.JsonHelper.safeGetString import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ResourceHelper diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSAlarm.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSAlarm.kt new file mode 100644 index 0000000000..f6ffa45c67 --- /dev/null +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSAlarm.kt @@ -0,0 +1,42 @@ +package info.nightscout.plugins.sync.nsShared + +import info.nightscout.core.utils.JsonHelper +import info.nightscout.interfaces.nsclient.NSAlarm +import org.json.JSONObject + +class NSAlarmObject(private var data: JSONObject) : NSAlarm { + /* + { + "level":2, + "title":"Urgent HIGH", + "message":"BG Now: 5.2 -0.1 → mmol\/L\nRaw BG: 5 mmol\/L Čistý\nBG 15m: 5 mmol\/L\nIOB: 0.00U\nCOB: 0g", + "eventName":"high", + "plugin":{"name":"simplealarms","label":"Simple Alarms","pluginType":"notification","enabled":true}, + "pushoverSound":"persistent", + "debug":{"lastSGV":5.2,"thresholds":{"bgHigh":80,"bgTargetTop":75,"bgTargetBottom":72,"bgLow":70}}, + "group":"default", + "key":"simplealarms_2" + } + */ + + override fun level(): Int = + JsonHelper.safeGetInt(data, "level", 0) + + override fun group(): String = + JsonHelper.safeGetString(data, "group", "N/A") + + override fun title(): String = + JsonHelper.safeGetString(data, "title", "N/A") + + override fun message(): String = + JsonHelper.safeGetString(data, "message", "N/A") + + override fun low(): Boolean = + JsonHelper.safeGetString(data, "eventName", "") == "low" + + override fun high(): Boolean = + JsonHelper.safeGetString(data, "eventName", "") == "high" + + override fun timeago(): Boolean = + JsonHelper.safeGetString(data, "eventName", "") == "timeago" +} \ No newline at end of file diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt index 98081b80a6..a522c6c990 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt @@ -18,6 +18,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import dagger.android.support.DaggerFragment import info.nightscout.core.ui.dialogs.OKDialog +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.database.entities.UserEntry import info.nightscout.interfaces.Config @@ -26,7 +27,6 @@ import info.nightscout.interfaces.logging.UserEntryLogger import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.plugin.PluginBase import info.nightscout.interfaces.plugin.PluginFragment -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.databinding.NsClientFragmentBinding import info.nightscout.plugins.sync.databinding.NsClientLogItemBinding @@ -235,6 +235,7 @@ class NSClientFragment : DaggerFragment(), MenuProvider, PluginFragment { private fun updateLog() { _binding?.recyclerview?.swapAdapter(RecyclerViewAdapter(nsClientPlugin?.listLog ?: arrayListOf()), true) } + private inner class RecyclerViewAdapter(private var logList: List) : RecyclerView.Adapter() { override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): NsClientLogViewHolder = diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSSgv.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSSgv.kt new file mode 100644 index 0000000000..e0a4e713f4 --- /dev/null +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSSgv.kt @@ -0,0 +1,33 @@ +package info.nightscout.plugins.sync.nsShared + +import info.nightscout.core.utils.JsonHelper +import info.nightscout.interfaces.nsclient.NSSgv +import org.json.JSONObject + +/** + * + * {"mgdl":105,"mills":1455136282375,"device":"xDrip-BluetoothWixel","direction":"Flat","filtered":98272,"unfiltered":98272,"noise":1,"rssi":100} + */ +@Suppress("SpellCheckingInspection") +class NSSgvObject(val data: JSONObject) : NSSgv { + + override val mgdl: Int? + get() = JsonHelper.safeGetIntAllowNull(data, "mgdl") + override val filtered: Int? + get() = JsonHelper.safeGetIntAllowNull(data, "filtered") + override val unfiltered: Int? + get() = JsonHelper.safeGetIntAllowNull(data, "unfiltered") + override val noise: Int? + get() = JsonHelper.safeGetIntAllowNull(data, "noise") + override val rssi: Int? + get() = JsonHelper.safeGetIntAllowNull(data, "rssi") + override val mills: Long? + get() = JsonHelper.safeGetLongAllowNull(data, "mills") + override val device: String? + get() = JsonHelper.safeGetStringAllowNull(data, "device", null) + override val direction: String? + get() = JsonHelper.safeGetStringAllowNull(data, "direction", null) + override val id: String? + get() = JsonHelper.safeGetStringAllowNull(data, "_id", null) + +} \ No newline at end of file diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt index 57c441316f..025c31660a 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt @@ -1,19 +1,18 @@ package info.nightscout.plugins.sync.nsShared import info.nightscout.annotations.OpenForTesting +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.Food import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.transactions.TransactionGlucoseValue import info.nightscout.interfaces.Config import info.nightscout.interfaces.Constants import info.nightscout.interfaces.notifications.Notification -import info.nightscout.interfaces.nsclient.NSSgv import info.nightscout.interfaces.nsclient.StoreDataForDb import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.profile.Instantiator import info.nightscout.interfaces.profile.ProfileSource import info.nightscout.interfaces.source.NSClientSource -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsclient.extensions.fromJson import info.nightscout.plugins.sync.nsclientV3.extensions.toBolus @@ -70,7 +69,7 @@ class NsIncomingDataProcessor @Inject constructor( ) { private fun toGv(jsonObject: JSONObject): TransactionGlucoseValue? { - val sgv = NSSgv(jsonObject) + val sgv = NSSgvObject(jsonObject) return TransactionGlucoseValue( timestamp = sgv.mills ?: return null, value = sgv.mgdl?.toDouble() ?: return null, diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1.kt index f4a52bbe9c..e663197bc5 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorV1.kt @@ -1,12 +1,12 @@ package info.nightscout.plugins.sync.nsclient +import info.nightscout.core.utils.JsonHelper import info.nightscout.core.utils.waitMillis import info.nightscout.database.impl.AppRepository import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.source.NSClientSource import info.nightscout.interfaces.sync.DataSyncSelector -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiQueue import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiStatus diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt index b62eb70c96..c7f33f663c 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt @@ -1,11 +1,11 @@ package info.nightscout.plugins.sync.nsclient.data import info.nightscout.annotations.OpenForTesting +import info.nightscout.core.utils.HtmlHelper +import info.nightscout.core.utils.JsonHelper import info.nightscout.interfaces.Config -import info.nightscout.sdk.interfaces.RunningConfiguration import info.nightscout.interfaces.nsclient.ProcessedDeviceStatusData -import info.nightscout.interfaces.utils.HtmlHelper -import info.nightscout.interfaces.utils.JsonHelper +import info.nightscout.sdk.interfaces.RunningConfiguration import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus import info.nightscout.shared.sharedPreferences.SP import info.nightscout.shared.utils.DateUtil diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSMbg.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSMbg.kt index 9ab9cecf28..908c92925b 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSMbg.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSMbg.kt @@ -1,6 +1,6 @@ package info.nightscout.plugins.sync.nsclient.data -import info.nightscout.interfaces.utils.JsonHelper +import info.nightscout.core.utils.JsonHelper import org.json.JSONObject class NSMbg(val json: JSONObject) { diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt index ffdf576816..200cd69154 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt @@ -5,6 +5,7 @@ package info.nightscout.plugins.sync.nsclient.data import android.content.Context import info.nightscout.annotations.OpenForTesting import info.nightscout.core.ui.dialogs.OKDialog +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Action import info.nightscout.interfaces.Config @@ -13,7 +14,6 @@ import info.nightscout.interfaces.notifications.Notification import info.nightscout.interfaces.nsclient.NSSettingsStatus import info.nightscout.interfaces.profile.DefaultValueHelper import info.nightscout.interfaces.ui.UiInteraction -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.plugins.sync.R import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventDismissNotification diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt index 3fb8b68c28..5786ff11b7 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt @@ -2,12 +2,12 @@ package info.nightscout.plugins.sync.nsclient.data import android.text.Spanned import dagger.android.HasAndroidInjector +import info.nightscout.core.utils.HtmlHelper +import info.nightscout.core.utils.JsonHelper import info.nightscout.interfaces.aps.APSResult import info.nightscout.interfaces.nsclient.NSSettingsStatus import info.nightscout.interfaces.nsclient.ProcessedDeviceStatusData import info.nightscout.interfaces.profile.Instantiator -import info.nightscout.interfaces.utils.HtmlHelper -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.interfaces.utils.Round import info.nightscout.plugins.sync.R import info.nightscout.shared.interfaces.ResourceHelper @@ -46,30 +46,30 @@ class ProcessedDeviceStatusDataImpl @Inject constructor( // test warning level val level = when { - pumpData.clock + nsSettingsStatus.extendedPumpSettings("urgentClock") * 60 * 1000L < dateUtil.now() -> ProcessedDeviceStatusData.Levels.URGENT - pumpData.reservoir < nsSettingsStatus.extendedPumpSettings("urgentRes") -> ProcessedDeviceStatusData.Levels.URGENT - pumpData.isPercent && pumpData.percent < nsSettingsStatus.extendedPumpSettings("urgentBattP") -> ProcessedDeviceStatusData.Levels.URGENT - !pumpData.isPercent && pumpData.voltage > 0 && pumpData.voltage < nsSettingsStatus.extendedPumpSettings("urgentBattV") -> ProcessedDeviceStatusData.Levels.URGENT - pumpData.clock + nsSettingsStatus.extendedPumpSettings("warnClock") * 60 * 1000L < dateUtil.now() -> ProcessedDeviceStatusData.Levels.WARN - pumpData.reservoir < nsSettingsStatus.extendedPumpSettings("warnRes") -> ProcessedDeviceStatusData.Levels.WARN - pumpData.isPercent && pumpData.percent < nsSettingsStatus.extendedPumpSettings("warnBattP") -> ProcessedDeviceStatusData.Levels.WARN - !pumpData.isPercent && pumpData.voltage > 0 && pumpData.voltage < nsSettingsStatus.extendedPumpSettings("warnBattV") -> ProcessedDeviceStatusData.Levels.WARN - else -> ProcessedDeviceStatusData.Levels.INFO - } - string.append("") - // val insulinUnit = rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) + pumpData.clock + nsSettingsStatus.extendedPumpSettings("urgentClock") * 60 * 1000L < dateUtil.now() -> ProcessedDeviceStatusData.Levels.URGENT + pumpData.reservoir < nsSettingsStatus.extendedPumpSettings("urgentRes") -> ProcessedDeviceStatusData.Levels.URGENT + pumpData.isPercent && pumpData.percent < nsSettingsStatus.extendedPumpSettings("urgentBattP") -> ProcessedDeviceStatusData.Levels.URGENT + !pumpData.isPercent && pumpData.voltage > 0 && pumpData.voltage < nsSettingsStatus.extendedPumpSettings("urgentBattV") -> ProcessedDeviceStatusData.Levels.URGENT + pumpData.clock + nsSettingsStatus.extendedPumpSettings("warnClock") * 60 * 1000L < dateUtil.now() -> ProcessedDeviceStatusData.Levels.WARN + pumpData.reservoir < nsSettingsStatus.extendedPumpSettings("warnRes") -> ProcessedDeviceStatusData.Levels.WARN + pumpData.isPercent && pumpData.percent < nsSettingsStatus.extendedPumpSettings("warnBattP") -> ProcessedDeviceStatusData.Levels.WARN + !pumpData.isPercent && pumpData.voltage > 0 && pumpData.voltage < nsSettingsStatus.extendedPumpSettings("warnBattV") -> ProcessedDeviceStatusData.Levels.WARN + else -> ProcessedDeviceStatusData.Levels.INFO + } + string.append("") + // val insulinUnit = rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) // val fields = nsSettingsStatus.pumpExtendedSettingsFields() // Removed here. Same value is in StatusLights - // if (pumpData.reservoirDisplayOverride != "") string.append(pumpData.reservoirDisplayOverride).append("$insulinUnit ") - // else if (fields.contains("reservoir")) string.append(pumpData.reservoir.toInt()).append("$insulinUnit ") - if (pumpData.isPercent) string.append(pumpData.percent).append("% ") - if (!pumpData.isPercent && pumpData.voltage > 0) string.append(Round.roundTo(pumpData.voltage, 0.001)).append(" ") - string.append(dateUtil.minAgo(rh, pumpData.clock)).append(" ") - string.append(pumpData.status).append(" ") - //string.append(device).append(" ") - string.append("") // color - return HtmlHelper.fromHtml(string.toString()) - } + // if (pumpData.reservoirDisplayOverride != "") string.append(pumpData.reservoirDisplayOverride).append("$insulinUnit ") + // else if (fields.contains("reservoir")) string.append(pumpData.reservoir.toInt()).append("$insulinUnit ") + if (pumpData.isPercent) string.append(pumpData.percent).append("% ") + if (!pumpData.isPercent && pumpData.voltage > 0) string.append(Round.roundTo(pumpData.voltage, 0.001)).append(" ") + string.append(dateUtil.minAgo(rh, pumpData.clock)).append(" ") + string.append(pumpData.status).append(" ") + //string.append(device).append(" ") + string.append("") // color + return HtmlHelper.fromHtml(string.toString()) + } override val extendedPumpStatus: Spanned get() = pumpData?.extended ?: HtmlHelper.fromHtml("") override val extendedOpenApsStatus: Spanned @@ -101,9 +101,11 @@ class ProcessedDeviceStatusDataImpl @Inject constructor( // test warning level val level = when { - openAPSData.clockSuggested + T.mins(sp.getLong(info.nightscout.core.utils.R.string.key_ns_alarm_urgent_stale_data_value, 31)).msecs() < dateUtil.now() -> ProcessedDeviceStatusData.Levels.URGENT - openAPSData.clockSuggested + T.mins(sp.getLong(info.nightscout.core.utils.R.string.key_ns_alarm_stale_data_value, 16)).msecs() < dateUtil.now() -> ProcessedDeviceStatusData.Levels.WARN - else -> ProcessedDeviceStatusData.Levels.INFO + openAPSData.clockSuggested + T.mins(sp.getLong(info.nightscout.core.utils.R.string.key_ns_alarm_urgent_stale_data_value, 31)) + .msecs() < dateUtil.now() -> ProcessedDeviceStatusData.Levels.URGENT + + openAPSData.clockSuggested + T.mins(sp.getLong(info.nightscout.core.utils.R.string.key_ns_alarm_stale_data_value, 16)).msecs() < dateUtil.now() -> ProcessedDeviceStatusData.Levels.WARN + else -> ProcessedDeviceStatusData.Levels.INFO } string.append("") if (openAPSData.clockSuggested != 0L) string.append(dateUtil.minAgo(rh, openAPSData.clockSuggested)).append(" ") @@ -116,9 +118,10 @@ class ProcessedDeviceStatusDataImpl @Inject constructor( override fun getAPSResult(injector: HasAndroidInjector): APSResult = instantiator.provideAPSResultObject().also { - it.json = openAPSData.suggested - it.date = openAPSData.clockSuggested - } + it.json = openAPSData.suggested + it.date = openAPSData.clockSuggested + } + override val uploaderStatus: String get() { val iterator: Iterator<*> = uploaderMap.entries.iterator() diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusCalculatorResultExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusCalculatorResultExtension.kt index 41666a0277..27a773f481 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusCalculatorResultExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusCalculatorResultExtension.kt @@ -2,8 +2,8 @@ package info.nightscout.plugins.sync.nsclient.extensions import com.google.gson.Gson import com.google.gson.JsonSyntaxException +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.BolusCalculatorResult -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.shared.interfaces.ProfileUtil import info.nightscout.shared.utils.DateUtil import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt index e539cbedbb..6031659b9e 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.sync.nsclient.extensions +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.shared.utils.DateUtil import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt index b716c96171..b03e4bf85f 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt @@ -1,9 +1,9 @@ package info.nightscout.plugins.sync.nsclient.extensions +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.Carbs import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.shared.utils.DateUtil import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt index cbdf2818c8..11a8f2bc1a 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt @@ -2,10 +2,10 @@ package info.nightscout.plugins.sync.nsclient.extensions import info.nightscout.core.extensions.pureProfileFromJson import info.nightscout.core.profile.ProfileSealed +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.EffectiveProfileSwitch import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.interfaces.GlucoseUnit -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.shared.utils.DateUtil import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt index fca2364cb8..073602a355 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt @@ -1,10 +1,10 @@ package info.nightscout.plugins.sync.nsclient.extensions import info.nightscout.core.extensions.toTemporaryBasal +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.ExtendedBolus import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.interfaces.profile.Profile -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.shared.utils.DateUtil import info.nightscout.shared.utils.T import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/FoodExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/FoodExtension.kt index 9803d2dac6..d832b96c5a 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/FoodExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/FoodExtension.kt @@ -1,7 +1,7 @@ package info.nightscout.plugins.sync.nsclient.extensions +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.Food -import info.nightscout.interfaces.utils.JsonHelper import org.json.JSONObject fun Food.Companion.fromJson(jsonObject: JSONObject): Food? { diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt index 6bd358e81d..9b30daa022 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt @@ -1,8 +1,8 @@ package info.nightscout.plugins.sync.nsclient.extensions +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.OfflineEvent import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.shared.utils.DateUtil import info.nightscout.shared.utils.T import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt index e8b94af8ab..476ae32cdc 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt @@ -4,12 +4,12 @@ import info.nightscout.core.extensions.fromConstant import info.nightscout.core.extensions.getCustomizedName import info.nightscout.core.extensions.pureProfileFromJson import info.nightscout.core.profile.ProfileSealed +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.ProfileSwitch import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.utils.DecimalFormatter -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.shared.utils.DateUtil import info.nightscout.shared.utils.T import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt index fa13c74c19..6f52a7a7ba 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt @@ -1,11 +1,11 @@ package info.nightscout.plugins.sync.nsclient.extensions import info.nightscout.core.extensions.convertedToAbsolute +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.TemporaryBasal import info.nightscout.database.entities.TemporaryBasal.Type.Companion.fromString import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.interfaces.profile.Profile -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.shared.utils.DateUtil import info.nightscout.shared.utils.T import org.json.JSONObject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt index e275c17366..1fd84ce0b2 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt @@ -1,9 +1,9 @@ package info.nightscout.plugins.sync.nsclient.extensions +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.TemporaryTarget import info.nightscout.interfaces.Constants import info.nightscout.interfaces.GlucoseUnit -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.shared.interfaces.ProfileUtil import info.nightscout.shared.utils.DateUtil import info.nightscout.shared.utils.T diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt index 62a30dbb99..685b50b371 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt @@ -1,9 +1,9 @@ package info.nightscout.plugins.sync.nsclient.extensions +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.TherapyEvent import info.nightscout.interfaces.Constants import info.nightscout.interfaces.GlucoseUnit -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.plugins.sync.nsclient.data.NSMbg import info.nightscout.shared.utils.DateUtil import info.nightscout.shared.utils.T diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt index 060df385bd..3b745d08a8 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt @@ -17,18 +17,18 @@ import com.google.gson.JsonDeserializer import dagger.android.DaggerService import dagger.android.HasAndroidInjector import info.nightscout.core.events.EventNewNotification +import info.nightscout.core.utils.JsonHelper.safeGetString +import info.nightscout.core.utils.JsonHelper.safeGetStringAllowNull import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.database.impl.AppRepository import info.nightscout.interfaces.Config import info.nightscout.interfaces.notifications.Notification -import info.nightscout.interfaces.nsclient.NSAlarm import info.nightscout.interfaces.nsclient.NSSettingsStatus import info.nightscout.interfaces.nsclient.StoreDataForDb import info.nightscout.interfaces.ui.UiInteraction -import info.nightscout.interfaces.utils.JsonHelper.safeGetString -import info.nightscout.interfaces.utils.JsonHelper.safeGetStringAllowNull import info.nightscout.plugins.sync.R +import info.nightscout.plugins.sync.nsShared.NSAlarmObject import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor import info.nightscout.plugins.sync.nsShared.events.EventConnectivityOptionChanged import info.nightscout.plugins.sync.nsShared.events.EventNSClientStatus @@ -638,7 +638,7 @@ import javax.inject.Inject private fun handleAnnouncement(announcement: JSONObject) { val defaultVal = config.NSCLIENT if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_announcements, defaultVal)) { - val nsAlarm = NSAlarm(announcement) + val nsAlarm = NSAlarmObject(announcement) uiInteraction.addNotificationWithAction(injector, nsAlarm) rxBus.send(EventNSClientNewLog("◄ ANNOUNCEMENT", safeGetString(announcement, "message", "received"))) aapsLogger.debug(LTag.NSCLIENT, announcement.toString()) @@ -650,7 +650,7 @@ import javax.inject.Inject if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_alarms, defaultVal)) { val snoozedTo = sp.getLong(rh.gs(info.nightscout.core.utils.R.string.key_snoozed_to) + alarm.optString("level"), 0L) if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) { - val nsAlarm = NSAlarm(alarm) + val nsAlarm = NSAlarmObject(alarm) uiInteraction.addNotificationWithAction(injector, nsAlarm) } rxBus.send(EventNSClientNewLog("◄ ALARM", safeGetString(alarm, "message", "received"))) @@ -663,7 +663,7 @@ import javax.inject.Inject if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_alarms, defaultVal)) { val snoozedTo = sp.getLong(rh.gs(info.nightscout.core.utils.R.string.key_snoozed_to) + alarm.optString("level"), 0L) if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) { - val nsAlarm = NSAlarm(alarm) + val nsAlarm = NSAlarmObject(alarm) uiInteraction.addNotificationWithAction(injector, nsAlarm) } rxBus.send(EventNSClientNewLog("◄ URGENTALARM", safeGetString(alarm, "message", "received"))) diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt index 062cbd0067..0f08a9256d 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt @@ -3,6 +3,7 @@ package info.nightscout.plugins.sync.nsclient.workers import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf +import info.nightscout.core.utils.JsonHelper import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.core.utils.worker.LoggingWorker import info.nightscout.database.entities.Bolus @@ -20,7 +21,6 @@ import info.nightscout.interfaces.Config import info.nightscout.interfaces.nsclient.StoreDataForDb import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.pump.VirtualPump -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsclient.extensions.extendedBolusFromJson import info.nightscout.plugins.sync.nsclient.extensions.fromJson diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt index cfb9bc3e10..4e5ad23df1 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt @@ -1,6 +1,7 @@ package info.nightscout.plugins.sync.nsclientV3 import info.nightscout.annotations.OpenForTesting +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.impl.AppRepository import info.nightscout.interfaces.Config import info.nightscout.interfaces.nsclient.StoreDataForDb @@ -8,7 +9,6 @@ import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.source.NSClientSource import info.nightscout.interfaces.sync.DataSyncSelector -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiQueue import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiStatus diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt index ee34f38e64..83b32ad668 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt @@ -35,6 +35,7 @@ import info.nightscout.interfaces.sync.Sync import info.nightscout.interfaces.ui.UiInteraction import info.nightscout.interfaces.utils.DecimalFormatter import info.nightscout.plugins.sync.R +import info.nightscout.plugins.sync.nsShared.NSAlarmObject import info.nightscout.plugins.sync.nsShared.NSClientFragment import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor import info.nightscout.plugins.sync.nsShared.events.EventConnectivityOptionChanged @@ -525,7 +526,7 @@ class NSClientV3Plugin @Inject constructor( rxBus.send(EventNSClientNewLog("◄ ANNOUNCEMENT", data.optString("message"))) aapsLogger.debug(LTag.NSCLIENT, data.toString()) if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_announcements, config.NSCLIENT)) - uiInteraction.addNotificationWithAction(injector, NSAlarm(data)) + uiInteraction.addNotificationWithAction(injector, NSAlarmObject(data)) } private val onAlarm = Emitter.Listener { args -> @@ -548,7 +549,7 @@ class NSClientV3Plugin @Inject constructor( if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_alarms, config.NSCLIENT)) { val snoozedTo = sp.getLong(rh.gs(info.nightscout.core.utils.R.string.key_snoozed_to) + data.optString("level"), 0L) if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) - uiInteraction.addNotificationWithAction(injector, NSAlarm(data)) + uiInteraction.addNotificationWithAction(injector, NSAlarmObject(data)) } } @@ -559,7 +560,7 @@ class NSClientV3Plugin @Inject constructor( if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_alarms, config.NSCLIENT)) { val snoozedTo = sp.getLong(rh.gs(info.nightscout.core.utils.R.string.key_snoozed_to) + data.optString("level"), 0L) if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) - uiInteraction.addNotificationWithAction(injector, NSAlarm(data)) + uiInteraction.addNotificationWithAction(injector, NSAlarmObject(data)) } } diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt index ce4a7d81ca..130930b083 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt @@ -3,10 +3,10 @@ package info.nightscout.plugins.sync.nsclientV3.workers import android.content.Context import androidx.work.WorkerParameters import androidx.work.workDataOf +import info.nightscout.core.utils.JsonHelper import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.core.utils.worker.LoggingWorker import info.nightscout.interfaces.sync.NsClient -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin import info.nightscout.rx.bus.RxBus diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt index 0bcbf14233..3422c259dc 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt @@ -5,6 +5,7 @@ import android.text.Spanned import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import dagger.android.HasAndroidInjector +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.interfaces.Constants import info.nightscout.interfaces.plugin.PluginBase @@ -13,7 +14,6 @@ import info.nightscout.interfaces.plugin.PluginType import info.nightscout.interfaces.sync.Sync import info.nightscout.interfaces.sync.Tidepool import info.nightscout.interfaces.ui.UiInteraction -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsShared.events.EventConnectivityOptionChanged import info.nightscout.plugins.sync.nsclient.ReceiverDelegate diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt index 6fd20db5be..57e13016a7 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/DataSyncSelectorXdripImpl.kt @@ -1,13 +1,13 @@ package info.nightscout.plugins.sync.xdrip import dagger.Lazy +import info.nightscout.core.utils.JsonHelper import info.nightscout.database.impl.AppRepository import info.nightscout.interfaces.XDripBroadcast import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.sync.DataSyncSelector import info.nightscout.interfaces.sync.DataSyncSelectorXdrip -import info.nightscout.interfaces.utils.JsonHelper import info.nightscout.plugins.sync.R import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt index 973abdcff7..ebbf7d1e2b 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt @@ -15,6 +15,7 @@ import info.nightscout.core.extensions.toStringShort import info.nightscout.core.iob.generateCOBString import info.nightscout.core.iob.round import info.nightscout.core.ui.toast.ToastUtils +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.interfaces.Constants import info.nightscout.interfaces.GlucoseUnit @@ -31,7 +32,6 @@ import info.nightscout.interfaces.sync.DataSyncSelector import info.nightscout.interfaces.sync.Sync import info.nightscout.interfaces.ui.UiInteraction import info.nightscout.interfaces.utils.DecimalFormatter -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsclient.extensions.toJson import info.nightscout.plugins.sync.xdrip.events.EventXdripUpdateGUI diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt index 1b980a2c61..56ce69b92a 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt @@ -7,6 +7,7 @@ import android.view.ViewGroup import com.google.common.base.Joiner import dagger.android.HasAndroidInjector import info.nightscout.core.ui.dialogs.OKDialog +import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.ValueWithUnit @@ -14,7 +15,6 @@ import info.nightscout.interfaces.GlucoseUnit import info.nightscout.interfaces.XDripBroadcast import info.nightscout.interfaces.iob.GlucoseStatusProvider import info.nightscout.interfaces.logging.UserEntryLogger -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.shared.interfaces.ProfileUtil import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.ui.databinding.DialogCalibrationBinding diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt index 6d250a5ab4..0cc7b4cb5d 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt @@ -10,6 +10,7 @@ import android.view.ViewGroup import com.google.common.base.Joiner import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.extensions.formatColor import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.UserEntry.Action @@ -35,7 +36,6 @@ import info.nightscout.interfaces.queue.Callback import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.interfaces.ui.UiInteraction import info.nightscout.interfaces.utils.DecimalFormatter -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ProfileUtil import info.nightscout.shared.interfaces.ResourceHelper @@ -278,7 +278,12 @@ class CarbsDialog : DialogFragmentWithDate() { if (duration > 0) actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + duration + rh.gs(info.nightscout.shared.R.string.shorthour)) if (carbsAfterConstraints > 0) { - actions.add(rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + "" + rh.gs(info.nightscout.core.main.R.string.format_carbs, carbsAfterConstraints) + "") + actions.add( + rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + "" + rh.gs(info.nightscout.core.main.R.string.format_carbs, carbsAfterConstraints) + "" + ) if (carbsAfterConstraints != carbs) actions.add("" + rh.gs(R.string.carbs_constraint_applied) + "") } diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt index 51e43dc544..c6532abe62 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt @@ -12,6 +12,7 @@ import com.google.common.base.Joiner import dagger.android.HasAndroidInjector import info.nightscout.core.extensions.fromConstant import info.nightscout.core.ui.dialogs.OKDialog +import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit @@ -24,7 +25,6 @@ import info.nightscout.interfaces.iob.GlucoseStatusProvider import info.nightscout.interfaces.logging.UserEntryLogger import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.ui.UiInteraction -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ProfileUtil import info.nightscout.shared.interfaces.ResourceHelper diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt index bc124586a0..10f02b2f0f 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt @@ -8,6 +8,7 @@ import android.view.ViewGroup import com.google.common.base.Joiner import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.extensions.formatColor import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit @@ -19,7 +20,6 @@ import info.nightscout.interfaces.protection.ProtectionCheck import info.nightscout.interfaces.queue.Callback import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.interfaces.ui.UiInteraction -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.logging.LTag import info.nightscout.shared.SafeParse import info.nightscout.shared.interfaces.ResourceHelper diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt index 55a49ff99e..2b1084f47b 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt @@ -8,6 +8,7 @@ import android.view.ViewGroup import com.google.common.base.Joiner import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.extensions.formatColor import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.UserEntry @@ -24,7 +25,6 @@ import info.nightscout.interfaces.queue.Callback import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.interfaces.ui.UiInteraction import info.nightscout.interfaces.utils.DecimalFormatter -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.logging.LTag import info.nightscout.shared.SafeParse import info.nightscout.shared.interfaces.ResourceHelper @@ -125,7 +125,9 @@ class FillDialog : DialogFragmentWithDate() { .formatColor(context, rh, info.nightscout.core.ui.R.attr.insulinButtonColor) ) if (abs(insulinAfterConstraints - insulin) > 0.01) - actions.add(rh.gs(info.nightscout.core.ui.R.string.bolus_constraint_applied_warn, insulin, insulinAfterConstraints).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor)) + actions.add( + rh.gs(info.nightscout.core.ui.R.string.bolus_constraint_applied_warn, insulin, insulinAfterConstraints).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor) + ) } val siteChange = binding.fillCatheterChange.isChecked if (siteChange) diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt index 59f0addbdf..1c8596bc04 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt @@ -10,6 +10,7 @@ import android.view.ViewGroup import com.google.common.base.Joiner import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.extensions.formatColor import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.UserEntry @@ -35,7 +36,6 @@ import info.nightscout.interfaces.queue.Callback import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.interfaces.ui.UiInteraction import info.nightscout.interfaces.utils.DecimalFormatter -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.logging.LTag import info.nightscout.shared.SafeParse import info.nightscout.shared.extensions.toVisibility @@ -204,7 +204,9 @@ class InsulinDialog : DialogFragmentWithDate() { if (recordOnlyChecked) actions.add(rh.gs(info.nightscout.core.ui.R.string.bolus_recorded_only).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor)) if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints)) - actions.add(rh.gs(info.nightscout.core.ui.R.string.bolus_constraint_applied_warn, insulin, insulinAfterConstraints).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor)) + actions.add( + rh.gs(info.nightscout.core.ui.R.string.bolus_constraint_applied_warn, insulin, insulinAfterConstraints).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor) + ) } val eatingSoonTTDuration = defaultValueHelper.determineEatingSoonTTDuration() val eatingSoonTT = defaultValueHelper.determineEatingSoonTT() diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt index 28ddf76c7d..197f0dda9d 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt @@ -12,6 +12,7 @@ import com.google.common.base.Joiner import info.nightscout.core.profile.ProfileSealed import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils +import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit @@ -25,7 +26,6 @@ import info.nightscout.interfaces.profile.DefaultValueHelper import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.protection.ProtectionCheck import info.nightscout.interfaces.utils.HardLimits -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.bus.RxBus import info.nightscout.rx.logging.LTag import info.nightscout.shared.extensions.toVisibility diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt index 0bd001a4d9..4e35a60cd9 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt @@ -13,6 +13,7 @@ import info.nightscout.core.extensions.getCustomizedName import info.nightscout.core.extensions.pureProfileFromJson import info.nightscout.core.main.R import info.nightscout.core.profile.ProfileSealed +import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.ValueWrapper import info.nightscout.database.impl.AppRepository import info.nightscout.interfaces.Config @@ -22,7 +23,6 @@ import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.ui.UiInteraction import info.nightscout.interfaces.utils.DecimalFormatter import info.nightscout.interfaces.utils.HardLimits -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.bus.RxBus import info.nightscout.shared.extensions.toVisibility import info.nightscout.shared.interfaces.ProfileUtil diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt index f5be09f454..730af01f57 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt @@ -8,6 +8,7 @@ import android.view.ViewGroup import com.google.common.base.Joiner import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.extensions.formatColor import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit @@ -22,7 +23,6 @@ import info.nightscout.interfaces.pump.defs.PumpDescription import info.nightscout.interfaces.queue.Callback import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.interfaces.ui.UiInteraction -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.logging.LTag import info.nightscout.shared.SafeParse import info.nightscout.shared.interfaces.ResourceHelper diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt index 175c8f2d74..7e08d66765 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt @@ -10,6 +10,7 @@ import com.google.common.base.Joiner import com.google.common.collect.Lists import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils +import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.UserEntry @@ -24,7 +25,6 @@ import info.nightscout.interfaces.logging.UserEntryLogger import info.nightscout.interfaces.profile.DefaultValueHelper import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.protection.ProtectionCheck -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.logging.LTag import info.nightscout.shared.interfaces.ProfileUtil import info.nightscout.shared.interfaces.ResourceHelper @@ -186,31 +186,34 @@ class TempTargetDialog : DialogFragmentWithDate() { OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.temporary_target), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { val units = profileFunction.getUnits() when (reason) { - rh.gs(info.nightscout.core.ui.R.string.eatingsoon) -> uel.log( + rh.gs(info.nightscout.core.ui.R.string.eatingsoon) -> uel.log( UserEntry.Action.TT, UserEntry.Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason( TemporaryTarget.Reason.EATING_SOON ), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration) ) - rh.gs(info.nightscout.core.ui.R.string.activity) -> uel.log( + rh.gs(info.nightscout.core.ui.R.string.activity) -> uel.log( UserEntry.Action.TT, UserEntry.Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason( TemporaryTarget.Reason.ACTIVITY ), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration) ) - rh.gs(info.nightscout.core.ui.R.string.hypo) -> uel.log( + rh.gs(info.nightscout.core.ui.R.string.hypo) -> uel.log( UserEntry.Action.TT, UserEntry.Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason( TemporaryTarget.Reason.HYPOGLYCEMIA ), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration) ) - rh.gs(info.nightscout.core.ui.R.string.manual) -> uel.log( + rh.gs(info.nightscout.core.ui.R.string.manual) -> uel.log( UserEntry.Action.TT, UserEntry.Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason( TemporaryTarget.Reason.CUSTOM ), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration) ) - rh.gs(info.nightscout.core.ui.R.string.stoptemptarget) -> uel.log(UserEntry.Action.CANCEL_TT, UserEntry.Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }) + rh.gs(info.nightscout.core.ui.R.string.stoptemptarget) -> uel.log( + UserEntry.Action.CANCEL_TT, + UserEntry.Sources.TTDialog, + ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }) } if (target == 0.0 || duration == 0) { disposable += repository.runTransactionForResult(CancelCurrentTemporaryTargetIfAnyTransaction(eventTime)) diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt index c48c1fbe5d..25e2905bf4 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt @@ -10,6 +10,7 @@ import android.view.ViewGroup import com.google.common.base.Joiner import info.nightscout.core.ui.dialogs.OKDialog import info.nightscout.core.ui.toast.ToastUtils +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.extensions.formatColor import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit @@ -26,7 +27,6 @@ import info.nightscout.interfaces.queue.Callback import info.nightscout.interfaces.queue.CommandQueue import info.nightscout.interfaces.ui.UiInteraction import info.nightscout.interfaces.utils.DecimalFormatter -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.rx.logging.LTag import info.nightscout.shared.SafeParse import info.nightscout.shared.interfaces.ResourceHelper @@ -157,8 +157,12 @@ class TreatmentDialog : DialogFragmentWithDate() { ) } if (carbsAfterConstraints > 0) { - actions.add(rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + rh.gs(info.nightscout.core.main.R.string.format_carbs, carbsAfterConstraints).formatColor(context, rh, info.nightscout - .core.ui.R.attr.carbsColor)) + actions.add( + rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + rh.gs(info.nightscout.core.main.R.string.format_carbs, carbsAfterConstraints).formatColor( + context, rh, info.nightscout + .core.ui.R.attr.carbsColor + ) + ) if (carbsAfterConstraints != carbs) actions.add(rh.gs(R.string.carbs_constraint_applied).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor)) } diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt index 319db875e9..690e6080a1 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt @@ -22,6 +22,7 @@ import info.nightscout.core.extensions.valueToUnits import info.nightscout.core.iob.round import info.nightscout.core.profile.ProfileSealed import info.nightscout.core.ui.toast.ToastUtils +import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.extensions.formatColor import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.core.wizard.BolusWizard @@ -37,7 +38,6 @@ import info.nightscout.interfaces.profile.Profile import info.nightscout.interfaces.profile.ProfileFunction import info.nightscout.interfaces.protection.ProtectionCheck import info.nightscout.interfaces.utils.DecimalFormatter -import info.nightscout.interfaces.utils.HtmlHelper import info.nightscout.interfaces.utils.Round import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus @@ -515,9 +515,13 @@ class WizardDialog : DaggerDialogFragment() { } if (wizard.calculatedTotalInsulin > 0.0 || carbsAfterConstraint > 0.0) { - val insulinText = if (wizard.calculatedTotalInsulin > 0.0) rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, wizard.calculatedTotalInsulin).formatColor(context, rh, info.nightscout.core.ui.R.attr.bolusColor) else "" - val carbsText = if (carbsAfterConstraint > 0.0) rh.gs(info.nightscout.core.main.R.string.format_carbs, carbsAfterConstraint).formatColor(context, rh, info.nightscout.core.ui.R.attr - .carbsColor) else "" + val insulinText = + if (wizard.calculatedTotalInsulin > 0.0) rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, wizard.calculatedTotalInsulin) + .formatColor(context, rh, info.nightscout.core.ui.R.attr.bolusColor) else "" + val carbsText = if (carbsAfterConstraint > 0.0) rh.gs(info.nightscout.core.main.R.string.format_carbs, carbsAfterConstraint).formatColor( + context, rh, info.nightscout.core.ui.R.attr + .carbsColor + ) else "" binding.total.text = HtmlHelper.fromHtml(rh.gs(R.string.result_insulin_carbs, insulinText, carbsText)) binding.okcancel.ok.visibility = View.VISIBLE } else {