From 9eaba98dfa26bf807cf00ba4244d876360884cda Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Sat, 15 Jul 2017 11:19:27 +0200 Subject: [PATCH 01/77] TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals --- .../nightscout/androidaps/data/Intervals.java | 91 +++++++++++++++++++ .../data/NonOverlappingIntervals.java | 30 ++++++ .../androidaps/data/OverlappingIntervals.java | 80 ++-------------- .../interfaces/TreatmentsInterface.java | 8 +- .../ConfigBuilder/ConfigBuilderPlugin.java | 8 +- .../plugins/Treatments/TreatmentsPlugin.java | 16 ++-- .../TreatmentsExtendedBolusesFragment.java | 8 +- .../TreatmentsTempTargetFragment.java | 7 +- .../TreatmentsTemporaryBasalsFragment.java | 8 +- 9 files changed, 152 insertions(+), 104 deletions(-) create mode 100644 app/src/main/java/info/nightscout/androidaps/data/Intervals.java create mode 100644 app/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.java diff --git a/app/src/main/java/info/nightscout/androidaps/data/Intervals.java b/app/src/main/java/info/nightscout/androidaps/data/Intervals.java new file mode 100644 index 0000000000..772c73b4b1 --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/data/Intervals.java @@ -0,0 +1,91 @@ +package info.nightscout.androidaps.data; + +import android.support.annotation.Nullable; +import android.support.v4.util.LongSparseArray; + +import java.util.ArrayList; +import java.util.List; + +import info.nightscout.androidaps.interfaces.Interval; + +/** + * Created by mike on 09.05.2017. + */ + +// Zero duration means end of interval + +public abstract class Intervals { + + LongSparseArray rawData = new LongSparseArray<>(); // oldest at index 0 + + public Intervals reset() { + rawData = new LongSparseArray<>(); + return this; + } + + public void add(T newInterval) { + rawData.put(newInterval.start(), newInterval); + merge(); + } + + protected abstract void merge(); + + public void add(List list) { + for (T interval : list) { + rawData.put(interval.start(), interval); + } + merge(); + } + + + + public List getList() { + List list = new ArrayList<>(); + for (int i = 0; i < rawData.size(); i++) + list.add(rawData.valueAt(i)); + return list; + } + + public List getReversedList() { + List list = new ArrayList<>(); + for (int i = rawData.size() -1; i>=0; i--) + list.add(rawData.valueAt(i)); + return list; + } + + protected int binarySearch(long value) { + int lo = 0; + int hi = rawData.size() - 1; + + while (lo <= hi) { + final int mid = (lo + hi) >>> 1; + final Interval midVal = rawData.valueAt(mid); + + if (midVal.before(value)) { + lo = mid + 1; + } else if (midVal.after(value)) { + hi = mid - 1; + } else if (midVal.match(value)) { + return mid; // value found + } + } + return ~lo; // value not present + } + + public abstract T getValueByInterval(long time); + + public int size() { + return rawData.size(); + } + + public T get(int index) { + return rawData.valueAt(index); + } + + public T getReversed(int index) { + return rawData.valueAt(size() - 1 - index); + } + + + +} \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.java b/app/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.java new file mode 100644 index 0000000000..ca1d5abe63 --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.java @@ -0,0 +1,30 @@ +package info.nightscout.androidaps.data; + + +import android.support.annotation.Nullable; + +import info.nightscout.androidaps.interfaces.Interval; + +/** + * Created by adrian on 15/07/17. + */ + +public class NonOverlappingIntervals extends Intervals { + + protected void merge() { + for (int index = 0; index < rawData.size() - 1; index++) { + Interval i = rawData.valueAt(index); + long startOfNewer = rawData.valueAt(index + 1).start(); + if (i.originalEnd() > startOfNewer) { + i.cutEndTo(startOfNewer); + } + } + } + + @Nullable + public T getValueByInterval(long time) { + int index = binarySearch(time); + if (index >= 0) return rawData.valueAt(index); + return null; + } +} diff --git a/app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java b/app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java index cc03936766..182e2cf76f 100644 --- a/app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java +++ b/app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java @@ -1,41 +1,17 @@ package info.nightscout.androidaps.data; -import android.support.annotation.Nullable; -import android.support.v4.util.LongSparseArray; -import java.util.ArrayList; -import java.util.List; +import android.support.annotation.Nullable; import info.nightscout.androidaps.interfaces.Interval; /** - * Created by mike on 09.05.2017. + * Created by adrian on 15/07/17. */ -// Zero duration means end of interval +public class OverlappingIntervals extends Intervals { -public class OverlappingIntervals { - - private LongSparseArray rawData = new LongSparseArray<>(); // oldest at index 0 - - public OverlappingIntervals reset() { - rawData = new LongSparseArray<>(); - return this; - } - - public void add(T newInterval) { - rawData.put(newInterval.start(), newInterval); - merge(); - } - - public void add(List list) { - for (T interval : list) { - rawData.put(interval.start(), interval); - } - merge(); - } - - private void merge() { + protected void merge() { for (int index = 0; index < rawData.size() - 1; index++) { Interval i = rawData.valueAt(index); long startOfNewer = rawData.valueAt(index + 1).start(); @@ -46,54 +22,10 @@ public class OverlappingIntervals { } @Nullable - public Interval getValueByInterval(long time) { + public T getValueByInterval(long time) { int index = binarySearch(time); if (index >= 0) return rawData.valueAt(index); return null; } - public List getList() { - List list = new ArrayList<>(); - for (int i = 0; i < rawData.size(); i++) - list.add(rawData.valueAt(i)); - return list; - } - - public List getReversedList() { - List list = new ArrayList<>(); - for (int i = rawData.size() -1; i>=0; i--) - list.add(rawData.valueAt(i)); - return list; - } - - private int binarySearch(long value) { - int lo = 0; - int hi = rawData.size() - 1; - - while (lo <= hi) { - final int mid = (lo + hi) >>> 1; - final Interval midVal = rawData.valueAt(mid); - - if (midVal.before(value)) { - lo = mid + 1; - } else if (midVal.after(value)) { - hi = mid - 1; - } else if (midVal.match(value)) { - return mid; // value found - } - } - return ~lo; // value not present - } - - public int size() { - return rawData.size(); - } - - public T get(int index) { - return rawData.valueAt(index); - } - - public T getReversed(int index) { - return rawData.valueAt(size() - 1 - index); - } -} \ No newline at end of file +} diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java b/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java index d9e3742c70..5e8b4e52e8 100644 --- a/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java +++ b/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java @@ -10,7 +10,7 @@ import info.nightscout.androidaps.db.ProfileSwitch; import info.nightscout.androidaps.db.TempTarget; import info.nightscout.androidaps.db.TemporaryBasal; import info.nightscout.androidaps.db.Treatment; -import info.nightscout.androidaps.data.OverlappingIntervals; +import info.nightscout.androidaps.data.Intervals; import info.nightscout.androidaps.data.ProfileIntervals; /** @@ -42,18 +42,18 @@ public interface TreatmentsInterface { TemporaryBasal getTempBasalFromHistory(long time); double getTempBasalAbsoluteRateHistory(); double getTempBasalRemainingMinutesFromHistory(); - OverlappingIntervals getTemporaryBasalsFromHistory(); + Intervals getTemporaryBasalsFromHistory(); boolean isInHistoryExtendedBoluslInProgress(); ExtendedBolus getExtendedBolusFromHistory(long time); - OverlappingIntervals getExtendedBolusesFromHistory(); + Intervals getExtendedBolusesFromHistory(); boolean addToHistoryExtendedBolus(ExtendedBolus extendedBolus); boolean addToHistoryTreatment(DetailedBolusInfo detailedBolusInfo); TempTarget getTempTargetFromHistory(long time); - OverlappingIntervals getTempTargetsFromHistory(); + Intervals getTempTargetsFromHistory(); ProfileSwitch getProfileSwitchFromHistory(long time); ProfileIntervals getProfileSwitchesFromHistory(); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java index 28821e0242..239318a6e4 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java @@ -23,7 +23,7 @@ import info.nightscout.androidaps.R; import info.nightscout.androidaps.data.DetailedBolusInfo; import info.nightscout.androidaps.data.IobTotal; import info.nightscout.androidaps.data.MealData; -import info.nightscout.androidaps.data.OverlappingIntervals; +import info.nightscout.androidaps.data.Intervals; import info.nightscout.androidaps.data.Profile; import info.nightscout.androidaps.data.ProfileIntervals; import info.nightscout.androidaps.data.PumpEnactResult; @@ -827,7 +827,7 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain } @Override - public OverlappingIntervals getTemporaryBasalsFromHistory() { + public Intervals getTemporaryBasalsFromHistory() { return activeTreatments.getTemporaryBasalsFromHistory(); } @@ -874,7 +874,7 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain } @Override - public OverlappingIntervals getExtendedBolusesFromHistory() { + public Intervals getExtendedBolusesFromHistory() { return activeTreatments.getExtendedBolusesFromHistory(); } @@ -896,7 +896,7 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain } @Override - public OverlappingIntervals getTempTargetsFromHistory() { + public Intervals getTempTargetsFromHistory() { return activeTreatments.getTempTargetsFromHistory(); } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java index d7a2c26bc7..1c156cf146 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java @@ -8,7 +8,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.ArrayList; -import java.util.Date; import java.util.List; import info.nightscout.androidaps.Config; @@ -19,7 +18,8 @@ import info.nightscout.androidaps.data.DetailedBolusInfo; import info.nightscout.androidaps.data.Iob; import info.nightscout.androidaps.data.IobTotal; import info.nightscout.androidaps.data.MealData; -import info.nightscout.androidaps.data.OverlappingIntervals; +import info.nightscout.androidaps.data.Intervals; +import info.nightscout.androidaps.data.NonOverlappingIntervals; import info.nightscout.androidaps.data.Profile; import info.nightscout.androidaps.data.ProfileIntervals; import info.nightscout.androidaps.db.ExtendedBolus; @@ -48,9 +48,9 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface { public static IobTotal lastTempBasalsCalculation; public static List treatments; - private static OverlappingIntervals tempBasals = new OverlappingIntervals<>(); - private static OverlappingIntervals extendedBoluses = new OverlappingIntervals<>(); - private static OverlappingIntervals tempTargets = new OverlappingIntervals<>(); + private static Intervals tempBasals = new NonOverlappingIntervals(); + private static Intervals extendedBoluses = new NonOverlappingIntervals(); + private static Intervals tempTargets = new NonOverlappingIntervals(); private static ProfileIntervals profiles = new ProfileIntervals<>(); private static boolean fragmentEnabled = true; @@ -347,7 +347,7 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface { } @Override - public OverlappingIntervals getExtendedBolusesFromHistory() { + public Intervals getExtendedBolusesFromHistory() { return extendedBoluses; } @@ -380,7 +380,7 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface { } @Override - public OverlappingIntervals getTemporaryBasalsFromHistory() { + public Intervals getTemporaryBasalsFromHistory() { return tempBasals; } @@ -442,7 +442,7 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface { } @Override - public OverlappingIntervals getTempTargetsFromHistory() { + public Intervals getTempTargetsFromHistory() { return tempTargets; } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java index 0acbf4b2c5..ca1cb002f8 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java @@ -23,8 +23,6 @@ import com.squareup.otto.Subscribe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Date; - import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; import info.nightscout.androidaps.data.IobTotal; @@ -35,7 +33,7 @@ import info.nightscout.androidaps.events.EventNewBG; import info.nightscout.utils.DateUtil; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.NSUpload; -import info.nightscout.androidaps.data.OverlappingIntervals; +import info.nightscout.androidaps.data.Intervals; public class TreatmentsExtendedBolusesFragment extends Fragment { @@ -48,9 +46,9 @@ public class TreatmentsExtendedBolusesFragment extends Fragment { public class RecyclerViewAdapter extends RecyclerView.Adapter { - OverlappingIntervals extendedBolusList; + Intervals extendedBolusList; - RecyclerViewAdapter(OverlappingIntervals extendedBolusList) { + RecyclerViewAdapter(Intervals extendedBolusList) { this.extendedBolusList = extendedBolusList; } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java index 7a74ca4a86..e47ed3c8e9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java @@ -26,11 +26,10 @@ import info.nightscout.androidaps.Services.Intents; import info.nightscout.androidaps.db.Source; import info.nightscout.androidaps.db.TempTarget; import info.nightscout.androidaps.events.EventTempTargetChange; -import info.nightscout.androidaps.data.Profile; import info.nightscout.utils.DateUtil; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.NSUpload; -import info.nightscout.androidaps.data.OverlappingIntervals; +import info.nightscout.androidaps.data.Intervals; import info.nightscout.utils.SP; /** @@ -47,9 +46,9 @@ public class TreatmentsTempTargetFragment extends Fragment implements View.OnCli public class RecyclerViewAdapter extends RecyclerView.Adapter { - OverlappingIntervals tempTargetList; + Intervals tempTargetList; - RecyclerViewAdapter(OverlappingIntervals TempTargetList) { + RecyclerViewAdapter(Intervals TempTargetList) { this.tempTargetList = TempTargetList; } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java index 8db8a9c67b..219e421c49 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java @@ -23,8 +23,6 @@ import com.squareup.otto.Subscribe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Date; - import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; import info.nightscout.androidaps.data.IobTotal; @@ -35,7 +33,7 @@ import info.nightscout.androidaps.events.EventTempBasalChange; import info.nightscout.utils.DateUtil; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.NSUpload; -import info.nightscout.androidaps.data.OverlappingIntervals; +import info.nightscout.androidaps.data.Intervals; public class TreatmentsTemporaryBasalsFragment extends Fragment { @@ -50,9 +48,9 @@ public class TreatmentsTemporaryBasalsFragment extends Fragment { public class RecyclerViewAdapter extends RecyclerView.Adapter { - OverlappingIntervals tempBasalList; + Intervals tempBasalList; - RecyclerViewAdapter(OverlappingIntervals tempBasalList) { + RecyclerViewAdapter(Intervals tempBasalList) { this.tempBasalList = tempBasalList; } From cb08d1d76b82a0bfff3b154c809899c4c4f21aa2 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Sat, 15 Jul 2017 12:29:51 +0200 Subject: [PATCH 02/77] TT new "old" logic for temp targets --- .../nightscout/androidaps/data/Intervals.java | 13 +++++----- .../androidaps/data/OverlappingIntervals.java | 26 ++++++++++++++----- .../plugins/Treatments/TreatmentsPlugin.java | 3 ++- .../TreatmentsTempTargetFragment.java | 16 +++++++++--- 4 files changed, 40 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/data/Intervals.java b/app/src/main/java/info/nightscout/androidaps/data/Intervals.java index 772c73b4b1..a76ea9b4f8 100644 --- a/app/src/main/java/info/nightscout/androidaps/data/Intervals.java +++ b/app/src/main/java/info/nightscout/androidaps/data/Intervals.java @@ -16,20 +16,19 @@ import info.nightscout.androidaps.interfaces.Interval; public abstract class Intervals { - LongSparseArray rawData = new LongSparseArray<>(); // oldest at index 0 + LongSparseArray rawData = new LongSparseArray(); // oldest at index 0 public Intervals reset() { - rawData = new LongSparseArray<>(); + rawData = new LongSparseArray(); return this; } - public void add(T newInterval) { - rawData.put(newInterval.start(), newInterval); - merge(); - } - protected abstract void merge(); + /** + * The List must be sorted by `T.start()` in ascending order + * + * */ public void add(List list) { for (T interval : list) { rawData.put(interval.start(), interval); diff --git a/app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java b/app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java index 182e2cf76f..38193a22c9 100644 --- a/app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java +++ b/app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java @@ -12,19 +12,31 @@ import info.nightscout.androidaps.interfaces.Interval; public class OverlappingIntervals extends Intervals { protected void merge() { - for (int index = 0; index < rawData.size() - 1; index++) { - Interval i = rawData.valueAt(index); - long startOfNewer = rawData.valueAt(index + 1).start(); - if (i.originalEnd() > startOfNewer) { - i.cutEndTo(startOfNewer); + boolean needToCut = false; + long cutTime = 0; + + for (int index = rawData.size()-1; index > 0; index--) { //begin with newest + Interval cur = rawData.valueAt(index); + if (cur.isEndingEvent()){ + needToCut = true; + cutTime = cur.start(); + } else { + //event that is no EndingEvent might need to be stopped by an ending event + if(needToCut&&cur.end() > cutTime){ + cur.cutEndTo(cutTime); + } } } } @Nullable public T getValueByInterval(long time) { - int index = binarySearch(time); - if (index >= 0) return rawData.valueAt(index); + for (int index = rawData.size()-1; index > 0; index--) { //begin with newest + T cur = rawData.valueAt(index); + if (cur.match(time)){ + return cur; + } + } return null; } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java index 1c156cf146..6a7f8c0873 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java @@ -20,6 +20,7 @@ import info.nightscout.androidaps.data.IobTotal; import info.nightscout.androidaps.data.MealData; import info.nightscout.androidaps.data.Intervals; import info.nightscout.androidaps.data.NonOverlappingIntervals; +import info.nightscout.androidaps.data.OverlappingIntervals; import info.nightscout.androidaps.data.Profile; import info.nightscout.androidaps.data.ProfileIntervals; import info.nightscout.androidaps.db.ExtendedBolus; @@ -50,7 +51,7 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface { public static List treatments; private static Intervals tempBasals = new NonOverlappingIntervals(); private static Intervals extendedBoluses = new NonOverlappingIntervals(); - private static Intervals tempTargets = new NonOverlappingIntervals(); + private static Intervals tempTargets = new OverlappingIntervals(); private static ProfileIntervals profiles = new ProfileIntervals<>(); private static boolean fragmentEnabled = true; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java index e47ed3c8e9..2b3f310b38 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java @@ -47,9 +47,11 @@ public class TreatmentsTempTargetFragment extends Fragment implements View.OnCli public class RecyclerViewAdapter extends RecyclerView.Adapter { Intervals tempTargetList; + TempTarget currentlyActiveTarget; RecyclerViewAdapter(Intervals TempTargetList) { this.tempTargetList = TempTargetList; + currentlyActiveTarget = tempTargetList.getValueByInterval(System.currentTimeMillis()); } @Override @@ -80,10 +82,18 @@ public class TreatmentsTempTargetFragment extends Fragment implements View.OnCli holder.reasonLabel.setText(""); holder.reasonColon.setText(""); } - if (tempTarget.isInProgress()) - holder.date.setTextColor(ContextCompat.getColor(MainApp.instance(), R.color.colorActive)); - else + if (tempTarget.isInProgress()) { + if(tempTarget == currentlyActiveTarget){ + // active as newest + holder.date.setTextColor(ContextCompat.getColor(MainApp.instance(), R.color.colorInProgress)); + } else { + // other's that might become active again after the latest (overlapping) is over + holder.date.setTextColor(ContextCompat.getColor(MainApp.instance(), R.color.colorActive)); + } + } + else { holder.date.setTextColor(holder.reasonColon.getCurrentTextColor()); + } holder.remove.setTag(tempTarget); } From d5599f1f00ae09fe4e1950462772681fc0253367 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Sun, 16 Jul 2017 16:00:04 +0200 Subject: [PATCH 03/77] catch TransactionTooLargeException --- .../broadcasts/BroadcastTreatment.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java index 382d8734dd..d56e75ba73 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; import android.os.Bundle; +import android.os.TransactionTooLargeException; import org.json.JSONArray; import org.json.JSONException; @@ -46,9 +47,17 @@ public class BroadcastTreatment { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); + try { + List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); + log.debug("TREAT_ADD " + part.length() + " " + x.size() + " receivers"); + } catch (RuntimeException exception){ + if(exception.getCause() instanceof TransactionTooLargeException){ + log.error("TREAT_ADD " + part.length() + " ERROR: no receiver size, CAUSE: " + exception.getMessage()); + } else { + throw exception; + } + } - log.debug("TREAT_ADD " + part.length() + " " + x.size() + " receivers"); } } From c64c5f54015804ba8c3430b5ec0c5fb5bd235a19 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Sun, 16 Jul 2017 16:38:01 +0200 Subject: [PATCH 04/77] NS client quickfix - catch even more --- .../NSClientInternal/broadcasts/BroadcastTreatment.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java index d56e75ba73..baf81c45c9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java @@ -50,12 +50,8 @@ public class BroadcastTreatment { try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("TREAT_ADD " + part.length() + " " + x.size() + " receivers"); - } catch (RuntimeException exception){ - if(exception.getCause() instanceof TransactionTooLargeException){ - log.error("TREAT_ADD " + part.length() + " ERROR: no receiver size, CAUSE: " + exception.getMessage()); - } else { - throw exception; - } + } catch (Throwable exception){ + log.debug("TREAT_ADD " + part.length() + " ERROR: no receiver size, CAUSE: " + exception.getMessage()); } } From 0d1ff3d721cc14e68c683eadad2c7eaa833c292c Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Sun, 16 Jul 2017 16:49:26 +0200 Subject: [PATCH 05/77] ns client quickfix now catch all --- .../broadcasts/BroadcastAckAlarm.java | 8 ++++-- .../broadcasts/BroadcastAlarm.java | 5 ++++ .../broadcasts/BroadcastAnnouncement.java | 4 +++ .../broadcasts/BroadcastCals.java | 4 +++ .../broadcasts/BroadcastClearAlarm.java | 4 +++ .../broadcasts/BroadcastDeviceStatus.java | 8 ++++++ .../broadcasts/BroadcastMbgs.java | 4 +++ .../broadcasts/BroadcastProfile.java | 4 +++ .../broadcasts/BroadcastSgvs.java | 8 ++++++ .../broadcasts/BroadcastStatus.java | 4 +++ .../broadcasts/BroadcastTreatment.java | 28 ++++++++++++++----- .../broadcasts/BroadcastUrgentAlarm.java | 4 +++ 12 files changed, 76 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java index 4e6566e330..8b27da530a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java @@ -29,9 +29,13 @@ public class BroadcastAckAlarm { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); + try { + List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); + log.debug("ACKALARM " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } - log.debug("ACKALARM " + x.size() + " receivers"); } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java index 46e2ef1e68..1653a55bc6 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java @@ -26,8 +26,13 @@ public class BroadcastAlarm { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + + try{ List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("ALARM " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java index bb4d3de726..a39a59558f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java @@ -27,8 +27,12 @@ public class BroadcastAnnouncement { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("ANNOUNCEMENT " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java index 6601207851..6445f13f94 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java @@ -27,8 +27,12 @@ public class BroadcastCals { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("CAL " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java index 7272a81d95..c3c1e41994 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java @@ -26,8 +26,12 @@ public class BroadcastClearAlarm { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("CLEARALARM " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java index 15d8fe5b5d..1f338b0038 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java @@ -26,9 +26,13 @@ public class BroadcastDeviceStatus { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("DEVICESTATUS " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } public static void handleNewDeviceStatus(JSONArray statuses, Context context, boolean isDelta) { List splitted = BroadcastTreatment.splitArray(statuses); @@ -40,9 +44,13 @@ public class BroadcastDeviceStatus { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("DEVICESTATUS " + part.length() + " records " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java index 1430fbaf1a..7d66352328 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java @@ -27,8 +27,12 @@ public class BroadcastMbgs { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("MBG " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java index 4edad5db33..0b64da8384 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java @@ -28,9 +28,13 @@ public class BroadcastProfile { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("PROFILE " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java index e846b8171b..308a1fe395 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java @@ -28,9 +28,13 @@ public class BroadcastSgvs { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("SGV " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } public static void handleNewSgv(JSONArray sgvs, Context context, boolean isDelta) { @@ -41,9 +45,13 @@ public class BroadcastSgvs { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("SGV " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java index 20055aa108..8edd749a95 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java @@ -38,8 +38,12 @@ public class BroadcastStatus { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("STATUS: " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java index baf81c45c9..8975b54181 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java @@ -32,9 +32,13 @@ public class BroadcastTreatment { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("TREAT_ADD " + treatment.getEventType() + " " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } public static void handleNewTreatment(JSONArray treatments, Context context, boolean isDelta) { @@ -50,9 +54,9 @@ public class BroadcastTreatment { try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("TREAT_ADD " + part.length() + " " + x.size() + " receivers"); - } catch (Throwable exception){ - log.debug("TREAT_ADD " + part.length() + " ERROR: no receiver size, CAUSE: " + exception.getMessage()); - } + } catch (Exception e){ + //for testing + } } } @@ -65,11 +69,11 @@ public class BroadcastTreatment { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - try { log.debug("TREAT_CHANGE " + treatment.getString("_id") + " " + x.size() + " receivers"); - } catch (JSONException e) { + } catch (Exception e) { } } @@ -83,9 +87,13 @@ public class BroadcastTreatment { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("TREAT_CHANGE " + part.length() + " " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } } @@ -97,11 +105,13 @@ public class BroadcastTreatment { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - try { + log.debug("TREAT_REMOVE " + treatment.getString("_id") + " " + x.size() + " receivers"); - } catch (JSONException e) { + } catch (Exception e){ + //for testing } } @@ -113,9 +123,13 @@ public class BroadcastTreatment { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("TREAT_REMOVE " + treatments.length() + " treatments " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java index 10d0f068f5..3093e610bf 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java @@ -26,8 +26,12 @@ public class BroadcastUrgentAlarm { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); + try { List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); log.debug("URGENTALARM " + x.size() + " receivers"); + } catch (Exception e){ + //for testing + } } } From 7216418f446cb809f19afcea71b7fdd64adfd8ff Mon Sep 17 00:00:00 2001 From: PoweRGbg Date: Mon, 17 Jul 2017 11:37:00 +0300 Subject: [PATCH 06/77] Translated latest additions strings.xml --- app/src/main/res/values-bg/strings.xml | 1071 ++++++++++++++---------- 1 file changed, 612 insertions(+), 459 deletions(-) diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 0589e0a982..e1c69f31af 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1,159 +1,53 @@ - Closed Loop - Open Loop - APS режим - Ср. изменение - Базал - КЗ достъпна в NS - Болус - Приложено ограничение за болус - Откажи - Въглехидрати - Приложено ограничениe за въгл. - Careportal - Известие - Проверка на КЗ - Корекция с въглехидр. - Смяна на сензор - Рестарт на сензор - Комбиниран болус - Болус за корекция - Физ. активност - Смяна на резервоар - Болус за осн. хранене - Абсолютна - ВХ - ВХ след - Продължителност - min - Въведено от - Време - Инсулин - Глюкомер - Бележки - Друго - Процент - Профил - Сензор - Разделяне - Бележка - OpenAPS оффлайн - Смяна на профил - Смяна на сет - Въпрос - Болус за закуска - Край на временен базал - Начало на временен базал - Променете данните! - Конфигурация - APS - Източник на КЗ - Ограничения - Основен - Loop - Профил - Помпа - Временен базал - Treatments - Потвърждение - Приложено ограничение! - Нарушено ограничение - Czech - дни - Изменение: - Време - English - Enter new treatment: - КЗ - Loop - APS - След приложени ограничения - Зададено на помпата - Loop отказан от ограниченията - Manual enacts - Минимална продължителност - Архивиране - Изход + Сигурност на лечението + Максимален инсулин при болус [единици] + Максимални въглехидрати [гр] + Опции - Обнови treatments от NS + Обнови леченията от NS + Резервно копие + Тест на аларма Нулирай базата данни - Тест на аларми - Не е избран APS или изчислен резултат - Не се изискват промени - Не е зареден профил от NS - Използване на абсолютни стойности - NSClient - Активен профил - Базални стойности: - DIA (Време на действие на инсулина): - IC (Инсулин/въглехидр.): - НЕ Е ЗАДАДЕН ПРОФИЛ - Целeва КЗ: - Единици - Цели - Старт - Проверка - Действие: + Сигурни ли сте че искате да изтриете всички данни? + Изход + Използвай удължен болус за над 200% + DanaR Bluetooth устройство + Използване само на абсолютни стойности на базал + Рестартирайте телефона или AndroidAPS от системните натройки \nили Android APS няма да записва проблемите (което е важно за работата на алгоритъма)! Цел: - OK - Настоящ базал - Модулът е забранен - КЗ стастус - Входни параметри - IOB данни - Последно зададено - Последно изпълнение - Данни за хранене - Долна граница - Няма данни за КЗ - Няма данни за профил - Няма данни за помпа - Профил - Искане - Резултат - Старт сега - Достъпно е ново предложение - Преглед - Калкулатор - Базална стойност - % (100% = current) - Болус - NS профил - Статус на помпа в NS - Стойност - Основание - Безопасност - Задай нов удължен болусs: - Приложи нов временен базал: - Обикновен профил + Действие: + Стартирай + Провери + Единици + DIA (Време на действие на инсулина): + Active profile + IC (Инсулин/въглехидр.): + ISF (Инс.чувствителност): + Базал + Целeва КЗ: + НЕ Е ЗАДАДЕН ПРОФИЛ + Инсулин: + Вълехидрати: + IOB: + IOB: + Активен: + Общо IOB: + Общо активен IOB: + Време: + Съотношение: + Инс: IOB: Общо IOB: - Инс: - Скорост: - Време: - Грешка при болус - Treatments - Активен: - ВХ: - Инсулин: - IOB: - Общо активен IOB: - Общо IOB: Количество въглехидрати Количество инсулин - Базален IOB КЗ - Болус IOB ВХ Корекция - ОБЩО - Ед. - Макс. лимит на болус - Макс. лимит на въглехидрати - Tratments safety - Неподържана версия на NSClient - Виртуална помпа + Ед + IOB от болуси + ОБШО + Старт сега Базова базална стойност Батерия Удължен болус @@ -162,382 +56,641 @@ Грешка в базата данни Временен базал ВИРТУАЛНА ПОМПА - xDrip - Удължен болус - Временен базал - ISF (Инс.чувствителност): - NSClient не е инсталиран. Записът е загубен! - Тип събитие - КЗ тип + Последно изпълнение + Параметри на входа + КЗ стастус + Настоящ базал + IOB данни + Профил + Данни за хранене + Резултат + Няма данни за КЗ + Няма зададен профил + Няма избана помпа + Не се изисква промяна + Искане + Долна граница(КЗ) + Стойност + Срок + Основание + КЗ + Промяна + Delta: + Средна промяна + + Конфигурация + Цели OpenAPS MA + Общ + NS Профил + Обикновен профил + TempBasal + Treatments + Виртуална помпа + Careportal + + + Помпа + Treatments + Временен базал + Профил + APS + Общи + дни + Минимална продължителност + Ограничения + + Цикъл + Цикъл + APS + След ограничения + Зададено на помпата + Последно зададено + OK + Откажи + НЕ Е ИЗБРАН APS ИЛИ НЯМА РЕЗУЛТАТ ОТ НЕГО + Сигурност + Плъгина е изключен + Нарушено ограничение + Грешка при подаване на болус + Грешка при подаване на временен базал + Стойност на базал + % (100% = текущ) + Приложи нов временен базал: + Болус + Калкулатор + Приложено ограничение! + Потвърждение + Въведете ново лечение: + Болус + Bolus: + Базал + Basal: + Въглехидрати + Променете данните! + Задай нов удължен болус: + Източник на данни за КЗ + xDrip + NSClient + APS режим + + Затворен цикъл + Отворен режим + изключен + Изключи + Влючи + + Има ново предложение + Несъвместима версия на NSClient + Несъвместима версия на Nightscout + NSClient не е открит. Записът е загубен! + КЗ се вижда в NS + Статуса на помпа е достъпен в NS + Ръчно приложени + ЦИКЪЛА Е СПРЯН ОТ ОГРАНИЧЕНИЯТА + Czech + English + Базален IOB + Приложено ограничение на болус + Приложено ограничение на въглехидратите + Проверка на КЗ + Известие + Бележка + Въпрос + Физ. активност + Смяна на сет + Смяна на сензор + Старт на сензор + Смяна на резервоар + Смяна на профил + Болус за закуска + Болус за основно хранене + Болус корекция + Комбиниран болус + Старт на временен базал + Край на временен базал + Корекция с въглехидрати + OpenAPS спрян + + Тип събитие + Друго + Глюкомер + Сензор + ВХ + Инсулин + ВХ след + Разделяне + Продължителност + Процент + Абсолютна + мин + Бележки + Време на събитие + Профил + Въведен от + Тип КЗ + Още не е зареден профила от NS + Временен базал + Удължен болус Nightscout версия: ИЗПРАТИ Липсва - Разрешено - Видимо + Разрешен + Видим Нагоре Настройките са експортирани + Експортирай настройките в + Импорт на настройки от Настройките са импортирани - Импортирай настройки от: - Файлът не съществува - Експортирай настройки до + Файлът не е намерен Експорт настройки Импорт настройки German - Макс. стойност, която е в границите + Spanish + Greek + Italian + Russian Мин. стойност, която е в границите + Максималната стойност на КЗ за да бъде в границите. + Максимално позволен временен базал Е/ч Макс. лимит на временен базал [Е/ч] - Български - Макс. лимит на не болус IOB подаван от openAPS - Свързан - Избраното устройство не съществува - Прекъснат - Свързва се - Грешка при свързване с помпа - DanaR Bluetooth устройство - DanaR настройки - Използвай удължен болус за над 200% - DanaR - РАЗБИРАМ И СЕ СЪГЛАСЯВАМ - Език - Сигурност - Синхронизирай помпата с профила - Няма bluetooth адаптер - Nightscout + Максимален IOB + Този параметър се нарича макс IOB в OpenAPS\nПо подразбиране е 0. След няколко дни или седмици можете да го увеличите. + Bulgarian Разбрах + Език + + DanaR + Свързване + Свързана + Не е сврзана + Синхронизирай помпата с профила + DanaR настройки + Nightscout End User License Agreement MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - +XXXXXXXXXX;+YYYYYYYYYY - Болус %.2fU беше подаден успешно - Bolus failed - Откажи временен базал - Последно свързване - Изчаква резултат - SMS комуникатор - Позволени телефонни номера - Успех - To deliver bolus %.2fU reply with code %s - Отдалечен болус не е разрешен - Обнови профила + Разбирам и приемам + Съхрани + Не е открит Bluetooth адаптер + Избраното устройство не е открито + Грешка при свързване с помпата + IOB на помпата + Инсулин за деня + Последен болус: + ч по-рано + Грешни входящи данни + Неправилна стойност + Презареди профил + Виж профил + Приложено + Коментар + Успешен Процент + Абсолютна + Откажи временен базал + SMS комуникатор + Чакам резултат от помпата + Разрешени телефонни номера + +XXXXXXXXXX;+YYYYYYYYYY + За да пуснете болус от %.2fЕ отговорете с код %s + За да изпратите калибрация %.2f отговорете с код %s + Болус отказан + Болус %.2fЕд беше подаден успешно + Подавам болус %.2fЕ + Болус от %.2fЕ подаден успешно + Подавам %.2fЕ + Позволи отдалечени команди чрез SMS + Отдалечено подаване на болус - забранено! + Пръст Сензор Ръчно - Пръст - Неправилно зададени стойности - Виж профила + Времена цел + Откажи временна цел DanaR профил DIA (Време на действие на инсулина) ч.: - Последен болус: - Неправилни входни данни - Единици за деня - Временна цел - Отакажи временна цел - Коментар - Абсолютна - Запушване - Доставено - Подаване на %.2fU Е инсулин - Стоп - Спрян - НАТИСНАТ СТОП - КЗ цел за изчисления - Помпата е заета - Изчаква за помпа. Click to refresh. - Грешна парола за помпата! - Достигнахте лимита - аларма - базален по часове - въглехидрати - грешка - кръвна захар + Продължителност на инсулиновата активност + Неуспешно обноввяване на базалния профил История + Презареди + Качване + E болус + DS болус + DE болус + грешка + пълнене + базал по часове + КЗ + въглехидрати + аларма + Общо %d записа качени + S болус Аларми Базален по часове Болуси Въглехидрати - Свъзва се за %d сек. - Инсулин за деня + Дневен инсулин Грешки - Кръвна захар + КЗ Пълнене - Прекъсване - Презареждане - IOB на помпата - Парола за помпа - пълнене - Общо %d записа са изпратени - Приложено - S bolus - Не може да се обнови базалния профил - h ago - Потвърдете, че КЗ и данните от помпата са достъпни в Nightscout - DE bolus - DS bolus - E bolus + Спиране + Опитвам да се свържа през последните %d с + Парола за помпата + Грешна парола за помпата! + Помпата е заета + Доставен + Спрян + Запушване + Спри + Натиснат е СТОП! + Чакам помпата + Чакам резутат. Натисни за обновяване. + Ще доставя %.2fЕ Настройка на визуализацията и наблюдението, а също и анализиране на базалните нужди и коефициенти - Стартиране в Open loop режим за няколко дни и ръчно прилагане на много временни базали - Стартиране на Open Loop + Работете в Отворен режим няколко дни и ръчно прилагайте на много временни базали + Стартиране на Отворен режим Определяне на макс. лимит на базалния инсулин и настройване в помпата и програмата - Разбиране на вашият open loop режим, включително препоръчваните временни базали - Стартиране на Closed loop с макс. IOB=0 без твърде много събития тип Low suspend - Активиране на допълнителни функции за дневно използване, включително и advanced meal assist - Стартиране на Close loop в режим Low Suspend - Стартирайте за няколко дни и поне една нощ без аларми за ниска КЗ - Настройване на Closed Loop, повишаване на максималният IOB над 0 и понижаване на целевите нива на КЗ - Една седмица успешно дневно използване с редовно въвеждане на въглехидрати + Разбиране на вашият Отворен режим, включително препоръчваните временни базали + Стартиране на Затворен цикъл с изключване на базал при ниска КЗ + Стартиране на Затворен цикъл с макс. IOB=0 без твърде много събития тип ниска КЗ + Настройване на Затворения цикъл чрез повишаване на максималният IOB над 0 и понижаване на целевите нива на КЗ + Прекарайте няколко дни по този начин, като поне една нощ нямате аларма за ниска КЗ. Настройване на базалния инсулин и коефициенти ако е необходимо и активиране на auto-sens - Качване - Подава %.2fU - Spanish - Не е избран профил - Korean - %s е недопустима стойност - Текст на бутон: - Корекция - Loop забранен - Въглехидрати: - Валидно: - Добави - Редактирай - Премахни - Бърз болус - Настройки за бърз болус - Не са позволени отдалечени настройки - To start basal %.2fU/h reply with code %s - To stop temp basal reply with code %s + Една седмица успешно дневно използване с редовно въвеждане на въглехидрати + Активиране на допълнителни функции за дневно използване, включително и advanced meal assist + Достигнахте лимита + Целева стойност използвана в изчисленията + Няма избран профил Loop has been disabled Loop has been enabled Loop is disabled Loop is enabled - Позволи команди през SMS + %.2f ограничен до %.2f + Стойността %s е извън границите + Remote basal setting is not allowed + Remote command is not allowed + To start basal %.2fU/h reply with code %s + To suspend loop for %d minutes reply with code %s + Temp basal %.2fU/h for %d min started successfully + Temp basal start failed + To stop temp basal reply with code %s Temp basal canceled Canceling temp basal failed - Temp basal start failed - Temp basal %.2fU/h for %d min started successfully Uknonwn command or wrong reply - Болус за хранене - Действия + + Бърз болус + Настройки за бърз болус + Текст на бутона: + Въглехидрати: + Валиден от: + Добави + Редакция + Изтрий + Хранене + Корекция + Korean + Actions Стартиран AndroidAPS - Базов профил + NS upload only (изключва синхронизацията) + Само качване на данните в NS. Няма ефект върху данните за КЗ ако локален източник като xDrip е избран. Няма ефект върху профила освен ако не е избран NS-профил. + Помпата не е инициализирана! + Помпата не е инициализирана, профила не е зададен! + Prime/Fill + Моля, уверете се, че стойността съответсва на вашият сет! Този инсулин не се включва в IOB! + Други + Fill/Prime количества нсулин по подразбиране. Бутон 1 Бутон 2 Бутон 3 - Процентен профил - Изпрати към помпата - Редактирай базални стойности - DIA: - Редактирай Инс./ВХ - Редактирай Инс. чувствителност - Fill/Prime стандарта стойност - Моля, уверете се, че стойността съответсва на вашият сет! Този инсулин не се включва в IOB! - mg/dl - mmol/l - Друго: % с който базовият профил ще бъде променен. - Prime/Fill - Помпата не е инициализирана! - Наистина ли искате да нулиратe базата данни? + Точен брой часове, с които ще бъде преместен профила! + Изпрати в помпата + Единици: + мг/дл + ммол/л + DIA(продължителност на инсулиновото дейстие): Целеви диапазон: - Брой часове, с които ще бъде преместен профила! - Мерни единици: - NS upload only (изключва синхронизацията) - NS upload only. Not effective on SGV unless a local source like xDrip is selected. Not effective on Profiles while NS-Profiles is used. - Моля рестартирайте телефона или AndroidAPS, в противен случай информацията за грешки няма да се запише(важно за да се потвърди, че алгоритъмът работи правилно) - Край на временен базал + Редактирай базални стойности + Редактирай Инс. чувствителност + Редактирай Инс./ВХ + Базов профил: + Процентен профил + край на временен базал Старт на временен базал - Базал: - Базалните стойности са под минимума. Не е зададен профил! + Диапазон за визуализация + Стойност на линиите за ниска и висока КЗ (mmol/l) за телефона и часовника + Ниска КЗ под + Висока КЗ над + Часовник + Препрати всички дани + Отвори настройките на часовника + Грешка в промпата + Изтощена батерия + Помпа изключена Батерията на помпата е изтощена - КЗ: + DanaR Korean + Избран е грешен тип помпа + Базал: + Неуспешно задаване на базален профил + Профила на помпата е обновен Забрани EasyUI режим в помпата Разреши удължен болус в помпата Промени режима от U/d на U/h в помпата - DanaR за Корея - Горна линия - Последна КЗ: - Долна линия - Изтощена батерия - Отвори Опции на часовника - Стойност на линиите за ниска и висока КЗ (mmol/l) - Диапазон на визуализация - Неуспешно задаване на базален профил - Базалният профил е обновен - Помпата не е инициализирана, профила не е зададен! - Грешка на помпата - Помпата е изключена - Изпрати всички данни отново - Wear - Избран е грешен тип помпа - преди %d м. - ДЕЙСТВ - WEAR - ВП - TREAT - ВЦeл - ВБ - SMS - ОПРОФ - ПРОф - ОСН - ЦЕЛИ - OAPS - "Loop " - ЛПр - Dana - КОНФ - ППр - CaPr + Базалните стойности са под минимума. Не е зададен профил! + BG: + Last BG: + Писалки + MM640g + Текущи известия + ПЕКАЛЕНО СТАРИ ДАННИ + преди %d мин + %dmin ago + Локален профил + OpenAPS AMA + Краткоср. Δ: + Дългоср. Δ: + Масив от %d елемента. \nАктуална стойност: + Autosens данни + Script debug + Разреши AMA autosens + Обнови от NS + Преди хранене Физ.активност + Премахни запис: DanaR статистика + Комулативна TDD + Експоненциално претеглена TDD Базал Болус - Дата - Стари данни! Натиснете "Презареждане" - Коефициент - Общо базален инс. - Общо базален инс.² TDD - Възможна неточност, ако сте използвали болус за презареждане! - Преди хранене - Greek - Инициализиране ... - Локален профил - Дългоср. изменение - Писалки - OpenAPS AMA - Разреши AMA autosens - Autosens данни - СТАРИ ДАННИ - Текущи известия - Script debug - %.2f ограничено до %.2f - Премахни запис: - Краткоср. Δ: - Къси имена - Bolus %.2fU delivered successfully - Експоненциално претеглена TDD - Комулативна TDD + Дата + Коефициент + # дни Тегло - Дни - MM640g - Масив от %d елемента. Актуална стойност: - Basal: - Bolus: - Delta: - IOB: - %dmin ago - Изчаква за помпа + Възможна неточност, ако сте използвали болус за презареждане! + Стари данни - натиснете "ПРЕЗАРЕДИ" + Общо базален инсулин + ОБИ * 2 + Инициализация ... + ДЕЙСТВ + КОНФ + ЦИК + ОПр + OAPS + Вцел + ЛПр + DANA + ППр + ВБ + ОСН + ВП + NSП + Леч + CP + Цел + WEAR + SMS + Изполвай къси имена + Настройки на параметър Δ КЗ Използвай краткоср. Δ вместо разлика от последната КЗ Полезно при данни за КЗ с много шум - Приближава достигане на дневният лимит на иснулин - Стартира подаване на %.2fU - Изпратена калибрация до xDrip - Копирано в клипборд - Копирай в клипборд - Продължителност на инсулиновата активност - Прекъсване - Не показвай отново - Полето не може да бъде празно - Позволени са само числа - Позволени са числа между %1$s - %2$s - Телефонният номер не е валиден - Изпълнение - Получава статус на помпа - Покажи лог - Максимално позволен временен базал Е/ч - Максимален базален IOB - Калибрация - Помпата е спряна - xDrip+ не е инсталиран - Грешна парола - Изпраща статус в NS - Настройки на виртуална помпа - Качва базални стойности - Отключи настройки - Спиране на удължен болус - Спиране на временен базал - Не е разрешена отдалечена калибрация - Грешка при подаване на временен базал - Изпращане на калибрация %.1f към xDrip? - Настройки на удължен болус - Парола за настройки - Настройки на временен базал - Помпата е спряна. Натиснете за обновяване - Настройки на параметър Δ КЗ - Калибрация на КЗ - Възрастен Разширени настройки - Дете - Изчисти опашката - Изчисти log - - Изпрати сега - неуспешно - проверете телефона - Недостъпно - NSCLIENT няма достъп. Грешна API secret? - вътрешен NSClient - Autoscroll - Ще бъде използвано в поле въведено от - Въведи име на устройство - Име на устройство - Въведи API secret (мин. 12 символа) - Вътрешен NSClient - URL: - Въведи Nightscout URL - Nightscout URL - NS API secret - NS API secret - NSCL - Възраст на потребителя - Изберете възраст за определяне лимитите на безопасност - На пауза + Медел: %02X Протокол: %02X Код: %02X Профил + По подразбиране: 3\nТова е основен параметър в сигурността на OpenAPS. Той лимитира максималният базал да бъде 3 пъти най-голямата стойност от дневните базали. Не би трябвало да има нужа от промяна, но внимавайте, защото от опит сме проверили, че максимумите са “3x от най-високия дневен; 4x от текущия”. + current_basal_safety_multiplier + По подразбиране: 4\nТова е другият основен параметър в сигурността на OpenAPS, и другата половина от "3x от най-високия дневен; 4x от текущия". Това означава, че независимо от макс базал настроен в помпата, стойността на базала не може да е по-висока от тази стойност умножена по стойността на базала за текущият час от денонощието. Това е с цел да предпази от прекалено високи стойности на максималния базал преди да разбират как работи алгоритъма. Повечето от Вас няма да имат нужда от смяна на тази стойност и могат да се справят с настойки на другите параметри. + autosens_max + По подразбиране: 1.2\nТова е максималният множител на autosens (а скоро autotune) за да позволи 20% максимален лимит на autosens коефициента, който от своя страна настройва базалите, колко може да намали ISF, и колко ниско може да свали целевата КЗ. + autosens_min + По подразбиране: 0.7\nДругата част от сигурността на autosens, слагайки ограничение на колко ниско може да ограничи базалите, колко да повиши чувствителността (ISF) и целевите КЗ. + autosens_adjust_targets + По подразбиране: разрешено\nТова позволява на autosens да променя и целевите КЗ(освен чувствителност и базал). + bolussnooze_dia_divisor + По подразбиране: 2\nBolus snooze се активира след като поставите болус за основно хранене, така цикъла няма да пуснка/намаля базалите веднага след като сте се хранили. Примерът тук е с 2; така при 3 часа DIA това ще означава че bolus snooze ще бъде внимателно изместен 1.5 часа (3DIA/2). + min_5m_carbimpact + По подразбиране: 3.0\nТова е настройка на количеството на покачване на КЗ при усвояване на въглехидратите за всеки 5 минути. По подразбиране 3мг/дл/5мин. Това се отразява на това колко бързо се усвояват COB според алгоритъма, и как това се отразява в предвиждането на КЗ, когато тя не се покачва или пада с различен темп от очакваното. + Attention!\nNormally you do not have to change these values below. Please CLICK HERE and READ the text and make sure you UNDERSTAND it before change any of these values. + http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html + Позволени са само числа + Позволени са числа между %1$s - %2$s + олето не може да бъде празно + Телефонният номер не е валиден + Грешен тел номер за SMS + Копирай + Копирано + Покажи лог + Калибрация + Калибрация + Изпрати калибрация %.1f на xDrip? + xDrip+ не е инсталиран + Калибрацията е изпратена към xDrip + Не е разрешена отдалечена калибрация + Неуспешно. Получаването трябва да е разрешено в xDrip. + xDrip не получава калибрации + Не показвай отново + Помпата е спряна. Натиснете за обновяване + Помпата е спряна + Получавам статус на помпата + Настройвам временен базал + Спирам временен базал + Настойвам удължен болус + Спирам удължен болус + Обновявам базалите + Спирам връзката + Изпълнявам + Настойки Виртуална Помпа + Качвам статуса в NS + Грешна парола + Парола за настройки + Отключи настройките + Близо до максмалния дневен инсулин + вътрешен NSClient + NSCI + URL: + Autoscroll Рестарт - Покажи опашката - xDrip не приема калибрация - Статус: - Тийнейджър - Раздели IOB на болус и базал IOB на часовника - Покажи подробен IOB - Настройки на часовник - To send calibration %.2f reply with code %s - Calibration sent. Receiving must be enabled in xDrip. - Invalid SMS phone number + Вътрешен NSClient + Nightscout адрес + Въведете Nightscout URL + NS API парола + NS API secret + Въведете NS API secret (мин 12 символа) + Име на устройството + Въведете името на телефона + Ще се използва за полето enteredBy + Изпрати сега + Изчисти опашка + Покажи опашка Опашка: - Firmware + Статус: + пауза + nsclientinternal_url + nsclientinternal_api_secret + danar_bt_name + danar_password + danar_useextended + danar_visualizeextendedaspercentage" + danarprofile_dia + Изчисти лога + nsclientinternal_autoscroll + nsclientinternal_paused + NSCLIENT права за запис. Грешен API secret? + Wear настройки(часовник) + Показвай подробен IOB + аздели IOB на болус и базал IOB на часовника + неуспешно - моля проверете в телефона + Недостъпно + smscommunicator_allowednumbers + smscommunicator_remotecommandsallowed + Възраст на пациента + Дете + Тийнейджър + Възрастен + age + child + teenage + adult + Изберете възраст за определяне лимитите на безопасност + I_understand Glimp - Устройството изглежда не подържа изключване на оптимизиране на батерията - COB - Инсулин - Bluetooh статус - DEV - Деактивиран Loop - Изключи помпата за 10 часа - Изключи помпата за 1 час - Изключи помпата за 2 часа - Изключи помпата за 30 мин. - Изключи помпата за 3 часа - Разреши Loop - Разреши суперболус - Разреши функцията суперболус в съветника. Не я разрешавайте докато не научите какво наистина прави. ТОВА МОЖЕ ДА СЪЗДАДЕ ОПАСНОСТ ОТ ПРЕДОЗИРАНЕ С ИНСУЛИН. - Бързодействащ инсулин - Бързодействащ инсулин с удължаване - ИНС - Loop меню - Loop спрян - Суперболус (%d м.) - За приложението - Спрян (%d м.) - %s трябва да изключите оптимизация на батерията за оптимална работа - Отбелязвай старт на програмата в NS + Устройството изглежда не подържа изключване на оптимизиране на батерията! Моля, позволете рарешение - - Изключи Loop за 10 ч. - Суперболус - "Изключи Loop за 1ч. " - Изключи Loop за 2ч. - Изключи Loop за 3ч. - 15min trend + %s се нуждае от зключване на оптимизиране на батерията за пълна функционалност + Цикъл изключен + Изключен (%d мин) + Суперболус (%d мин) + Меню Цикъл + Изключи цикъла за 1ч + Изключи цикъла за 2ч + Изключи цикъла за 3ч + Изключи цикъла за 10 ч + Изключи помпата за 30 мин. + Изключи помпата за 1 ч + Изключи помпата за 2 ч + Изключи помпата за 3 ч + Изключи помпата за 10 ч + Възстанови + Wrong duration + Loop suspended + Loop resumed + промяна за 15мин COB - Italian + Суперболус + Записвай всяко стартиране на AndroidAPS в NS + ns_logappstartedevent + Рестартирам за да се приложат новите настройки. + DanaRv2 + Инсулин + Бързодействащ инсулин + Novorapid, Novolog, Humalog + ИНС + Бързодействащ инсулин с удължаване + key_usersuperbolus + Разреши използването на Суперболус + Разреши функцията суперболус в съветника. Не я разрешавайте докато не научите какво наистина прави. ТОВА МОЖЕ ДА СЪЗДАДЕ ОПАСНОСТ ОТ ПРЕДОЗИРАНЕ С ИНСУЛИН. + IOB + COB + PRE + BAS + Firmware + Последно свързване + Bluetooh статус + За приложението + Missing SMS permission + DEV + xDrip статус (часовник) + xDrip статус (часовник) + xds + Показвай BGI + Добави BGI към статуса + Без качване на данни в NS + Всички данни за NS се пропускат. AAPS е свързан с NS, но не прави промени в NS + ns_upload_only + ns_noupload + Стъпка за базал + Стъпка за болус + Удължен болус + Вр. цел + Спри удължен болус + Възраст на сензора + Възраст на канюла + Възраст на инсулина + часа + Тип базал + ISF липсва в профила. По подразбиране. + IC липсва в профила. По подразбиране. + Базал липсва в профила. По подразбиране. + Целева КЗ липсва в профила. По подразбиране. + Грешен профил !!! + Смяна на профил + Възраст на батерията на помпата + Смяна на батерия + Опции за аларми + nsalarm_urgent_high + nsalarm_high + nsalarm_low + nsalarm_urgent_low + nsalarm_staledata + nsalarm_urgent_staledata + nsalarm_staledatavalue + nsalarm_urgent_staledatavalue + Много висока + Висока + Ниска + Много ниска + Текущата стойност е %f + Няма данни + Много стари данни + Когато няма данни повече от [мин] + Много стари данни при повече от [мин] + Интервал за autosens [ч] + Брой часове назад за определяне на чувствителността (приемът на въглехидрати е изключен) + openapsama_autosens_period + RAT + do_not_track_profile_switch + Игнорирай събитията от тип Смяна на профил + Всички смени на профила се игнорират и винаги се използва текущия профил + Помпа + OpenAPS + Устройство + Uploader + Определяне на чувствителност + ЧУВСТВ + Алгоритъм на Oref0 + Алгоритъм на AAPS + Настройки за абсорбция + absorption_maxtime + Максимално време за усвояване на храненето [ч] + Брой часове, за които се очаква храненето да бъде напълно усвоено в организма + rangetodisplay + Показвай удължените болуси като % + ВСенз + ВИнс + ВКан + ВБат + OAPS + UPLD + БАЗА + УД. + Заключен екран + Закл + Когато включите Autosense feature трябва да въвеждате ВСИЧКИ въглехидрати. В противен случай те ще се изчисляват грешно като повишена чувствителност!! + SMB резултат + SMB + SMB + key_smb + SMB enable + Super Micro Boluses is used when there are COB and more insulin is needed + UAM + UAM + key_uam + Enable UAM + UnAnounced Meals - Необявени хранения - трябва да помага при неправилно изчислени и въведени въглехидрати. + Rumen SMB + Алгоритъм на Среднопретеглената стойност + OK + Откажи + трябва да е активно за да изпратя стойностите към помпата! + Не всички профили са заредени! + Стойностите не са запазени! From 387cfcccafbf9cca28e326738f05637847e896e1 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Sun, 16 Jul 2017 01:28:08 +0200 Subject: [PATCH 07/77] wear menu simplification --- .../plugins/Wear/ActionStringHandler.java | 11 +- .../actions/TempTargetActivity.java | 2 +- .../interaction/menus/FillMenuActivity.java | 30 +++--- .../interaction/menus/MainMenuActivity.java | 102 +++++++----------- .../menus/MainMenuRestrictedActivity.java | 53 --------- .../interaction/menus/StatusMenuActivity.java | 30 ++---- .../interaction/utils/MenuListActivity.java | 6 +- wear/src/main/res/xml/preferences.xml | 9 +- 8 files changed, 75 insertions(+), 168 deletions(-) delete mode 100644 wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuRestrictedActivity.java diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java index a881464e82..8a1f44b8b7 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java @@ -157,14 +157,9 @@ public class ActionStringHandler { rMessage = getPumpStatus(); } else if ("loop".equals(act[1])) { rTitle += " LOOP"; - rMessage = getLoopStatus(); - - } else if ("targets".equals(act[1])) { - rTitle += " TARGETS"; - rMessage = getTargetsStatus(); - } else if ("oapsresult".equals(act[1])) { - rTitle += " OAPS RESULT"; - rMessage = getOAPSResultStatus(); + rMessage = "TARGETS:\n" + getTargetsStatus(); + rMessage += "\n\n" + getLoopStatus(); + rMessage += "\n\nOAPS RESULT:\n" + getOAPSResultStatus();; } } else if ("wizard".equals(act[0])) { diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java index 2981066bfb..4b04a72cdc 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java @@ -50,7 +50,7 @@ public class TempTargetActivity extends ViewSelectorActivity { SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); isMGDL = sp.getBoolean("units_mgdl", true); - isSingleTarget = sp.getBoolean("singletarget", false); + isSingleTarget = sp.getBoolean("singletarget", true); } diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/FillMenuActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/FillMenuActivity.java index da8daa80cb..a4d1a3d181 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/FillMenuActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/FillMenuActivity.java @@ -14,7 +14,7 @@ public class FillMenuActivity extends MenuListActivity { @Override protected String[] getElements() { - return new String[] { + return new String[]{ "Preset 1", "Preset 2", "Preset 3", @@ -23,23 +23,17 @@ public class FillMenuActivity extends MenuListActivity { } @Override - protected void doAction(int position) { - switch (position) { - case 0: - ListenerService.initiateAction(this, "fillpreset 1"); - break; - case 1: - ListenerService.initiateAction(this, "fillpreset 2"); - break; - case 2: - ListenerService.initiateAction(this, "fillpreset 3"); - break; - case 3: - Intent intent = new Intent(this, FillActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - this.startActivity(intent); - break; + protected void doAction(String action) { + if ("Preset 1".equals(action)) { + ListenerService.initiateAction(this, "fillpreset 1"); + } else if ("Preset 2".equals(action)) { + ListenerService.initiateAction(this, "fillpreset 2"); + } else if ("Preset 3".equals(action)) { + ListenerService.initiateAction(this, "fillpreset 3"); + } else if ("Free amount".equals(action)) { + Intent intent = new Intent(this, FillActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + this.startActivity(intent); } - } } diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java index aeea844f42..2d8b29d10a 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java @@ -5,6 +5,8 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; +import java.util.Vector; + import info.nightscout.androidaps.BuildConfig; import info.nightscout.androidaps.data.ListenerService; import info.nightscout.androidaps.interaction.AAPSPreferences; @@ -39,74 +41,50 @@ public class MainMenuActivity extends MenuListActivity { boolean showPrimeFill = sp.getBoolean("primefill", false); - return new String[] { - "TempT", - "Bolus", - "Wizard", - "Settings", - "Re-Sync", - "Status", - showPrimeFill?"Prime/Fill":""}; + boolean showWizard = sp.getBoolean("showWizard", true); + + Vector menuitems = new Vector(); + menuitems.add("TempT"); + menuitems.add("Bolus"); + if(showWizard) menuitems.add("Wizard"); + menuitems.add("Settings"); + menuitems.add("Status"); + if (showPrimeFill) menuitems.add("Prime/Fill"); + + return menuitems.toArray(new String[menuitems.size()]); } @Override - protected void doAction(int position) { + protected void doAction(String action) { Intent intent; - if(!BuildConfig.WEAR_CONTROL) { - switch (position) { - case 0: - intent = new Intent(this, AAPSPreferences.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - this.startActivity(intent); - break; - case 1: - ListenerService.requestData(this); - break; - } - return; + if ("Settings".equals(action)) { + intent = new Intent(this, AAPSPreferences.class); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + this.startActivity(intent); + } else if ("Re-Sync".equals(action)) { + ListenerService.requestData(this); + } else if ("TempT".equals(action)) { + intent = new Intent(this, TempTargetActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + this.startActivity(intent); + } else if ("Bolus".equals(action)) { + intent = new Intent(this, BolusActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + this.startActivity(intent); + } else if ("Wizard".equals(action)) { + intent = new Intent(this, WizardActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + this.startActivity(intent); + } else if ("Status".equals(action)) { + intent = new Intent(this, StatusMenuActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + this.startActivity(intent); + } else if ("Prime/Fill".equals(action)) { + intent = new Intent(this, FillMenuActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + this.startActivity(intent); } - - - switch (position) { - case 0: - intent = new Intent(this, TempTargetActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - this.startActivity(intent); - break; - case 1: - intent = new Intent(this, BolusActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - this.startActivity(intent); - break; - case 2: - intent = new Intent(this, WizardActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - this.startActivity(intent); - break; - case 3: - intent = new Intent(this, AAPSPreferences.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - this.startActivity(intent); - break; - case 4: - ListenerService.requestData(this); - break; - case 5: - intent = new Intent(this, StatusMenuActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - this.startActivity(intent); - break; - case 6: - boolean showPrimeFill = sp.getBoolean("primefill", false); - if(showPrimeFill) { - intent = new Intent(this, FillMenuActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - this.startActivity(intent); - } - break; - } - } } diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuRestrictedActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuRestrictedActivity.java deleted file mode 100644 index 779e9611d2..0000000000 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuRestrictedActivity.java +++ /dev/null @@ -1,53 +0,0 @@ -package info.nightscout.androidaps.interaction.menus; - -import android.content.Intent; -import android.content.SharedPreferences; -import android.os.Bundle; -import android.preference.PreferenceManager; - -import info.nightscout.androidaps.data.ListenerService; -import info.nightscout.androidaps.interaction.AAPSPreferences; -import info.nightscout.androidaps.interaction.actions.BolusActivity; -import info.nightscout.androidaps.interaction.actions.TempTargetActivity; -import info.nightscout.androidaps.interaction.actions.WizardActivity; -import info.nightscout.androidaps.interaction.utils.MenuListActivity; - -/** - * Created by adrian on 09/02/17. - */ - -public class MainMenuRestrictedActivity extends MenuListActivity { - - SharedPreferences sp; - - @Override - protected void onCreate(Bundle savedInstanceState) { - sp = PreferenceManager.getDefaultSharedPreferences(this); - super.onCreate(savedInstanceState); - ListenerService.requestData(this); - } - - @Override - protected String[] getElements() { - return new String[] { - "Settings", - "Re-Sync"}; - } - - @Override - protected void doAction(int position) { - - Intent intent; - switch (position) { - case 0: - intent = new Intent(this, AAPSPreferences.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - this.startActivity(intent); - break; - case 1: - ListenerService.requestData(this); - break; - } - - } -} diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/StatusMenuActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/StatusMenuActivity.java index a57bd17c8f..58eb0ef254 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/StatusMenuActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/StatusMenuActivity.java @@ -14,32 +14,18 @@ public class StatusMenuActivity extends MenuListActivity { return new String[] { "Pump", "Loop", - "Targets", - "CPP", - "OAPS Result"}; + "CPP"}; } @Override - protected void doAction(int position) { - switch (position) { - - case 0: - ListenerService.initiateAction(this, "status pump"); - break; - case 1: - ListenerService.initiateAction(this, "status loop"); - break; - case 2: - ListenerService.initiateAction(this, "status targets"); - break; - case 3: - ListenerService.initiateAction(this, "opencpp"); - break; - case 4: - ListenerService.initiateAction(this, "status oapsresult"); - break; + protected void doAction(String action) { + if ("Pump".equals(action)) { + ListenerService.initiateAction(this, "status pump"); + } else if ("Loop".equals(action)) { + ListenerService.initiateAction(this, "status loop"); + } else if ("CPP".equals(action)) { + ListenerService.initiateAction(this, "opencpp"); } - } } diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/MenuListActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/MenuListActivity.java index d151196091..9d6fd51126 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/MenuListActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/MenuListActivity.java @@ -22,7 +22,7 @@ public abstract class MenuListActivity extends Activity protected abstract String[] getElements(); - protected abstract void doAction(int position); + protected abstract void doAction(String position); @Override protected void onPause(){ @@ -50,7 +50,7 @@ public abstract class MenuListActivity extends Activity // WearableListView click listener @Override public void onClick(WearableListView.ViewHolder v) { - Integer tag = (Integer) v.itemView.getTag(); + String tag = (String) v.itemView.getTag(); doAction(tag); //ActionsDefinitions.doAction(v.getAdapterPosition(), this); finish(); @@ -105,7 +105,7 @@ public abstract class MenuListActivity extends Activity // replace text contents view.setText(mDataset[position]); // replace list item's metadata - holder.itemView.setTag(position); + holder.itemView.setTag(mDataset[position]); } // Return the size of your dataset diff --git a/wear/src/main/res/xml/preferences.xml b/wear/src/main/res/xml/preferences.xml index 57050ef0f5..b9c6307cac 100644 --- a/wear/src/main/res/xml/preferences.xml +++ b/wear/src/main/res/xml/preferences.xml @@ -121,6 +121,13 @@ app:wear_iconOff="@drawable/settings_off" app:wear_iconOn="@drawable/settings_on"/> + Date: Mon, 17 Jul 2017 16:18:18 +0200 Subject: [PATCH 08/77] wear TDD status --- .../plugins/Wear/ActionStringHandler.java | 128 ++++++++++++++++++ .../interaction/menus/StatusMenuActivity.java | 6 +- 2 files changed, 133 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java index 8a1f44b8b7..c88faad0da 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java @@ -4,8 +4,14 @@ import android.os.Handler; import android.os.HandlerThread; import android.support.annotation.NonNull; +import java.text.DateFormat; import java.text.DecimalFormat; +import java.text.SimpleDateFormat; +import java.util.Collections; +import java.util.Comparator; import java.util.Date; +import java.util.LinkedList; +import java.util.List; import info.nightscout.androidaps.BuildConfig; import info.nightscout.androidaps.Config; @@ -15,17 +21,24 @@ import info.nightscout.androidaps.R; import info.nightscout.androidaps.data.DetailedBolusInfo; import info.nightscout.androidaps.data.PumpEnactResult; import info.nightscout.androidaps.db.BgReading; +import info.nightscout.androidaps.db.DanaRHistoryRecord; import info.nightscout.androidaps.db.DatabaseHelper; import info.nightscout.androidaps.db.Source; import info.nightscout.androidaps.db.TempTarget; import info.nightscout.androidaps.interfaces.APSInterface; +import info.nightscout.androidaps.interfaces.DanaRInterface; import info.nightscout.androidaps.interfaces.PluginBase; +import info.nightscout.androidaps.interfaces.PumpInterface; import info.nightscout.androidaps.plugins.Actions.dialogs.FillDialog; import info.nightscout.androidaps.plugins.Loop.APSResult; import info.nightscout.androidaps.plugins.Loop.LoopPlugin; import info.nightscout.androidaps.data.Profile; import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification; import info.nightscout.androidaps.plugins.ProfileCircadianPercentage.CircadianPercentageProfilePlugin; +import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin; +import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes; +import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin; +import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin; import info.nightscout.utils.BolusWizard; import info.nightscout.utils.DateUtil; import info.nightscout.utils.DecimalFormatter; @@ -251,6 +264,58 @@ public class ActionStringHandler { rAction = actionstring; } + } else if("tddstats".equals(act[0])){ + Object activePump = MainApp.getConfigBuilder().getActivePump(); + PumpInterface dana = (PumpInterface) MainApp.getSpecificPlugin(DanaRPlugin.class); + PumpInterface danaV2 = (PumpInterface) MainApp.getSpecificPlugin(DanaRv2Plugin.class); + PumpInterface danaKorean = (PumpInterface) MainApp.getSpecificPlugin(DanaRKoreanPlugin.class); + + + if((dana == null || dana != activePump) && + (danaV2 == null || danaV2 != activePump) && + (danaKorean == null || danaKorean != activePump) + ){ + sendError("Pump does not support TDDs!"); + return; + } else { + // check if DB up to date + List dummies = new LinkedList(); + List historyList = getTDDList(dummies); + + if(isOldData(historyList)){ + rTitle = "TDD"; + rAction = "statusmessage"; + rMessage = "OLD DATA - "; + + //if pump is not busy: try to fetch data + final PumpInterface pump = MainApp.getConfigBuilder().getActivePump(); + if (pump.isBusy()) { + rMessage += MainApp.instance().getString(R.string.pumpbusy); + } else { + rMessage += "trying to fetch data from pump."; + Handler handler = new Handler(handlerThread.getLooper()); + handler.post(new Runnable() { + @Override + public void run() { + ((DanaRInterface)pump).loadHistory(RecordTypes.RECORD_TYPE_DAILY); + List dummies = new LinkedList(); + List historyList = getTDDList(dummies); + if(isOldData(historyList)){ + sendStatusmessage("TDD", "TDD: Still old data! Cannot load from pump."); + } else { + sendStatusmessage("TDD", generateTDDMessage(historyList, dummies)); + } + } + }); + } + } else { + // if up to date: prepare, send (check if CPP is activated -> add CPP stats) + rTitle = "TDD"; + rAction = "statusmessage"; + rMessage = generateTDDMessage(historyList, dummies); + } + } + } else return; @@ -261,6 +326,62 @@ public class ActionStringHandler { lastConfirmActionString = rAction; } + private static String generateTDDMessage(List historyList, List dummies) { + + DateFormat df = new SimpleDateFormat("dd.MM."); + String message = "TDD:\n"; + + //TODO: if CPP add weighted + message += "\n\n"; + + + //add TDDs: + for (DanaRHistoryRecord record : historyList) { + double tdd = record.recordDailyBolus + record.recordDailyBasal; + message += df.format(new Date(record.recordDate)) + " " + DecimalFormatter.to2Decimal(tdd) +"U" + (dummies.contains(record)?"x":"") +"\n"; + } + return message; + } + + public static boolean isOldData(List historyList) { + DateFormat df = new SimpleDateFormat("dd.MM."); + return (historyList.size() < 3 || !(df.format(new Date(historyList.get(0).recordDate)).equals(df.format(new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24))))); + } + + @NonNull + public static List getTDDList(List returnDummies) { + List historyList = MainApp.getDbHelper().getDanaRHistoryRecordsByType(RecordTypes.RECORD_TYPE_DAILY); + + //only use newest 10 + historyList = historyList.subList(0, Math.min(10, historyList.size())); + + //fill single gaps + List dummies = (returnDummies!=null)?returnDummies:(new LinkedList()); + DateFormat df = new SimpleDateFormat("dd.MM."); + for(int i = 0; i < historyList.size()-1; i++){ + DanaRHistoryRecord elem1 = historyList.get(i); + DanaRHistoryRecord elem2 = historyList.get(i+1); + + if (!df.format(new Date(elem1.recordDate)).equals(df.format(new Date(elem2.recordDate + 25*60*60*1000)))){ + DanaRHistoryRecord dummy = new DanaRHistoryRecord(); + dummy.recordDate = elem1.recordDate - 24*60*60*1000; + dummy.recordDailyBasal = elem1.recordDailyBasal/2; + dummy.recordDailyBolus = elem1.recordDailyBolus/2; + dummies.add(dummy); + elem1.recordDailyBasal /= 2; + elem1.recordDailyBolus /= 2; + } + } + historyList.addAll(dummies); + Collections.sort(historyList, new Comparator() { + @Override + public int compare(DanaRHistoryRecord lhs, DanaRHistoryRecord rhs) { + return (int) (rhs.recordDate-lhs.recordDate); + } + }); + return historyList; + } + @NonNull private static String getPumpStatus() { return MainApp.getConfigBuilder().shortStatus(false); @@ -501,6 +622,13 @@ public class ActionStringHandler { lastBolusWizard = null; } + private synchronized static void sendStatusmessage(String title, String message) { + WearFragment.getPlugin(MainApp.instance()).requestActionConfirmation(title, message, "statusmessage"); + lastSentTimestamp = System.currentTimeMillis(); + lastConfirmActionString = null; + lastBolusWizard = null; + } + public synchronized static void expectNotificationAction(String message, int id) { String actionstring = "dismissoverviewnotification " + id; WearFragment.getPlugin(MainApp.instance()).requestActionConfirmation("DISMISS", message, actionstring); diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/StatusMenuActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/StatusMenuActivity.java index 58eb0ef254..f17bc23e46 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/StatusMenuActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/StatusMenuActivity.java @@ -14,7 +14,9 @@ public class StatusMenuActivity extends MenuListActivity { return new String[] { "Pump", "Loop", - "CPP"}; + "CPP", + "TDD"}; + } @@ -26,6 +28,8 @@ public class StatusMenuActivity extends MenuListActivity { ListenerService.initiateAction(this, "status loop"); } else if ("CPP".equals(action)) { ListenerService.initiateAction(this, "opencpp"); + } else if ("TDD".equals(action)) { + ListenerService.initiateAction(this, "tddstats"); } } } From e0c1f65b8b39fa8464a6656d13394a48d18bd2b7 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Mon, 17 Jul 2017 22:37:57 +0200 Subject: [PATCH 09/77] wear tdd weighted --- .../plugins/Wear/ActionStringHandler.java | 47 +++++++++++++++++-- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java index c88faad0da..f800d9d531 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java @@ -36,6 +36,7 @@ import info.nightscout.androidaps.data.Profile; import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification; import info.nightscout.androidaps.plugins.ProfileCircadianPercentage.CircadianPercentageProfilePlugin; import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin; +import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump; import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes; import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin; import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin; @@ -329,16 +330,52 @@ public class ActionStringHandler { private static String generateTDDMessage(List historyList, List dummies) { DateFormat df = new SimpleDateFormat("dd.MM."); - String message = "TDD:\n"; + String message = ""; - //TODO: if CPP add weighted - message += "\n\n"; + CircadianPercentageProfilePlugin cpp = (CircadianPercentageProfilePlugin) MainApp.getSpecificPlugin(CircadianPercentageProfilePlugin.class); + boolean isCPP = (cpp!= null && cpp.isEnabled(PluginBase.PROFILE)); + double refTDD = 100; + if(isCPP) refTDD = cpp.baseBasalSum()*2; + int i = 0; + double sum = 0d; + double weighted03 = 0d; + double weighted05 = 0d; + double weighted07 = 0d; - //add TDDs: + Collections.reverse(historyList); for (DanaRHistoryRecord record : historyList) { double tdd = record.recordDailyBolus + record.recordDailyBasal; - message += df.format(new Date(record.recordDate)) + " " + DecimalFormatter.to2Decimal(tdd) +"U" + (dummies.contains(record)?"x":"") +"\n"; + if (i == 0) { + weighted03 = tdd; + weighted05 = tdd; + weighted07 = tdd; + + } else { + weighted07 = (weighted07 * 0.3 + tdd * 0.7); + weighted05 = (weighted05 * 0.5 + tdd * 0.5); + weighted03 = (weighted03 * 0.7 + tdd * 0.3); + } + i++; + } + message += "weighted:\n"; + message += "0.3: " + DecimalFormatter.to2Decimal(weighted03) + "U " + (isCPP?(DecimalFormatter.to0Decimal(100*weighted03/refTDD) + "%"):"") + "\n"; + message += "0.5: " + DecimalFormatter.to2Decimal(weighted05) + "U " + (isCPP?(DecimalFormatter.to0Decimal(100*weighted05/refTDD) + "%"):"") + "\n"; + message += "0.7: " + DecimalFormatter.to2Decimal(weighted07) + "U " + (isCPP?(DecimalFormatter.to0Decimal(100*weighted07/refTDD) + "%"):"") + "\n"; + message += "\n"; + + PumpInterface pump = MainApp.getConfigBuilder().getActivePump(); + if (pump != null && pump instanceof DanaRPlugin) { + double tdd = DanaRPump.getInstance().dailyTotalUnits; + message += "Today: " + DecimalFormatter.to2Decimal(tdd) + "U " + (isCPP?(DecimalFormatter.to0Decimal(100*tdd/refTDD) + "%"):"") + "\n"; + message += "\n"; + } + + //add TDDs: + Collections.reverse(historyList); + for (DanaRHistoryRecord record : historyList) { + double tdd = record.recordDailyBolus + record.recordDailyBasal; + message += df.format(new Date(record.recordDate)) + " " + DecimalFormatter.to2Decimal(tdd) +"U " + (isCPP?(DecimalFormatter.to0Decimal(100*tdd/refTDD) + "%"):"") + (dummies.contains(record)?"x":"") +"\n"; } return message; } From 7c6bdc0b31b075746aec079e35161ee13ab72314 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Tue, 18 Jul 2017 12:37:35 +0200 Subject: [PATCH 10/77] Have most fragments update their content in onResume. --- .../androidaps/plugins/Actions/ActionsFragment.java | 13 +++++++------ .../plugins/Careportal/CareportalFragment.java | 3 ++- .../androidaps/plugins/Loop/LoopFragment.java | 3 ++- .../plugins/OpenAPSAMA/OpenAPSAMAFragment.java | 3 ++- .../plugins/OpenAPSMA/OpenAPSMAFragment.java | 1 + .../plugins/ProfileNS/NSProfileFragment.java | 1 + .../androidaps/plugins/PumpDanaR/DanaRFragment.java | 1 + .../PumpDanaRKorean/DanaRKoreanFragment.java | 1 + .../plugins/PumpDanaRv2/DanaRv2Fragment.java | 1 + .../plugins/PumpVirtual/VirtualPumpFragment.java | 1 + .../SmsCommunicator/SmsCommunicatorFragment.java | 1 + .../TreatmentsExtendedBolusesFragment.java | 1 + .../fragments/TreatmentsProfileSwitchFragment.java | 3 ++- .../fragments/TreatmentsTempTargetFragment.java | 3 ++- .../TreatmentsTemporaryBasalsFragment.java | 1 + 15 files changed, 26 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java index bc2c0adb86..d3ce1e7b7a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java @@ -82,7 +82,7 @@ public class ActionsFragment extends Fragment implements View.OnClickListener { tempBasal.setOnClickListener(this); fill.setOnClickListener(this); - updateGUIIfVisible(); + updateGUI(); return view; } @@ -96,29 +96,30 @@ public class ActionsFragment extends Fragment implements View.OnClickListener { public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Subscribe public void onStatusEvent(final EventInitializationChanged ev) { - updateGUIIfVisible(); + updateGUI(); } @Subscribe public void onStatusEvent(final EventRefreshOverview ev) { - updateGUIIfVisible(); + updateGUI(); } @Subscribe public void onStatusEvent(final EventExtendedBolusChange ev) { - updateGUIIfVisible(); + updateGUI(); } @Subscribe public void onStatusEvent(final EventTempBasalChange ev) { - updateGUIIfVisible(); + updateGUI(); } - void updateGUIIfVisible() { + private void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java index abc67c4c39..16e9441211 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java @@ -188,6 +188,7 @@ public class CareportalFragment extends Fragment implements View.OnClickListener public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Subscribe @@ -195,7 +196,7 @@ public class CareportalFragment extends Fragment implements View.OnClickListener updateGUI(); } - void updateGUI() { + private void updateGUI() { Activity activity = getActivity(); updateAge(activity, sage, iage, cage, pbage); } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopFragment.java index de295d8a6e..143cbe617b 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopFragment.java @@ -71,6 +71,7 @@ public class LoopFragment extends Fragment implements View.OnClickListener { public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Override @@ -110,7 +111,7 @@ public class LoopFragment extends Fragment implements View.OnClickListener { } - void updateGUI() { + private void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java index c480ebfe3c..22071e4ae1 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java @@ -91,6 +91,7 @@ public class OpenAPSAMAFragment extends Fragment implements View.OnClickListener public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Subscribe @@ -103,7 +104,7 @@ public class OpenAPSAMAFragment extends Fragment implements View.OnClickListener updateResultGUI(ev.text); } - void updateGUI() { + private void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java index 16249dffc3..867f63e182 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java @@ -85,6 +85,7 @@ public class OpenAPSMAFragment extends Fragment implements View.OnClickListener public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Subscribe diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java index f765fe6ed1..743ef7cb58 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java @@ -60,6 +60,7 @@ public class NSProfileFragment extends Fragment { public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Subscribe diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java index 1780b1a53f..437043c887 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java @@ -166,6 +166,7 @@ public class DanaRFragment extends Fragment { public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Subscribe diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java index 02e7e5ba24..adca7e91a3 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java @@ -164,6 +164,7 @@ public class DanaRKoreanFragment extends Fragment { public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Subscribe diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Fragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Fragment.java index 9e87d45dca..d443746e5a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Fragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Fragment.java @@ -163,6 +163,7 @@ public class DanaRv2Fragment extends Fragment { public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Subscribe diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java index f1e709e329..bb639d30f1 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java @@ -73,6 +73,7 @@ public class VirtualPumpFragment extends Fragment { public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Subscribe diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorFragment.java index 83973e83ff..1ec0239f83 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorFragment.java @@ -66,6 +66,7 @@ public class SmsCommunicatorFragment extends Fragment { public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Subscribe diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java index 0acbf4b2c5..17836e081b 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java @@ -193,6 +193,7 @@ public class TreatmentsExtendedBolusesFragment extends Fragment { public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Subscribe diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java index 344abd8346..8a8866fa4d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java @@ -190,6 +190,7 @@ public class TreatmentsProfileSwitchFragment extends Fragment implements View.On public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Subscribe @@ -197,7 +198,7 @@ public class TreatmentsProfileSwitchFragment extends Fragment implements View.On updateGUI(); } - void updateGUI() { + private void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java index 7a74ca4a86..4a465840d6 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java @@ -211,6 +211,7 @@ public class TreatmentsTempTargetFragment extends Fragment implements View.OnCli public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Subscribe @@ -218,7 +219,7 @@ public class TreatmentsTempTargetFragment extends Fragment implements View.OnCli updateGUI(); } - void updateGUI() { + private void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java index 8db8a9c67b..bcd544c3ab 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java @@ -212,6 +212,7 @@ public class TreatmentsTemporaryBasalsFragment extends Fragment { public void onResume() { super.onResume(); MainApp.bus().register(this); + updateGUI(); } @Subscribe From 435ec55580bff10fc1a044cf246f9846844efbf0 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Tue, 18 Jul 2017 12:56:56 +0200 Subject: [PATCH 11/77] Extract SubscriberFragment base class. --- .../plugins/Actions/ActionsFragment.java | 19 +++----------- .../Careportal/CareportalFragment.java | 19 +++----------- .../plugins/Common/SubscriberFragment.java | 22 ++++++++++++++++ .../androidaps/plugins/Loop/LoopFragment.java | 20 +++------------ .../NSClientInternalFragment.java | 19 +++----------- .../OpenAPSAMA/OpenAPSAMAFragment.java | 19 +++----------- .../plugins/OpenAPSMA/OpenAPSMAFragment.java | 21 ++++------------ .../ProfileLocal/LocalProfileFragment.java | 25 +++++++------------ .../plugins/ProfileNS/NSProfileFragment.java | 19 +++----------- .../ProfileSimple/SimpleProfileFragment.java | 25 +++++++------------ .../plugins/PumpDanaR/DanaRFragment.java | 19 +++----------- .../PumpDanaRKorean/DanaRKoreanFragment.java | 19 +++----------- .../plugins/PumpDanaRv2/DanaRv2Fragment.java | 19 +++----------- .../PumpVirtual/VirtualPumpFragment.java | 22 +++------------- .../SmsCommunicatorFragment.java | 19 +++----------- .../fragments/TreatmentsBolusFragment.java | 19 +++----------- .../TreatmentsExtendedBolusesFragment.java | 19 +++----------- .../TreatmentsProfileSwitchFragment.java | 19 +++----------- .../TreatmentsTempTargetFragment.java | 20 +++------------ .../TreatmentsTemporaryBasalsFragment.java | 19 +++----------- 20 files changed, 109 insertions(+), 293 deletions(-) create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/Common/SubscriberFragment.java diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java index d3ce1e7b7a..b62674c5ae 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java @@ -31,11 +31,12 @@ import info.nightscout.androidaps.plugins.Actions.dialogs.NewTempBasalDialog; import info.nightscout.androidaps.plugins.Careportal.CareportalFragment; import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog; import info.nightscout.androidaps.plugins.Careportal.OptionsToShow; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; /** * A simple {@link Fragment} subclass. */ -public class ActionsFragment extends Fragment implements View.OnClickListener { +public class ActionsFragment extends SubscriberFragment implements View.OnClickListener { static ActionsPlugin actionsPlugin = new ActionsPlugin(); @@ -86,19 +87,6 @@ public class ActionsFragment extends Fragment implements View.OnClickListener { return view; } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventInitializationChanged ev) { updateGUI(); @@ -119,7 +107,8 @@ public class ActionsFragment extends Fragment implements View.OnClickListener { updateGUI(); } - private void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java index 16e9441211..6ddda8cd68 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java @@ -19,9 +19,10 @@ import info.nightscout.androidaps.R; import info.nightscout.androidaps.db.CareportalEvent; import info.nightscout.androidaps.events.EventCareportalEventChange; import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.Overview.OverviewFragment; -public class CareportalFragment extends Fragment implements View.OnClickListener { +public class CareportalFragment extends SubscriberFragment implements View.OnClickListener { static CareportalPlugin careportalPlugin; @@ -178,25 +179,13 @@ public class CareportalFragment extends Fragment implements View.OnClickListener newDialog.show(manager, "NewNSTreatmentDialog"); } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventCareportalEventChange c) { updateGUI(); } - private void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); updateAge(activity, sage, iage, cage, pbage); } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Common/SubscriberFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Common/SubscriberFragment.java new file mode 100644 index 0000000000..74abc837fe --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Common/SubscriberFragment.java @@ -0,0 +1,22 @@ +package info.nightscout.androidaps.plugins.Common; + +import android.support.v4.app.Fragment; + +import info.nightscout.androidaps.MainApp; + +abstract public class SubscriberFragment extends Fragment { + @Override + public void onPause() { + super.onPause(); + MainApp.bus().unregister(this); + } + + @Override + public void onResume() { + super.onResume(); + MainApp.bus().register(this); + updateGUI(); + } + + protected abstract void updateGUI(); +} diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopFragment.java index 143cbe617b..2fb143517b 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopFragment.java @@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.Loop; import android.app.Activity; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -19,10 +18,11 @@ import org.slf4j.LoggerFactory; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.Loop.events.EventLoopSetLastRunGui; import info.nightscout.androidaps.plugins.Loop.events.EventLoopUpdateGui; -public class LoopFragment extends Fragment implements View.OnClickListener { +public class LoopFragment extends SubscriberFragment implements View.OnClickListener { private static Logger log = LoggerFactory.getLogger(LoopFragment.class); private static LoopPlugin loopPlugin; @@ -61,19 +61,6 @@ public class LoopFragment extends Fragment implements View.OnClickListener { return view; } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Override public void onClick(View view) { switch (view.getId()) { @@ -111,7 +98,8 @@ public class LoopFragment extends Fragment implements View.OnClickListener { } - private void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientInternalFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientInternalFragment.java index 3e37bf71d7..164e9902df 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientInternalFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientInternalFragment.java @@ -28,12 +28,13 @@ import org.slf4j.LoggerFactory; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; import info.nightscout.androidaps.events.EventPreferenceChange; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientNewLog; import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientRestart; import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientUpdateGUI; import info.nightscout.utils.SP; -public class NSClientInternalFragment extends Fragment implements View.OnClickListener, CompoundButton.OnCheckedChangeListener { +public class NSClientInternalFragment extends SubscriberFragment implements View.OnClickListener, CompoundButton.OnCheckedChangeListener { private static Logger log = LoggerFactory.getLogger(NSClientInternalFragment.class); static NSClientInternalPlugin nsClientInternalPlugin; @@ -150,25 +151,13 @@ public class NSClientInternalFragment extends Fragment implements View.OnClickLi } } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventNSClientUpdateGUI ev) { updateGUI(); } - private void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java index 22071e4ae1..419a55f057 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java @@ -20,11 +20,12 @@ import org.slf4j.LoggerFactory; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui; import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateResultGui; import info.nightscout.utils.JSONFormatter; -public class OpenAPSAMAFragment extends Fragment implements View.OnClickListener { +public class OpenAPSAMAFragment extends SubscriberFragment implements View.OnClickListener { private static Logger log = LoggerFactory.getLogger(OpenAPSAMAFragment.class); private static OpenAPSAMAPlugin openAPSAMAPlugin; @@ -81,19 +82,6 @@ public class OpenAPSAMAFragment extends Fragment implements View.OnClickListener } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventOpenAPSUpdateGui ev) { updateGUI(); @@ -104,7 +92,8 @@ public class OpenAPSAMAFragment extends Fragment implements View.OnClickListener updateResultGUI(ev.text); } - private void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java index 867f63e182..90bfc301b1 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java @@ -18,11 +18,12 @@ import org.slf4j.LoggerFactory; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui; import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateResultGui; import info.nightscout.utils.JSONFormatter; -public class OpenAPSMAFragment extends Fragment implements View.OnClickListener { +public class OpenAPSMAFragment extends SubscriberFragment implements View.OnClickListener { private static Logger log = LoggerFactory.getLogger(OpenAPSMAFragment.class); private static OpenAPSMAPlugin openAPSMAPlugin; @@ -75,19 +76,6 @@ public class OpenAPSMAFragment extends Fragment implements View.OnClickListener } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventOpenAPSUpdateGui ev) { updateGUI(); @@ -98,7 +86,8 @@ public class OpenAPSMAFragment extends Fragment implements View.OnClickListener updateResultGUI(ev.text); } - void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { @@ -124,7 +113,7 @@ public class OpenAPSMAFragment extends Fragment implements View.OnClickListener }); } - void updateResultGUI(final String text) { + private void updateResultGUI(final String text) { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java index 97f32e232a..7161a1d9de 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java @@ -27,10 +27,11 @@ import info.nightscout.androidaps.interfaces.PumpInterface; import info.nightscout.androidaps.plugins.Careportal.CareportalFragment; import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog; import info.nightscout.androidaps.plugins.Careportal.OptionsToShow; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.utils.SafeParse; import info.nightscout.utils.TimeListEdit; -public class LocalProfileFragment extends Fragment { +public class LocalProfileFragment extends SubscriberFragment { private static Logger log = LoggerFactory.getLogger(LocalProfileFragment.class); private static LocalProfilePlugin localProfilePlugin = new LocalProfilePlugin(); @@ -73,7 +74,7 @@ public class LocalProfileFragment extends Fragment { layout.findViewById(R.id.localprofile_basal).setVisibility(View.GONE); } - onStatusEvent(null); + updateGUI(); mgdlView.setChecked(localProfilePlugin.mgdl); mmolView.setChecked(localProfilePlugin.mmol); @@ -130,26 +131,18 @@ public class LocalProfileFragment extends Fragment { diaView.addTextChangedListener(textWatch); - onStatusEvent(null); + updateGUI(); return layout; } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - onStatusEvent(null); - } - @Subscribe public void onStatusEvent(final EventInitializationChanged e) { + updateGUI(); + } + + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java index 743ef7cb58..c8b5b2c5db 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java @@ -13,10 +13,11 @@ import com.squareup.otto.Subscribe; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; import info.nightscout.androidaps.data.Profile; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.ProfileNS.events.EventNSProfileUpdateGUI; import info.nightscout.utils.DecimalFormatter; -public class NSProfileFragment extends Fragment { +public class NSProfileFragment extends SubscriberFragment { private static NSProfilePlugin nsProfilePlugin = new NSProfilePlugin(); public static NSProfilePlugin getPlugin() { @@ -50,19 +51,6 @@ public class NSProfileFragment extends Fragment { return layout; } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventNSProfileUpdateGUI ev) { Activity activity = getActivity(); @@ -75,7 +63,8 @@ public class NSProfileFragment extends Fragment { }); } - private void updateGUI() { + @Override + protected void updateGUI() { if (MainApp.getConfigBuilder().getProfile() == null) { noProfile.setVisibility(View.VISIBLE); return; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java index 7d1f829849..a4e3a8eecf 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java @@ -25,9 +25,10 @@ import info.nightscout.androidaps.interfaces.PumpInterface; import info.nightscout.androidaps.plugins.Careportal.CareportalFragment; import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog; import info.nightscout.androidaps.plugins.Careportal.OptionsToShow; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.utils.SafeParse; -public class SimpleProfileFragment extends Fragment { +public class SimpleProfileFragment extends SubscriberFragment { private static Logger log = LoggerFactory.getLogger(SimpleProfileFragment.class); private static SimpleProfilePlugin simpleProfilePlugin = new SimpleProfilePlugin(); @@ -66,7 +67,7 @@ public class SimpleProfileFragment extends Fragment { layout.findViewById(R.id.simpleprofile_basalrate_label).setVisibility(View.GONE); } - onStatusEvent(null); + updateGUI(); mgdlView.setChecked(simpleProfilePlugin.mgdl); mmolView.setChecked(simpleProfilePlugin.mmol); @@ -138,26 +139,18 @@ public class SimpleProfileFragment extends Fragment { targetlowView.addTextChangedListener(textWatch); targethighView.addTextChangedListener(textWatch); - onStatusEvent(null); + updateGUI(); return layout; } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - onStatusEvent(null); - } - @Subscribe public void onStatusEvent(final EventInitializationChanged e) { + updateGUI(); + } + + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java index 437043c887..87c635cbef 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java @@ -27,6 +27,7 @@ import info.nightscout.androidaps.R; import info.nightscout.androidaps.events.EventExtendedBolusChange; import info.nightscout.androidaps.events.EventPumpStatusChanged; import info.nightscout.androidaps.events.EventTempBasalChange; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.PumpDanaR.Dialogs.ProfileViewDialog; import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRHistoryActivity; import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRStatsActivity; @@ -35,7 +36,7 @@ import info.nightscout.utils.DateUtil; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.SetWarnColor; -public class DanaRFragment extends Fragment { +public class DanaRFragment extends SubscriberFragment { private static Logger log = LoggerFactory.getLogger(DanaRFragment.class); private static DanaRPlugin danaRPlugin; @@ -156,19 +157,6 @@ public class DanaRFragment extends Fragment { return view; } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventPumpStatusChanged c) { Activity activity = getActivity(); @@ -205,7 +193,8 @@ public class DanaRFragment extends Fragment { } // GUI functions - private void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null && basaBasalRateView != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java index adca7e91a3..50ec8883c6 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java @@ -27,6 +27,7 @@ import info.nightscout.androidaps.R; import info.nightscout.androidaps.events.EventExtendedBolusChange; import info.nightscout.androidaps.events.EventPumpStatusChanged; import info.nightscout.androidaps.events.EventTempBasalChange; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump; import info.nightscout.androidaps.plugins.PumpDanaR.Dialogs.ProfileViewDialog; import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRHistoryActivity; @@ -36,7 +37,7 @@ import info.nightscout.utils.DateUtil; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.SetWarnColor; -public class DanaRKoreanFragment extends Fragment { +public class DanaRKoreanFragment extends SubscriberFragment { private static Logger log = LoggerFactory.getLogger(DanaRKoreanFragment.class); private static DanaRKoreanPlugin danaRKoreanPlugin = new DanaRKoreanPlugin(); @@ -154,19 +155,6 @@ public class DanaRKoreanFragment extends Fragment { return view; } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventPumpStatusChanged c) { Activity activity = getActivity(); @@ -203,7 +191,8 @@ public class DanaRKoreanFragment extends Fragment { } // GUI functions - private void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null && basaBasalRateView != null) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Fragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Fragment.java index d443746e5a..7b92be30d8 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Fragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Fragment.java @@ -27,6 +27,7 @@ import info.nightscout.androidaps.R; import info.nightscout.androidaps.events.EventExtendedBolusChange; import info.nightscout.androidaps.events.EventPumpStatusChanged; import info.nightscout.androidaps.events.EventTempBasalChange; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump; import info.nightscout.androidaps.plugins.PumpDanaR.Dialogs.ProfileViewDialog; import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRHistoryActivity; @@ -36,7 +37,7 @@ import info.nightscout.utils.DateUtil; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.SetWarnColor; -public class DanaRv2Fragment extends Fragment { +public class DanaRv2Fragment extends SubscriberFragment { private static Logger log = LoggerFactory.getLogger(DanaRv2Fragment.class); private static DanaRv2Plugin danaRPlugin; @@ -153,19 +154,6 @@ public class DanaRv2Fragment extends Fragment { return view; } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventPumpStatusChanged c) { Activity activity = getActivity(); @@ -202,7 +190,8 @@ public class DanaRv2Fragment extends Fragment { } // GUI functions - private void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null && basaBasalRateView != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java index bb639d30f1..2dfaefe482 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java @@ -5,7 +5,6 @@ import android.app.Activity; import android.os.Bundle; import android.os.Handler; import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -16,13 +15,12 @@ import com.squareup.otto.Subscribe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Date; - import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.PumpVirtual.events.EventVirtualPumpUpdateGui; -public class VirtualPumpFragment extends Fragment { +public class VirtualPumpFragment extends SubscriberFragment { private static Logger log = LoggerFactory.getLogger(VirtualPumpFragment.class); TextView basaBasalRateView; @@ -63,25 +61,13 @@ public class VirtualPumpFragment extends Fragment { return view; } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventVirtualPumpUpdateGui ev) { updateGUI(); } - public void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null && basaBasalRateView != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorFragment.java index 1ec0239f83..09a635bf86 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorFragment.java @@ -20,13 +20,14 @@ import java.util.Comparator; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.SmsCommunicator.events.EventSmsCommunicatorUpdateGui; import info.nightscout.utils.DateUtil; /** * A simple {@link Fragment} subclass. */ -public class SmsCommunicatorFragment extends Fragment { +public class SmsCommunicatorFragment extends SubscriberFragment { private static Logger log = LoggerFactory.getLogger(SmsCommunicatorFragment.class); private static SmsCommunicatorPlugin smsCommunicatorPlugin; @@ -56,26 +57,14 @@ public class SmsCommunicatorFragment extends Fragment { return view; } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventSmsCommunicatorUpdateGui ev) { updateGUI(); } - private void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java index c0e763ee90..0e7d94cd88 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java @@ -37,13 +37,14 @@ import info.nightscout.androidaps.db.Treatment; import info.nightscout.androidaps.events.EventNewBG; import info.nightscout.androidaps.events.EventTreatmentChange; import info.nightscout.androidaps.data.Profile; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin; import info.nightscout.utils.DateUtil; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.NSUpload; import info.nightscout.utils.SP; -public class TreatmentsBolusFragment extends Fragment implements View.OnClickListener { +public class TreatmentsBolusFragment extends SubscriberFragment implements View.OnClickListener { private static Logger log = LoggerFactory.getLogger(TreatmentsBolusFragment.class); RecyclerView recyclerView; @@ -205,19 +206,6 @@ public class TreatmentsBolusFragment extends Fragment implements View.OnClickLis } } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventTreatmentChange ev) { updateGUI(); @@ -228,7 +216,8 @@ public class TreatmentsBolusFragment extends Fragment implements View.OnClickLis updateGUI(); } - public void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java index 17836e081b..d8326fb348 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java @@ -32,13 +32,14 @@ import info.nightscout.androidaps.db.ExtendedBolus; import info.nightscout.androidaps.db.Source; import info.nightscout.androidaps.events.EventExtendedBolusChange; import info.nightscout.androidaps.events.EventNewBG; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.utils.DateUtil; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.NSUpload; import info.nightscout.androidaps.data.OverlappingIntervals; -public class TreatmentsExtendedBolusesFragment extends Fragment { +public class TreatmentsExtendedBolusesFragment extends SubscriberFragment { private static Logger log = LoggerFactory.getLogger(TreatmentsExtendedBolusesFragment.class); RecyclerView recyclerView; @@ -183,19 +184,6 @@ public class TreatmentsExtendedBolusesFragment extends Fragment { return view; } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventExtendedBolusChange ev) { updateGUI(); @@ -206,7 +194,8 @@ public class TreatmentsExtendedBolusesFragment extends Fragment { updateGUI(); } - public void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null && recyclerView != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java index 8a8866fa4d..e5c1134787 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java @@ -30,6 +30,7 @@ import info.nightscout.androidaps.db.Source; import info.nightscout.androidaps.db.TempTarget; import info.nightscout.androidaps.events.EventProfileSwitchChange; import info.nightscout.androidaps.events.EventTempTargetChange; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.utils.DateUtil; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.NSUpload; @@ -40,7 +41,7 @@ import info.nightscout.utils.SP; * Created by mike on 13/01/17. */ -public class TreatmentsProfileSwitchFragment extends Fragment implements View.OnClickListener { +public class TreatmentsProfileSwitchFragment extends SubscriberFragment implements View.OnClickListener { RecyclerView recyclerView; LinearLayoutManager llm; @@ -180,25 +181,13 @@ public class TreatmentsProfileSwitchFragment extends Fragment implements View.On } } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventProfileSwitchChange ev) { updateGUI(); } - private void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java index 4a465840d6..4a6aab2152 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java @@ -26,7 +26,7 @@ import info.nightscout.androidaps.Services.Intents; import info.nightscout.androidaps.db.Source; import info.nightscout.androidaps.db.TempTarget; import info.nightscout.androidaps.events.EventTempTargetChange; -import info.nightscout.androidaps.data.Profile; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.utils.DateUtil; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.NSUpload; @@ -37,7 +37,7 @@ import info.nightscout.utils.SP; * Created by mike on 13/01/17. */ -public class TreatmentsTempTargetFragment extends Fragment implements View.OnClickListener { +public class TreatmentsTempTargetFragment extends SubscriberFragment implements View.OnClickListener { RecyclerView recyclerView; LinearLayoutManager llm; @@ -201,25 +201,13 @@ public class TreatmentsTempTargetFragment extends Fragment implements View.OnCli } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventTempTargetChange ev) { updateGUI(); } - private void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java index bcd544c3ab..e9f6c7c7b9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java @@ -32,13 +32,14 @@ import info.nightscout.androidaps.db.Source; import info.nightscout.androidaps.db.TemporaryBasal; import info.nightscout.androidaps.events.EventNewBG; import info.nightscout.androidaps.events.EventTempBasalChange; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.utils.DateUtil; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.NSUpload; import info.nightscout.androidaps.data.OverlappingIntervals; -public class TreatmentsTemporaryBasalsFragment extends Fragment { +public class TreatmentsTemporaryBasalsFragment extends SubscriberFragment { private static Logger log = LoggerFactory.getLogger(TreatmentsTemporaryBasalsFragment.class); RecyclerView recyclerView; @@ -202,19 +203,6 @@ public class TreatmentsTemporaryBasalsFragment extends Fragment { return view; } - @Override - public void onPause() { - super.onPause(); - MainApp.bus().unregister(this); - } - - @Override - public void onResume() { - super.onResume(); - MainApp.bus().register(this); - updateGUI(); - } - @Subscribe public void onStatusEvent(final EventTempBasalChange ev) { updateGUI(); @@ -225,7 +213,8 @@ public class TreatmentsTemporaryBasalsFragment extends Fragment { updateGUI(); } - public void updateGUI() { + @Override + protected void updateGUI() { Activity activity = getActivity(); if (activity != null) activity.runOnUiThread(new Runnable() { From 741f6bd866b9f18690b3a7c03b3a48677e0f5253 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Tue, 18 Jul 2017 13:18:41 +0200 Subject: [PATCH 12/77] Update InsulinFastactingFragment.java ... in case DIA has changed --- .../InsulinFastactingFragment.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/InsulinFastactingFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/InsulinFastactingFragment.java index a99e016621..84741656f5 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/InsulinFastactingFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/InsulinFastactingFragment.java @@ -35,12 +35,22 @@ public class InsulinFastactingFragment extends Fragment { insulinDia = (TextView) view.findViewById(R.id.insulin_dia); insulinGraph = (ActivityGraph) view.findViewById(R.id.insuling_graph); - insulinName.setText(insulinFastactingPlugin.getFriendlyName()); - insulinComment.setText(insulinFastactingPlugin.getComment()); - insulinDia.setText(MainApp.sResources.getText(R.string.dia) + " " + new Double(insulinFastactingPlugin.getDia()).toString() + "h"); - insulinGraph.show(insulinFastactingPlugin); + updateGUI(); return view; } + @Override + public void onResume() { + super.onResume(); + updateGUI(); + } + + private void updateGUI() { + insulinName.setText(insulinFastactingPlugin.getFriendlyName()); + insulinComment.setText(insulinFastactingPlugin.getComment()); + insulinDia.setText(MainApp.sResources.getText(R.string.dia) + " " + new Double(insulinFastactingPlugin.getDia()).toString() + "h"); + insulinGraph.show(insulinFastactingPlugin); + } + } From c79a5725fdc0f1a321e806bf2d83287e2bc4ee52 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Tue, 18 Jul 2017 13:19:43 +0200 Subject: [PATCH 13/77] Update InsulinFastactingProlongedFragment.java ... in case DIA has changed. --- .../InsulinFastactingProlongedFragment.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastactingProlonged/InsulinFastactingProlongedFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastactingProlonged/InsulinFastactingProlongedFragment.java index acc915b001..e1d0143934 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastactingProlonged/InsulinFastactingProlongedFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastactingProlonged/InsulinFastactingProlongedFragment.java @@ -36,12 +36,22 @@ public class InsulinFastactingProlongedFragment extends Fragment { insulinDia = (TextView) view.findViewById(R.id.insulin_dia); insulinGraph = (ActivityGraph) view.findViewById(R.id.insuling_graph); - insulinName.setText(insulinFastactingProlongedPlugin.getFriendlyName()); - insulinComment.setText(insulinFastactingProlongedPlugin.getComment()); - insulinDia.setText(MainApp.sResources.getText(R.string.dia) + " " + new Double(insulinFastactingProlongedPlugin.getDia()).toString() + "h"); - insulinGraph.show(insulinFastactingProlongedPlugin); + updateGUI(); return view; } + @Override + public void onResume() { + super.onResume(); + updateGUI(); + } + + private void updateGUI() { + insulinName.setText(insulinFastactingProlongedPlugin.getFriendlyName()); + insulinComment.setText(insulinFastactingProlongedPlugin.getComment()); + insulinDia.setText(MainApp.sResources.getText(R.string.dia) + " " + new Double(insulinFastactingProlongedPlugin.getDia()).toString() + "h"); + insulinGraph.show(insulinFastactingProlongedPlugin); + } + } From c3f85faede88ebb508079d8338093068424f9936 Mon Sep 17 00:00:00 2001 From: PoweRGbg Date: Tue, 18 Jul 2017 18:10:24 +0300 Subject: [PATCH 14/77] removed some "unneeded" translations --- app/src/main/res/values-bg/strings.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index e1c69f31af..99e1201b64 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -675,18 +675,7 @@ Заключен екран Закл Когато включите Autosense feature трябва да въвеждате ВСИЧКИ въглехидрати. В противен случай те ще се изчисляват грешно като повишена чувствителност!! - SMB резултат - SMB - SMB - key_smb - SMB enable - Super Micro Boluses is used when there are COB and more insulin is needed - UAM - UAM - key_uam - Enable UAM - UnAnounced Meals - Необявени хранения - трябва да помага при неправилно изчислени и въведени въглехидрати. - Rumen SMB + Алгоритъм на Среднопретеглената стойност OK Откажи From c7538737693ba746d92e16a8cb9ab996d87e2970 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Tue, 18 Jul 2017 22:15:17 +0200 Subject: [PATCH 15/77] setting to disable local broadcasts in NSClient --- .../broadcasts/BroadcastAckAlarm.java | 2 ++ .../broadcasts/BroadcastAlarm.java | 4 ++++ .../broadcasts/BroadcastAnnouncement.java | 4 ++++ .../broadcasts/BroadcastCals.java | 4 ++++ .../broadcasts/BroadcastClearAlarm.java | 4 ++++ .../broadcasts/BroadcastDeviceStatus.java | 6 ++++++ .../broadcasts/BroadcastMbgs.java | 4 ++++ .../broadcasts/BroadcastProfile.java | 4 ++++ .../broadcasts/BroadcastQueueStatus.java | 4 ++++ .../broadcasts/BroadcastSgvs.java | 4 ++++ .../broadcasts/BroadcastStatus.java | 4 ++++ .../broadcasts/BroadcastTreatment.java | 19 +++++++++++++++++++ .../broadcasts/BroadcastUrgentAlarm.java | 4 ++++ app/src/main/res/values/strings.xml | 2 ++ .../main/res/xml/pref_nsclientinternal.xml | 5 +++++ 15 files changed, 74 insertions(+) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java index 8b27da530a..3b01e038ab 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java @@ -12,6 +12,7 @@ import java.util.List; import info.nightscout.androidaps.Services.Intents; import info.nightscout.androidaps.plugins.NSClientInternal.data.NSAlarm; +import info.nightscout.utils.SP; /** * Created by mike on 11.06.2017. @@ -21,6 +22,7 @@ public class BroadcastAckAlarm { private static Logger log = LoggerFactory.getLogger(BroadcastAckAlarm.class); public static void handleClearAlarm(NSAlarm originalAlarm, Context context, long silenceTimeInMsec) { + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; Bundle bundle = new Bundle(); bundle.putInt("level", originalAlarm.getLevel()); bundle.putString("group", originalAlarm.getGroup()); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java index 1653a55bc6..01857bd8c1 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java @@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory; import java.util.List; import info.nightscout.androidaps.Services.Intents; +import info.nightscout.utils.SP; /** * Created by mike on 26.06.2016. @@ -20,6 +21,9 @@ public class BroadcastAlarm { private static Logger log = LoggerFactory.getLogger(BroadcastAlarm.class); public static void handleAlarm(JSONObject alarm, Context context) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + Bundle bundle = new Bundle(); bundle.putString("data", alarm.toString()); Intent intent = new Intent(Intents.ACTION_ALARM); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java index a39a59558f..96279a039e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java @@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory; import java.util.List; import info.nightscout.androidaps.Services.Intents; +import info.nightscout.utils.SP; /** * Created by mike on 26.06.2016. @@ -21,6 +22,9 @@ public class BroadcastAnnouncement { private static Logger log = LoggerFactory.getLogger(BroadcastAnnouncement.class); public static void handleAnnouncement(JSONObject announcement, Context context) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + Bundle bundle = new Bundle(); bundle.putString("data", announcement.toString()); Intent intent = new Intent(Intents.ACTION_ANNOUNCEMENT); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java index 6445f13f94..e8e1cd4758 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java @@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory; import java.util.List; import info.nightscout.androidaps.Services.Intents; +import info.nightscout.utils.SP; /** * Created by mike on 26.06.2016. @@ -20,6 +21,9 @@ public class BroadcastCals { private static Logger log = LoggerFactory.getLogger(BroadcastCals.class); public static void handleNewCal(JSONArray cals, Context context, boolean isDelta) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + Bundle bundle = new Bundle(); bundle.putString("cals", cals.toString()); bundle.putBoolean("delta", isDelta); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java index c3c1e41994..768df01be2 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java @@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory; import java.util.List; import info.nightscout.androidaps.Services.Intents; +import info.nightscout.utils.SP; /** * Created by mike on 26.06.2016. @@ -20,6 +21,9 @@ public class BroadcastClearAlarm { private static Logger log = LoggerFactory.getLogger(BroadcastClearAlarm.class); public static void handleClearAlarm(JSONObject clearalarm, Context context) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + Bundle bundle = new Bundle(); bundle.putString("data", clearalarm.toString()); Intent intent = new Intent(Intents.ACTION_CLEAR_ALARM); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java index 1f338b0038..4d1321241a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java @@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory; import java.util.List; import info.nightscout.androidaps.Services.Intents; +import info.nightscout.utils.SP; public class BroadcastDeviceStatus { @@ -35,6 +36,11 @@ public class BroadcastDeviceStatus { } } public static void handleNewDeviceStatus(JSONArray statuses, Context context, boolean isDelta) { + + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + + List splitted = BroadcastTreatment.splitArray(statuses); for (JSONArray part: splitted) { Bundle bundle = new Bundle(); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java index 7d66352328..d11a542714 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java @@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory; import java.util.List; import info.nightscout.androidaps.Services.Intents; +import info.nightscout.utils.SP; /** * Created by mike on 26.06.2016. @@ -20,6 +21,9 @@ public class BroadcastMbgs { private static Logger log = LoggerFactory.getLogger(BroadcastMbgs.class); public static void handleNewMbg(JSONArray mbgs, Context context, boolean isDelta) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + Bundle bundle = new Bundle(); bundle.putString("mbgs", mbgs.toString()); bundle.putBoolean("delta", isDelta); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java index 0b64da8384..3fe6bf4c35 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java @@ -12,6 +12,7 @@ import java.util.List; import info.nightscout.androidaps.Services.Intents; import info.nightscout.androidaps.data.ProfileStore; +import info.nightscout.utils.SP; /** @@ -21,6 +22,9 @@ public class BroadcastProfile { private static Logger log = LoggerFactory.getLogger(BroadcastProfile.class); public static void handleNewTreatment(ProfileStore profile, Context context, boolean isDelta) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + Bundle bundle = new Bundle(); bundle.putString("profile", profile.getData().toString()); bundle.putBoolean("delta", isDelta); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastQueueStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastQueueStatus.java index fbcc1ed7a3..eedeb4574d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastQueueStatus.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastQueueStatus.java @@ -6,12 +6,16 @@ import android.os.Bundle; import android.os.PowerManager; import info.nightscout.androidaps.Services.Intents; +import info.nightscout.utils.SP; /** * Created by mike on 28.02.2016. */ public class BroadcastQueueStatus { public static void handleNewStatus(int size, Context context) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "sendQueue"); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java index 308a1fe395..52e88295c1 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java @@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory; import java.util.List; import info.nightscout.androidaps.Services.Intents; +import info.nightscout.utils.SP; /** * Created by mike on 22.02.2016. @@ -21,6 +22,9 @@ public class BroadcastSgvs { private static Logger log = LoggerFactory.getLogger(BroadcastSgvs.class); public static void handleNewSgv(JSONObject sgv, Context context, boolean isDelta) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + Bundle bundle = new Bundle(); bundle.putString("sgv", sgv.toString()); bundle.putBoolean("delta", isDelta); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java index 8edd749a95..82870b960e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java @@ -15,6 +15,7 @@ import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.Services.Intents; import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSettingsStatus; import info.nightscout.androidaps.plugins.NSClientInternal.services.NSClientService; +import info.nightscout.utils.SP; /** * Created by mike on 24.02.2016. @@ -23,6 +24,9 @@ public class BroadcastStatus { private static Logger log = LoggerFactory.getLogger(BroadcastStatus.class); public static void handleNewStatus(NSSettingsStatus status, Context context, boolean isDelta) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + Bundle bundle = new Bundle(); try { bundle.putString("nsclientversionname", MainApp.instance().getPackageManager().getPackageInfo(MainApp.instance().getPackageName(), 0).versionName); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java index 8975b54181..dbd6414152 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java @@ -17,6 +17,7 @@ import java.util.List; import info.nightscout.androidaps.Services.Intents; import info.nightscout.androidaps.plugins.NSClientInternal.data.NSTreatment; +import info.nightscout.utils.SP; /** * Created by mike on 20.02.2016. @@ -25,6 +26,9 @@ public class BroadcastTreatment { private static Logger log = LoggerFactory.getLogger(BroadcastTreatment.class); public static void handleNewTreatment(NSTreatment treatment, Context context, boolean isDelta) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + Bundle bundle = new Bundle(); bundle.putString("treatment", treatment.getData().toString()); bundle.putBoolean("delta", isDelta); @@ -42,6 +46,9 @@ public class BroadcastTreatment { } public static void handleNewTreatment(JSONArray treatments, Context context, boolean isDelta) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + List splitted = splitArray(treatments); for (JSONArray part: splitted) { Bundle bundle = new Bundle(); @@ -62,6 +69,9 @@ public class BroadcastTreatment { } public void handleChangedTreatment(JSONObject treatment, Context context, boolean isDelta) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + Bundle bundle = new Bundle(); bundle.putString("treatment", treatment.toString()); bundle.putBoolean("delta", isDelta); @@ -78,6 +88,9 @@ public class BroadcastTreatment { } public static void handleChangedTreatment(JSONArray treatments, Context context, boolean isDelta) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + List splitted = splitArray(treatments); for (JSONArray part: splitted) { Bundle bundle = new Bundle(); @@ -98,6 +111,9 @@ public class BroadcastTreatment { } public static void handleRemovedTreatment(JSONObject treatment, Context context, boolean isDelta) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + Bundle bundle = new Bundle(); bundle.putString("treatment", treatment.toString()); bundle.putBoolean("delta", isDelta); @@ -116,6 +132,9 @@ public class BroadcastTreatment { } public static void handleRemovedTreatment(JSONArray treatments, Context context, boolean isDelta) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + Bundle bundle = new Bundle(); bundle.putString("treatments", treatments.toString()); bundle.putBoolean("delta", isDelta); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java index 3093e610bf..335c500c98 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java @@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory; import java.util.List; import info.nightscout.androidaps.Services.Intents; +import info.nightscout.utils.SP; /** * Created by mike on 26.06.2016. @@ -20,6 +21,9 @@ public class BroadcastUrgentAlarm { private static Logger log = LoggerFactory.getLogger(BroadcastUrgentAlarm.class); public static void handleUrgentAlarm(JSONObject urgentalarm, Context context) { + + if(!SP.getBoolean("nsclient_localbroadcasts", true)) return; + Bundle bundle = new Bundle(); bundle.putString("data", urgentalarm.toString()); Intent intent = new Intent(Intents.ACTION_URGENT_ALARM); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a44e5ef758..a8083e7bc6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -580,6 +580,7 @@ Superbolus Log app start to NS ns_logappstartedevent + nsclient_localbroadcasts Exiting application to apply settings. DanaRv2 Insulin @@ -685,4 +686,5 @@ Values not stored! Overview Notifications Pass the Overview Notifications through as wear confirmation messages. + Enable loacal broadcasts to other apps (like xDrip). diff --git a/app/src/main/res/xml/pref_nsclientinternal.xml b/app/src/main/res/xml/pref_nsclientinternal.xml index 8c12efd5de..4eb1553a1c 100644 --- a/app/src/main/res/xml/pref_nsclientinternal.xml +++ b/app/src/main/res/xml/pref_nsclientinternal.xml @@ -27,6 +27,11 @@ android:key="@string/key_ns_logappstartedevent" android:title="@string/ns_logappstartedevent" /> + + Date: Tue, 18 Jul 2017 22:18:10 +0200 Subject: [PATCH 16/77] local broadcasts better setting title --- app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/pref_nsclientinternal.xml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a8083e7bc6..b22b5f160c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -687,4 +687,5 @@ Overview Notifications Pass the Overview Notifications through as wear confirmation messages. Enable loacal broadcasts to other apps (like xDrip). + Enable local Broadcasts. diff --git a/app/src/main/res/xml/pref_nsclientinternal.xml b/app/src/main/res/xml/pref_nsclientinternal.xml index 4eb1553a1c..5f401d6c0e 100644 --- a/app/src/main/res/xml/pref_nsclientinternal.xml +++ b/app/src/main/res/xml/pref_nsclientinternal.xml @@ -30,7 +30,9 @@ + android:title="@string/ns_localbroadcasts_title" + android:summary="@string/ns_localbroadcasts"/> + From c95879e6adf1a5a26c1a742535b4d1f0a95ba18c Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Wed, 19 Jul 2017 11:45:51 +0200 Subject: [PATCH 17/77] Align OpenAS(A)MA fragments with layout of other fragments. Removes a margin that makes the top elements jump up and down when flipping through tabs. --- app/src/main/res/layout/loop_fragment.xml | 1 - app/src/main/res/layout/openapsama_fragment.xml | 5 ++--- app/src/main/res/layout/openapsma_fragment.xml | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/layout/loop_fragment.xml b/app/src/main/res/layout/loop_fragment.xml index 23a2f93d18..fb6038dcb3 100644 --- a/app/src/main/res/layout/loop_fragment.xml +++ b/app/src/main/res/layout/loop_fragment.xml @@ -5,7 +5,6 @@ tools:context="info.nightscout.androidaps.plugins.Loop.LoopFragment"> diff --git a/app/src/main/res/layout/openapsama_fragment.xml b/app/src/main/res/layout/openapsama_fragment.xml index f1f4f364ec..a471429567 100644 --- a/app/src/main/res/layout/openapsama_fragment.xml +++ b/app/src/main/res/layout/openapsama_fragment.xml @@ -6,12 +6,11 @@ + android:layout_height="match_parent"> + android:layout_height="match_parent"> Date: Wed, 19 Jul 2017 16:05:13 +0200 Subject: [PATCH 18/77] nsclient remove debug data that puts stress on the broadcast system --- .../NSClientInternal/broadcasts/BroadcastAckAlarm.java | 7 ------- .../NSClientInternal/broadcasts/BroadcastAlarm.java | 8 -------- .../broadcasts/BroadcastAnnouncement.java | 7 ------- .../NSClientInternal/broadcasts/BroadcastCals.java | 7 ------- .../NSClientInternal/broadcasts/BroadcastClearAlarm.java | 7 ------- .../broadcasts/BroadcastDeviceStatus.java | 7 ------- .../NSClientInternal/broadcasts/BroadcastMbgs.java | 7 ------- .../NSClientInternal/broadcasts/BroadcastProfile.java | 7 ------- .../NSClientInternal/broadcasts/BroadcastSgvs.java | 7 ------- .../NSClientInternal/broadcasts/BroadcastStatus.java | 7 ------- .../NSClientInternal/broadcasts/BroadcastTreatment.java | 7 ------- .../NSClientInternal/broadcasts/BroadcastUrgentAlarm.java | 7 ------- 12 files changed, 85 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java index 3b01e038ab..35789a426c 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java @@ -31,13 +31,6 @@ public class BroadcastAckAlarm { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - log.debug("ACKALARM " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } - } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java index 01857bd8c1..03fe04f8fe 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java @@ -30,13 +30,5 @@ public class BroadcastAlarm { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - - try{ - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("ALARM " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java index 96279a039e..3f9a43a14a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java @@ -31,12 +31,5 @@ public class BroadcastAnnouncement { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("ANNOUNCEMENT " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java index e8e1cd4758..7a7772357c 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java @@ -31,12 +31,5 @@ public class BroadcastCals { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("CAL " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java index 768df01be2..4f2716cf85 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java @@ -30,12 +30,5 @@ public class BroadcastClearAlarm { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("CLEARALARM " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java index 4d1321241a..4cad77df11 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java @@ -50,13 +50,6 @@ public class BroadcastDeviceStatus { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("DEVICESTATUS " + part.length() + " records " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java index d11a542714..f45ade6b32 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java @@ -31,12 +31,5 @@ public class BroadcastMbgs { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("MBG " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java index 3fe6bf4c35..ec62ccbf6f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java @@ -32,13 +32,6 @@ public class BroadcastProfile { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("PROFILE " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java index 52e88295c1..56350080ef 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java @@ -49,13 +49,6 @@ public class BroadcastSgvs { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("SGV " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java index 82870b960e..15432c8e79 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java @@ -42,12 +42,5 @@ public class BroadcastStatus { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("STATUS: " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java index dbd6414152..66edb99141 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java @@ -142,13 +142,6 @@ public class BroadcastTreatment { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("TREAT_REMOVE " + treatments.length() + " treatments " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java index 335c500c98..442eb729c0 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java @@ -30,12 +30,5 @@ public class BroadcastUrgentAlarm { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("URGENTALARM " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } } From 621c32d832e52d972c40841fff063db0eb731927 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Wed, 19 Jul 2017 16:06:36 +0200 Subject: [PATCH 19/77] nsclient remove debug data that puts stress on the broadcast system 2 --- .../broadcasts/BroadcastTreatment.java | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java index 66edb99141..60540d7613 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java @@ -36,13 +36,6 @@ public class BroadcastTreatment { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("TREAT_ADD " + treatment.getEventType() + " " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } public static void handleNewTreatment(JSONArray treatments, Context context, boolean isDelta) { @@ -58,13 +51,6 @@ public class BroadcastTreatment { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - log.debug("TREAT_ADD " + part.length() + " " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } - } } @@ -79,12 +65,6 @@ public class BroadcastTreatment { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("TREAT_CHANGE " + treatment.getString("_id") + " " + x.size() + " receivers"); - } catch (Exception e) { - } } public static void handleChangedTreatment(JSONArray treatments, Context context, boolean isDelta) { @@ -100,13 +80,6 @@ public class BroadcastTreatment { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("TREAT_CHANGE " + part.length() + " " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } } @@ -121,14 +94,6 @@ public class BroadcastTreatment { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - - log.debug("TREAT_REMOVE " + treatment.getString("_id") + " " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } public static void handleRemovedTreatment(JSONArray treatments, Context context, boolean isDelta) { From e6ce35485af2d46c591543cf1bbff2bd63e1e113 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Wed, 19 Jul 2017 16:09:34 +0200 Subject: [PATCH 20/77] nsclient remove debug data that puts stress on the broadcast system 3 --- .../NSClientInternal/broadcasts/BroadcastDeviceStatus.java | 7 ------- .../plugins/NSClientInternal/broadcasts/BroadcastSgvs.java | 7 ------- 2 files changed, 14 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java index 4cad77df11..9053c6becb 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java @@ -27,13 +27,6 @@ public class BroadcastDeviceStatus { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("DEVICESTATUS " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } public static void handleNewDeviceStatus(JSONArray statuses, Context context, boolean isDelta) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java index 56350080ef..29e2031869 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java @@ -32,13 +32,6 @@ public class BroadcastSgvs { intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); context.sendBroadcast(intent); - try { - List x = context.getPackageManager().queryBroadcastReceivers(intent, 0); - - log.debug("SGV " + x.size() + " receivers"); - } catch (Exception e){ - //for testing - } } public static void handleNewSgv(JSONArray sgvs, Context context, boolean isDelta) { From 76990b7983d02ecd352a4c8c953af742d7a942a7 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Wed, 19 Jul 2017 17:38:20 +0200 Subject: [PATCH 21/77] synchronize interval access --- .../nightscout/androidaps/data/Intervals.java | 16 +++++++------- .../data/NonOverlappingIntervals.java | 4 ++-- .../androidaps/data/OverlappingIntervals.java | 4 ++-- .../androidaps/data/ProfileIntervals.java | 22 +++++++++---------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/data/Intervals.java b/app/src/main/java/info/nightscout/androidaps/data/Intervals.java index a76ea9b4f8..108b4060e0 100644 --- a/app/src/main/java/info/nightscout/androidaps/data/Intervals.java +++ b/app/src/main/java/info/nightscout/androidaps/data/Intervals.java @@ -18,7 +18,7 @@ public abstract class Intervals { LongSparseArray rawData = new LongSparseArray(); // oldest at index 0 - public Intervals reset() { + public synchronized Intervals reset() { rawData = new LongSparseArray(); return this; } @@ -29,7 +29,7 @@ public abstract class Intervals { * The List must be sorted by `T.start()` in ascending order * * */ - public void add(List list) { + public synchronized void add(List list) { for (T interval : list) { rawData.put(interval.start(), interval); } @@ -38,21 +38,21 @@ public abstract class Intervals { - public List getList() { + public synchronized List getList() { List list = new ArrayList<>(); for (int i = 0; i < rawData.size(); i++) list.add(rawData.valueAt(i)); return list; } - public List getReversedList() { + public synchronized List getReversedList() { List list = new ArrayList<>(); for (int i = rawData.size() -1; i>=0; i--) list.add(rawData.valueAt(i)); return list; } - protected int binarySearch(long value) { + protected synchronized int binarySearch(long value) { int lo = 0; int hi = rawData.size() - 1; @@ -73,15 +73,15 @@ public abstract class Intervals { public abstract T getValueByInterval(long time); - public int size() { + public synchronized int size() { return rawData.size(); } - public T get(int index) { + public synchronized T get(int index) { return rawData.valueAt(index); } - public T getReversed(int index) { + public synchronized T getReversed(int index) { return rawData.valueAt(size() - 1 - index); } diff --git a/app/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.java b/app/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.java index ca1d5abe63..385eeb9594 100644 --- a/app/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.java +++ b/app/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.java @@ -11,7 +11,7 @@ import info.nightscout.androidaps.interfaces.Interval; public class NonOverlappingIntervals extends Intervals { - protected void merge() { + protected synchronized void merge() { for (int index = 0; index < rawData.size() - 1; index++) { Interval i = rawData.valueAt(index); long startOfNewer = rawData.valueAt(index + 1).start(); @@ -22,7 +22,7 @@ public class NonOverlappingIntervals extends Intervals { } @Nullable - public T getValueByInterval(long time) { + public synchronized T getValueByInterval(long time) { int index = binarySearch(time); if (index >= 0) return rawData.valueAt(index); return null; diff --git a/app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java b/app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java index 38193a22c9..608fa8d328 100644 --- a/app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java +++ b/app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java @@ -11,7 +11,7 @@ import info.nightscout.androidaps.interfaces.Interval; public class OverlappingIntervals extends Intervals { - protected void merge() { + protected synchronized void merge() { boolean needToCut = false; long cutTime = 0; @@ -30,7 +30,7 @@ public class OverlappingIntervals extends Intervals { } @Nullable - public T getValueByInterval(long time) { + public synchronized T getValueByInterval(long time) { for (int index = rawData.size()-1; index > 0; index--) { //begin with newest T cur = rawData.valueAt(index); if (cur.match(time)){ diff --git a/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java b/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java index ef255ed901..3633f1079e 100644 --- a/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java +++ b/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java @@ -19,24 +19,24 @@ public class ProfileIntervals { private LongSparseArray rawData = new LongSparseArray<>(); // oldest at index 0 - public ProfileIntervals reset() { + public synchronized ProfileIntervals reset() { rawData = new LongSparseArray<>(); return this; } - public void add(T newInterval) { + public synchronized void add(T newInterval) { rawData.put(newInterval.start(), newInterval); merge(); } - public void add(List list) { + public synchronized void add(List list) { for (T interval : list) { rawData.put(interval.start(), interval); } merge(); } - private void merge() { + private synchronized void merge() { for (int index = 0; index < rawData.size() - 1; index++) { Interval i = rawData.valueAt(index); long startOfNewer = rawData.valueAt(index + 1).start(); @@ -47,27 +47,27 @@ public class ProfileIntervals { } @Nullable - public Interval getValueToTime(long time) { + public synchronized Interval getValueToTime(long time) { int index = binarySearch(time); if (index >= 0) return rawData.valueAt(index); return null; } - public List getList() { + public synchronized List getList() { List list = new ArrayList<>(); for (int i = 0; i < rawData.size(); i++) list.add(rawData.valueAt(i)); return list; } - public List getReversedList() { + public synchronized List getReversedList() { List list = new ArrayList<>(); for (int i = rawData.size() -1; i>=0; i--) list.add(rawData.valueAt(i)); return list; } - private int binarySearch(long value) { + private synchronized int binarySearch(long value) { if (rawData.size() == 0) return -1; int lo = 0; @@ -95,15 +95,15 @@ public class ProfileIntervals { return -1; // value not present } - public int size() { + public synchronized int size() { return rawData.size(); } - public T get(int index) { + public synchronized T get(int index) { return rawData.valueAt(index); } - public T getReversed(int index) { + public synchronized T getReversed(int index) { return rawData.valueAt(size() - 1 - index); } } \ No newline at end of file From 732e225c7db8051d3a60be1e0ac4e6dce686784a Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Wed, 19 Jul 2017 19:50:40 +0200 Subject: [PATCH 22/77] bulgarian removed non-translatable --- app/src/main/res/values-bg/strings.xml | 44 -------------------------- 1 file changed, 44 deletions(-) diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 99e1201b64..480c780025 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -457,17 +457,11 @@ Медел: %02X Протокол: %02X Код: %02X Профил По подразбиране: 3\nТова е основен параметър в сигурността на OpenAPS. Той лимитира максималният базал да бъде 3 пъти най-голямата стойност от дневните базали. Не би трябвало да има нужа от промяна, но внимавайте, защото от опит сме проверили, че максимумите са “3x от най-високия дневен; 4x от текущия”. - current_basal_safety_multiplier По подразбиране: 4\nТова е другият основен параметър в сигурността на OpenAPS, и другата половина от "3x от най-високия дневен; 4x от текущия". Това означава, че независимо от макс базал настроен в помпата, стойността на базала не може да е по-висока от тази стойност умножена по стойността на базала за текущият час от денонощието. Това е с цел да предпази от прекалено високи стойности на максималния базал преди да разбират как работи алгоритъма. Повечето от Вас няма да имат нужда от смяна на тази стойност и могат да се справят с настойки на другите параметри. - autosens_max По подразбиране: 1.2\nТова е максималният множител на autosens (а скоро autotune) за да позволи 20% максимален лимит на autosens коефициента, който от своя страна настройва базалите, колко може да намали ISF, и колко ниско може да свали целевата КЗ. - autosens_min По подразбиране: 0.7\nДругата част от сигурността на autosens, слагайки ограничение на колко ниско може да ограничи базалите, колко да повиши чувствителността (ISF) и целевите КЗ. - autosens_adjust_targets По подразбиране: разрешено\nТова позволява на autosens да променя и целевите КЗ(освен чувствителност и базал). - bolussnooze_dia_divisor По подразбиране: 2\nBolus snooze се активира след като поставите болус за основно хранене, така цикъла няма да пуснка/намаля базалите веднага след като сте се хранили. Примерът тук е с 2; така при 3 часа DIA това ще означава че bolus snooze ще бъде внимателно изместен 1.5 часа (3DIA/2). - min_5m_carbimpact По подразбиране: 3.0\nТова е настройка на количеството на покачване на КЗ при усвояване на въглехидратите за всеки 5 минути. По подразбиране 3мг/дл/5мин. Това се отразява на това колко бързо се усвояват COB според алгоритъма, и как това се отразява в предвиждането на КЗ, когато тя не се покачва или пада с различен темп от очакваното. Attention!\nNormally you do not have to change these values below. Please CLICK HERE and READ the text and make sure you UNDERSTAND it before change any of these values. http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html @@ -524,34 +518,11 @@ Опашка: Статус: пауза - nsclientinternal_url - nsclientinternal_api_secret - danar_bt_name - danar_password - danar_useextended - danar_visualizeextendedaspercentage" - danarprofile_dia - Изчисти лога - nsclientinternal_autoscroll - nsclientinternal_paused - NSCLIENT права за запис. Грешен API secret? - Wear настройки(часовник) - Показвай подробен IOB - аздели IOB на болус и базал IOB на часовника - неуспешно - моля проверете в телефона - Недостъпно - smscommunicator_allowednumbers - smscommunicator_remotecommandsallowed Възраст на пациента Дете Тийнейджър Възрастен - age - child - teenage - adult Изберете възраст за определяне лимитите на безопасност - I_understand Glimp Устройството изглежда не подържа изключване на оптимизиране на батерията! Моля, позволете рарешение @@ -577,7 +548,6 @@ COB Суперболус Записвай всяко стартиране на AndroidAPS в NS - ns_logappstartedevent Рестартирам за да се приложат новите настройки. DanaRv2 Инсулин @@ -585,7 +555,6 @@ Novorapid, Novolog, Humalog ИНС Бързодействащ инсулин с удължаване - key_usersuperbolus Разреши използването на Суперболус Разреши функцията суперболус в съветника. Не я разрешавайте докато не научите какво наистина прави. ТОВА МОЖЕ ДА СЪЗДАДЕ ОПАСНОСТ ОТ ПРЕДОЗИРАНЕ С ИНСУЛИН. IOB @@ -605,8 +574,6 @@ Добави BGI към статуса Без качване на данни в NS Всички данни за NS се пропускат. AAPS е свързан с NS, но не прави промени в NS - ns_upload_only - ns_noupload Стъпка за базал Стъпка за болус Удължен болус @@ -626,14 +593,6 @@ Възраст на батерията на помпата Смяна на батерия Опции за аларми - nsalarm_urgent_high - nsalarm_high - nsalarm_low - nsalarm_urgent_low - nsalarm_staledata - nsalarm_urgent_staledata - nsalarm_staledatavalue - nsalarm_urgent_staledatavalue Много висока Висока Ниска @@ -645,7 +604,6 @@ Много стари данни при повече от [мин] Интервал за autosens [ч] Брой часове назад за определяне на чувствителността (приемът на въглехидрати е изключен) - openapsama_autosens_period RAT do_not_track_profile_switch Игнорирай събитията от тип Смяна на профил @@ -659,10 +617,8 @@ Алгоритъм на Oref0 Алгоритъм на AAPS Настройки за абсорбция - absorption_maxtime Максимално време за усвояване на храненето [ч] Брой часове, за които се очаква храненето да бъде напълно усвоено в организма - rangetodisplay Показвай удължените болуси като % ВСенз ВИнс From 98bb792264673ea3510dbfb21881f159c6b1ee2a Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Wed, 19 Jul 2017 23:46:32 +0200 Subject: [PATCH 23/77] Add color of chart to corresponding lables/scale --- .../androidaps/plugins/InsulinFastacting/ActivityGraph.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/ActivityGraph.java b/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/ActivityGraph.java index 2d4795a3ec..a2181a3a15 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/ActivityGraph.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/InsulinFastacting/ActivityGraph.java @@ -63,6 +63,7 @@ public class ActivityGraph extends GraphView { getViewport().setMaxX(hours * 60); getGridLabelRenderer().setNumHorizontalLabels(hours + 1); getGridLabelRenderer().setHorizontalAxisTitle("[min]"); + getGridLabelRenderer().setVerticalLabelsColor(activitySeries.getColor()); DataPoint[] iobDataPoints = new DataPoint[iobArray.size()]; iobDataPoints = iobArray.toArray(iobDataPoints); @@ -72,5 +73,6 @@ public class ActivityGraph extends GraphView { iobSeries.setBackgroundColor(Color.argb(70, 255, 0, 255)); getSecondScale().setMinY(0); getSecondScale().setMaxY(1); + getGridLabelRenderer().setVerticalLabelsSecondScaleColor(Color.MAGENTA); } } From c35b7bb9d69eb3512ec7d9e142236ceb75875d00 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Thu, 20 Jul 2017 00:53:05 +0200 Subject: [PATCH 24/77] string comparison --- app/src/main/java/info/nightscout/androidaps/db/TempTarget.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java b/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java index 5aaeea1daa..3bbdcbc06c 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java +++ b/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java @@ -51,7 +51,7 @@ public class TempTarget implements Interval { return false; if (high != other.high) return false; - if (reason != other.reason) + if (!Objects.equals(reason, other.reason)) return false; if (!Objects.equals(_id, other._id)) return false; From 6daff6fae97546b812de8b8823e759d0a25bfdff Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Thu, 20 Jul 2017 00:53:36 +0200 Subject: [PATCH 25/77] self asignment -> comment --- .../androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java | 2 +- .../androidaps/plugins/OpenAPSMA/DetermineBasalResultMA.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java index c086ff2cd5..c2a55ff894 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java @@ -43,7 +43,7 @@ public class DetermineBasalResultAMA extends APSResult { } if (result.contains("duration")) { duration = result.getInteger("duration"); - changeRequested = changeRequested; + //changeRequested as above } else { duration = -1; changeRequested = false; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalResultMA.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalResultMA.java index cb0e67249f..a0cd1a75b0 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalResultMA.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalResultMA.java @@ -41,7 +41,7 @@ public class DetermineBasalResultMA extends APSResult { } if (result.contains("duration")) { duration = result.getInteger("duration"); - changeRequested = changeRequested; + //changeRequested as above } else { duration = -1; changeRequested = false; From b5cb68be738d2d3df88763b396dddf4d3dc6f3b9 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Thu, 20 Jul 2017 00:54:19 +0200 Subject: [PATCH 26/77] remove extra strings --- app/src/main/res/values-it/strings.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 10ed6e1d4c..48cd17b8a1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -4,9 +4,7 @@ Italiano MM640g assoluto - azioni - attivita\' adulto settaggi avanzati From 1ba11ed00607d5772e710c486d0fb78051a85109 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Thu, 20 Jul 2017 00:59:08 +0200 Subject: [PATCH 27/77] spanish emptiy string --- app/src/main/res/values-es/strings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6aa5dc7979..cb011f510e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -387,11 +387,10 @@ ENVIAR A BOMBA Media corta delta Bolo: - Ultimo BG: + Último BG: %dmin antes Bolo %.2fU enviado correctamente Rango Objetivo: - Unidades: Sólo se permiten caracteres numéricos Sólo se permiten dígitos en el rango %1$s - %2$s From b72482601ee68f8f2d0c282d1b6ae688912ceb5b Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Thu, 20 Jul 2017 01:01:50 +0200 Subject: [PATCH 28/77] remove unnecessary semicolons --- .../plugins/ConfigBuilder/ConfigBuilderPlugin.java | 1 - .../NSClientInternal/broadcasts/BroadcastStatus.java | 2 +- .../NSClientInternal/data/NSSettingsStatus.java | 8 -------- .../plugins/NSClientInternal/data/NSSgv.java | 6 +++--- .../plugins/NSClientInternal/data/NSTreatment.java | 10 +++++----- .../plugins/Overview/Dialogs/WizardDialog.java | 2 -- .../CircadianPercentageProfileFragment.java | 1 - .../androidaps/plugins/Wear/ActionStringHandler.java | 2 +- 8 files changed, 10 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java index 239318a6e4..7f7013de73 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java @@ -83,7 +83,6 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain MainApp.bus().register(this); PowerManager powerManager = (PowerManager) MainApp.instance().getApplicationContext().getSystemService(Context.POWER_SERVICE); mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "ConfigBuilderPlugin"); - ; } @Override diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java index 15432c8e79..026658afc0 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java @@ -33,7 +33,7 @@ public class BroadcastStatus { bundle.putInt("nsclientversioncode", MainApp.instance().getPackageManager().getPackageInfo(MainApp.instance().getPackageName(), 0).versionCode); } catch (PackageManager.NameNotFoundException e) { e.printStackTrace(); - }; + } bundle.putString("nightscoutversionname", NSClientService.nightscoutVersionName); bundle.putInt("nightscoutversioncode", NSClientService.nightscoutVersionCode); bundle.putString("status", status.getData().toString()); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSettingsStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSettingsStatus.java index 3201d62f6e..4980b342e9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSettingsStatus.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSettingsStatus.java @@ -207,8 +207,6 @@ public class NSSettingsStatus { return ret; } - ; - private Integer getIntegerOrNull(String key) { Integer ret = null; if (data.has(key)) { @@ -221,8 +219,6 @@ public class NSSettingsStatus { return ret; } - ; - private Long getLongOrNull(String key) { Long ret = null; if (data.has(key)) { @@ -235,8 +231,6 @@ public class NSSettingsStatus { return ret; } - ; - private Date getDateOrNull(String key) { Date ret = null; if (data.has(key)) { @@ -249,8 +243,6 @@ public class NSSettingsStatus { return ret; } - ; - private boolean getBooleanOrNull(String key) { boolean ret = false; if (data.has(key)) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSgv.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSgv.java index c8666f4306..78ddc7a8f7 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSgv.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSgv.java @@ -24,7 +24,7 @@ public class NSSgv { } } return ret; - }; + } private Integer getIntegerOrNull(String key) { Integer ret = null; @@ -36,7 +36,7 @@ public class NSSgv { } } return ret; - }; + } private Long getLongOrNull(String key) { Long ret = null; @@ -48,7 +48,7 @@ public class NSSgv { } } return ret; - }; + } public JSONObject getData () { return data; } public Integer getMgdl () { return getIntegerOrNull("mgdl"); } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSTreatment.java index 7430caf600..1b48f27e2f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSTreatment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSTreatment.java @@ -25,7 +25,7 @@ public class NSTreatment { } } return ret; - }; + } private Double getDoubleOrNull(String key) { Double ret = null; @@ -37,7 +37,7 @@ public class NSTreatment { } } return ret; - }; + } private Integer getIntegerOrNull(String key) { Integer ret = null; @@ -49,7 +49,7 @@ public class NSTreatment { } } return ret; - }; + } private Long getLongOrNull(String key) { Long ret = null; @@ -61,7 +61,7 @@ public class NSTreatment { } } return ret; - }; + } private Date getDateOrNull(String key) { Date ret = null; @@ -73,7 +73,7 @@ public class NSTreatment { } } return ret; - }; + } public String getAction() { return action; } public JSONObject getData() { return data; } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java index 0a1b5417a8..5d57f3caf1 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java @@ -213,9 +213,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com bgTrendInsulin = (TextView) view.findViewById(R.id.treatments_wizard_bgtrendinsulin); cobLayout = (LinearLayout) view.findViewById(R.id.treatments_wizard_cob_layout); cob = (TextView) view.findViewById(R.id.treatments_wizard_cob); - ; cobInsulin = (TextView) view.findViewById(R.id.treatments_wizard_cobinsulin); - ; bgCheckbox = (CheckBox) view.findViewById(R.id.treatments_wizard_bgcheckbox); bolusIobCheckbox = (CheckBox) view.findViewById(R.id.treatments_wizard_bolusiobcheckbox); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java index c70a66850f..0f0defac27 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java @@ -434,7 +434,6 @@ public class CircadianPercentageProfileFragment extends Fragment { if (i == 0) { copyprevbutton.setVisibility(View.INVISIBLE); - ; } else { final int j = i; //needs to be final to be passed to inner class. copyprevbutton.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java index f800d9d531..02ee924923 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java @@ -173,7 +173,7 @@ public class ActionStringHandler { rTitle += " LOOP"; rMessage = "TARGETS:\n" + getTargetsStatus(); rMessage += "\n\n" + getLoopStatus(); - rMessage += "\n\nOAPS RESULT:\n" + getOAPSResultStatus();; + rMessage += "\n\nOAPS RESULT:\n" + getOAPSResultStatus(); } } else if ("wizard".equals(act[0])) { From 42263e979ec6fae53f6c9577dc7680bd6e5c4672 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Thu, 20 Jul 2017 02:41:57 +0200 Subject: [PATCH 29/77] synchronize interval access from other classes --- .../plugins/Treatments/TreatmentsPlugin.java | 56 +++++++++++-------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java index 6a7f8c0873..8a999cbcd6 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java @@ -188,11 +188,13 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface { } if (!MainApp.getConfigBuilder().isFakingTempsByExtendedBoluses()) - for (Integer pos = 0; pos < extendedBoluses.size(); pos++) { - ExtendedBolus e = extendedBoluses.get(pos); - if (e.date > time) continue; - IobTotal calc = e.iobCalc(time); - total.plus(calc); + synchronized (extendedBoluses) { + for (Integer pos = 0; pos < extendedBoluses.size(); pos++) { + ExtendedBolus e = extendedBoluses.get(pos); + if (e.date > time) continue; + IobTotal calc = e.iobCalc(time); + total.plus(calc); + } } return total; } @@ -292,20 +294,24 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface { @Override public IobTotal getCalculationToTimeTempBasals(long time) { IobTotal total = new IobTotal(time); - for (Integer pos = 0; pos < tempBasals.size(); pos++) { - TemporaryBasal t = tempBasals.get(pos); - if (t.date > time) continue; - IobTotal calc = t.iobCalc(time); - //log.debug("BasalIOB " + new Date(time) + " >>> " + calc.basaliob); - total.plus(calc); + synchronized (tempBasals) { + for (Integer pos = 0; pos < tempBasals.size(); pos++) { + TemporaryBasal t = tempBasals.get(pos); + if (t.date > time) continue; + IobTotal calc = t.iobCalc(time); + //log.debug("BasalIOB " + new Date(time) + " >>> " + calc.basaliob); + total.plus(calc); + } } if (MainApp.getConfigBuilder().isFakingTempsByExtendedBoluses()) { IobTotal totalExt = new IobTotal(time); - for (Integer pos = 0; pos < extendedBoluses.size(); pos++) { - ExtendedBolus e = extendedBoluses.get(pos); - if (e.date > time) continue; - IobTotal calc = e.iobCalc(time); - totalExt.plus(calc); + synchronized (extendedBoluses) { + for (Integer pos = 0; pos < extendedBoluses.size(); pos++) { + ExtendedBolus e = extendedBoluses.get(pos); + if (e.date > time) continue; + IobTotal calc = e.iobCalc(time); + totalExt.plus(calc); + } } // Convert to basal iob totalExt.basaliob = totalExt.iob; @@ -420,12 +426,18 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface { @Override public long oldestDataAvailable() { long oldestTime = System.currentTimeMillis(); - if (tempBasals.size() > 0) - oldestTime = Math.min(oldestTime, tempBasals.get(0).date); - if (extendedBoluses.size() > 0) - oldestTime = Math.min(oldestTime, extendedBoluses.get(0).date); - if (treatments.size() > 0) - oldestTime = Math.min(oldestTime, treatments.get(treatments.size() - 1).date); + synchronized (tempBasals) { + if (tempBasals.size() > 0) + oldestTime = Math.min(oldestTime, tempBasals.get(0).date); + } + synchronized (extendedBoluses) { + if (extendedBoluses.size() > 0) + oldestTime = Math.min(oldestTime, extendedBoluses.get(0).date); + } + synchronized (treatments) { + if (treatments.size() > 0) + oldestTime = Math.min(oldestTime, treatments.get(treatments.size() - 1).date); + } oldestTime -= 15 * 60 * 1000L; // allow 15 min before return oldestTime; } From 3098f0bdfab4831ddccbf3eaf933f8ef21c59b8e Mon Sep 17 00:00:00 2001 From: Radoslav Radev Date: Thu, 20 Jul 2017 09:24:35 +0300 Subject: [PATCH 30/77] update bg translation --- app/src/main/res/values-bg/strings.xml | 84 +++++++++++++------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 480c780025..460e57d226 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1,6 +1,6 @@ - Сигурност на лечението + Настройки на сигурността Максимален инсулин при болус [единици] Максимални въглехидрати [гр] @@ -13,15 +13,15 @@ Изход Използвай удължен болус за над 200% DanaR Bluetooth устройство - Използване само на абсолютни стойности на базал - Рестартирайте телефона или AndroidAPS от системните натройки \nили Android APS няма да записва проблемите (което е важно за работата на алгоритъма)! + Използване на абсолютни стойности за базал + Рестартирайте телефона или AndroidAPS от системните настройки или Android APS няма да записва проблемите (което е важно за работата на алгоритъма)! Цел: Действие: Стартирай Провери Единици DIA (Време на действие на инсулина): - Active profile + Активен профил IC (Инсулин/въглехидр.): ISF (Инс.чувствителност): Базал @@ -135,24 +135,24 @@ APS режим Затворен цикъл - Отворен режим + Отворен цикъл изключен Изключи - Влючи + Включи Има ново предложение Несъвместима версия на NSClient Несъвместима версия на Nightscout NSClient не е открит. Записът е загубен! - КЗ се вижда в NS - Статуса на помпа е достъпен в NS + КЗ да се вижда в NS + Статуса на помпа да е достъпен в NS Ръчно приложени ЦИКЪЛА Е СПРЯН ОТ ОГРАНИЧЕНИЯТА Czech English Базален IOB Приложено ограничение на болус - Приложено ограничение на въглехидратите + Приложено ограничение на въглехидрати Проверка на КЗ Известие Бележка @@ -215,7 +215,7 @@ Максимално позволен временен базал Е/ч Макс. лимит на временен базал [Е/ч] Максимален IOB - Този параметър се нарича макс IOB в OpenAPS\nПо подразбиране е 0. След няколко дни или седмици можете да го увеличите. + Този параметър се нарича максимален IOB в OpenAPS и подразбиране е 0. След няколко дни или седмици можете да го увеличите. Bulgarian Разбрах Език @@ -249,16 +249,16 @@ Абсолютна Откажи временен базал SMS комуникатор - Чакам резултат от помпата + Изчаква резултат от помпата Разрешени телефонни номера +XXXXXXXXXX;+YYYYYYYYYY - За да пуснете болус от %.2fЕ отговорете с код %s + За да доставите болус от %.2fЕ отговорете с код %s За да изпратите калибрация %.2f отговорете с код %s Болус отказан Болус %.2fЕд беше подаден успешно - Подавам болус %.2fЕ + Подава болус %.2fЕ Болус от %.2fЕ подаден успешно - Подавам %.2fЕ + Подава %.2fЕ Позволи отдалечени команди чрез SMS Отдалечено подаване на болус - забранено! Пръст @@ -268,7 +268,7 @@ Откажи временна цел DanaR профил DIA (Време на действие на инсулина) ч.: - Продължителност на инсулиновата активност + Продължителност на действие на инсулина Неуспешно обноввяване на базалния профил История Презареди @@ -293,7 +293,7 @@ КЗ Пълнене Спиране - Опитвам да се свържа през последните %d с + Опитва да се свърже през последните %d с Парола за помпата Грешна парола за помпата! Помпата е заета @@ -302,8 +302,8 @@ Запушване Спри Натиснат е СТОП! - Чакам помпата - Чакам резутат. Натисни за обновяване. + Очаква помпата + Очаква резутат. Натисни за обновяване. Ще доставя %.2fЕ Настройка на визуализацията и наблюдението, а също и анализиране на базалните нужди и коефициенти Работете в Отворен режим няколко дни и ръчно прилагайте на много временни базали @@ -357,17 +357,17 @@ Prime/Fill Моля, уверете се, че стойността съответсва на вашият сет! Този инсулин не се включва в IOB! Други - Fill/Prime количества нсулин по подразбиране. + Fill/Prime количества инсулин по подразбиране. Бутон 1 Бутон 2 Бутон 3 % с който базовият профил ще бъде променен. - Точен брой часове, с които ще бъде преместен профила! + Точен брой часове, с които ще бъде изместен профила! Изпрати в помпата Единици: мг/дл ммол/л - DIA(продължителност на инсулиновото дейстие): + DIA(продължителност на действие на инсулина): Целеви диапазон: Редактирай базални стойности Редактирай Инс. чувствителност @@ -381,7 +381,7 @@ Ниска КЗ под Висока КЗ над Часовник - Препрати всички дани + Изпрати отново всички дани Отвори настройките на часовника Грешка в промпата Изтощена батерия @@ -408,7 +408,7 @@ OpenAPS AMA Краткоср. Δ: Дългоср. Δ: - Масив от %d елемента. \nАктуална стойност: + Масив от %d елемента.Актуална стойност: Autosens данни Script debug Разреши AMA autosens @@ -433,7 +433,7 @@ Инициализация ... ДЕЙСТВ КОНФ - ЦИК + LOOP ОПр OAPS Вцел @@ -445,18 +445,18 @@ ВП NSП Леч - CP + КП Цел WEAR SMS - Изполвай къси имена + Използвай къси имена Настройки на параметър Δ КЗ Използвай краткоср. Δ вместо разлика от последната КЗ Полезно при данни за КЗ с много шум Разширени настройки Медел: %02X Протокол: %02X Код: %02X Профил - По подразбиране: 3\nТова е основен параметър в сигурността на OpenAPS. Той лимитира максималният базал да бъде 3 пъти най-голямата стойност от дневните базали. Не би трябвало да има нужа от промяна, но внимавайте, защото от опит сме проверили, че максимумите са “3x от най-високия дневен; 4x от текущия”. + По подразбиране: 3 Това е основен параметър в сигурността на OpenAPS. Той ограничава максималният базал да бъде 3 пъти най-голямата стойност от дневните базали. Не би трябвало да има нужа от промяна, защото от опит сме проверили, че максимумите са “3x от най-високия дневен; 4x от текущия”. По подразбиране: 4\nТова е другият основен параметър в сигурността на OpenAPS, и другата половина от "3x от най-високия дневен; 4x от текущия". Това означава, че независимо от макс базал настроен в помпата, стойността на базала не може да е по-висока от тази стойност умножена по стойността на базала за текущият час от денонощието. Това е с цел да предпази от прекалено високи стойности на максималния базал преди да разбират как работи алгоритъма. Повечето от Вас няма да имат нужда от смяна на тази стойност и могат да се справят с настойки на другите параметри. По подразбиране: 1.2\nТова е максималният множител на autosens (а скоро autotune) за да позволи 20% максимален лимит на autosens коефициента, който от своя страна настройва базалите, колко може да намали ISF, и колко ниско може да свали целевата КЗ. По подразбиране: 0.7\nДругата част от сигурността на autosens, слагайки ограничение на колко ниско може да ограничи базалите, колко да повиши чувствителността (ISF) и целевите КЗ. @@ -466,8 +466,8 @@ Attention!\nNormally you do not have to change these values below. Please CLICK HERE and READ the text and make sure you UNDERSTAND it before change any of these values. http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html Позволени са само числа - Позволени са числа между %1$s - %2$s - олето не може да бъде празно + Позволени са числа между %1$s - %2$s + Полето не може да бъде празно Телефонният номер не е валиден Грешен тел номер за SMS Копирай @@ -484,16 +484,16 @@ Не показвай отново Помпата е спряна. Натиснете за обновяване Помпата е спряна - Получавам статус на помпата - Настройвам временен базал - Спирам временен базал - Настойвам удължен болус - Спирам удължен болус - Обновявам базалите - Спирам връзката - Изпълнявам + Получава статус на помпата + Настройва временен базал + Спира временен базал + Настойва удължен болус + Спира удължен болус + Обновява базалите + Спира връзката + Изпълнява Настойки Виртуална Помпа - Качвам статуса в NS + Качва статуса в NS Грешна парола Парола за настройки Отключи настройките @@ -518,7 +518,7 @@ Опашка: Статус: пауза - Възраст на пациента + Възраст на потребителя Дете Тийнейджър Възрастен @@ -526,7 +526,7 @@ Glimp Устройството изглежда не подържа изключване на оптимизиране на батерията! Моля, позволете рарешение - %s се нуждае от зключване на оптимизиране на батерията за пълна функционалност + %s се нуждае от зключване на оптимизиране на батерията за пълна функционалност Цикъл изключен Изключен (%d мин) Суперболус (%d мин) @@ -548,7 +548,7 @@ COB Суперболус Записвай всяко стартиране на AndroidAPS в NS - Рестартирам за да се приложат новите настройки. + Рестартиране за да се приложат новите настройки. DanaRv2 Инсулин Бързодействащ инсулин @@ -619,7 +619,7 @@ Настройки за абсорбция Максимално време за усвояване на храненето [ч] Брой часове, за които се очаква храненето да бъде напълно усвоено в организма - Показвай удължените болуси като % + Показвай удължените болуси като % ВСенз ВИнс ВКан From 3b1407b8dd01309242c6c83a95f84aa5f6a48f37 Mon Sep 17 00:00:00 2001 From: Boyko Kazakov Date: Thu, 20 Jul 2017 20:57:45 +0300 Subject: [PATCH 31/77] Added icons for home, actions and care portal screens --- .../icon_actions-cancelextbolus.png | Bin 0 -> 2293 bytes .../drawable-hdpi/icon_actions-profileswitch.png | Bin 0 -> 1585 bytes .../res/drawable-hdpi/icon_actions-refill.png | Bin 0 -> 1672 bytes .../drawable-hdpi/icon_actions-startextbolus.png | Bin 0 -> 1877 bytes .../icon_actions-starttempbasal.png | Bin 0 -> 745 bytes .../drawable-hdpi/icon_actions-temptarget.png | Bin 0 -> 2118 bytes .../res/drawable-hdpi/icon_cp-aaps-offline.png | Bin 0 -> 2011 bytes .../res/drawable-hdpi/icon_cp-age-battery.png | Bin 0 -> 1183 bytes .../res/drawable-hdpi/icon_cp-age-canula.png | Bin 0 -> 1060 bytes .../res/drawable-hdpi/icon_cp-age-insulin.png | Bin 0 -> 1530 bytes .../res/drawable-hdpi/icon_cp-age-sensor.png | Bin 0 -> 1931 bytes .../res/drawable-hdpi/icon_cp-announcement.png | Bin 0 -> 1939 bytes .../main/res/drawable-hdpi/icon_cp-basal-end.png | Bin 0 -> 1155 bytes .../res/drawable-hdpi/icon_cp-basal-start.png | Bin 0 -> 698 bytes .../main/res/drawable-hdpi/icon_cp-bgcheck.png | Bin 0 -> 1903 bytes .../res/drawable-hdpi/icon_cp-bolus-carbs.png | Bin 0 -> 1935 bytes .../res/drawable-hdpi/icon_cp-bolus-combo.png | Bin 0 -> 771 bytes .../drawable-hdpi/icon_cp-bolus-correction.png | Bin 0 -> 1338 bytes .../res/drawable-hdpi/icon_cp-bolus-meal.png | Bin 0 -> 1470 bytes .../res/drawable-hdpi/icon_cp-bolus-snack.png | Bin 0 -> 1500 bytes .../res/drawable-hdpi/icon_cp-cgm-insert.png | Bin 0 -> 1609 bytes .../res/drawable-hdpi/icon_cp-cgm-profile.png | Bin 0 -> 1529 bytes .../main/res/drawable-hdpi/icon_cp-cgm-start.png | Bin 0 -> 1939 bytes .../res/drawable-hdpi/icon_cp-cgm-target.png | Bin 0 -> 1965 bytes .../main/res/drawable-hdpi/icon_cp-exercise.png | Bin 0 -> 2324 bytes app/src/main/res/drawable-hdpi/icon_cp-note.png | Bin 0 -> 2020 bytes .../res/drawable-hdpi/icon_cp-pump-battery.png | Bin 0 -> 1233 bytes .../res/drawable-hdpi/icon_cp-pump-canula.png | Bin 0 -> 1500 bytes .../res/drawable-hdpi/icon_cp-pump-cartridge.png | Bin 0 -> 1798 bytes .../main/res/drawable-hdpi/icon_cp-question.png | Bin 0 -> 1220 bytes .../main/res/drawable-hdpi/icon_home-loop.png | Bin 0 -> 1502 bytes .../main/res/drawable-hdpi/icon_home-profile.png | Bin 0 -> 1797 bytes .../main/res/drawable-hdpi/icon_home-target.png | Bin 0 -> 2562 bytes .../icon_actions-cancelextbolus.png | Bin 0 -> 1493 bytes .../drawable-mdpi/icon_actions-profileswitch.png | Bin 0 -> 1143 bytes .../res/drawable-mdpi/icon_actions-refill.png | Bin 0 -> 1161 bytes .../drawable-mdpi/icon_actions-startextbolus.png | Bin 0 -> 1249 bytes .../icon_actions-starttempbasal.png | Bin 0 -> 651 bytes .../drawable-mdpi/icon_actions-temptarget.png | Bin 0 -> 1364 bytes .../res/drawable-mdpi/icon_cp-aaps-offline.png | Bin 0 -> 1361 bytes .../res/drawable-mdpi/icon_cp-age-battery.png | Bin 0 -> 911 bytes .../res/drawable-mdpi/icon_cp-age-canula.png | Bin 0 -> 806 bytes .../res/drawable-mdpi/icon_cp-age-insulin.png | Bin 0 -> 1073 bytes .../res/drawable-mdpi/icon_cp-age-sensor.png | Bin 0 -> 1352 bytes .../res/drawable-mdpi/icon_cp-announcement.png | Bin 0 -> 1286 bytes .../main/res/drawable-mdpi/icon_cp-basal-end.png | Bin 0 -> 867 bytes .../res/drawable-mdpi/icon_cp-basal-start.png | Bin 0 -> 616 bytes .../main/res/drawable-mdpi/icon_cp-bgcheck.png | Bin 0 -> 1233 bytes .../res/drawable-mdpi/icon_cp-bolus-carbs.png | Bin 0 -> 1257 bytes .../res/drawable-mdpi/icon_cp-bolus-combo.png | Bin 0 -> 687 bytes .../drawable-mdpi/icon_cp-bolus-correction.png | Bin 0 -> 948 bytes .../res/drawable-mdpi/icon_cp-bolus-meal.png | Bin 0 -> 1046 bytes .../res/drawable-mdpi/icon_cp-bolus-snack.png | Bin 0 -> 1007 bytes .../res/drawable-mdpi/icon_cp-cgm-insert.png | Bin 0 -> 1156 bytes .../res/drawable-mdpi/icon_cp-cgm-profile.png | Bin 0 -> 1075 bytes .../main/res/drawable-mdpi/icon_cp-cgm-start.png | Bin 0 -> 1321 bytes .../res/drawable-mdpi/icon_cp-cgm-target.png | Bin 0 -> 1295 bytes .../main/res/drawable-mdpi/icon_cp-exercise.png | Bin 0 -> 1464 bytes app/src/main/res/drawable-mdpi/icon_cp-note.png | Bin 0 -> 1307 bytes .../res/drawable-mdpi/icon_cp-pump-battery.png | Bin 0 -> 932 bytes .../res/drawable-mdpi/icon_cp-pump-canula.png | Bin 0 -> 1090 bytes .../res/drawable-mdpi/icon_cp-pump-cartridge.png | Bin 0 -> 1305 bytes .../main/res/drawable-mdpi/icon_cp-question.png | Bin 0 -> 913 bytes .../main/res/drawable-mdpi/icon_home-loop.png | Bin 0 -> 931 bytes .../main/res/drawable-mdpi/icon_home-profile.png | Bin 0 -> 1026 bytes .../main/res/drawable-mdpi/icon_home-target.png | Bin 0 -> 1318 bytes .../icon_actions-cancelextbolus.png | Bin 0 -> 3060 bytes .../icon_actions-profileswitch.png | Bin 0 -> 2150 bytes .../res/drawable-xhdpi/icon_actions-refill.png | Bin 0 -> 2189 bytes .../icon_actions-startextbolus.png | Bin 0 -> 2448 bytes .../icon_actions-starttempbasal.png | Bin 0 -> 832 bytes .../drawable-xhdpi/icon_actions-temptarget.png | Bin 0 -> 2836 bytes .../res/drawable-xhdpi/icon_cp-aaps-offline.png | Bin 0 -> 2622 bytes .../res/drawable-xhdpi/icon_cp-age-battery.png | Bin 0 -> 1462 bytes .../res/drawable-xhdpi/icon_cp-age-canula.png | Bin 0 -> 1283 bytes .../res/drawable-xhdpi/icon_cp-age-insulin.png | Bin 0 -> 2014 bytes .../res/drawable-xhdpi/icon_cp-age-sensor.png | Bin 0 -> 2480 bytes .../res/drawable-xhdpi/icon_cp-announcement.png | Bin 0 -> 2543 bytes .../res/drawable-xhdpi/icon_cp-basal-end.png | Bin 0 -> 1434 bytes .../res/drawable-xhdpi/icon_cp-basal-start.png | Bin 0 -> 785 bytes .../main/res/drawable-xhdpi/icon_cp-bgcheck.png | Bin 0 -> 2464 bytes .../res/drawable-xhdpi/icon_cp-bolus-carbs.png | Bin 0 -> 2524 bytes .../res/drawable-xhdpi/icon_cp-bolus-combo.png | Bin 0 -> 859 bytes .../drawable-xhdpi/icon_cp-bolus-correction.png | Bin 0 -> 1692 bytes .../res/drawable-xhdpi/icon_cp-bolus-meal.png | Bin 0 -> 1963 bytes .../res/drawable-xhdpi/icon_cp-bolus-snack.png | Bin 0 -> 1986 bytes .../res/drawable-xhdpi/icon_cp-cgm-insert.png | Bin 0 -> 2044 bytes .../res/drawable-xhdpi/icon_cp-cgm-profile.png | Bin 0 -> 2059 bytes .../res/drawable-xhdpi/icon_cp-cgm-start.png | Bin 0 -> 2556 bytes .../res/drawable-xhdpi/icon_cp-cgm-target.png | Bin 0 -> 2653 bytes .../main/res/drawable-xhdpi/icon_cp-exercise.png | Bin 0 -> 3154 bytes app/src/main/res/drawable-xhdpi/icon_cp-note.png | Bin 0 -> 2802 bytes .../res/drawable-xhdpi/icon_cp-pump-battery.png | Bin 0 -> 1509 bytes .../res/drawable-xhdpi/icon_cp-pump-canula.png | Bin 0 -> 1962 bytes .../drawable-xhdpi/icon_cp-pump-cartridge.png | Bin 0 -> 2401 bytes .../main/res/drawable-xhdpi/icon_cp-question.png | Bin 0 -> 1513 bytes .../main/res/drawable-xhdpi/icon_home-loop.png | Bin 0 -> 2027 bytes .../res/drawable-xhdpi/icon_home-profile.png | Bin 0 -> 2646 bytes .../main/res/drawable-xhdpi/icon_home-target.png | Bin 0 -> 3546 bytes .../icon_actions-cancelextbolus.png | Bin 0 -> 4456 bytes .../icon_actions-profileswitch.png | Bin 0 -> 3312 bytes .../res/drawable-xxhdpi/icon_actions-refill.png | Bin 0 -> 3231 bytes .../icon_actions-startextbolus.png | Bin 0 -> 3649 bytes .../icon_actions-starttempbasal.png | Bin 0 -> 935 bytes .../drawable-xxhdpi/icon_actions-temptarget.png | Bin 0 -> 4232 bytes .../res/drawable-xxhdpi/icon_cp-aaps-offline.png | Bin 0 -> 3886 bytes .../res/drawable-xxhdpi/icon_cp-age-battery.png | Bin 0 -> 1991 bytes .../res/drawable-xxhdpi/icon_cp-age-canula.png | Bin 0 -> 1788 bytes .../res/drawable-xxhdpi/icon_cp-age-insulin.png | Bin 0 -> 2867 bytes .../res/drawable-xxhdpi/icon_cp-age-sensor.png | Bin 0 -> 3604 bytes .../res/drawable-xxhdpi/icon_cp-announcement.png | Bin 0 -> 3754 bytes .../res/drawable-xxhdpi/icon_cp-basal-end.png | Bin 0 -> 1814 bytes .../res/drawable-xxhdpi/icon_cp-basal-start.png | Bin 0 -> 897 bytes .../main/res/drawable-xxhdpi/icon_cp-bgcheck.png | Bin 0 -> 3637 bytes .../res/drawable-xxhdpi/icon_cp-bolus-carbs.png | Bin 0 -> 3767 bytes .../res/drawable-xxhdpi/icon_cp-bolus-combo.png | Bin 0 -> 940 bytes .../drawable-xxhdpi/icon_cp-bolus-correction.png | Bin 0 -> 2449 bytes .../res/drawable-xxhdpi/icon_cp-bolus-meal.png | Bin 0 -> 2746 bytes .../res/drawable-xxhdpi/icon_cp-bolus-snack.png | Bin 0 -> 2975 bytes .../res/drawable-xxhdpi/icon_cp-cgm-insert.png | Bin 0 -> 2946 bytes .../res/drawable-xxhdpi/icon_cp-cgm-profile.png | Bin 0 -> 3179 bytes .../res/drawable-xxhdpi/icon_cp-cgm-start.png | Bin 0 -> 3738 bytes .../res/drawable-xxhdpi/icon_cp-cgm-target.png | Bin 0 -> 3820 bytes .../res/drawable-xxhdpi/icon_cp-exercise.png | Bin 0 -> 4734 bytes .../main/res/drawable-xxhdpi/icon_cp-note.png | Bin 0 -> 4109 bytes .../res/drawable-xxhdpi/icon_cp-pump-battery.png | Bin 0 -> 2098 bytes .../res/drawable-xxhdpi/icon_cp-pump-canula.png | Bin 0 -> 2829 bytes .../drawable-xxhdpi/icon_cp-pump-cartridge.png | Bin 0 -> 3466 bytes .../res/drawable-xxhdpi/icon_cp-question.png | Bin 0 -> 2097 bytes .../main/res/drawable-xxhdpi/icon_home-loop.png | Bin 0 -> 3095 bytes .../res/drawable-xxhdpi/icon_home-profile.png | Bin 0 -> 4091 bytes .../res/drawable-xxhdpi/icon_home-target.png | Bin 0 -> 5596 bytes .../icon_actions-cancelextbolus.png | Bin 0 -> 6123 bytes .../icon_actions-profileswitch.png | Bin 0 -> 4514 bytes .../res/drawable-xxxhdpi/icon_actions-refill.png | Bin 0 -> 4290 bytes .../icon_actions-startextbolus.png | Bin 0 -> 4813 bytes .../icon_actions-starttempbasal.png | Bin 0 -> 1089 bytes .../drawable-xxxhdpi/icon_actions-temptarget.png | Bin 0 -> 5622 bytes .../drawable-xxxhdpi/icon_cp-aaps-offline.png | Bin 0 -> 5173 bytes .../res/drawable-xxxhdpi/icon_cp-age-battery.png | Bin 0 -> 2612 bytes .../res/drawable-xxxhdpi/icon_cp-age-canula.png | Bin 0 -> 2285 bytes .../res/drawable-xxxhdpi/icon_cp-age-insulin.png | Bin 0 -> 3972 bytes .../res/drawable-xxxhdpi/icon_cp-age-sensor.png | Bin 0 -> 4801 bytes .../drawable-xxxhdpi/icon_cp-announcement.png | Bin 0 -> 4990 bytes .../res/drawable-xxxhdpi/icon_cp-basal-end.png | Bin 0 -> 2234 bytes .../res/drawable-xxxhdpi/icon_cp-basal-start.png | Bin 0 -> 1038 bytes .../res/drawable-xxxhdpi/icon_cp-bgcheck.png | Bin 0 -> 4845 bytes .../res/drawable-xxxhdpi/icon_cp-bolus-carbs.png | Bin 0 -> 5055 bytes .../res/drawable-xxxhdpi/icon_cp-bolus-combo.png | Bin 0 -> 1132 bytes .../icon_cp-bolus-correction.png | Bin 0 -> 3170 bytes .../res/drawable-xxxhdpi/icon_cp-bolus-meal.png | Bin 0 -> 3634 bytes .../res/drawable-xxxhdpi/icon_cp-bolus-snack.png | Bin 0 -> 3854 bytes .../res/drawable-xxxhdpi/icon_cp-cgm-insert.png | Bin 0 -> 3772 bytes .../res/drawable-xxxhdpi/icon_cp-cgm-profile.png | Bin 0 -> 4222 bytes .../res/drawable-xxxhdpi/icon_cp-cgm-start.png | Bin 0 -> 4949 bytes .../res/drawable-xxxhdpi/icon_cp-cgm-target.png | Bin 0 -> 5083 bytes .../res/drawable-xxxhdpi/icon_cp-exercise.png | Bin 0 -> 6431 bytes .../main/res/drawable-xxxhdpi/icon_cp-note.png | Bin 0 -> 5399 bytes .../drawable-xxxhdpi/icon_cp-pump-battery.png | Bin 0 -> 2659 bytes .../res/drawable-xxxhdpi/icon_cp-pump-canula.png | Bin 0 -> 3705 bytes .../drawable-xxxhdpi/icon_cp-pump-cartridge.png | Bin 0 -> 4483 bytes .../res/drawable-xxxhdpi/icon_cp-question.png | Bin 0 -> 2737 bytes .../main/res/drawable-xxxhdpi/icon_home-loop.png | Bin 0 -> 4103 bytes .../res/drawable-xxxhdpi/icon_home-profile.png | Bin 0 -> 5576 bytes .../res/drawable-xxxhdpi/icon_home-target.png | Bin 0 -> 7641 bytes .../res/drawable/icon_actions-cancelextbolus.png | Bin 0 -> 1493 bytes .../res/drawable/icon_actions-profileswitch.png | Bin 0 -> 1143 bytes .../main/res/drawable/icon_actions-refill.png | Bin 0 -> 1161 bytes .../res/drawable/icon_actions-startextbolus.png | Bin 0 -> 1249 bytes .../res/drawable/icon_actions-starttempbasal.png | Bin 0 -> 651 bytes .../res/drawable/icon_actions-temptarget.png | Bin 0 -> 1364 bytes .../main/res/drawable/icon_cp-aaps-offline.png | Bin 0 -> 1361 bytes .../main/res/drawable/icon_cp-age-battery.png | Bin 0 -> 911 bytes app/src/main/res/drawable/icon_cp-age-canula.png | Bin 0 -> 806 bytes .../main/res/drawable/icon_cp-age-insulin.png | Bin 0 -> 1073 bytes app/src/main/res/drawable/icon_cp-age-sensor.png | Bin 0 -> 1352 bytes .../main/res/drawable/icon_cp-announcement.png | Bin 0 -> 1286 bytes app/src/main/res/drawable/icon_cp-basal-end.png | Bin 0 -> 867 bytes .../main/res/drawable/icon_cp-basal-start.png | Bin 0 -> 616 bytes app/src/main/res/drawable/icon_cp-bgcheck.png | Bin 0 -> 1233 bytes .../main/res/drawable/icon_cp-bolus-carbs.png | Bin 0 -> 1257 bytes .../main/res/drawable/icon_cp-bolus-combo.png | Bin 0 -> 687 bytes .../res/drawable/icon_cp-bolus-correction.png | Bin 0 -> 948 bytes app/src/main/res/drawable/icon_cp-bolus-meal.png | Bin 0 -> 1046 bytes .../main/res/drawable/icon_cp-bolus-snack.png | Bin 0 -> 1007 bytes app/src/main/res/drawable/icon_cp-cgm-insert.png | Bin 0 -> 1156 bytes .../main/res/drawable/icon_cp-cgm-profile.png | Bin 0 -> 1075 bytes app/src/main/res/drawable/icon_cp-cgm-start.png | Bin 0 -> 1321 bytes app/src/main/res/drawable/icon_cp-cgm-target.png | Bin 0 -> 1295 bytes app/src/main/res/drawable/icon_cp-exercise.png | Bin 0 -> 1464 bytes app/src/main/res/drawable/icon_cp-note.png | Bin 0 -> 1307 bytes .../main/res/drawable/icon_cp-pump-battery.png | Bin 0 -> 932 bytes .../main/res/drawable/icon_cp-pump-canula.png | Bin 0 -> 1090 bytes .../main/res/drawable/icon_cp-pump-cartridge.png | Bin 0 -> 1305 bytes app/src/main/res/drawable/icon_cp-question.png | Bin 0 -> 913 bytes app/src/main/res/drawable/icon_home-loop.png | Bin 0 -> 931 bytes app/src/main/res/drawable/icon_home-profile.png | Bin 0 -> 1026 bytes app/src/main/res/drawable/icon_home-target.png | Bin 0 -> 1318 bytes 198 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/icon_actions-cancelextbolus.png create mode 100644 app/src/main/res/drawable-hdpi/icon_actions-profileswitch.png create mode 100644 app/src/main/res/drawable-hdpi/icon_actions-refill.png create mode 100644 app/src/main/res/drawable-hdpi/icon_actions-startextbolus.png create mode 100644 app/src/main/res/drawable-hdpi/icon_actions-starttempbasal.png create mode 100644 app/src/main/res/drawable-hdpi/icon_actions-temptarget.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-aaps-offline.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-age-battery.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-age-canula.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-age-insulin.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-age-sensor.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-announcement.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-basal-end.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-basal-start.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-bgcheck.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-bolus-carbs.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-bolus-combo.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-bolus-correction.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-bolus-meal.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-bolus-snack.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-cgm-insert.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-cgm-profile.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-cgm-start.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-cgm-target.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-exercise.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-note.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-pump-battery.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-pump-canula.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-pump-cartridge.png create mode 100644 app/src/main/res/drawable-hdpi/icon_cp-question.png create mode 100644 app/src/main/res/drawable-hdpi/icon_home-loop.png create mode 100644 app/src/main/res/drawable-hdpi/icon_home-profile.png create mode 100644 app/src/main/res/drawable-hdpi/icon_home-target.png create mode 100644 app/src/main/res/drawable-mdpi/icon_actions-cancelextbolus.png create mode 100644 app/src/main/res/drawable-mdpi/icon_actions-profileswitch.png create mode 100644 app/src/main/res/drawable-mdpi/icon_actions-refill.png create mode 100644 app/src/main/res/drawable-mdpi/icon_actions-startextbolus.png create mode 100644 app/src/main/res/drawable-mdpi/icon_actions-starttempbasal.png create mode 100644 app/src/main/res/drawable-mdpi/icon_actions-temptarget.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-aaps-offline.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-age-battery.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-age-canula.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-age-insulin.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-age-sensor.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-announcement.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-basal-end.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-basal-start.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-bgcheck.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-bolus-carbs.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-bolus-combo.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-bolus-correction.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-bolus-meal.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-bolus-snack.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-cgm-insert.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-cgm-profile.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-cgm-start.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-cgm-target.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-exercise.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-note.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-pump-battery.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-pump-canula.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-pump-cartridge.png create mode 100644 app/src/main/res/drawable-mdpi/icon_cp-question.png create mode 100644 app/src/main/res/drawable-mdpi/icon_home-loop.png create mode 100644 app/src/main/res/drawable-mdpi/icon_home-profile.png create mode 100644 app/src/main/res/drawable-mdpi/icon_home-target.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_actions-cancelextbolus.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_actions-profileswitch.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_actions-refill.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_actions-startextbolus.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_actions-starttempbasal.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_actions-temptarget.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-aaps-offline.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-age-battery.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-age-canula.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-age-insulin.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-age-sensor.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-announcement.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-basal-end.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-basal-start.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-bgcheck.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-bolus-carbs.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-bolus-combo.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-bolus-correction.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-bolus-meal.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-bolus-snack.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-cgm-insert.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-cgm-profile.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-cgm-start.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-cgm-target.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-exercise.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-note.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-pump-battery.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-pump-canula.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-pump-cartridge.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp-question.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_home-loop.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_home-profile.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_home-target.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_actions-cancelextbolus.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_actions-profileswitch.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_actions-refill.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_actions-startextbolus.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_actions-starttempbasal.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_actions-temptarget.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-aaps-offline.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-age-battery.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-age-canula.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-age-insulin.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-age-sensor.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-announcement.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-basal-end.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-basal-start.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-bgcheck.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-bolus-carbs.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-bolus-combo.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-bolus-correction.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-bolus-meal.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-bolus-snack.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-cgm-insert.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-cgm-profile.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-cgm-start.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-cgm-target.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-exercise.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-note.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-pump-battery.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-pump-canula.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-pump-cartridge.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp-question.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_home-loop.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_home-profile.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_home-target.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_actions-cancelextbolus.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_actions-profileswitch.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_actions-refill.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_actions-startextbolus.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_actions-starttempbasal.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_actions-temptarget.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-aaps-offline.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-age-battery.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-age-canula.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-age-insulin.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-age-sensor.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-announcement.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-basal-end.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-basal-start.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-bgcheck.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-carbs.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-combo.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-correction.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-meal.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-snack.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-insert.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-profile.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-start.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-target.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-exercise.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-note.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-pump-battery.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-pump-canula.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-pump-cartridge.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp-question.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_home-loop.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_home-profile.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_home-target.png create mode 100644 app/src/main/res/drawable/icon_actions-cancelextbolus.png create mode 100644 app/src/main/res/drawable/icon_actions-profileswitch.png create mode 100644 app/src/main/res/drawable/icon_actions-refill.png create mode 100644 app/src/main/res/drawable/icon_actions-startextbolus.png create mode 100644 app/src/main/res/drawable/icon_actions-starttempbasal.png create mode 100644 app/src/main/res/drawable/icon_actions-temptarget.png create mode 100644 app/src/main/res/drawable/icon_cp-aaps-offline.png create mode 100644 app/src/main/res/drawable/icon_cp-age-battery.png create mode 100644 app/src/main/res/drawable/icon_cp-age-canula.png create mode 100644 app/src/main/res/drawable/icon_cp-age-insulin.png create mode 100644 app/src/main/res/drawable/icon_cp-age-sensor.png create mode 100644 app/src/main/res/drawable/icon_cp-announcement.png create mode 100644 app/src/main/res/drawable/icon_cp-basal-end.png create mode 100644 app/src/main/res/drawable/icon_cp-basal-start.png create mode 100644 app/src/main/res/drawable/icon_cp-bgcheck.png create mode 100644 app/src/main/res/drawable/icon_cp-bolus-carbs.png create mode 100644 app/src/main/res/drawable/icon_cp-bolus-combo.png create mode 100644 app/src/main/res/drawable/icon_cp-bolus-correction.png create mode 100644 app/src/main/res/drawable/icon_cp-bolus-meal.png create mode 100644 app/src/main/res/drawable/icon_cp-bolus-snack.png create mode 100644 app/src/main/res/drawable/icon_cp-cgm-insert.png create mode 100644 app/src/main/res/drawable/icon_cp-cgm-profile.png create mode 100644 app/src/main/res/drawable/icon_cp-cgm-start.png create mode 100644 app/src/main/res/drawable/icon_cp-cgm-target.png create mode 100644 app/src/main/res/drawable/icon_cp-exercise.png create mode 100644 app/src/main/res/drawable/icon_cp-note.png create mode 100644 app/src/main/res/drawable/icon_cp-pump-battery.png create mode 100644 app/src/main/res/drawable/icon_cp-pump-canula.png create mode 100644 app/src/main/res/drawable/icon_cp-pump-cartridge.png create mode 100644 app/src/main/res/drawable/icon_cp-question.png create mode 100644 app/src/main/res/drawable/icon_home-loop.png create mode 100644 app/src/main/res/drawable/icon_home-profile.png create mode 100644 app/src/main/res/drawable/icon_home-target.png diff --git a/app/src/main/res/drawable-hdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-hdpi/icon_actions-cancelextbolus.png new file mode 100644 index 0000000000000000000000000000000000000000..95761084a9acace3081eea185dfe94b12980c837 GIT binary patch literal 2293 zcmZ9OdpHw(8^=+|sc6ip!;DbanDZDfIfXWjG&yB6!`PfHyeiCLLW-osqZ}%XIix~z z7&(-u#53n6r6-4Ns?meI^SoWpb-nL>UBAQqyYK7sy}tKfzbrSTql~1Aq>zx1%qb^3 zwBU5vUHilYyBRX!i;$48ONa+126NgKjw6Rd0s_fcJcJS+A*c%pSz1#f0&qlp3&nMJ~+fFAqwxFfb_s65OL;#U~4N$OA1^72*<|+fGFW% zq-Zz=0sfl{7u0^Gmxn{#K73x3}&PY zg6SKWK=sX`21a`N25^0IxV{1CSAeY~L6%X0L2$I4!!I#Gh5!f0#6-ZM(D?XxNW3A0 z97TW{n46nJ^3{>!k#N8_SGB4R?wB+xE1085UIL4d)~ zT@mOn6@fkIKmG*CKNG@}1Y?O3_y?V$!-a&z@u%!;JSZhAlf+tId*wdfTnLf(&e^8U z;a|<31@dZRw^M&hsY@}n(+id_kfiZwPR&^CS)+TICZYylv356W5838WVPS>(@OMg; z`QGK_VuDcZJ`0 z@0I*^VIn=|g{#`{N8K%~M>Ti$B~!&C6lXE(oApDU)33GvEu5@Y)=GadWw$=UIw#%Q zgWdujs&i3q5bZIOI;s%oj#$q=!`S1_6rb)qUEJ3Dj`7ed9eMSwb@q{{j*WZdz6VO2 z54OF;1>2d2j~)5hMen0{{ji_vRn8O{OrY-5f#4ppZRJrYcV zcKyNKTieGzzRfYyL~IVA8BT$=;eDIDn3CM1p(J1!pyMat&+QMrd@bBf+4h;FtFQU# z^~|xgi$ufH{BCciMnYn-vkNS(etyq!tMvNJvGC>zmt#W+073is=E> zs(%6+oQEZp*Kum3)!J9#KSW+5*>#kfTh`tNCvS-~^=`HJxdPUWUs^b_f{PDtB(|ex zGCteaKJ0cde{?Ob98BOJ(UV0X%gcLxP8t|7sA* z{1SM;ERFm?LDDL1J=P6rQL6LF4qL9RBX3E!nUrV1>*e^^H+>0C!?-1M5(60Lt%a?- z##xJhf9JTR#?R^N`v*grOe{|cP($`AAB;HklU4+L>p)#8lo|WFz{kqqnQ%oy1y`Mt z%?e6_SIV%_yu}3e-XGV@{#XbrEIpC_rQ3G0!%UBwLA}s+#-SEPt1Q}>tloFy3d{R$ zS+_d_ozy{6x}M!BT*hfEfep**Y<5wbji11%iXVP_hqeHgT$3QweyVTNBghEar=WY3 z`8fE@gr_1#+s7i!&ElE%eLzrFp109(QI=?c(=gMx`QXwF#xJw%3fXwTdn+8{TH$yz zH0rg*Xms`lATdRhLRL$zVadr>Ip;((iZNPQStd>Dw2o@I?;WJ{&*M_gCJ8FJC^m=v z<~rwlYSS2>zI>mfC%qz}k`-(DT*uTh`zu=K%VJa593^o}*QfS3?ers>a zfF}m{`C1bDlbO8^h^2rIi9&{Z7`=ZAFTdYTW%)0Q3h!tfrtXgBSMGR;@%}-zCHlAJ zSOp)QcF>GlOfg|a8xLO&d0a_QkB_YWSfUHOja2HnB*m+B94k?ireW4A2o_}*mFWO6 zyjDuM=TuEoT$o;viaY~0(rvkIzSepETLU9b89-c`pGdppXb|bvJGgw?Yfzbie}cZ) zm5knpk`vch2zu9hAoaz0h9sc+)Hb$|+uC|?*{bE7ke{yqUE(w=6+GUv;U!u2cCitv z_`Eepb2#b;Uu-tNG%xc;xrCU#?tHH3p?emJC>;o3mYUFIGT_VNYD8vVQ@U*&HwVgU zQBif@aKGX9^H_IbfrN=>`+fTxY~4tGmqR^c`c7EHiOw}j^ApYA$&iElUq!NopEI~q zHftSR@|cW`7)NB)Ba)4K-q5?av?F24Se!y1jRQbGsooBr%0)t84yj>|KKWq-kGoR zbY&D;#TNO2ZM2z=4}Nx9#e>nubT0H7&*o~yl4g%ks-8F$-ldW}<{!QLjb@+3HXS%1 z`zbRKQ}nVP8#m~hb%7 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_actions-profileswitch.png b/app/src/main/res/drawable-hdpi/icon_actions-profileswitch.png new file mode 100644 index 0000000000000000000000000000000000000000..4b36a0cc23c04f959aa1d8f667d98b4382fd7ad3 GIT binary patch literal 1585 zcmX|Bdpy%?7+<71YUG@C5ivg#Ep}yWGs48&5+ftRZ1Xd_v<)K_xm0dtu2H%zhdPs{ zbU}R5Nr=vIJIbYwQpYIgl#-5grkvi-=Y5~|d7tO~em~#mkMA*GA2+D>CT$1=0;RcA z{nXKOaj#mTKJ9#xR1nBAPmmrY3G((LF$FwSM3f+sg_81w>N*5s?g4-`SbX(ZL~8wTS`7&TS$>X2b)rj8y)F-pHVoL9`7{@dK@9An^J2j!45+9Npu^_D zb$W%s`qi80zW0oCVA`&Y7X3rO(X6qI4Sq1W@7n7NdtkpFzE+iv94M9Bg7d9N-UUUa zSz@Cde(J{a?l){UCw{DAW#+>d$>KZsM->H+i5wu&-spJS^M9n@0!-)Z;~`252BSH@ ztWjr%Kz{VaX`r>m^2@lvvqs>7D*AkbwPo>4mfTNh&+HiRcv7}M`;sq=5n^`QcB zURaXiQkh(Jn#IEdI`{9z60mNmHSvZ0(D_(uY|gPs$PTaJ3$HD>4_4Ww8;JH@)h!z| z-OeGmt2DOcq;$oNku_;1y4MPRv3hyeP3WQ+B_4O}rX_Q{JgN`6^B8eAxA&yT57M@! zeJ+yK;BFbqX5uv`ZXIE?m2YZ&YNSWl&s+qlDsuqsEZ%~ZBPD+uA+Wx9~3+CR$zE$+Oc zYy&x$Gyi-it5~gLj%YG9M-1m(tadaBm7)9@V^A4Ei)D@o-GeOZeld!CcA&T47O~MU zk=I&z`m!uc@MLS**1AInI&Le^@9e>ela*!)$Q%5bLCe3T%aZa(K2;^tKOwt}KVDOk zQf7g>6&5LS-#*<+-p|5>H^uEgzA2wE*NfO$AJk_SK;^CK4B6`0aw{O6(huzNO#S_6 z)q6r^ztTCv*e%_LrR3+Gzwc$Rpus*Lzqzy^xVhy|Zw)h_vP#WM z&J8jg5!h^cSp6qj?#|m#_h3_7t;W6MSB$Pda1AV`bP{goo80v2IU-89K@oNCb~A&v zcU}JD?m#n%fHY%t#LW0etK~OdtoNGEDzwU1NT!Yvd zm|w4ZlOUT;**bkjpo~9xU(nW6L0LW@JU%w7!HrZ+tf)9QEOut6j)vaSQ+wl7Is4OUe^YwUyFrGIX8EQ<*hsO4;MoGf^`u74$>YlOa`tFy z2uOq`|6uRjVLN;Hwdk4maI<1QGenkc(4i<9|KAaoj6s^!+58ee=2FHX!4{pK=ITSO IaSlKHAJ(z5%m4rY literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_actions-refill.png b/app/src/main/res/drawable-hdpi/icon_actions-refill.png new file mode 100644 index 0000000000000000000000000000000000000000..ace25d1558822150adf95eb6c9e0723aa4af2a9e GIT binary patch literal 1672 zcmY+Fdt4G$6vtWHvboI6*90@dXC+UckjP9-%|{BREGy-unF0z-2`Z{(qAs18StdDC zTPC_Or&pYQK;&L8JyM}!BO7z2#~ z0Dwtw5T0PLAuD^$YQyOr&VL2~d=!!tMdFgeLNQbp14gE?D0CQ)k!pwo06sWgDw� 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-hdpi/icon_actions-starttempbasal.png new file mode 100644 index 0000000000000000000000000000000000000000..8772df62a4ec9beb694bec0dc983a6e8c41237b9 GIT binary patch literal 745 zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`2ojdb&7^-n1^+7{?Q>bCw1A)aQ9y0?Nst-g> zW{j=hyo`O_?*qQQlF|oWJ^z|A`EZHtwFTS{HXYmNx-Z%E(%17Ff_p>_!VW|*CbLq7 z(fEXY$MFMtZ`tPQ+PoL3_*M9x>&E&`mYrK!by#2T&Zs-FS61to*S$%*6LK@xAE-UM zcRTO=de3`nd=u0n;xBQ3h$w!~S#Zq#Lt?$u3hQuS5CGBJYW7D)vOJQZldgbLsHdx+ J%Q~loCIH#b3pxM* literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_actions-temptarget.png b/app/src/main/res/drawable-hdpi/icon_actions-temptarget.png new file mode 100644 index 0000000000000000000000000000000000000000..f839a6894b38d9327b8838649ccf4001fcb4c1ad GIT binary patch literal 2118 zcmZWqdpHwp8<#g?(q|6kbI6)3hjt=|4U?jUnT4VhZL_qr0~CAOuPZ4zxp0_7ayW$z zB2mJqbZ79Ks09q7hB|`-Y`qcQ%!8D()WdO+6u&sUKRGU(j0y$2U;s`W^g02J!X|<^ zwDWWpn&S-qix<8A-uQ-tL4UQd!=1sd8-k!fZvyBbBa#BLh1o&LNE-)`Jqm`jMLAgS z+Y7QrAno7?6dbt^ia??fC^P~I`Ux-w0CI{9J%jdjJM>d*J#z-1WwV)RI6NjM1{Pxj zV?>6*kth@jjpk3D{Wi7@&GpZR*9cz zoT_oILHCF23x}8EL6}P|y~AM%um=76P>wu7An8zwBga}t!^=R$~hsfu`4(VD0lysLY~ zkaONWsKRop&8EX#W*%iB+uiM{F!(Ae>p1{y7ZZfP=8kI_fd0SuFeap84kd2<715zS-@?C)?R!*{|{t zQRd-PNK!*d&pmca;O;Mxvyz606tI|Dy=e@mnBmq3X}s8*@!}8tD0A6rp18U!9$0v3 z^iO|})t!3-9{(bbhmEEm+j%&o=mpP9x(8R0Jy42B$8NQ~yB!L@P$}Sdc0oU4`~+mj zq}~sSrH=LFJASLehLpzXyADp_Yw0D638e3_M%(a{y^=Y1af7i*8^dxq1Txjw$T_gQ zs`639$|Wa4TGU#!lez;Io<{trNyS@)mn&9@Pl^i|)9-Lkj@H$v@+(Mj3zv_4iRLt& z5kRDIR>6=1S&wwbpOtg{=Z&0vHut%a=12=wW2SwbN5zIN+T4)c?_I&_k9Yn6>U?<% zwk@dQPfwgV>6l@X({DkcdF&|u^>-dhR+iahIFCN>$5}0ns3HK0m*gIpj(NmPs}Szu zS9T5JZCp9d=x+`fXH3Qi3OS2M;qvS6E^=!o`Vw{|`ucwVgnM$P?B>l}H2<>*2h&Kj zx0aS%BHVnzgfv1x>kF!N&!D}){e*-oK;BjoY^X& z`pU_UE2Imbj*~Fw7B(4~DHI~hw{o33Lx3w!_GWU8D`rOv^ti3j$@6!xXdS!X1|JTl z^``eF77dQ0ES(ug3YzlvMOn${V%H2wkeTxEP&Pw1b}8@Pil%zMsD}_h%u_2kS8RA& zXs?c~E`PXb9Gz;04bBP9+jZz8jT7g{j2 z5T?k-74C^7HcapUNi$XLjiawV;v4#3E*`h%l_%UEWSUv$@sia~L6yfwUOH^~p>29L zrP!2~J_tk~OuLiYFMoPIhDXNAu7ZPaVTw%a8*efyLvrds?ScWcQBUeK{{o9`Ili&ExLBZL>f2<=^##-MGi=%s}+OF zqGLk31kga1#=UyRb{ZZX1~!fD^VRJS53S?u-`q`c9Mb$J$RCmpV)uJtsC>xA`uA|h LyFEB?`ttt(TIk*S literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-aaps-offline.png b/app/src/main/res/drawable-hdpi/icon_cp-aaps-offline.png new file mode 100644 index 0000000000000000000000000000000000000000..0fe1cd628b6ee26bda855569c1c6ae5a9453872e GIT binary patch literal 2011 zcmYjSeK-?p8=u}2N)96>q?r!mu-Rf5o6M$s&5R;n*;uS?#te%h+D^(x9ev>Vszh)3 zoSA&pTWqA3y-rJrS3XKbXLA*b=$-R+b-mAZJ+ z0Bx^>IFc&*Y-~++)#*e?dk+Ap`OtzwI3a$%sAv`wN{(Sss8B95K~)C;T-~?{VqVr#15G@7`4tDUf^Gooc#?cO@v8jP+grMj&dbD#4*bTGQm5WjlFsU3e zh|6TeC!x4#@ZY>B)qUd`1_u2N;n2}w_YFZ%h#wK;!D3TE4p5|RG<=^E$k7=JcW`z> z*xP^*c5o!j&KU-`x3z<#?3__{aM1S!#%u+-vSW^+NI1{$VyX-cj^l6=P%v0(YAQ5! zAC$$8g~6Sjondwe7y@CdLf9sqi06>Gw(&{k8x;TJz)_Q;*|Y=>jTH~t;3QL6$s9Bo z4BHTaeOFQ0gZ=QQN`7>R8n0>#Tjd|*)qny3)P1~g?m^tL52Gif;fHqhEy$i|jsFxw z%cbD)HdaJPn?atok=h{SJXW&#NOg`D#7G+o2a0M6y|;jW(hM*Y1>iJ6Ev=jISFuMn zZ4r1SY8&udLEg9PGhO%HkFD9KkdC#dj@r+b`XZL4=qF$Qa+aN_m<>mi_*z`*kNFX# zDgDGogCS{ggv9C2n@wfewaW2NXYZMY4kw$tTt?kwUTXi0TP0wOo(YOMdqzb7o|*u5PZytf8qlpX^2|#gAMKWj0ejvGFC5-Bef%WYs?%682$54i2Ypzv zFFTi>n-VIQ8R>Nnc;{o8+o${_x9{k`H_FG__6a!Y9s^{uPn^4|=rUT&6*4924PLofEPzA)LKtgR##0 zFui%SR;V9&?vw=D0bAPP0$#Y-(BtJ*?!qI=M6@J_g1%01L0D|faFoR|;sF>*zhWm3 z6f;nV6u+fA0yCuIQl+|?G$A+Lak`P~Zlgdw!PPBecdpq!eArE^mp$$mHA}{S?#KzD z!?hcGs?hS6cIh#zw=Vi-W?ffH6Qs)kb!YU-U%ZQU5aO9F2CF9ZjxSK)bE~mXAZ-w{+t=#R7PCA ze@0nN5IZV87}hHqp#e+MQEj)K8ANM&pp(DrqEH$3fp28lwPqiXDl86odSoDpzrVJy zxg0;my1hgWHha9Co(ggZ6jKpub-IppY*der6 zu0BprpLMQl?1lu^-JM$OUo59w+c`B6A+H4SP!?95YI}B+%Fo?s)3;R$t7GpIxnCAXo-z8C#Jj+yiA6bI)O)Xq(@GwZ z>U8_t4~JV$wSKdpvVgntuK2xHBFCUt8A7+KZs70zX~+wyYS#&# z=9Ke~zp+S^repzEkv3P4QMY01K8p1ignvi;l9$|weLk|6Bo>O@B_AkP5BGuyH!X8K z&O{V8KjELQFL;&ydfBOqmx3aRLekG$R+zR%T9AK|8EO5l!rLmWF5;46qNk{%?ruwu;sRs=U3=rQ?NCYgua)Kn{hic?-sSBiq?Z4w z+Q8O1CC_R9+bhqfPEUpAD^wF@e%x((cTIpH1CJ8h5s|Nq~<7QzUn Y+wgtYF1qRNvl}zn3s1l`V574C3#xsVQvd(} literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-age-battery.png b/app/src/main/res/drawable-hdpi/icon_cp-age-battery.png new file mode 100644 index 0000000000000000000000000000000000000000..abc626901a7d6ceece40505528ae5af05cda7b82 GIT binary patch literal 1183 zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UH;eoq(2kcv5PZ=LRraTPiK(LY@%{ZYn|o&}s;Ni7^sJ^_J&0fFX=x)&@` znlbnEAM-pB$8ayEz&k6Y3mfSH`2C37;EmU#<0qX}wkVK%ceMA0 zm6P@51^vQ51m=f*pR3usX7vXiJ-wGD$7-6)*Cr{rqA$YJc?ZP40Odm}n2!iZ=6 zaj(#Kk9BKSKAmHrJniEK3BiKd9UJ_nbZjkN@Q3-Hen#@GKRxD!3wG__v}EF>#2u*% z{)BrjH-6OLSak7JtkShM)uXQt?CIF*>nIhRoGH_1V(1lQrI&ZiIcZ_V^2Kk3zID9+ z80dK4yF%!C*OITHe|E(^jdZ)F^ez0l(mTQ3jb?8SC|hV;n*P0D+ktl59eyrf`R?2c zsSKOARk%Ou^mUH*?~h&QNF{BSH1Cvonf0eF+~rr$tHYvO)1%u$Wl9oeeJN0XXI}F& zPUP?-)<2Q9(Fb*vUfb=@{=wJ&@i)glo7-0tW+mx%pV*oBAX5H$R$b2VWQ(roqkV}5 zpZ+uChnEGXMkT!!a*7SQJO9Y@t6Npfo zD)02N-;(n2TI2iZ%a;w`*mKoe6WCi4YWHXttzUF_m)M_>-T6ItJUh2)?W+m*d#Gxo zsP-{A`AeomeD{~fvsS%7_On3F=!ezvk8@7C2G327`ls=ElldBB-i3T!xqjKtLf2$& zkS#AUym2Dw;zxlEE^7`7AD?>2EbZWi#ZTVvHVH5~SZ^Ezopr011}@YybcN literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-age-canula.png b/app/src/main/res/drawable-hdpi/icon_cp-age-canula.png new file mode 100644 index 0000000000000000000000000000000000000000..ecccc394265f0a31f54fa3f57b00a407df6eb02b GIT binary patch literal 1060 zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIpDV{ElAr*7p-aMHd>?p(j!M`i$^({GGOHe~+i^v7jhWoD*079ElhPJt{;7TN(c@mqy$`AP&ZNjG zwg@h z5pZYm8J2eso5Y+}tEZojYC0SdUh}W@_>RW*6BljGAI(s^ZF^MX+!WDY(YCAkk8kAh z|HyZG>4R$zCC@!Bo&Ejh+OG=|blW~|nmhYBSN3F)E3tFte)?PVW@^YdAf6;t2fexq4X=1^UxPj%z^ApJk$juWlUiv5|oAuG6I@A1`T zZx@+7cz+;l|YQO@qE_>hXe=7SlXzvmCgJSymfuT`Br_M_iaj zc*NEQF%ACgRU03z*s0%Yp3jzhL*4dOf7GAY&{<3OPZd2QdhPckn-zPX9&Gt#95yrd z(hSR6$NoycIvwJ#yWpYE*V3giiMHD3RvTZvKDDUzYoJth*o>Q8)nO+@#WL5toLemY}@X%D|EAW`{EheYZKi*UVAdln|1b5`vdQN^^~jpHYf5X zEj_tk?eV1rc6wh|v|iHsSM!doY;xLRD^=b**&E$%^+ksK`6vDE!Ky7+FK&*CJXn9= z?4uw0Ph}od$F*E-isN3r`2CwI%{8lDZr`%`<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIZEKe85kcv5PZ{5xhbrm`O(VtQ9wuA7RMS@!cxfK;UW=UO zpo?&=!9?}{qNZxc*yr!D`I!*9&P_|oMMThfgNEqEMJJX@Yza91G4btWIX{2Pw>!mV z1b=bKWsg<%XIaku&?Q6?~dM0>iPd5_>BnT z?iqhBi|^lS_q=Os#Ew_{r}AX&>b%+%-D-MP^iWN!u7sWcZuJl9+oru(KVh*&?8^ts zCP#383@B@1{^4;ZWod@6*!08Y6W` zZ|beR8fk~uU+n*zBvi5e!K^(I?HkwLYCN}MTeH>-&7@0KYeY6*72BiN^6E&eYp$5c zobQ|yqc?w2PrCL-YloWtwVyE+mrPD?+SMX@Mm+C}tr@3ymOKA6uIZK}gCYSM*XvDMBtXLKVg1CA_>cg-uYe|Pd6=jnQp{LUX+ ze4qH)a~oEDY!b*5i03MQC#b(Ln&V!4_d#>7HI_U4cU<-PxXiqB!EE8ME6QtD&1iLM z$ZvhEEBXn z`0Pm7m_2=IWYXD#+Q-t?+x-5pu;TVxB|Y6hX}_envU~b#zTF71%DCoK6_IjrwfB|z zV(+${sxVxgI4@$~8u7vniC44^>{lt%;zHxmvhGwt#>(k8vbEfI@(W(>s>;2XBN87JrT*jZ8i9<>Qg4&YnyT_Ht~u~n^%eV( zbq8GJm0tNR&5Jm1`{Sef7enkZRei-a-yEk zSUng2yS~s_XA8eXekSkoOEadT=W(IVBO*WK_4g~cblzuX2Nl_#u6{1-oD!M<(0QEg literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-age-sensor.png b/app/src/main/res/drawable-hdpi/icon_cp-age-sensor.png new file mode 100644 index 0000000000000000000000000000000000000000..30d5d02de019105a8e9ec4678d99f84feaa9d1ba GIT binary patch literal 1931 zcmYjSc{Cf?8rNq~QPs#;N)egI;}H=ANi7GlmE?&au~m~uNG(x9BGhykWlCv_cB)F% zR<-XfLTM~R%S?wT6$!@DD(aO6UA&mrH|O1R?)~m}zwi8h=lA>LyFYnhT@?Wu04XUc zMRzx}w z!DMO}J=zws+0_dH(?e|`1O&zu6XQe;r@L`tsdx_7hr)@VAVVScb^seTN&*l?Ws<<` zsL1Fz6x$Z^CoW2IKYWHkz<;(dBWxiKhlF4v#tZDkh^2xNCYDeN+}s*$g*1U9kk)1v z#$Yp3xFyUK34>ceP2nh0B+3*H{<JHcvT$!;87|HKzEb`@xW>hMiJ!wQaEsCi<@;`}%7L{iUS|p> ze2rSql?qI#U8DP=q@g5Q!t%x}m(>s~?#_EYR)h>2n;lQ?T}d8i9l!0VpZ80s+5f_` z<(OH0kEPe$8P>Hvi}{2TKR6Zt|sZz@QS_Zm3Md>!SeC}gFFfUVQL=pGUN5g z&aExYPt8fQ!+s}>D$-8Qrmq=IVMR&orlu`bkP%f?N4Y*AMngC_-6d{{q-Y!LXd#b)j$|Dd({+62z^N}} zNP1xb?OmFio?}W2Ut0SsH1fyvKVueLK0S8sy0{x!@m9tr$7x?d90#O5OBml={jeua z$PJowkUom^`Y$1ds;b8wOme%NLia#{l`A1)@Vuh6lP2*bGkie=*Hr0htnDv z#Mj2V-=6K)xzT))f1G48q;j$Tz?1R0Lz=;OAohvvmTMrE36(XWd}@C)pm_DmLD^YL z5nu@pr7HDYYM8ItRj#k8W;yK1_&m)|{a){L0y;=#tB~Il z03~X=u5c<>wFCt5bC;eKys4wPf72>Mu(IDjKZAZ}weXZ<-#Ox*9P)@zu&p?52n)>> zRc>r$Hx}iu_g6gh%xs*OLyTXKRs7=rd&*hZ0pglwJ8;dmP}+`M*%e&Q#J9_rDm?VK zv*_4O0F1u2()X8~_ldneW!SQ`vBq11XcO1yeU ztb_3F9(zkuJFe5IYnO9eW@uW)5e6k7RkY_+I&q+*CpBd{y)vofTS%qC5*7F(UjU2W zi+f{UrnQv(`LW%2+Z7VtB4e93V?=9I48 zT@?SamjYkvi0{M2aNT^>Y-sW7IIm#LF`hx{3)gKk`8;;VTp*1yP&g2_9klj0?eGVu zp|g)gL?^C`%XL4ywBA){#KxI=Ti8wYvgH8aL4|5}whld^PMTxBmS}?vuPPhq)8T`R z+W0u4uWLEJUgc)e-O15>J>YLv{-cNy(37Y9Ch0IAvX&Zy`Ov#(&fm0xu7>F|@4sL8 z!IJq7$Q5>864tFaxajdm$!|F!-j=Y+eG)xD_U<6VxxG}Fa`|+A96?FlR2{0mRMq$$ z`IMnus5Ty}+i=T?%(bc$3mOY|A{S`g_DK8EqAS{&xGV8ko+ASU(OM7TBGd}-Ls5_A z#j96KSGJs-x}V^_7u-H^d)#~h`lW%LLDW}q4CZz4uzkvbiIm~;VQxj=igPl-=>(@b zrAO#yqQ+-d#mZ8S2yqnL8p%AXEjamOmveUBWbH~(CRaA#V29F@i74x?V%{2#oT#`P z(%*mN2I3+&?DZ@9*jJk;Oq xe)i0&?azXAan2lVdpT?I|MONdeWyD=$^9A)??fqu*Bt(#?#@_rz2mvm{{XQ8e%$~7 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-announcement.png b/app/src/main/res/drawable-hdpi/icon_cp-announcement.png new file mode 100644 index 0000000000000000000000000000000000000000..23c9a9847d544b796887d6073a8d803e8254ca83 GIT binary patch literal 1939 zcmY+Fc~lbE9>>+p1(QU@rKuN^l^dHYpy))dV=m zWg59c$^+>UeVh_Ob4`w=_#}J!l9TCVOc>O`9$?4D$^Z;X zJQ2cXL`KD7**NH5T&!%rbBusO{wj&5_M+ zTqv+!_wYr(`Zmh2?cyhh?Wr(=AUSSzV-8|_GF(rPjQbEiXXvk-I8@1+nE|{PU9h;H zK*kB#PA|8syA#p+>$8VXOz(ZDKddX9ENr^piZ4saQ=fiC`nZu=u*uQi)Rb5~+^rV$ zb5LRNLxuDnuGBf(y8k`?$>$DM6K?aTi-)A0qxdI!o&xL{u8nU*+@9A1x911ZHMc|j zs}GVmiU&>JT_auA(|5nGR1^^E*|SR;QMT&b=Q?3CkiIu(wk|MbGBfScN;dwhYU+1o zUl3<yG=z@ilu-fTi`T}itsm|S3 zq|G{D!l<}H8eCHlv^e$kk(F(!4!v2xJSvp9J+dX*c^8K@=W)2raRgX8D1W_5I_?IMb!PJ1jSb?~2fAKArhB9Yc;INpFR8Is; z-cYkPo%E_5w6EDCZJ~vtj1PijhQX$t{ZU1T^RH-Y@x3Ku+avRhwgRKl zJ{qB-Bb|$c2{{hF=&9`?VP$?2=>q2dLaki+ckI|#NP*N)>U3%U6Y%qiS?jT14-dmM@R^q;*`;7Hu zMT)E(S_*|XI~dn*tM%QPaM5d9&N5z-VC`$&_^nqP!Fx%^c~geY-9-UuC1_GRY@I`{ ztLOmCxh#&E;gqlGOx^3t?lG0#AgrIe<;Dl{s#GQdlh;o3pLqpHPEQy0*b&TX=e6U0 zNJ!833-}tb|C9^$?r%27X7S#>bx0)o}4j2)I;J zqQSQXy_Br#3pc-?zv6QnczQN<;*jEc!)VlCmPW2haYq*~gjKD||3FMK*scJ+Z`8~f z86;(;I@LR9p(p?J8G(v^Y-AoCY;BtKZX=L;o+gp6t?*_E?MU}8Df7>3hkQsTy~-;@ zlTqW*J4nF5);J0*Y1DcA@j^ga2J*zU()Oytu;CbDz4Z^lq=HM&W7u3)|G%~jBv}RV z!90=Y{Eu|OKEgk6Op}}RWqIm#I3Eu7xedM{_19(KidquN(H@6^8qB`XEKo{j^wUDK zk+M(X^k4I^eOLgMWfW&PBzZ9D_Y=bUl5t9;4d_Ua!9+#fmME+LQDhhWca?0|UBYJ) z->1^FUh1FEeJDyHaR|6AmIOl-i1pQm42~>6~IqD=T7L-Dr0!R|?9p}J)^fyn^k%fvYOzbv zz=VM~2hl>Kdd+-aRp*tH>_-!uk9YI{LJjvzf*tLm)ziv~$AaFtsf9<7gJNnHR6sY4 zT+)>AMK;@?c`h-+iEI|P=y_oqZ59Gj4}4pDLZtU@_k_B5s`ouZ7^&Iz^?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIp&z>%hAr*7p-a5ZJG*slk$NrB_T0ES>olagY9J-6$TwC-_ybrQjt#F*o zk)_b+(R@IIi^t@Uy~C0PY;>f?8GZ`qKX~44y6%S2j;4u#)y?(Nz?1bUE zV{AS=lKobj_8kb+Ic6Qv&!5&2+0x&-qF7@7!vDceS0v}?N!;dm_E1sh;KZgI^#w+hN4;7Yga0+jyAg4wwAS!-DU18^TKJqVG`cKSywi1OH!|s zQYw?rJ0vf9?BX1$O%i?~(}SlTyD(>3zx99XpfE4`1#N`pmx?~L# zs&K$!m(M(Anb9v}LLN#aKWg5scfTv>$4y860OxBfegwQJD%iK-|IT@DrGMYb6MS#M zzHa%|313(J*!Hl<;D!2(SibIZCgmNQ*1z2m8B*bclH!&q)-#`ZSgn}KE(I<;JYD@< J);T3K0RRyZ| literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-basal-start.png b/app/src/main/res/drawable-hdpi/icon_cp-basal-start.png new file mode 100644 index 0000000000000000000000000000000000000000..d79ca15f86036c73c3cac65fe76c44ef101912af GIT binary patch literal 698 zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`2o{dAc};RLpsM%g~G2QO50~xM9{q&Naeon8L!My2>|fI4R2Ve!(=kV|EFt z6R+v{3j8(^R21u8B-C_&4YT8Y{%yDZoE9Fn*+(ar&SlseICL=)THCIH)zH?soFD75yZo2$H*lbqs zq_4O37<>`3vyU&#@1M5Oi*Iu*Q+aNj)DHgn^$UJ#Z*SC#KYzyV;vAJJP>+dLGjCdL V^lt;#)M!wW^K|udS?83{1ORk9_ZR>G literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-bgcheck.png b/app/src/main/res/drawable-hdpi/icon_cp-bgcheck.png new file mode 100644 index 0000000000000000000000000000000000000000..56569a264a229e22719c389e86a86a53b5284e14 GIT binary patch literal 1903 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 rPrtg?5ow-L?C_&7``d!#JT?fc(#4h literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-bolus-combo.png b/app/src/main/res/drawable-hdpi/icon_cp-bolus-combo.png new file mode 100644 index 0000000000000000000000000000000000000000..98c076905c2038cad30f9deee89d0b7593147ff7 GIT binary patch literal 771 zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`2n|d%8G=RLpsM%i4=MkiqTY;u{=`5|*;DNLxE@*t~u7X%Fm9h< z+wq7grtt=6Q*ZyNb73J@lr-H=toR>l%sGeODZ$A6dy!gyqR<2t&q*Nk^0-@7?w!4r zFTPs^=_YI~cw<>``*q{DLuaNlALmlf3F5Y34dXf<&n$f))v91i!6CJ^!E#&)f;Y4z zEqd0kdBr%7@Ay5Y$yaLr)TB!!huXIN-v2*sQ(}#@*|7-5WY!*0gRlb;jcWd~X^lIZ z3P0EHoiIPk=$fd()dznzs@-pM7Ug1l%=1scg6rFTwr~H^HRGjQBEBDR-SGcbz3vn1 zI%zhD32>uuFjnkdbLUz4|3)v9!UNlW)>Qsty|M6fcktR>5woBCuhlZWxV)0#-mdS) zccZTwwQl_O^1SwIQ47A~b1wW`_;p>vKIR0@3btd~x92x(ZhAf$8Zs--v9DB@w`%W+ Q&H$xdPgg&ebxsLQ0NC0eZvX%Q literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-hdpi/icon_cp-bolus-correction.png new file mode 100644 index 0000000000000000000000000000000000000000..8ad786440618b237be1180f03fd2c943a3e567c2 GIT binary patch literal 1338 zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJURh}-6Ar*7p-tx|f4HY@|@qX{Zj;&o8p7CKTY9#_UC_FmS_{hc8gs;XY z#H9CXd`+nAGlI*7v`5ar@($x7@0h|NLNe=IGlUVxQH%^geKn>AIhN<5t7&TOXdX&S@>b zwc(=S#%WzIB3t`ESll~$u|mrILG9O;rpK#Z=h<98&~Ldz$Ts56gMFSaTOvMxP@DEJ zE$5J<&H-Vk6<=@I9PGExy77 zODSI25Ha<<<{R%qukO;E(!VuMznxzkUY&GK>d@gIQj053E;_VNWce2ZnU(8`)wbjd zCapP~?zCfl!Lp7c|5=tQXPYeYo3kXp_Ulj9+XZa<4zCRTuijd#>G$%)udTbj`Cit91P9tsfTL$i30m?Xq`=Q2V3knjZVx z72kRcVmFF$DTZ}M<$GVfC&c;U)~f$Cf7C9uzQ6rx3-^q^i0)Pa?E>a^>u*IbVv`Y? z{Fl{fMWl1^#%UZ2r%A_)YL1N2W z04t36@q$)? zEQa4!4}r?U*TglCk*DiNno*U`ib+ticHKS%2bI=;LB@w(H8>Ir0`0Moi!apC~k-2F}L+|7x z-ldCq9`99S^Xk~@wzmn20J{m3bZex4-%bnmdKI;Vst E03X^=C;$Ke literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-bolus-meal.png b/app/src/main/res/drawable-hdpi/icon_cp-bolus-meal.png new file mode 100644 index 0000000000000000000000000000000000000000..97dd4e2ed839bad49d0ef8863fdaed02f4406c3a GIT binary patch literal 1470 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 SdS~6nr|fbRkGpdu_{{&vLYfW$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-cgm-insert.png b/app/src/main/res/drawable-hdpi/icon_cp-cgm-insert.png new file mode 100644 index 0000000000000000000000000000000000000000..699be547928804e3853dda2280f4c24b6f70fe1d GIT binary patch literal 1609 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-cgm-target.png b/app/src/main/res/drawable-hdpi/icon_cp-cgm-target.png new file mode 100644 index 0000000000000000000000000000000000000000..2cf826dad14c43e421002b9ba6a41f47d58ec117 GIT binary patch literal 1965 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 WxzWVPkeAYx&p9YCl-NM{q2T`sx|BZv literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-pump-battery.png b/app/src/main/res/drawable-hdpi/icon_cp-pump-battery.png new file mode 100644 index 0000000000000000000000000000000000000000..b4a4f2923a20ce34d0cd48461d286cfa73cb189f GIT binary patch literal 1233 zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UH;M^6{Wkcv5PZ$+<2EtX;baDHZ57iaPwo;G2l%1cw&Ri`h`+;c+m%#@6b zqRg02EgG6ZHa^c1XQjD#iJTRAsy9(^(gd3X7o!=;Zj<)xFnw0>@H* zR{zhxuVk*@d;b6b`0V=g^?&uN<%7I5mrg+;rkaHYPkMSnj)L!(hDD_2 zAAZbzoc-0D6^@sG?E3KM#xCAa$p`%vl3}dA?V(w7&9!FnWE<#;$mA*OhbnWBPA42ly!xL}V zzINI;DK5U^t=65}OYd>+5RQMS`=@E^D|XkMyIo-mK$q zrhZ@c-w?AG8_YUBuH3ugulW0pwU_QjL~88j$?wuVb*J^Q^dk2^RtK`*W(6eb9yPnu za=1c%_XnA}ys4F<`Lk=I=b0>@n`zVY+x0@P)R7rmrRHyudw(c1DdB#innu!{83NnG z)%QQ<`uH=_zPUE0&^7CxFxcJ+3hKv8T zUFKf@|MJ=-`|4|3DlSJ)dm{o&oni2tjg$~*vMBMvb>AUSCdm z+Sn~AekUe;w&+jDGN;SchZixo3187nQ=4i(m8a_>S9XNjQNIPB=6&+u;qEj0effUS zskYJ;S%;OMt>9Zlr8^q z$z!VPOL?UYYj^nMRJqrh*`_?Jm;Gi|ql=b&_x|QTqTI^1V|(@iP)X$J>gTe~DWM4f D948-A literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-pump-canula.png b/app/src/main/res/drawable-hdpi/icon_cp-pump-canula.png new file mode 100644 index 0000000000000000000000000000000000000000..e75d9ed81df18865567664173b747a8ff92c4fad GIT binary patch literal 1500 zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UG@A5Ry@kcv5PZ$)>6hRPiO*gyTG&&KY^wp4Lm zRY*xFRAy4uk)2}X*wtEuOv$JT@v7*ms0hiF~W5B$I{3Br2^Sfd`Xu)H{9($ zzfsS6n}k5LsgcalSsK$m+dRumGtxU0r|4sT?eXOqkd^t%dO?- zi^U#A*~B*9trHQ=)`>gx=<$`8N6q#q+dQ4kWOn>FLKD&vhl8L(v5kI?1dqJPL>|hj*i>9 z>DT#=GY8{U-+Woz5pj9*=gt`W=K}Xm@mcUse-!huu>Ip^iCOH@uWZ9M?01dq7BAc^ zuwSUF)q0glgv*+@H!GL@f4;Td zINLR@E-I9*yW?wOnVfRi-d!8w&TO3eb!SJ!{Ei)5Vxd6|R--nK)HG@ZqGINiT(VPq_3q*G&1R&OedBzn@d3^M$34 z{M#^7=eS{J*qXf+s@nQOlI;)u=KY=(e=R_J=eyJ-XB#H|sc#)-N2r@!U7F##hB?Vo ztthrM!B^BRsLHhi5@L>yH81FhOYVZbkDpS(@igQMNIzS5OyzW8*}cH zx0~2z31;iO6LmJYFR!P6yU}dZ@->aed|vWQG`H88ccVx6=j!ewmuF~yt+#$>xhH%Z zbLpbMHN7)p7MwG)S$e1>H#S4$b@E3Q_4>Wb+3O#uZ@l``N#)AEoOE_!lne~a&e?z1 Y8Jmw>+ViGR98@TKy85}Sb4q9e00{_3%2FU8TUf#tK!GGA5XdH^62PDWfrJRk z1Ox%KfGA4<0Y#_&fI&>x#yejoA3N_uh7lq^j>8h zWe^Co*TEi(mq(}Ft*9VBQ7$pFAke>@Xr2TP0q2Y%vlvFiU>1pD#AUGMeGtgZlFKHN z!zmmHi4sC%nnM>KH$fq^U~{OC2@Zi{+fYJj_AwC@j~EwEa!fcG9SpU!P&VUYh)sK9_gU!HfsT6uEwq_2G?XCuF9TXrpR@=tu8 zcP(27Z^Oi|2Pp~0|;uXSzdXcJ+1LSR;RMThP;@v%XF z$dlN-&A%IkAKGIGxn zP6eMEw;ew_V{bH zc5AJ^lX}BxKL<$S+&i^+v??#&jDZRAC|EsZlz(qroD>-$wiy_ z_@l~i0>dY+UI`Xa^A!2MVfnIC3)(zgyJCIy??$UmsOuiH{!L1!#~UOo z+^_NTt$94nfHxm0$g-8yt8`W<6%H5Nxcf7piEGr0{Z`j8WISZleS}rdRc2mYsjfPQ z`a$puUoGs1Z@QBW6utN^qRiwzjj()A?>1aZtb*v(l{u_|`<%gik{BF$tJ$N@O){;@ zF7n%B4zphWqD*T5N3)fzV%sy^E7KnLyvI~X3@To<7F7JVUV|mL#e@J~gK7Yp|)W`pDwLp{x|kK_xBW(gtjUm#kLaercL` z_AsV6b2_nk(Z{$pfp9E!-6^_e0drF$MRB4ZJcZ)6uYC!Xg@joZ8(v{pv}EnAg||`0 zj3yc4IQMXA|4^n0HO<~+9ZVKIFAYH9kCsVFzRr6<4-Ba)r3>``!5+| zGMjgfr3_v-{#89FohxweC+3&-IO5k07xYTNw5MS!MRpJT7CQS#{)MHa)K+Q@qiqUSK_~^jezHcrEshzWdEFKjoIDb@#y>h zWt)ya_L%FOx0$&^aLUNCRxR63KkegD^l4aGRWR(PEg1H29ha!wKJ?Fb&$89>$0VC) T1oza5-S5l6)&*N(9Tfj3ZB|4y literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_cp-question.png b/app/src/main/res/drawable-hdpi/icon_cp-question.png new file mode 100644 index 0000000000000000000000000000000000000000..65102f2abf80a771ea8dc89dbc4c45a75a63bf7b GIT binary patch literal 1220 zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UH;6Hgb%kcv5PZ^f^8k}PrH<9VH~$=AGQi!Rg+TBPzSV$y^ayw!_!-%OLv z;@*DyUe1miVy+r@7Q|=-N=tK^Pcaj(R^$s?8GC!)mbdf%L<$~1YQ6mPxp~Hq|CFWO zyKh~!FZ}&yv(Nkd??0=3{?}cA#Ssbp_qKZcF5%zY|8J7G$`hH_9f(?UkW=P({|}+~ z1o>yvvzKhny!mQk(XSiTFV08VwB<(FJ}5SS^e^wH^`55bDl=UpLw6n4oBdIDo3zfW z6usk@e{fyzS6tsXP; zmfX9@&*M|s!|9Cot-YnX{2%MJp~%$vvzZ`9~woZ{ym> z6-M3R5AOx%tQK6FVmoDO`iEl^-tO(L-&9d`;#-&tXXJCw?z60M*U}SjHXNRD_R&}8 zZQGT+PWA$^wMX%S`fBe~T zdyj(l`EP%(aAaohHr5f3j+t}lx~kROkjUBoUHA1bzEn9CwYFTnfI)uxiwdDs+x6uf zc1z38nwqKkUh~U2`H25x)yi|XZT@5*lDu^9)5JCJs%;ir*wlD(!d5@4uA39C);8b% zP<+xQOTO*$rN#ukto0>Zig%P4nV!C-HMcG9M(^{bCu%)`Y7K5Ogc0bjkN6p+S?^R4-xPn|$f)SKqhGHcyF4iS069 zs+@Akx!?AZ^4+WzuGiGO<;&MhJhySxLb1qt^ELUcQ7L;>&xTrVu2|n1^DC%(jq;`7 s<9{#h`(XU??8}(ho~+2}_UcFdiJNL3ZTc<#6IA$ky85}Sb4q9e0J4)FrT_o{ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_home-loop.png b/app/src/main/res/drawable-hdpi/icon_home-loop.png new file mode 100644 index 0000000000000000000000000000000000000000..b0f9f6ea2923a19dacb71380aaaed47d64d0da9a GIT binary patch literal 1502 zcmY*ZX;70_6io=5K@bYEwU+b)jWUppH7Ow?VTs5`zyP7j5+FiMAR!4RvIebG9F##> z6^fOz1S5+IIIbxQR)MOBELJ24itLP{AOvV)9jASB-*WD|@0>aJ$IGFDKKgJ=I0ORG zr}&bCRJ)&g>T0W2S1@G~0)hImXmlane-9ysn}A}(a-*3jaRN_u4}rLm#5_g}n<+#@ zGvio^L}2d59RR_KB?6&N{uqCrCo`Vqo5E-AO#x{!DeM@0EI@LHyNL-Zf&`|Jfe2J7I8aKWRnPIy?EOVdg@{1BP{<>o(ISxuC2~M<`Eh70 z9*;+3aA+LPUR7Z)IGiYCi0u;v)@q7>Imk>w44=glvbc!|H76sQn=B*(09q}A{-UC? zhyLnM1-^EOnW$l?Q=e}Pg znn>Q{MbX}B^pWcOLzszHp$Cn2fJbR zBzv)uo8%^#8)R3c{#EKHvzq>;^w!7cQ_8tDdfXf=n_>R{pm}(*-;(Qctvff%t>sm6 z>>yPVAYpe-%JOY&Z&)ys=|C$K4eLgI(65Hm^$3)yn9cL>p<@~Y2KyreTz#GfL=Wk4 zY%*C(@M~~asvp^6*-NIA75BhwQlL1fpxPTHpMR+34mH)Nfn0gMzG5^`+>~lgH=b{{ zqC<1X2Xdj-a#R#<8+Aq_vW0#h)|pi$XUdzT*U^%#->u5o^U;M5=r=ARLLa)J+Ml?uI$(7NRP_ zvA&4*Nv2X?(fX-hav1t|g+u0WkLMk)5}li1#+vExwRC$$xZ+UNYFpQEq}g<9XvnKk zlwHY*uE*&+_?8?I&`nzz1Y`Gg@5P4yTF36bE{&2j5b|wa$5k7D;+?(s4f3*Gh-{#j zfog=g20qnXGF{THSW#+m+Q)aT_h>l7Tr|^G4P;uUgiOXDEWGU1sHp!ZG2y;^u;B+L%_a*B=?YKj%5?%k2|s#!*}QRR85dyQr%vd zB71_C_fL?w!PdOXd@sVAiVkK&Y7fhP8xEW+lEiu-g|ENb|G}Uh8Ebw1N4!& zTCrSIuyz(4E0#2jH(TD5am=(Pb#l_OW+bp#?O7dzHv{Dj3nEQ1HcIeYPiSxAwPI!X zJSVEAui^+);i&Ay%QZ86h#RN1)8If_m58*8%@h2_iVMezn$70`A2xwEP$6KI+ieOP>)?tc!YEm_fU9%hxdA9pgTCFzK9ZIN4K?Q_|O(|$^6nE6>i&&Rm; zf~Zsqm};+&d{+zf4S{6hx6$5xHjN&PR)ZzoYlt>cX_+1e_I>Dp!G%Zt7xLoYKuFNI z?dMh{q-u)}KQFpEFknTb#!wbBXEir>% zokI2*y=<(eE}U-8A&uO`w%m1(GUg$rd;4vDOlM9N8D~_^x%9zAk5|QnVqEWErXcTs5 zDEt&K1@YY`qpXRQ6Wcl|a;ZFNX{xTSM4oqn5f#80?P+M+co*~ESZh_n{>VMrqGfpX Qk@{Pvc!A{lT~SB=0b~w_r2qf` literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/icon_home-profile.png b/app/src/main/res/drawable-hdpi/icon_home-profile.png new file mode 100644 index 0000000000000000000000000000000000000000..b288171332ab79caaea02dcdbf34514614b51d0a GIT binary patch literal 1797 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 NhD5l*Ywa&4{1@)n!xaDk literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-mdpi/icon_actions-cancelextbolus.png new file mode 100644 index 0000000000000000000000000000000000000000..4ad378e374a0add202bbbca73d029476d8bdcd32 GIT binary patch literal 1493 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UG@S5Ftmkc`H+H!3^ALq*s>^v|4pGpV~RQ>1mKtJ)>Epc`?^TyH5!%~ZW9 z@5+)Ud6R9HfotOyfxt&w0s@k^cyzN){p#+zgSjn=g)h;-R7ft zxpc;|@7=`vcI|CbQ=#JzL}eys-ELZLuy8$PGGd?SPO292xrYV-W3NVNNRzvS~f?A!TA&hoE*g6^ym z-EY&cs-010I$daY@1Stf)A%DNBj%jwJ&7( zJ(!#&e7$JDx~lyx;q4utFUU`Sw6saZ?SZaL%kskMe?DJqyf>rir$m#wp|g&I#{8oF zUyn>Qd=&8A*?O5;m&n15N#(y)KdrS)UX~zHC(ylJEAxK%k*VEBDrZi6ak1A!^|IGv z_dioLKJxF=^+>AUqxI%*$yDEzZ8uDnG`2l3bIeHkWE(0lcedy{Q33X@sWLs!TRL?G zwPW;W6|N|_9{Sd%)lO+sz2dp2W--0|t(E;}xI&aS$=?$b{1)ePY^y}Wb;B)ut!-Tz zeGbe9X+qG=cB8K>#JJ6y1_*w-@I?UBPq4QuA>s^{0c&XJz{?#$rpo%miZvlV_q!xC&*a$J9n*YyZjY>FA9s<+=|!u2&tr3>D>vSnVDtOB zW!FTaA7wlQFAm`BH9n$sb>RM4X86tj1R2LmH4Y`wT_Ncr@t!#1Vl%}GI kYC*t^ECkHaH>Q4&Kc@VAnty8d15jz~>FVdQ&MBb@0D^UiN&o-= literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_actions-profileswitch.png b/app/src/main/res/drawable-mdpi/icon_actions-profileswitch.png new file mode 100644 index 0000000000000000000000000000000000000000..eeae6ccfdb4e1e7479920aecb225f88eac9807d2 GIT binary patch literal 1143 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIp=bkQ(AsLNtXIN*1IEu9W@0I#wV7S1krh9#cQkdIDfh_@VbdEUbut*E$ zG;s-v)+`aw-P+Ns#L*-s7Pv9+;Ew}Ny@4!4Zoe+SRc1qOj^?~gTe~DWM4f5p>N& literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_actions-refill.png b/app/src/main/res/drawable-mdpi/icon_actions-refill.png new file mode 100644 index 0000000000000000000000000000000000000000..737cca8b004081172db6dae3f0021d3c2e9cc89f GIT binary patch literal 1161 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIppPnv`AsLNtZ}@hEhe{m(c)lm~l~+~Z=}S3*J-arPco|RNaLE!4+|0pg zo@&Ojc8zORkfSd5EDaYSULUS4tx7^JVZu+ir#)1@^o_{~Dc;08Hr9mr0w5EEcF3Qk0wA#NS+h%=fg5*2j@8N|a@sIyR z95e2JcjnW}wl&+2r)ll_sPruM`Cj>p&ABhU&%ZlTwx?ac$o`I(qV`9_XG?yw?K_d+-1=>?q4LuDCsNyzIxlH0OR76H|CFg- zZjQwKqdeLjfQ{0d4dd*aK)>KdQQnCTd_s1;)SGt)kA_Jc9n)1%CG%ZkTiJ{7U zwWt-&E_3TjPI0r$UDW#fqhqJ@Ql~cazj_zfTNi5UrCl-QjXuhMQ*qnjn^U+X@0HFI z;6C_u=2ss<=?$z&$zO{W+8+(fPEfMZ`S-|VBS($d;=bKSDyn$?tK9Z({U^fxQ+Mg+ zBRg)W9mzQ!C&=Muy>Mr2&ayhe?(=N(4u!YwTd*g4uHQ?ZKic2!?5$v5eW{f1KKI4i zB&Jx6ZHJhZ`jbujM1B?a1}TakJ(ix){p~@qjecMAy91LK-}tXmHhq3a-c=LfQitn( wzmGN^y7Og?KgW-Q3Eh2O?-*lY>F?1G{)IVxH;U(Wvw}(xPgg&ebxsLQ08v@%WB>pF literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-mdpi/icon_actions-startextbolus.png new file mode 100644 index 0000000000000000000000000000000000000000..338df773c2f8cd0837f81bd8044653656e98036f GIT binary patch literal 1249 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUKu;IPkc`H+H=@_XJBu9u=)Zc^tZ5vgE8DXcdBlgbtXkq?^WlMzs-Tp} z#8vG4uY^2{T>|861e8oH3OSV~?oe}o#lhP-X<4cFk+rT>_OC8!`8~OESZd?>`~R2x zpSkyZ_nZ8pP3h<^EK`*`q&Rg~e4+5X8}mOV zZ|*-e>++E`*DCL%ZsB-Yd$fYbY@SnDf8hRf8#ZZw#nT3N0>86QTlR@DBC>M*(IskD zlFhynht7E2&CBt9D!RjVD*K1nxd&&78F5a3$ady?e7X_y{UqZ)zta5))xyl?N11H; zb{?{}Z7=_zT6fq)rhjum+|j%Mot;r8s!ysOX0=~zXD_+`=6#YV-_fEwP27c|^Hv!* zs=20bi}j&wMx~_>0l4uDIfp9jnyz=<%G!w?iI@? z99>|}L8;dMN%OctVn+UR&N;V!n>%OXyxALq zYZmHwwaRqr+HU*1y4~z}*s1%=|83R~Eix$kdZSEx-%bD7E2n;XuVi#?QOJq&k9c0R z*6whb^DKGe;vhSxj*~z^H<{^)`yJ=}N$!lCK9Bv8#K!PV8ls;XIsQCLy|G3#@cli# z{d;H4Ti!Xjw)S0%S1V74M|t70yVXi_R(Ab7xWD~X(nFcB=YA_fPU!9F$u5Xk_I5$X zr1qo#cKSV0-t2PY^Q?k{kykha-yJNu6P{q*;JQOJf7!07Gj#IeH?35DB5b4cZ*e!* zoBIL_Z6-#<>V2B^=C9-5=qa~9D9$srsy+KKXd>Sl(fAb|yPW=s>^yQk>HL?Mwvn@S zrd|H5wE9g6Q>01Z`mMstyO$O%_o!Siu)N-US!c)h;)zWBk9-#MAI+JytL8>?cgyvi z%>La^H~GoTyWLVgyE*u1ZPgg&ebxsLQ06nZ9yZ`_I literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-mdpi/icon_actions-starttempbasal.png new file mode 100644 index 0000000000000000000000000000000000000000..18fbd8c1119ef94c546a23b9ad17975dc4123225 GIT binary patch literal 651 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`43D_H=O!$!L6gV`J8#0Ewd?_lHWqTp(g4TB2)J`myki*L;UxB6)qXyMJ)_ z`Pnsu2+Wba!{W%YbP3-{1*f8XrwRQ9b*EKNp4@vsQop04!=p0flAWI0f7kipth3~H z3K#6D{b}bTw|!duvNLgwk{_N;{L9RC;7IxBYO$Y6S{vE;`f~UslDC{l-c!d=?EX#s zMas=TisxO#R(6+wlzskPr0ymbk#=1%!V5>N3 z=rZYo@pY!M@bmKzln31ieZu3@xbFEwz37CO6Mr-Qa*$pje3x}S*DOaD7ndh-db@?C UmMFDa%mt+(Pgg&ebxsLQ0Kz-w1poj5 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_actions-temptarget.png b/app/src/main/res/drawable-mdpi/icon_actions-temptarget.png new file mode 100644 index 0000000000000000000000000000000000000000..39170bab37f0625cc3372a69bcf8c53208ca5645 GIT binary patch literal 1364 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUBc3jfAsLNtZ`7`to-D!sp;hvmDb37uvs_;fQ3%2T%!MqZ>+q?7oNLo*G0YRhk-rE&-a$pr2PN+ ze@E{8wvbcp&4qe=FVA|Gyp#Ga{`V%NtHC>Tc4PJN8{f= zpPC-imA>X-kIZD+tP2&UCHe%io-%miV$=8DkcYp+KCVCB_`Q9inA?(V{tsU$d5M^& znA=RecmAMz=~w20;HvpOwy$5^7mQvfFL(G{rKo1s2@#pb>Lc4$Cd%8WY`d)LS;oB2 zZFa&|se6ZNE%>HC3tiHoSX;om@8Dm_pA37{d1mxxPp;9r6+BUE9%Od?* zpjy9TFspU1&;7d*>VJ;%2!300TuUbU`gT{180EIUE9J8H{5M^U=shhRsO7)rYOCMF zFTWBs>jbXcYKe8V*(x~u)vtB_Z~G5v98B^KzN;`t@y{u)np+(~l{_zf&O7)V5l#9n zu`#;t&&w;)Zn^uou|Yvn|0YCE0xkyO0{MiZ~B>3ns@R9pMcxf^Cy-) zv=(%@R#2s7{TbwX)s=fRly5g#AF*8Z_v+tE#S=W9ht!51>3=hnMQD)@VJSJ~#HmeCqPjWHU^ zJ^OurG_tdDUyaXLgcmy!@l}gS2h^^$nnW1j)Y%ZUI`xkB&6O9EG8KkJYD@<);T3K0RTA9 BO>h7J literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-aaps-offline.png b/app/src/main/res/drawable-mdpi/icon_cp-aaps-offline.png new file mode 100644 index 0000000000000000000000000000000000000000..dc506538838555fade6e8bee85485e3693d4c92e GIT binary patch literal 1361 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUgPtyqAsLNtZ)A6bq{=IY}Q=M z;&V5fEaD|*RG#~6^ZdW{|J%iFlOW(ff9_eeFMcyV=HCePR)2S-ID$_({7n9igcA>L zUoleNz@fg#S!s#n+vdzbHol`tii_C4FN?K^kh{qqYr(;;mVA5id8;=oHm5E5aKxgf zdGp8IThd~xPa@{Dds^_iXU?gA{n7B=@!L1n?C;Qw5^%IrJX|Qc?&uGz>-ER_Z%q3m zr}k*S@Zw45U3bXWbLrQub@dN9p|nJJ`(rkl2|aHGHvZ+CmXtcRA*!uY#zJ&D$6;-y zWeLqE?%rK1akXng*_k7EEi5FXyVN%@>|b{0d3lY>ykEX2Z$$ZsDjj>sYtz}j!FX+9 z<_j^yKRX0IDlY4;sfel)6y@{&W-S-bwLZsV-Cfn9H+DMS&rDQ%CzK`rh`iC2UBD)` zZ2Ru}wS3}<5rT%I_d{d%^N4dNK5m`CJ^QYLZ^qkWLT_3lf6a@rReKOKr|-8&qt)W7b)>dICD{|tq1$G`6IoAR(xqHE*H@1{y~%pPSt ze5q^tdHbUv#j;Xk=FcVH$|kO{t#IhL(e`tP;N-%V6Dx(kOueGN%4Lqup1pjVUB9kM zut$xE3)=) z%?g=#{6}X+tjsStQKc|W|1Xb31igw~<8(yaCq+exIT|`yeOQnY^E~|RPOplj;7_}G zi$AE9J(Rh4cfO#ijkqhvOx;5(s@8X@n}zo39#?kC3I9|(T|-R%#80olmI*869k@u?Up&7>G_8v(^kLc?-MAB6>Z{$4arpD7 zFs)m&dELDT#S~E^|B!k9E*4k26#D*V9^+D6Jz@KijY(2bP0l+XkK{?R{w literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-age-battery.png b/app/src/main/res/drawable-mdpi/icon_cp-age-battery.png new file mode 100644 index 0000000000000000000000000000000000000000..6c7fc5613931143c3d6dfa0ff4ffca876523f5ba GIT binary patch literal 911 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`2qx_jGX#$!L6g{rqa5M496sub)wv6sm!NP5s0F zPpH0OlF+8Wx;GIVuBV(LJz`T7O`l#W*m>+xrP^h~@^dq*)7*m3@AjMf+-Cms>V5M+ z+dTj2s5H?-MX1w7Y2pk6t;(jd-FJ81?U20UJ~QBn`K*f8qdBQdKjq(Y?R|47a*fvP zhYco$lJUFbzZnIoY?ShIdmCM&Ge2H0bm4dNhZ=cLO*N91DDo^9TgP?RjxX*p(>5`| zaPADNzdJH&)E>A$`&+A-l%gatb)uDDLT+E4=`!vY3G&Z$jI;Za#BQ}+p3!x^bc^vU zwzQ3s+dtZ>r^U`F;BbDI7-rz394d3rvHtj19=^wpYvv!TJNU*s=J5JCJAy5)hrXNn zc|%Xm0m;O+%!kZn$96dz&XkSlSG{v|bJNCbr}JM^CEUs$TRi*7k>8TS|6s-i>&=0? z8)jFSJN!|tnU=h)XCl`&Zs%u0b!o5Ux&I%F(b<2T_uv_YnxmpIJx}L3Z|s@4?ZemK zA5~sS?a;5eJM{x^dD5Kcds!aeu(s8`S;xEW#LwkwiH6_l~pLa~ZzTib=O4yAeky{6NCr&Gn`+4Q>hBF7dHr#kC r_|5%s0;7HkU+5RJNze!ZQvbW{<6I)%OLDAe2IV79S3j3^P6?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`2or^K@|x$!L6g&DUErP=et>`kw})-vX|Sqqp$f64@dUqq3#&@-bKL-|~OE ze+er6P}XXicF|~s1CP^1At%kFIfeP%#jT#l3e$Wfp428tyqoj=Oy&KZ&(BCYaVWM3 z011{8ec3O*R;B)3_sDA7#;XZ;*k>G_+O(~9&+*xd`Xa;Td(##3Q&3^C7#piDf z6p1O%ialh!=fL_qUkhJqmVaPeePe3ZyC3ysn{}$=t^|CSmwY#$zc1#0qwAexwKkKw zXJ%RuL literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-age-insulin.png b/app/src/main/res/drawable-mdpi/icon_cp-age-insulin.png new file mode 100644 index 0000000000000000000000000000000000000000..5cd8598faa8740927f76ebee31ab4d67e7622241 GIT binary patch literal 1073 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIpg`O^sAsLNtuiswnpDA*j5p0ApB zzPy(I{CCBP9x6heE=m($w61w^q_3}UlS$8k>OJS~8`s>^Io;(cbE6>gsASvI8Okm3 zhk4f=tG}`I)Pj3I#N;xajO&hZ%Lp}zCwpDp!)y_MMfq>;iI6pi3S^F3ZVB)0Ke}F` z+5E<&)SIi7xW7+VT-?HV`J;Z{swXb##~yG0^Rr}Hs;;Y6VFKlY3)znYj?ak{X|y()6+hWU#kyw9Q^r1z9OXLFyq&kZ>Mck zGP(9BNN)wN{nN+EE=Q}Bc+M8M9DU*67E-+|T5j5$vmAhHD#Qu5t z-<0(pNw_8To|rf<<7kRpzcYb4Asw zpHGSrjBr~2m2r7XhSL|5iEEm(BHB65|5Y-Vx@2@kD$4i96z-SYxfa^1uKahk)7X4{ zRtN9an%Tv?x)m{}-BY)H-0u2!er&-%=ZWmwe{Bd){8iN_bBt%|k@tPuEfl?qs`)=l zIoaOL-)!N$%jYQT#j={Uhjo4G?+BdlydC>>XQ4Rz*8soMi{>rc7(3;{s|`0FOG`NZ zz5Bj)&dK@lk7DP({yNj`j(~B`;b7C4maZTZcW{aUC7k!|{Y(Oji&y?mTLH@Hp00i_ I>zopr0Jv7e)Bpeg literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-age-sensor.png b/app/src/main/res/drawable-mdpi/icon_cp-age-sensor.png new file mode 100644 index 0000000000000000000000000000000000000000..d312b6c57297851575871c70ded755015ad87e24 GIT binary patch literal 1352 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJU9iA?ZAsLNtZ`{s~brm`O(f{4r-q72#9<2S=wB_Qmdybi`-4&GrN4S-K zX#9Hi|50;((}JdsMI8@#0|f-Pg!CSqp%EBdC1`RnY7uX4Qcc8WTWf3E>iNpY15)c1 zea_9Cxi{_Xtgq3V`As3X#C5y=?#=|Ic$VYIdJe>U->KqrGU0Xu0SyS)XM6!$(8AU$iKPcgD^;+WvC)>nR#Z zeaRKBPY#^DG3T{)>-!=zua_;#H#g2YGG#|yj?nHo=@BaL_pY>0c8dw#wQ;*ay4u$1 zVY-WS+|9bG1LsA~(K&OzEZghF|L`52D@pYwEgbwS{(*&1I`or1Oo z=7xWBJ~VN!RA)qF>1>0J-L9$ehoq&Z&aHTPOX*Wu)zvplZ>@?X?7O|JC-l_ZKlW#? zl6>2dyziYS_N@yvHsV|I&3ma!wz{?)9|V@me~kG^f`$h*ksv~6?muLE8)^G?|prZ{?h4y(EQ>`t@j z-`gKMZY=Svx%H~~{M7Kfb%n9__51Fb#7)v}d4B7>qpKMQ>mBuwo`7T9*M@BHx^`<~ zVBzGmb$n9SEJW2^__j_iuirea?@L#<*S{W}?j`cV*XM0pG$DO$aY{&xow$pty;9r) it(B)H&VqsZ{{0L=Tt_yCtLt6?6@Z?uelF{r5}E*`k5owj literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-announcement.png b/app/src/main/res/drawable-mdpi/icon_cp-announcement.png new file mode 100644 index 0000000000000000000000000000000000000000..6e1338ac2477afb55718e21257fd209a8cf6388e GIT binary patch literal 1286 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUGEW!Bkc`H+H==uDgJq6?>_5HZtE;t%luNhS+8t_-gj^m81#Qnb+O1KV zZR_DROQTTU^>UQ}|1HPWiY*$=Qm#w*TY|201l49VP4qmfs(A5Y-{Xh-(>Fc;Qeu?- zzV=sA{p87|=i;*8e*Hi9|G)p&>vOXp;LSv%AE#4$7roALwD*&L-6AZmHZ$$KOLNzS z&XW=u&y{vNpV+ddcI({kH++i07Y@uS(+gTUfzv{=-8A-o+twc|kIwP?@}Ol?cerZG zHiHu7x+7_KRC#Jyr*E6FnLqAO>W*D&7(+Q`HeJ0Te}18~?2AKccUF{^#q`Y^X?<&K^Sg)<%NAH2QuRnJEC(bDjoGVi0$EL`m03C@1`N63sP*zLq& z3l{AU;qR)PCAM>=KVTMAPB%aMUM%(O9*}g%iL*OYfA0(L{^$5`?NOyZJ3-UXd2f}f zeZ`+o4H6MFlJ0+A7q9wiO`6oAf;p|S6@e0UF?nY$%r9_Zw04`I^~A&`e~Gx-!-av* zzC4K7)4=^f)K2{Cb(x2I&vur*ad~BTN%hqGG%*f-9V4UHK4Q?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`2o*_H=O!$!L6gV{f*Iqr~x#=PUOuXid`fkovtvQ>TXU;IU(F0xqmar=MbR z2{2itq}D68Z=qvgAh)aZMxj6KNA^2x5!%S1#nn|Mw%NU}VEXQxwr9l7Z@+nWW_nuP z{=4bvY10)rnn37TBFTE+1+rM zRP7~Nq08<^3A(*?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`42&@N{tu$!L6g-J0uAfJn>3ctIT&&WKwPI~d-+xzn^`T0^wJ7O`%fW2!fP zYs574CMb4@dFr?n%a}e_e?GaG;1$# z&wXusr7LfmGjjxEZvPtr2~o*Uy-K=|gp3nrPV8=|yQp|yW0Doq@1F0^jpWx)v&`x2 zidd|4ZAFKvR#Gp5dG@@>$Ddbu8!j0C_A+)iV_0_bD`UhDxi69HoMV>EOJ0~Bp78p_ mn+8S$&v)ieG?YN#ll{BT?jp+;2ClsWN+6!DelF{r5}E+C>DLJW literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-bgcheck.png b/app/src/main/res/drawable-mdpi/icon_cp-bgcheck.png new file mode 100644 index 0000000000000000000000000000000000000000..0cb14c2f574f22b0fba26b9b3bd876fcd2a4b3b0 GIT binary patch literal 1233 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-bolus-combo.png b/app/src/main/res/drawable-mdpi/icon_cp-bolus-combo.png new file mode 100644 index 0000000000000000000000000000000000000000..ce4d8fb9d39cd1bb9238c4c67b51af26126704ff GIT binary patch literal 687 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`2q7d%8G=WHi3LZkxsAC~@p#eUi$p9~W6?E8KJ1u*o+weR;wL0q*<>&KzNJ z2TpNkJm$>N5n>8k8Fb@!;2RbniLxnodk=s5lQ6UNdFs8&h_X-tK|#TZOYZ#L`{CEm zuky9t2V^oVUTt#_uK2&xV5MCoxBR19H>XCiD5f1K_lV_}U}C=Bw4G~`>0{{)d@Elw z&h!@B)4xkOUZW#FNLZz_y_Vz3#yz*rUwM=_%VmPzLAS&ECU6y+`@Z_Rn<38W+3y1u z=h{|Qx``Yy=XxZ~`mwj^hnr(f^6#}%nLi0$+w)@mOHsMTO_ui=tD`6Co?s8?yixOd zhW)IM4_4e}mMv!RIe)HxBda9i`93y1?c;yW^hmqM&VG<5a`t&@i*08I5G*;uX(cMt UvoY?tCMcbGy85}Sb4q9e0NdjHVgLXD literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-mdpi/icon_cp-bolus-correction.png new file mode 100644 index 0000000000000000000000000000000000000000..582472dc9273600f30c9038e07b0e7fc04b739ba GIT binary patch literal 948 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UH86;Bt(kc`H+H_mtaCQ2Omc%G+Ms-<(vi47Z+rkt>MIMoznCc^FADRkH= zQeazGP+D?^*U3X7%KOVs9qMm2nes;?XT}VX!x1*+yDmSuSA2e_@tmW-*IwTHea?4V z+xwsQyf420eS(LIP^XL1M30mULGK?O552wl*Y-qpvt%~50>S>QE%UpjBW4%gXUsY9 z`l9e>`R~`>8klNdveI#quUjO&xll&_ir7sx6}`vNy=J*LT5TI)VrNxQOrd$?Uf?|G=|uM3T$tncT~j=7c` z(LY;4%ztMn&(t!-kFuwa?)j-MBKlL+h*9}Q)8UFfMMLofui%SM7reMo)n1xhXMZqj z%@N%kA<^^=Gaq~ka7o#?Lhbpnx%Kgu&mNlinTki*ed;QCq_^%-&kW({kD~Kk!gjfs z?lwpaG;@%f=oi}A{OIKO$L%xJWh*+Fr<(nr;^sPyqccuM=>LVk6VL#<&^_pwV8T~4{(b4~8PAt|=h*8O(ojNqSk zD|Y?=sa@&n*OltEx#!AGvzVWE;w>MnsW1?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIpHcuDFkc`H+*S$MJ!Uc|fyl;_I)8p|-p;2+)MTZNmlM+ipLSlZ*IjX`^ zqN=BoqN=r`gR@J4QJk|$BO@%Y=B(1isr({=M_L4$no_kyHwbnqv8p?KB)uj5>6q3Jx%vg%>ITf_r#V(FyCLl=wPkT| z&dTF1g6j|6Q&}fvRS>bKCo*aC5C5Fr?%LF-6z`}H9RhaJ)gkX${^%^S^!>8%(3IX2 z3V(Ee9TxfcO|0veMR3}~?HBmdUDx(ped`f?x?_#N-UrbWk9&Vue9Mw?{f59RmrpI? zpW1suvPUTTh2ojx>J4|z=wUh7jT+vcGo7DYANON1jlM>rG3VjBX4fb^uO1ei) z{+n6I@P}dll+f^|;Fng5L4x;MehB?L5^fRj=;x*w|Lfb7j=4%bGPo$e&u@Rdz_}2Y z~4u3feBGAjO?$D5Ue@qI7Z?BUYaefZ&oS)N+wjSJtL2POk( cYAEl!&bzq9CFlNA6;O8eboFyt=akR{0IMIf*#H0l literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-bolus-snack.png b/app/src/main/res/drawable-mdpi/icon_cp-bolus-snack.png new file mode 100644 index 0000000000000000000000000000000000000000..b2ba41c27d3de3407300dafb9342c2cfacde1f93 GIT binary patch literal 1007 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIpcuyC{kc`H+H@rJM0%eYW?7wc1VyM*9y6B0d>yjyZR9zO`%(PL`lz!tg zEm=L)L^mFdb)H&^8+hFdICEDV z@w=n{Mwj#XD;F=t+#4NFB|`7aZry(L>*JQ<(nZxy@pldQi$8GvE@WF@xW;1rA(b!3 zjTKqXKgxddWaYgR88L!P^E$ZB950kPs&MC+-5J+-#}Arw^xp(7sZc)Ln&9`taB70p zG|t92k$nrZ@83NBAi=QC=-zZ*rPc{faSY!NZ!_FLmjVn#paipyN zRQZqZ_C_|_(`-W8DS~+~euPhXIwN4+@+qYP+9@{c+si_%`YA4hCtJDZi(~JFlxcZ#!6v=DGjw$_Pj84@ zQL{U#$wTqUk_$)8e*We%3(D|+^+8RoBP91v)E6O_(Ell`4@G?W_wt{KqOLyoY|+3a zQ4zMHL91(*KVg{1aZt~Vzve*VokJmO1b%IiO1!MpHAVXf`=Lcy!eL1(6qd!UaO2*v oWkam~yzE2ETMSd+vCep(L9?w`Y2`JMC!l=l>FVdQ&MBb@0F#xM@c;k- literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-cgm-insert.png b/app/src/main/res/drawable-mdpi/icon_cp-cgm-insert.png new file mode 100644 index 0000000000000000000000000000000000000000..67c0fb1ba2c90b65acd7d81009aed78247e7ab3a GIT binary patch literal 1156 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-cgm-target.png b/app/src/main/res/drawable-mdpi/icon_cp-cgm-target.png new file mode 100644 index 0000000000000000000000000000000000000000..86ce00442ccc8d91855e740db8ae07744d6e3d30 GIT binary patch literal 1295 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUdQTU}kc`H+H!?fILM7Ng+@BJW`DVN{8!I!m^j%k{4%l&)5=SKp<5f|6w3OPDBzJw#R^twy)usA_c{``DHLv~ytC~jc)d35*lyWN~X9Rs# zi93An%6{(Kn?Fh$$jWA($(j=!)~VHTr#E{8$L5XJud@&Tv|u{UH|x8c-XTAef(l91 zQ$mvMtUn|^8~-dgbFh4d+LSvQbN)=pxx;qmNN18W*J7QCJDpDM=9zKHBT=uPBR&5? z{+Yu!Bl9Mch-1#g>12 z>N-`^`ALXO`_q|kJnm?f{a>vT-K>7;_q;3nrMIVi4(k%$yJUq?YDdYE^m?_~ihfy< zYQN>qr@gh`7$zV&FXi?|*6C@RrUj^Mp5MY>SdwLa>9fAfqMstkAxzb6?N3MRCML^?sGjma)Gl}Y?ad!$cN)w;BnP^l z5_&1R+v0emt7RS4$L$=G)+p>%@0D&85B|@bDzb7>#+xH)5BCVOfBni8e?!Ah ze|?jCx37ip_wGsi3|1*@3cYi>{E@7nn>%k*a>1n8E$3aCVpPto6;zEq fhvtL-y8jqse0IH--h6i&s2uZj^>bP0l+XkK{0u4c literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-exercise.png b/app/src/main/res/drawable-mdpi/icon_cp-exercise.png new file mode 100644 index 0000000000000000000000000000000000000000..1c92c0ebb54905553278ab32a3b392757b9775c0 GIT binary patch literal 1464 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UG@4Nn)xkc`H+*K5~IPnKZ+aDL^pkUj~`o-2D=d=y<2^@Gp6_VQRPt`aS| zv2yMWqf7D`OBZePc&dAOcIU*2)AyV?E#JB*fbbgC} z<~uGir|a4e8UIIbFYzxgwPe_m!Il5|KwO1j|3YQI157eE5A0$55j5dH>*|Z)EDr*A zK6rjH#-;C2`wkxd#{ys6ylvXeO3zsH6@TF4JNomaTl$^$*_VU4&pJK{a$Ll$cS!a| zUw@%=RmX{GhxbOz&&fHp_dhrP14+jfVG6S*d3g66uc_&s7ty2T<6`b})ag#c!PJ~N z?U6tB_L-(7$j=G0x)9>>?Xc3F){`%qw?68qZQ0nAV9j&%`;2MFjJJ3`w!gCZT=~oG z&MzH;1zsx7dE30&W$LeBmA70qT8ruh(vpqWxhy>~ecQ=%@|kZss;<47RadVgdm~n< zc|**UYm*K5*M8`*IKTZt)|sOmF&%{!^5xx6>TJ^UIomoP2X}R)fNEk3W3h9D9?J9us@+4d2AlMfbuV zC&cKiy4H8c{QBcq!JBbPrEL*F3Fs_7wNKd|BH!IN(b$KZgON-}+$#r36&t~!}C@^{5$TYU3L z-rKsOOyuPMoV+;eJALLKL!&-(2HKnwTDe+T_16l?MNYcjeQ`=tDwbIYO)gN*3)+27 zUTxApQNg##u9C5{JNCEgKKf^9ZoYo^h2@+{%crRsIlHWsn^8N%|6AzE2L^>{#vvV6 z_6+H(SFYlAEpby*PoKu=^!>?!^A>J*^gHab_g(1ibqXf|VqcLCmsOfi2 z)Bdd37n&>^wATLKWMmtvxyia3mQ_J{_FwT2>7VaD?Y#P+p=fS?83{1OQF| Be}Di0 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-note.png b/app/src/main/res/drawable-mdpi/icon_cp-note.png new file mode 100644 index 0000000000000000000000000000000000000000..7c8663a4fe54351e0991f0a52338bd929026ab63 GIT binary patch literal 1307 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUZci7-kc`H+H-2`Dr^>K@xc<&d{H9QA*(}GzWsZR&8-re7)D?Af5ue-P z*%sz@(OzJRt6*S)o70SdOOBCmXGw8or@D$PI|k33T`fL+*WddETI&u9>D<2T>l^;%-DmFE zueYx>S$8Dsj3fKIj3eIdvrb%%=;)o%m}k><^XtBfh`st6joBY{_8nZ36w_-uquahU z#8*Pgb)C3S_C-CFSq8G!8=3n%yi5}{I_@;2f0#PqMuV75@9F|MzvE^$eVJQzjBdE( z9jmF)Q!(qZ)<5ucM$^X5{*R7r;^tMG7;VTuKS{|f(OySLRPCXyOy9XjGiToD zS#GfIOj5Jxo69Nb_J@A{U}S&bI;XApqokV$SDx;(YhADRwyfO5`Mc$yf|0EM1Lm7Q z=NAaX9g{Hp;Vsj+)FR-{yVs9u+EO-5O%=;EnJ6i=A$A8xw1Ld}hY^Y!`P?}>rzPbz zPpD;`TqqwlHFC#9L!)4iHHTWA7K!FR%DDNp)G4F#qtEUM782{ZJAZ$4xOr51=?NX1 z9??g)Zx=}1)9SHtU-hG~B0B4MiYLR`MG><#0%x)G20roAOq;vI#iK`{`S+jw(#N}n z_KOwIE?B`*J^M?X>BI$fO6A_wAKCPdmdR+cnRg$&|A-|pd-IaJ?^WOG9hKZ9$$vH3 z!`3D3vE!bu(???69?pGKvq)r@p;OLekpuFs8&fZxJ1^w=+G(weTDQ;=w?As@Haj)d zcp2JwaC+*u62-C`{e& zNN&(U>87X-6Yqku)8CJVWx7`#3Ed`=%x<^Qy1RE8i$Rpu|2?~O{v_}B1L?x&DU+isNw>K;$` z@twb(_v~I^*u>-`2i_+AaQNbJers?{_70U6M^(p4*IV5m1@ZZB_U-dYDJ-sxmr1LhfB~Vp& r{E^aYBFFpOq(fnuBH-cv*8L1IeHVCUemZvuRHk{l`njxgN@xNA*JdlK literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-pump-battery.png b/app/src/main/res/drawable-mdpi/icon_cp-pump-battery.png new file mode 100644 index 0000000000000000000000000000000000000000..f4dab169a8771dccfbc3ae1a0b1460c9c6542080 GIT binary patch literal 932 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UH85lQzH*OZvR_shmeC&V7q_rn9m$i=b$Bd(u8)ZNB_-HRXbRum{|D0;(XD%7xi>13iv1N;}&Jp|e zO?S)Gi(4P92;jBvyuIyvA!qt2PN~!s$#)N1KIE1@P)nPhVO7Zbexum$4{Awok>!!?r5s7x_Tm`B~8HpRRjs|3ni Mp00i_>zopr0H|GjJOBUy literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-pump-canula.png b/app/src/main/res/drawable-mdpi/icon_cp-pump-canula.png new file mode 100644 index 0000000000000000000000000000000000000000..ee512c5fef5d4814b63244e967463f28aae26810 GIT binary patch literal 1090 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIpO`a}}AsLNtuX|^RhRYoP*uUOswM%AZFZbG{gJE9sP11@Ab{j&Qt*^&k ziQ2ScsdVAPWv!Q-uCo?CT(w)_2Zx$e$RZbUyUq@gKyT-btzujo1G{e>txsBKIP;9p zyS;d-5WUN6J_J%m-|~!du%(=GJAt!cVw&k z4;l81eG?^rFz$BY@;&A?=g{vA$;)Qk@w3&G=Ra6I$uQS4SHFLbNp(-o+Q*yOKHfax zx_Q6H#FAMZiE|wJ{Sp>z+j!CKS>jrW8`2-jPX1tAeCYQRpOd{tn|R~9W@UU&+iGWyrg?6Rb#h3|MjCRUv@0`xBSW857ir+wmq)6R^EEzd;i5o z{Z0G&ZLBBAOZl$cUvMd7-G8HlzuP_-+Z{PN$*!n(%R=uzpOqi!r5`Up^dxFy#NLTp z|EmSP*Shw&JVwB+yMSl*)te`TCvF%1XwH{Q}7#8_m zakgHivFe2B`S%>fnpO*bZ4@c?=9HI52*LQ;;t a#(&0(YBg_)^~7d^vc9LQpUXO@geCyI>AyAr literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-pump-cartridge.png b/app/src/main/res/drawable-mdpi/icon_cp-pump-cartridge.png new file mode 100644 index 0000000000000000000000000000000000000000..70a90c596f527fb62bd63ca439547cae933df4a6 GIT binary patch literal 1305 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUPEQxdkc`H+*E2gpQ)P~SJnuU<=itU!3s@H!W#?=*TGXqdl(E1(a>`Zi zXpN|hg>4zlrvevmP||+w8z$iCWG?9R+Vz)G(25mX3_`k=oj78aa>y*L>SO(~>e;*3 ze|c2%u;88L`Qmw>|KEMSU)Bf;{*^z`;_Z2=%~yJ;t+IlnJ%M*xf^eGwyZ?i|_3|^U z!#16Gq9+m6Yy5%d+>!H#eylF!wL7Yrc~9ocPI-#cShdTeif)6Bk6^!nr2#2*TEzQy|vY_;H8FKSyYdv5KP0`u0GM*WQfhb26Y zU*r0`|9J0>Y3qtB99d`YR(uk&=CJgPHfuxaZ1pp*4^|4l``cG@@oT5WhCAL?nkhDX zc0zg^d5kxT)K8yTFL2MNxa+0w^Zbnx_S32()my$isB5)|&@X$ijmvFM-{FnS-5>t6 ze0=$`rl({5rY+GYmMTSvKW0C3v^9yHt?Sv>#H?R`=bniAAj2p2(d1mo!=(DK>cZVE zb95dl%;%9j!uj%^P|h)~zz+`uZRXYKABf!H!Lcut(C$1+g%>c?iHNKFfFNTg>LpnA^ArhdoF1zPM+L&`-uGyJ3s$p z^6E@AkwQ^tLKnSwd*tw;sYMa3Z+Ao=Idt)mDF5NuB=%?_BhkrfcXmt6=bV1C_w?k# z-L2Vcg*CU!SZ-_%{;=rA%Ac7z9#>}QTG;oV7tuYFq3!hSvG~MHJwd(AYO?MfYU}0S zt1z2&C#*lJvvKy~9g_VI?e^%FRn?T|2P$5jwm9nh@2MHW5BN74PySFOv@v*#5Vz~u zjF$T@`lil1u9`fI`u=F`EI0ETfAhixHf?{=%C;e}WcAOIytcnC<<$)w-yCgLyLGK~ zGrcbL9ejc#FaL10o5-e^eaG%BTd`bWou9jLkJgccN^dfY=FYkj zee=D5=4L^&M>4rR%~@BppGXH*zD|tz5}3|y7`t#{+-uF6xYU~d7oERcyY$vZ$u1F8 ztbeGswD$ZAgFW*7uM%WJ7GHc<-h4@ahwh=Nw`MMrUN+P0A7f2y$=%Cp(NT*e6_s}c k)m(ZfbYDOc2A2L|u4mu%a%-cB1gJ#wboFyt=akR{0B$`g!~g&Q literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_cp-question.png b/app/src/main/res/drawable-mdpi/icon_cp-question.png new file mode 100644 index 0000000000000000000000000000000000000000..5d430d91640854e6249ff03e6ee73687f4d13f42 GIT binary patch literal 913 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UH8Mo$;Vkc`H+*Zn(s10{}sJU?|~fY)XPpOf=Vj_Rmrn;ywZ@#-?+=H|Ys znflZ}C&e@KjMrJG$@Uu)m4n365_MF}atxNZ1f4R7=`PMXvm-0*UhzBKbLF4sM8B`B zJOAGH`JK;uM7Ua=76$w%UlHmXu>YQctMs-6--$r9cUe9wUH2NM%&pV%R@43WnA&>$Kzw=4= z7D?Evtx&v~IG=ZRvW(}%HKA_1HYoS$FY~y;rTlh>O3v%Vhk7f0HutU(t6HnK=aAgO z)RjKQy(W`N;_ST5o zm2bX$YMG(t(Gw;&+c!tdk5qpx`SNgr%zN>FUG`6ePVZEbu9Mb3u&O62vX^J(4)=K+ vviW93d20pN2;cg)Tg^ul93>im^#3p&*%a(_WKrZMP)_o6^>bP0l+XkKMX6`d literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_home-loop.png b/app/src/main/res/drawable-mdpi/icon_home-loop.png new file mode 100644 index 0000000000000000000000000000000000000000..5240cc85dba134c10ec48e96acd974b57890cfb7 GIT binary patch literal 931 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UH8VNVywkc`H+(`>WF90iWoZ+Gj}?-dMD$x0N+5pfCWh+z4{vQI=T^A7`; z*sadkGwlI_EhaB7bv7j|>=dZx)wrmXCDPf|`tSIoFx&p>c`4JMTh9J@@W8pd=iZ#T z`^MmbMc-pE`dqIO#Org)@;So>^L6&j#j7Pn6rar5T;}67HCyeZO1IH&vEBP7&p6WS z#gul*cyimXi5~i1*#Z{4GK|}pt~cf%U@6$Tt(@xzOAWgj)BDEC2X$M1N=I}rHBGoA zI@vB{-;bw1@)mtl51ah-MfQTXmu}@;@^N-Z{`j~1h)dn+9?#}nwW8h53j98|5-urD zo@O+8=hZN!f~*%l149=cn0(SbGz;FB<}5n*|EFM zcX+PXuCAX|vN7>~%Gu|0uk0w=bxp}Y=Bj9d_}0GQWO)P5H~qh~ALQhoS3AYGP4!iN zm%z6rN2X5h2)z>dpkh@&-x)^t$5E~vuY-DuXMH_>s>)naesLqyjmV4PL9$O&KJD2g z$969L$BJUM71J(VmizIh&-3xt?w_W1+_8GK>YQq^1~0wOKCj4%u`Exq{m@dRvhovO zginE}hWewoTc3YEuu-W+UbFD&xhUlW$^X{Aj@!V}!^FLEbJ)9-Z<97f+n(Bz|0wax z&I!qPx?h&_Sg^~mm8txSS*Eiz^AzU~|Lpg_zr2RU(`Ds4#=_0Q=J9%cp`g6w>FVdQ I&MBb@0JRKubN~PV literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_home-profile.png b/app/src/main/res/drawable-mdpi/icon_home-profile.png new file mode 100644 index 0000000000000000000000000000000000000000..f689df10c6be8d709ccdbf9a221a424d39f094a0 GIT binary patch literal 1026 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIpB2O2`kc`H+GyJ_p6Ge{A-|3<1@=#0jKg+hYOY$eAOwoH4yn~0!{44J& zS8nmGZ-jRkP2l1-*E{01m`Tvtz|k?LGqb)<_nD9EvWwR5_uj4My(cd-3Wk&I#`%x)pBF`-}FETD?ZPT$a=i5Dz%iulB`5ikY&F$jfu4)N7 zAG}&=Wq8p1qn4iHs=T|tIC|>e{a9@N-RaVvC92)2p4yY@yv|l;sUEORXl|aVWpOz; zG|Q}Ew?lL65;wQi9gII%zKBS?+_*EVr|s3M)XdsxCD(XsFV26uQ6~}Gmm81bYI*3&~DEJzXV0~6qN%f zJl1`aEzp{szf6!(_P`opW66Y+OIOcEt)Er?&1>$yZ7ROI&)YL)?Y))xI@I{9)Wl1F z6&^b~+;uOn*%v36`_(MqSKZW)cIM?FmsG9mlryiN)!p%US1-%t=;w2HN^iS=>~`br z1G{ENZ{JvU`sMkn|Mp#sF5Jv-p?JSx@&Vn1-oKHX=Lm;QHoV}ae0}Z&+k~wSKl)tf zg|0riT9@y4^Y=l+Bz@L1#;rX{=PM6I7DDOezSqi9i?XT0?;?xNj|>eD7~WaW8Q z?EEwQe|D+IE}fS%mRz57ZPgab+@IEy;#MZ`Xa3MX0!sy%b&PWJQ=g?)M6iIeuBWS? J%Q~loCIAqCoaO)k literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/icon_home-target.png b/app/src/main/res/drawable-mdpi/icon_home-target.png new file mode 100644 index 0000000000000000000000000000000000000000..9fc7086e9d92214191fbc63f0dce2ac3f1e22954 GIT binary patch literal 1318 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-refill.png b/app/src/main/res/drawable-xhdpi/icon_actions-refill.png new file mode 100644 index 0000000000000000000000000000000000000000..ace20f3bfe4d7d750f0a88ae515409b242fef556 GIT binary patch literal 2189 zcmZ{mc{mj67st63{j6CMSsLReg;_9|VaSX%OSWrl7c*uE85+Y3g-6ywBxF|vg+s*u8HR))Pm)g{*(ZPqIAmgR0l{P>5C}dL0sm6r zln4H|K92KmhX_PYTS%Px0cO<*E-s!QW`+j#)clo+>&fm$CttD$LduU-I-Jf*H1f3* zs}NCAvOQ6JH0ny7G5dY4>F^Fv@2{O?D9jfJG*0f~ZQ!}Nep@mrQ33|LWM<=h(O%Bs zLe*g0U6fs>uer<8nNN+&-zJ-z+n7@UUX*LCJ@0<5?k`NLUmpnQhpPuI*eZ$h#iEL= z|I-i$)7KZqPqn~0{mZ7c^W)N?Pm21j9(T%8AB_uU2aj$sTj$ed?k@K;=OtCTcC}^I zjjydJ?u+UN{9tNbV$|1$XN)H2oNqdMD=nx4y|2?6J1SYA<^h^am99JH{;JO3RZE(J zlU_wlDb1(QXcf0(9i!c6T$z5KY<9FYS)|wca|5i0BcH_BIiM$4N5x!}mq%>vf%j9J zNbpa^8=bPxq=i{Dk?Op}ZQPN`GDenO8z~}8dSx-2Hiz!-fGr8*AbBy1O;U|X@sYJf zlNvKSr&yVe4;jO%7`927dKSjju}vLrY28ggM4wW9ohcEF0) zK2jsv|GZabrqRl;;NU@#)w-KnA>X1%$`)F1%KxMnp0*~!ob$?0Oid`%$o8I9Y_T`Q z|FJ-BQiXNd$-B2-KixZ;@Ohy$hQ2-frTC4#-@@d5t&x(eu0pY!(}J0F zmq2$O#tL1m(wX=D!Y)sShPz=@UxSvLlsa6TbTjN370uIB5NN&cu`1>Tl7`bNof&k9F!JF z?S4iku-TKomLErd*mo3eF>-RJJUj7oNIS~c3zl(K9W%EfpW2Yp)3w~Y>lUv#6kNdW z@5}uxgMm*yhTGBo#A5|6!}{3Z@?#RQ0`Gp?THdjupBo3p3ooAR=@06d_I=ThSs?`) zpcx;BQFhAs#N)xIFuhtc+qk+}y6s(|9Bt}cm{d}= z5su3m^sn-iUCkPc5_-M6mmQw=arbzHis%?=FnR!%QPVB2 z`vfH?=EB|8ZqXvw_R{?MNO78zuZOaWej{IfZa$}D_cyHBKDk}A z<2{p|i1;ztEfc7e)4a!*W*HUCJ&@Backes*&Mq@`+qVZqoAW@T_2uW1TFTQq<|aP? zf#&Zzsdgn-Q@f{njfG;98vroNn64U${|z)Yq~xn~Vx)WZ!5iNrh0;G*g|GzDXrxQ5 zry6zQm~!vmt0kmu>hGZCEs=A!TQT)|`^L%Kq`#ssCqkOPw`QnPn+0Z5F3gtPKEi@Y zxhT&Mby`)J$DB9sw87oqCTtb5FW1eGT~NDd4x)Lj<`M&19G_oB94ws{!!<;>WsQ@v zsX?!iON&*8I;W(@Dhmr-6}Fbpk;E@wdFmGF=N}^t1o$xgo#erhGJc~8Rn&562}2fG zYpNHeEz=}UZz4r(-X9RA$y#6pudOgp(7ZKEXjnkl{Xe|;|%x6z(JauniH0D+f>9M5PW-5P3!fkSvY3W$JcS01CUmCAb=YCYOZ`d6O z0nOQ(1~=$syl!=fX>&gj@I|V>ZhLWA*1>NLyX(dM5t!BU+`th0V?x`4`6tWZomkss z!Jk*(h!vkIJUc0>QIuiODn~cE8sP-Ac(<-u%}7k8g(oC+G<3l~svAXzy1pH$7IjMa zfbp?VQXDsj>`^pj!3)h2S61hxJIT99+)QQVc(z^Z(fa?MES#w$i99&sM7cQe(Rg(C P@E2ibWMx>5^0@go{|)~g literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-xhdpi/icon_actions-startextbolus.png new file mode 100644 index 0000000000000000000000000000000000000000..0e59f6ec36caa13b2fbb0b09bcf47b002e488cbb GIT binary patch literal 2448 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 UeOQWkv-Oek-5-E&@gN=hFFhAHmjD0& literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-xhdpi/icon_actions-starttempbasal.png new file mode 100644 index 0000000000000000000000000000000000000000..1deb6f3ca877f433e466ff8da527e5b19a46ca3f GIT binary patch literal 832 zcmeAS@N?(olHy`uVBq!ia0vp^DIm-n*TA>HIW;5GqpB!1xXLdi zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}lpi<;HsXMd|v6mX? z9yU!KE(<>hEt;@ZvB^!wurrCzix_lidr+ii+ zkw@ql{fT8ydW*Ub_&wa2EAj2NNBz3eOV79K6)@PCNk$X}Z*O?p^!eDuL*JLrmwvG3 zs+rPW#+$wrhDQSno?VF0ZzMzEf>FVdQ&MBb@0Pj>XSpWb4 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-temptarget.png b/app/src/main/res/drawable-xhdpi/icon_actions-temptarget.png new file mode 100644 index 0000000000000000000000000000000000000000..c484837e53aa10396205a30927dd9f07a6446b87 GIT binary patch literal 2836 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-age-battery.png b/app/src/main/res/drawable-xhdpi/icon_cp-age-battery.png new file mode 100644 index 0000000000000000000000000000000000000000..3d75b9dc7a16b1a9cf017661bc71401ba122889c GIT binary patch literal 1462 zcmeAS@N?(olHy`uVBq!ia0vp^DIm-n*TA>HIW;5GqpB!1xXLdi zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}lpi<;HsXMd|v6mX?HMpV%^m%1(MUYPQBarHnsV=$BEM1yan4zMI_v$aGU>M|6ZC#X=caNS2AUQ0wdmwo+f7q^X7J)m{k&MS zjCGE-DMFkpXLxuVb#c;Cdw%I;jl^N!OMjkyK2sR}NP{n}tCCM`c71)jva6revKF0* zX-BR^*S?yQJ6QTXKMMs_Z-4kaPMyztx@o8S(v%5d6XmB~yYQ=U z<&-QQS`J{+ZyMX=**% zzjy<#wyZg9+jX`k|3F>Mji9i@QksI{TdvwS$^O__qMbhLO>AmesP~B-TTX5*?0bH< zli5N?HDmI*$EUvs8TC!ec$^u!v}MhNT`Rb6o$~i!ekb?RDgNriJ5t-cn$x$(F8Ka& znPtvSJ||HjBQ@KpcM^Bm2LFhfm0gor2`TMW5n}t8q@BaPava34#>|?8Y+C`5PgeH9s{{3Iu zqIBi`dwQjf&EI(E8UA(I;eW6&=R$K8U+Es5S}A|N9lC4zOzNMdM2Lx3XRdHFy5{9= zS}Q%ZCFH1Xg;VF&H69*y++Tm5@K$+J^78lE|1zAJ?{{a*X7|p!DcA9<&Ro~siEq2? z`ir%(nN!xh52}l3G=I4J_W&et=xeE+!7a*uSFiXy(u>Gbt4``2ANJ~^>DyZ{xqp00i_ I>zopr0CaPHE&u=k literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-age-canula.png b/app/src/main/res/drawable-xhdpi/icon_cp-age-canula.png new file mode 100644 index 0000000000000000000000000000000000000000..8629a7998d15dd8eab46c57fbfe77840c2672fcf GIT binary patch literal 1283 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-age-sensor.png b/app/src/main/res/drawable-xhdpi/icon_cp-age-sensor.png new file mode 100644 index 0000000000000000000000000000000000000000..a3577da118eeff9a8d4a3756ae6010d3e2b4d98a GIT binary patch literal 2480 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 QaI~j6*t*y>pAF3X4<*iVaR2}S literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-basal-end.png b/app/src/main/res/drawable-xhdpi/icon_cp-basal-end.png new file mode 100644 index 0000000000000000000000000000000000000000..c92af22df3208bf294678eca6a835a5313332d16 GIT binary patch literal 1434 zcmeAS@N?(olHy`uVBq!ia0vp^DIm-n*TA>HIW;5GqpB!1xXLdi zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}lpi<;HsXMd|v6mX?7)mpEDR=K=#b$NWSIooVv)@!lC z?yMk9!CnEa6larJTuL1~Y&xPf6ff>jZ}HH&BrbQPyF!rjtlqY+w-pw~b7J4ly8VB@ z`}gmav;OBlpYwm_-*f-}{5MWd<4|l7aKcJlzS5&*b$8oF#@|Vd`y3bZ-<4}Q{2{mf zE#Hwlc5n8lO4$3AwX43~^?&=j%cZAJo;}bW(WM*Fcv0?`HRpTJ|2J+I*3W*M_DGfI z+lKd@ZU)lUzi&LhpB8pelW*dohR+)%*-LI-PpWw^KmF%T*)6r+^@kgpKh8B_{t_G7 z_@`z0=C{QkrM|u2FyA#uV)N|V$rUS_zkRm46Th2n$;u7ySIye=pepmibhGW}C-+TB z{jsFUit&%TX~XiZ-&n`HTlgXQ0W)C$|xu`0ffYcoG*JU*P^ z@qA%=mQ=FfE3TH3b30h_)3!bh(panf_(a;?#;X;pj(rqec+SCN;TnT~S*fb~4h5cl z%XaO-$*T6Swq4AMt($zRSnpr5nr^Z|tpB?0iXb0Xg(U%bQ_kt`T)V7L!Y5Y2-Q)7L zBirTuCZChuoFyNqxJ+q6<)zm>t&wkEzxft=>1Xn)c{;(X-m%+?zkmE=O_{de)ODMp z)=hL;nNqnRrIgLc-O5NTb?fa94PUk$Q?NVruS|EI!C9x3+7lQxdxSUNntNkHZok+2 z(%Ly!!yX!5)|g_&l-at`V)fnD>hj|I@k;~jPG+tC*pVsZb+wVlL%UWzeQULWiRbM2 zB>{G4v&=nSD^%BNgt8TB+&iclnafeW{bHF5*VD~wwu$k7%Pv^Ds)+M@tj@`-@1DV- zyW5t!u3a1XRxRgMWeMwQtqET*EzLR2cITq2{ozYezn(|FO`CJ`?}bxgp$hv`x0`!S z-+ou>nB|W}JMSLoll!F|73#gi`G=hSgQIp|w#%k_zE+Nxsz353bQM<$yWG3t`O23r zZVR71?Y;O^9VSg5mY^9NOAG`(5|t(#a#3jQbl?(h6j38A5n6j9kvDJUiuZnJ{=eT{ zk~{m$*0-Hz4=?6fuhp8c)MDA9ecl@r_`e!|5%35N4zu2$8nnIhe)^k`-Tf<~4;ulbUstvAhXyG_>j{cKyf^S|$yk2U`t`hPn-n*TA>HIW;5GqpB!1xXLdi zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}lpi<;HsXMd|v6mX?;OB?jusXV`PJAU2!^sK7t|IfGF|I#C_;yDQ!-7*R-`uz9ff@^kJGnn-n zTD?BoH3UESwVglro%r7t`!gYP%`7(`klYYl`Oe6IAy4bPZ1%3Tty0^#-k2GbGvCNg zcoz}-vz=$YwEBVQgL`!MC2d)!?bs&Eq|f?&y}?3-Sj$aThZPcegpSdY$g;6WkbV(5 zBRFZ}!JD=Z5{~>nf57rXT=B+B3ZD<8_V%(wv-cf~sb+YWr59F}Qu_6xOnvCz-_!YO zSl2Zy<*Hu!l=Fr7xgD(6_Qmr{{EgXY_aS0OA95h6c>X`FzO7z{Z?>R literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-bgcheck.png b/app/src/main/res/drawable-xhdpi/icon_cp-bgcheck.png new file mode 100644 index 0000000000000000000000000000000000000000..030099f9106f7881592f1f254dab6fb131604597 GIT binary patch literal 2464 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-bolus-combo.png b/app/src/main/res/drawable-xhdpi/icon_cp-bolus-combo.png new file mode 100644 index 0000000000000000000000000000000000000000..908f33ccd8aab2e150a8a331101810e7c644d963 GIT binary patch literal 859 zcmeAS@N?(olHy`uVBq!ia0vp^DIm-n*TA>HIW;5GqpB!1xXLdi zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}lpi<;HsXMd|v6mX?xe>MvEetI(T@OM5%78TD) zNa$Dp-WO%ZpZ&aQ@Lgh=+6UGddM57~Z!r3;lKWEnvDE)?oLEH0oHNY!4dt!R^_XrS zD7@f!~R`myW*ah~F=-ePB6X{eG5j z)v`gNPn0*@c^=ekX8ej(YftX~k|LHnUyPQ#I^kt=PN-aK)hn)_Zm)OS1l?guH%a~yL@RVr!gtb=L;o1R-&DN!?f?9DpgiH}>gTe~ HDWM4fL?J>` literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-xhdpi/icon_cp-bolus-correction.png new file mode 100644 index 0000000000000000000000000000000000000000..0fe89d5f8b482b6af978d9072096b71fda7cc4d2 GIT binary patch literal 1692 zcmZ`)XH*kb7>!V7nL=1H(twN#Sqef(7&0VkKz0m7$N~c-5J*fwEQ;(QSjwoP9tUY7 z-~u875lsjxpooBmf(k@IMZnMsiV6+Z9hZr9c{(*ytj z+L!>}5XDMao9e2Hm@-)z1^}$vNejcVaM)c)axxu4q$HE55H3AMQ3n7}p4=27Ig!c& zk*M)B1{yry-U$ZLC}?n`GZuzT@uBXc1!SaBLo))y$Qg-bHwxI(LlebCDhTLQ77@gy zCo$5HTr~I#FH*5zJBETmUm&bRG}wDh5QM|-2KgkXQbEoT7bh}&vnyz;8wBp`=8D+j z2tvT%E>M^o6u!j?21ml&kT5vt>i~Obf>5cHIAn;g|5q_Zh6e9ru~LvwD2Ky=a5h7d zQ{$mMBv~&iG$aP|*S+7z2!{JL!Bd5|*ShQpYXpNIdN@larU@&w| z1o~A)VGsJvpCb9zAu2=BmQ;m*5auEh08r7w_@Rd&lrbb*u*sDoNEXxN(UP>v_UG4_S(4OcCzA>J&fyuai0(n0Zs$Z&G~Q868RHprE7isfUN;6# zZz$|me#Ne47pjvr7DW;yan~(nsdmpD zx-4uUwTCBjNII1N7E@7a;UrA@!LG>TGdlWF%j~X`FvWdKhJ7Qi9pf5U4DQ2j4~8m_ zG;)RdSuFbK8Lm(xaz8zakOQx8W-w-35)1dLT&*>6AJ6p`bnfZ6FP^J=mskLcD`HN+ zCVj5b9=Za|0N!bSxG?E0IGxX7L(-QFt8WJt_sTX(gU0MdIo%1!9tEPm?uEmVq}6rp z1#+s2JU?rv)_5l=23}s4F4TPPo*Cn)%bxyZy5Ep9WiXI$b>&*Ck~I%Me!@RtL`m53 z=Ad75cIhhhG_(sl5#3+|DeWbUt&_~iuwj?A732#w!H!URUb@DdCFQe=RDj!y3l-vj zGbTi=dZ9zd;>SYHlz2pM5@imWSOy)}p&;fYmXiMX$vR>cJbV|wZ++u5?$e$~l~LYZ zFWcgg;f1jwKe6ji>vfDPveSIk|CE!2!%5Y=?sA8-Q6t_t%;PmU$5C_RSa-SM95B=7 zsm+Yx?M2|n6&q2j@XWHn-{5eAji|<2R!f8$(Ao3oSKBd2i~7jmo*)~?-@75taJ`XSX8{J_IAmU^k^CI`Q z#gUlrnrmx>PfTNuj@Od+4nyjL>`FGecHM+cy=pGmdbvW2%)cNg&qWf=ZFt*zbh_^O zeYjNE{_fI`rxK(254X8IPUju$I7~EmY~vS_{vb!1c4tLwEMKsA$0m&G7&OK!?FAAu z35^M|&`PhL9GsFv@E&Gc3t-Du{-q;!2e5oZ9%>U0^+>Y$Y-OJwVHm;PQ)2o|mzlY2 z9Io_%5bcf53zu-9%V>yY)5?~G3#CEfm#!KSL*+MVf|_=`y~j(JI4jF{q5y`L=TiTp zV+k;Pj1=Q@#|v+(O#4;qJQY!1b@yKhk6-q4p!k?})oRQ={4%7{!q!7|be4+R)AE3~ z600^Y%Ijei%kpunZ8hA+^L$7mijyl|sg9&#Tgr{)9q+p^8$LPQAR|J)XWsy#hUOOo iw5R{)H43ZfT-Vh)a?$|qdr0x805E=mz8AN}X8#SD)%bt_ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-bolus-meal.png b/app/src/main/res/drawable-xhdpi/icon_cp-bolus-meal.png new file mode 100644 index 0000000000000000000000000000000000000000..52ef734adfe8d6311d30a2856cb2677d53c95920 GIT binary patch literal 1963 zcmai#c{tnI8pq?(BDT_Kl_K}oS}J6rK{jqs#MWvMrX5B|(TIcuvDQA8PS;U2rD`kM z3^i5K7HJhRZ7~y6OKVG;&g9xsx43OaZp`g7|IT^N_MY=TpYQX1|2U`QSb&!f*cc1~ zfpkdT9>#{C@0k44;#f~z$2rXR2rPiU@7lGAiOJ=6&XdR zaiCOMOk4s1Sa~P_pmEUzfP(f%`m@|=v2ot%Ni=eLKu}aVJqi;IxVnJxT&xnnpm8Fh zTt<8X8_OjCe{!+P{q`{efc}}np%Vb&wjear{}|MrnM8x4;f{7uCJxkerbRU7>ZAdK7~E*;rT^O84-Y34u^$BAW~CP;i(RA zW>O3Sg~4DDNPC36y`3_{j-8gkiR9WPun%k_{?G8Bv7?gWSe!U!0(6@hNo6K;2mpZC z7D0SbQQAZNRUuk}vMfnT|4>pZ76jU9Lh>L6ajTZ5PVh{FO@*>i%tScwOWltx zT+QQlkidq+8qL;V75$)Fb31}EZ_F(0FgHef_-WU*U$TY<=2d7I6H&3$G7Zh*spgMn zCEi4FKHAXd5QD^M(Nk0|Rt_(}BE*a?vQyR+mbfs7yQhYy)~`;w0{IuXzJHTL%?ycJk+0Fx|Z{Nn>d7QEJy65XDgF znHLCos}maDAt+_b+Mddm`2SdW6plBnF_x&QM?!Yo=Zm%q_`mn?_vt~FoT!1naUbJU#G zZO7N2?JrUhN}uII*3I&QH#M%0iO^dGw-Z%UIumnMi5K$k7@H5uH9s*7oc^OS|BC{a zAT_hK9?5zT8t4_(;%%JKzK>qujN7@TZs_^-g)YsSRi2qJWzO+p?rfu&w^8BF0*~yv z$xJ-&qS!P4p=%L$>?)+*W(YWWo}IpbI)^SJ;9ta4HI*pF+GcI5iu6iAwK$R70^XmW zHTe58>r+yzg^laBgXvZ04BdDo2_M=QB!nWy0!iS0^+qt4NKp`|_p0rr5wnyCeJgP) zaKQ*Wc4)|gZ!+4tIDOD>lC&AtzLK_?!_V#Eb`6dD?h&ImZ+P!loXe1*suz3ThF5({ zSwNKkp~Wgg*0R?X2%Qm*hCTf0K1!+WgSWU)%jdiITlgF_N&IfryzMvC4C50{T)%px z{nE(46Xkn>&kA01nZ9JjfH&|sYmj+1^792$WZn$<)dpXKDF}%l71H_!Q>|L}YRo^t z82R=~o&CmJ&+UdW5-797T!|VR-@_m5d)hk-7TitFTf5#LlsRioiS~6>7%usm7sdbyrQF3f_z zvT++Zes**YCZ+Or-;BBUcmP^=TYag<$Rj7wX1Q$<7qMCX!l($kR=Cf`;T-|M!04ok zd6AFe4M2AFRlWZxNA87po={%^>!0rGL#o|BN%-6wWYy54QPaAAx^%M4ns+h&zRI%j zAxGkHB6{t|&DqW!VYwT@oypjDKNr-}&coEUNEtE(cotP+gLWU?Cs}ny-rpY$XGk{BX7dd7Oaj->w2oB3(WgY< zFiW?=OK3OkzLp9qKKHz_DXQ74K4KnZ1`Lg)hEKR+6Pu;3kSW27hg*li za&IB?Y!r>G+V#&NI&8@+`N~FZT`VOjN^8<=&-D0Oqr(rzd>vxIt&WvJMd`XsYHloV zD5UFMzGaRX=yk2T3Q9!8MQKji z!A~Zub+=yM>*GC3}zh${LH>aHflplE|NB{@PQVfe*u9Ppc<0 zT!ZAgYI~XmbXW50(Kq?pQw31p{u3SV7GP^OU8O5kX1^vb*N?=@Y&O+CB931vK9+5o zT|DbYTP4!N*7{+;Ufdi%Q@q$$CJb5bVg6*LD|MH&oTl!Rl|{UecwG0fmZRx*h&$4jH!n$C8c&c(l5GllMP!p@Q!K literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-bolus-snack.png b/app/src/main/res/drawable-xhdpi/icon_cp-bolus-snack.png new file mode 100644 index 0000000000000000000000000000000000000000..8d2e9690fcc63dc80887041ead60c7bae4156f77 GIT binary patch literal 1986 zcmaJ?d05if8m6Xln{pY{(iCEB(Ucz`DUisR|>T8!*!gL8Z4zdPqS+xMOCdEe)K|2SWk57~9Iwuv?f z1lsKGM)Xsk^tGkANxidWmnb06I#LuRC_c!`6Gw}Ufm7+R;S4x8hOK@FfgA{2HkB65 zh=+zVjz_WZFojSAgGSNuutWR25MFF&Mr4#*5{KcRM5fS^qG?zib$6fIN&u!nGBo>PW5GVkJvQbyq#3i!gsazXY-1ln`|HB|M;%J;Gc6?MU3%Z6$4Uat)kB7m4 zH4@+}i&`G=w?1|7w?hn;+7^ylKh(Vz2Lf$Exf7iz+-q;1Cs&&V81^W=En}Me(vMKU zrT^Yj7I1=?ML~biHMHn9;Q1m{{7lt({>`0|aB!A)ZuWtc3;dr{6|iF)&>j5EfqFWc zCsHyrYqBZNp!dP|RvTvHXUzw&f~(09-fxz7^;ci9wM{;inm~wn({$d#{o?nxsh_(oUCdY-MA8L7e9pBcm}Wy8JWf~Jcu?-1k%Gt2pDU{m(GHv1Rj zw`8XSd(Y3oxn3{yrXP}89Yugb36B=P1u|0o$dOHUkxG3#S)ou$Oo0A0`xRa>ba+xApIo+PZGAk{hl}Gd1la>9wsXK;e zuqwM@O3z2J@xh_@b8W8$lrKweEqfkXkh_X1SB}eELiW0lztrYKe)O+zRxCg3QOH#C z66hjy@{Dc6(I@Fe)Be9qVH95B#HVFx;JdDp0H>ttE~yH=V7B-<2Vop++OxpwsB4g1 z`gp;Y*?pKR(3@_SG1%(`S-a*HnEI2e=A@#Hhtp>ow&yhXWU`IzWF`_p`%7+-oR;cm zmW&Ryo(#S`tyPlNqETG=u2wASUL|}2lkE9sg-LwI;U_3LYlg~^(#k35Ret31n zHurPav^1sU^5(MspunQ#3n}S(f=r3OXzPBBklUW$rU|m83Oh;eeewHny(YQme=DqR zV~*<6&4;BcB|l#Wi=PLSG>_Hc93epaTtn%}6{e)lS}s%&l-stS7ccJFZcze)_!K-e zl2w&dfXj8fhOH$U)zwR}4~mt2QLMQ7txL6?KfPLI7i-@77pYUcV0yA3F~}wqlRR=` zr^_kf=(7iks;A*0JD2m##NJa~5&AnE!yHDxIe7bY9iJ)`r}HiCGfi-i8}0qCI-IHs zS&c?j#aSXLTDaSV@Et7Vt*#Jo`8irS-g`ZdR2lQS(1@NFIU;5Hhb@jrn6-tBk(9j# zMg*e!M&Y$*iO%OgKaZ?6g}A}X4{I~2Io*D0?J@X+S?HU0XZ zym86Q+Y`dNUmRJN{CK|`?9f+b;L0X9rjFL%m^v*j-+(2y=IY;0KN_AB*)p25;qdeN zFFp^?`@XNpC}0Yw{dn7-*Y7usskv7*?&#h($S;KEm@J8%2d!LzN349;?w)QBODFT8 z`rX=}5ZSYFVBevXmz#n;7rh7J~2_;*7oKBN&9W-xs(tjP{HB5&F_kU zj1*uJtku?$KQx}DEvk5J?=j8PFe>|%B*=2&%F?WPMAdO!66c6`)k90eLx*!ENtJxA zkt7M^8?T$lg%q(%?m&y5n9Uhv80c6{j@1(ad$S(%^b&pWj(ksMG&a zFQmp?0T^b*#h_d*4!;konJ)anc*7O&Bgy?XdR~ymV@$IH&CZTw=00l9dk3#sutmo;_P^9T3Qkw` zr4{`4+AiX%MkNZ4_A+@r*-}>X$T@tX8>R1W(sdfi#2>Ww77oZYTAk_5fZ>$<)d8{+ z-co<;I9QOgYgY4G=3G|DZyJlP%FCjGC)njCn7)GIK%%>|x)j8RUrcPg`*!`q-|X(E Zge-5|ab&B4DO+p3?gz=l+5^XUe*zX0ou2>z literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-cgm-insert.png b/app/src/main/res/drawable-xhdpi/icon_cp-cgm-insert.png new file mode 100644 index 0000000000000000000000000000000000000000..af93321e3aee5fd2c50bec73cd78c54654da54f0 GIT binary patch literal 2044 zcmZ`)dpOf;9M_>ZlZ*^)U4E@dF1yIAEz?<+$Srq@);2R5c0m?Oxg1PM7d1t4DV;DW zp*Wq&hEtlH(8VpLi%YgqZHk;Zr|0~4-sio2zTfZj`8=QRAMcyJ$8(n+2ny2B(9m;r zA^E7!u*IdbOue&5^8GY4mbgXw1;qtR5>2Uy+ z&WMa5z-3K;z=6mx0z44of%0HG(IX;V61jBWL{C3jB9n#-gKu{PIq>jmf@pdi1>i+T z#l+%y1o%I^c=dfTjD!RKl*BO!aN?pM5ah83aAI-k00v=iLql)b3Se;vGzPcT*3KHR zMWOAHC>#=PXM;lHQ8+vb4g45zM-bq^4GYKnkeq*rsSyDl5f{hCBasOS35bL(2o{%t zMB{KcB+3?PYipyfu!%h!6G!3M#Kdk`r1+PEM31F$BiV70tQcUClR{<1#}VLgq1JH2 zjau1R#GQbu_aHT`{5}{`=AD&om~j2PTI5@yyoYIJA`R&gA$8A)!9`_dGQM-_n4cWs7 zj06VK1)4xibceKQv#)O*3`|~YIl@qEbu<$JF^${gK67^;i!;sIw>qZl=WuwY4(8Cx zsGFLlXnkr5C;7Sy);Ik~X)S|qcUypX6lL%NnIPRo4azusQ`cm;E5labDX&Lmk0{vm zboqBPXytB!rDFw#bloa}YIXDqdUf&fK5-#8;(kX9c+@QyLR&Tj*)ead9R2_nhMF8T z3kYr!>48kLh8Cc!$IdHUHHGakMQ?p$%^SbwRYMQRRZ-~Ohoox+On#r`JArVyPaeAe znQ?>W1?iAxv&2Gy3F$Fb#uWD0v|Q0z)dHbbS#+B6Ctq7@2*K zeZrpioHS|qa&4sf_IkGzr``-zfrM(k38pYa2fWDs?V42B8J+_fO-?3PzLMS)h?Iz1 z9mH6i?-`s8l?7QL@8@uy$-TimXzM~IT&UEmaE zzqcx?t)?_y6pSM!fBFXmP=u7iezMSvt zlJB;0wZ-K@?sZ-lner2GYY}Dg;VE&_N%F*ytz1$+BaGdLOg$kru6FC2=jH!u`s8UH z%B%mF73T7pB+5^ha(=0rnlgN%N)n}gbb@|C?Uj8;>$!ai=EZwgoWW6?$6S!9li-tN zE=iz0HC1xr>H(;%rHx&S8YgIXcJqe*(yb(&nz-lp@pKKyyJ>$F2-$*(=Ew|MoI($4 zVId_j+Kwx}?E0XhXycy{s>CFNxgB-;0&jr0Wxb%ID~icsSI0$#s6S;Z3G)*>=bnpD zw}ZI%S~1(5i+&7!9ueJpAc;Q0-GU2vHJ)zr0eG=_MgH<(h(?6UiatC}x<|WaP$Bpiv zZiJsw;)drr1sA8{YbpV=ViBy)ez08Nd+)GU?$2lEY({F%?Op*|U(X!45n|>1Fml*_ zn3mMkI@rvq{fZBr@W5;yoF~5yXiei)3$O>DTIlSEV&DB`vL9cu`ToG!xwmVkryfr9 zuMAoGu)4~tr@?7mhUx6YL38_9Nt<^vn1!Y04wsqhD2n}Lkf!pr zGWq;D)Tw0ZW-E+^vv=MZubjJ-dz+_fsA(QA2+8q`b4%Alzrz&`yS9l%3z_t4@Be+# ct#J$5czx?*LB7+ji=VdZPEV3>$AQ$p0aeelTL1t6 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-cgm-profile.png b/app/src/main/res/drawable-xhdpi/icon_cp-cgm-profile.png new file mode 100644 index 0000000000000000000000000000000000000000..e4c50f26676e3bffeca42e6f2336b5b373ca47cf GIT binary patch literal 2059 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 J-E8Td{6D@syF>s0 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-xxhdpi/icon_actions-startextbolus.png new file mode 100644 index 0000000000000000000000000000000000000000..e33b5e0a64587afac8da4aa8bd54706b1412d6b9 GIT binary patch literal 3649 zcmb7HXHXML*ABe~kg61kCf+RwsB2olFq)3cN zk=}!XKq!LJ@m>&7@s01j^Zx$6owMbfefD|goY~o#&9Jw%1oBGq0ssIY+{(<6IT!uu z+?>o&j|IC30I*mGUv|a2B5YuO=x{K~AMG0ejt$2!_n8R8SPaT9Gyo6s4G0X5(3jh8 zdo2eF_Sctl(MG5vFs1=P!B+9OfJ^bVm;K^H{h3&Dr#%NhR>1i2#YL8fS207x6Gqv{9IJP*=^f+5<_^BP(zAPseh zj+#1D4Wgy04uPpdVd@ajzfI177o>;tzXEeKv-nqx>FLV_;qe%lnp#Xu3^+y;jK&43 zL7-5mn!1LXhK4E=p&A(%fk(xvMnsfO0;^!K1TC={Z zz;bHma4EstV0(78G-0cFpSu0cZT+ZW82aOAt9`z$Vjlfl=lBiO|HCXElu<(1;_n@7 zWI5d*VcFnFlzh+r*=Bcx*9U^(!f4jPV%8loA3g)0CMJMp?@kR>13z+a6xWj|gx4Uf z^O0TUog^nI2G7(j&&&F+WM8=dihQbOW#cM5QGu)di;Wf-S*xjNPW~f*; z=fgazPkRKNiZj4?4@GgN@mMDUn^h`WhuCbx7OA&sc!qQa#&xux`urJ!5-JQ23T8d^U`zQ0jJ7ejp1Jbtft#(eTE`$P_B z9?$w_^}BB1NWfe5%KF zhKwDg(vCmxsmNj7;#y&QIpq~e2%tIB)U1w%yjhB_G*WPfiKV!kfL|EF2~RvlKArJ}uVY%~yi}Lf_aQXlW|fYd z;Ix~o-}S8Pc`tT0q-d9D`7~?Vo$2)`A5R~vO>NQlqVFYvtqor((rY`((W3N{po@mZ zD~9tXS|g+s&iSlM)IhGf6Ye(;xp#Pc-WEgw^ynR$USkm*(*n%`FP!18_>p|bj4N2T z&lZbF?g1l{AD|r$QTTM&z|_$@c~QO1#@whgxSt9cYhI#x2EykF8)V$5XTv8~pVN$f zD?HqWLqLs28Vlw^MUm@!KhfMF-v&*WYKWr+M}vz9HXkT%FAONn`BQ&oZfLrF@Ib0v z0gnQ*N3c>QBZsX&a}kZO##aaHgqtOg^OfEZM|k1^tE>`?(Ho16sVddRL9}1J_Y&f} zJzOYTy>JH){SYw~qk|aEvv?uL&I z0vNBmbBggjeLeqrzT<=ow47%hptX;|o-NrEtKSS6SJ+-RqrMBhzIqFd^T{7J$mrbj z@7$}TB_Zfe&{I62nvAo@rnXr2%bPLzEUJ2%tWlACBd(Pv#3@)x=wKBaa3w4A-Md2j z)JfSWZByx~l}pu607t}y4>4?prUEMth>!DWi(75dQ#Sy*BPAo&@}ek&3HVODmr+v7 z6kpPBy`ppbMz{H}{ipR+%uZmC*NQd?TOyc91Y@%zH>g8jf5?@c04aIgUYvVBl-H^H<{Q^Z4P?ABQ_z|Q_r3Q@l52hyJo7E z^R!-sSGjhTl{^)1;;*suC^caVa0S}e!w9~3@j;sQ2Zwz@M(J~)65&fwlSGf`N2w5s zc(!tv3o1N2!9B?!yl!>q4M592FY9aqC-mX^i9G2guZ60*T=J;#Tw3z?=|aevXLg7# z8J^n{g+;k}9cxDQi+e~LDSs54!S3_dz4a_CI%t+_ILZ21b|r*hQL!Ded^R+O&Q2v_ z@~S3J8Yd2=kL^0RKEM{tBJfu5w%xd8Ox_~c=Qbtrf$u;tP&Vz;#Y7znUim2{|DalT zR#CBz)Sd;Y&`uPgb1I6z(ybzRyZBfaN+-8=DMmyWgr`IYClJsbB@D&;cJuwkRPb&k z%gWgCzHz}Ab}RV`9tNL36b( zST|2_;ITBe>yZ$qrmsT(piDhcSiJd{H9q2aT?~XeN*IFx1 zbn=w+fXU)HxxhrnHH^!~^b*JWQDG`izgU7;;fW6tSIQ$GXzXBi3tjNw3FYTA=*)-) zl_yjnCo6f05OuCj9vJr$>Dg&Hw3VKqv_dVNGt{K=tcytwH@UINXYUb-L8*(t7i^|k8i(vhg4(jR{y8jWuyTyU^%f25hptV~`uF1nbny&B%T3;&2g% z-f?g(WB<9ANL({X^;o!ApnW!{`Ej|lk3)6dg{T!^!TMX9P8ZZ*88-TSW}Un02!X3- zq_p{nGf{Ve7SY7Aw_)G zFG+uDxXvd+lF9nv+G0uYzS3AFlqfF#nf>PBZm)eomX_IL*7@a{VZ5Pac2CZmLpHF$1z zpn$`<^(_3hD!|K{d|y5qyr|`Od&Vj| zrqex(-?ZwW_C;Gmx=^87DoAC-*u0kTlO1n>53&}5SEtx!%Y12$RwE6uCx~R$wG!T9 z6SlvZR<_Qhu_(eO#ZDbc;&7J4_-$Z0Hy^_suh6(|O-#LlEN@U)JBp4%dZcyWNXp}7 z&OC5ez%^R?A-}u-s{%}0*C|@KS;eHmi33F3ivMXX6v4Ofu_f|;y7Y6WM=~LW3yR&d zla2&~?YK|H`9z^Kj!b;B!Q%9h;@{nc(PNg~r@g%=dWEOR!&0K<|?IrD56uA zIK$62GPD`|B&t;;Y7*MKVhAq!O@fw=@RBO3YlUdCeNr~i^X%cnvSv$$-zEtZi zKv7vll;^}DzxmDRT$X4fYtG^BXQ!4ZB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3j zDm&RSMakZd%cjB#Xh3diNuokUZcbjYRfVk**jy_h8zii+qySb@l5MNx2(nNi!Z$#{ zIlm}X!Bo#oH`&nGLc!cp&(PG;!pKBN!N|bSOy9s#-_S(Yz|hLT(#pV40Sc7txD;%P zQqrt~T->0R0eQAc86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx=P7{9OiaozEwNQn(g#_h548p8J$<3=B--o-U3d6?5KRTiA6aP~zCb@JN7NOFym;3QJ&}# zy%~ErCZ?`W@ZEHDQG`j)!3PHnisR0o`Cwy^`|P*hkH63V2!o>onfP{psi3pn-e0Ck zXV&eS{KR$A>COC~rqB1Br*0Yl{P_3zx$}-5JSJQ*%lx;3x6KKqU+u=zxU*}W@A?04)_g7^CK`9| zc=h}zUt9L-Z{G25ThoSP*8ZOg58YcXT&DL_Yl%}t2uC+pVxXdqR*P%vh7|&0qK6g@ zHNirIjB`^}+MCnfcCFsbzhTi~mFwYu-u0{8ch`{>y_PxYc5|BHwUhJDYwc6rIrYiw zW!~qwhT1Fd;6G12IK#Uw6b%L^mRvhz%HOUb&1-?1UK;nHz@I@pMQup zQ4jWSUhU)g-)$re`fmuqR}W_JR}gA%X#+J12*yJ-5SmKvDr#EL^C*Oh21-j+T@k9P ztfGljMj=(ym6TPql~LNtD$xHH7@8BR8|>k!ZHqDfuh{WQ59UoE1ZpFZ;o;$ka5Y3g zuoqGVg+d{fRgtQyO2-JLkO+T*8&SzWMDj1ie>gDs5cgo8K!Q(zKlCrB+x37@f*uTp z{40X|ugbA|$p86wy!c;)@czeP2|o58YW7ka0O0*?hB2@sK3Xe|pg50+^<3C!Jz>@> zC6#o?Zir@+V?(*&oi44Ro^knwMBYj4P<$nav;irh@Wze2!U}V4rMq&b+IMXgfLKQ( zQ`4srW=Fqg8)p03qP|A;H!aOX^+&Z2I6jz;>7VgxkBSZ7_{y|A%l%II|55peYz9)Y zZvEQdiH;W42F}MZsdn_#x0x~=<9@m?5Cdy=`4x*O2&T3ex+sIHXpZeLZI41eKZQ-(8ESjEsiU*n#%kfF`pZHvG!vfD)4M= z@(3Ex2>w#JDESdwui%FV(k-aGRN?H-wup!O?Lbl912G~mQG|G^fL*;|#WY0UM7Vk_ zJ~8fFa%@j=$JwEOX_Qv38PUP?Eb0suG|HzIOTctY0<<{#G^gGe9Idi|gqcNby4=&O z(-xq@58C%K-=G)@uHu2GZc5rANGu@MSbz)Aie;?2BV^Uexa^-5o-8I&`umv-5AUpPKrcSD4?7je)Go~Y*q7z3_iiHr5r+~lAV-sm$y z)lH>({q|916VOzfK9+t~O<))Yg3Xg$#kGWY&Dn0_^AVKKwneuNjxWVaP?7P;f+b%8 zkK&T{LQZuTot-Rl&0rU2d3&WXK)cX+kEI>JbpFOX(tc(1$(;)+*i8lxS1j5!#_D(g zry4qAn#x*FTm}|OAfB|G3y^W_3^VvNn|kLkcCLk~HMfsue`#PbuaYNBdxL}b=bYN_ zS6?%zEzIVR34R!b=CCqEx68@thD0RnzcOJBlXHt-XPX8*Dvb7?fNms=0-V62mljJZ z;^LF{=QuHwipDyhi^0e&9x8_Z#gV5{ZjlO2}Inc{+;JU$VqEn7Zhojh^*|9ArU*oaeDBI}S zLfUVKUKzPvzCe~hE4t$a%6y+-1f)8|rX}wIQGg}jILAvd zgZ`g2E#NUIJtf}vJWIRPro$BMSN~A_>My_&YpZSaq8W8N-Zz(q^T3p_kyv6H(MO94 z`e!Cytx8(_$%U)_^u@0`^GLt$2Z@6+pX?!Ti7+e|RD)O8A35NUG$gGPLQmA@RZ?tHn!2%e|2O8+@6%{4=xv+h$AH3GaZnpqAtzQ9Nqtz3cE6PP#5#jE;$f|!dwv7j&f_WZwIn`Uhtu5sZ`_l;6G z{k+uGgr@q?MrycEb?1#NKEM7wqZbnI9N%y~GZet7P3YN^8B94bB(hVbnVTZA%Fy4J zn&TQRp^2;sRDFPdS%+ONX3xj{7=Adf8--RC|dd)SVsjw1`8a> z2>T2w+AcMsBTG0vr392#@mALrm~_-O<{_K8uJVQ(<9@s@|N(_UlYTT z!-axFZtA(ZP}QM>)R&0)ZtA`kAL?V8kAB_dM+1kkzk3>aQ&&Gq9j6u6TUID#1b%pR z0~6^8nI*U!Da`F#844X--+Qv0rZp|*{Z-QQf`;U$gi-M6MW4s4iWx%#-L%V>E?QIu z+xb7&2=Nk0%}wpJJ$N4fTBU@CAxjYmosj;I$r}x_dh^AMi2;ecLI48D6nK)QGelN9 zgT2+CzByX~pP5*@GyJ}s%y#4-azdn!r;qH)!%5k%|N8y(w-#o)2kztmYdZ@whu+#& zT&(lb{NgqxRQdoldS8)i%+-1-g~lg*KLc**-kx9ER9ZtkDQyc0vFSw{G6yfpGaQ5z z&)*Q3JB!IG{p`O(B!9E(@}hll=(X|C$}oqMWM9UOB~^2d*&HN{<}Uwp6bAo3BfVBT z2PZtIOnU&yHP}PmdN5_fn4^Z_U~`~}U0L^i;{4f@mbkG`J!_Nn9RksL!$Eq`?Q+NS z%`I<*bu}mxqLdZF^(tR*c3X(ti>#arnBc)$Qr^3VDy0V~@8KFnQ+xT4r4K`QI*Dk5 z*dy)aT}!zdjcdIzG=i!?jEn{6O@EH?zRCvI9ev(KEeCjU{2__xDaj8w=We6hO5(%1 zL5BKHcKI0*HB-%nJxB_k+M((upQGeNjq7cTG@np@hS}Y&KxIR|JS1v6Reio%>y#GO z>JSeTyhoQ`+VK>>Pg@fo$y#Oz(J@ivYe6@@H{jylf=qlRC!WqdRo z+pBZV>}G=Zg3_N*)b;;fDLy@=i{pJiRXT~(a}lF*$$!E7{8Qhbn35xv-vccX?BH!b zy5vU_`S)caSW3w?VylqjVia&6aG{)#Oyp~dF6rKQ{v)YMmrs9U7^wRzZf@R$f1qga zxrasqg(YV5<O zCigh+G>*y&Vv?@EivHw2^MUM|T)z>NI3+`z>^G9z!cB0=9rBeo?rPO7>YFQQAz8#T zhD-#QFewWhZn`%I-{Bbd^*IH(sVSxg=Xo=c8hEBTYu;NBbB*qLhr^>YuqO&M#I=xM zB|SAbf=>Jy_U6SsdMnuEcCUvVOEEy#%C zYb?&rbs*>Vy};Oq)z~Xlq!nVJyz}DZh=W zG`C_3m92?7sUJ=uZLtdq%_H#lc_Ysx+cIYCYrCk{@-5@|a|arYi}Zn$18fe$)me-I z$Cj!lwkVRKpS($&o(_3o2jW5W$g4<8g9e$K1r5~_Tf zl_iCxJugL$KU3hpvn0n;=v%J-pbAOqFL1Ug?;<6!6Zki|*8LMb74z?d_p0O^7=oAQ zT-2u;udTbf2H5qh@Lnm4dut&l7$=s^=rewOscuks_4cmc9YXz!gDSHr#L%@-cxRjDefD0pyhCWtHay&Jo-_^5n_PB+uEHpUCM zW{J@$_`~^04SZBKV`S=r+OUGG7g5f*N-vh;cSP@jnV17ZjWj|(@Www|F#9ydfPLx7 zBB@K;`r1QQaPjJ4To5h-gthU@u&T4}H0?|d?a94p<7@81#^uqmyCSHUJ)4&&xct7R zZF#vtDyK9J_q`qHqxV_&1-1qB4G4VxWGnZftaZX0$WbP*UFX|ruq$rAUHs2(81`d? z^fw}~FH8>?-?;w*aii|kL-}Y8<16J`rVk(2K(8gRlhsphy}mMsgxyQ>q0vw$P>+q= zMUp(5r5yCo-2(lmS~BZLK>x@F93usqgb3M6D~R$Y?{d|%M;{;?RjX77_H!*^BQH)cAumHt#m_gW3x_E`NxX8isZX^Rc&?72w}zSwmO|}54k*U z7bH(hnccuX#qCBa2a8)9yIqhFH!;i~+oXn;>75XwWi<*<)+8?{ai@pm_|KzZL8HS>e-N$+d>9)n~pxMXRv4LOOs}G`Dfp<5qcDTgw<9cOJ{s(&NboaIp^IXb(8a$F?)3zhnAWBftCi(jiykJ9q!6~!zcBOrfo8bCc z^DWp-HQWt*nUVRC(pIHpbO{!FWFqnPnqCCEG=aNJj7yNf-ND-BWNBPq9fK>cD5@E` zT#d0dZ#K~ zX>1GSf8vx7<&N)sAm*aooC=sTP!DQ#b9ClJc_>k?yz1!_VoO4rxYn(AUZC#a^ zVLJ~}WJZ_=qEbje@j{vn;r$5QDMFJZ;}@M8mb5d=?eQS9yyeO})`fWmPk9+Tyh=yv z?W+X~Yj4wGCIzn8cYP1~Ll+E`lsi(pb(ccnAw6){1i=i8>}!Fi%=_Bkw7paLf4nBs b6&bNPh*tb_kO(I$Lo4NAJ5l+?`&sBTM;1zApig%Vu!PKIk-#yYyrN5 z)0`_}8UWxr5kzn&yE~jj`i6z*`1pmL_t%LF2|vgmR9M7?`}hX?lfmcx1A{_Qkma@x z2sp?O1vzcxpz9Eh@h1i05+eOw6C4S?3BkUmeh>?^ka-;P03gJl>;sMqxfmLSj6*^G zgNrwA2Zd_Gcq;NH-v%pb@hx9 zx~2#{L%6OUQr8rzs|WsfLC`{A^GLq{q>Hu9zhnm<3PK{2!;uI?Y;3GftbtBgWFSJ% z)YKHAtB=svhaXhHqvAu!K5_8SDAhj@|BGSmALSbv6iyBb3kCnd^f@0EO-4Z=h(9EV ze_0OXA^xlH!1?cl{6i1M5_zB>Z1)g(Fm9TiwIw0$=HjjR<|2QkHx`@es$VW~--ki8 zqOW5`j6iUhgYao0?vQ>I+{kEvn3sUdm%mnS3yU}*RXSwdefO18#2YxwT3sZU0kGCzI00w zZ8f7UHTyDqbS?v3DUNx@2teZ3QIHKqP`lzVFY)pj!iTEN-`Cs|hPb5MHcVt%WuDg3 zxNW#k`2K^JIO#q*9mj@#$y)Sag|6GdP*93IF2_}j%%8x$z%`EKv&_Fbw+pE5N z*VFzE&zaZrw(yQWv>WmGq0ob4x^kp<7JPt;Z?~6)FS^gJms7+jnT+#nB{rNL?VYl> zKkVM_#HI5ZUU#|RE-C`w`CO$Q&Cp@=GGZ7X3(}a?!jiKA>M0$E<3MGXVlFrVqbMVQ zk7%W`nV_G5a9ssES4+51uoT;j5lb1TAT&QK0Tj}vw%;^ue=p&7;uZrMq0s4#Td3tGGLiLUON`42@Ih74l?dy#IO6s7**fJ`ngj_tS`SO0J>9If+xzaA`Mi>EEzl=r%}H*D>=)ZF~*dpAUyT zuf(Q8aXF0%fIy%Hozr3`EZKj%F9u~~VL;@$NkR_zEW$baX)H@ojpRGoQ> z|1cj%ropbq2fem7DZn{4lY({7Wal&TQHwhKDS2lIXCU}>jOreZg-;e8OH#ACmi4NW zC2ms8uDZar$DO3OYpGf2fFDmgM<|_^9rk8NsMT@b>KE8l@N`kLl4Qe zTPVpvxn{Z8-OfS#Kz4xNrN{`0Nb|Odug+?9?dmC${5Lde%*L#3zA$&7LRJ;8#)9m- zNqib~fsE?~&%h66`uG?BX5YHf9;bt(7ox8iBunczTovszHk_6okzi#Rnjin{#@6r_ zFBg4mJRYsa|AjAUa&XCfM)g;d!VRdS<|pI@-y&85D&;|n)+?3z!#gp&$*xWSGw{Ni znZ$;+PUIX0)i=0wnB(}}D9Fk+KviM*Qfq7;AV3upQhm_yR{<{R#qF@Cik_*%++NP} z!+W%tz-h7kqusV7!la-)CHW8^t+S)|0o5b}R1IZ0u+}4_Mu|nTbgt|RVNPx5rp0E2 znSX2DS>^G*aWCZ9ucv60jNdZqL1rTmKYaVKsg$%Y@LbZuge?4O)Es86WIq*1jp8@G zUwWrt2Fs%C8rz>I0hYKn!oNHck;|`XY9wL#hUHn+dd$HTh`nmCXp`7+bLMkdk&bSf zg~Ap%3r()pEJq6EhdBFL$*FEZW}c5S`)fps6`n&feuKWk{d!D64owTiq^BxWV1;rF z|FrlB&o5iF+WyZsq{;-|Rfoj!LTmzpeTMZz;uNg(L%>j0`u4-TxjkOb{^=B%u|iR; zfmtbO9cg5Qzyo=CBmOG<6lnTw{6gN7O?rP3!J*aOy_ws>a_MGkoXn>q4!OT$w#IoN zYYnfTy-qOOzj6&}sIQcB=#tN?@Jy_5`A!&)J)vBA>z_ic%@U(@Fe>^EvBn~M~fOAsOVXHPPVhU&pG8D{6}0e^_ahUtV$!wynP&Zz$to2kL)p)3*O(CoUPOv40Ogn z<^>Vy$5sTEn*Sm4NYN5K%x~&FvwUHhWzY7(Smck&Y3sxm&@d1=%2bMiREAqiIE7c9`Ysqvww-h31NUe zkc-8R3SK0#*@H5##TkxjpfTRIVp}wF8JFgEuWELVowmd!LU&60vawLeBwMy#%W%!I`mvsJb;Q+PwUb zc|OWpV<~!kjk6nA6u)?{fZi^VYhwxR`(^7oz0IS%dS1POi4^JXl8wTU{f>C{Ennf} z`?O{ALGU8v=IuisEe|~QVaMtH##&J3CVIXw_#$5;9<-U8VJH-=+)P_**e`dk|EOEE z0m__glE}UgWn1B|WjMQ9uw*KmJJ3dFhM+f&2S0Mjo3+N#8(;I0qQvYq%5dZ}E0#Fe zu2M(|1pl7O-ZSVgoi*nyM`e*cMpe@RQ0@a!hXsJ zX%XWSIrx^Q!0FZl#G2B$6j9HzbBe3GPpzsVlbuiWN&h0gNi<{@m4q>Vy@19D|um)}NKjZ$UaHMC<$JSMHF8{ira>gh> zoHnUOn?CYcW%73L<#nzVl(cJ!S~7mxuCqn@RjAvw=tb~5EBQOMqY9a;wEX(1yK&07 zg#8s_7|e73y~cBDVoqPLX-l<-JHB5~aK_tjf6R~(EJL?{*M5HsQWOn@9yJ7xRxhc4 z(1*E6DK{F#q_aJt@wP46}v6ha(&wEnxW1_SAcBu zV3Lx5Ly>A-ES|f;iI5qIxjRRdv{trkf7eyJiim~_2b;0O=A^ISi}ugT-f1b-Hmb|p zV3I6HWrlwxh%ByLc)S(`7kVJulO9j$Y3L7A#Xq}dF&~7Oau>|iB5r#Sww~0~8u{d6 z+MdvBIWOPaR;^)6X8TxC(%~xQvrxNW?IB|8A@$55o)-NNv9^MDeCuBHE|4mZsAX5m zZ~qKWaYax)Xr93Nxz`)>siRlNivia zvE;Ro;Z52F&m@|+Q_GtP6-8gG9% zf2I`AiLYJ{f7C{^Hr6KjJGszG3Zha8!Cf?$BBjs)fz+x^9Z zweX{PmI*n%M%3B%ywyLogo5>=6$+b%V`~9_0z|x!4`G3l13fg8@^p{T!`Z>7E z0y@^3p8>G}Zr2i0RXQCt7jR19>UGLt1#lk+X6npX2&=;_yH?@84)LzGP^lg(t8u=d zYb4ghZ)#@1K59F!X6OAoQXS&S8L4V7_h=R*nR?G_>gu-==#tT6>PMNmtG~T#qO%Mu z6z9_{*tcm9F(6Vpff#mjr07?4v7n(UFQm7sF%d47o|)gwB9ir?50wMz65RQ5{z#|_Yyb-TI20pjA1Kzg zXDN5@#ltF2-CH9&&&=o(+21w$&%Rf`SmTl`xNK(U1n{Y+!9+7d%|d-HWtq#kb z3{7R8rzI|JXgax-3(9CY&(ySfYFXyPd7b{A?|j?ue)s%-=iYPf{qh6w-pWutC;$LZ z_Vw`ylAh(e3j&hvPBO`J0Dz2NLNJj<#Q9@M44PGREF*?&#ik`m-=!X|?4)QCmCS<0 zkmC~Q&hXWaE;uY9))^jVi$md(+{y6?J{c)wLIysVltCq7V&SeXP$xE4N&XR<-ae&!ltkAX?2kS!? zFl!Xr4vE4b(T6NiXerP)|9 zQsR(k3{nr%sEB6cbM&*4F4l2Q_qSP2X|Y?m`ShLOs0hQpD& zBFJwl((sVq-y72W?7VCp+pB2vV)MmjRVPHG&e9(BQ8pllBT|kq%JiEQ z8Q$*y(o`efG*1B5h(F=l>b9SK;p>*}^S$(sCa&R#s3z>jm{)ZiFiw_N{I%o2>szdR zGlBj~;1|G`vd4JyE8`?<%aWXM7BtCLP|?@@HYG&jE%`yR*`SF0{n2&64Q{|O$2~k~ z=TW)VKMyw6o}#oiK>@#7K^ zP!!0#3j9!L+RQE7?61De)Oo35U?w4ABarVr`J3sRfH1&Nqf6;%ca>Lg_j)UM9C%v8 z$lHDqq32`1lz2jE0I<>I#2w}JjBplH+h~Bu?ts@cqc!YWYR$@hp>B&RJXNq@_p+_n zuDVO~Y92JT&}ik9D$uK;q?uTCOxbQ_mYoQn3T)Y@RDKCXJkk?&P$Bo%@1Up>+-jWB zbYKJ~;6AOCn*a}hKn{-*{U0d}xBLe#`DyNhj`4Yqf>A{anNWbM>}t?*bDxD|f6Vod z7u{Bk_k*)02UR+piQ9ePf5%R*h61azhZIfE0*EeKBZ{3q10l#D)g*f~-!alPFn1OF zfRf4+8?@#LX~KNlwws_fnXY}N_kJ8z(gwQs8J)60Um<(vystX;)9A0?v;Zmc_3tab4&}oRlY|rTh%|f@x`n!dTE-}SB zP{}L3sU1+Qd=@RbE?o~^tge9zd3!zz2d39=KQ!>mm#<$XvsV^9R_tpHO*XG#rC}R;`jx%FVfE8701;AZx1A{RrLz@N9lYlhRmH2D(G&wUVzX-XEkiczV4kF zQOBAPN4O(1CZlhwuWPuQ^!6>re-YK65h6U=@uEex7w2BK>f*3GqDHOt@EmY^M|&`& z0dsbre-VB0gZ7%KI=>Ao_jm#~jffsWzvYdJ3|q;ppzKPlt- z5km}*ozdVE*?02VH*y{B|21|#xbp{g$59EZ^}bl&J<~j-0Vy)6t|hnk7TC3f^CU&N0ta#p{-YnVc-i`eP8^ zA56lPI}7K9&K`P2cNun{gZP?t@RPo!nGx9?-nk3J2O1erOxwB6pb!eNtrXQ5Y57p^|QTH zGzh%eBgp_yr_i@qlpz(4ju+8e$%G}&$(3u;+z!$vob6u5&(&&G8l_u@)P=R@5GVO9 z(UyS(vYixulz&|ddEwip8OMDkZBdY9LQ&(<>L3D`JLaA@@DzF7h^oIPmk)9p8;z9s zLYBm-(&s& literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-age-canula.png b/app/src/main/res/drawable-xxhdpi/icon_cp-age-canula.png new file mode 100644 index 0000000000000000000000000000000000000000..715682129b554c1c57b1354abadb5d4be3073792 GIT binary patch literal 1788 zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm4M^HB7CvHNVD!!mi71Ki^|4CM&(%vz$xlkv ztH>^BXQ!4ZB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3j zDm&RSMakZd%cjB#Xh3diNuokUZcbjYRfVk**jy_h8zii+qySb@l5MNx2(nNi!Z$#{ zIlm}X!Bo#oH`&nGLc!cp&(PG;!pKBN!N|bSOy9s#-_S(Yz|hLT(#pV40Sc7txD;%P zQqrt~T->0R0eQAc86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx=P7{9OiaozEwNQn(g#_h548p8J$<3=FI}o-U3d6?5L+jqDc*m1zICoINdqhqtmw?b~I4n?7Gho(h-DZxh=)2jAVR2$t*H7*GcEuZ_Yvd&Ze zicjfP#(%Z1)&?(Mxh z-KgGhwD!jJ{sYo37rYF84o30VaNJ?+iAkDkCAhBkK>3tEnz|RQ9$0qCf7`W@zhd>8 zUS97FZjH+uUhk?n@A)A40mFn_g+DVFt$Vdx@@FM9&N8SsoR?nTd*JVuZ(ODc>Ki00 zCa*Yr%E0UU|FG3wx60+TJA~)u`3419PW0;C%2Od2aV5fzb&pfJ>(AZ;hg}xlxnz=H zFL)tNnJ)9y{A^RioLihKa{NgRAzh7_k@7TOB-gtjBmkq-n2AeBs@o(Rx zJZ$57bYkOdrk@^5kDa=vT>tFOIhGGn1>yzrg%-27vfQ{@;mgq8@$Mi010I8`5$oA< zPVfAmXyi9XAk}__tfy+kO{rxkO4nNzzOZ(Xk;+eAS2la=wvV^2e%b7)6ynYGruxQ{ zb-KZvVc+cQcD3ZrW4*^_$NEl%Xug`zqbuume8G6ebXv*gO6V2>TzvlTMS7@|B za>q=GMG{kWttCeA6v~9<9o&|f_Y8KyQ(YdifN*Frfy)1(K^_4t*LO%j9&{Grv`24OP#iU z{Sr|vSFeMo=CPI;zmM(o)QmWuxz{YU-}FEb*EJEtJmYNLb0!iInylPW&7q4odscb{ zWF0)!mmVAGsT~plWcq!G?htQicLFlc6-i|8o;GQE)P_x)Ev)yhcI))ijksx@d@ke? zmuOhnhHH$`8ezh{mwugTlq|ZZxaieXL-}m(!p)hzGp<$l%$QTwvg6X5+9^4x_;B;OIYRh>UkVjud8nH z7S+l=_dD}J_p$7r88bI5{1|oq>H8J7o@aFbPm;6!8~*od_iRl)fuq%*@2YxtwlC{7 z|F>tw#(R;AzMZdIx`KA|K4IBsg$ zv()xAWGP6lDUnsYFD|cgFk$KIgsZ$7hZ2@%&Z-D|b-*Yh)5<4*{=r+tD{H3rMd>b@ nlYUox+V|ZhM3ihnO#he-E<96;d%m(4RB3s-`njxgN@xNAO<(~0 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-age-insulin.png b/app/src/main/res/drawable-xxhdpi/icon_cp-age-insulin.png new file mode 100644 index 0000000000000000000000000000000000000000..79a21cea45b98f1ee10bdf10f9a5795e01abbc4b GIT binary patch literal 2867 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 G2~7avWJGoV literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-bgcheck.png b/app/src/main/res/drawable-xxhdpi/icon_cp-bgcheck.png new file mode 100644 index 0000000000000000000000000000000000000000..4e68c25d70fe7784c798a24452fd487dbc47b0fd GIT binary patch literal 3637 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 wc=4zGR1SmPHE_?ue$>?3a-q(_)WNT!b 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 NG}1@uz0|oE`G2%h?7;v4 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-combo.png b/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-combo.png new file mode 100644 index 0000000000000000000000000000000000000000..c91b51500199cc50507ab54abe18af243707ac60 GIT binary patch literal 940 zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm4M^HB7CvHNVD!!mi71Ki^|4CM&(%vz$xlkv ztH>^BXQ!4ZB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3j zDm&RSMakZd%cjB#Xh3diNuokUZcbjYRfVk**jy_h8zii+qySb@l5MNx2(nNi!Z$#{ zIlm}X!Bo#oH`&nGLc!cp&(PG;!pKBN!N|bSOy9s#-_S(Yz|hLT(#pV40Sc7txD;%P zQqrt~T->0R0eQAc86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx=P7{9OiaozEwNQn(g#_h548p8J$<3=B*%o-U3d6?5L+)$I-`WH|cpG4~CZ?hJvON*WSt)^Ul=KAI-J?I-7%yzP=b zO%K8abkrs%I?mSj><;VJkALtgF5UKfU-5kQZD-H?Jpc6gT;AP2OyDR%BXTx5|F%td zes{U%xs4*XJ=dMv@>lC*_x{R5i`QP(?w5`IIdjb;$4Re^bNBldRj%52IG9)W&QX>5 zlVfIn1WA470a1V{)i;MiwN0~eD-0FrghkN%xAXpD&obk`zwL}a z-g`4m>{{6*>tgvN&Ki**u->DW>W)i&GCBG9)3LoO+fPYnyGES+t#baf^yEL$zpXw7 zdf+h}tBvFc8mg`N?YU3==T1g@f3|z~KMGz?nEWQ~|LZThC$~2D^l-jDbmI8m^?qk+ z8%#@dPTp+Zb3l##a8HZt(HZYA-SqynwRVE!-kAx>FQnf2Zuni6P~Ic&Y4_*xX0)h+ caX+x{XV~r@*>}@CQ4=KQ>FVdQ&MBb@03EVg%K!iX literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-correction.png new file mode 100644 index 0000000000000000000000000000000000000000..d0c7a40613f5db6bb4ef31424459ea600cec6d98 GIT binary patch literal 2449 zcmb7GX;>3h7EM^f8U#_P$dZNv1ws}eAqfPAfD%9=B`lFevJfMCgg}r@1EL5hEd^Hu z8IdJKOq8u5%M{ z>*5B3xFAs&1QLfpxj7?Icq9&wL_z)xsFyy(Gd=z&KGg5PpJM8Y06oU#a_|TQkH>@a zT;XZyYy=92!y%9^2p1P;HNrXLL@Jk_?VOrnvrX|o4nI}~Gd+RBO-M_HY;)2XX_;IC z6pGjuLHwzrwuku3pSt*KLabEvSkl%0Apvc806-TQ;O7&TU9&jNF5ktn7+PI^`O4A0 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-meal.png b/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-meal.png new file mode 100644 index 0000000000000000000000000000000000000000..e13a420bade111dc6652d821df727ece1ae11ca1 GIT binary patch literal 2746 zcmbVOdpHw%AKwgPE}bm5O{cYln9Xh2W-hr@7@ON+Az_*c!!Y+&dfkeXq>f9-iODsW zlI!Z^5?*(TTksWYc7 z9QMxa{Us*4w;KUN-T(kV8-FKPmMh5??-Lw|KJOdsO+&K-nS1>`h6$T_-Y0;@LU_|I z_y-Y@E6wdlgugEl`3sh$MPi!M=>DgpLuroDc1}Lg0X{fiq=_-ah>hP92&A#jBiMl# zgTnA^BJyut{N8>48G}UpO<@HPk!Jgb2v-srVICYxLtxSRnm*dPh6n>3S{sWq)X_sB zbhNbfF0oqpH1`;qVNpS>^K8wauw(lY|JAUdh53Z~Gg4L3?8f-OGqKwQ2}GIFFs%Hj>N41nO6?R6e-;eXBHJj%mSGET5o;va zuvd@@fQqm4)0R-L4uaw<(Z9qDGZyDQ06oDKq8osf(vHYW5pQ@9!jVR}VR8TJIpJ7% zqpZT~2i6TxuuH=e-X`ZAI9-;L0QjB~wT$#4E@p)5fnDz31}t%B4{b#+U+rmX+vF0{dc-w*PXimlc*)V;G~ z5p%{_PX$^6wZU_5!-+iQ(T4@;et+6qNQ@>K2zFzJYr%Tpe@=XyCYckL0Me>nyFd&`CS1w@nb_2z!$Z8B;Rj-Y|AtE$7;GvtWXD09 znV#QEf}Ru2>Xr|bDiGS0oI3Zd z>G9gTr}%23><%3L`-bVF{@fM%2QE#?6~?bLFGGby0B;vb4*KPp`WW za&nlFfR-hC_+79X@bj+d;_$C_15pL()S|{hnCY=+j$+_3)SOk;(Iz=s!uas}sh7(2 zg{{D8bhY=^>oxS~(*!V#oM>x_+em{~*sDxdcI0rZm?5hUk;TVzJZ^kJucd7t5-fH< z4Cgg7THbx;-V&o_jhBnLUmurF3Xtn8YMZ;N-38|KasqO=_T2~WBi*O%su<~O0o9R^vzjdEQ)L_OZwMc$v$CEdqY9e=r&W7P7EP1 ziZY~>&ZWfv+zW5?V@wux;Gy^P6E8C`Othfu^jG)MgdC&3hR63R#=_PZm(QT8PD3(4@k#jS6aodjJ5*cyGb_#2Y&qez2iI}urk{qZ zxdDvQ4=yQ`3ttwiUN_P!+J1EB?GY<~9O*+A4=VZeH)v?WtVq7R)$cb`2rYp(4KfncxDmz1zeJH+6<(c;C9fB+KOXTPC=?PI zKt7Aw5?L$C$z)t-bO(5OSg~uFN35|?Efp7Ka(*?!E>O=7=8ZEJ3l0vHBXeLAa)uGg z*2un&6+QV|$%fYjpaRR$u2&u|`aqGf6wWG`0_#E5f7GEWnO?ax&GFG4g843dk#kKd z?5dI$S2}A&>t_Q=W{K1XK)nO3A_04@ibN(IO2Iy@3( z`^-%lkAk;@YMp!Y!9(v27%0Jd){?_^Eat+}FWmg4F^4Ge3V$b)6iFC0 zI62G1-tcyu2=i3!7(>Fouq=z~Blg|a@y2alQ{JNVHlXJ&%Ai0XJRco8SlvBHN(}z4 z@q$h?Jix&!Y9dd0Bt?WO>eRbK*A?b>T~rl?jTO}r6czcw{G&DKk|xYxh7PpH<0M-l z?!*gYkCCcJGM?M+*%6kAZQi2QlPQXU1FqQ<(K0()EuN8zAA4Xrp-4ZW;p_$;w|(Z{ zJap@ugxE^M;81R^$VGFvddiX0%}6(}i`sFvgms06Jfq(Lx_dOD3CpRqR9jcUx{10N z%pdfuZ@{N8sh=002k7Ca?ACp}p@VPY7`2iWicTg+N9@;cVppVFHZa_dT85?Gj?Aq^ z+t_RlR+St99*f})NaRII;3mGQmgQywyQAve^!6o_J}d?)7_MUd>4^gNW}>E?xAV(^%0$-xv<#> z#_i%+SBI}rk-fZBNZ?=5tilSYe9kHFfWnW?{;g3i94wK%VOof40(OqjSM1<3aZVQo zHe_~dRM6!-2%mdO)e_joak#ZTG}UM66ltyb5ik!9adew`fvjl~%dk6Xl86)-uN_)b zu8+JjwvuA%#)W4#qJ)-&pXIiFvTsHnM$})^)xBEd%S<3K!}6ilTs;bcl! zL<~-AvAtUh9ub1m@WBjM9StO<_`TTGqb|;Y3#txGgP~0!JH~A%l%gE#T%DLt`|?!eqYz z+{DP(3}u8t8Sh6L8DotwSR-TjKcR((z^!6KLa|G2&~971s}Us>cEV5Cx}0)`#Ou=O>cSdsEZ}%c~2Jevoro zBO*GS!uIlvG=ps?Q#_5UOs;w9Y}fJh@$u1pu||z*diL^<#~L0UJ_RZjY)E>M$7}sc zLQ#E0T^>XiXxL6jPFyU*tzyC!Cr_?So?Q4m{)8HO1}ED1ZunzDWF`70qxHWAtm!%z ztS?9l8`57{(ia}Os=gCE2fQMQO@Z>0Z>k@=!aT zpGLd*6^NujTNxw|3%C>7uDk}L%Qx=+z}TH^>eIF<1T20#V~uAx6d9YPKZVJ1VcqE1 zaf#9`{va2rNq|3rl$Hxh0zY<*?nrA<^ox{Ob83o^_2T77{SJ6~csX-j&zqoo#>nyLS`@1rChG`>)J z02&V{Je}`R(inQCW)ELkTL4Da#OzKeBtbAd{>K9vTav^iiMv3mL8sbi<^;~Z%r*J9 zUZ0CN|01Jar35l?Zi^eRi=9vQlmeDZ7AP&6PbgU6R@WIai(_Cb?>3{}=hAFRAC)o% zm)`Gk1hn2N&5Mk)o5|%tZ+OD?Ed~l54M+?7{`%%X%3rG{RA8HO!f*G1s5{pY1wk|k zLx~08aa}8#`g$+T|Gr#rZRYvR!D=46NB8tH(c!cFoY$(?!q0A4Um)w~(p^2CKDRVb>qZ%|@vtgd0y=w%sIFxmjW5(Z&uV!w0i|DXZ_hHe~$It$$kFa*y|Xv5H?y+*5eH{(OvFT1vIzY4H+Kp;56N zJf4Quoa_0%Wi0g$330d>Hq-(p%35U&PqYSuWsk|I<;EpxeCW6?vnD~8GwYdt2I;#{ zB!1?=CGhmuek3tqCXD~tE-)E05{g!y*AlJ|1)m{Z z?wc9is)5RQ&WYQ*T>Uz8xLFtM>t$8@DG-!&c0JY|6mxxP!N^IE9JC-smiR7RMm#p`B;wVg@F?|dOu?HREUJ$c}aYFH~J2B$Vyit781wwxNy zMSqCNDWyKh{2Bj1)Q7#aq1hi4V0i42eu4AHp7##+gV#(3;pjJ1GE}gzRykC)gqjE= z@Jdd1DC)So*7cC)k=R6~iH&G>oQrLrdXj6T=W?f#{yB4umrxTn-42cU1QkkK1v z55CkSbIl5`J5pEnrkX9UIm6@-0;WxV6C*^C#g|tm?pVQm(IHRWDOg=mJUL@X{d%H@ zu4mrEJAEoSEu#GwH!%WjQ+B0G7h)tUozYI+Z5It?a2yc$x}miKqSL(hX{h>2S$kx& zGNP5n&fkxW>@Ifj^!s5c2>hw}t&kW~`))&Urhon0IMz4d6Oy+Aquu#b84xC|ixC8J z_bvL7t^e99*t#;b)s;^zWds`NOb3(O0xSd}FuQ0qo6Sh{iNMF_SB!b%`D-0B%kF<6 zWkh*I?`ckGp@ho-oO87By;^sQVTSi-z%pq-5US`1bzyNji(bDECdVn2=UZv#9K0E2 zwWKQ=pEx3MG4mW-a`{z{sko$jp^C>a4s37A9gLtsFUfDA{ZiQ*<;Hh?okA*k!aWgD z^y-L&7b2LK;aWK^$(k*0U`x_3G3JKQUtUE`SE=}fC^{a+>x~Q!Esv%CDK_4I_r*-P zZql~~su)d}uKP0h2+nb~%!@beMay+L2L&u+cq@Qz`VbO+!sx2|4zGCgQP)K9*Lxxc zITfk63oY*#Kj<5rwHS5^ygNqv-AVGq86;2rD-?2>^W~vvk6OaGtbd-Tf$j83vUTFA zAzxrlvvf$7ZqRJ5{ra|eozuijgY>?8?6n>D2#uP0cuaYZrio=L!z7zBVB^TeN8R77 zxxhcS6fzAQ*@>OPurznmplUW`;7|Fn>&TB5+-)^1rN(QTRjf31KC4OQhKY@nLE{*c zwd0BJ9)I)B$=hUT=d)LXouf_Tlgud{nLRu#PkpAUIE7mKWZ{aBa7PrQriS+B+1N;? zj$Q38-jUZjWb(|^=iRtRH0Q5m$01)5DrPn3T9XuK>>+dgd&gyY$9bO{ABCu>@)Rpg zW%k!zHFoB91V;J4h#MV=z7hP;hl^dZ7?EGGjq1KqgW${Xl^ZkGbK*2`nZvJqg0^o8 z(O%?t^F1r*4wZJxlFWILl{|qHO|+RHEPF+uS{pv^jgl8Kzq1BE^uv}Fqo&WaAH0?I ef5gkaO<>@}y-Dv^w2)u_Y9~9lL-jU6Y5xHg-$xJt literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-cgm-insert.png b/app/src/main/res/drawable-xxhdpi/icon_cp-cgm-insert.png new file mode 100644 index 0000000000000000000000000000000000000000..f1a791b702871250342b40de79c1e548da7fa173 GIT binary patch literal 2946 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 K&A!f-eDQzV)ykOw literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-cgm-start.png b/app/src/main/res/drawable-xxhdpi/icon_cp-cgm-start.png new file mode 100644 index 0000000000000000000000000000000000000000..47d5de66a1e966ee9bb53a1e97f143fd5621e6ab GIT binary patch literal 3738 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 Xciw{=ycYTWpQSU>H`lAyb&dT$&zbsU literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-exercise.png b/app/src/main/res/drawable-xxhdpi/icon_cp-exercise.png new file mode 100644 index 0000000000000000000000000000000000000000..4fb54d370347787698b1b54cd6555b49671a06db GIT binary patch literal 4734 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 ZfAogqV{tpz&ijV*R literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-note.png b/app/src/main/res/drawable-xxhdpi/icon_cp-note.png new file mode 100644 index 0000000000000000000000000000000000000000..c1881112b70839058236539cdd6d1cf648c85606 GIT binary patch literal 4109 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 H+)4UBdWVfL literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-pump-battery.png b/app/src/main/res/drawable-xxhdpi/icon_cp-pump-battery.png new file mode 100644 index 0000000000000000000000000000000000000000..1a6d44bba039431f7b096887dd459580fb570def GIT binary patch literal 2098 zcma)7X;ji_9|bgUD4d9w%8dw3Q%B&hVSxK+us;UQ6^?c0CG4UGdu{z;rb8~c-2wrZN+1Y@LcGuc&*3E! z01AadAleh`?d^07JAPWKAWmeL$~Rw<_`il1iyzNR;tG;Dsn{jWI3{PGzy*gRESV5~ zxai^${>i5U|5S*Tsw)dmmmlkMg$e>el|Eh`p`zlkexa&_Z+dS^80lM76#+22bHb8) z;iN3LiuU?#f#$y&Fs-&8cFQ>{)%?P=FeaH?#v&bRPh1Z&-_;m#K1x26H__7ge9UFI zbm~CqaL!lTMxP0zTQ4X24n6toJltUDeZs=$UrqQXi!JL<4xb4dAFmf56t|1f!QJJH z?;$tA1F&fD0xfK^pG~X$*7)c`vIb-b!Grf(1Z9#cV#M3TY%$^Jp8L;MJd83@7}E4C zV=F#wf|C&nL~%rdXYjh(?XYO5qhHjODu-2S7z3uRl0q*yGwoo`+2@iib_74mw`JAf z^{&$yrJZW@+9F|DWmdfn*F$+#-s?ShwAq%9R=t+434ADsEg!$PV#@0MQ{z_a)_MDk zMZ=-nuA6o2nA39@iyN2${X+qvXVMSC`d}ZS^Nbm21?6<2LGW?s*%kzYf`Wk{$FJpJsY?Z59Y=gd4JwBl{d1ijBRQMp) z+63x%n#g!~xGmUnMS*?CleUPK5$H6K)49`;ZvDvU!tvy^LFiyY?2f@Z5bf2~Tu4X$ zJOlhC51I?@omgl=iA-m&4rFQV7?GenP~^Tv*W+tVCmz=#JjDkyA81x+U&|ikr!>Nb==pv?lY* z9ZhIOVZCR~_Vu~6khQbaT{yr9Z+l?nqAUio8DfHz+(n729aIg)bZfVbE`^Nnu)6JT z=y5ttYcx{w$8)1rSZj%F)XX!=iEdfY@?{o5E-{G6x1ktcW&|v|Y^-95+0u}JvTbi8 zGb!D|FR~%Q$pr@8jvFuz z2r_cE?4e^>H+av>zb1h29lgnIRGIovtO3qROoN}n@!&`QQoF= zqkv4k^+T=EUc?NE>n6z_MKGiEjg3 z0Vxi+-A*YCs)Mq3Dp8yU56oBer2gKZh1E6diFI?|Bu0>^s4Yb|q#ge5?Hck6y``u_kuT0Qwlj@u zkr++=dv^Ht-urD4C)W;Ze;+XK`g~#M#YMB4HOS5>wCk|lpaFaUsO}&o*UW5K_&mPM zaQ$`n$G%no!$m@VTfkq##k9XX6_~1*k6Heq@+?w9Djta~&W|ryF5|ic0Gm!hD?P%qi*ZRv=|y7sdqy)y_>!@Gb<;XHTYJf3sySdzt17bIkN}4 zRmeQXmI(ci0klW`C{e+Sxl8D#Rj%t@uhDSST<}dRS5v!+2Ck(38h#KoWOi^}d&jB3 zOLx5%V|Y+@>`n~~)>DD3u9Y9J)l_mAm{UfonGTQX=BF2DI*uIGfjVHSe&cC-##oYb zO>_Zzt!joueRLa9V4rWpIOf+^darX|k7d`?lh8IBl75|`-F24$No2-kHfT~0cm+6A zW|0~+W9H&IRL{9jHh)Df(tj(DBcaSM6;uuXg=XdtyI(Pner%R7&;0X6y2jh1a-lLK zvq%blS1!G&qLsmWLz(-B-2E;b(c6rQxzA|t+!wY>A6damJQJ>QUESz|R{f!geTQUW z9FDYEby~M%$lAMkr>-`=iu%-V6mY6BJ7>7zXA4%%%?&e7lXHCId$hq~oQ;3K$9HNi z`PC)O+p6?D2rT$U9uN{f-F)k(J%~QT`FxLWHWTs8`dQ#Vvv<#j)2Ac7O|z;k_tzGA z=Tr@UFG))o;xLcDnbXKe!{;+1!T+uw{MnfScYuznSAT9=YV|%_{JpOH8k_Y$cD$YL literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-pump-canula.png b/app/src/main/res/drawable-xxhdpi/icon_cp-pump-canula.png new file mode 100644 index 0000000000000000000000000000000000000000..6021f928ed95cee82509257f9fa852669b3e8f07 GIT binary patch literal 2829 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-pump-cartridge.png b/app/src/main/res/drawable-xxhdpi/icon_cp-pump-cartridge.png new file mode 100644 index 0000000000000000000000000000000000000000..c7a8897a529eed901bccd96e7fe380dcc451c914 GIT binary patch literal 3466 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 VkQZ5UbEjV@L){xXWm=B+{s*p~TDkxL literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-question.png b/app/src/main/res/drawable-xxhdpi/icon_cp-question.png new file mode 100644 index 0000000000000000000000000000000000000000..09455d09fda5539972882f83017cde6e013960b9 GIT binary patch literal 2097 zcmah~eK-?p8(*`bIY@1NFtvua8MYZ?8>4KBP%LTDjtv`YV>`2$I)~+?l;ylqk{qw` z`Z~?bM@JNvoSZkxQD<5Rr;{jpO+L~G=bcX1`SU&Zbv@60|L*5^{eIVd|MQ#;-M7aa zVhsTR0Oo-KG`b-dtR7Qi!|lE1t7ibfnjl^{L&69NCdUdBG3+>D3`wkR}R}lF3pE@{=yvP_MSJNW>?Kgik^4S~Wy4LP8N#p_qdpU_4x6UEPQXPZGwJ zKqBJZoe_APs|OZG!n(S<;9SW#5*g=;_#8+d2*O(&$0gHgyFZ&55Cxeak%-7xY-(yM zCe;li6vty-NhA^$hsWaaE(V56a$1svEpQ-j7yjurDn5}q&#v8u_A5gwCJ zkVx#R3HGy#VLa?#^BKTj8{#Ax)*?2{j|fze0RUq~AZ=H;wD|Q?e)c7Qc=zngai@@> z-g8~Fdvv#p=K^{#7b_7*xrbBok(1n0>tHm$&73XFNnpF_{f2eFDwV^NF*VHKdrhYQ z39fIr3R6`^RS)I-aj&)2t?$WGx4B}siMMN_rQF4 zPS`aDh>e?5)k0*8(nm-F4JbZc+)ngIei}@zRs^aD7_PNMWbdHRcHTd8w_) z#p7!i&;z^P4E0eKUJYTaEw&kR+Z#~os{CDM zJthZ!m=R2Nz?XnJ(~kqe9VwdnoxZGf9{X)Z^l4c{_|?%6zz9lD;W&&7v)a^lcVxho z>;+9QYt2U0K*D#nFyUR`qk7rfY2X8sc5l7^H%`t>t%lw}y>5PEEz!J?Iz>==b9yIgO_pwrC<1cK~0X=Y{`0V_JsH^a{3jP?1f$MFFD&OBe=R7c|}YXR!b zm9=t*58K*m3xM%Pqw(`MH`ui1=S8Y>L0kJK=S)S|b$n#w+RbN~ha@lM+KcjEGYPiD zkw-q;ZeZyyCWD~i!u|>J`XYV>RN1acELmL8(I|CwM+mxKCLh{v-c(aCMu!Zzm*$t( zZZ*@Yq~q>WzsVQ#!hXm`Tw*N%RP#+(kk8rhoW5?I=kCinF|hTK=-WlvAu=Yn3vExO z=yR)SERyWSMQmTN)2%3( zW65F%>OQ|Hv5b{PfJn*ZebBMDrq^i|tgPfMDcHiPFI{C5jsnN@Ct>Q&8?Yf(*QOsh zOJ{y=C>VTdo;GFbo%5Rb`y4?8(?{#iiOX29{aC@3C%?$kM_DI$%T~9_;5?Lbu9a?Y zsWP+{fI-ZLp3Kxn9Mo~Q5_A?BK8^K&72DQodZ|La&Y=7Q3FwD9}&kzC@U93EZ$s=f`0QTS28 ztI8bd-#(H=Dr{$#<@)!iYboF1~WsZA3 zdF1i^w_vvg)?>{m2hSe7|l(SmQ@3yi3i`*-uHeV=XwY-ba+Bd4*q2Qj{ zs;We06Z+o8%<+Nyv+t7{JgaM^kbE34R>20?ADa98_n@u*KJxy#Vj{dd V%c~^rT3Y?-1O4~WRDP_?{{fx(gfIXA literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_home-loop.png b/app/src/main/res/drawable-xxhdpi/icon_home-loop.png new file mode 100644 index 0000000000000000000000000000000000000000..c33f0903116599df12240d08c4f39e76e2377271 GIT binary patch literal 3095 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 uzaVPRY1yGEbt&Ry)bs@u|Njxb0u&k^cqHAZ--@ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-xxxhdpi/icon_actions-cancelextbolus.png new file mode 100644 index 0000000000000000000000000000000000000000..f5b57a9bc93eae27923885e93a0aef500f8dd92f GIT binary patch literal 6123 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

Z#v?jjY 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-refill.png b/app/src/main/res/drawable-xxxhdpi/icon_actions-refill.png new file mode 100644 index 0000000000000000000000000000000000000000..be3a5db708f478fc797cbf7e5183b2151894a342 GIT binary patch literal 4290 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-xxxhdpi/icon_actions-startextbolus.png new file mode 100644 index 0000000000000000000000000000000000000000..89b44ea2010fa9d07cad61205a6b8b2b06481821 GIT binary patch literal 4813 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 E2jmr|WB>pF literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-xxxhdpi/icon_actions-starttempbasal.png new file mode 100644 index 0000000000000000000000000000000000000000..7be2e32dfe1fc0880cb2ea00ccd6658d75d0412c GIT binary patch literal 1089 zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST~P>fzdlNB%&n3*T*V3KUXg?B|j-u zuOhbqD9^xPV_#8_n4FzjqL7rDo|$K>^nUk#C56lsTcvPQUjyF)=hTc$kE){7;3~h6 zMhJ1(0FE1&_nsU?XD6}dTi#a0!zN?>!XfNYSkzLEl1NlCV?k|W4Mg$UmO z1?T*tR0UH#Gu>oEV+#dyOFctVOA8|t9R(u;LoMvg1;) zDN0GR3UYCSS_b6VDrJ)$_Bg3rw^PdjH`oF)X051hoef~+GK%A;>9 zADdT_KFP+jDD#_=`xoPrn^okeOI5r*I3anCN~E;e%%!pZpDMlyasQn9MzUIubS?;Po>hfdLrxHbLX?vQLh|Pk8)3b5j21=^ApXI}NHk4-1|6_+9Db@0;Et(w4^> zcO*F~3TUt}wK_o5J1GQkuy8dxj99_0t&YX(Rd$*e{PQd-`^MC4>r?c6!uh{*QnC-m zmPwX2yjQy^VKVz_(dUly_4A$_7wUeKdPVf~)!zEl7m>vi7J>sE7>GSwDb*KZ%6{8c zH`eypaXUZn|26x2=%mx0*VxadAHS|LKTUsQ|5+7twzK~xJo&xgCeFkIl9*Fb&*0Lb U7<6&ftqc&~)78&qol`;+0HCp6(EtDd literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-temptarget.png b/app/src/main/res/drawable-xxxhdpi/icon_actions-temptarget.png new file mode 100644 index 0000000000000000000000000000000000000000..955a19f3bc9639014853ab3869ffafd5340d5f66 GIT binary patch literal 5622 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-age-battery.png b/app/src/main/res/drawable-xxxhdpi/icon_cp-age-battery.png new file mode 100644 index 0000000000000000000000000000000000000000..dd21ad490ca6fa3a670fbcf26eb682b449c7aa77 GIT binary patch literal 2612 zcmb_e`#%$UA0J~Rw-t_CnGF%!%&nPwTdvV2)gHNy#jv?emRvT;nJ6bjL%mkuhY5Il=-Sgfc}#j#wg4=9Xv^ zGb4zJG0FmIY>7mf!HrQEV@r%N3i5Y@+R8wzV}j3NJaLYHlkHeG&`>%(3WG$($Hyb$ zO%ahXAxM;^r6tnX1ZiRd--&?7UZBwf8E{%GY!~7$3>-N&D25V6r$o{qyO@Eb$T+$U z6pGv>LH^CMBM@ z+?c@c{N_8WV#LKlOVdx^N**jF>*k&_2?@DLe;M*J_U4lHB#^7)@_*}Q`stoYQMDt_ z+Gf!UhyYjvNY${`{qTrc6o_#EEzrD86%63BEpU6eZ12 zLg%!?Gi%<1gXI?X2n8c8j(gmJCjcpcm&#ky7qTI7d;87{m&UHDwFXGOPSkMp_ z(B~y(_rr=^?#TCDS9^Ftno;*9y~U? zUm-8c9%hN%~}{pjktOLDd{{P5WdEHG8benW~epJ(lPaOAX_##EKf1s5(a* zGo|}=2*skPXO3}=#h0I=`0_%PGF4v$sDj964vH6?A3OIGL1zwm$}CjuIWwHu+0kkI zBwARBJ96hG?M17=Pk7?PmoPOBNp?SvcqEr9d=KlY_1bVtQj2b8*hS|R&p{T#MX#5O z!_(0BpOdnPQRX?HfO5{s;Y_O;YF?OX>wz_ukBCDDwPk|7=w746?$z~yf1ej}LcU4!yVK*^vEuZ0k#0jR?6d4?$E z^{2#Jak%~wEp7@ihK;rqV7-2wA0Dw1e|utzi&66t|5CEt@r_#ns)#RUBSy%Qos;K< zLAW!OTJLfANXRwK(q?8a>u1WZG1JT43eF}Vopx=Zp0HfWKX^lr6#UsOF|@#0ej>G7faKKWo`iGuZG4Bcpi}*~ zOvT?yCgy%0B3SJI_n6E4)RI+K)?={TIR#mb`J zQ1|r@y;Z%ZHXf@-BUOP-4a?mbYgQLG+bL6D>w4J%%cf`7U4@3-(yy=B{y12czPQzu zvc9=-*o>t2SgbJe2r8|(#c&8(ud5kmcP`x{8$9H(J`PThn~reGFo4C~GWS`nU15q9 zQnS#6iE--FhXt$ z()YW)Svoh_-Q9h0hNt>OCwjPQsfMQ;#1U`G(ZAhrrM3MxZPL$m39lx=LaDBwX16fC z(Nl@cl{)KDgIfamqxR|S@%ppON#Hhg%XlWUYn6q}NrJnaJiT>&R`WMyztTYd zUL)(xiCjmYfftmlR=q_)^pgUNrs*~D$?}aoE0R+$8+ZW?Pf_oyv-mbnV!D|iZAeJf z{Iz8hFn1gNZJk2$8~stEJ`6~?yTMs8Soil|vbdzkX|n<)7JOf2+KDF~DCmA^er#BU zKe!3&mMnV|g_Lw}QA>;E=rJy%JrfI6aiOnjcuIHKv`<*vM=lxn`n!(gnN%~#@}fGJ z`<%tAq`C%`RDL)X0IKlwXx6IPGw85emP8Q;P)mWxt&xMz2N3z9h?2|}Mx#O9-C zAch3tOO6G;+}ZjaS`J5qYF+?yQFGE*@w-K&QFGC-gxIj z>FFExz46oR54Wal;w3@e#!U4Cf^aC<@P0xOI_x+gMK|B=OifMA$E9X(I6H32e_-v9 z6FY8v|8U6oy{5AcX(Rdvd#Qa5a}QUrm)-%)*R+o( z$%`-a4$I-^j*DgArAZ9KAcOmR_!VjjCv&Y9MztXT1#X>pTmCPVRRraNHi=+v)fZGw zo3^XSn83Sd;h9YuFbBPr_c=uk&m-<#(^#;QssF%@SE{9nu|kLZgipJv*)7eTGMo9_ zdJeLO`GV+?*T$0{!zHy{dN!{KW*^FMD0)>RLVjevuyFJW@yAM3PM($0FLfcUolk9D o8416$^2-M~_W%6czv^1I8w`wmXVYw!y!+X6Ip%?@KN^tw2NblLGXMYp literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-age-canula.png b/app/src/main/res/drawable-xxxhdpi/icon_cp-age-canula.png new file mode 100644 index 0000000000000000000000000000000000000000..6a3585b72f53bb3893e373ee11770e15fe33f193 GIT binary patch literal 2285 zcmcImc{mhW8=o;U*D{1AQyHeQWEp10GR)XBma%8ZGGrawG-%9al5Ab2MAk?mk*h2r zOLn(A#@3~wD8zhHJy|l+7nS%%U(fyP`|o@1dCocSS>E^eJMZuOan5BICmV>^VKD#z z03q2DT?KYy`5EMn%4hW74q-wM1(Sm&dz}Sox9S}sL zG7*8)(C|nTw2d$%{CGgOSIUC6gU};6hDD6S~7lTNR31WmtGsB}I5qp>cflr2w{iEr^W0XC%T~PXIFq4jor#TKt=qk1a0-?=2SYntuV zD~ctNUm>*)s5K8ZHFTaz_&oq08as+F2@M&IdHdZ?wE_GY?;JZ88d9pbVT>T+;PnWNb85P}?@cFf<`q{K%LtN4x|{_DFc!} zI(^w|upRR8?1I=hZ66D`g^tb)t6c+r7NTel&ya*a;CY4Y0u_UAmt_Z(Z>l&E2d3)> zF$~C{0&gdGY7Afo94*+ML185YN+}*O@SnGD4lPA|U5{CM*weWxCh=Zd!nQ7Jd_FNA zzI9?f^ak_}cv+d-uxrSd_O~C}y#-P@8qZMxpE}YzoLNNc6te8-7DQ+S)gsJK%fElQs*)2!&8={F{ zowDluB|(aH|4vC9zz^KhWC6Echh0=^vFt0f-M%r}2yuGr%PlcKg! zy09h1m*5+7DY#lo;<1!*BY?arr#W{Ji!ib~WpuM)yD()<77i>6d|k%fS@0CvvGVCZ z<t=5~c@?Z@XMESG5_S5pkkDV?;BMXi^?`-uRrcT(yuWehau2OfC6Kc^ zC$jtk`Y!#D)X*X;pZq^O97liU?{g7A4M+G&C%3J0wgaX^H=dHQmaKc>=-?gmL-GUu7 z*-E`*t-d*8Qb4JLNxSM;+HJDxdab_g%V!&Nnpg6PSwQv9g5s#IgG;{&bZYe(`@o@< zI|*(BJz>V^xjEzovLh=GB>UX$h3klSb*FWN4ZnfyPp`3kFjuM-e!5*`(QSz4q~yV9 z7pYtkeQZJI-pzS)INLxjjk4w>FLffYT_iY-WnD340-3TTYfmMcql%x>oK zweW=l43&Zyb0@BuzoB!fEJnYaA!++E`CqE1t2N6@KtgYpJ8_K}H3Z~la=z9kxdoiA zmpcn`<>1nDhfEMuio74a>tL~WJGgSi;+}V$i+kImeD>L|a&(Hy>hZ~?M})PhHW{+n z^>nCcp0=oHLepXkxw*~sdXUxjqSEQh}=ux@X~ zr@^4T=C#?Z7DJqLTZBv^?Dd#- z@$L3R1LyZ8g1cNN&Y3%$Oc2|0%v>v%ta&K6EZ^9>mB-$$w(PT5c)5Py+*!1c^MNG0 zmaqtKjtURm59C(8urcm!6n{ageL!iUO=w7Wp|TjiAkqr!5#xk_+MNPdRnO zF}XhIol8qXS!b#P^7IuixukLt z;-8+kE2Jt8?T5T(%|OF4fLz1~8(NtskuLInWfcnB51D*9qlrP>pM3wrd^UzBU3s{4 zh)-#4o$S;t*3q}z#l^`+g;ZU?*7AQmQ|jLpYp0YuG#)`(_I@cOD<@+8asSl+0JJyh A)&Kwi literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-age-insulin.png b/app/src/main/res/drawable-xxxhdpi/icon_cp-age-insulin.png new file mode 100644 index 0000000000000000000000000000000000000000..3b50b616fc64a1e7e7cd82a090a837444e38a0d1 GIT binary patch literal 3972 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-age-sensor.png b/app/src/main/res/drawable-xxxhdpi/icon_cp-age-sensor.png new file mode 100644 index 0000000000000000000000000000000000000000..2dd35e6e9e27fc6897eb6346fe5857a339d7c61f GIT binary patch literal 4801 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-announcement.png b/app/src/main/res/drawable-xxxhdpi/icon_cp-announcement.png new file mode 100644 index 0000000000000000000000000000000000000000..256631f49b600a8dd9977991d31a1c1b3b06db97 GIT binary patch literal 4990 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 Yt-AkHka?Si`^J}p?Cj}O;}DqqFY1lH>Hq)$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-basal-start.png b/app/src/main/res/drawable-xxxhdpi/icon_cp-basal-start.png new file mode 100644 index 0000000000000000000000000000000000000000..d36b0b711c904785a158299520194c25277288ce GIT binary patch literal 1038 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-carbs.png b/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-carbs.png new file mode 100644 index 0000000000000000000000000000000000000000..4dab75558b6fa73985283e4e9c4ff6a00a498373 GIT binary patch literal 5055 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 UtM9tmKmTrK#+F7k2JZ3y1L8YUk^lez literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-combo.png b/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-combo.png new file mode 100644 index 0000000000000000000000000000000000000000..1418ea49947f70cf4b0db37b4fa336646eaab512 GIT binary patch literal 1132 zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST~P>fzdlNB%&n3*T*V3KUXg?B|j-u zuOhbqD9^xPV_#8_n4FzjqL7rDo|$K>^nUk#C56lsTcvPQUjyF)=hTc$kE){7;3~h6 zMhJ1(0FE1&_nsU?XD6}dTi#a0!zN?>!XfNYSkzLEl1NlCV?k|W4Mg$UmO z1?T*tR0UH#Gu>oEV+#dyOFctVOA8|t9R(u;LoMvg1;) zDN0GR3UYCSS_b6VDrJX8rgp=vDEP7wHJcF zzr;>TU+iA<<>(7Wojlu<$6g2u=cw$Q;{55>7rvq`v0k5^14VM*{n<0|$-xtfClyyt zIXXwu_5s7WKDh}TELx2Y59OZx_@#UDeY5$W8BeYsl-6pLiLY0$w5d4!z4`op_304- z94uUo4vGRAEKIEq3j{bsm>QiFh!Fg+)t>MC`(*V+<*=C!(>{NF!RYx;Wv6M?5v}4*R+6kF-f^U>T;p5uZl_B4 z7gm|yo#x8ft5 erhqCA{HtZ?eXH@kVb7&(kOogzKbLh*2~7abh>IZr literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-correction.png new file mode 100644 index 0000000000000000000000000000000000000000..ccc3d0e39cabeb86d49ce3d12b473a74e0505602 GIT binary patch literal 3170 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 T+>JFn{x+~Ow=-)r@wxFoI)cop literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-start.png b/app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-start.png new file mode 100644 index 0000000000000000000000000000000000000000..e8d0e6773e4fd6818265ec0e602422d7ece714a5 GIT binary patch literal 4949 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 HeHi;Mzd#&{ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-target.png b/app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-target.png new file mode 100644 index 0000000000000000000000000000000000000000..2bdaf7d73d0a83c5b3cdc45ae0694eb65037bad0 GIT binary patch literal 5083 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Î+8ZlR( zZx?s!{Z4^$Pv`4#_}R>(0@EKrO~(y~UWVNzmZUo?d@`w6fec7V+x%FqJF)4_9IKkr ymt7(BHU94nWuaxm)bmRHn!^9V<8?(w1i@y0vzSI%!RLSeH4Jo(b!xPnqW%wN{oi*0 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-note.png b/app/src/main/res/drawable-xxxhdpi/icon_cp-note.png new file mode 100644 index 0000000000000000000000000000000000000000..dd1e04b41930b3ab0c3aea6edd738e9ba0e640bf GIT binary patch literal 5399 zcmb_g2UnBL)(xTe-dhNvcL-HN4G<6nLQxRuB~b}2fOMkLBtR(A6p$jm6r&(jx^xgo z07Z(TfPg4Pks=~|@qX{Rzu?YVGtZR0_MS8ItTShwG`mX{tV}{o004m15&=h2z9WAt z10AJ(dWBdD08m{-J6^$Fv9Z?k2?|v9@(uF#Q@#}#Oj!p2^bKzXd->e(!-Bm10?-&3 zc(z|zF@=da7!me+$@v38WwD>#v7|oBu0D8Nt9PEH+qAMI|yaQaMsX zIVdzhMNL;%S4CA_MO|Hqf=~*J!eG5_DPh7S|5E%v2iz~rClnowMF(L(e>uIpgTk>e zFj(cUh|0ez6!TR6YaeCs-xKn~P>v;(Vn4`|s0RRWr&z*`9dA9{E{Q7i@QX^`m5?wp z0;b+nHZrE=k>@aa#m6A~fRB@-0r*D#5$l^V`NpPZ(4cFel@r|T5f4udurU_|%Ff~F z1*A1HXsb@(RG2Un2z;Zr=JG%n>2r+mZfV8cYg&=x>EgFaO!K#>MRl?fPP zSq;+!GFNrgGd-k!4Pc{vyZQS!xwoY^0dVy5PphRTt|?b3v8Y!fkG)bGfT6iG(j?q) z1+=|N-K&B-P-qcnjpc0vu(y9mq@7k~11eKH*M5IN4>UC8j+#lKofbP2(#gUd0Am1# z!{A>DiiC(@nqa;=`@8K5TSY`lNU5!C_X8Xe4i5+6m5Z|OMrO!8H~a63#w0tVA8-js=DyD zx6E#L`Djb)IqC}AT0_eQfM1l&%kfLL{tFY-5!CTct70+PXIn?WgcRg*7OfVLSi=$a zySwn|`1?kqmnnWYW?WXl0*uufh^Y(7`a^=pC$Y`BQyZi>zh+veiUDq1PVJ&r;-Tzc z6mQ&LymWnfwRf_&Ug$`Nhw=GLRJK{%T#rNOb}iGlQp#YyJxs_vGOS;npl4OKLpV2UEbNNY#so~M3<-8X7!Uu`QL?r76{W2j?wjzz@b z;IyhnEHB^4bbu7}(|g?+j8<`&z7XC}s05_1AM(c@>ed0{2ougrXui4UVgy?ogw7&I zfG#ibrYr9xW-xqQB<{XrpG0x$GK5C>7w&tu5rXP%&S2xPM{wyr>7=mZjc<>QBIINC<+71lN}R;RHx zMqSBC=Ai`cPzg($+9u)+Do4e zqe;>gwCdRUBzMw;`nEFF;p3Al-JYVp$P%t)URkveW6*lvCfxga^Oo~iOr`g5m!j=W zzaQg^*Y41&L+kGhG+0)@r`=5NQWZ$J=Gfx7I&c6E|NPkK^;8A)_oXkg&u_)&ea+wl zb8la^TIf{RbL+oHtA5-m8aJ;!*7V!pWI>r}D1o1Am@e(>29>y^^vh9Md$j`t_=d%i zeRut0A&isRH`s+e&8OeGLjyO(!9N^xveF|N@~1;~UyJKVV7lGaE-1bUxD|+mYa6Dp zGW+fwYt-@*b*bYTDxDNtH`9BZS5CAEE=xCXg)-%j=Xk<5EF2Oe^WA#n1cKf@H=;|4 ztn{+o8h78z+DsSa9j0k=Jy_3a^I#f+v9?32+Y*oMSl4JzzvO(KA#>Do;>C98QB=Z} z1=}W(S(}d8*YhTw z+xQAoW636Mcj_1qe4bhAB-~1H*Gwg<=zJ&V=Oe{sN3dkv+vjocY1LY+8*qRgJ*VqNwzk#a#Z#O{P>`QdTxe3Y%mcpb_Qo#$&I?^}!G#S@f%s zqI`%_7%4Nf=)!O;7PXo0`AsY@A{1`9)RpRjC*DrRElLy5IZJjrR5@N)E#1CgS3H{Y zWiMj@C>J0OeXD$t7(>?{`I==&EXlc+?UGvpUl%I7Ey%p?##IPW1>Ujh^yg{qkW!oI zLCX}~YNQe$qL`Xw058fN=H8U*RuG7>_W1UPd#((w;tJU*-jupjVi?6Jih8Ne!JQ`& zthD#Ry5lOj6B4RZ_qD-D&!L6geos~?V2W{Q@~PsRv<^1C_Cl+M1gZ(2YC7-R$fIXw z?f!mC`1rETkWa*6V3cH8`RPp>Mfb(5m!ibfd~~E-T8Bb|Z+AF3D#P*KpZ(3x8HEG5 z#+)Y=JZI|F<%4Pbx4#SHUPO6J`R4H<56?dvtZ{Jh4(mW^tkPEFebt0GEwa7KxQ6v1 zZU5+e$UsidQQVwRlzTH$#1r>(12x9ZhU!eMuLdw_9X*{O;L< zwlf|spQg-_Y6LcDqNzjVjX7S(2FkA4{vzDsLC*zzgheNuGhh+N0f z;h=TbK-R%vrz8iruMIRK_Wi4iq`N)emZB7%8+~;AD6SreG3DNn*Zh6*Lit3fM?DLy9OmKsf8BQ%QOLxcox9$R-jsA+9EzXZvgCC^+X zY?d+(EG7RaI5wUQJJsUghD_Iu&cO`Df1RDF3G_7J9dSGt-g&%kdT{UUVI_JYsomsy zd@%Kb8-CzDl~Ow~r_G@C*~BijnsE`Zz@gNKPVXC5_PaxJhChUwap95^in0-EEu8WY7jP&*xHP=0xkNX1|(yo07E<{N3r$^Qu%=SzOESD>O z)xq?U_|afS{pmN;D8UyV+-1Xw>QPftJ@&DBLdltkklqo_k9T=S|E@mdb?PP?O}xnobAn`u&vk-Czf0Z|a-#ELCi4(RRMHrv@JPaenDecbOj6LB z{J_4=Ts8DPfU|5#4DXCbdK}*%ubrF&)r^x_9AuYSXhr)19gA+4S8M}oTrCfUXN3d! zH{_8XzvMRYQ3Kn1sy7}v-FLs#69p(IDgL6Z}xl8|db+|UtDc|%mRM?C%YXQbMB?lD`$CztygSV{!=!2#G{K@-S3Qj@p1#N*~Hc{sYM@E|%n z>+#Zl3-=Q{%*AM}V1|Y$>xSiA4Xi?J%U0oHbEy{7nh`XUXi^KlDRZxUOfK!~Acs`J z&o+ohW$ba7bV%9Ks~7UE%MOlr^<+3=;AAZv<+=Q)HkP)eX2ia#x++=zS@~$VZ|d}& zWXIwBCfz%2wmSk%`flqL3_`V{scuU)w_6z3SR6y!^GSoSlPJTO*UL+ zUTUSc8Ol;bJLFlV+Ra)`3BKf&#`4pzX6YMtF?m3>mvLtY3SX_NR2 z`^|L1bPn0WSIY6b*-wL9Eqq0+!iowhVXS&k8(1J=V480x`7^=B_MQbPe#CLwrDfOX zi*P~t{(207IOICa1l$GYv)8s<9x`-F&8$Dovwc`*HaW+YB0xI4>}Po=GBuIrFAg) zb-J2?;bGGAjmdjc$UUz-gPi^P;yVMJ2P|5G#ohKg$v?y(dU-_|`DV{#U=J5~j#(GJ zceAoSk2dx+v?StApZ;s}!7czS{%i z*O({V;qV_ELWl5mn!&U|d2@DcPVH_jO?0D?mPE-*wmri;*s==*MD0RMeEOB_68m2E z(FY2NeC!c27=eK6)4sTG58Dk28KXI~tMGLf)aV4KM3Lp&PO}<#4eCduKuf<7J{D(o zq-y&0B&>l&cegk~gkSROv`CUd>}=o%7D6?XFVE-wEQ_?cv42c>v+Hk*%#TNOGl#6P z1(4^6nTwr*G{y3S37peK;L|klR+KWmDr$h1Z-i7* z*Dsh+uJ)V?9O<5O^p}5YBQ_e-0Wr4Mr)z;)jrUk8r4gWM0w-(KA zS35ji-_T08z}l1CSr?rUO(w{1_20+`+gx3L|J1uflI#mZDpWBkNJeIVM`;8r{5W$g z*)+@j-WPA6F#@#&!Pb<_e{0aTC&u27&fWM-P8%WSB_qN19E;oHa7u$!XGz zzT9IrPYSB&-!Lt49>^Z$HC>}?&%XJ7cgnxFvAGmFQP=y#J_gQRr#rrL2e_LB{uMzlFXFE(Q}Y`t09Tt<;Lh zyHjEPCvblf`koOVC>t+W{ktdmG$zOd^Icn#KYS*%7|cOf{gi+4i+dM>!+~5oli?Vt zsist62`m~SF|ASg)@d~Fx*xvO%-|ZC|0ns_6Sm)vU@%kh3c&8uQ7mfjt?9MYOgQ6& zq@ocV>@1T$MOrfu9N^*YLriAn>AZ(oSpJuh-jmC1DXN;Nl_G2+D=w@2g+yH?Wr zaCRb+#B2BV*dZ;Rt9+}AKp?P7l&3Gl*Uc4Aj-w(&!s0?HNEVeQz6XH_hgh@_atwt5 zgi<1+Vy&RdEgeuGD$EM%gLOl@(GF80qnr}xlw%1;Jjn?$WQ#E9A!}Iz3oizsQWzls zi+Un99?!CZ{*8+l@3)UpP~dMDMvN8IcAF6Jb#n&}$I&SO7HNhc8=K$&a|@&~)&hqy zg##G0u^9?&figBlppEfp3q0Bw_@_awWdQ;`EF4cFI{ZT>wydC$3L zM~^@mTUc12&=?d3gAjWl;?Kk~LRg5{c)e|i|6mX)@nm`wjS&?W3v6SCgvOm>SV5tv zZ4%T!EMj@6fAxute_x0aD}ENbSU=!gjR%2t3_25SJy`{d0_w#;drjWzR{aZ+1cIO8 zWz{aYp(L(sO&y&ZNujt_%6+N*LTIfFUo*ocdlgD_oWUV z?p!aj)I)_Gw$wcDyJbnN(~y=ntHdRN$=uBETc~l<7R$tl=ES1J@Y#L>MrP->?R0T%H8lx){%_WZJvDS<-q<39tFiAZX&UL{_Gt60(kyyjKmwb zPyib$4foqo5O_-Ov;HY|E2t4TsU6*pQYB|iIBNqpBtN?ZT*$A{Sz`=eiiFL?XC{RL zxlfbR+vk;1I+T*DXY=i*RAwQ|debL{7kEuPwVjj0_1R!L0gZ5M>X29lEgc=(<3-+0 z)1?`$l$`8cIx0UA_r2iuY3?7P+F7OjTWmFBT=RHBF!-LH<9MlBLmAZ&@`hs38{i1H zb!WEx(s=!%!E@}fifk}O&+%G|>PSsOlab@KIc_Ymg(Tf=ZP7avZF7tJezPj3;UhPr zD}zMV07%jhVs9|pNmE|gFcl1?pl!JF(wyv0(61N`peuS~xo%+*RnURFzMsw#%j~N@fuBlD>(*nFcj9)9NuAZi zDY6F+ zKI$ue$|mM6?7{9M{SB!a1*1RaM)Mg$D@41uCWQO&HM=rBLdyQCe1Hoh75}69blz3# z{h**5rJLcRaa%#eouY+c=%5>QtV@d;7YekeiO!Mv4ABk_WMZ=^4{{u0rowzc=&a2R zcYQTd#LO&jyUNN-4t#{4RbIb23$Zlmb%Ql)L3ke2)^AABcz+X-WbKy8%)F}wx)e9R&Vi5 z1kb76K~L_ytSbt6)xwe6AeO}BVspDO=dV^Qn&M6?{|r0YC3Lzqx&&NMW?nL%fp-)- z2@c^lm&ZP|bvVQIn)0vqBKpFi=p?_;LaRG@5^qd}?=Ef$7o0`F4ckz^)2+<8m~@~i zjZW{YhCOk0^Nk#1wJ8H%)t;;Dp=6JPr)(v=p7AwGwMUgYo}A*!T?ypb^F1g7q#W)f zrM=p-xMZ zLAcF_LHUmgIf?AYoCwakXDD#daFN%!V3G{$fkH_~V#8)Nex{>u9NXT>N_6K#ixh^HunPGsk4F#sX4qFi-c&VQzg z#Kis7y@L5nSobyq?@cfEl{{-2Sohw!X(&vgHZ8ez$UL4C|I`Q6@M}%Xt&Qupf4sNM zI=k>o5pek=lCb)SC2BWR8)XW+I0%hB+6JEXU*+Y0OB>Mh-)mVN~* zy4~b3RMwEFwJjBqJnQ-1uje25KG*B@Ib4U=`+Z&4=kv>T)y?Ik7~~KH004+#9PHfr z=ZoKKpAdh4=+k@`0026MdHBTmI6Il+hy=aBU}6wnk4zx({Q!XFF)}F-7mkmC1>r-( zBCX(@o_;tiEZ7R}ZS1V?OtQsa2y;k`#-B-a@xUd9w|j0zM`XMkYi= zUNR?J!T*D6&cFXQBjK?Bgv5kf!EJsM!hD?FV7A0)Jj_@Rt&1}-G=-U%=@}TCnWBsk zFqFOl8mVuFG%(WDH!#;XGuJnO{Uh+B5SV3jaEQ6Po&7&#e9a1eAtr`ojzq@C$Lqx# z>Jg(ukp^aFW=MS$5{1&`N9bNkh>Qs&>qcHu`wj7b7|{fnKgOyrtI^FLN9DU z`@mos2hH>YQp@|&NMQft-EF^kF$;#p?6-4wK5w$SHaF|b=Wnget(nXvP!~56Z0!E0 zQX@g&-7z#F@O+{5*}D|AG}|;0YYVOrSB48~J;Ydl7_-|-o;(WJzu^xR@v|W9*BAZ( zqJHOX-=S+WrI;<&u0>g686dlDoF?g@ti&bCEjl;l=PwCtT#TPsg;>-0<7T{QAJJ1`j337#UtuzYTiBBlWJG`Egz;KEyuxnP?jj|uA_j39u$z%16YHI#Ma0BqV=$rSiU-tNSeEnSy0 zE+9P+`fGHP*iQT)kSEzBR$RxUyHb!tuA0^js|T5@K7Mc`0$rXiII*-#qvR||DM3d` zD6Saugd4?UB!G^mU+oi}tdgeb*vfHJ#8*|)&c*J51O4M_iNc^w$rKVLR;Mzrl9{8M z!}$P_>f258tFF9pU2VzYNqQy$%$1W-O!#<>qiOv#PLdnAnDyY^=dA+JVSj1LMzUO0 zm2$yvSF9}BN8?A&(Y|Vci1&fSrqK)1+?}m7&|xQOO2%cms`O5QO5uRKN;gX8T1GpX z;}G`^L{cQhvx^~x`p(>Q6v!M1@l;5I7;gC>?Wz8^&Q6>14UNuUIKfsaGQdw~QAg0> zkAN@dDD);Zk(`D4Fx=M@Kq=~x%X0UYJF%~bUUpqC1(MbHLCWB`!o9>Cw_fPaJBMM) z8g)01LkhW012gu2jxxmxl|MPcp*a>bc$F) zPT-hB;%%XF^Y)v3>ysPn!ov$wsgX0lIz1Y^ zAJs3|eoMVIaj9f^34($ufOj-YNn}V*2u_>R;EC4xH}ZU-+!GqOr1uL+F{W_B+x;?U>7bxq3cpmp9s$HH%mj zyf6?K(RSWagI4fqB&7ogf)tj<0Q#S<*C!yP+4KffRBVV^r|Pm8!^NgP?>xk)wAH>p zKFE8?6!w{#TD)6&f+OjDWz~K&`RAfs!w0~vf@D&jqSoDOE74YRWZ8w<586$8Z>IGc zh^FSQI(OkBIiBt4IZgsXjw?B_)JrqNZFaiTQQ9bLDz2JZEoynP+9l#=pz8OuZdsq) zbH2IdvxbTaO2~!nYmqlDemM1|C09>fM4~lQxJ0yY&pY9-*Ha8=_y{>d_*L7#4AzI{ zb-QrI%wJcXlMX(BHd(|2XQ=Z%)1dcErB8lVkv=U0PlEGM0t)ii-v}!PFn?5>wG30a z*RAtH-AGQ+6_@(r2uAM*o8i*9MA;0S(>QyFI#DoPylQ_viL!@XY*46*{xef7k#M9Q zB{qzHv#F)K=D|k(RNnkX1PT-^!W2RpY zw>Oe34{`!SpU1hHm(CPZJ5F%SXwNsJ*!UY4UqPBOo|fIAzoeH{4coRx-B5pf%7X$2 zEicFqcM8-6Y3@b>VnE;~CHH#3 zNRQZL0h?Wl#&C>2tryju_VHtaKZ(n1H_h??C}P-aDmJulzGZ^3Xc55c7Hcdh)yfgB zd4PW5G?}ra{6!qvD!JKMwcx;%_6b@w>t@>sG^XwW!%dVHmpKv76L(m8j5<**UxR>w zW)kn`BLhY#(}k!$>iZTL?J-1qZdTc7(ozH-)BhxHA{ySKSm1nOd?6$v_(%4KRlkXi zI>6%75Q(Yzv~Lfd19=jG;;p*1De3Q{JT$GpGzXn?-OlXYy`Y-r4YkKwxxJzpGmB{f z^&>{J*=qxRZ%hE!u}b^HTN8qO&8s)^L3f`;qkG@(vC3wQE}|<2G|NMp~fy0FD zAx6cx+DhAvZIRoLw5Ya&X5K&)m2wG_5QCFGj$`|1lrdL!?>je+iK~YVVvKde$(G}e zTG6HPl;9OtvA&P4D9<(}7Rowg`Ldo?**C@~7Q;ik@ajhG zD~aAyFgX{fA@^z{VeaOm%0QjUzt% z=?;YyYWNpLeHzOw8S~m+)mtxiR>a&(<-i4kwYYYpG#=es)Us>qn+96&Xs3c#2h^nq z*e1Q@Jj5fSOgFg-2<_7^wG;D)R%%vb6Xm`oIXQH^wo8uN6nZc;pLQTz#F+ON?qIjKk__N@*Kv6P=Z^z8K@kU{6|R{jUkWs6}}AKypXKoe5}5K zxuDuSb9FE0YjD^OFw{)@N_R&#J$^8jpFf~1L~&2KwXC`=$AW`h^TgSTH1*8lsYR86 zzK|qCp{=xMe2fw+%@N_J*D%KfL<)&%Q%a1w$9T^uz5g`>+3U*!}zSYD z#HU#`t~R%F*jSxu$zY4YP>LngzclKnrMIBu5ihq&c8K2E&dAMd&aV$D#YYA48l=K! zZ4R`6r_{THLxHJF?i)(5aiBN9_=?8#9O?XGImctlEDLKu%Izp89DI7xbT|1*nfq5; zdC+poWS9G0At#cLtk%rg^>~YvX>Xfy&ujp&+hECO?PL99yYhMqymk@UhX6)<57DrX zzF=A|E~qZ_mQ-QzB84YW1!2Tz7kx3PUnQk~R~wB=!H~g<3QJ8gtm7t_d{siSTi8u? z>o#gh&B|5@>G?FmlU8n|wZuS&)=GG@0H@V@F}@qoXj7f6ZYfSqqqdjyeA*>cLFhxJ zB9iXO{I5ql0@c>;Xbqd3>Gwa=uw*{jwXP#p32d`y1)CZ#89P2W&qYqt=Hr3o?{usS zfXaZrLSDId>q?iqb8UYjWx+E^jW%*6RN$luZ(H=i_~;Rqe-Usp+gaM|(1Okm89T0# zx_K5GWwRm`c2)<7QdC$`7LCEKvFiYwtC6n``Y6w=F#1%(FiLh6^Dj%Vo>p> z^xDQqW$;F2jVy)yrtkZn@9+QL`Q7I{&vRe*^|?OR^||i*oaa1GhNC^2A0hz(008{9 zHdfB;=iu*)hl_oGh<#KJ008ZXuGlav<}3;y9H`-YA=rcg4p9;E@;P%uFH1Q7AS+AR){b z5fw-Zx`K)_k^2uXiar0mtSN{14x|TLd3yIRwM*KVEOd$y4&FXC99%dpZr};aH=D%6k@-+Xek8S+7Lxdo9TSD3T5w?#|0D!=zt<@>lsJkm4qI0BA ziw}GYw%|zbN>2$r*7lKQ&nrKl357Gd5;;XQ#g9nxWCAL1}bt^MkHaR{u{U zX0Wcv5MCs+72%9o0<3}CI2as-z|7=;Wb_%eNx}Qu;_0Ck+D@x-&v14ud7K%p)%Vv^ z8QPJP+%!nki_KqaT-(z7e z{SAH3q}xmaoc;t3j^m5HQUSR+L~eFp+0-H%P)<+pctc2^$rV((2z^PnKp`Dul~?N* zyd=W`M?YOFp;yx7SpIYkY{h(;^bS@apiSgVydaSGx+fi-v41w~n;a#A9zK@5G@4*@ zA1l;~YA;G}9|$hh;-V4d{|P&c<@()TJNeT6O%vV>@VpRpyi-3vNVFGG_o0xc)& zC(k_zxgIG`3D4R&Gy~hLF`-2Q?|Dc|As^=H{>kmYconnh>^F4|1D9{h05$hS$9o&- z9nkfCRr8WyV=@<6)4*lrvN&0Sf+WjsukX>|Cjm^(UB&gAi(AB6P}=Ekf9_j;`jcX$ z?O4U*4&(g(0GiO!(}C9yWB3_sNYE1c`8tRp6Vr4cpqH=l;VkzmXkiW}*$y%S$|xnw z%_b%zvA3R>k-e_PX7zJHLhl2Jg(~!Bu0z8Y^POnQJ?0VKJmY7OeJB%Hs^*=PxT#Jw z!@cGCBvA;e7FWczzVN}W%zjm1T~M3(0@;v?mKes+(WtwzA2z^_C-NX}2D81IczDk5a!t3N5VCc|~gk2EYl z9zlm4zYYG&*hcDtt@2Yb-Yix9n$f1~6J#&0^M~?U#Bo!OO8pVRhEokE>@0j`CYJqa z*kt`yi-*~Ps>f16)g`sZ3LSS56RZBTjdO{nH{VnhfWS5rzf0kk;Ox_ANirm@-qu$CEi7|!uXoPN3GgxqbQ zV-i$FuX3Hxlt>k4%%pEeyk@ywuh=q$V@>)F;sbIN=-kvNrFBmlZGSQ7ia)aY6P2*#8&IVQcGWts3iTw;Bt=oi~lD34wI?vj56li=fq5tvDbQ-psG{1%Ref-0A z=4J3M$`&{(=qUu*e2?h$Ff;I->i#?8XwV_%kjwtk9tosnL@|csa1~i&Eqrs~^1C#! z7r8)Bym89=E_yNXZSw94>thw5p32^m9Dbo%Tvx(Vp5+CP*N6dphnp=LPp}`$4*#CN zsdt~!0iPKe4H8a;TYl{z&x!svL zJbb{Q^Q8rNS#vb6Y%H?l{>*b^rp@%#P*Y~U0m`}xNY_^KK7X}iE|9o=;S#SypRVe# zuD89d_3di!+Lb7aZz!hm!&AWMcARUHtIZ_~-@(2b0bJ{t_|5lR6~Lzx-x6ZAzOU`@ zuvW4rrLVsUkuOX3${M!|V~7RJm%lD*V}6Mq*t4nxh@bx_mJxYywNiJqUpz(X@$$w_ zM8tGYw)FmM!elmg(%7_Vtkf!8RSocnxJOESe{}AB^H7C4_pf>Eb!8~Rvh}BUpn_8HZ?Fe47a)H$uB~m?Pw9?=w-<-Qno64!*>fF+*XUYiHPpO4(Bk zoURf&>)f7jy>TqW=vz2fnZTF&tjS08t18HM1`@HyXyX=#&$E*3-|^YKBN>XqXT5B8 zX5wdwzaTk&FpU*Vj9LGSsHWO8n_6X3d+zFAssxN0kY5666F8jkt(AC+uvm=b_oK|X zQNz!_TCfmr*6y>B?;G7%7fRae2hkkvc5x!5Vpn`hsp<^dvV|W$#E2J#-4VK6v4D2l zID@3XTVspsQcL*ajwJ=tSkc(QiZI$QDW?2|4Z=Rp`a!SRv_Ly-%Y%Xlt=c@*C(=PC zT9RrHBIdZcQ$BrW)N-F#l;y)DNv0kg^vS2X$O3% z0d25l^Jg$cUo|yi*egcC++zCIpZPvM?pv*Eo#jKtB7yeu@lj%Gxan+FBXIkcDhD>r z1c@?)>;i){OL91Zeo}jyKTvO{)Le>5B4vI$`(|K8_VN)=8nn|!wQ+*F;9RmuozKrd zpAuf}qgM6!N)P{sG(zO_%hEH$TMw~|2V!T=r_784js)(dsd+VDU%zz0~ z+f(OhJ+lrk+@%!Xa4NRN8yqvbxN`A*sjrsa*pGe_{~LGv&KfHsXBbA29jiuS z1M@D5m)Vg9d^PjkC<}~PW}Qd7__qjx4A`)$meZ!Nt!J&TMlG{?L+@DQ!RUUlRcR8?giU`lAOMl!u7JUD0ed}ZKa&eu3~l2q!N zT)j?Uc1`1h4)73{%{%cuqpuhFn~-hy{X1S6SIJ__F-;@%UaWp+^mO(%K6t)3%-;Og z1wArARMIqn-rIwEyW!)u4sy4wRUehe4zJ7CY=GLt{P;@aMv62To>eZIzeSXx$$T|G8Xb02=IWO2MPK~BDIxx7?B3hn1IJ(Arn3xW~QHGj%o86LAK{c4m0h^$?w>9(q5B6Y1SL#y(YuvMtt(n7jM&PjlaFK zfy-;lQLkpCbYRo~!HNX5yR4E%YS2qZ|HcuM;t*Aa$ECHV2lbRYh+tGwhog3*R~;q*oK4%GW1$dPVS z*ZPcKB;bPj-rc8uxS`-qLj_qUlYnU|2HSV3y}ky6=9KdDaj`G4+!v9{EJoImi3 zt^+N6@U)%!VN00p)>XG}yjiCEZT5k8nZOpIohL-tByLkeVg9BIR)r~O15i$ zX7UWWb28R;Z5P&h%0jb_VBuT75mj`Kci+RBHn}7o?XjU_U~{Q~G01|4%%ED8{@!YP z2HW}YbSzFf%46E!CE3hzpIv^z`_a$Ec|*>~=-RI441R?mp;<<@@1o1imx|nGXMY6H zmmYopt?AW^S69yCR0;t!MBg*TyzUpZwED9azEXdGsPsuk#k!3!*(ee1Io*`24&Xf5 zhEUO1b&+F;?9u4!ZP5El?ANX9_}$(P=2txxYX`Q5`Z~au0cUHy?(*jHv&yesavu-x zuo7yo?bh!fO$~PoJNJ@^J(K=?44tjS27d;4+AsFz2w5LV1uGw?u359t3UR?M%9Rvz z0-;;l5@RTI!fDWRInT)xxB+d0y1(BIBFg6$bVSTKFMoFy_hkEooQi=uNi{7GR(?)q zTD0lqNftc&xthTGo;T#EAnPSzoAv6bVA53e+RsVexVL_HK(4ap?te{RIo|D0wM%Xg zMBpCx-YM`&znXgYg$B6sOj44*dbviIAo#Do8i{)6B;!;J!obb!9L?3p4I)ShAMH`^ z5=4IPFL7os>ALae0GF>ZLAq6PIdjiC{JU-Fc40p2dwRF`s2Xtphc{&=NQ6?2N za1Dkw)w?ON=l2@8c(8Kw1OlutSqK7edIba(3jHy0;CI`R$*htT}zb`r@7SXJ?d`L&A>;QaW<07;KkgQVe(y z!V=tw$F>T0@;N;K0C%Odlpe$eD207-YzF{O=F*7D&8$SxuJ7q6u0dxOfHh&W(*@jl z%&Zw0*EXjQOCWVepSAT5pM!mIoMZ=pje<~(Tgmw2@6i%OLk?7y%2M$i0;uN|y=%$k(v0RaJP=^H44uf6>6v;H79F@oL2vUseH#wT0 z9gR{x?^JDDB80%He6}-gjs~C9NNcgN)Kf7(&socn9pk;Jz-s;hMVH*O1%eo!Gok?o z;g6y4cV%~CGpZRc3w)9!jWZ_X$C4d@MjUY56nzKCOLe<}(((MieMp!5ooJ?BWZEY- SSNi+kiS227t49{NtN#N}uMM04 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-question.png b/app/src/main/res/drawable-xxxhdpi/icon_cp-question.png new file mode 100644 index 0000000000000000000000000000000000000000..b2e19c157587d6b49a24522532ef024552cb16c0 GIT binary patch literal 2737 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 N^w~r5uJJr}`rjyg&Po6P literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_home-loop.png b/app/src/main/res/drawable-xxxhdpi/icon_home-loop.png new file mode 100644 index 0000000000000000000000000000000000000000..a59d73e2b4a9bb90ec21b75ae784ac53d449f7e6 GIT binary patch literal 4103 zcmbtXi8mWq`;NV_RP9O-q1sYnCqz|SBqg-g*q4Y_EwO|IqYb8m^0QN8tyWQj7;CMu zj9_fFrnNM+Ru$0_ZMD-co!^}AANcM$cYogJx$nLA-1FX)n>Ln0{4)Fi06++dxNgU; zhkxc%yzH_LU0(_Sa99O6pz&ywwGjpvtl{H_^TlcqgG1T#007*S80v!w#Nxre*xLai zCXoHkUI;kA&jjMEhtfoaUc=rAK*WS&?PF{lFfoA`m>W<8{S*YFQ8&TYaN$_6o`$|UMoY&KYyi{H(t{al>s|tD zYij93HDORKU3E<@BTbl*rWW|$1i8!)hKKw48`)jA_*abGGlAT}<3o+0Py&IVLD12_ zh2Ms1!C)|`rZ!YtTb+$ikBAPz`w-PbB9wko{6EKaYy>7eAQT^f3jzP+^zp?-;!PkB z=uZ*ozbb6^p#Sxc-TChhVMEy463+G?jI1{T08SH-*UcP=#kbu9_v33qn6&B=Fw}cDVGX0 z3B|vc&H7Qrjckw#<mdxf`JXf8}I1`&{t$A;;g`X{a+N zC)5YP)p^i4gv@tRXMDHV;AOscWwWKi3hslp%b`$8XT*{uW05*pyf&|UF1aC|>J?v7 zyw(b+;&O)3>Y{I)F_ra63^z8U1#{YP)rY0KN#%ks^Ku9SluFk0InHzTMy9(NzWhBgJu^X`p_L|6tDV+KGA$t~jTJSQjQ&e!`+9DhL? zj46qxu?nB1(Fx}^1M5sDx%SP6!WK#@m-IP1y(3Y^-U_p*_|o`=FaGJVbfI=(tA6pX zn8f(!-8^H#-+$+Ub9WUTria(eogdDp8V2>SdeCw9^0zrmQ{V(BnMt`n5nFAEqJqe* zAQ?^Q?(Q#;9kGghQ9n&h;Le*jJ&yx7)ftPz?Wq(;^NuDd%B}CR@sI3Q5Z%fME>?vh zSCPXkntAjo_ntyBD(b!c(k@yfhbyR(_AVY8Fa=PI$f=sJ+E+;5|ijNps$SH79*Enf1 z)|5R_x!4)CEx4M!c88&PU*1OKq8>TTzF>)wP@g|UoBGPv*$?x*Y zfvyiwdtWuqsb{&W*=EL(&Xerr_RsmRPDP=cZj8Kr%E!vRFS;{itKyh&$gMF{7u@OJ?WMwy70*T(Vql4ugNzydIQ! zFb98zI88E8ns`;m?97xt@qPO7DLgSoWtix#(mH9bs+G}aD{)UsH1HJbtPx%9v2#Lk z+7a&9V=?|*>htEfdbSb#t1k-wC~wwOH2meub+{ z<0QQt%X6VNrG<+rTmy@m5)85;E(9y(E5FWr9+QuGcEi@+L=h_%hzWA}p{l}1e-q8m z;dQ#MkR&!$spB}ySJce<{Rz|^pK#b8BW)M8;U5MFvkxkw$iMKCh&8q&DWVkv%28jR zi1}&%{nuAohj`I~NDa?tBmGyFHCRDrA_R(FHy$=5Ph4!?&Ylh@>%4_#ZF%t*yDaS@ zI0`8qogMC+BeDGsri_cT zj2mH_S`)bMS?}p-35Blaa5D>zj9c9Y>8!%WmrMi7-6<>`GP%3V^9^R1rqih6%x}wZ z7M&5UO_n!n*;;St|4sJq<(E*CB6L%7QMq#^mVPp2{o(IYj?4JuSl%#?;ppzfZmx;2 zv{zh3h$wLD>X^I(PO*O*ov|U)CF;k?q>&dcxahFtwItj)b^RxzMQjEtQ)AALh>}Mm zTO*eAxhQ!Xw*4_VHNGG@a@2knScv{KZjo(-6blub-?Z+Kb}>Hht9NH*d;*Jp^{4e# zd#x$*_8E&Fjk#lqh@n{c-EQ8U>5#`YSCTROYv{ zwl_CgyNL!F!5+txh>`)diy?6q_*HRMn`AeEB6*YdfD5j640MrurIB z+(?o#Lim@e8P9cTwP#=GQj=;EVX}?={i^L_TJsa!g1BFmhY{aaOyyOU5pn!bj;9Cv zY1N}01H!8YW!ShN*#qmVqU)dD9*fqgCc2hN`f`;&VmSBab!1Xd0-?2-t}*jgMc`@+ z&Rw8&&V_I&;)HIK$iIN?F4FaBQoyNhf7OC-Nd#vdQ8Ukadm5X47buchEK#S5Zn%?S z6ba2!bihu{2U}VMDjy^EXTGn*q!mSml0hQ4{pbY6zHxEi^aA(8Ka~19F@zmwfZ2B~ z+$CDPp$9A2vln%_gnd4xjpj%D3}mXz4~ZCvt^unI?Myr)VtKJ9n#yLp7E6eGIbFa zL}p4Ug(wega*O96m*1s&CHQ&LV9I8tDeYP46)OQ`%-X?X=J^Pu6?=&qqH)?SEoZCO zkM(Hie;oM((2Kp>N_A4q-Sg3HB|bNlyvKA`J=Ond`b0tJzPv8{rmby)p>)xZbsARcYN>%`;x2192t*VI!@rf zYy}GbIiHjF6)({R{5cR(Mjor#Cfxpa6vj8I`pY!%F$a^KYTKjE4@N`38~ zvMUTZ@`1D-K5tvRW}E!V=dK+2uZ2%9PwCHuf?SU(=Ho;b8M=356F4sc^q(C8?KV%_ zk5gMjwl?OZ+RH$0UvGrdINBIxAn&qQ499g0;f378xu##qwT`)Ybd@7h+cR#fx}2uG z6F0=~^H6|H|3!t|?!R_xE8OIp&uj90Hn|rViR?0?vv{9pa|Oxn87#y&@cEX3Gou;~ z^;0Puu!aHLeMK*(|t#l7c^1%ejHoTx};k!KRKHsIX z8h_z#&pNcPuF85kr9a7r`Ni1`N8VtmvUFbv$(Bo)4#X=p)+~*k;Bv{p*ckGyl~Q&@ zYG6iXePqfrM^?=l`{=OOO>|!M)Pu#?r=`IpRL~;tqIiU0&k4;hQZMwbWiQh@bJ9nF z+T+rYN7ue|tMH3oCt%wZ8boM}Y*fiv7_5Y^43zrG*}NPs1e@b$dQQ6ozBQ8qqu(uj zRXW-Q@fY+u42p4o*dXf9(e)htc%2Gox2cbBi`9fIl6+kGg`;0P+usJz5i zMdS;>onlRwMmJs00(nx0Fe~FRS055GS)N=yq&M1T({bHGpsQEHf4!h)M&%WzVG_e2 zSa$Ge86ex6|2xTK-x<$rTU|LBU36BJ|O zUUh5wO2%x3Ia&Y%zt^coxDc5@YJpbyHuctXJ3Z@`L*C(O|S0Wy(tlzsX9c0ryTed;PQMO+<5P9p9xC3;gKdZL# z^iv!R6d%N#wMu)g97C(F;trTeK8lhP0C5Bru%eWwe1l%Rc58&KAx&={6@Yj3IAgsZ zWS(Fa?><8#+>F}z)wBvvFA2b}4~+YLjmrU7J7)5Bt}dUc0qQL_f?co}^{_ zYP24{JGqFfQCn6wGnx@|qwmd7N%IOLxU;Oc_hn;~s$Xc4$-w{N2eR zsIfLlrL2`LQg^!d_ql)G&wW4VU7q)x^Zh>G=RNOp&gZ0^ak1m&lHdXW0K5+N)^4o( z(7*Et2kY8^d{7Di03Aczk$9xDlTlzqn3_L2A|OaDHVntA2LMdWV{!h0p+R_fKu~Z< zxT)MmXRjPQ1Z^tksq3uajI#>DgxJSN1)Ys|aSx0S4Kzf{nVWH$#2T>x!h-Pr@YpbH zc(hThsoa0#8nK@Ly;hfl|92C7sHvRAKSDUt`3&4DA}R>3tEQ(KsHtrL*Edwt)HO8F z(ounHX=v)HYZ$6)>ZodH8fh3BX=uX#bI6%-!A+vj7meJkZT~~YvP|VLcs$NXU7biI zsu8u-BBFxTH4P07)it!#wX{@OEmWi9!twsGs^QVc{z3c?hILSMU{nYW9}*D`|A*-x z5D|knm6KEdN22~87M48q|JBDb{x?EF;jFMkvGl_o9vA@t!Uhi37VfddYb6Q!ejYJ{ z=GvTALa5vTdyZ5AdjWa4yMSf@K;(UZBYQo$QnlqOSJ*g+3s{-jP;gHKI&9ew+O~L_ ze#8x7QF>Ka;+X7`1srh%m?!2-M(+<2uYA_ei*1=e{|$zui?Sc@AcjF zpN!xLoYY|C|Ets-ejVC>y0G9oa%Gb0g5pOdF}LYzbTkV8{(Ub`JzD`_7q|=HCR3j# z%v9s?=!7l1tlxq)^0q(-_!0RSiPJFYuQ>A(lZz>OLB#^cA8;CqGr@6a+`XeG!`=h9 z3_<$26+M=_4~Zl*#(`4YFWCut%}v6E;0qTgugorj(j575N}Dvq&K17PY)HW&-%pX` zzK?LGGOCkK@GO7)s)W3DF1H@^RcGC9-T>5=v$+U}YbYW=KgJ06o}=UsLP#gmdbQhN zdvKid(iM5?>858tY`1n`(9UCtCj4C@ZN>yUw|;gZ+6($$(Cpy)5TKySYN#fVC~tF_ zSBRG3a9XNd`{u*Jb?d1}{s{>?pn2+inqaIk?(C||o$IHYR>i?4N1Uj0Svg2R7hgZo zFmX?Kr1Yr0pHzAIP;c6N+Py{C9kD=i|DE<7vCL2OaC%0QaW2=o1=cX_TPnB(WiCrl zxR;uc{TrLS9^#ZfpHo~9Ah7$U&gTfT!ZoN+S89N$P*mt=Ie_EO%?cL|=m}e;38Rny zkQ?n^x5v&=7&xve5y;TbL@gH5wS??dC&a?B4Ug%`SkZa1pJeAT%}9PXvzh>Pnn$8} z0XD;=A`iF=pN(9R$1_1nLebpMC#`4AG+_%?fG?sawn!Uan)wO$xc57{@seje9v} z>(&Mdp=vjYKG9Jb7ii+C7AsG_T>`g%>d-yXRH?BzDV9dTbz%z*8!7 zPg-DMuQ_x?`6XsjX{^CfOgW4d-iGnU=iGdR7GAgclbRs#y@nn!qzPkhJ6h;vX)LW6 zdLVfU6RM~ur>;9XX6rsjS^9VZ+YkKI{VSm<={Yf=ccG5u0u!*hf|*M{g}C`*E&pTA z^-3s%{{{hLJV!x)i3VbegT|`2&)=bF1m@|){DcRNImCVZ0$|z)7U_dh#2+6z4(~dF z+qoLbM0F3{%?2Y%Mr5$gNrF08s)5DG>aoK}@bUxUImFC{3(yK1doM;46vnXG_z zYXsKRvN^G8r1`NmgOP-}xOTqStR|{t6HW)c zy0o8B^C1yt>s#mUCOpK4QQj0q$q1kCj=4`gaY~)bzRNtj`!KtPtGkD*-$-~r${Z)T zX->~;&?!tuw1Uidq##{s``D9yX@~0!#1$ulERiBA=6swIj-9=EYEX3Otzz{17m8uQ zC5%)xt5^J3q71(F-2-2=;yEA`;3sPrSzZW9wgYjy?%B@w0hPI>&r6ke%6Zy0N*1Ll znod|UQ=28#-%#-2_aIvMT`Q3Lu@T-g6W2+`_jw6E9BDgXDxEs-xc#K(?$G7K1b6>1BsPsp-rPh zNcQ-#9pZ->wT2^0v#g&;??b|!xONO5E^gIDp3c(}=bl;#GUTABKIZx%L-))3jIV}D zk9F9yDlp)>A-QhJ{voVqAF8NP@GiK-@%AF7Ix=y`=^HVX@sdk;_X!^s`nAS2BGM$o z(&+W^#7I(~2_){fu%2MRxD~l0GtQJ1TyX5vv9OG>jB58XP$_NhW~CEHPiFN{3|eG( zuJ`pYMauE8Z=Cx#kBzL1T?{Ka!ux!|z;|bP`H?4%lKDUVO74O!@d@AXh7^E3!O%B7 zzbbavX^=lsK6bU>Cx8^B^-mYen*KGh=094>)rK-{Q0XfR&OJP<9@R(ZuUtOaXnrc& z^u|u+*BOA*x8>zny^)lkJam6|Zz=T(?@Nvhd~nD2N151u?97dU!}QPhJG}wMO~1PT ze#O8dd{9H_uJl=wOwcbJjEt=AP|5f*Zu;eO=WA-&U~QJ2BIV|^P64=z&9*|Wh7y!@ zi#Boc?n_BcfuV)|eK(^}@$+n1cB`Hx3{uy+mT>Ki6XeuG9qQBmyl1*A;$G&3!Mr~- zK3F=I21N_%RNFj08UOy`R{4q`I4{OYVUF)BMOs=q;o>h8j9hOEOb>b_)ON%pF)UT~ z4QM#T_=MbdCp!mIm%bDIZ-!|!nv>viTs6{Lc=e_I?~|MAwqeFo0Uqy1A0GTkGS&M< ze)4kvsY$2X3O8P!dypyn^Y!N~KvKvg;d8KI7UHewvc2ezZHoTc%o*an!Pm8D>*^Rw zpqBYa9NP~hnT8JHXL@2je4Z?t&oNLbOa8?2-40G!SX0fZ!=T)zT?o$}@!xh{MPn7B z$rC1^_J;_&9}|>IzET48f;>^}aiWY|uf^wkUU6(ufn=Jn|E!sJ3S0A+zAtOFnO3#Y z*)K<rJEvHZl!uYkPR^5;vGRgj*{1ehlglY<>2Tc>^Y1>Q z7_}wGoTL+^ja|S!7JDm4Z)QJwV4qWe!njJR@#7CM<+OJCwBV}Ir${qgJX_}q>D>g8 zBjDB)T6}m}kYY&hb=}y~^|%Xmt_w&7Z>^%u;Mg-daoZUDk3^I&<#;6LCJ~dkcxP0R zX{_jP%@b}l$dPo}*V4W4Ht6^DSn_pqYjC)T_1AnW=w@QRm>kFHN(tKGTbOKfr#ggB z!S};n)tP`ru~1nB$&aMaR0W!DVkIk=^EVg84m(Y``m9`b5nSgiB96(bZK!3Ptyt&Ue9XY z?vFq7rE1bzb!wDw{vy{8sRZlhUaqu226F}(R32RZG|l5rs3zCt1o_;<4sBj`kP8+4 zmviedOYAl5KF`+W{O3D4xwEf^b(jP^eCb*c$L$FxDmqCCCt$c9kAAvXo1`g}w#|OO zf&ujDicge3h*<*Q$Cci`^fwb4oM@J8O;7gXlX9YEC>_@pR2AY+NB6o&U9I+LdRw|% z8N9}sF`!E6KUaw!B8tt3(Y`ANU91lqFxvFRM+6ty??l+d5z3mhP}0ur5^E~+C~UCe z0MPvF3gxWYhTU$=fNgVzfT+ zDdPPzpQULGU?^o^$)G(=nzHNTzEyJD%dfo)Qp>be~D0+p>>MBebh6W2uJV!3> zNho(ptE3xmQ6Km+KhmM#*)R?6y;=L#S#lmp->%sdYLHBi5wUV<;)pWZOg2eWOw(1Q zv;}964x-(!%5Bj+)Hg%&m%4P^iUW9;GM1^r9pB!>a!rm93@Dq63{tLfzB0|EZwtQB(d*toEPhY2*=TYE^J>3LlfD1F_m$VHDPS8w3U z_6Kw>-Ad*);ZZbR^vNzRBOtK4V8_ix>zKfd;2yaVRja zSRGPBBA8KY^pG1BC@!?v1!#@RsYD<|B7!RtiH-#Q@LuUgWy)LlB+)0;ogL)Ap!`q| z+v&5ci9G;5dnL-1(~Lm9>6-kuw)pj`?Z7u24v16qe_NF7-~%r&q0UlgU_q1N#+n1Q z^RuM)l8=2PJOqv~UQq&%cik5{2h9z*%RX!)!ZwknbrIP(Q9Dm~_D$6J&!kv`%RULgh>CKbz(;@uq%~J)nK$1L(!;zv8WHpb+5wrwKqLdXiw=4CpKd zs%48dN_4&dp!@dcCf9Ljb;vVzw`>^7xT-ZV{)Wtb%~`=u9QL{S?28J^A+96I@jmQ7 zNdB{H>D=;~Dv(!Ep4C2eK~CqS*_%PJGqr1k&ylM_R}>`kM6_hWVYdFn42`?ngEYFY zVsW+Pd=8-ByurqM{HKQU881?t;tR{^mk9Nhv9y^1NaY+WtMqp0!_*d7oL6x3*fgb>qwwgXA*aFb%%Do&>o2 z{Yh=*6sJ@gY-WTr?|2l9u)+ql=c^~^idGn?ob&}>=AU=}E#N=!|Kb-SV= zhH*R+M@FM1QTJSD&z-&IwlnmlluZR!Cv}>L%6lQOR5|T|v{zMTu zdXizoS=j>*m>75EU$V@i{IVp*DR_bRL9&A@+yhyD+G2YF3Q_=g=TC;;!dK+J%NTp` zj&}U9_x!7sEDfr`NdNI!h(zQsfGzAH< zt4(wzdH{1oxc3yQeLUyFkV6TZ8#*IOZgX_GVjm)O!CDk0g;S3AD(3G}{<7g6enSD; zQg|DoqCUEGO9IPX3{heK!`V4U*PNCxkUo_B0!qsLNNlL~n)UZ?RM4;E?2CdP8@Xu& zG=P}ul*wYlHj!9xak9zqG?uGSif<&w-YtaWb~N>q>^q#_CH;8&g36RTv>P=N>M6%F ze@8V6r+(7TE}CT1>Tg_o+A}$z6Uce{;wAxN>eI-ioz$Q~YOR0&*h{ z3Pus(ZbbpAw0WR{k%K9iCH1F=;qKr%Lc5N0NsxJqQIguHOD`hngWuV%JF1jg64&!& zb;(e_DaSo z-~@2d^eg>K!whLL`_DxQ-QC>Ci+hPjjMkDIUmQ9lD~#)Y z*p|(V`M3RXb_>2T9@b6xsK*SWS1dsx_Q*%1=VLnc^KB%=;*eE3j7^xorEn*e+94U2 z+5GP4h9&G1@9`&+l;ATH*HJ0gJa*vaZFQr4>(&`_8EXLt@p`K38`>Ci`QU5@XFSE- z^oXL`3g4E1d)k5P&~IIgry83yy{rPay%he5N-x12lfx{2tB1)4kx4(C=N)@y!<+V0 z;}H+#iZwV`dC;)b>Z%f+!=JZNM$l#SzFGgJMz%ud8FqbWxk~y0;IEBIBx&K9x#jMD zaMc{Lt{J$kSvQtTzN02EW-&9EcEIEvu*|oK>cAp2}%x+esFENGMfuaFgJCF5DV0WOwHD$o4_(V z&PqQTs+XtZO!}m@lKJrv(Q{zCJj4;_PA)bSbZh69_|QTW-tJ&lJ~rDUTPy|Bf03Twec!da>xYnC@dS8+)eB}ih3bkBx5YEm zU~5^ehD3{nyWC+(4=kF@vnsCY6Dx5)JJJIbZ7US7gU1cluLUd(9Fy(7*43w_L))z! pN*mhSG3r5hHIknU1)kr0q@3F+>VMx;wXeE8n) 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_actions-cancelextbolus.png b/app/src/main/res/drawable/icon_actions-cancelextbolus.png new file mode 100644 index 0000000000000000000000000000000000000000..4ad378e374a0add202bbbca73d029476d8bdcd32 GIT binary patch literal 1493 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UG@S5Ftmkc`H+H!3^ALq*s>^v|4pGpV~RQ>1mKtJ)>Epc`?^TyH5!%~ZW9 z@5+)Ud6R9HfotOyfxt&w0s@k^cyzN){p#+zgSjn=g)h;-R7ft zxpc;|@7=`vcI|CbQ=#JzL}eys-ELZLuy8$PGGd?SPO292xrYV-W3NVNNRzvS~f?A!TA&hoE*g6^ym z-EY&cs-010I$daY@1Stf)A%DNBj%jwJ&7( zJ(!#&e7$JDx~lyx;q4utFUU`Sw6saZ?SZaL%kskMe?DJqyf>rir$m#wp|g&I#{8oF zUyn>Qd=&8A*?O5;m&n15N#(y)KdrS)UX~zHC(ylJEAxK%k*VEBDrZi6ak1A!^|IGv z_dioLKJxF=^+>AUqxI%*$yDEzZ8uDnG`2l3bIeHkWE(0lcedy{Q33X@sWLs!TRL?G zwPW;W6|N|_9{Sd%)lO+sz2dp2W--0|t(E;}xI&aS$=?$b{1)ePY^y}Wb;B)ut!-Tz zeGbe9X+qG=cB8K>#JJ6y1_*w-@I?UBPq4QuA>s^{0c&XJz{?#$rpo%miZvlV_q!xC&*a$J9n*YyZjY>FA9s<+=|!u2&tr3>D>vSnVDtOB zW!FTaA7wlQFAm`BH9n$sb>RM4X86tj1R2LmH4Y`wT_Ncr@t!#1Vl%}GI kYC*t^ECkHaH>Q4&Kc@VAnty8d15jz~>FVdQ&MBb@0D^UiN&o-= literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_actions-profileswitch.png b/app/src/main/res/drawable/icon_actions-profileswitch.png new file mode 100644 index 0000000000000000000000000000000000000000..eeae6ccfdb4e1e7479920aecb225f88eac9807d2 GIT binary patch literal 1143 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIp=bkQ(AsLNtXIN*1IEu9W@0I#wV7S1krh9#cQkdIDfh_@VbdEUbut*E$ zG;s-v)+`aw-P+Ns#L*-s7Pv9+;Ew}Ny@4!4Zoe+SRc1qOj^?~gTe~DWM4f5p>N& literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_actions-refill.png b/app/src/main/res/drawable/icon_actions-refill.png new file mode 100644 index 0000000000000000000000000000000000000000..737cca8b004081172db6dae3f0021d3c2e9cc89f GIT binary patch literal 1161 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIppPnv`AsLNtZ}@hEhe{m(c)lm~l~+~Z=}S3*J-arPco|RNaLE!4+|0pg zo@&Ojc8zORkfSd5EDaYSULUS4tx7^JVZu+ir#)1@^o_{~Dc;08Hr9mr0w5EEcF3Qk0wA#NS+h%=fg5*2j@8N|a@sIyR z95e2JcjnW}wl&+2r)ll_sPruM`Cj>p&ABhU&%ZlTwx?ac$o`I(qV`9_XG?yw?K_d+-1=>?q4LuDCsNyzIxlH0OR76H|CFg- zZjQwKqdeLjfQ{0d4dd*aK)>KdQQnCTd_s1;)SGt)kA_Jc9n)1%CG%ZkTiJ{7U zwWt-&E_3TjPI0r$UDW#fqhqJ@Ql~cazj_zfTNi5UrCl-QjXuhMQ*qnjn^U+X@0HFI z;6C_u=2ss<=?$z&$zO{W+8+(fPEfMZ`S-|VBS($d;=bKSDyn$?tK9Z({U^fxQ+Mg+ zBRg)W9mzQ!C&=Muy>Mr2&ayhe?(=N(4u!YwTd*g4uHQ?ZKic2!?5$v5eW{f1KKI4i zB&Jx6ZHJhZ`jbujM1B?a1}TakJ(ix){p~@qjecMAy91LK-}tXmHhq3a-c=LfQitn( wzmGN^y7Og?KgW-Q3Eh2O?-*lY>F?1G{)IVxH;U(Wvw}(xPgg&ebxsLQ08v@%WB>pF literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_actions-startextbolus.png b/app/src/main/res/drawable/icon_actions-startextbolus.png new file mode 100644 index 0000000000000000000000000000000000000000..338df773c2f8cd0837f81bd8044653656e98036f GIT binary patch literal 1249 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUKu;IPkc`H+H=@_XJBu9u=)Zc^tZ5vgE8DXcdBlgbtXkq?^WlMzs-Tp} z#8vG4uY^2{T>|861e8oH3OSV~?oe}o#lhP-X<4cFk+rT>_OC8!`8~OESZd?>`~R2x zpSkyZ_nZ8pP3h<^EK`*`q&Rg~e4+5X8}mOV zZ|*-e>++E`*DCL%ZsB-Yd$fYbY@SnDf8hRf8#ZZw#nT3N0>86QTlR@DBC>M*(IskD zlFhynht7E2&CBt9D!RjVD*K1nxd&&78F5a3$ady?e7X_y{UqZ)zta5))xyl?N11H; zb{?{}Z7=_zT6fq)rhjum+|j%Mot;r8s!ysOX0=~zXD_+`=6#YV-_fEwP27c|^Hv!* zs=20bi}j&wMx~_>0l4uDIfp9jnyz=<%G!w?iI@? z99>|}L8;dMN%OctVn+UR&N;V!n>%OXyxALq zYZmHwwaRqr+HU*1y4~z}*s1%=|83R~Eix$kdZSEx-%bD7E2n;XuVi#?QOJq&k9c0R z*6whb^DKGe;vhSxj*~z^H<{^)`yJ=}N$!lCK9Bv8#K!PV8ls;XIsQCLy|G3#@cli# z{d;H4Ti!Xjw)S0%S1V74M|t70yVXi_R(Ab7xWD~X(nFcB=YA_fPU!9F$u5Xk_I5$X zr1qo#cKSV0-t2PY^Q?k{kykha-yJNu6P{q*;JQOJf7!07Gj#IeH?35DB5b4cZ*e!* zoBIL_Z6-#<>V2B^=C9-5=qa~9D9$srsy+KKXd>Sl(fAb|yPW=s>^yQk>HL?Mwvn@S zrd|H5wE9g6Q>01Z`mMstyO$O%_o!Siu)N-US!c)h;)zWBk9-#MAI+JytL8>?cgyvi z%>La^H~GoTyWLVgyE*u1ZPgg&ebxsLQ06nZ9yZ`_I literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_actions-starttempbasal.png b/app/src/main/res/drawable/icon_actions-starttempbasal.png new file mode 100644 index 0000000000000000000000000000000000000000..18fbd8c1119ef94c546a23b9ad17975dc4123225 GIT binary patch literal 651 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`43D_H=O!$!L6gV`J8#0Ewd?_lHWqTp(g4TB2)J`myki*L;UxB6)qXyMJ)_ z`Pnsu2+Wba!{W%YbP3-{1*f8XrwRQ9b*EKNp4@vsQop04!=p0flAWI0f7kipth3~H z3K#6D{b}bTw|!duvNLgwk{_N;{L9RC;7IxBYO$Y6S{vE;`f~UslDC{l-c!d=?EX#s zMas=TisxO#R(6+wlzskPr0ymbk#=1%!V5>N3 z=rZYo@pY!M@bmKzln31ieZu3@xbFEwz37CO6Mr-Qa*$pje3x}S*DOaD7ndh-db@?C UmMFDa%mt+(Pgg&ebxsLQ0Kz-w1poj5 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_actions-temptarget.png b/app/src/main/res/drawable/icon_actions-temptarget.png new file mode 100644 index 0000000000000000000000000000000000000000..39170bab37f0625cc3372a69bcf8c53208ca5645 GIT binary patch literal 1364 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUBc3jfAsLNtZ`7`to-D!sp;hvmDb37uvs_;fQ3%2T%!MqZ>+q?7oNLo*G0YRhk-rE&-a$pr2PN+ ze@E{8wvbcp&4qe=FVA|Gyp#Ga{`V%NtHC>Tc4PJN8{f= zpPC-imA>X-kIZD+tP2&UCHe%io-%miV$=8DkcYp+KCVCB_`Q9inA?(V{tsU$d5M^& znA=RecmAMz=~w20;HvpOwy$5^7mQvfFL(G{rKo1s2@#pb>Lc4$Cd%8WY`d)LS;oB2 zZFa&|se6ZNE%>HC3tiHoSX;om@8Dm_pA37{d1mxxPp;9r6+BUE9%Od?* zpjy9TFspU1&;7d*>VJ;%2!300TuUbU`gT{180EIUE9J8H{5M^U=shhRsO7)rYOCMF zFTWBs>jbXcYKe8V*(x~u)vtB_Z~G5v98B^KzN;`t@y{u)np+(~l{_zf&O7)V5l#9n zu`#;t&&w;)Zn^uou|Yvn|0YCE0xkyO0{MiZ~B>3ns@R9pMcxf^Cy-) zv=(%@R#2s7{TbwX)s=fRly5g#AF*8Z_v+tE#S=W9ht!51>3=hnMQD)@VJSJ~#HmeCqPjWHU^ zJ^OurG_tdDUyaXLgcmy!@l}gS2h^^$nnW1j)Y%ZUI`xkB&6O9EG8KkJYD@<);T3K0RTA9 BO>h7J literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-aaps-offline.png b/app/src/main/res/drawable/icon_cp-aaps-offline.png new file mode 100644 index 0000000000000000000000000000000000000000..dc506538838555fade6e8bee85485e3693d4c92e GIT binary patch literal 1361 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUgPtyqAsLNtZ)A6bq{=IY}Q=M z;&V5fEaD|*RG#~6^ZdW{|J%iFlOW(ff9_eeFMcyV=HCePR)2S-ID$_({7n9igcA>L zUoleNz@fg#S!s#n+vdzbHol`tii_C4FN?K^kh{qqYr(;;mVA5id8;=oHm5E5aKxgf zdGp8IThd~xPa@{Dds^_iXU?gA{n7B=@!L1n?C;Qw5^%IrJX|Qc?&uGz>-ER_Z%q3m zr}k*S@Zw45U3bXWbLrQub@dN9p|nJJ`(rkl2|aHGHvZ+CmXtcRA*!uY#zJ&D$6;-y zWeLqE?%rK1akXng*_k7EEi5FXyVN%@>|b{0d3lY>ykEX2Z$$ZsDjj>sYtz}j!FX+9 z<_j^yKRX0IDlY4;sfel)6y@{&W-S-bwLZsV-Cfn9H+DMS&rDQ%CzK`rh`iC2UBD)` zZ2Ru}wS3}<5rT%I_d{d%^N4dNK5m`CJ^QYLZ^qkWLT_3lf6a@rReKOKr|-8&qt)W7b)>dICD{|tq1$G`6IoAR(xqHE*H@1{y~%pPSt ze5q^tdHbUv#j;Xk=FcVH$|kO{t#IhL(e`tP;N-%V6Dx(kOueGN%4Lqup1pjVUB9kM zut$xE3)=) z%?g=#{6}X+tjsStQKc|W|1Xb31igw~<8(yaCq+exIT|`yeOQnY^E~|RPOplj;7_}G zi$AE9J(Rh4cfO#ijkqhvOx;5(s@8X@n}zo39#?kC3I9|(T|-R%#80olmI*869k@u?Up&7>G_8v(^kLc?-MAB6>Z{$4arpD7 zFs)m&dELDT#S~E^|B!k9E*4k26#D*V9^+D6Jz@KijY(2bP0l+XkK{?R{w literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-age-battery.png b/app/src/main/res/drawable/icon_cp-age-battery.png new file mode 100644 index 0000000000000000000000000000000000000000..6c7fc5613931143c3d6dfa0ff4ffca876523f5ba GIT binary patch literal 911 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`2qx_jGX#$!L6g{rqa5M496sub)wv6sm!NP5s0F zPpH0OlF+8Wx;GIVuBV(LJz`T7O`l#W*m>+xrP^h~@^dq*)7*m3@AjMf+-Cms>V5M+ z+dTj2s5H?-MX1w7Y2pk6t;(jd-FJ81?U20UJ~QBn`K*f8qdBQdKjq(Y?R|47a*fvP zhYco$lJUFbzZnIoY?ShIdmCM&Ge2H0bm4dNhZ=cLO*N91DDo^9TgP?RjxX*p(>5`| zaPADNzdJH&)E>A$`&+A-l%gatb)uDDLT+E4=`!vY3G&Z$jI;Za#BQ}+p3!x^bc^vU zwzQ3s+dtZ>r^U`F;BbDI7-rz394d3rvHtj19=^wpYvv!TJNU*s=J5JCJAy5)hrXNn zc|%Xm0m;O+%!kZn$96dz&XkSlSG{v|bJNCbr}JM^CEUs$TRi*7k>8TS|6s-i>&=0? z8)jFSJN!|tnU=h)XCl`&Zs%u0b!o5Ux&I%F(b<2T_uv_YnxmpIJx}L3Z|s@4?ZemK zA5~sS?a;5eJM{x^dD5Kcds!aeu(s8`S;xEW#LwkwiH6_l~pLa~ZzTib=O4yAeky{6NCr&Gn`+4Q>hBF7dHr#kC r_|5%s0;7HkU+5RJNze!ZQvbW{<6I)%OLDAe2IV79S3j3^P6?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`2or^K@|x$!L6g&DUErP=et>`kw})-vX|Sqqp$f64@dUqq3#&@-bKL-|~OE ze+er6P}XXicF|~s1CP^1At%kFIfeP%#jT#l3e$Wfp428tyqoj=Oy&KZ&(BCYaVWM3 z011{8ec3O*R;B)3_sDA7#;XZ;*k>G_+O(~9&+*xd`Xa;Td(##3Q&3^C7#piDf z6p1O%ialh!=fL_qUkhJqmVaPeePe3ZyC3ysn{}$=t^|CSmwY#$zc1#0qwAexwKkKw zXJ%RuL literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-age-insulin.png b/app/src/main/res/drawable/icon_cp-age-insulin.png new file mode 100644 index 0000000000000000000000000000000000000000..5cd8598faa8740927f76ebee31ab4d67e7622241 GIT binary patch literal 1073 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIpg`O^sAsLNtuiswnpDA*j5p0ApB zzPy(I{CCBP9x6heE=m($w61w^q_3}UlS$8k>OJS~8`s>^Io;(cbE6>gsASvI8Okm3 zhk4f=tG}`I)Pj3I#N;xajO&hZ%Lp}zCwpDp!)y_MMfq>;iI6pi3S^F3ZVB)0Ke}F` z+5E<&)SIi7xW7+VT-?HV`J;Z{swXb##~yG0^Rr}Hs;;Y6VFKlY3)znYj?ak{X|y()6+hWU#kyw9Q^r1z9OXLFyq&kZ>Mck zGP(9BNN)wN{nN+EE=Q}Bc+M8M9DU*67E-+|T5j5$vmAhHD#Qu5t z-<0(pNw_8To|rf<<7kRpzcYb4Asw zpHGSrjBr~2m2r7XhSL|5iEEm(BHB65|5Y-Vx@2@kD$4i96z-SYxfa^1uKahk)7X4{ zRtN9an%Tv?x)m{}-BY)H-0u2!er&-%=ZWmwe{Bd){8iN_bBt%|k@tPuEfl?qs`)=l zIoaOL-)!N$%jYQT#j={Uhjo4G?+BdlydC>>XQ4Rz*8soMi{>rc7(3;{s|`0FOG`NZ zz5Bj)&dK@lk7DP({yNj`j(~B`;b7C4maZTZcW{aUC7k!|{Y(Oji&y?mTLH@Hp00i_ I>zopr0Jv7e)Bpeg literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-age-sensor.png b/app/src/main/res/drawable/icon_cp-age-sensor.png new file mode 100644 index 0000000000000000000000000000000000000000..d312b6c57297851575871c70ded755015ad87e24 GIT binary patch literal 1352 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJU9iA?ZAsLNtZ`{s~brm`O(f{4r-q72#9<2S=wB_Qmdybi`-4&GrN4S-K zX#9Hi|50;((}JdsMI8@#0|f-Pg!CSqp%EBdC1`RnY7uX4Qcc8WTWf3E>iNpY15)c1 zea_9Cxi{_Xtgq3V`As3X#C5y=?#=|Ic$VYIdJe>U->KqrGU0Xu0SyS)XM6!$(8AU$iKPcgD^;+WvC)>nR#Z zeaRKBPY#^DG3T{)>-!=zua_;#H#g2YGG#|yj?nHo=@BaL_pY>0c8dw#wQ;*ay4u$1 zVY-WS+|9bG1LsA~(K&OzEZghF|L`52D@pYwEgbwS{(*&1I`or1Oo z=7xWBJ~VN!RA)qF>1>0J-L9$ehoq&Z&aHTPOX*Wu)zvplZ>@?X?7O|JC-l_ZKlW#? zl6>2dyziYS_N@yvHsV|I&3ma!wz{?)9|V@me~kG^f`$h*ksv~6?muLE8)^G?|prZ{?h4y(EQ>`t@j z-`gKMZY=Svx%H~~{M7Kfb%n9__51Fb#7)v}d4B7>qpKMQ>mBuwo`7T9*M@BHx^`<~ zVBzGmb$n9SEJW2^__j_iuirea?@L#<*S{W}?j`cV*XM0pG$DO$aY{&xow$pty;9r) it(B)H&VqsZ{{0L=Tt_yCtLt6?6@Z?uelF{r5}E*`k5owj literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-announcement.png b/app/src/main/res/drawable/icon_cp-announcement.png new file mode 100644 index 0000000000000000000000000000000000000000..6e1338ac2477afb55718e21257fd209a8cf6388e GIT binary patch literal 1286 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUGEW!Bkc`H+H==uDgJq6?>_5HZtE;t%luNhS+8t_-gj^m81#Qnb+O1KV zZR_DROQTTU^>UQ}|1HPWiY*$=Qm#w*TY|201l49VP4qmfs(A5Y-{Xh-(>Fc;Qeu?- zzV=sA{p87|=i;*8e*Hi9|G)p&>vOXp;LSv%AE#4$7roALwD*&L-6AZmHZ$$KOLNzS z&XW=u&y{vNpV+ddcI({kH++i07Y@uS(+gTUfzv{=-8A-o+twc|kIwP?@}Ol?cerZG zHiHu7x+7_KRC#Jyr*E6FnLqAO>W*D&7(+Q`HeJ0Te}18~?2AKccUF{^#q`Y^X?<&K^Sg)<%NAH2QuRnJEC(bDjoGVi0$EL`m03C@1`N63sP*zLq& z3l{AU;qR)PCAM>=KVTMAPB%aMUM%(O9*}g%iL*OYfA0(L{^$5`?NOyZJ3-UXd2f}f zeZ`+o4H6MFlJ0+A7q9wiO`6oAf;p|S6@e0UF?nY$%r9_Zw04`I^~A&`e~Gx-!-av* zzC4K7)4=^f)K2{Cb(x2I&vur*ad~BTN%hqGG%*f-9V4UHK4Q?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`2o*_H=O!$!L6gV{f*Iqr~x#=PUOuXid`fkovtvQ>TXU;IU(F0xqmar=MbR z2{2itq}D68Z=qvgAh)aZMxj6KNA^2x5!%S1#nn|Mw%NU}VEXQxwr9l7Z@+nWW_nuP z{=4bvY10)rnn37TBFTE+1+rM zRP7~Nq08<^3A(*?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`42&@N{tu$!L6g-J0uAfJn>3ctIT&&WKwPI~d-+xzn^`T0^wJ7O`%fW2!fP zYs574CMb4@dFr?n%a}e_e?GaG;1$# z&wXusr7LfmGjjxEZvPtr2~o*Uy-K=|gp3nrPV8=|yQp|yW0Doq@1F0^jpWx)v&`x2 zidd|4ZAFKvR#Gp5dG@@>$Ddbu8!j0C_A+)iV_0_bD`UhDxi69HoMV>EOJ0~Bp78p_ mn+8S$&v)ieG?YN#ll{BT?jp+;2ClsWN+6!DelF{r5}E+C>DLJW literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-bgcheck.png b/app/src/main/res/drawable/icon_cp-bgcheck.png new file mode 100644 index 0000000000000000000000000000000000000000..0cb14c2f574f22b0fba26b9b3bd876fcd2a4b3b0 GIT binary patch literal 1233 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-bolus-combo.png b/app/src/main/res/drawable/icon_cp-bolus-combo.png new file mode 100644 index 0000000000000000000000000000000000000000..ce4d8fb9d39cd1bb9238c4c67b51af26126704ff GIT binary patch literal 687 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD`2q7d%8G=WHi3LZkxsAC~@p#eUi$p9~W6?E8KJ1u*o+weR;wL0q*<>&KzNJ z2TpNkJm$>N5n>8k8Fb@!;2RbniLxnodk=s5lQ6UNdFs8&h_X-tK|#TZOYZ#L`{CEm zuky9t2V^oVUTt#_uK2&xV5MCoxBR19H>XCiD5f1K_lV_}U}C=Bw4G~`>0{{)d@Elw z&h!@B)4xkOUZW#FNLZz_y_Vz3#yz*rUwM=_%VmPzLAS&ECU6y+`@Z_Rn<38W+3y1u z=h{|Qx``Yy=XxZ~`mwj^hnr(f^6#}%nLi0$+w)@mOHsMTO_ui=tD`6Co?s8?yixOd zhW)IM4_4e}mMv!RIe)HxBda9i`93y1?c;yW^hmqM&VG<5a`t&@i*08I5G*;uX(cMt UvoY?tCMcbGy85}Sb4q9e0NdjHVgLXD literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-bolus-correction.png b/app/src/main/res/drawable/icon_cp-bolus-correction.png new file mode 100644 index 0000000000000000000000000000000000000000..582472dc9273600f30c9038e07b0e7fc04b739ba GIT binary patch literal 948 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UH86;Bt(kc`H+H_mtaCQ2Omc%G+Ms-<(vi47Z+rkt>MIMoznCc^FADRkH= zQeazGP+D?^*U3X7%KOVs9qMm2nes;?XT}VX!x1*+yDmSuSA2e_@tmW-*IwTHea?4V z+xwsQyf420eS(LIP^XL1M30mULGK?O552wl*Y-qpvt%~50>S>QE%UpjBW4%gXUsY9 z`l9e>`R~`>8klNdveI#quUjO&xll&_ir7sx6}`vNy=J*LT5TI)VrNxQOrd$?Uf?|G=|uM3T$tncT~j=7c` z(LY;4%ztMn&(t!-kFuwa?)j-MBKlL+h*9}Q)8UFfMMLofui%SM7reMo)n1xhXMZqj z%@N%kA<^^=Gaq~ka7o#?Lhbpnx%Kgu&mNlinTki*ed;QCq_^%-&kW({kD~Kk!gjfs z?lwpaG;@%f=oi}A{OIKO$L%xJWh*+Fr<(nr;^sPyqccuM=>LVk6VL#<&^_pwV8T~4{(b4~8PAt|=h*8O(ojNqSk zD|Y?=sa@&n*OltEx#!AGvzVWE;w>MnsW1?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIpHcuDFkc`H+*S$MJ!Uc|fyl;_I)8p|-p;2+)MTZNmlM+ipLSlZ*IjX`^ zqN=BoqN=r`gR@J4QJk|$BO@%Y=B(1isr({=M_L4$no_kyHwbnqv8p?KB)uj5>6q3Jx%vg%>ITf_r#V(FyCLl=wPkT| z&dTF1g6j|6Q&}fvRS>bKCo*aC5C5Fr?%LF-6z`}H9RhaJ)gkX${^%^S^!>8%(3IX2 z3V(Ee9TxfcO|0veMR3}~?HBmdUDx(ped`f?x?_#N-UrbWk9&Vue9Mw?{f59RmrpI? zpW1suvPUTTh2ojx>J4|z=wUh7jT+vcGo7DYANON1jlM>rG3VjBX4fb^uO1ei) z{+n6I@P}dll+f^|;Fng5L4x;MehB?L5^fRj=;x*w|Lfb7j=4%bGPo$e&u@Rdz_}2Y z~4u3feBGAjO?$D5Ue@qI7Z?BUYaefZ&oS)N+wjSJtL2POk( cYAEl!&bzq9CFlNA6;O8eboFyt=akR{0IMIf*#H0l literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-bolus-snack.png b/app/src/main/res/drawable/icon_cp-bolus-snack.png new file mode 100644 index 0000000000000000000000000000000000000000..b2ba41c27d3de3407300dafb9342c2cfacde1f93 GIT binary patch literal 1007 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIpcuyC{kc`H+H@rJM0%eYW?7wc1VyM*9y6B0d>yjyZR9zO`%(PL`lz!tg zEm=L)L^mFdb)H&^8+hFdICEDV z@w=n{Mwj#XD;F=t+#4NFB|`7aZry(L>*JQ<(nZxy@pldQi$8GvE@WF@xW;1rA(b!3 zjTKqXKgxddWaYgR88L!P^E$ZB950kPs&MC+-5J+-#}Arw^xp(7sZc)Ln&9`taB70p zG|t92k$nrZ@83NBAi=QC=-zZ*rPc{faSY!NZ!_FLmjVn#paipyN zRQZqZ_C_|_(`-W8DS~+~euPhXIwN4+@+qYP+9@{c+si_%`YA4hCtJDZi(~JFlxcZ#!6v=DGjw$_Pj84@ zQL{U#$wTqUk_$)8e*We%3(D|+^+8RoBP91v)E6O_(Ell`4@G?W_wt{KqOLyoY|+3a zQ4zMHL91(*KVg{1aZt~Vzve*VokJmO1b%IiO1!MpHAVXf`=Lcy!eL1(6qd!UaO2*v oWkam~yzE2ETMSd+vCep(L9?w`Y2`JMC!l=l>FVdQ&MBb@0F#xM@c;k- literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-cgm-insert.png b/app/src/main/res/drawable/icon_cp-cgm-insert.png new file mode 100644 index 0000000000000000000000000000000000000000..67c0fb1ba2c90b65acd7d81009aed78247e7ab3a GIT binary patch literal 1156 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIpFP<)rAsLNtZ}@jybCo&%aeCP5ciUe6Vqe3z$)j|FN|TYd=c@@9mwMOx zDV7Sn5lMQq*1O(8xx>NyvqDpc#zdEi7ZtU%v{vwlXxi#r3yXNRYxT7>*?pUTy!rI| zt=;)|HjfhT8Jzhu@8`d?ee%zK|2}udd0~Kt2v_T&(BnO;awu?;jaXjszJ+EG7Q75|k zBg4McuW~|96umiciZiFJfUo`$OIxsI_rWW2hvIikxYfL4Mo!!1_vt~ka{bBHc1QO9 zD712VcR)SqrTrmmi$42HOBO$!FLo?vn%%}-`j2ZBpM7_04r|$?=aeQ}_Wa{|)wqK- zIfqtPtlGF)Qt@sD@9GbmBYquMt4xn*Ii(?9Amu*0Xy?4M6+-;|?`Qa&s1clA-Zf#T zJMmJTbvWbSuDFL!q_*7Pa=IQ#U-Ma`h!&Jij` zHzZz}9Z}z)&s)*o@iXR(&$*JN&!t^gtP!lf+~j#r{=lbw_m29eu6=Hx^r_rW(8c2K ztq(O!^E+FNn71$6#2|a}*`6DJ?;rSnY-!x9);oINT1qc}x0cQh{#zEBK6gU!4%a2S zS9jXph`bu8{>1UlHM8<%$0TcFuScpcv7aha((yh?<#NT;Gda&6bgsX0q||R&RZo7a zYSyJ1zja5tVg$P;a9JJc-55EoV|9*L5!cP8`9Zdl(v#nI?^HXl`DB5`$$c%cJJuaq z#+;uxd&m4YXH6^p6zw~hp9$LNu3Pe1>X&$z@CRc(dADry9bqT`Zv5UY{3fx`>PN^O zZ?Q+*clygGpFKH8c)M~o?<2uIn(t&c9}TQs$+6OXvTxX}sderf?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIp#hxyXAsLNtXPoyI4HP+U|5#hgoNeu-I*(bbULQ{Qa;u6j4ZP%(@zDOl zeSvFQEB7xj%bd-0&~;Djr0!{=A|ZQtc)IEYTyr-Cv0u#Zw(MV)xxo7KvrPVX?0Sc7 zpU*2k|NUIS`_u!EKUUbt^*`UQd_qb=^Yn+@1FjDwJ}}H+aJv3L;Y7?l>q(ooc>X=v ztMidp)mbriQkbgk~;IId@jZ7 zxnGY9eKXt~pUtNDcG5IeT@NkQ8r9AE-nU|xOweV`&}Ni%5Wm1Xhj|-wc*E8sH%uRB z6$sDRxQ$^C)4gRq`7+y9Jy#7?*}Em*&QtYi?veXms;X*RYD7=Rp9%_}$NbUgq9Xf; z-V9Umr1M%I?kHXrTrmBGZW%NC+O0F|l{lKb*OfjM{3LgS>kFg&reoF{*eiI}usLqH zZn{GCxJ!Iz*ji=xHQch({(Cona`%wh^#14WC3VN&-q`vz`d+}LfW@r}FW2~fbH3!@ zsKlldpYc zz4o2ceA0WAU%ggZm&J2)SH@Y5MOPoaTlRDFg!JFOj~PBlMx2t^&Qi1K$1V-06MWiF zT+jWeTyXi*lVu!=?VWmkm8~JV{{n1XMHH7DpLbOxo}owJZ;6EBU$2nphIu0Mja_3N zXS1GBf1}>9?u~o$HuVFn33_R(kA4*k=(g6}?fuqk-{oJmlb)T~rk8o^Tzls0(|>Bs z_MOcsH>>`=H@CINdse5Ywf4$6648CRS6`de-TAfMEZQUT(xST00T(m>uD|>zP$$jM zwPe|@u3wjL@XcYl$M~Ibx)xJ{zzz00%y$1w7fh^|vX$#U4oWuX{xI2zuDCO??;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUnVv3=AsLNtuSa)W4HY^5vA_4Shv{RVR38Z!)})fzK3%6~I0vo6rAyfBM(o@3*qo+XMXv2LG+qLaHiGukYS;?sj+GobKR@&1Eu2^ndWh zCm4UbX8h6N{bkkL>S z6??gM%Gf_Tzi6ABj)&XX0ILN&iNbM0d8U(Y#UF9sVfuCDOt;wV*@l9`h5Y-(*O_%# z7aA^m7%@lZ&I>`GgWNazR(C(U)5vZR)3128D=Idkn|q_sX_pS!^KywV*lc<}x30Jv z(JEb_(aqTV&ZF_&7i)b<<2aZ08xyw`zMY@Mmv^}G#hEOJ%`I;P^uFW;M%#yVWSHo@ zn<$ub^s$BRSL>eiLaVy-Sq{efN0`);7{VW@@6la!CEtQkJYk`Qz5heI(s}JcTbxc5 zoe?^=?!$Y7=mp&6kL!GnhW6^+;!-SM5~SJwi<$pX>BLngKH4o;CbQICUE><9xJ2l! zg&Ra^wFm^9?DLA$6X&ydhNqjy1c6JrRFOCQyb3hRoYmy zHE6kxliFj>82x)6D%v*cPd&tHVX`jQqvg@wmH+DmtN53sJFm2JjM<_ceEU`!XXf!L zL8t2-F`3m98-JU8@C|IU{K2yRVNgxjs^Gm&VqAjW9|M?=T|MkK(J)7BVQtw;zpY%E zhZpbA{ySg$)2jVh61(Gfoaa~Cf9g=!p4RNsr7J>D6f2q5ySvQVCv{9@QIKKqWtrVB zMLVMJ{9CGbHb_SA`vNgV@0O0xN7Xf3j=6Tv>@nYGIbBFzL{TxRvYv~aGuExhx3$;5KlZ1Dq_C$dhxx%k_D}ZupyRH;g-(fqN;pqfKbLh*2~7Z!1|&ZK literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-cgm-target.png b/app/src/main/res/drawable/icon_cp-cgm-target.png new file mode 100644 index 0000000000000000000000000000000000000000..86ce00442ccc8d91855e740db8ae07744d6e3d30 GIT binary patch literal 1295 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUdQTU}kc`H+H!?fILM7Ng+@BJW`DVN{8!I!m^j%k{4%l&)5=SKp<5f|6w3OPDBzJw#R^twy)usA_c{``DHLv~ytC~jc)d35*lyWN~X9Rs# zi93An%6{(Kn?Fh$$jWA($(j=!)~VHTr#E{8$L5XJud@&Tv|u{UH|x8c-XTAef(l91 zQ$mvMtUn|^8~-dgbFh4d+LSvQbN)=pxx;qmNN18W*J7QCJDpDM=9zKHBT=uPBR&5? z{+Yu!Bl9Mch-1#g>12 z>N-`^`ALXO`_q|kJnm?f{a>vT-K>7;_q;3nrMIVi4(k%$yJUq?YDdYE^m?_~ihfy< zYQN>qr@gh`7$zV&FXi?|*6C@RrUj^Mp5MY>SdwLa>9fAfqMstkAxzb6?N3MRCML^?sGjma)Gl}Y?ad!$cN)w;BnP^l z5_&1R+v0emt7RS4$L$=G)+p>%@0D&85B|@bDzb7>#+xH)5BCVOfBni8e?!Ah ze|?jCx37ip_wGsi3|1*@3cYi>{E@7nn>%k*a>1n8E$3aCVpPto6;zEq fhvtL-y8jqse0IH--h6i&s2uZj^>bP0l+XkK{0u4c literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-exercise.png b/app/src/main/res/drawable/icon_cp-exercise.png new file mode 100644 index 0000000000000000000000000000000000000000..1c92c0ebb54905553278ab32a3b392757b9775c0 GIT binary patch literal 1464 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UG@4Nn)xkc`H+*K5~IPnKZ+aDL^pkUj~`o-2D=d=y<2^@Gp6_VQRPt`aS| zv2yMWqf7D`OBZePc&dAOcIU*2)AyV?E#JB*fbbgC} z<~uGir|a4e8UIIbFYzxgwPe_m!Il5|KwO1j|3YQI157eE5A0$55j5dH>*|Z)EDr*A zK6rjH#-;C2`wkxd#{ys6ylvXeO3zsH6@TF4JNomaTl$^$*_VU4&pJK{a$Ll$cS!a| zUw@%=RmX{GhxbOz&&fHp_dhrP14+jfVG6S*d3g66uc_&s7ty2T<6`b})ag#c!PJ~N z?U6tB_L-(7$j=G0x)9>>?Xc3F){`%qw?68qZQ0nAV9j&%`;2MFjJJ3`w!gCZT=~oG z&MzH;1zsx7dE30&W$LeBmA70qT8ruh(vpqWxhy>~ecQ=%@|kZss;<47RadVgdm~n< zc|**UYm*K5*M8`*IKTZt)|sOmF&%{!^5xx6>TJ^UIomoP2X}R)fNEk3W3h9D9?J9us@+4d2AlMfbuV zC&cKiy4H8c{QBcq!JBbPrEL*F3Fs_7wNKd|BH!IN(b$KZgON-}+$#r36&t~!}C@^{5$TYU3L z-rKsOOyuPMoV+;eJALLKL!&-(2HKnwTDe+T_16l?MNYcjeQ`=tDwbIYO)gN*3)+27 zUTxApQNg##u9C5{JNCEgKKf^9ZoYo^h2@+{%crRsIlHWsn^8N%|6AzE2L^>{#vvV6 z_6+H(SFYlAEpby*PoKu=^!>?!^A>J*^gHab_g(1ibqXf|VqcLCmsOfi2 z)Bdd37n&>^wATLKWMmtvxyia3mQ_J{_FwT2>7VaD?Y#P+p=fS?83{1OQF| Be}Di0 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-note.png b/app/src/main/res/drawable/icon_cp-note.png new file mode 100644 index 0000000000000000000000000000000000000000..7c8663a4fe54351e0991f0a52338bd929026ab63 GIT binary patch literal 1307 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUZci7-kc`H+H-2`Dr^>K@xc<&d{H9QA*(}GzWsZR&8-re7)D?Af5ue-P z*%sz@(OzJRt6*S)o70SdOOBCmXGw8or@D$PI|k33T`fL+*WddETI&u9>D<2T>l^;%-DmFE zueYx>S$8Dsj3fKIj3eIdvrb%%=;)o%m}k><^XtBfh`st6joBY{_8nZ36w_-uquahU z#8*Pgb)C3S_C-CFSq8G!8=3n%yi5}{I_@;2f0#PqMuV75@9F|MzvE^$eVJQzjBdE( z9jmF)Q!(qZ)<5ucM$^X5{*R7r;^tMG7;VTuKS{|f(OySLRPCXyOy9XjGiToD zS#GfIOj5Jxo69Nb_J@A{U}S&bI;XApqokV$SDx;(YhADRwyfO5`Mc$yf|0EM1Lm7Q z=NAaX9g{Hp;Vsj+)FR-{yVs9u+EO-5O%=;EnJ6i=A$A8xw1Ld}hY^Y!`P?}>rzPbz zPpD;`TqqwlHFC#9L!)4iHHTWA7K!FR%DDNp)G4F#qtEUM782{ZJAZ$4xOr51=?NX1 z9??g)Zx=}1)9SHtU-hG~B0B4MiYLR`MG><#0%x)G20roAOq;vI#iK`{`S+jw(#N}n z_KOwIE?B`*J^M?X>BI$fO6A_wAKCPdmdR+cnRg$&|A-|pd-IaJ?^WOG9hKZ9$$vH3 z!`3D3vE!bu(???69?pGKvq)r@p;OLekpuFs8&fZxJ1^w=+G(weTDQ;=w?As@Haj)d zcp2JwaC+*u62-C`{e& zNN&(U>87X-6Yqku)8CJVWx7`#3Ed`=%x<^Qy1RE8i$Rpu|2?~O{v_}B1L?x&DU+isNw>K;$` z@twb(_v~I^*u>-`2i_+AaQNbJers?{_70U6M^(p4*IV5m1@ZZB_U-dYDJ-sxmr1LhfB~Vp& r{E^aYBFFpOq(fnuBH-cv*8L1IeHVCUemZvuRHk{l`njxgN@xNA*JdlK literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-pump-battery.png b/app/src/main/res/drawable/icon_cp-pump-battery.png new file mode 100644 index 0000000000000000000000000000000000000000..f4dab169a8771dccfbc3ae1a0b1460c9c6542080 GIT binary patch literal 932 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UH85lQzH*OZvR_shmeC&V7q_rn9m$i=b$Bd(u8)ZNB_-HRXbRum{|D0;(XD%7xi>13iv1N;}&Jp|e zO?S)Gi(4P92;jBvyuIyvA!qt2PN~!s$#)N1KIE1@P)nPhVO7Zbexum$4{Awok>!!?r5s7x_Tm`B~8HpRRjs|3ni Mp00i_>zopr0H|GjJOBUy literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-pump-canula.png b/app/src/main/res/drawable/icon_cp-pump-canula.png new file mode 100644 index 0000000000000000000000000000000000000000..ee512c5fef5d4814b63244e967463f28aae26810 GIT binary patch literal 1090 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIpO`a}}AsLNtuX|^RhRYoP*uUOswM%AZFZbG{gJE9sP11@Ab{j&Qt*^&k ziQ2ScsdVAPWv!Q-uCo?CT(w)_2Zx$e$RZbUyUq@gKyT-btzujo1G{e>txsBKIP;9p zyS;d-5WUN6J_J%m-|~!du%(=GJAt!cVw&k z4;l81eG?^rFz$BY@;&A?=g{vA$;)Qk@w3&G=Ra6I$uQS4SHFLbNp(-o+Q*yOKHfax zx_Q6H#FAMZiE|wJ{Sp>z+j!CKS>jrW8`2-jPX1tAeCYQRpOd{tn|R~9W@UU&+iGWyrg?6Rb#h3|MjCRUv@0`xBSW857ir+wmq)6R^EEzd;i5o z{Z0G&ZLBBAOZl$cUvMd7-G8HlzuP_-+Z{PN$*!n(%R=uzpOqi!r5`Up^dxFy#NLTp z|EmSP*Shw&JVwB+yMSl*)te`TCvF%1XwH{Q}7#8_m zakgHivFe2B`S%>fnpO*bZ4@c?=9HI52*LQ;;t a#(&0(YBg_)^~7d^vc9LQpUXO@geCyI>AyAr literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-pump-cartridge.png b/app/src/main/res/drawable/icon_cp-pump-cartridge.png new file mode 100644 index 0000000000000000000000000000000000000000..70a90c596f527fb62bd63ca439547cae933df4a6 GIT binary patch literal 1305 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUPEQxdkc`H+*E2gpQ)P~SJnuU<=itU!3s@H!W#?=*TGXqdl(E1(a>`Zi zXpN|hg>4zlrvevmP||+w8z$iCWG?9R+Vz)G(25mX3_`k=oj78aa>y*L>SO(~>e;*3 ze|c2%u;88L`Qmw>|KEMSU)Bf;{*^z`;_Z2=%~yJ;t+IlnJ%M*xf^eGwyZ?i|_3|^U z!#16Gq9+m6Yy5%d+>!H#eylF!wL7Yrc~9ocPI-#cShdTeif)6Bk6^!nr2#2*TEzQy|vY_;H8FKSyYdv5KP0`u0GM*WQfhb26Y zU*r0`|9J0>Y3qtB99d`YR(uk&=CJgPHfuxaZ1pp*4^|4l``cG@@oT5WhCAL?nkhDX zc0zg^d5kxT)K8yTFL2MNxa+0w^Zbnx_S32()my$isB5)|&@X$ijmvFM-{FnS-5>t6 ze0=$`rl({5rY+GYmMTSvKW0C3v^9yHt?Sv>#H?R`=bniAAj2p2(d1mo!=(DK>cZVE zb95dl%;%9j!uj%^P|h)~zz+`uZRXYKABf!H!Lcut(C$1+g%>c?iHNKFfFNTg>LpnA^ArhdoF1zPM+L&`-uGyJ3s$p z^6E@AkwQ^tLKnSwd*tw;sYMa3Z+Ao=Idt)mDF5NuB=%?_BhkrfcXmt6=bV1C_w?k# z-L2Vcg*CU!SZ-_%{;=rA%Ac7z9#>}QTG;oV7tuYFq3!hSvG~MHJwd(AYO?MfYU}0S zt1z2&C#*lJvvKy~9g_VI?e^%FRn?T|2P$5jwm9nh@2MHW5BN74PySFOv@v*#5Vz~u zjF$T@`lil1u9`fI`u=F`EI0ETfAhixHf?{=%C;e}WcAOIytcnC<<$)w-yCgLyLGK~ zGrcbL9ejc#FaL10o5-e^eaG%BTd`bWou9jLkJgccN^dfY=FYkj zee=D5=4L^&M>4rR%~@BppGXH*zD|tz5}3|y7`t#{+-uF6xYU~d7oERcyY$vZ$u1F8 ztbeGswD$ZAgFW*7uM%WJ7GHc<-h4@ahwh=Nw`MMrUN+P0A7f2y$=%Cp(NT*e6_s}c k)m(ZfbYDOc2A2L|u4mu%a%-cB1gJ#wboFyt=akR{0B$`g!~g&Q literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_cp-question.png b/app/src/main/res/drawable/icon_cp-question.png new file mode 100644 index 0000000000000000000000000000000000000000..5d430d91640854e6249ff03e6ee73687f4d13f42 GIT binary patch literal 913 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UH8Mo$;Vkc`H+*Zn(s10{}sJU?|~fY)XPpOf=Vj_Rmrn;ywZ@#-?+=H|Ys znflZ}C&e@KjMrJG$@Uu)m4n365_MF}atxNZ1f4R7=`PMXvm-0*UhzBKbLF4sM8B`B zJOAGH`JK;uM7Ua=76$w%UlHmXu>YQctMs-6--$r9cUe9wUH2NM%&pV%R@43WnA&>$Kzw=4= z7D?Evtx&v~IG=ZRvW(}%HKA_1HYoS$FY~y;rTlh>O3v%Vhk7f0HutU(t6HnK=aAgO z)RjKQy(W`N;_ST5o zm2bX$YMG(t(Gw;&+c!tdk5qpx`SNgr%zN>FUG`6ePVZEbu9Mb3u&O62vX^J(4)=K+ vviW93d20pN2;cg)Tg^ul93>im^#3p&*%a(_WKrZMP)_o6^>bP0l+XkKMX6`d literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_home-loop.png b/app/src/main/res/drawable/icon_home-loop.png new file mode 100644 index 0000000000000000000000000000000000000000..5240cc85dba134c10ec48e96acd974b57890cfb7 GIT binary patch literal 931 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UH8VNVywkc`H+(`>WF90iWoZ+Gj}?-dMD$x0N+5pfCWh+z4{vQI=T^A7`; z*sadkGwlI_EhaB7bv7j|>=dZx)wrmXCDPf|`tSIoFx&p>c`4JMTh9J@@W8pd=iZ#T z`^MmbMc-pE`dqIO#Org)@;So>^L6&j#j7Pn6rar5T;}67HCyeZO1IH&vEBP7&p6WS z#gul*cyimXi5~i1*#Z{4GK|}pt~cf%U@6$Tt(@xzOAWgj)BDEC2X$M1N=I}rHBGoA zI@vB{-;bw1@)mtl51ah-MfQTXmu}@;@^N-Z{`j~1h)dn+9?#}nwW8h53j98|5-urD zo@O+8=hZN!f~*%l149=cn0(SbGz;FB<}5n*|EFM zcX+PXuCAX|vN7>~%Gu|0uk0w=bxp}Y=Bj9d_}0GQWO)P5H~qh~ALQhoS3AYGP4!iN zm%z6rN2X5h2)z>dpkh@&-x)^t$5E~vuY-DuXMH_>s>)naesLqyjmV4PL9$O&KJD2g z$969L$BJUM71J(VmizIh&-3xt?w_W1+_8GK>YQq^1~0wOKCj4%u`Exq{m@dRvhovO zginE}hWewoTc3YEuu-W+UbFD&xhUlW$^X{Aj@!V}!^FLEbJ)9-Z<97f+n(Bz|0wax z&I!qPx?h&_Sg^~mm8txSS*Eiz^AzU~|Lpg_zr2RU(`Ds4#=_0Q=J9%cp`g6w>FVdQ I&MBb@0JRKubN~PV literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_home-profile.png b/app/src/main/res/drawable/icon_home-profile.png new file mode 100644 index 0000000000000000000000000000000000000000..f689df10c6be8d709ccdbf9a221a424d39f094a0 GIT binary patch literal 1026 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIpB2O2`kc`H+GyJ_p6Ge{A-|3<1@=#0jKg+hYOY$eAOwoH4yn~0!{44J& zS8nmGZ-jRkP2l1-*E{01m`Tvtz|k?LGqb)<_nD9EvWwR5_uj4My(cd-3Wk&I#`%x)pBF`-}FETD?ZPT$a=i5Dz%iulB`5ikY&F$jfu4)N7 zAG}&=Wq8p1qn4iHs=T|tIC|>e{a9@N-RaVvC92)2p4yY@yv|l;sUEORXl|aVWpOz; zG|Q}Ew?lL65;wQi9gII%zKBS?+_*EVr|s3M)XdsxCD(XsFV26uQ6~}Gmm81bYI*3&~DEJzXV0~6qN%f zJl1`aEzp{szf6!(_P`opW66Y+OIOcEt)Er?&1>$yZ7ROI&)YL)?Y))xI@I{9)Wl1F z6&^b~+;uOn*%v36`_(MqSKZW)cIM?FmsG9mlryiN)!p%US1-%t=;w2HN^iS=>~`br z1G{ENZ{JvU`sMkn|Mp#sF5Jv-p?JSx@&Vn1-oKHX=Lm;QHoV}ae0}Z&+k~wSKl)tf zg|0riT9@y4^Y=l+Bz@L1#;rX{=PM6I7DDOezSqi9i?XT0?;?xNj|>eD7~WaW8Q z?EEwQe|D+IE}fS%mRz57ZPgab+@IEy;#MZ`Xa3MX0!sy%b&PWJQ=g?)M6iIeuBWS? J%Q~loCIAqCoaO)k literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_home-target.png b/app/src/main/res/drawable/icon_home-target.png new file mode 100644 index 0000000000000000000000000000000000000000..9fc7086e9d92214191fbc63f0dce2ac3f1e22954 GIT binary patch literal 1318 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UJUX`U{QAsLNtZ$$UR1&gqMh;J{mx~!GEs73OZ%cE(P3NDWpP8ASkQFT-` zby-xXyK2d@OJS=;LzigquTud7){3E`{bu5c;ceQ|VVlZ*SL{|&tr;^&j1jpJ`!JF<0Ig6_UUwieEF zSvD#gZ;**k_PvzJHOqAg`}~JdG7axPDx4GDeWCyJ2LZMg^)tSo+M4s~GuS2ye`MVC z!8q@b$(h5mZ#3y|kTZY0!epEGj)!eq+%%`C8o5eT3v7F2V$)-LbI$z_)!+8GzqzJ) z=qTSYX|G+8kxJiJy+88v#+=^LM^Z68n+vxp#2kJ;V`jl?bY;J63n8# zXZp$X?u59hC&eE0y{Qbnv|nTL-udg6CkF{OcZGagY7x5k#$8n=DLoOlb%KVQG%jZ! zHj?T4xI_N({-EiyGy7jm3aDq{q+C8ts-Gy^G-bCqU3O{MP{Fx<3y!G=*mE9uxi5$Tj7hin0 zJ)`GMsQ>oM#y_(zE;@5M<#g{F!R_45@#j*u9@)rg-6avCmc4iGy6_ddU-;e8GP>sU zu Date: Fri, 21 Jul 2017 12:17:37 +0300 Subject: [PATCH 32/77] Files renamed --- ...extbolus.png => icon_actions_cancelextbolus.png} | Bin ...ileswitch.png => icon_actions_profileswitch.png} | Bin ...n_actions-refill.png => icon_actions_refill.png} | Bin ...textbolus.png => icon_actions_startextbolus.png} | Bin ...empbasal.png => icon_actions_starttempbasal.png} | Bin ...s-temptarget.png => icon_actions_temptarget.png} | Bin ...cp-aaps-offline.png => icon_cp_aaps_offline.png} | Bin ...n_cp-age-battery.png => icon_cp_age_battery.png} | Bin ...con_cp-age-canula.png => icon_cp_age_canula.png} | Bin ...n_cp-age-insulin.png => icon_cp_age_insulin.png} | Bin ...con_cp-age-sensor.png => icon_cp_age_sensor.png} | Bin ...cp-announcement.png => icon_cp_announcement.png} | Bin ...{icon_cp-basal-end.png => icon_cp_basal_end.png} | Bin ...n_cp-basal-start.png => icon_cp_basal_start.png} | Bin .../{icon_cp-bgcheck.png => icon_cp_bgcheck.png} | Bin ...n_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} | Bin ...n_cp-bolus-combo.png => icon_cp_bolus_combo.png} | Bin ...-correction.png => icon_cp_bolus_correction.png} | Bin ...con_cp-bolus-meal.png => icon_cp_bolus_meal.png} | Bin ...n_cp-bolus-snack.png => icon_cp_bolus_snack.png} | Bin ...con_cp-cgm-insert.png => icon_cp_cgm_insert.png} | Bin ...n_cp-cgm-profile.png => icon_cp_cgm_profile.png} | Bin ...{icon_cp-cgm-start.png => icon_cp_cgm_start.png} | Bin ...con_cp-cgm-target.png => icon_cp_cgm_target.png} | Bin .../{icon_cp-exercise.png => icon_cp_exercise.png} | Bin .../{icon_cp-note.png => icon_cp_note.png} | Bin ...cp-pump-battery.png => icon_cp_pump_battery.png} | Bin ...n_cp-pump-canula.png => icon_cp_pump_canula.png} | Bin ...ump-cartridge.png => icon_cp_pump_cartridge.png} | Bin .../{icon_cp-question.png => icon_cp_question.png} | Bin .../{icon_home-loop.png => icon_home_loop.png} | Bin ...{icon_home-profile.png => icon_home_profile.png} | Bin .../{icon_home-target.png => icon_home_target.png} | Bin ...extbolus.png => icon_actions_cancelextbolus.png} | Bin ...ileswitch.png => icon_actions_profileswitch.png} | Bin ...n_actions-refill.png => icon_actions_refill.png} | Bin ...textbolus.png => icon_actions_startextbolus.png} | Bin ...empbasal.png => icon_actions_starttempbasal.png} | Bin ...s-temptarget.png => icon_actions_temptarget.png} | Bin ...cp-aaps-offline.png => icon_cp_aaps_offline.png} | Bin ...n_cp-age-battery.png => icon_cp_age_battery.png} | Bin ...con_cp-age-canula.png => icon_cp_age_canula.png} | Bin ...n_cp-age-insulin.png => icon_cp_age_insulin.png} | Bin ...con_cp-age-sensor.png => icon_cp_age_sensor.png} | Bin ...cp-announcement.png => icon_cp_announcement.png} | Bin ...{icon_cp-basal-end.png => icon_cp_basal_end.png} | Bin ...n_cp-basal-start.png => icon_cp_basal_start.png} | Bin .../{icon_cp-bgcheck.png => icon_cp_bgcheck.png} | Bin ...n_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} | Bin ...n_cp-bolus-combo.png => icon_cp_bolus_combo.png} | Bin ...-correction.png => icon_cp_bolus_correction.png} | Bin ...con_cp-bolus-meal.png => icon_cp_bolus_meal.png} | Bin ...n_cp-bolus-snack.png => icon_cp_bolus_snack.png} | Bin ...con_cp-cgm-insert.png => icon_cp_cgm_insert.png} | Bin ...n_cp-cgm-profile.png => icon_cp_cgm_profile.png} | Bin ...{icon_cp-cgm-start.png => icon_cp_cgm_start.png} | Bin ...con_cp-cgm-target.png => icon_cp_cgm_target.png} | Bin .../{icon_cp-exercise.png => icon_cp_exercise.png} | Bin .../{icon_cp-note.png => icon_cp_note.png} | Bin ...cp-pump-battery.png => icon_cp_pump_battery.png} | Bin ...n_cp-pump-canula.png => icon_cp_pump_canula.png} | Bin ...ump-cartridge.png => icon_cp_pump_cartridge.png} | Bin .../{icon_cp-question.png => icon_cp_question.png} | Bin .../{icon_home-loop.png => icon_home_loop.png} | Bin ...{icon_home-profile.png => icon_home_profile.png} | Bin .../{icon_home-target.png => icon_home_target.png} | Bin ...extbolus.png => icon_actions_cancelextbolus.png} | Bin ...ileswitch.png => icon_actions_profileswitch.png} | Bin ...n_actions-refill.png => icon_actions_refill.png} | Bin ...textbolus.png => icon_actions_startextbolus.png} | Bin ...empbasal.png => icon_actions_starttempbasal.png} | Bin ...s-temptarget.png => icon_actions_temptarget.png} | Bin ...cp-aaps-offline.png => icon_cp_aaps_offline.png} | Bin ...n_cp-age-battery.png => icon_cp_age_battery.png} | Bin ...con_cp-age-canula.png => icon_cp_age_canula.png} | Bin ...n_cp-age-insulin.png => icon_cp_age_insulin.png} | Bin ...con_cp-age-sensor.png => icon_cp_age_sensor.png} | Bin ...cp-announcement.png => icon_cp_announcement.png} | Bin ...{icon_cp-basal-end.png => icon_cp_basal_end.png} | Bin ...n_cp-basal-start.png => icon_cp_basal_start.png} | Bin .../{icon_cp-bgcheck.png => icon_cp_bgcheck.png} | Bin ...n_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} | Bin ...n_cp-bolus-combo.png => icon_cp_bolus_combo.png} | Bin ...-correction.png => icon_cp_bolus_correction.png} | Bin ...con_cp-bolus-meal.png => icon_cp_bolus_meal.png} | Bin ...n_cp-bolus-snack.png => icon_cp_bolus_snack.png} | Bin ...con_cp-cgm-insert.png => icon_cp_cgm_insert.png} | Bin ...n_cp-cgm-profile.png => icon_cp_cgm_profile.png} | Bin ...{icon_cp-cgm-start.png => icon_cp_cgm_start.png} | Bin ...con_cp-cgm-target.png => icon_cp_cgm_target.png} | Bin .../{icon_cp-exercise.png => icon_cp_exercise.png} | Bin .../{icon_cp-note.png => icon_cp_note.png} | Bin ...cp-pump-battery.png => icon_cp_pump_battery.png} | Bin ...n_cp-pump-canula.png => icon_cp_pump_canula.png} | Bin ...ump-cartridge.png => icon_cp_pump_cartridge.png} | Bin .../{icon_cp-question.png => icon_cp_question.png} | Bin .../{icon_home-loop.png => icon_home_loop.png} | Bin ...{icon_home-profile.png => icon_home_profile.png} | Bin .../{icon_home-target.png => icon_home_target.png} | Bin ...extbolus.png => icon_actions_cancelextbolus.png} | Bin ...ileswitch.png => icon_actions_profileswitch.png} | Bin ...n_actions-refill.png => icon_actions_refill.png} | Bin ...textbolus.png => icon_actions_startextbolus.png} | Bin ...empbasal.png => icon_actions_starttempbasal.png} | Bin ...s-temptarget.png => icon_actions_temptarget.png} | Bin ...cp-aaps-offline.png => icon_cp_aaps_offline.png} | Bin ...n_cp-age-battery.png => icon_cp_age_battery.png} | Bin ...con_cp-age-canula.png => icon_cp_age_canula.png} | Bin ...n_cp-age-insulin.png => icon_cp_age_insulin.png} | Bin ...con_cp-age-sensor.png => icon_cp_age_sensor.png} | Bin ...cp-announcement.png => icon_cp_announcement.png} | Bin ...{icon_cp-basal-end.png => icon_cp_basal_end.png} | Bin ...n_cp-basal-start.png => icon_cp_basal_start.png} | Bin .../{icon_cp-bgcheck.png => icon_cp_bgcheck.png} | Bin ...n_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} | Bin ...n_cp-bolus-combo.png => icon_cp_bolus_combo.png} | Bin ...-correction.png => icon_cp_bolus_correction.png} | Bin ...con_cp-bolus-meal.png => icon_cp_bolus_meal.png} | Bin ...n_cp-bolus-snack.png => icon_cp_bolus_snack.png} | Bin ...con_cp-cgm-insert.png => icon_cp_cgm_insert.png} | Bin ...n_cp-cgm-profile.png => icon_cp_cgm_profile.png} | Bin ...{icon_cp-cgm-start.png => icon_cp_cgm_start.png} | Bin ...con_cp-cgm-target.png => icon_cp_cgm_target.png} | Bin .../{icon_cp-exercise.png => icon_cp_exercise.png} | Bin .../{icon_cp-note.png => icon_cp_note.png} | Bin ...cp-pump-battery.png => icon_cp_pump_battery.png} | Bin ...n_cp-pump-canula.png => icon_cp_pump_canula.png} | Bin ...ump-cartridge.png => icon_cp_pump_cartridge.png} | Bin .../{icon_cp-question.png => icon_cp_question.png} | Bin .../{icon_home-loop.png => icon_home_loop.png} | Bin ...{icon_home-profile.png => icon_home_profile.png} | Bin .../{icon_home-target.png => icon_home_target.png} | Bin ...extbolus.png => icon_actions_cancelextbolus.png} | Bin ...ileswitch.png => icon_actions_profileswitch.png} | Bin ...n_actions-refill.png => icon_actions_refill.png} | Bin ...textbolus.png => icon_actions_startextbolus.png} | Bin ...empbasal.png => icon_actions_starttempbasal.png} | Bin ...s-temptarget.png => icon_actions_temptarget.png} | Bin ...cp-aaps-offline.png => icon_cp_aaps_offline.png} | Bin ...n_cp-age-battery.png => icon_cp_age_battery.png} | Bin ...con_cp-age-canula.png => icon_cp_age_canula.png} | Bin ...n_cp-age-insulin.png => icon_cp_age_insulin.png} | Bin ...con_cp-age-sensor.png => icon_cp_age_sensor.png} | Bin ...cp-announcement.png => icon_cp_announcement.png} | Bin ...{icon_cp-basal-end.png => icon_cp_basal_end.png} | Bin ...n_cp-basal-start.png => icon_cp_basal_start.png} | Bin .../{icon_cp-bgcheck.png => icon_cp_bgcheck.png} | Bin ...n_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} | Bin ...n_cp-bolus-combo.png => icon_cp_bolus_combo.png} | Bin ...-correction.png => icon_cp_bolus_correction.png} | Bin ...con_cp-bolus-meal.png => icon_cp_bolus_meal.png} | Bin ...n_cp-bolus-snack.png => icon_cp_bolus_snack.png} | Bin ...con_cp-cgm-insert.png => icon_cp_cgm_insert.png} | Bin ...n_cp-cgm-profile.png => icon_cp_cgm_profile.png} | Bin ...{icon_cp-cgm-start.png => icon_cp_cgm_start.png} | Bin ...con_cp-cgm-target.png => icon_cp_cgm_target.png} | Bin .../{icon_cp-exercise.png => icon_cp_exercise.png} | Bin .../{icon_cp-note.png => icon_cp_note.png} | Bin ...cp-pump-battery.png => icon_cp_pump_battery.png} | Bin ...n_cp-pump-canula.png => icon_cp_pump_canula.png} | Bin ...ump-cartridge.png => icon_cp_pump_cartridge.png} | Bin .../{icon_cp-question.png => icon_cp_question.png} | Bin .../{icon_home-loop.png => icon_home_loop.png} | Bin ...{icon_home-profile.png => icon_home_profile.png} | Bin .../{icon_home-target.png => icon_home_target.png} | Bin ...extbolus.png => icon_actions_cancelextbolus.png} | Bin ...ileswitch.png => icon_actions_profileswitch.png} | Bin ...n_actions-refill.png => icon_actions_refill.png} | Bin ...textbolus.png => icon_actions_startextbolus.png} | Bin ...empbasal.png => icon_actions_starttempbasal.png} | Bin ...s-temptarget.png => icon_actions_temptarget.png} | Bin ...cp-aaps-offline.png => icon_cp_aaps_offline.png} | Bin ...n_cp-age-battery.png => icon_cp_age_battery.png} | Bin ...con_cp-age-canula.png => icon_cp_age_canula.png} | Bin ...n_cp-age-insulin.png => icon_cp_age_insulin.png} | Bin ...con_cp-age-sensor.png => icon_cp_age_sensor.png} | Bin ...cp-announcement.png => icon_cp_announcement.png} | Bin ...{icon_cp-basal-end.png => icon_cp_basal_end.png} | Bin ...n_cp-basal-start.png => icon_cp_basal_start.png} | Bin .../{icon_cp-bgcheck.png => icon_cp_bgcheck.png} | Bin ...n_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} | Bin ...n_cp-bolus-combo.png => icon_cp_bolus_combo.png} | Bin ...-correction.png => icon_cp_bolus_correction.png} | Bin ...con_cp-bolus-meal.png => icon_cp_bolus_meal.png} | Bin ...n_cp-bolus-snack.png => icon_cp_bolus_snack.png} | Bin ...con_cp-cgm-insert.png => icon_cp_cgm_insert.png} | Bin ...n_cp-cgm-profile.png => icon_cp_cgm_profile.png} | Bin ...{icon_cp-cgm-start.png => icon_cp_cgm_start.png} | Bin ...con_cp-cgm-target.png => icon_cp_cgm_target.png} | Bin .../{icon_cp-exercise.png => icon_cp_exercise.png} | Bin .../drawable/{icon_cp-note.png => icon_cp_note.png} | Bin ...cp-pump-battery.png => icon_cp_pump_battery.png} | Bin ...n_cp-pump-canula.png => icon_cp_pump_canula.png} | Bin ...ump-cartridge.png => icon_cp_pump_cartridge.png} | Bin .../{icon_cp-question.png => icon_cp_question.png} | Bin .../{icon_home-loop.png => icon_home_loop.png} | Bin ...{icon_home-profile.png => icon_home_profile.png} | Bin .../{icon_home-target.png => icon_home_target.png} | Bin app/src/main/res/values/strings.xml | 1 - 199 files changed, 1 deletion(-) rename app/src/main/res/drawable-hdpi/{icon_actions-cancelextbolus.png => icon_actions_cancelextbolus.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_actions-profileswitch.png => icon_actions_profileswitch.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_actions-refill.png => icon_actions_refill.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_actions-startextbolus.png => icon_actions_startextbolus.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_actions-starttempbasal.png => icon_actions_starttempbasal.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_actions-temptarget.png => icon_actions_temptarget.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-aaps-offline.png => icon_cp_aaps_offline.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-age-battery.png => icon_cp_age_battery.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-age-canula.png => icon_cp_age_canula.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-age-insulin.png => icon_cp_age_insulin.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-age-sensor.png => icon_cp_age_sensor.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-announcement.png => icon_cp_announcement.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-basal-end.png => icon_cp_basal_end.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-basal-start.png => icon_cp_basal_start.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-bgcheck.png => icon_cp_bgcheck.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-bolus-combo.png => icon_cp_bolus_combo.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-bolus-correction.png => icon_cp_bolus_correction.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-bolus-meal.png => icon_cp_bolus_meal.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-bolus-snack.png => icon_cp_bolus_snack.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-cgm-insert.png => icon_cp_cgm_insert.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-cgm-profile.png => icon_cp_cgm_profile.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-cgm-start.png => icon_cp_cgm_start.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-cgm-target.png => icon_cp_cgm_target.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-exercise.png => icon_cp_exercise.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-note.png => icon_cp_note.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-pump-battery.png => icon_cp_pump_battery.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-pump-canula.png => icon_cp_pump_canula.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-pump-cartridge.png => icon_cp_pump_cartridge.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_cp-question.png => icon_cp_question.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_home-loop.png => icon_home_loop.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_home-profile.png => icon_home_profile.png} (100%) rename app/src/main/res/drawable-hdpi/{icon_home-target.png => icon_home_target.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_actions-cancelextbolus.png => icon_actions_cancelextbolus.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_actions-profileswitch.png => icon_actions_profileswitch.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_actions-refill.png => icon_actions_refill.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_actions-startextbolus.png => icon_actions_startextbolus.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_actions-starttempbasal.png => icon_actions_starttempbasal.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_actions-temptarget.png => icon_actions_temptarget.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-aaps-offline.png => icon_cp_aaps_offline.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-age-battery.png => icon_cp_age_battery.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-age-canula.png => icon_cp_age_canula.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-age-insulin.png => icon_cp_age_insulin.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-age-sensor.png => icon_cp_age_sensor.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-announcement.png => icon_cp_announcement.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-basal-end.png => icon_cp_basal_end.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-basal-start.png => icon_cp_basal_start.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-bgcheck.png => icon_cp_bgcheck.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-bolus-combo.png => icon_cp_bolus_combo.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-bolus-correction.png => icon_cp_bolus_correction.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-bolus-meal.png => icon_cp_bolus_meal.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-bolus-snack.png => icon_cp_bolus_snack.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-cgm-insert.png => icon_cp_cgm_insert.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-cgm-profile.png => icon_cp_cgm_profile.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-cgm-start.png => icon_cp_cgm_start.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-cgm-target.png => icon_cp_cgm_target.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-exercise.png => icon_cp_exercise.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-note.png => icon_cp_note.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-pump-battery.png => icon_cp_pump_battery.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-pump-canula.png => icon_cp_pump_canula.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-pump-cartridge.png => icon_cp_pump_cartridge.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_cp-question.png => icon_cp_question.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_home-loop.png => icon_home_loop.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_home-profile.png => icon_home_profile.png} (100%) rename app/src/main/res/drawable-mdpi/{icon_home-target.png => icon_home_target.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_actions-cancelextbolus.png => icon_actions_cancelextbolus.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_actions-profileswitch.png => icon_actions_profileswitch.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_actions-refill.png => icon_actions_refill.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_actions-startextbolus.png => icon_actions_startextbolus.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_actions-starttempbasal.png => icon_actions_starttempbasal.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_actions-temptarget.png => icon_actions_temptarget.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-aaps-offline.png => icon_cp_aaps_offline.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-age-battery.png => icon_cp_age_battery.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-age-canula.png => icon_cp_age_canula.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-age-insulin.png => icon_cp_age_insulin.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-age-sensor.png => icon_cp_age_sensor.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-announcement.png => icon_cp_announcement.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-basal-end.png => icon_cp_basal_end.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-basal-start.png => icon_cp_basal_start.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-bgcheck.png => icon_cp_bgcheck.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-bolus-combo.png => icon_cp_bolus_combo.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-bolus-correction.png => icon_cp_bolus_correction.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-bolus-meal.png => icon_cp_bolus_meal.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-bolus-snack.png => icon_cp_bolus_snack.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-cgm-insert.png => icon_cp_cgm_insert.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-cgm-profile.png => icon_cp_cgm_profile.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-cgm-start.png => icon_cp_cgm_start.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-cgm-target.png => icon_cp_cgm_target.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-exercise.png => icon_cp_exercise.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-note.png => icon_cp_note.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-pump-battery.png => icon_cp_pump_battery.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-pump-canula.png => icon_cp_pump_canula.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-pump-cartridge.png => icon_cp_pump_cartridge.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_cp-question.png => icon_cp_question.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_home-loop.png => icon_home_loop.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_home-profile.png => icon_home_profile.png} (100%) rename app/src/main/res/drawable-xhdpi/{icon_home-target.png => icon_home_target.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_actions-cancelextbolus.png => icon_actions_cancelextbolus.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_actions-profileswitch.png => icon_actions_profileswitch.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_actions-refill.png => icon_actions_refill.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_actions-startextbolus.png => icon_actions_startextbolus.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_actions-starttempbasal.png => icon_actions_starttempbasal.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_actions-temptarget.png => icon_actions_temptarget.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-aaps-offline.png => icon_cp_aaps_offline.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-age-battery.png => icon_cp_age_battery.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-age-canula.png => icon_cp_age_canula.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-age-insulin.png => icon_cp_age_insulin.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-age-sensor.png => icon_cp_age_sensor.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-announcement.png => icon_cp_announcement.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-basal-end.png => icon_cp_basal_end.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-basal-start.png => icon_cp_basal_start.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-bgcheck.png => icon_cp_bgcheck.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-bolus-combo.png => icon_cp_bolus_combo.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-bolus-correction.png => icon_cp_bolus_correction.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-bolus-meal.png => icon_cp_bolus_meal.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-bolus-snack.png => icon_cp_bolus_snack.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-cgm-insert.png => icon_cp_cgm_insert.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-cgm-profile.png => icon_cp_cgm_profile.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-cgm-start.png => icon_cp_cgm_start.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-cgm-target.png => icon_cp_cgm_target.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-exercise.png => icon_cp_exercise.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-note.png => icon_cp_note.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-pump-battery.png => icon_cp_pump_battery.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-pump-canula.png => icon_cp_pump_canula.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-pump-cartridge.png => icon_cp_pump_cartridge.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_cp-question.png => icon_cp_question.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_home-loop.png => icon_home_loop.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_home-profile.png => icon_home_profile.png} (100%) rename app/src/main/res/drawable-xxhdpi/{icon_home-target.png => icon_home_target.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_actions-cancelextbolus.png => icon_actions_cancelextbolus.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_actions-profileswitch.png => icon_actions_profileswitch.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_actions-refill.png => icon_actions_refill.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_actions-startextbolus.png => icon_actions_startextbolus.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_actions-starttempbasal.png => icon_actions_starttempbasal.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_actions-temptarget.png => icon_actions_temptarget.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-aaps-offline.png => icon_cp_aaps_offline.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-age-battery.png => icon_cp_age_battery.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-age-canula.png => icon_cp_age_canula.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-age-insulin.png => icon_cp_age_insulin.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-age-sensor.png => icon_cp_age_sensor.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-announcement.png => icon_cp_announcement.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-basal-end.png => icon_cp_basal_end.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-basal-start.png => icon_cp_basal_start.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-bgcheck.png => icon_cp_bgcheck.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-bolus-combo.png => icon_cp_bolus_combo.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-bolus-correction.png => icon_cp_bolus_correction.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-bolus-meal.png => icon_cp_bolus_meal.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-bolus-snack.png => icon_cp_bolus_snack.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-cgm-insert.png => icon_cp_cgm_insert.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-cgm-profile.png => icon_cp_cgm_profile.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-cgm-start.png => icon_cp_cgm_start.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-cgm-target.png => icon_cp_cgm_target.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-exercise.png => icon_cp_exercise.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-note.png => icon_cp_note.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-pump-battery.png => icon_cp_pump_battery.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-pump-canula.png => icon_cp_pump_canula.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-pump-cartridge.png => icon_cp_pump_cartridge.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_cp-question.png => icon_cp_question.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_home-loop.png => icon_home_loop.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_home-profile.png => icon_home_profile.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{icon_home-target.png => icon_home_target.png} (100%) rename app/src/main/res/drawable/{icon_actions-cancelextbolus.png => icon_actions_cancelextbolus.png} (100%) rename app/src/main/res/drawable/{icon_actions-profileswitch.png => icon_actions_profileswitch.png} (100%) rename app/src/main/res/drawable/{icon_actions-refill.png => icon_actions_refill.png} (100%) rename app/src/main/res/drawable/{icon_actions-startextbolus.png => icon_actions_startextbolus.png} (100%) rename app/src/main/res/drawable/{icon_actions-starttempbasal.png => icon_actions_starttempbasal.png} (100%) rename app/src/main/res/drawable/{icon_actions-temptarget.png => icon_actions_temptarget.png} (100%) rename app/src/main/res/drawable/{icon_cp-aaps-offline.png => icon_cp_aaps_offline.png} (100%) rename app/src/main/res/drawable/{icon_cp-age-battery.png => icon_cp_age_battery.png} (100%) rename app/src/main/res/drawable/{icon_cp-age-canula.png => icon_cp_age_canula.png} (100%) rename app/src/main/res/drawable/{icon_cp-age-insulin.png => icon_cp_age_insulin.png} (100%) rename app/src/main/res/drawable/{icon_cp-age-sensor.png => icon_cp_age_sensor.png} (100%) rename app/src/main/res/drawable/{icon_cp-announcement.png => icon_cp_announcement.png} (100%) rename app/src/main/res/drawable/{icon_cp-basal-end.png => icon_cp_basal_end.png} (100%) rename app/src/main/res/drawable/{icon_cp-basal-start.png => icon_cp_basal_start.png} (100%) rename app/src/main/res/drawable/{icon_cp-bgcheck.png => icon_cp_bgcheck.png} (100%) rename app/src/main/res/drawable/{icon_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} (100%) rename app/src/main/res/drawable/{icon_cp-bolus-combo.png => icon_cp_bolus_combo.png} (100%) rename app/src/main/res/drawable/{icon_cp-bolus-correction.png => icon_cp_bolus_correction.png} (100%) rename app/src/main/res/drawable/{icon_cp-bolus-meal.png => icon_cp_bolus_meal.png} (100%) rename app/src/main/res/drawable/{icon_cp-bolus-snack.png => icon_cp_bolus_snack.png} (100%) rename app/src/main/res/drawable/{icon_cp-cgm-insert.png => icon_cp_cgm_insert.png} (100%) rename app/src/main/res/drawable/{icon_cp-cgm-profile.png => icon_cp_cgm_profile.png} (100%) rename app/src/main/res/drawable/{icon_cp-cgm-start.png => icon_cp_cgm_start.png} (100%) rename app/src/main/res/drawable/{icon_cp-cgm-target.png => icon_cp_cgm_target.png} (100%) rename app/src/main/res/drawable/{icon_cp-exercise.png => icon_cp_exercise.png} (100%) rename app/src/main/res/drawable/{icon_cp-note.png => icon_cp_note.png} (100%) rename app/src/main/res/drawable/{icon_cp-pump-battery.png => icon_cp_pump_battery.png} (100%) rename app/src/main/res/drawable/{icon_cp-pump-canula.png => icon_cp_pump_canula.png} (100%) rename app/src/main/res/drawable/{icon_cp-pump-cartridge.png => icon_cp_pump_cartridge.png} (100%) rename app/src/main/res/drawable/{icon_cp-question.png => icon_cp_question.png} (100%) rename app/src/main/res/drawable/{icon_home-loop.png => icon_home_loop.png} (100%) rename app/src/main/res/drawable/{icon_home-profile.png => icon_home_profile.png} (100%) rename app/src/main/res/drawable/{icon_home-target.png => icon_home_target.png} (100%) diff --git a/app/src/main/res/drawable-hdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-hdpi/icon_actions_cancelextbolus.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_actions-cancelextbolus.png rename to app/src/main/res/drawable-hdpi/icon_actions_cancelextbolus.png diff --git a/app/src/main/res/drawable-hdpi/icon_actions-profileswitch.png b/app/src/main/res/drawable-hdpi/icon_actions_profileswitch.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_actions-profileswitch.png rename to app/src/main/res/drawable-hdpi/icon_actions_profileswitch.png diff --git a/app/src/main/res/drawable-hdpi/icon_actions-refill.png b/app/src/main/res/drawable-hdpi/icon_actions_refill.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_actions-refill.png rename to app/src/main/res/drawable-hdpi/icon_actions_refill.png diff --git a/app/src/main/res/drawable-hdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-hdpi/icon_actions_startextbolus.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_actions-startextbolus.png rename to app/src/main/res/drawable-hdpi/icon_actions_startextbolus.png diff --git a/app/src/main/res/drawable-hdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-hdpi/icon_actions_starttempbasal.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_actions-starttempbasal.png rename to app/src/main/res/drawable-hdpi/icon_actions_starttempbasal.png diff --git a/app/src/main/res/drawable-hdpi/icon_actions-temptarget.png b/app/src/main/res/drawable-hdpi/icon_actions_temptarget.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_actions-temptarget.png rename to app/src/main/res/drawable-hdpi/icon_actions_temptarget.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-aaps-offline.png b/app/src/main/res/drawable-hdpi/icon_cp_aaps_offline.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-aaps-offline.png rename to app/src/main/res/drawable-hdpi/icon_cp_aaps_offline.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-age-battery.png b/app/src/main/res/drawable-hdpi/icon_cp_age_battery.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-age-battery.png rename to app/src/main/res/drawable-hdpi/icon_cp_age_battery.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-age-canula.png b/app/src/main/res/drawable-hdpi/icon_cp_age_canula.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-age-canula.png rename to app/src/main/res/drawable-hdpi/icon_cp_age_canula.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-age-insulin.png b/app/src/main/res/drawable-hdpi/icon_cp_age_insulin.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-age-insulin.png rename to app/src/main/res/drawable-hdpi/icon_cp_age_insulin.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-age-sensor.png b/app/src/main/res/drawable-hdpi/icon_cp_age_sensor.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-age-sensor.png rename to app/src/main/res/drawable-hdpi/icon_cp_age_sensor.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-announcement.png b/app/src/main/res/drawable-hdpi/icon_cp_announcement.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-announcement.png rename to app/src/main/res/drawable-hdpi/icon_cp_announcement.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-basal-end.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_end.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-basal-end.png rename to app/src/main/res/drawable-hdpi/icon_cp_basal_end.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-basal-start.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_start.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-basal-start.png rename to app/src/main/res/drawable-hdpi/icon_cp_basal_start.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-bgcheck.png b/app/src/main/res/drawable-hdpi/icon_cp_bgcheck.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-bgcheck.png rename to app/src/main/res/drawable-hdpi/icon_cp_bgcheck.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-bolus-carbs.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-bolus-carbs.png rename to app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-bolus-combo.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_combo.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-bolus-combo.png rename to app/src/main/res/drawable-hdpi/icon_cp_bolus_combo.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_correction.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-bolus-correction.png rename to app/src/main/res/drawable-hdpi/icon_cp_bolus_correction.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-bolus-meal.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_meal.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-bolus-meal.png rename to app/src/main/res/drawable-hdpi/icon_cp_bolus_meal.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-bolus-snack.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_snack.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-bolus-snack.png rename to app/src/main/res/drawable-hdpi/icon_cp_bolus_snack.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-cgm-insert.png b/app/src/main/res/drawable-hdpi/icon_cp_cgm_insert.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-cgm-insert.png rename to app/src/main/res/drawable-hdpi/icon_cp_cgm_insert.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-cgm-profile.png b/app/src/main/res/drawable-hdpi/icon_cp_cgm_profile.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-cgm-profile.png rename to app/src/main/res/drawable-hdpi/icon_cp_cgm_profile.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-cgm-start.png b/app/src/main/res/drawable-hdpi/icon_cp_cgm_start.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-cgm-start.png rename to app/src/main/res/drawable-hdpi/icon_cp_cgm_start.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-cgm-target.png b/app/src/main/res/drawable-hdpi/icon_cp_cgm_target.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-cgm-target.png rename to app/src/main/res/drawable-hdpi/icon_cp_cgm_target.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-exercise.png b/app/src/main/res/drawable-hdpi/icon_cp_exercise.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-exercise.png rename to app/src/main/res/drawable-hdpi/icon_cp_exercise.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-note.png b/app/src/main/res/drawable-hdpi/icon_cp_note.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-note.png rename to app/src/main/res/drawable-hdpi/icon_cp_note.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-pump-battery.png b/app/src/main/res/drawable-hdpi/icon_cp_pump_battery.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-pump-battery.png rename to app/src/main/res/drawable-hdpi/icon_cp_pump_battery.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-pump-canula.png b/app/src/main/res/drawable-hdpi/icon_cp_pump_canula.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-pump-canula.png rename to app/src/main/res/drawable-hdpi/icon_cp_pump_canula.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-pump-cartridge.png b/app/src/main/res/drawable-hdpi/icon_cp_pump_cartridge.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-pump-cartridge.png rename to app/src/main/res/drawable-hdpi/icon_cp_pump_cartridge.png diff --git a/app/src/main/res/drawable-hdpi/icon_cp-question.png b/app/src/main/res/drawable-hdpi/icon_cp_question.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_cp-question.png rename to app/src/main/res/drawable-hdpi/icon_cp_question.png diff --git a/app/src/main/res/drawable-hdpi/icon_home-loop.png b/app/src/main/res/drawable-hdpi/icon_home_loop.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_home-loop.png rename to app/src/main/res/drawable-hdpi/icon_home_loop.png diff --git a/app/src/main/res/drawable-hdpi/icon_home-profile.png b/app/src/main/res/drawable-hdpi/icon_home_profile.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_home-profile.png rename to app/src/main/res/drawable-hdpi/icon_home_profile.png diff --git a/app/src/main/res/drawable-hdpi/icon_home-target.png b/app/src/main/res/drawable-hdpi/icon_home_target.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_home-target.png rename to app/src/main/res/drawable-hdpi/icon_home_target.png diff --git a/app/src/main/res/drawable-mdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-mdpi/icon_actions_cancelextbolus.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_actions-cancelextbolus.png rename to app/src/main/res/drawable-mdpi/icon_actions_cancelextbolus.png diff --git a/app/src/main/res/drawable-mdpi/icon_actions-profileswitch.png b/app/src/main/res/drawable-mdpi/icon_actions_profileswitch.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_actions-profileswitch.png rename to app/src/main/res/drawable-mdpi/icon_actions_profileswitch.png diff --git a/app/src/main/res/drawable-mdpi/icon_actions-refill.png b/app/src/main/res/drawable-mdpi/icon_actions_refill.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_actions-refill.png rename to app/src/main/res/drawable-mdpi/icon_actions_refill.png diff --git a/app/src/main/res/drawable-mdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-mdpi/icon_actions_startextbolus.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_actions-startextbolus.png rename to app/src/main/res/drawable-mdpi/icon_actions_startextbolus.png diff --git a/app/src/main/res/drawable-mdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-mdpi/icon_actions_starttempbasal.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_actions-starttempbasal.png rename to app/src/main/res/drawable-mdpi/icon_actions_starttempbasal.png diff --git a/app/src/main/res/drawable-mdpi/icon_actions-temptarget.png b/app/src/main/res/drawable-mdpi/icon_actions_temptarget.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_actions-temptarget.png rename to app/src/main/res/drawable-mdpi/icon_actions_temptarget.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-aaps-offline.png b/app/src/main/res/drawable-mdpi/icon_cp_aaps_offline.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-aaps-offline.png rename to app/src/main/res/drawable-mdpi/icon_cp_aaps_offline.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-age-battery.png b/app/src/main/res/drawable-mdpi/icon_cp_age_battery.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-age-battery.png rename to app/src/main/res/drawable-mdpi/icon_cp_age_battery.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-age-canula.png b/app/src/main/res/drawable-mdpi/icon_cp_age_canula.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-age-canula.png rename to app/src/main/res/drawable-mdpi/icon_cp_age_canula.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-age-insulin.png b/app/src/main/res/drawable-mdpi/icon_cp_age_insulin.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-age-insulin.png rename to app/src/main/res/drawable-mdpi/icon_cp_age_insulin.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-age-sensor.png b/app/src/main/res/drawable-mdpi/icon_cp_age_sensor.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-age-sensor.png rename to app/src/main/res/drawable-mdpi/icon_cp_age_sensor.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-announcement.png b/app/src/main/res/drawable-mdpi/icon_cp_announcement.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-announcement.png rename to app/src/main/res/drawable-mdpi/icon_cp_announcement.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-basal-end.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_end.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-basal-end.png rename to app/src/main/res/drawable-mdpi/icon_cp_basal_end.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-basal-start.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_start.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-basal-start.png rename to app/src/main/res/drawable-mdpi/icon_cp_basal_start.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-bgcheck.png b/app/src/main/res/drawable-mdpi/icon_cp_bgcheck.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-bgcheck.png rename to app/src/main/res/drawable-mdpi/icon_cp_bgcheck.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-bolus-carbs.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-bolus-carbs.png rename to app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-bolus-combo.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_combo.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-bolus-combo.png rename to app/src/main/res/drawable-mdpi/icon_cp_bolus_combo.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_correction.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-bolus-correction.png rename to app/src/main/res/drawable-mdpi/icon_cp_bolus_correction.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-bolus-meal.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_meal.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-bolus-meal.png rename to app/src/main/res/drawable-mdpi/icon_cp_bolus_meal.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-bolus-snack.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_snack.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-bolus-snack.png rename to app/src/main/res/drawable-mdpi/icon_cp_bolus_snack.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-cgm-insert.png b/app/src/main/res/drawable-mdpi/icon_cp_cgm_insert.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-cgm-insert.png rename to app/src/main/res/drawable-mdpi/icon_cp_cgm_insert.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-cgm-profile.png b/app/src/main/res/drawable-mdpi/icon_cp_cgm_profile.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-cgm-profile.png rename to app/src/main/res/drawable-mdpi/icon_cp_cgm_profile.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-cgm-start.png b/app/src/main/res/drawable-mdpi/icon_cp_cgm_start.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-cgm-start.png rename to app/src/main/res/drawable-mdpi/icon_cp_cgm_start.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-cgm-target.png b/app/src/main/res/drawable-mdpi/icon_cp_cgm_target.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-cgm-target.png rename to app/src/main/res/drawable-mdpi/icon_cp_cgm_target.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-exercise.png b/app/src/main/res/drawable-mdpi/icon_cp_exercise.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-exercise.png rename to app/src/main/res/drawable-mdpi/icon_cp_exercise.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-note.png b/app/src/main/res/drawable-mdpi/icon_cp_note.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-note.png rename to app/src/main/res/drawable-mdpi/icon_cp_note.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-pump-battery.png b/app/src/main/res/drawable-mdpi/icon_cp_pump_battery.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-pump-battery.png rename to app/src/main/res/drawable-mdpi/icon_cp_pump_battery.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-pump-canula.png b/app/src/main/res/drawable-mdpi/icon_cp_pump_canula.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-pump-canula.png rename to app/src/main/res/drawable-mdpi/icon_cp_pump_canula.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-pump-cartridge.png b/app/src/main/res/drawable-mdpi/icon_cp_pump_cartridge.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-pump-cartridge.png rename to app/src/main/res/drawable-mdpi/icon_cp_pump_cartridge.png diff --git a/app/src/main/res/drawable-mdpi/icon_cp-question.png b/app/src/main/res/drawable-mdpi/icon_cp_question.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_cp-question.png rename to app/src/main/res/drawable-mdpi/icon_cp_question.png diff --git a/app/src/main/res/drawable-mdpi/icon_home-loop.png b/app/src/main/res/drawable-mdpi/icon_home_loop.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_home-loop.png rename to app/src/main/res/drawable-mdpi/icon_home_loop.png diff --git a/app/src/main/res/drawable-mdpi/icon_home-profile.png b/app/src/main/res/drawable-mdpi/icon_home_profile.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_home-profile.png rename to app/src/main/res/drawable-mdpi/icon_home_profile.png diff --git a/app/src/main/res/drawable-mdpi/icon_home-target.png b/app/src/main/res/drawable-mdpi/icon_home_target.png similarity index 100% rename from app/src/main/res/drawable-mdpi/icon_home-target.png rename to app/src/main/res/drawable-mdpi/icon_home_target.png diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-xhdpi/icon_actions_cancelextbolus.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_actions-cancelextbolus.png rename to app/src/main/res/drawable-xhdpi/icon_actions_cancelextbolus.png diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-profileswitch.png b/app/src/main/res/drawable-xhdpi/icon_actions_profileswitch.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_actions-profileswitch.png rename to app/src/main/res/drawable-xhdpi/icon_actions_profileswitch.png diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-refill.png b/app/src/main/res/drawable-xhdpi/icon_actions_refill.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_actions-refill.png rename to app/src/main/res/drawable-xhdpi/icon_actions_refill.png diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-xhdpi/icon_actions_startextbolus.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_actions-startextbolus.png rename to app/src/main/res/drawable-xhdpi/icon_actions_startextbolus.png diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-xhdpi/icon_actions_starttempbasal.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_actions-starttempbasal.png rename to app/src/main/res/drawable-xhdpi/icon_actions_starttempbasal.png diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-temptarget.png b/app/src/main/res/drawable-xhdpi/icon_actions_temptarget.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_actions-temptarget.png rename to app/src/main/res/drawable-xhdpi/icon_actions_temptarget.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-aaps-offline.png b/app/src/main/res/drawable-xhdpi/icon_cp_aaps_offline.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-aaps-offline.png rename to app/src/main/res/drawable-xhdpi/icon_cp_aaps_offline.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-age-battery.png b/app/src/main/res/drawable-xhdpi/icon_cp_age_battery.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-age-battery.png rename to app/src/main/res/drawable-xhdpi/icon_cp_age_battery.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-age-canula.png b/app/src/main/res/drawable-xhdpi/icon_cp_age_canula.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-age-canula.png rename to app/src/main/res/drawable-xhdpi/icon_cp_age_canula.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-age-insulin.png b/app/src/main/res/drawable-xhdpi/icon_cp_age_insulin.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-age-insulin.png rename to app/src/main/res/drawable-xhdpi/icon_cp_age_insulin.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-age-sensor.png b/app/src/main/res/drawable-xhdpi/icon_cp_age_sensor.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-age-sensor.png rename to app/src/main/res/drawable-xhdpi/icon_cp_age_sensor.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-announcement.png b/app/src/main/res/drawable-xhdpi/icon_cp_announcement.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-announcement.png rename to app/src/main/res/drawable-xhdpi/icon_cp_announcement.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-basal-end.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_end.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-basal-end.png rename to app/src/main/res/drawable-xhdpi/icon_cp_basal_end.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-basal-start.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_start.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-basal-start.png rename to app/src/main/res/drawable-xhdpi/icon_cp_basal_start.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-bgcheck.png b/app/src/main/res/drawable-xhdpi/icon_cp_bgcheck.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-bgcheck.png rename to app/src/main/res/drawable-xhdpi/icon_cp_bgcheck.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-bolus-carbs.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-bolus-carbs.png rename to app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-bolus-combo.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_combo.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-bolus-combo.png rename to app/src/main/res/drawable-xhdpi/icon_cp_bolus_combo.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_correction.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-bolus-correction.png rename to app/src/main/res/drawable-xhdpi/icon_cp_bolus_correction.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-bolus-meal.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_meal.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-bolus-meal.png rename to app/src/main/res/drawable-xhdpi/icon_cp_bolus_meal.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-bolus-snack.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_snack.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-bolus-snack.png rename to app/src/main/res/drawable-xhdpi/icon_cp_bolus_snack.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-cgm-insert.png b/app/src/main/res/drawable-xhdpi/icon_cp_cgm_insert.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-cgm-insert.png rename to app/src/main/res/drawable-xhdpi/icon_cp_cgm_insert.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-cgm-profile.png b/app/src/main/res/drawable-xhdpi/icon_cp_cgm_profile.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-cgm-profile.png rename to app/src/main/res/drawable-xhdpi/icon_cp_cgm_profile.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-cgm-start.png b/app/src/main/res/drawable-xhdpi/icon_cp_cgm_start.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-cgm-start.png rename to app/src/main/res/drawable-xhdpi/icon_cp_cgm_start.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-cgm-target.png b/app/src/main/res/drawable-xhdpi/icon_cp_cgm_target.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-cgm-target.png rename to app/src/main/res/drawable-xhdpi/icon_cp_cgm_target.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-exercise.png b/app/src/main/res/drawable-xhdpi/icon_cp_exercise.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-exercise.png rename to app/src/main/res/drawable-xhdpi/icon_cp_exercise.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-note.png b/app/src/main/res/drawable-xhdpi/icon_cp_note.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-note.png rename to app/src/main/res/drawable-xhdpi/icon_cp_note.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-pump-battery.png b/app/src/main/res/drawable-xhdpi/icon_cp_pump_battery.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-pump-battery.png rename to app/src/main/res/drawable-xhdpi/icon_cp_pump_battery.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-pump-canula.png b/app/src/main/res/drawable-xhdpi/icon_cp_pump_canula.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-pump-canula.png rename to app/src/main/res/drawable-xhdpi/icon_cp_pump_canula.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-pump-cartridge.png b/app/src/main/res/drawable-xhdpi/icon_cp_pump_cartridge.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-pump-cartridge.png rename to app/src/main/res/drawable-xhdpi/icon_cp_pump_cartridge.png diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-question.png b/app/src/main/res/drawable-xhdpi/icon_cp_question.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_cp-question.png rename to app/src/main/res/drawable-xhdpi/icon_cp_question.png diff --git a/app/src/main/res/drawable-xhdpi/icon_home-loop.png b/app/src/main/res/drawable-xhdpi/icon_home_loop.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_home-loop.png rename to app/src/main/res/drawable-xhdpi/icon_home_loop.png diff --git a/app/src/main/res/drawable-xhdpi/icon_home-profile.png b/app/src/main/res/drawable-xhdpi/icon_home_profile.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_home-profile.png rename to app/src/main/res/drawable-xhdpi/icon_home_profile.png diff --git a/app/src/main/res/drawable-xhdpi/icon_home-target.png b/app/src/main/res/drawable-xhdpi/icon_home_target.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_home-target.png rename to app/src/main/res/drawable-xhdpi/icon_home_target.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-xxhdpi/icon_actions_cancelextbolus.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_actions-cancelextbolus.png rename to app/src/main/res/drawable-xxhdpi/icon_actions_cancelextbolus.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-profileswitch.png b/app/src/main/res/drawable-xxhdpi/icon_actions_profileswitch.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_actions-profileswitch.png rename to app/src/main/res/drawable-xxhdpi/icon_actions_profileswitch.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-refill.png b/app/src/main/res/drawable-xxhdpi/icon_actions_refill.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_actions-refill.png rename to app/src/main/res/drawable-xxhdpi/icon_actions_refill.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-xxhdpi/icon_actions_startextbolus.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_actions-startextbolus.png rename to app/src/main/res/drawable-xxhdpi/icon_actions_startextbolus.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-xxhdpi/icon_actions_starttempbasal.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_actions-starttempbasal.png rename to app/src/main/res/drawable-xxhdpi/icon_actions_starttempbasal.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-temptarget.png b/app/src/main/res/drawable-xxhdpi/icon_actions_temptarget.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_actions-temptarget.png rename to app/src/main/res/drawable-xxhdpi/icon_actions_temptarget.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-aaps-offline.png b/app/src/main/res/drawable-xxhdpi/icon_cp_aaps_offline.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-aaps-offline.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_aaps_offline.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-age-battery.png b/app/src/main/res/drawable-xxhdpi/icon_cp_age_battery.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-age-battery.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_age_battery.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-age-canula.png b/app/src/main/res/drawable-xxhdpi/icon_cp_age_canula.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-age-canula.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_age_canula.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-age-insulin.png b/app/src/main/res/drawable-xxhdpi/icon_cp_age_insulin.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-age-insulin.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_age_insulin.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-age-sensor.png b/app/src/main/res/drawable-xxhdpi/icon_cp_age_sensor.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-age-sensor.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_age_sensor.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-announcement.png b/app/src/main/res/drawable-xxhdpi/icon_cp_announcement.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-announcement.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_announcement.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-basal-end.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_end.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-basal-end.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_basal_end.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-basal-start.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_start.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-basal-start.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_basal_start.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-bgcheck.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bgcheck.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-bgcheck.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_bgcheck.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-carbs.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-bolus-carbs.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-combo.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_combo.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-bolus-combo.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_bolus_combo.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_correction.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-bolus-correction.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_bolus_correction.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-meal.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_meal.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-bolus-meal.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_bolus_meal.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-snack.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_snack.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-bolus-snack.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_bolus_snack.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-cgm-insert.png b/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_insert.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-cgm-insert.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_cgm_insert.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-cgm-profile.png b/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_profile.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-cgm-profile.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_cgm_profile.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-cgm-start.png b/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_start.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-cgm-start.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_cgm_start.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-cgm-target.png b/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_target.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-cgm-target.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_cgm_target.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-exercise.png b/app/src/main/res/drawable-xxhdpi/icon_cp_exercise.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-exercise.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_exercise.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-note.png b/app/src/main/res/drawable-xxhdpi/icon_cp_note.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-note.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_note.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-pump-battery.png b/app/src/main/res/drawable-xxhdpi/icon_cp_pump_battery.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-pump-battery.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_pump_battery.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-pump-canula.png b/app/src/main/res/drawable-xxhdpi/icon_cp_pump_canula.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-pump-canula.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_pump_canula.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-pump-cartridge.png b/app/src/main/res/drawable-xxhdpi/icon_cp_pump_cartridge.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-pump-cartridge.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_pump_cartridge.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-question.png b/app/src/main/res/drawable-xxhdpi/icon_cp_question.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_cp-question.png rename to app/src/main/res/drawable-xxhdpi/icon_cp_question.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_home-loop.png b/app/src/main/res/drawable-xxhdpi/icon_home_loop.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_home-loop.png rename to app/src/main/res/drawable-xxhdpi/icon_home_loop.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_home-profile.png b/app/src/main/res/drawable-xxhdpi/icon_home_profile.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_home-profile.png rename to app/src/main/res/drawable-xxhdpi/icon_home_profile.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_home-target.png b/app/src/main/res/drawable-xxhdpi/icon_home_target.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/icon_home-target.png rename to app/src/main/res/drawable-xxhdpi/icon_home_target.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_cancelextbolus.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_actions-cancelextbolus.png rename to app/src/main/res/drawable-xxxhdpi/icon_actions_cancelextbolus.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-profileswitch.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_profileswitch.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_actions-profileswitch.png rename to app/src/main/res/drawable-xxxhdpi/icon_actions_profileswitch.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-refill.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_refill.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_actions-refill.png rename to app/src/main/res/drawable-xxxhdpi/icon_actions_refill.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_startextbolus.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_actions-startextbolus.png rename to app/src/main/res/drawable-xxxhdpi/icon_actions_startextbolus.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_starttempbasal.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_actions-starttempbasal.png rename to app/src/main/res/drawable-xxxhdpi/icon_actions_starttempbasal.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-temptarget.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_temptarget.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_actions-temptarget.png rename to app/src/main/res/drawable-xxxhdpi/icon_actions_temptarget.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-aaps-offline.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_aaps_offline.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-aaps-offline.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_aaps_offline.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-age-battery.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_age_battery.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-age-battery.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_age_battery.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-age-canula.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_age_canula.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-age-canula.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_age_canula.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-age-insulin.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_age_insulin.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-age-insulin.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_age_insulin.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-age-sensor.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_age_sensor.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-age-sensor.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_age_sensor.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-announcement.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_announcement.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-announcement.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_announcement.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-basal-end.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_end.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-basal-end.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_basal_end.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-basal-start.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_start.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-basal-start.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_basal_start.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-bgcheck.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bgcheck.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-bgcheck.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_bgcheck.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-carbs.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-carbs.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-combo.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_combo.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-combo.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_combo.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_correction.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-correction.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_correction.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-meal.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_meal.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-meal.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_meal.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-snack.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_snack.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-snack.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_snack.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-insert.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_insert.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-insert.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_insert.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-profile.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_profile.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-profile.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_profile.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-start.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_start.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-start.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_start.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-target.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_target.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-target.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_target.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-exercise.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_exercise.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-exercise.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_exercise.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-note.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_note.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-note.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_note.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-pump-battery.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_battery.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-pump-battery.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_pump_battery.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-pump-canula.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_canula.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-pump-canula.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_pump_canula.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-pump-cartridge.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_cartridge.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-pump-cartridge.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_pump_cartridge.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-question.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_question.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_cp-question.png rename to app/src/main/res/drawable-xxxhdpi/icon_cp_question.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_home-loop.png b/app/src/main/res/drawable-xxxhdpi/icon_home_loop.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_home-loop.png rename to app/src/main/res/drawable-xxxhdpi/icon_home_loop.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_home-profile.png b/app/src/main/res/drawable-xxxhdpi/icon_home_profile.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_home-profile.png rename to app/src/main/res/drawable-xxxhdpi/icon_home_profile.png diff --git a/app/src/main/res/drawable-xxxhdpi/icon_home-target.png b/app/src/main/res/drawable-xxxhdpi/icon_home_target.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/icon_home-target.png rename to app/src/main/res/drawable-xxxhdpi/icon_home_target.png diff --git a/app/src/main/res/drawable/icon_actions-cancelextbolus.png b/app/src/main/res/drawable/icon_actions_cancelextbolus.png similarity index 100% rename from app/src/main/res/drawable/icon_actions-cancelextbolus.png rename to app/src/main/res/drawable/icon_actions_cancelextbolus.png diff --git a/app/src/main/res/drawable/icon_actions-profileswitch.png b/app/src/main/res/drawable/icon_actions_profileswitch.png similarity index 100% rename from app/src/main/res/drawable/icon_actions-profileswitch.png rename to app/src/main/res/drawable/icon_actions_profileswitch.png diff --git a/app/src/main/res/drawable/icon_actions-refill.png b/app/src/main/res/drawable/icon_actions_refill.png similarity index 100% rename from app/src/main/res/drawable/icon_actions-refill.png rename to app/src/main/res/drawable/icon_actions_refill.png diff --git a/app/src/main/res/drawable/icon_actions-startextbolus.png b/app/src/main/res/drawable/icon_actions_startextbolus.png similarity index 100% rename from app/src/main/res/drawable/icon_actions-startextbolus.png rename to app/src/main/res/drawable/icon_actions_startextbolus.png diff --git a/app/src/main/res/drawable/icon_actions-starttempbasal.png b/app/src/main/res/drawable/icon_actions_starttempbasal.png similarity index 100% rename from app/src/main/res/drawable/icon_actions-starttempbasal.png rename to app/src/main/res/drawable/icon_actions_starttempbasal.png diff --git a/app/src/main/res/drawable/icon_actions-temptarget.png b/app/src/main/res/drawable/icon_actions_temptarget.png similarity index 100% rename from app/src/main/res/drawable/icon_actions-temptarget.png rename to app/src/main/res/drawable/icon_actions_temptarget.png diff --git a/app/src/main/res/drawable/icon_cp-aaps-offline.png b/app/src/main/res/drawable/icon_cp_aaps_offline.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-aaps-offline.png rename to app/src/main/res/drawable/icon_cp_aaps_offline.png diff --git a/app/src/main/res/drawable/icon_cp-age-battery.png b/app/src/main/res/drawable/icon_cp_age_battery.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-age-battery.png rename to app/src/main/res/drawable/icon_cp_age_battery.png diff --git a/app/src/main/res/drawable/icon_cp-age-canula.png b/app/src/main/res/drawable/icon_cp_age_canula.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-age-canula.png rename to app/src/main/res/drawable/icon_cp_age_canula.png diff --git a/app/src/main/res/drawable/icon_cp-age-insulin.png b/app/src/main/res/drawable/icon_cp_age_insulin.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-age-insulin.png rename to app/src/main/res/drawable/icon_cp_age_insulin.png diff --git a/app/src/main/res/drawable/icon_cp-age-sensor.png b/app/src/main/res/drawable/icon_cp_age_sensor.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-age-sensor.png rename to app/src/main/res/drawable/icon_cp_age_sensor.png diff --git a/app/src/main/res/drawable/icon_cp-announcement.png b/app/src/main/res/drawable/icon_cp_announcement.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-announcement.png rename to app/src/main/res/drawable/icon_cp_announcement.png diff --git a/app/src/main/res/drawable/icon_cp-basal-end.png b/app/src/main/res/drawable/icon_cp_basal_end.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-basal-end.png rename to app/src/main/res/drawable/icon_cp_basal_end.png diff --git a/app/src/main/res/drawable/icon_cp-basal-start.png b/app/src/main/res/drawable/icon_cp_basal_start.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-basal-start.png rename to app/src/main/res/drawable/icon_cp_basal_start.png diff --git a/app/src/main/res/drawable/icon_cp-bgcheck.png b/app/src/main/res/drawable/icon_cp_bgcheck.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-bgcheck.png rename to app/src/main/res/drawable/icon_cp_bgcheck.png diff --git a/app/src/main/res/drawable/icon_cp-bolus-carbs.png b/app/src/main/res/drawable/icon_cp_bolus_carbs.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-bolus-carbs.png rename to app/src/main/res/drawable/icon_cp_bolus_carbs.png diff --git a/app/src/main/res/drawable/icon_cp-bolus-combo.png b/app/src/main/res/drawable/icon_cp_bolus_combo.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-bolus-combo.png rename to app/src/main/res/drawable/icon_cp_bolus_combo.png diff --git a/app/src/main/res/drawable/icon_cp-bolus-correction.png b/app/src/main/res/drawable/icon_cp_bolus_correction.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-bolus-correction.png rename to app/src/main/res/drawable/icon_cp_bolus_correction.png diff --git a/app/src/main/res/drawable/icon_cp-bolus-meal.png b/app/src/main/res/drawable/icon_cp_bolus_meal.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-bolus-meal.png rename to app/src/main/res/drawable/icon_cp_bolus_meal.png diff --git a/app/src/main/res/drawable/icon_cp-bolus-snack.png b/app/src/main/res/drawable/icon_cp_bolus_snack.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-bolus-snack.png rename to app/src/main/res/drawable/icon_cp_bolus_snack.png diff --git a/app/src/main/res/drawable/icon_cp-cgm-insert.png b/app/src/main/res/drawable/icon_cp_cgm_insert.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-cgm-insert.png rename to app/src/main/res/drawable/icon_cp_cgm_insert.png diff --git a/app/src/main/res/drawable/icon_cp-cgm-profile.png b/app/src/main/res/drawable/icon_cp_cgm_profile.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-cgm-profile.png rename to app/src/main/res/drawable/icon_cp_cgm_profile.png diff --git a/app/src/main/res/drawable/icon_cp-cgm-start.png b/app/src/main/res/drawable/icon_cp_cgm_start.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-cgm-start.png rename to app/src/main/res/drawable/icon_cp_cgm_start.png diff --git a/app/src/main/res/drawable/icon_cp-cgm-target.png b/app/src/main/res/drawable/icon_cp_cgm_target.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-cgm-target.png rename to app/src/main/res/drawable/icon_cp_cgm_target.png diff --git a/app/src/main/res/drawable/icon_cp-exercise.png b/app/src/main/res/drawable/icon_cp_exercise.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-exercise.png rename to app/src/main/res/drawable/icon_cp_exercise.png diff --git a/app/src/main/res/drawable/icon_cp-note.png b/app/src/main/res/drawable/icon_cp_note.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-note.png rename to app/src/main/res/drawable/icon_cp_note.png diff --git a/app/src/main/res/drawable/icon_cp-pump-battery.png b/app/src/main/res/drawable/icon_cp_pump_battery.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-pump-battery.png rename to app/src/main/res/drawable/icon_cp_pump_battery.png diff --git a/app/src/main/res/drawable/icon_cp-pump-canula.png b/app/src/main/res/drawable/icon_cp_pump_canula.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-pump-canula.png rename to app/src/main/res/drawable/icon_cp_pump_canula.png diff --git a/app/src/main/res/drawable/icon_cp-pump-cartridge.png b/app/src/main/res/drawable/icon_cp_pump_cartridge.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-pump-cartridge.png rename to app/src/main/res/drawable/icon_cp_pump_cartridge.png diff --git a/app/src/main/res/drawable/icon_cp-question.png b/app/src/main/res/drawable/icon_cp_question.png similarity index 100% rename from app/src/main/res/drawable/icon_cp-question.png rename to app/src/main/res/drawable/icon_cp_question.png diff --git a/app/src/main/res/drawable/icon_home-loop.png b/app/src/main/res/drawable/icon_home_loop.png similarity index 100% rename from app/src/main/res/drawable/icon_home-loop.png rename to app/src/main/res/drawable/icon_home_loop.png diff --git a/app/src/main/res/drawable/icon_home-profile.png b/app/src/main/res/drawable/icon_home_profile.png similarity index 100% rename from app/src/main/res/drawable/icon_home-profile.png rename to app/src/main/res/drawable/icon_home_profile.png diff --git a/app/src/main/res/drawable/icon_home-target.png b/app/src/main/res/drawable/icon_home_target.png similarity index 100% rename from app/src/main/res/drawable/icon_home-target.png rename to app/src/main/res/drawable/icon_home_target.png diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b22b5f160c..1db0151f51 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -688,4 +688,3 @@ Pass the Overview Notifications through as wear confirmation messages. Enable loacal broadcasts to other apps (like xDrip). Enable local Broadcasts. - From 31fcf34a2dcd67cb73d803663221a98cfabc504c Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Fri, 21 Jul 2017 11:59:36 +0200 Subject: [PATCH 33/77] Fix after merge-conflict cleanup --- app/src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1db0151f51..cbde9f5520 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -688,3 +688,4 @@ Pass the Overview Notifications through as wear confirmation messages. Enable loacal broadcasts to other apps (like xDrip). Enable local Broadcasts. + \ No newline at end of file From fdc0aea24b708bf291056de5bcc055ab16b4d228 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Fri, 21 Jul 2017 14:50:00 +0200 Subject: [PATCH 34/77] Let CircadianPercentageProfileFragment inherit from SubscriberFragment. --- .../CircadianPercentageProfileFragment.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java index c70a66850f..2e9d71881c 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java @@ -39,10 +39,11 @@ import info.nightscout.androidaps.interfaces.PumpInterface; import info.nightscout.androidaps.plugins.Careportal.CareportalFragment; import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog; import info.nightscout.androidaps.plugins.Careportal.OptionsToShow; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.SafeParse; -public class CircadianPercentageProfileFragment extends Fragment { +public class CircadianPercentageProfileFragment extends SubscriberFragment { private static Logger log = LoggerFactory.getLogger(CircadianPercentageProfileFragment.class); private static CircadianPercentageProfilePlugin circadianPercentageProfilePlugin = new CircadianPercentageProfilePlugin(); @@ -309,16 +310,14 @@ public class CircadianPercentageProfileFragment extends Fragment { percentageView.addTextChangedListener(textWatch); timeshiftView.addTextChangedListener(textWatch); - updateGui(); + updateGUI(); onStatusEvent(new EventInitializationChanged()); return layout; } - public void updateGui() { - - + public void updateGUI() { updateProfileInfo(); diaView.removeTextChangedListener(textWatch); @@ -485,15 +484,12 @@ public class CircadianPercentageProfileFragment extends Fragment { } basalEditDialog = null; - MainApp.bus().unregister(this); fl.requestFocusFromTouch(); } @Override public void onResume() { super.onResume(); - updateGui(); - MainApp.bus().register(this); onStatusEvent(new EventInitializationChanged()); fl.requestFocusFromTouch(); } @@ -521,7 +517,7 @@ public class CircadianPercentageProfileFragment extends Fragment { activity.runOnUiThread(new Runnable() { @Override public void run() { - updateGui(); + updateGUI(); } }); } From e381d197cb3738d73306793d0a325aded87f3664 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Fri, 21 Jul 2017 16:49:43 +0200 Subject: [PATCH 35/77] 1.5e --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ac3736b675..15bd342d62 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,7 +44,7 @@ android { minSdkVersion 21 targetSdkVersion 23 versionCode 1500 - version "1.5d" + version "1.5e" buildConfigField "String", "VERSION", '"' + version + '"' buildConfigField "String", "BUILDVERSION", generateGitBuild() } @@ -183,4 +183,4 @@ dependencies { compile 'com.google.code.gson:gson:2.7' compile 'com.google.guava:guava:20.0' -} \ No newline at end of file +} From 10d27f0b6a259b45e28ffa2b5dbad477ccef30f3 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Fri, 21 Jul 2017 22:24:06 +0200 Subject: [PATCH 36/77] Picture renaming (#311) * adding icons --- FETCH_HEAD | 0 .../EventSmsCommunicatorUpdateGui.java | 0 app/src/main/res/layout/actions_fragment.xml | 21 +- .../main/res/layout/careportal_fragment.xml | 299 ++++++++++++------ .../res/layout/careportal_stats_fragment.xml | 36 ++- app/src/main/res/values/strings.xml | 9 +- git | 0 7 files changed, 246 insertions(+), 119 deletions(-) create mode 100644 FETCH_HEAD rename app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/{events => Events}/EventSmsCommunicatorUpdateGui.java (100%) create mode 100644 git diff --git a/FETCH_HEAD b/FETCH_HEAD new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/events/EventSmsCommunicatorUpdateGui.java b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/Events/EventSmsCommunicatorUpdateGui.java similarity index 100% rename from app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/events/EventSmsCommunicatorUpdateGui.java rename to app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/Events/EventSmsCommunicatorUpdateGui.java diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml index 5a0faa4099..099e2c6db1 100644 --- a/app/src/main/res/layout/actions_fragment.xml +++ b/app/src/main/res/layout/actions_fragment.xml @@ -23,8 +23,8 @@ android:layout_marginRight="10dp" android:layout_marginTop="3dp" android:layout_weight="0.5" - android:text="@string/careportal_profileswitch" - android:textColor="@color/colorProfileSwitchButton" /> + android:drawableTop="@drawable/icon_actions_profileswitch" + android:text="@string/careportal_profileswitch" />

5Iab#=Xt_?6Q7W_pxUMd(E7b|nI#)R3@ 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 Nbh2}|t+WYB{U814sPq5; literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-exercise.png b/app/src/main/res/drawable-xhdpi/icon_cp-exercise.png new file mode 100644 index 0000000000000000000000000000000000000000..90cc102c07e8c179fe2fe3a74d9ef293afc7721c GIT binary patch literal 3154 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-note.png b/app/src/main/res/drawable-xhdpi/icon_cp-note.png new file mode 100644 index 0000000000000000000000000000000000000000..cf821a9d1f61689a63b23c96d6ac3923c643be82 GIT binary patch literal 2802 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 C#ezBj literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-pump-cartridge.png b/app/src/main/res/drawable-xhdpi/icon_cp-pump-cartridge.png new file mode 100644 index 0000000000000000000000000000000000000000..d40a8540e64c17d52217895de1e7e576c095ba9f GIT binary patch literal 2401 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 VAkuQf2b(`57e|~!t^Lp3{{iHuWN`oh literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-question.png b/app/src/main/res/drawable-xhdpi/icon_cp-question.png new file mode 100644 index 0000000000000000000000000000000000000000..43df04ef8158c728795f606301b33f354948a1be GIT binary patch literal 1513 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 MPyn4$@5hk-2im@Qng9R* literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_home-profile.png b/app/src/main/res/drawable-xhdpi/icon_home-profile.png new file mode 100644 index 0000000000000000000000000000000000000000..95c0ca450284418edb423416c68504119c8850a4 GIT binary patch literal 2646 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-xxhdpi/icon_actions-cancelextbolus.png new file mode 100644 index 0000000000000000000000000000000000000000..d223d16d8f02d45fe3a3495dd8f4cc809e94dc32 GIT binary patch literal 4456 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