caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

UserEntry text format and colors.xml

Browse source 
ValueWithUnit Bold
Note standard grey color
Action Colored (table in UserEntryExt.kt)
This commit is contained in:
Philoul 2021-03-04 14:52:30 +01:00
parent 37777d7d82
commit db4268f408
16 changed files with 249 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsUserEntryFragment.kt
View file

@ -78,11 +78,12 @@ class TreatmentsUserEntryFragment : DaggerFragment() {
val current = entries[position]
holder.binding.date.text = dateUtil.dateAndTimeAndSecondsString(current.timestamp)
holder.binding.action.text = resourceHelper.gs(current.action.stringId())
holder.binding.action.setTextColor(resourceHelper.gc(current.action.colorId()))
if (current.s != "") holder.binding.s.text = current.s else holder.binding.s.visibility = View.GONE
//holder.binding.s.text = current.toString() //for debug
var valuesWithUnitString = ""
var rStringParam = 0
val separator = " "
val separator = " "
for(v in current.values) {
if (rStringParam >0)
rStringParam--
@ -109,7 +110,7 @@ class TreatmentsUserEntryFragment : DaggerFragment() {
}
if (current.values.size > 0)
holder.binding.values.visibility = View.VISIBLE
holder.binding.values.text = valuesWithUnitString
holder.binding.values.text = valuesWithUnitString.trim()
}
inner class UserEntryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {

4
app/src/main/res/drawable/ic_actions_startextbolus.xml
View file

@ -4,6 +4,6 @@
android:viewportHeight="24"
android:viewportWidth="24"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#67DFE8" android:pathData="M15.714,7.697l0.353,-0.684c0.18,-0.348 0.043,-0.775 -0.305,-0.955c-0.351,-0.181 -0.775,-0.043 -0.955,0.305l-0.354,0.685c-0.379,-0.148 -0.772,-0.265 -1.18,-0.344V6.106c0.45,-0.061 0.802,-0.431 0.802,-0.897c0,-0.509 -0.412,-0.921 -0.921,-0.921h-2.313c-0.509,0 -0.921,0.413 -0.921,0.921c0,0.467 0.352,0.836 0.802,0.897v0.598c-3.125,0.599 -5.495,3.349 -5.495,6.646c0,3.732 3.037,6.77 6.77,6.77c3.732,0 6.77,-3.037 6.77,-6.77C18.768,10.989 17.551,8.909 15.714,7.697zM11.998,19.119c-3.182,0 -5.77,-2.588 -5.77,-5.77s2.588,-5.77 5.77,-5.77s5.77,2.588 5.77,5.77S15.18,19.119 11.998,19.119z"/>
<path android:fillColor="#67DFE8" android:pathData="M12,8.814c-0.086,0 -0.169,0.035 -0.23,0.096s-0.096,0.144 -0.096,0.23v4.198c0,0.08 0.029,0.157 0.083,0.217l2.789,3.14c0.058,0.064 0.139,0.104 0.226,0.108c0.006,0.001 0.013,0.001 0.019,0.001c0.08,0 0.157,-0.029 0.217,-0.083c0.971,-0.866 1.527,-2.095 1.527,-3.372C16.533,10.85 14.5,8.816 12,8.814z"/>
<path android:fillColor="@color/extendedBolus" android:pathData="M15.714,7.697l0.353,-0.684c0.18,-0.348 0.043,-0.775 -0.305,-0.955c-0.351,-0.181 -0.775,-0.043 -0.955,0.305l-0.354,0.685c-0.379,-0.148 -0.772,-0.265 -1.18,-0.344V6.106c0.45,-0.061 0.802,-0.431 0.802,-0.897c0,-0.509 -0.412,-0.921 -0.921,-0.921h-2.313c-0.509,0 -0.921,0.413 -0.921,0.921c0,0.467 0.352,0.836 0.802,0.897v0.598c-3.125,0.599 -5.495,3.349 -5.495,6.646c0,3.732 3.037,6.77 6.77,6.77c3.732,0 6.77,-3.037 6.77,-6.77C18.768,10.989 17.551,8.909 15.714,7.697zM11.998,19.119c-3.182,0 -5.77,-2.588 -5.77,-5.77s2.588,-5.77 5.77,-5.77s5.77,2.588 5.77,5.77S15.18,19.119 11.998,19.119z"/>
<path android:fillColor="@color/extendedBolus" android:pathData="M12,8.814c-0.086,0 -0.169,0.035 -0.23,0.096s-0.096,0.144 -0.096,0.23v4.198c0,0.08 0.029,0.157 0.083,0.217l2.789,3.14c0.058,0.064 0.139,0.104 0.226,0.108c0.006,0.001 0.013,0.001 0.019,0.001c0.08,0 0.157,-0.029 0.217,-0.083c0.971,-0.866 1.527,-2.095 1.527,-3.372C16.533,10.85 14.5,8.816 12,8.814z"/>
</vector>

6
app/src/main/res/drawable/ic_calibration.xml
View file

@ -5,11 +5,11 @@
android:viewportHeight="24">
<path
android:pathData="M7.305,4.482c1.782,2.914 4.332,5.382 3.916,9.05c-0.256,2.254 -2.529,3.635 -4.783,3.199c-2.145,-0.415 -3.625,-2.546 -3.171,-4.728C3.858,9.168 5.537,6.894 7.305,4.482zM5.08,10.061c-0.212,0.638 -0.489,1.262 -0.621,1.916c-0.205,1.017 -0.065,1.994 0.764,2.731c0.297,0.264 0.68,0.354 1.038,0.077c0.242,-0.187 0.269,-0.46 0.096,-0.692C5.468,12.903 5.032,11.589 5.08,10.061z"
android:fillColor="#E83258"/>
android:fillColor="@color/calibration"/>
<path
android:pathData="M17.959,4.566c1.073,1.453 2.073,2.837 2.489,4.535c0.28,1.143 -0.069,2.1 -1.037,2.763c-0.943,0.645 -1.961,0.655 -2.904,0.009c-0.967,-0.662 -1.318,-1.635 -1.041,-2.769C15.88,7.408 16.875,6.019 17.959,4.566z"
android:fillColor="#E83258"/>
android:fillColor="@color/calibration"/>
<path
android:pathData="M14.82,14.425c0.797,1.094 1.535,2.104 1.819,3.355c0.188,0.826 -0.096,1.498 -0.784,1.965c-0.669,0.454 -1.393,0.467 -2.067,0.014c-0.688,-0.462 -0.985,-1.13 -0.8,-1.959C13.272,16.531 14.004,15.503 14.82,14.425z"
android:fillColor="#E83258"/>
android:fillColor="@color/calibration"/>
</vector>

2
app/src/main/res/drawable/ic_loop_closed.xml
View file

@ -5,5 +5,5 @@
android:viewportHeight="24">
<path
android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
android:fillColor="#00C03E"/>
android:fillColor="@color/loopClosed"/>
</vector>

6
app/src/main/res/drawable/ic_loop_disabled.xml
View file

@ -5,11 +5,11 @@
android:viewportHeight="24">
<path
android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
android:fillColor="#FF1313"/>
android:fillColor="@color/loopDisabled"/>
<path
android:pathData="M10.2429,8.7408l5.0162,5.0162l-1.5026,1.5026l-5.0162,-5.0162z"
android:fillColor="#FF1313"/>
android:fillColor="@color/loopDisabled"/>
<path
android:pathData="M8.7408,13.7571l5.0162,-5.0162l1.5026,1.5026l-5.0162,5.0162z"
android:fillColor="#FF1313"/>
android:fillColor="@color/loopDisabled"/>
</vector>

4
app/src/main/res/drawable/ic_loop_disconnected.xml
View file

@ -5,8 +5,8 @@
android:viewportHeight="24">
<path
android:pathData="M17.523,3.764c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938c0,1.803 0.484,3.49 1.325,4.945l-0.319,0.365c-0.001,0.842 0.325,1.681 1.01,2.277l2.416,2.103l0.872,-1.002l1.746,1.523l0.472,-0.542l-1.747,-1.523l1.272,-1.461l1.748,1.524l0.472,-0.542l-1.749,-1.525l0.872,-1.001l-2.416,-2.103c-0.684,-0.596 -1.557,-0.803 -2.39,-0.687l-0.277,0.318c-0.335,-0.825 -0.528,-1.723 -0.528,-2.67c0,-3.952 3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784L17.523,3.764z"
android:fillColor="#939393"/>
android:fillColor="@color/loopDisconnected"/>
<path
android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,0.938 -0.183,1.833 -0.511,2.653l-0.263,-0.302c-0.833,-0.116 -1.706,0.091 -2.39,0.687l-2.416,2.103l3.96,4.549l2.416,-2.103c0.685,-0.596 1.011,-1.435 1.01,-2.277l-0.346,-0.397C21.51,15.526 22,13.855 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
android:fillColor="#939393"/>
android:fillColor="@color/loopDisconnected"/>
</vector>

12
app/src/main/res/drawable/ic_loop_lgs.xml
View file

@ -5,20 +5,20 @@
android:viewportHeight="24">
<path
android:pathData="M6.349,7.767c0.408,-0.542 0.89,-1.022 1.433,-1.429L6.38,3.917C5.424,4.584 4.593,5.415 3.924,6.37L6.349,7.767z"
android:fillColor="#00C03E"/>
android:fillColor="@color/loopClosed"/>
<path
android:pathData="M9.258,5.478c0.613,-0.262 1.272,-0.436 1.959,-0.517l-0.003,-2.793c-1.191,0.101 -2.318,0.414 -3.352,0.898L9.258,5.478z"
android:fillColor="#00C03E"/>
android:fillColor="@color/loopClosed"/>
<path
android:pathData="M12.922,2.189l0.003,2.773c0.754,0.093 1.472,0.301 2.135,0.608c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538C16.182,2.88 14.61,2.336 12.922,2.189z"
android:fillColor="#00C03E"/>
android:fillColor="@color/loopClosed"/>
<path
android:pathData="M4.963,11.199c0.083,-0.687 0.259,-1.345 0.523,-1.958L3.072,7.85c-0.485,1.034 -0.801,2.16 -0.903,3.351L4.963,11.199z"
android:fillColor="#00C03E"/>
android:fillColor="@color/loopClosed"/>
<path
android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156c-2.345,0 -4.42,-1.133 -5.725,-2.876l-2.421,1.401C5.712,20.315 8.689,22 12.063,22C17.551,22 22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
android:fillColor="#00C03E"/>
android:fillColor="@color/loopClosed"/>
<path
android:pathData="M5.478,14.867c-0.262,-0.614 -0.436,-1.272 -0.517,-1.96L2.168,12.91c0.101,1.191 0.414,2.319 0.898,3.353L5.478,14.867z"
android:fillColor="#00C03E"/>
android:fillColor="@color/loopClosed"/>
</vector>

14
app/src/main/res/drawable/ic_loop_open.xml
View file

@ -5,23 +5,23 @@
android:viewportHeight="24">
<path
android:pathData="M6.349,7.767c0.408,-0.542 0.89,-1.022 1.433,-1.429L6.38,3.917C5.424,4.584 4.593,5.415 3.924,6.37L6.349,7.767z"
android:fillColor="#4983D7"/>
android:fillColor="@color/loopOpened"/>
<path
android:pathData="M3.072,7.85c-0.485,1.034 -0.801,2.16 -0.903,3.351l2.795,-0.003c0.083,-0.687 0.259,-1.345 0.523,-1.958L3.072,7.85z"
android:fillColor="#4983D7"/>
android:fillColor="@color/loopOpened"/>
<path
android:pathData="M21.059,7.862l-2.412,1.396c0.262,0.614 0.437,1.272 0.518,1.96l2.793,-0.003C21.856,10.024 21.543,8.896 21.059,7.862z"
android:fillColor="#4983D7"/>
android:fillColor="@color/loopOpened"/>
<path
android:pathData="M17.787,7.781l2.421,-1.401c-0.668,-0.956 -1.499,-1.787 -2.454,-2.456l-1.397,2.425C16.9,6.757 17.38,7.238 17.787,7.781z"
android:fillColor="#4983D7"/>
android:fillColor="@color/loopOpened"/>
<path
android:pathData="M19.162,12.926c-0.427,3.544 -3.44,6.293 -7.099,6.293c-3.666,0 -6.684,-2.758 -7.102,-6.312L2.168,12.91C2.599,18.001 6.86,22 12.063,22c5.198,0 9.457,-3.992 9.894,-9.077L19.162,12.926z"
android:fillColor="#4983D7"/>
android:fillColor="@color/loopOpened"/>
<path
android:pathData="M9.258,5.478c0.613,-0.262 1.272,-0.436 1.959,-0.517l-0.003,-2.793c-1.191,0.101 -2.318,0.414 -3.352,0.898L9.258,5.478z"
android:fillColor="#4983D7"/>
android:fillColor="@color/loopOpened"/>
<path
android:pathData="M12.925,4.963c0.687,0.083 1.345,0.259 1.958,0.522l1.391,-2.414c-1.034,-0.485 -2.161,-0.801 -3.352,-0.903L12.925,4.963z"
android:fillColor="#4983D7"/>
android:fillColor="@color/loopOpened"/>
</vector>

6
app/src/main/res/drawable/ic_loop_paused.xml
View file

@ -5,11 +5,11 @@
android:viewportHeight="24">
<path
android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
android:fillColor="#FFFF13"/>
android:fillColor="@color/loopSuspended"/>
<path
android:pathData="M8.813,8.453h2.125v7.094h-2.125z"
android:fillColor="#FFFF13"/>
android:fillColor="@color/loopSuspended"/>
<path
android:pathData="M13.063,8.453h2.125v7.094h-2.125z"
android:fillColor="#FFFF13"/>
android:fillColor="@color/loopSuspended"/>
</vector>

4
app/src/main/res/drawable/ic_loop_reconnect.xml
View file

@ -5,8 +5,8 @@
android:viewportHeight="24">
<path
android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156c-3.952,0 -7.156,-3.204 -7.156,-7.156c0,-3.952 3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.937,4.449 -9.937,9.938c0,5.488 4.449,9.937 9.937,9.937C17.551,22 22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
android:fillColor="#939393"/>
android:fillColor="@color/loopDisconnected"/>
<path
android:pathData="M14.868,22.154c0.794,0 1.49,-0.418 1.973,-1.054l-0.001,-3.926c-0.482,-0.634 -1.177,-1.052 -1.969,-1.052l-5.612,-0.001c-0.793,0 -1.487,0.416 -1.97,1.05l-0.004,3.926c0.482,0.636 1.178,1.055 1.972,1.055"
android:fillColor="#939393"/>
android:fillColor="@color/loopDisconnected"/>
</vector>

4
app/src/main/res/drawable/ic_loop_resume.xml
View file

@ -5,8 +5,8 @@
android:viewportHeight="24">
<path
android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156c-3.952,0 -7.156,-3.204 -7.156,-7.156c0,-3.952 3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.937,4.449 -9.937,9.938c0,5.488 4.449,9.937 9.937,9.937C17.551,22 22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
android:fillColor="#00C03E"/>
android:fillColor="@color/loopClosed"/>
<path
android:pathData="M9.401,8.391l6.599,3.609l-6.599,3.609z"
android:fillColor="#00C03E"/>
android:fillColor="@color/loopClosed"/>
</vector>

1
app/src/main/res/layout/treatments_user_entry_item.xml
View file

@ -52,6 +52,7 @@
android:layout_weight="1"
android:paddingStart="20dp"
android:paddingEnd="10dp"
android:textStyle="bold"
android:visibility="gone"
android:text="Values with units" />

2
app/src/main/res/values/colors.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="prediction">#ff00ff</color>
<color name="basal">#00ffff</color>
<color name="iobPred">#00d2d2</color>
<color name="bolus">#1ea3e5</color>
<color name="ratio">#FFFFFF</color>
@ -22,7 +21,6 @@
<color name="ok_background">#323232</color>
<color name="defaultbackground">#424242</color>
<color name="defaulttext">#BBBBBB</color>
<color name="defaulttextcolor">#B3FFFFFF</color>
<color name="tempTargetBackground">#77dd77</color>

311
core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt
View file

@ -5,107 +5,208 @@ import info.nightscout.androidaps.core.R
import info.nightscout.androidaps.database.entities.UserEntry
fun UserEntry.Action.stringId(): Int {
return when {
this == UserEntry.Action.BOLUS -> R.string.uel_bolus
this == UserEntry.Action.BOLUS_WIZARD -> R.string.uel_bolus_wizard
this == UserEntry.Action.BOLUS_ADVISOR -> R.string.uel_bolus_advisor
this == UserEntry.Action.BOLUS_RECORD -> R.string.uel_bolus_record
this == UserEntry.Action.EXTENDED_BOLUS -> R.string.uel_extended_bolus
this == UserEntry.Action.SUPERBOLUS_TBR -> R.string.uel_superbolus_tbr
this == UserEntry.Action.CARBS -> R.string.uel_carbs
this == UserEntry.Action.EXTENDED_CARBS -> R.string.uel_extended_carbs
this == UserEntry.Action.TEMP_BASAL -> R.string.uel_temp_basal
this == UserEntry.Action.TT -> R.string.uel_tt
this == UserEntry.Action.TT_ACTIVITY -> R.string.uel_tt_activity
this == UserEntry.Action.TT_EATING_SOON -> R.string.uel_tt_eating_soon
this == UserEntry.Action.TT_HYPO -> R.string.uel_tt_hypo
this == UserEntry.Action.NEW_PROFILE -> R.string.uel_new_profile
this == UserEntry.Action.CLONE_PROFILE -> R.string.uel_clone_profile
this == UserEntry.Action.STORE_PROFILE -> R.string.uel_store_profile
this == UserEntry.Action.PROFILE_SWITCH -> R.string.uel_profile_switch
this == UserEntry.Action.PROFILE_SWITCH_CLONED -> R.string.uel_profile_switch_cloned
this == UserEntry.Action.CLOSED_LOOP_MODE -> R.string.uel_closed_loop_mode
this == UserEntry.Action.LGS_LOOP_MODE -> R.string.uel_lgs_loop_mode
this == UserEntry.Action.OPEN_LOOP_MODE -> R.string.uel_open_loop_mode
this == UserEntry.Action.LOOP_DISABLED -> R.string.uel_loop_disabled
this == UserEntry.Action.LOOP_ENABLED -> R.string.uel_loop_enabled
this == UserEntry.Action.RECONNECT -> R.string.uel_reconnect
this == UserEntry.Action.DISCONNECT_15M -> R.string.uel_disconnect_15m
this == UserEntry.Action.DISCONNECT_30M -> R.string.uel_disconnect_30m
this == UserEntry.Action.DISCONNECT_1H -> R.string.uel_disconnect_1h
this == UserEntry.Action.DISCONNECT_2H -> R.string.uel_disconnect_2h
this == UserEntry.Action.DISCONNECT_3H -> R.string.uel_disconnect_3h
this == UserEntry.Action.RESUME -> R.string.uel_resume
this == UserEntry.Action.SUSPEND_1H -> R.string.uel_suspend_1h
this == UserEntry.Action.SUSPEND_2H -> R.string.uel_suspend_2h
this == UserEntry.Action.SUSPEND_3H -> R.string.uel_suspend_3h
this == UserEntry.Action.SUSPEND_10H -> R.string.uel_suspend_10h
this == UserEntry.Action.HW_PUMP_ALLOWED -> R.string.uel_hw_pump_allowed
this == UserEntry.Action.CLEAR_PAIRING_KEYS -> R.string.uel_clear_pairing_keys
this == UserEntry.Action.ACCEPTS_TEMP_BASAL -> R.string.uel_accepts_temp_basal
this == UserEntry.Action.CANCEL_TEMP_BASAL -> R.string.uel_cancel_temp_basal
this == UserEntry.Action.CANCEL_EXTENDED_BOLUS -> R.string.uel_cancel_extended_bolus
this == UserEntry.Action.CANCEL_TT -> R.string.uel_cancel_tt
this == UserEntry.Action.CAREPORTAL -> R.string.uel_careportal
this == UserEntry.Action.CALIBRATION -> R.string.uel_calibration
this == UserEntry.Action.INSULIN_CHANGE -> R.string.uel_insulin_change
this == UserEntry.Action.PRIME_BOLUS -> R.string.uel_prime_bolus
this == UserEntry.Action.SITE_CHANGE -> R.string.uel_site_change
this == UserEntry.Action.TREATMENT -> R.string.uel_treatment
this == UserEntry.Action.CAREPORTAL_NS_REFRESH -> R.string.uel_careportal_ns_refresh
this == UserEntry.Action.PROFILE_SWITCH_NS_REFRESH -> R.string.uel_profile_switch_ns_refresh
this == UserEntry.Action.TREATMENTS_NS_REFRESH -> R.string.uel_treatments_ns_refresh
this == UserEntry.Action.TT_NS_REFRESH -> R.string.uel_tt_ns_refresh
this == UserEntry.Action.AUTOMATION_REMOVED -> R.string.uel_automation_removed
this == UserEntry.Action.BG_REMOVED -> R.string.uel_bg_removed
this == UserEntry.Action.CAREPORTAL_REMOVED -> R.string.uel_careportal_removed
this == UserEntry.Action.EXTENDED_BOLUS_REMOVED -> R.string.uel_extended_bolus_removed
this == UserEntry.Action.FOOD_REMOVED -> R.string.uel_food_removed
this == UserEntry.Action.PROFILE_REMOVED -> R.string.uel_profile_removed
this == UserEntry.Action.PROFILE_SWITCH_REMOVED -> R.string.uel_profile_switch_removed
this == UserEntry.Action.RESTART_EVENTS_REMOVED -> R.string.uel_restart_events_removed
this == UserEntry.Action.TREATMENT_REMOVED -> R.string.uel_treatment_removed
this == UserEntry.Action.TT_REMOVED -> R.string.uel_tt_removed
this == UserEntry.Action.NS_PAUSED -> R.string.uel_ns_paused
this == UserEntry.Action.NS_QUEUE_CLEARED -> R.string.uel_ns_queue_cleared
this == UserEntry.Action.NS_SETTINGS_COPIED -> R.string.uel_ns_settings_copied
this == UserEntry.Action.ERROR_DIALOG_OK -> R.string.uel_error_dialog_ok
this == UserEntry.Action.ERROR_DIALOG_MUTE -> R.string.uel_error_dialog_mute
this == UserEntry.Action.ERROR_DIALOG_MUTE_5MIN -> R.string.uel_error_dialog_mute_5min
this == UserEntry.Action.OBJECTIVE_STARTED -> R.string.uel_objective_started
this == UserEntry.Action.OBJECTIVE_UNSTARTED -> R.string.uel_objective_unstarted
this == UserEntry.Action.OBJECTIVES_SKIPPED -> R.string.uel_objectives_skipped
this == UserEntry.Action.STAT_RESET -> R.string.uel_stat_reset
this == UserEntry.Action.DELETE_LOGS -> R.string.uel_delete_logs
this == UserEntry.Action.DELETE_FUTURE_TREATMENTS -> R.string.uel_delete_future_treatments
this == UserEntry.Action.EXPORT_SETTINGS -> R.string.uel_export_settings
this == UserEntry.Action.IMPORT_SETTINGS -> R.string.uel_import_settings
this == UserEntry.Action.RESET_DATABASES -> R.string.uel_reset_databases
this == UserEntry.Action.EXPORT_DATABASES -> R.string.uel_export_databases
this == UserEntry.Action.IMPORT_DATABASES -> R.string.uel_import_databases
this == UserEntry.Action.OTP_EXPORT -> R.string.uel_otp_export
this == UserEntry.Action.OTP_RESET -> R.string.uel_otp_reset
this == UserEntry.Action.SMS_BASAL -> R.string.uel_sms_basal
this == UserEntry.Action.SMS_BOLUS -> R.string.uel_sms_bolus
this == UserEntry.Action.SMS_CAL -> R.string.uel_sms_cal
this == UserEntry.Action.SMS_CARBS -> R.string.uel_sms_carbs
this == UserEntry.Action.SMS_EXTENDED_BOLUS -> R.string.uel_sms_extended_bolus
this == UserEntry.Action.SMS_LOOP_DISABLED -> R.string.uel_sms_loop_disabled
this == UserEntry.Action.SMS_LOOP_ENABLED -> R.string.uel_sms_loop_enabled
this == UserEntry.Action.SMS_LOOP_RESUME -> R.string.uel_sms_loop_resume
this == UserEntry.Action.SMS_LOOP_SUSPEND -> R.string.uel_sms_loop_suspend
this == UserEntry.Action.SMS_PROFILE -> R.string.uel_sms_profile
this == UserEntry.Action.SMS_PUMP_CONNECT -> R.string.uel_sms_pump_connect
this == UserEntry.Action.SMS_PUMP_DISCONNECT -> R.string.uel_sms_pump_disconnect
this == UserEntry.Action.SMS_SMS -> R.string.uel_sms_sms
this == UserEntry.Action.SMS_TT -> R.string.uel_sms_tt
this == UserEntry.Action.TT_DELETED_FROM_NS -> R.string.uel_tt_deleted_from_ns
this == UserEntry.Action.TT_FROM_NS -> R.string.uel_tt_from_ns
this == UserEntry.Action.TT_CANCELED_FROM_NS -> R.string.uel_tt_canceleted_from_ns
else -> R.string.uel_unknown
return when (this) {
UserEntry.Action.BOLUS -> R.string.uel_bolus
UserEntry.Action.BOLUS_WIZARD -> R.string.uel_bolus_wizard
UserEntry.Action.BOLUS_ADVISOR -> R.string.uel_bolus_advisor
UserEntry.Action.BOLUS_RECORD -> R.string.uel_bolus_record
UserEntry.Action.EXTENDED_BOLUS -> R.string.uel_extended_bolus
UserEntry.Action.SUPERBOLUS_TBR -> R.string.uel_superbolus_tbr
UserEntry.Action.CARBS -> R.string.uel_carbs
UserEntry.Action.EXTENDED_CARBS -> R.string.uel_extended_carbs
UserEntry.Action.TEMP_BASAL -> R.string.uel_temp_basal
UserEntry.Action.TT -> R.string.uel_tt
UserEntry.Action.TT_ACTIVITY -> R.string.uel_tt_activity
UserEntry.Action.TT_EATING_SOON -> R.string.uel_tt_eating_soon
UserEntry.Action.TT_HYPO -> R.string.uel_tt_hypo
UserEntry.Action.NEW_PROFILE -> R.string.uel_new_profile
UserEntry.Action.CLONE_PROFILE -> R.string.uel_clone_profile
UserEntry.Action.STORE_PROFILE -> R.string.uel_store_profile
UserEntry.Action.PROFILE_SWITCH -> R.string.uel_profile_switch
UserEntry.Action.PROFILE_SWITCH_CLONED -> R.string.uel_profile_switch_cloned
UserEntry.Action.CLOSED_LOOP_MODE -> R.string.uel_closed_loop_mode
UserEntry.Action.LGS_LOOP_MODE -> R.string.uel_lgs_loop_mode
UserEntry.Action.OPEN_LOOP_MODE -> R.string.uel_open_loop_mode
UserEntry.Action.LOOP_DISABLED -> R.string.uel_loop_disabled
UserEntry.Action.LOOP_ENABLED -> R.string.uel_loop_enabled
UserEntry.Action.RECONNECT -> R.string.uel_reconnect
UserEntry.Action.DISCONNECT_15M -> R.string.uel_disconnect_15m
UserEntry.Action.DISCONNECT_30M -> R.string.uel_disconnect_30m
UserEntry.Action.DISCONNECT_1H -> R.string.uel_disconnect_1h
UserEntry.Action.DISCONNECT_2H -> R.string.uel_disconnect_2h
UserEntry.Action.DISCONNECT_3H -> R.string.uel_disconnect_3h
UserEntry.Action.RESUME -> R.string.uel_resume
UserEntry.Action.SUSPEND_1H -> R.string.uel_suspend_1h
UserEntry.Action.SUSPEND_2H -> R.string.uel_suspend_2h
UserEntry.Action.SUSPEND_3H -> R.string.uel_suspend_3h
UserEntry.Action.SUSPEND_10H -> R.string.uel_suspend_10h
UserEntry.Action.HW_PUMP_ALLOWED -> R.string.uel_hw_pump_allowed
UserEntry.Action.CLEAR_PAIRING_KEYS -> R.string.uel_clear_pairing_keys
UserEntry.Action.ACCEPTS_TEMP_BASAL -> R.string.uel_accepts_temp_basal
UserEntry.Action.CANCEL_TEMP_BASAL -> R.string.uel_cancel_temp_basal
UserEntry.Action.CANCEL_EXTENDED_BOLUS -> R.string.uel_cancel_extended_bolus
UserEntry.Action.CANCEL_TT -> R.string.uel_cancel_tt
UserEntry.Action.CAREPORTAL -> R.string.uel_careportal
UserEntry.Action.CALIBRATION -> R.string.uel_calibration
UserEntry.Action.INSULIN_CHANGE -> R.string.uel_insulin_change
UserEntry.Action.PRIME_BOLUS -> R.string.uel_prime_bolus
UserEntry.Action.SITE_CHANGE -> R.string.uel_site_change
UserEntry.Action.TREATMENT -> R.string.uel_treatment
UserEntry.Action.CAREPORTAL_NS_REFRESH -> R.string.uel_careportal_ns_refresh
UserEntry.Action.PROFILE_SWITCH_NS_REFRESH -> R.string.uel_profile_switch_ns_refresh
UserEntry.Action.TREATMENTS_NS_REFRESH -> R.string.uel_treatments_ns_refresh
UserEntry.Action.TT_NS_REFRESH -> R.string.uel_tt_ns_refresh
UserEntry.Action.AUTOMATION_REMOVED -> R.string.uel_automation_removed
UserEntry.Action.BG_REMOVED -> R.string.uel_bg_removed
UserEntry.Action.CAREPORTAL_REMOVED -> R.string.uel_careportal_removed
UserEntry.Action.EXTENDED_BOLUS_REMOVED -> R.string.uel_extended_bolus_removed
UserEntry.Action.FOOD_REMOVED -> R.string.uel_food_removed
UserEntry.Action.PROFILE_REMOVED -> R.string.uel_profile_removed
UserEntry.Action.PROFILE_SWITCH_REMOVED -> R.string.uel_profile_switch_removed
UserEntry.Action.RESTART_EVENTS_REMOVED -> R.string.uel_restart_events_removed
UserEntry.Action.TREATMENT_REMOVED -> R.string.uel_treatment_removed
UserEntry.Action.TT_REMOVED -> R.string.uel_tt_removed
UserEntry.Action.NS_PAUSED -> R.string.uel_ns_paused
UserEntry.Action.NS_QUEUE_CLEARED -> R.string.uel_ns_queue_cleared
UserEntry.Action.NS_SETTINGS_COPIED -> R.string.uel_ns_settings_copied
UserEntry.Action.ERROR_DIALOG_OK -> R.string.uel_error_dialog_ok
UserEntry.Action.ERROR_DIALOG_MUTE -> R.string.uel_error_dialog_mute
UserEntry.Action.ERROR_DIALOG_MUTE_5MIN -> R.string.uel_error_dialog_mute_5min
UserEntry.Action.OBJECTIVE_STARTED -> R.string.uel_objective_started
UserEntry.Action.OBJECTIVE_UNSTARTED -> R.string.uel_objective_unstarted
UserEntry.Action.OBJECTIVES_SKIPPED -> R.string.uel_objectives_skipped
UserEntry.Action.STAT_RESET -> R.string.uel_stat_reset
UserEntry.Action.DELETE_LOGS -> R.string.uel_delete_logs
UserEntry.Action.DELETE_FUTURE_TREATMENTS -> R.string.uel_delete_future_treatments
UserEntry.Action.EXPORT_SETTINGS -> R.string.uel_export_settings
UserEntry.Action.IMPORT_SETTINGS -> R.string.uel_import_settings
UserEntry.Action.RESET_DATABASES -> R.string.uel_reset_databases
UserEntry.Action.EXPORT_DATABASES -> R.string.uel_export_databases
UserEntry.Action.IMPORT_DATABASES -> R.string.uel_import_databases
UserEntry.Action.OTP_EXPORT -> R.string.uel_otp_export
UserEntry.Action.OTP_RESET -> R.string.uel_otp_reset
UserEntry.Action.SMS_BASAL -> R.string.uel_sms_basal
UserEntry.Action.SMS_BOLUS -> R.string.uel_sms_bolus
UserEntry.Action.SMS_CAL -> R.string.uel_sms_cal
UserEntry.Action.SMS_CARBS -> R.string.uel_sms_carbs
UserEntry.Action.SMS_EXTENDED_BOLUS -> R.string.uel_sms_extended_bolus
UserEntry.Action.SMS_LOOP_DISABLED -> R.string.uel_sms_loop_disabled
UserEntry.Action.SMS_LOOP_ENABLED -> R.string.uel_sms_loop_enabled
UserEntry.Action.SMS_LOOP_RESUME -> R.string.uel_sms_loop_resume
UserEntry.Action.SMS_LOOP_SUSPEND -> R.string.uel_sms_loop_suspend
UserEntry.Action.SMS_PROFILE -> R.string.uel_sms_profile
UserEntry.Action.SMS_PUMP_CONNECT -> R.string.uel_sms_pump_connect
UserEntry.Action.SMS_PUMP_DISCONNECT -> R.string.uel_sms_pump_disconnect
UserEntry.Action.SMS_SMS -> R.string.uel_sms_sms
UserEntry.Action.SMS_TT -> R.string.uel_sms_tt
UserEntry.Action.TT_DELETED_FROM_NS -> R.string.uel_tt_deleted_from_ns
UserEntry.Action.TT_FROM_NS -> R.string.uel_tt_from_ns
UserEntry.Action.TT_CANCELED_FROM_NS -> R.string.uel_tt_canceleted_from_ns
else -> R.string.uel_unknown
}
}
fun UserEntry.Action.colorId(): Int {
return when (this) {
UserEntry.Action.BOLUS -> R.color.iob
UserEntry.Action.BOLUS_WIZARD -> R.color.iob
UserEntry.Action.BOLUS_ADVISOR -> R.color.iob
UserEntry.Action.BOLUS_RECORD -> R.color.iob
UserEntry.Action.EXTENDED_BOLUS -> R.color.extendedBolus
UserEntry.Action.SUPERBOLUS_TBR -> R.color.carbs
UserEntry.Action.CARBS -> R.color.carbs
UserEntry.Action.EXTENDED_CARBS -> R.color.carbs
UserEntry.Action.TEMP_BASAL -> R.color.basal
UserEntry.Action.TT -> R.color.tempTargetConfirmation
UserEntry.Action.TT_ACTIVITY -> R.color.tempTargetConfirmation
UserEntry.Action.TT_EATING_SOON -> R.color.tempTargetConfirmation
UserEntry.Action.TT_HYPO -> R.color.tempTargetConfirmation
UserEntry.Action.NEW_PROFILE -> R.color.white
UserEntry.Action.CLONE_PROFILE -> R.color.white
UserEntry.Action.STORE_PROFILE -> R.color.white
UserEntry.Action.PROFILE_SWITCH -> R.color.white
UserEntry.Action.PROFILE_SWITCH_CLONED -> R.color.white
UserEntry.Action.CLOSED_LOOP_MODE -> R.color.loopClosed
UserEntry.Action.LGS_LOOP_MODE -> R.color.loopClosed
UserEntry.Action.OPEN_LOOP_MODE -> R.color.loopOpened
UserEntry.Action.LOOP_DISABLED -> R.color.loopDisabled
UserEntry.Action.LOOP_ENABLED -> R.color.loopClosed
UserEntry.Action.RECONNECT -> R.color.loopDisconnected
UserEntry.Action.DISCONNECT_15M -> R.color.loopDisconnected
UserEntry.Action.DISCONNECT_30M -> R.color.loopDisconnected
UserEntry.Action.DISCONNECT_1H -> R.color.loopDisconnected
UserEntry.Action.DISCONNECT_2H -> R.color.loopDisconnected
UserEntry.Action.DISCONNECT_3H -> R.color.loopDisconnected
UserEntry.Action.RESUME -> R.color.loopClosed
UserEntry.Action.SUSPEND_1H -> R.color.loopSuspended
UserEntry.Action.SUSPEND_2H -> R.color.loopSuspended
UserEntry.Action.SUSPEND_3H -> R.color.loopSuspended
UserEntry.Action.SUSPEND_10H -> R.color.loopSuspended
UserEntry.Action.HW_PUMP_ALLOWED -> R.color.defaulttext
UserEntry.Action.CLEAR_PAIRING_KEYS -> R.color.defaulttext
UserEntry.Action.ACCEPTS_TEMP_BASAL -> R.color.basal
UserEntry.Action.CANCEL_TEMP_BASAL -> R.color.basal
UserEntry.Action.CANCEL_EXTENDED_BOLUS -> R.color.extendedBolus
UserEntry.Action.CANCEL_TT -> R.color.tempTargetConfirmation
UserEntry.Action.CAREPORTAL -> R.color.notificationAnnouncement
UserEntry.Action.CALIBRATION -> R.color.calibration
UserEntry.Action.INSULIN_CHANGE -> R.color.iob
UserEntry.Action.PRIME_BOLUS -> R.color.defaulttext
UserEntry.Action.SITE_CHANGE -> R.color.defaulttext
UserEntry.Action.TREATMENT -> R.color.defaulttext
UserEntry.Action.CAREPORTAL_NS_REFRESH -> R.color.notificationAnnouncement
UserEntry.Action.PROFILE_SWITCH_NS_REFRESH -> R.color.white
UserEntry.Action.TREATMENTS_NS_REFRESH -> R.color.defaulttext
UserEntry.Action.TT_NS_REFRESH -> R.color.tempTargetConfirmation
UserEntry.Action.AUTOMATION_REMOVED -> R.color.defaulttext
UserEntry.Action.BG_REMOVED -> R.color.calibration
UserEntry.Action.CAREPORTAL_REMOVED -> R.color.notificationAnnouncement
UserEntry.Action.EXTENDED_BOLUS_REMOVED -> R.color.extendedBolus
UserEntry.Action.FOOD_REMOVED -> R.color.carbs
UserEntry.Action.PROFILE_REMOVED -> R.color.white
UserEntry.Action.PROFILE_SWITCH_REMOVED -> R.color.white
UserEntry.Action.RESTART_EVENTS_REMOVED -> R.color.defaulttext
UserEntry.Action.TREATMENT_REMOVED -> R.color.defaulttext
UserEntry.Action.TT_REMOVED -> R.color.tempTargetConfirmation
UserEntry.Action.NS_PAUSED -> R.color.defaulttext
UserEntry.Action.NS_QUEUE_CLEARED -> R.color.defaulttext
UserEntry.Action.NS_SETTINGS_COPIED -> R.color.defaulttext
UserEntry.Action.ERROR_DIALOG_OK -> R.color.defaulttext
UserEntry.Action.ERROR_DIALOG_MUTE -> R.color.defaulttext
UserEntry.Action.ERROR_DIALOG_MUTE_5MIN -> R.color.defaulttext
UserEntry.Action.OBJECTIVE_STARTED -> R.color.defaulttext
UserEntry.Action.OBJECTIVE_UNSTARTED -> R.color.defaulttext
UserEntry.Action.OBJECTIVES_SKIPPED -> R.color.defaulttext
UserEntry.Action.STAT_RESET -> R.color.defaulttext
UserEntry.Action.DELETE_LOGS -> R.color.defaulttext
UserEntry.Action.DELETE_FUTURE_TREATMENTS -> R.color.defaulttext
UserEntry.Action.EXPORT_SETTINGS -> R.color.defaulttext
UserEntry.Action.IMPORT_SETTINGS -> R.color.defaulttext
UserEntry.Action.RESET_DATABASES -> R.color.defaulttext
UserEntry.Action.EXPORT_DATABASES -> R.color.defaulttext
UserEntry.Action.IMPORT_DATABASES -> R.color.defaulttext
UserEntry.Action.OTP_EXPORT -> R.color.defaulttext
UserEntry.Action.OTP_RESET -> R.color.defaulttext
UserEntry.Action.SMS_BASAL -> R.color.basal
UserEntry.Action.SMS_BOLUS -> R.color.iob
UserEntry.Action.SMS_CAL -> R.color.calibration
UserEntry.Action.SMS_CARBS -> R.color.carbs
UserEntry.Action.SMS_EXTENDED_BOLUS -> R.color.extendedBolus
UserEntry.Action.SMS_LOOP_DISABLED -> R.color.loopDisabled
UserEntry.Action.SMS_LOOP_ENABLED -> R.color.loopClosed
UserEntry.Action.SMS_LOOP_RESUME -> R.color.loopClosed
UserEntry.Action.SMS_LOOP_SUSPEND -> R.color.loopSuspended
UserEntry.Action.SMS_PROFILE -> R.color.white
UserEntry.Action.SMS_PUMP_CONNECT -> R.color.loopDisconnected
UserEntry.Action.SMS_PUMP_DISCONNECT -> R.color.loopDisconnected
UserEntry.Action.SMS_SMS -> R.color.defaulttext
UserEntry.Action.SMS_TT -> R.color.tempTargetConfirmation
UserEntry.Action.TT_DELETED_FROM_NS -> R.color.tempTargetConfirmation
UserEntry.Action.TT_FROM_NS -> R.color.tempTargetConfirmation
UserEntry.Action.TT_CANCELED_FROM_NS -> R.color.tempTargetConfirmation
else -> R.color.defaulttext
}
}
fun UserEntry.Units.stringId(): Int {
return when {
@ -121,17 +222,3 @@ fun UserEntry.Units.stringId(): Int {
else -> 0
}
}
fun UserEntry.ValueWithUnit.toStringWithUnit(): String {
/* need injection to maje convertion
return when (this.unit) {
UserEntry.Units.Timestamp -> dateUtil.dateAndTimeAndSecondsString(this.lValue)
UserEntry.Units.CPEvent -> translator.translate(this.sValue)
UserEntry.Units.R_String -> resourceHelper.gs(this.iValue)
UserEntry.Units.Mg_Dl -> DecimalFormatter.to0Decimal(this.dValue) + resourceHelper.gs(UserEntry.Units.Mg_Dl.stringId())
UserEntry.Units.Mmol_L -> DecimalFormatter.to1Decimal(this.dValue) + resourceHelper.gs(UserEntry.Units.Mmol_L.stringId())
UserEntry.Units.G -> DecimalFormatter.to0Decimal(this.dValue) + resourceHelper.gs(UserEntry.Units.G.stringId())
else -> if (!this.value().equals(0) && !this.value().equals("")) { v.value().toString() + if (!this.unit.stringId().equals(0)) resourceHelper.gs(this.unit.stringId()) else "" } else ""
} */
return ""
}

6
core/src/main/res/drawable/ic_cp_bgcheck.xml
View file

@ -5,11 +5,11 @@
android:viewportHeight="24">
<path
android:pathData="M6.384,15.052c-0.018,-0.323 0.025,-0.625 0.418,-0.671c0.36,-0.042 0.49,0.218 0.531,0.516c0.155,1.131 0.771,1.799 1.92,1.948c0.336,0.043 0.592,0.192 0.528,0.573c-0.059,0.351 -0.373,0.388 -0.654,0.387C7.775,17.801 6.4,16.415 6.384,15.052z"
android:fillColor="#E9375C"/>
android:fillColor="@color/calibration"/>
<path
android:pathData="M18.817,9.875c-0.377,-1.485 -1.932,-3.719 -2.256,-3.719c-0.325,0 -1.884,2.238 -2.26,3.721c-0.251,0.991 0.067,1.842 0.943,2.421c0.855,0.565 1.778,0.556 2.632,-0.008C18.755,11.712 19.071,10.874 18.817,9.875zM17.437,11.623c-0.297,0.196 -0.595,0.295 -0.886,0.295c-0.286,0 -0.577,-0.097 -0.866,-0.287c-0.586,-0.387 -0.779,-0.882 -0.608,-1.558c0.236,-0.933 0.997,-2.169 1.484,-2.813c0.486,0.644 1.244,1.878 1.481,2.812C18.213,10.745 18.021,11.237 17.437,11.623z"
android:fillColor="#E83258"/>
android:fillColor="@color/calibration"/>
<path
android:pathData="M13.737,13.869c-0.726,-2.859 -3.893,-7.275 -4.343,-7.275c-0.45,0 -3.627,4.425 -4.349,7.278c-0.483,1.908 0.128,3.546 1.816,4.66c1.646,1.087 3.422,1.07 5.067,-0.015C13.617,17.403 14.225,15.791 13.737,13.869zM11.487,17.85c-0.694,0.457 -1.405,0.689 -2.112,0.689c-0.698,0 -1.396,-0.227 -2.074,-0.675c-1.389,-0.916 -1.887,-2.193 -1.481,-3.796c0.563,-2.22 3.332,-6.141 3.574,-6.141s3.003,3.917 3.568,6.138C13.368,15.663 12.871,16.937 11.487,17.85z"
android:fillColor="#E83258"/>
android:fillColor="@color/calibration"/>
</vector>

12
core/src/main/res/values/colors.xml
View file

@ -25,22 +25,34 @@
<color name="errorAlertBackground">#FFFF5555</color>
<color name="errorAlertHeaderText">#FF000000</color>
<color name="examinedProfile">#FFFF5555</color>
<color name="defaulttext">#BBBBBB</color>
<!-- Treatment-->
<color name="tempbasal">#C803A9F4</color>
<color name="list_delimiter">#505050</color>
<color name="basal">#00ffff</color>
<!-- Loop -->
<color name="loopDisconnected">#939393</color>
<color name="loopClosed">#00C03E</color>
<color name="loopSuspended">#FFFF13</color>
<color name="loopOpened">#4983D7</color>
<color name="loopDisabled">#FF1313</color>
<!-- BgReading-->
<color name="inrange">#00FF00</color>
<color name="low">#FF0000</color>
<color name="high">#FFFF00</color>
<color name="iob">#1e88e5</color>
<color name="extendedBolus">#67DFE8</color>
<color name="iobPredAS">#1ea3e5</color>
<color name="cob">#FFFB8C00</color>
<color name="carbs">#FFFB8C00</color>
<color name="uam">#c9bd60</color>
<color name="zt">#00d2d2</color>
<color name="white">#ffffff</color>
<color name="calibration">#E83258</color>
<color name="ribbonDefault">#5a595b</color>
<color name="daySelected">#D000FF00</color>