From be35597da49c95bd0e55d58adda1f5cbd881a56f Mon Sep 17 00:00:00 2001 From: Philoul Date: Sat, 3 Apr 2021 18:51:36 +0200 Subject: [PATCH] Add Pump Sources (only Dana currently has an Entry, but required I think for pump history uploaded in AAPS, or Prime/Fill/ReservoirChange from pump) --- .../nightscout/androidaps/utils/Translator.kt | 43 +++++++++++++++++++ .../utils/UserEntryPresentationHelper.kt | 13 ++++++ .../src/main/res/drawable/ic_combo_128.xml | 0 .../src/main/res/drawable/ic_danars_128.xml | 0 .../src/main/res/drawable/ic_ict.xml | 0 .../src/main/res/drawable/ic_insight_128.xml | 0 .../src/main/res/drawable/ic_pod_128.xml | 0 .../src/main/res/drawable/ic_veo_128.xml | 0 .../src/main/res/drawable/ic_virtual_pump.xml | 0 .../androidaps/dana/DanaFragment.kt | 2 +- .../androidaps/database/entities/UserEntry.kt | 13 ++++++ 11 files changed, 70 insertions(+), 1 deletion(-) rename {combo => core}/src/main/res/drawable/ic_combo_128.xml (100%) rename {dana => core}/src/main/res/drawable/ic_danars_128.xml (100%) rename {app => core}/src/main/res/drawable/ic_ict.xml (100%) rename {insight => core}/src/main/res/drawable/ic_insight_128.xml (100%) rename {omnipod-common => core}/src/main/res/drawable/ic_pod_128.xml (100%) rename {medtronic => core}/src/main/res/drawable/ic_veo_128.xml (100%) rename {app => core}/src/main/res/drawable/ic_virtual_pump.xml (100%) diff --git a/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt b/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt index be2fd0eb25..4895e5e90a 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt +++ b/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt @@ -207,6 +207,49 @@ class Translator @Inject internal constructor( Sources.ConfigBuilder -> TODO() Sources.Overview -> TODO() Sources.Stats -> TODO() + Sources.TreatmentDialog -> TODO() + Sources.InsulinDialog -> TODO() + Sources.CarbDialog -> TODO() + Sources.WizardDialog -> TODO() + Sources.QuickWizard -> TODO() + Sources.ExtendedBolusDialog -> TODO() + Sources.TTDialog -> TODO() + Sources.ProfileSwitchDialog -> TODO() + Sources.LoopDialog -> TODO() + Sources.TempBasalDialog -> TODO() + Sources.CalibrationDialog -> TODO() + Sources.FillDialog -> TODO() + Sources.BgCheck -> TODO() + Sources.SensorInsert -> TODO() + Sources.BatteryChange -> TODO() + Sources.Note -> TODO() + Sources.Exercise -> TODO() + Sources.Question -> TODO() + Sources.Announcement -> TODO() + Sources.Actions -> TODO() + Sources.BG -> TODO() + Sources.LocalProfile -> TODO() + Sources.Maintenance -> TODO() + Sources.NSProfile -> TODO() + Sources.Objectives -> TODO() + Sources.Dana -> TODO() + Sources.DanaR -> TODO() + Sources.DanaRC -> TODO() + Sources.DanaRv2 -> TODO() + Sources.DanaRS -> TODO() + Sources.Insight -> TODO() + Sources.Combo -> TODO() + Sources.Medtronic -> TODO() + Sources.Omnipod -> TODO() + Sources.OmnipodEros -> TODO() + Sources.OmnipodDash -> TODO() + Sources.MDI -> TODO() + Sources.VirtualPump -> TODO() + Sources.Treatments -> TODO() + Sources.Food -> TODO() + Sources.ConfigBuilder -> TODO() + Sources.Overview -> TODO() + Sources.Stats -> TODO() */ Sources.Automation -> resourceHelper.gs(R.string.automation) Sources.Loop -> resourceHelper.gs(R.string.loop) diff --git a/core/src/main/java/info/nightscout/androidaps/utils/UserEntryPresentationHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/UserEntryPresentationHelper.kt index 45e7e19106..856b1e59a9 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/UserEntryPresentationHelper.kt +++ b/core/src/main/java/info/nightscout/androidaps/utils/UserEntryPresentationHelper.kt @@ -64,6 +64,19 @@ class UserEntryPresentationHelper @Inject constructor( Sources.NSProfile -> R.drawable.ic_nightscout_profile Sources.Objectives -> R.drawable.ic_graduation Sources.Pump -> R.drawable.ic_generic_icon + Sources.Dana -> R.drawable.ic_danars_128 + Sources.DanaR -> R.drawable.ic_danars_128 + Sources.DanaRC -> R.drawable.ic_danars_128 + Sources.DanaRv2 -> R.drawable.ic_danars_128 + Sources.DanaRS -> R.drawable.ic_danars_128 + Sources.Insight -> R.drawable.ic_insight_128 + Sources.Combo -> R.drawable.ic_combo_128 + Sources.Medtronic -> R.drawable.ic_veo_128 + Sources.Omnipod -> R.drawable.ic_pod_128 + Sources.OmnipodEros -> R.drawable.ic_pod_128 + Sources.OmnipodDash -> R.drawable.ic_pod_128 + Sources.MDI -> R.drawable.ic_ict + Sources.VirtualPump -> R.drawable.ic_virtual_pump Sources.SMS -> R.drawable.ic_sms Sources.Treatments -> R.drawable.ic_treatments Sources.Wear -> R.drawable.ic_watch diff --git a/combo/src/main/res/drawable/ic_combo_128.xml b/core/src/main/res/drawable/ic_combo_128.xml similarity index 100% rename from combo/src/main/res/drawable/ic_combo_128.xml rename to core/src/main/res/drawable/ic_combo_128.xml diff --git a/dana/src/main/res/drawable/ic_danars_128.xml b/core/src/main/res/drawable/ic_danars_128.xml similarity index 100% rename from dana/src/main/res/drawable/ic_danars_128.xml rename to core/src/main/res/drawable/ic_danars_128.xml diff --git a/app/src/main/res/drawable/ic_ict.xml b/core/src/main/res/drawable/ic_ict.xml similarity index 100% rename from app/src/main/res/drawable/ic_ict.xml rename to core/src/main/res/drawable/ic_ict.xml diff --git a/insight/src/main/res/drawable/ic_insight_128.xml b/core/src/main/res/drawable/ic_insight_128.xml similarity index 100% rename from insight/src/main/res/drawable/ic_insight_128.xml rename to core/src/main/res/drawable/ic_insight_128.xml diff --git a/omnipod-common/src/main/res/drawable/ic_pod_128.xml b/core/src/main/res/drawable/ic_pod_128.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_pod_128.xml rename to core/src/main/res/drawable/ic_pod_128.xml diff --git a/medtronic/src/main/res/drawable/ic_veo_128.xml b/core/src/main/res/drawable/ic_veo_128.xml similarity index 100% rename from medtronic/src/main/res/drawable/ic_veo_128.xml rename to core/src/main/res/drawable/ic_veo_128.xml diff --git a/app/src/main/res/drawable/ic_virtual_pump.xml b/core/src/main/res/drawable/ic_virtual_pump.xml similarity index 100% rename from app/src/main/res/drawable/ic_virtual_pump.xml rename to core/src/main/res/drawable/ic_virtual_pump.xml diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt b/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt index 3bdf9980ba..4189e50da4 100644 --- a/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt +++ b/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt @@ -110,7 +110,7 @@ class DanaFragment : DaggerFragment() { binding.btconnection.setOnLongClickListener { activity?.let { OKDialog.showConfirmation(it, resourceHelper.gs(R.string.resetpairing)) { - uel.log(Action.CLEAR_PAIRING_KEYS, Sources.Pump) + uel.log(Action.CLEAR_PAIRING_KEYS, Sources.Dana) (activePlugin.activePump as DanaPumpInterface).clearPairing() } } diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt index d097001f8e..c08aa63119 100644 --- a/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt +++ b/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt @@ -127,6 +127,19 @@ data class UserEntry( NSProfile, //From NSProfile plugin Objectives, //From Objectives plugin Pump, //To update with one Source per pump + Dana, //Only one UserEntry in Common module Dana + DanaR, //No entry currently + DanaRC, //No entry currently + DanaRv2, //No entry currently + DanaRS, //No entry currently + Insight, //No entry currently + Combo, //No entry currently + Medtronic, //No entry currently + Omnipod, //No entry currently + OmnipodEros, //No entry currently + OmnipodDash, //No entry currently + MDI, //No entry currently + VirtualPump, //No entry currently SMS, //From SMS plugin Treatments, //From Treatments plugin Wear, //From Wear plugin