caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

extend Plugin with icon resource for menue and config builder. Integrate plugin icon for pump selection into config builder

Browse source
This commit is contained in:
osodebailar 2020-12-07 18:51:16 +01:00
parent 161e3aa119
commit 634efad48f
13 changed files with 270 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
View file

@ -5,12 +5,9 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.CheckBox
import android.widget.ImageButton
import android.widget.LinearLayout
import android.widget.RadioButton
import android.widget.TextView
import android.widget.*
import androidx.annotation.StringRes
import androidx.core.content.ContextCompat
import dagger.android.support.DaggerFragment
import info.nightscout.androidaps.Config
import info.nightscout.androidaps.R
@ -129,6 +126,7 @@ class ConfigBuilderFragment : DaggerFragment() {
val baseView: LinearLayout = fragment.layoutInflater.inflate(R.layout.configbuilder_single_plugin, null) as LinearLayout
private val enabledExclusive: RadioButton
private val enabledInclusive: CheckBox
private val pluginIcon: ImageView
private val pluginName: TextView
private val pluginDescription: TextView
private val pluginPreferences: ImageButton
@ -137,6 +135,7 @@ class ConfigBuilderFragment : DaggerFragment() {
init {
enabledExclusive = baseView.findViewById(R.id.plugin_enabled_exclusive)
enabledInclusive = baseView.findViewById(R.id.plugin_enabled_inclusive)
pluginIcon = baseView.findViewById(R.id.plugin_icon)
pluginName = baseView.findViewById(R.id.plugin_name)
pluginDescription = baseView.findViewById(R.id.plugin_description)
pluginPreferences = baseView.findViewById(R.id.plugin_preferences)
@ -175,6 +174,12 @@ class ConfigBuilderFragment : DaggerFragment() {
enabledInclusive.isChecked = plugin.isEnabled(pluginType)
enabledInclusive.isEnabled = !plugin.pluginDescription.alwaysEnabled
enabledExclusive.isEnabled = !plugin.pluginDescription.alwaysEnabled
if(plugin.menuIcon != -1) {
pluginIcon.visibility = View.VISIBLE
pluginIcon.setImageDrawable(context?.let { ContextCompat.getDrawable(it, plugin.menuIcon) })
} else {
pluginIcon.visibility = View.GONE
}
pluginName.text = plugin.name
if (plugin.description == null)
pluginDescription.visibility = View.GONE

1
app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
View file

@ -147,6 +147,7 @@ public class ComboPlugin extends PumpPluginBase implements PumpInterface, Constr
super(new PluginDescription()
.mainType(PluginType.PUMP)
.fragmentClass(ComboFragment.class.getName())
.pluginIcon(R.drawable.ic_combo)
.pluginName(R.string.combopump)
.shortName(R.string.combopump_shortname)
.description(R.string.description_pump_combo),

1
app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
View file

@ -219,6 +219,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
DateUtil dateUtil
) {
super(new PluginDescription()
.pluginIcon(R.drawable.ic_insight)
.pluginName(R.string.insight_local)
.shortName(R.string.insightpump_shortname)
.mainType(PluginType.PUMP)

5
app/src/main/res/layout/configbuilder_single_plugin.xml
View file

@ -29,6 +29,11 @@
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:id="@+id/plugin_icon"
android:layout_width="36dp"
android:layout_height="36dp" />
<TextView
android:id="@+id/plugin_name"
android:layout_width="wrap_content"

5
app/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt
View file

@ -39,6 +39,11 @@ class PluginDescriptionTest {
Assert.assertEquals(false, pluginDescription.showInList)
}
@Test fun pluginIcon() {
val pluginDescription = PluginDescription().pluginIcon(10)
Assert.assertEquals(10, pluginDescription.pluginIcon.toLong())
}
@Test fun pluginName() {
val pluginDescription = PluginDescription().pluginName(10)
Assert.assertEquals(10, pluginDescription.pluginName.toLong())

3
core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt
View file

@ -24,6 +24,9 @@ abstract class PluginBase(
private var state = State.NOT_INITIALIZED
private var fragmentVisible = false
open val menuIcon: Int
get() = pluginDescription.pluginIcon
open val name: String
get() = if (pluginDescription.pluginName == -1) "UNKNOWN" else resourceHelper.gs(pluginDescription.pluginName)

6
core/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.java
View file

@ -14,6 +14,7 @@ public class PluginDescription {
public boolean enableByDefault = false;
public boolean visibleByDefault = false;
boolean defaultPlugin = false;
int pluginIcon = -1;
public PluginDescription mainType(PluginType mainType) {
this.mainType = mainType;
@ -45,6 +46,11 @@ public class PluginDescription {
return this;
}
public PluginDescription pluginIcon(int pluginIcon) {
this.pluginIcon = pluginIcon;
return this;
}
public PluginDescription pluginName(int pluginName) {
this.pluginName = pluginName;
return this;

64
dana/src/main/res/drawable/ic_dana_rs.xml Normal file
View file

@ -0,0 +1,64 @@
<vector android:height="75dp" android:viewportHeight="300"
android:viewportWidth="600" android:width="150dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#F5F4F0" android:pathData="M500.668,8.819L4,8.819L4,278.689C4,282.802 7.34,286.142 11.453,286.142L500.668,286.142L500.668,8.819Z"/>
<path android:fillColor="#383A3B" android:pathData="M482.033,102.178C482.033,92.508 474.182,84.657 464.512,84.657L73.741,84.657C64.072,84.657 56.221,92.508 56.221,102.178L56.221,288.505C56.221,289.33 56.89,289.999 57.714,289.999L480.008,289.999C481.125,289.999 482.033,289.091 482.033,287.974L482.033,102.178Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M228.849,73.75C229.398,73.75 229.926,73.692 230.41,73.595C230.872,73.498 231.289,73.323 231.641,73.09C231.993,72.877 232.279,72.585 232.477,72.236C232.675,71.886 232.785,71.459 232.785,70.974C232.785,70.449 232.675,70.022 232.477,69.692C232.257,69.362 231.971,69.09 231.619,68.896C231.245,68.701 230.85,68.566 230.388,68.488C229.926,68.41 229.442,68.371 228.937,68.371L224.188,68.371L224.188,73.75L228.849,73.75ZM224.188,74.877L224.188,81.227L222.692,81.227L222.692,67.245L228.893,67.245C230.63,67.245 231.971,67.536 232.894,68.099C233.818,68.682 234.28,69.614 234.28,70.915C234.28,71.789 234.082,72.488 233.686,73.013C233.268,73.537 232.609,73.964 231.707,74.333C232.169,74.469 232.543,74.683 232.807,74.954C233.07,75.226 233.268,75.537 233.4,75.887C233.532,76.236 233.62,76.605 233.664,76.993C233.686,77.382 233.708,77.751 233.73,78.12C233.752,78.644 233.774,79.091 233.818,79.44C233.84,79.79 233.884,80.081 233.95,80.295C233.994,80.508 234.06,80.683 234.126,80.8C234.192,80.936 234.28,81.033 234.39,81.091L234.39,81.227L232.741,81.227C232.587,80.994 232.477,80.664 232.411,80.256C232.345,79.848 232.279,79.401 232.257,78.955C232.213,78.508 232.169,78.062 232.169,77.634C232.147,77.207 232.103,76.858 232.037,76.586C231.949,76.217 231.817,75.906 231.619,75.673C231.399,75.459 231.179,75.285 230.894,75.168C230.608,75.052 230.3,74.974 229.97,74.935C229.618,74.896 229.267,74.877 228.893,74.877L224.188,74.877Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M237.995,77.052C238.061,77.673 238.215,78.197 238.479,78.625C238.721,79.071 239.051,79.421 239.469,79.693C239.864,79.965 240.326,80.159 240.854,80.275C241.382,80.411 241.953,80.469 242.547,80.469C243.25,80.469 243.866,80.392 244.372,80.236C244.878,80.081 245.295,79.867 245.625,79.596C245.955,79.343 246.197,79.032 246.351,78.683C246.505,78.333 246.571,77.964 246.571,77.576C246.571,77.032 246.439,76.586 246.153,76.256C245.867,75.925 245.515,75.634 245.075,75.421C244.614,75.207 244.108,75.052 243.536,74.916C242.943,74.78 242.349,74.663 241.755,74.527C241.14,74.411 240.546,74.275 239.974,74.1C239.381,73.925 238.875,73.712 238.435,73.42C237.974,73.129 237.622,72.76 237.336,72.313C237.05,71.867 236.918,71.304 236.918,70.624C236.918,70.138 237.028,69.672 237.27,69.226C237.49,68.779 237.82,68.371 238.281,68.022C238.721,67.672 239.271,67.4 239.952,67.187C240.634,66.973 241.404,66.876 242.283,66.876C243.184,66.876 243.954,66.993 244.636,67.206C245.295,67.42 245.845,67.731 246.285,68.099C246.724,68.488 247.054,68.935 247.274,69.439C247.494,69.944 247.604,70.488 247.604,71.051L246.175,71.051C246.175,70.527 246.065,70.061 245.867,69.672C245.647,69.284 245.361,68.973 244.987,68.721C244.614,68.468 244.196,68.294 243.734,68.177C243.272,68.061 242.789,68.002 242.283,68.002C241.513,68.002 240.876,68.099 240.37,68.274C239.842,68.468 239.425,68.721 239.117,69.012C238.809,69.303 238.589,69.634 238.479,70.003C238.369,70.372 238.347,70.721 238.413,71.09C238.501,71.537 238.699,71.906 239.029,72.178C239.359,72.449 239.754,72.682 240.216,72.838C240.678,73.013 241.206,73.168 241.777,73.265C242.327,73.382 242.899,73.498 243.492,73.615C244.086,73.75 244.658,73.886 245.207,74.061C245.757,74.236 246.241,74.45 246.658,74.741C247.076,75.032 247.428,75.382 247.692,75.828C247.934,76.275 248.066,76.838 248.066,77.518C248.066,78.819 247.56,79.809 246.549,80.528C245.537,81.246 244.108,81.596 242.283,81.596C241.469,81.596 240.7,81.499 239.996,81.324C239.293,81.13 238.677,80.838 238.171,80.45C237.666,80.081 237.27,79.596 236.984,79.032C236.698,78.489 236.544,77.809 236.544,77.052L237.995,77.052Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M162.922,74.208L166.098,74.208C166.726,74.208 167.228,74.295 167.614,74.469C168,74.633 168.319,74.874 168.57,75.193C168.821,75.511 169.004,75.878 169.111,76.303C169.227,76.728 169.284,77.172 169.284,77.645C169.284,78.379 169.198,78.948 169.033,79.364C168.86,79.769 168.628,80.107 168.329,80.387C168.029,80.657 167.711,80.841 167.373,80.928C166.9,81.053 166.475,81.121 166.098,81.121L162.922,81.121L162.922,74.208ZM165.056,75.772L165.056,79.547L165.587,79.547C166.031,79.547 166.349,79.499 166.533,79.402C166.726,79.306 166.871,79.132 166.977,78.881C167.083,78.64 167.141,78.234 167.141,77.684C167.141,76.95 167.016,76.448 166.784,76.178C166.543,75.907 166.147,75.772 165.596,75.772L165.056,75.772Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M170.344,74.208L172.265,74.208L172.265,75.511L170.344,75.511L170.344,74.208ZM170.344,76.11L172.265,76.11L172.265,81.121L170.344,81.121L170.344,76.11Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M175.239,77.732L173.405,77.539C173.472,77.22 173.579,76.969 173.704,76.786C173.839,76.602 174.023,76.438 174.274,76.303C174.447,76.207 174.689,76.139 174.998,76.081C175.307,76.023 175.635,76.004 175.992,76.004C176.571,76.004 177.035,76.033 177.382,76.1C177.73,76.158 178.02,76.293 178.251,76.496C178.415,76.641 178.541,76.844 178.637,77.104C178.734,77.365 178.782,77.606 178.782,77.848L178.782,80.059C178.782,80.29 178.792,80.474 178.831,80.609C178.86,80.744 178.917,80.918 179.024,81.121L177.218,81.121C177.151,80.995 177.102,80.889 177.083,80.821C177.054,80.754 177.035,80.648 177.016,80.512C176.765,80.754 176.514,80.918 176.262,81.024C175.925,81.169 175.529,81.237 175.085,81.237C174.486,81.237 174.032,81.092 173.723,80.821C173.414,80.541 173.26,80.204 173.26,79.798C173.26,79.412 173.366,79.103 173.588,78.862C173.81,78.611 174.225,78.427 174.824,78.311C175.548,78.166 176.011,78.07 176.224,78.002C176.436,77.944 176.668,77.877 176.909,77.78C176.909,77.539 176.861,77.375 176.755,77.288C176.658,77.191 176.494,77.143 176.243,77.143C175.934,77.143 175.693,77.191 175.538,77.298C175.413,77.375 175.316,77.52 175.239,77.732ZM176.909,78.746C176.639,78.842 176.369,78.919 176.079,78.997C175.693,79.103 175.442,79.199 175.336,79.306C175.229,79.402 175.181,79.518 175.181,79.653C175.181,79.808 175.229,79.933 175.336,80.02C175.442,80.117 175.596,80.165 175.799,80.165C176.011,80.165 176.214,80.117 176.398,80.01C176.581,79.914 176.716,79.779 176.793,79.634C176.871,79.479 176.909,79.286 176.909,79.055L176.909,78.746Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M180.035,74.208L181.976,74.208L181.976,76.602C182.169,76.4 182.381,76.255 182.623,76.149C182.874,76.052 183.134,76.004 183.434,76.004C184.042,76.004 184.544,76.216 184.949,76.66C185.345,77.095 185.548,77.722 185.548,78.543C185.548,79.093 185.451,79.576 185.278,79.991C185.094,80.406 184.843,80.715 184.515,80.928C184.196,81.13 183.839,81.237 183.443,81.237C183.105,81.237 182.796,81.159 182.517,81.015C182.314,80.908 182.082,80.696 181.831,80.377L181.831,81.121L180.035,81.121L180.035,74.208ZM181.957,78.601C181.957,79.035 182.043,79.344 182.198,79.537C182.362,79.73 182.565,79.827 182.816,79.827C183.048,79.827 183.241,79.73 183.395,79.547C183.55,79.354 183.627,79.035 183.627,78.582C183.627,78.186 183.55,77.896 183.395,77.713C183.25,77.529 183.067,77.433 182.845,77.433C182.584,77.433 182.372,77.529 182.208,77.722C182.043,77.915 181.957,78.215 181.957,78.601Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M192.027,79.093L188.174,79.093C188.213,79.402 188.3,79.634 188.425,79.779C188.609,80.001 188.85,80.107 189.15,80.107C189.343,80.107 189.516,80.059 189.69,79.962C189.796,79.904 189.903,79.798 190.028,79.653L191.92,79.827C191.631,80.329 191.274,80.686 190.868,80.908C190.463,81.121 189.874,81.237 189.111,81.237C188.445,81.237 187.923,81.14 187.547,80.957C187.161,80.764 186.852,80.474 186.601,80.059C186.35,79.653 186.224,79.18 186.224,78.63C186.224,77.848 186.475,77.211 186.977,76.728C187.479,76.245 188.174,76.004 189.053,76.004C189.767,76.004 190.337,76.11 190.752,76.322C191.167,76.544 191.486,76.853 191.698,77.269C191.92,77.684 192.027,78.215 192.027,78.881L192.027,79.093ZM190.076,78.176C190.038,77.8 189.932,77.539 189.777,77.375C189.613,77.22 189.401,77.133 189.13,77.133C188.831,77.133 188.59,77.259 188.406,77.5C188.29,77.655 188.213,77.877 188.184,78.176L190.076,78.176Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M196.641,79.161L198.466,79.373C198.359,79.75 198.195,80.078 197.964,80.358C197.742,80.638 197.442,80.85 197.085,81.005C196.728,81.159 196.284,81.237 195.733,81.237C195.202,81.237 194.758,81.188 194.401,81.092C194.044,80.995 193.745,80.831 193.494,80.609C193.233,80.387 193.04,80.126 192.895,79.827C192.75,79.528 192.673,79.132 192.673,78.64C192.673,78.128 192.76,77.693 192.934,77.355C193.069,77.104 193.243,76.873 193.465,76.68C193.687,76.477 193.918,76.332 194.15,76.236C194.527,76.081 195.009,76.004 195.589,76.004C196.409,76.004 197.037,76.149 197.462,76.438C197.886,76.728 198.195,77.162 198.359,77.722L196.554,77.964C196.506,77.751 196.4,77.587 196.245,77.481C196.1,77.375 195.898,77.317 195.647,77.317C195.328,77.317 195.077,77.433 194.874,77.655C194.681,77.886 194.585,78.234 194.585,78.697C194.585,79.103 194.681,79.422 194.874,79.634C195.067,79.846 195.318,79.953 195.618,79.953C195.869,79.953 196.081,79.885 196.255,79.759C196.429,79.634 196.554,79.431 196.641,79.161Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M201.092,77.732L199.258,77.539C199.325,77.22 199.432,76.969 199.557,76.786C199.692,76.602 199.876,76.438 200.127,76.303C200.3,76.207 200.542,76.139 200.851,76.081C201.16,76.023 201.488,76.004 201.845,76.004C202.424,76.004 202.888,76.033 203.235,76.1C203.583,76.158 203.873,76.293 204.104,76.496C204.268,76.641 204.394,76.844 204.491,77.104C204.587,77.365 204.635,77.606 204.635,77.848L204.635,80.059C204.635,80.29 204.645,80.474 204.684,80.609C204.713,80.744 204.77,80.918 204.877,81.121L203.071,81.121C203.004,80.995 202.955,80.889 202.936,80.821C202.907,80.754 202.888,80.648 202.869,80.512C202.618,80.754 202.367,80.918 202.115,81.024C201.778,81.169 201.382,81.237 200.938,81.237C200.339,81.237 199.885,81.092 199.576,80.821C199.267,80.541 199.113,80.204 199.113,79.798C199.113,79.412 199.219,79.103 199.441,78.862C199.663,78.611 200.078,78.427 200.677,78.311C201.401,78.166 201.864,78.07 202.077,78.002C202.289,77.944 202.521,77.877 202.762,77.78C202.762,77.539 202.714,77.375 202.608,77.288C202.511,77.191 202.347,77.143 202.096,77.143C201.787,77.143 201.546,77.191 201.391,77.298C201.266,77.375 201.169,77.52 201.092,77.732ZM202.762,78.746C202.492,78.842 202.222,78.919 201.932,78.997C201.546,79.103 201.295,79.199 201.189,79.306C201.082,79.402 201.034,79.518 201.034,79.653C201.034,79.808 201.082,79.933 201.189,80.02C201.295,80.117 201.449,80.165 201.652,80.165C201.864,80.165 202.067,80.117 202.251,80.01C202.434,79.914 202.569,79.779 202.646,79.634C202.724,79.479 202.762,79.286 202.762,79.055L202.762,78.746Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M205.803,76.11L207.599,76.11L207.599,76.931C207.772,76.583 207.946,76.332 208.13,76.197C208.323,76.071 208.545,76.004 208.815,76.004C209.095,76.004 209.404,76.091 209.742,76.264L209.153,77.635C208.921,77.539 208.748,77.491 208.612,77.491C208.361,77.491 208.168,77.597 208.023,77.8C207.83,78.099 207.734,78.64 207.734,79.441L207.734,81.121L205.803,81.121L205.803,76.11Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M215.786,79.093L211.933,79.093C211.972,79.402 212.059,79.634 212.184,79.779C212.368,80.001 212.609,80.107 212.909,80.107C213.102,80.107 213.275,80.059 213.449,79.962C213.555,79.904 213.662,79.798 213.787,79.653L215.679,79.827C215.39,80.329 215.033,80.686 214.627,80.908C214.222,81.121 213.633,81.237 212.87,81.237C212.204,81.237 211.682,81.14 211.306,80.957C210.92,80.764 210.611,80.474 210.36,80.059C210.109,79.653 209.983,79.18 209.983,78.63C209.983,77.848 210.234,77.211 210.736,76.728C211.238,76.245 211.933,76.004 212.812,76.004C213.526,76.004 214.096,76.11 214.511,76.322C214.926,76.544 215.245,76.853 215.457,77.269C215.679,77.684 215.786,78.215 215.786,78.881L215.786,79.093ZM213.835,78.176C213.797,77.8 213.691,77.539 213.536,77.375C213.372,77.22 213.16,77.133 212.889,77.133C212.59,77.133 212.349,77.259 212.165,77.5C212.049,77.655 211.972,77.877 211.943,78.176L213.835,78.176Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M88.773,68.352L96.912,68.352C98.325,68.352 99.645,68.521 100.782,68.839C101.918,69.177 102.901,69.627 103.7,70.208C104.498,70.789 105.113,71.464 105.543,72.233C105.973,73.002 106.188,73.827 106.188,74.708C106.188,75.627 105.973,76.471 105.512,77.258C105.082,78.046 104.437,78.721 103.608,79.283C102.809,79.864 101.826,80.314 100.69,80.633C99.553,80.952 98.294,81.121 96.912,81.121L88.773,81.121L88.773,68.352ZM92.305,79.264L96.052,79.264C97.004,79.264 97.895,79.171 98.693,78.964C99.523,78.777 100.198,78.477 100.782,78.102C101.365,77.708 101.826,77.239 102.164,76.677C102.502,76.114 102.655,75.458 102.655,74.727C102.655,73.939 102.502,73.264 102.164,72.683C101.826,72.121 101.365,71.633 100.782,71.277C100.198,70.902 99.492,70.621 98.693,70.433C97.864,70.264 97.004,70.171 96.052,70.171L92.305,70.171L92.305,79.264Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M123.209,80.877C122.901,80.989 122.656,81.064 122.441,81.121C122.226,81.177 122.011,81.233 121.857,81.252C121.673,81.289 121.519,81.289 121.396,81.308C121.274,81.308 121.151,81.308 121.089,81.308C120.721,81.308 120.383,81.271 120.106,81.177C119.799,81.102 119.523,81.008 119.308,80.877C119.093,80.746 118.909,80.577 118.724,80.408C118.571,80.239 118.417,80.052 118.325,79.864C117.864,80.146 117.434,80.389 117.035,80.558C116.636,80.746 116.236,80.896 115.868,81.008C115.469,81.121 115.069,81.196 114.701,81.233C114.301,81.289 113.902,81.308 113.472,81.308C112.796,81.308 112.151,81.233 111.537,81.102C110.954,80.971 110.431,80.783 110.001,80.539C109.541,80.314 109.203,80.014 108.957,79.677C108.711,79.339 108.589,78.946 108.589,78.533C108.589,78.177 108.711,77.858 108.988,77.596C109.234,77.352 109.602,77.108 110.032,76.921C110.462,76.714 110.954,76.564 111.506,76.414C112.059,76.283 112.643,76.152 113.196,76.039C113.779,75.927 114.363,75.814 114.916,75.702C115.469,75.608 115.96,75.496 116.39,75.383C116.82,75.271 117.189,75.139 117.434,74.989C117.711,74.839 117.834,74.671 117.834,74.483C117.834,74.277 117.741,74.108 117.588,73.977C117.434,73.846 117.219,73.752 116.974,73.658C116.697,73.583 116.421,73.527 116.114,73.489C115.776,73.452 115.469,73.433 115.192,73.433C114.885,73.433 114.578,73.452 114.271,73.508C113.994,73.564 113.718,73.639 113.472,73.752C113.226,73.864 113.011,73.996 112.827,74.183C112.674,74.352 112.551,74.558 112.52,74.802L108.926,74.802C108.988,74.258 109.203,73.789 109.571,73.396C109.94,72.983 110.431,72.664 111.015,72.402C111.599,72.139 112.244,71.933 112.981,71.802C113.687,71.689 114.424,71.614 115.192,71.614C115.991,71.614 116.789,71.671 117.526,71.783C118.264,71.896 118.939,72.064 119.492,72.308C120.076,72.533 120.536,72.852 120.874,73.208C121.212,73.583 121.366,74.033 121.366,74.539L121.366,79.077C121.366,79.189 121.427,79.302 121.581,79.396C121.704,79.508 121.888,79.564 122.134,79.564C122.164,79.564 122.256,79.546 122.441,79.527C122.656,79.508 122.901,79.452 123.209,79.358L123.209,80.877ZM117.834,76.658C117.619,76.733 117.311,76.808 116.943,76.883C116.574,76.958 116.175,77.014 115.745,77.089C115.315,77.164 114.885,77.239 114.424,77.314C113.994,77.389 113.626,77.483 113.257,77.596C112.919,77.689 112.612,77.821 112.397,77.971C112.182,78.102 112.059,78.271 112.059,78.477C112.059,78.664 112.121,78.833 112.213,78.964C112.305,79.096 112.459,79.208 112.612,79.283C112.766,79.377 112.95,79.433 113.165,79.471C113.38,79.508 113.595,79.546 113.81,79.546C114.486,79.546 115.192,79.396 115.899,79.114C116.636,78.833 117.281,78.402 117.834,77.821L117.834,76.658Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M125.017,71.802L128.549,71.802L128.549,72.908C129.225,72.439 129.901,72.121 130.638,71.914C131.344,71.708 132.112,71.614 132.849,71.614C133.648,71.614 134.354,71.689 134.969,71.821C135.583,71.971 136.105,72.177 136.535,72.421C136.965,72.683 137.272,73.002 137.518,73.358C137.733,73.733 137.856,74.127 137.856,74.577L137.856,81.121L134.324,81.121L134.324,74.914C134.324,74.689 134.262,74.483 134.139,74.296C134.047,74.108 133.894,73.958 133.709,73.827C133.525,73.696 133.279,73.602 133.034,73.527C132.757,73.471 132.481,73.433 132.204,73.433C131.744,73.433 131.283,73.508 130.822,73.621C130.392,73.733 130.024,73.902 129.686,74.089C129.348,74.296 129.072,74.521 128.857,74.783C128.672,75.046 128.549,75.308 128.549,75.589L128.549,81.121L125.017,81.121L125.017,71.802Z"/>
<path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M155.212,80.877C154.905,80.989 154.659,81.064 154.444,81.121C154.229,81.177 154.014,81.233 153.86,81.252C153.676,81.289 153.522,81.289 153.4,81.308C153.277,81.308 153.154,81.308 153.092,81.308C152.724,81.308 152.386,81.271 152.11,81.177C151.802,81.102 151.526,81.008 151.311,80.877C151.096,80.746 150.912,80.577 150.727,80.408C150.574,80.239 150.42,80.052 150.328,79.864C149.867,80.146 149.437,80.389 149.038,80.558C148.639,80.746 148.24,80.896 147.871,81.008C147.472,81.121 147.072,81.196 146.704,81.233C146.305,81.289 145.905,81.308 145.475,81.308C144.8,81.308 144.155,81.233 143.54,81.102C142.957,80.971 142.435,80.783 142.005,80.539C141.544,80.314 141.206,80.014 140.96,79.677C140.715,79.339 140.592,78.946 140.592,78.533C140.592,78.177 140.715,77.858 140.991,77.596C141.237,77.352 141.605,77.108 142.035,76.921C142.465,76.714 142.957,76.564 143.51,76.414C144.063,76.283 144.646,76.152 145.199,76.039C145.783,75.927 146.366,75.814 146.919,75.702C147.472,75.608 147.963,75.496 148.393,75.383C148.823,75.271 149.192,75.139 149.437,74.989C149.714,74.839 149.837,74.671 149.837,74.483C149.837,74.277 149.745,74.108 149.591,73.977C149.437,73.846 149.222,73.752 148.977,73.658C148.7,73.583 148.424,73.527 148.117,73.489C147.779,73.452 147.472,73.433 147.195,73.433C146.888,73.433 146.581,73.452 146.274,73.508C145.997,73.564 145.721,73.639 145.475,73.752C145.23,73.864 145.015,73.996 144.83,74.183C144.677,74.352 144.554,74.558 144.523,74.802L140.93,74.802C140.991,74.258 141.206,73.789 141.575,73.396C141.943,72.983 142.435,72.664 143.018,72.402C143.602,72.139 144.247,71.933 144.984,71.802C145.69,71.689 146.427,71.614 147.195,71.614C147.994,71.614 148.792,71.671 149.53,71.783C150.267,71.896 150.942,72.064 151.495,72.308C152.079,72.533 152.54,72.852 152.877,73.208C153.215,73.583 153.369,74.033 153.369,74.539L153.369,79.077C153.369,79.189 153.43,79.302 153.584,79.396C153.707,79.508 153.891,79.564 154.137,79.564C154.167,79.564 154.26,79.546 154.444,79.527C154.659,79.508 154.905,79.452 155.212,79.358L155.212,80.877ZM149.837,76.658C149.622,76.733 149.315,76.808 148.946,76.883C148.577,76.958 148.178,77.014 147.748,77.089C147.318,77.164 146.888,77.239 146.427,77.314C145.997,77.389 145.629,77.483 145.26,77.596C144.923,77.689 144.615,77.821 144.4,77.971C144.185,78.102 144.063,78.271 144.063,78.477C144.063,78.664 144.124,78.833 144.216,78.964C144.308,79.096 144.462,79.208 144.615,79.283C144.769,79.377 144.953,79.433 145.168,79.471C145.383,79.508 145.598,79.546 145.813,79.546C146.489,79.546 147.195,79.396 147.902,79.114C148.639,78.833 149.284,78.402 149.837,77.821L149.837,76.658Z"/>
<path android:fillColor="#2C2D2D" android:pathData="M122.567,71.351C120.964,70.67 119.114,68.728 116.794,64.391L121.955,64.391L122.567,71.351Z"/>
<path android:fillColor="#7A9C8E" android:pathData="M296.432,123.366C296.432,122.091 295.396,121.056 294.121,121.056L83.011,121.056C81.736,121.056 80.7,122.091 80.7,123.366L80.7,221.025C80.7,222.3 81.736,223.335 83.011,223.335L294.121,223.335C295.396,223.335 296.432,222.3 296.432,221.025L296.432,123.366Z"/>
<path android:fillColor="#ADB0AF" android:pathData="M48.68,8.819l1.884,0l0,277.323l-1.884,0z"/>
<path android:fillColor="#DEDEDC" android:pathData="M4,8.819l1.884,0l0,277.323l-1.884,0z"/>
<path android:fillAlpha="0.45" android:fillColor="#CFCCCC" android:pathData="M466.961,12.872C466.961,10.635 465.145,8.819 462.908,8.819L327.607,8.819C325.37,8.819 323.554,10.635 323.554,12.872L323.554,41.112C323.554,43.349 325.37,45.165 327.607,45.165L462.908,45.165C465.145,45.165 466.961,43.349 466.961,41.112L466.961,12.872Z"/>
<path android:fillColor="#00000000"
android:pathData="M443.78,184.711C443.78,182.058 441.626,179.904 438.972,179.904L406.236,179.904C403.582,179.904 401.428,182.058 401.428,184.711L401.428,217.966C401.428,220.619 403.582,222.773 406.236,222.773L438.972,222.773C441.626,222.773 443.78,220.619 443.78,217.966L443.78,184.711Z"
android:strokeColor="#212122" android:strokeWidth="1.77"/>
<path android:fillColor="#BD1716" android:fillType="nonZero" android:pathData="M403.71,201.586C403.71,198.391 404.577,195.872 406.31,194.03C408.044,192.216 410.265,191.295 413,191.295C414.788,191.295 416.413,191.728 417.848,192.595C419.283,193.434 420.367,194.626 421.125,196.17C421.883,197.686 422.263,199.42 422.263,201.37C422.263,203.347 421.856,205.107 421.071,206.651C420.285,208.195 419.148,209.386 417.685,210.172C416.25,210.957 414.679,211.363 413,211.363C411.158,211.363 409.533,210.93 408.098,210.036C406.663,209.17 405.579,207.951 404.821,206.434C404.09,204.918 403.71,203.293 403.71,201.586ZM406.365,201.641C406.365,203.97 406.988,205.811 408.26,207.166C409.506,208.493 411.077,209.17 412.973,209.17C414.896,209.17 416.494,208.493 417.74,207.138C418.985,205.784 419.608,203.861 419.608,201.37C419.608,199.772 419.338,198.391 418.823,197.226C418.281,196.061 417.496,195.141 416.467,194.491C415.438,193.841 414.3,193.516 413.027,193.516C411.213,193.516 409.642,194.139 408.342,195.384C407.015,196.63 406.365,198.716 406.365,201.641Z"/>
<path android:fillColor="#BD1716" android:fillType="nonZero" android:pathData="M425.454,211.038L425.454,191.647L428.026,191.647L428.026,201.261L437.641,191.647L441.135,191.647L433.01,199.501L441.487,211.038L438.101,211.038L431.195,201.234L428.026,204.322L428.026,211.038L425.454,211.038Z"/>
<path android:fillColor="#ffffff" android:pathData="M358.377,133.179l4.486,0l0,19.197l-4.486,0z"/>
<path android:fillColor="#ffffff" android:pathData="M370.113,140.125l0,4.486l-19.197,0l-0,-4.486z"/>
<path android:fillColor="#00000000"
android:pathData="M339.492,142.094a21.723,21.176 90,1 0,42.352 0a21.723,21.176 90,1 0,-42.352 0z"
android:strokeColor="#212122" android:strokeWidth="1.67"/>
<path android:fillColor="#00000000"
android:pathData="M339.492,201.165a21.723,21.176 90,1 0,42.352 0a21.723,21.176 90,1 0,-42.352 0z"
android:strokeColor="#212122" android:strokeWidth="1.67"/>
<path android:fillColor="#ffffff" android:pathData="M350.818,198.915l19.702,0l0,4.5l-19.702,0z"/>
<path android:fillColor="#00000000"
android:pathData="M401.428,142.778a21.723,21.176 90,1 0,42.352 0a21.723,21.176 90,1 0,-42.352 0z"
android:strokeColor="#212122" android:strokeWidth="1.67"/>
<path android:fillColor="#ffffff" android:pathData="M437.981,142.111L413.468,154.091L413.468,130.132L437.981,142.111Z"/>
<path android:fillColor="#F0EEEB" android:pathData="M500.667,8.819h15.78v120.078h-15.78z"/>
<path android:fillColor="#F3F3F1" android:pathData="M596,101.601C596,99.691 594.45,98.141 592.54,98.141L545.626,98.141C543.716,98.141 542.166,99.691 542.166,101.601L542.166,108.52C542.166,110.43 543.716,111.98 545.626,111.98L592.54,111.98C594.45,111.98 596,110.43 596,108.52L596,101.601Z"/>
<path android:fillColor="#F3F3F1" android:pathData="M596,26.529C596,24.565 594.404,22.969 592.439,22.969L545.727,22.969C543.762,22.969 542.166,24.565 542.166,26.529L542.166,33.652C542.166,35.616 543.762,37.212 545.727,37.212L592.439,37.212C594.404,37.212 596,35.616 596,33.652L596,26.529Z"/>
<path android:fillColor="#EAEAE9" android:pathData="M516.448,128.899L516.448,8.821L567.884,38.842L567.884,98.88L516.448,128.899Z"/>
<path android:fillColor="#DEDEDC" android:pathData="M543.132,112.477L543.345,24.252C561.109,29.271 578.621,34.039 595.948,35.654L595.948,101.826C576.919,102.086 559.415,106.169 543.132,112.477Z"/>
<path android:fillColor="#EAEAE9" android:pathData="M543.156,108.052L543.156,29.215C560.974,33.815 578.62,36.308 595.999,37.788L595.999,98.449C576.913,98.687 559.487,102.267 543.156,108.052Z"/>
<path android:fillColor="#D7D7D7" android:pathData="M542.166,68.63C557.906,60.402 577.31,60.03 595.999,58.12L595.999,76.682C577.858,75.427 559.414,76.39 542.166,68.63Z"/>
<path android:fillColor="#E3E3E1" android:pathData="M596.241,65.839C596.241,64.656 595.197,63.696 593.911,63.696L544.054,63.696C542.768,63.696 541.724,64.656 541.724,65.839C541.724,65.839 541.335,69.053 541.724,70.125C542.081,71.112 542.768,72.268 544.054,72.268L593.911,72.268C595.197,72.268 596.241,71.308 596.241,70.125L596.241,65.839Z"/>
<path android:fillColor="#DEDEDC" android:pathData="M490.852,37.216L494.769,45.651L486.934,45.651L490.852,37.216Z"/>
<path android:fillColor="#DEDEDC" android:pathData="M489.126,44.957h3.071v16.44h-3.071z"/>
<path android:fillColor="#DEDEDC" android:pathData="M498.606,78.261l2.061,0l0,209.314l-2.061,0z"/>
<path android:fillColor="#DEDEDC" android:pathData="M500.668,78.402C500.504,74.29 498.976,70.502 496.317,67.611C492.697,63.675 487.301,61.744 481.579,62.337L481.552,64.305C486.683,63.773 491.523,65.505 494.769,69.035C497.153,71.628 498.523,75.025 498.67,78.712L500.668,78.402Z"/>
<path android:fillColor="#DEDEDC" android:pathData="M162.488,62.23l323.193,0l0,1.999l-323.193,0z"/>
<path android:fillColor="#DEDEDC" android:pathData="M111.691,7.546C111.242,19.109 114.538,30.602 121.076,40.285C130.531,54.286 145.833,63.152 162.404,64.23L162.488,62.101C146.58,61.066 131.887,52.552 122.812,39.113C116.534,29.817 113.373,18.785 113.802,7.685L111.691,7.546Z"/>
<path android:fillColor="#D6D2D2" android:fillType="nonZero" android:pathData="M490.101,83.233C489.299,83.233 488.537,83.046 487.842,82.658C487.134,82.284 486.573,81.71 486.145,80.961C485.731,80.213 485.517,79.318 485.517,78.302C485.517,77.46 485.651,76.725 485.918,76.097C486.185,75.456 486.546,74.948 487,74.534C487.455,74.133 487.949,73.839 488.484,73.652C489.032,73.451 489.566,73.358 490.114,73.358C490.902,73.358 491.651,73.545 492.346,73.906C493.04,74.28 493.615,74.841 494.043,75.576C494.47,76.324 494.684,77.22 494.684,78.249C494.684,79.197 494.524,79.999 494.216,80.654C493.909,81.322 493.521,81.83 493.054,82.204C492.586,82.578 492.092,82.832 491.57,82.992C491.063,83.153 490.568,83.233 490.101,83.233ZM490.127,81.122C490.622,81.122 491.089,81.082 491.53,80.988C491.985,80.908 492.386,80.761 492.746,80.547C493.094,80.333 493.388,80.039 493.602,79.678C493.802,79.304 493.909,78.85 493.909,78.302C493.909,77.554 493.722,76.966 493.348,76.552C492.987,76.124 492.519,75.843 491.958,75.696C491.397,75.549 490.782,75.469 490.127,75.469C489.767,75.469 489.379,75.496 488.991,75.536C488.591,75.589 488.19,75.71 487.762,75.883C487.348,76.071 487,76.364 486.72,76.765C486.439,77.166 486.292,77.674 486.292,78.315C486.292,78.944 486.439,79.451 486.733,79.852C487.027,80.24 487.388,80.534 487.802,80.707C488.23,80.895 488.644,81.001 489.018,81.055C489.406,81.095 489.78,81.122 490.127,81.122Z"/>
<path android:fillColor="#D6D2D2" android:fillType="nonZero" android:pathData="M492.172,92.106C491.437,92.106 490.889,91.879 490.515,91.438C490.141,90.984 489.9,90.463 489.793,89.848C489.686,89.247 489.633,88.605 489.633,87.937L489.633,87.349L487.321,87.349C487.067,87.349 486.853,87.376 486.72,87.443C486.573,87.496 486.466,87.616 486.386,87.803C486.319,87.99 486.279,88.271 486.279,88.659L485.677,88.659L485.677,84.209L486.279,84.209C486.279,84.583 486.319,84.864 486.399,85.051C486.479,85.224 486.586,85.345 486.733,85.398C486.867,85.451 487.067,85.478 487.321,85.478L492.907,85.478C493.161,85.478 493.361,85.451 493.495,85.398C493.642,85.345 493.749,85.238 493.829,85.051C493.909,84.864 493.949,84.583 493.949,84.209L494.564,84.209L494.631,86.734C494.631,86.868 494.631,87.002 494.644,87.162C494.644,87.309 494.644,87.443 494.644,87.523C494.644,87.616 494.644,87.75 494.644,87.937C494.644,88.151 494.644,88.325 494.644,88.431C494.617,88.953 494.577,89.447 494.497,89.928C494.417,90.396 494.19,90.89 493.829,91.371C493.468,91.866 492.92,92.106 492.172,92.106ZM492.158,90.102C492.867,90.102 493.334,89.888 493.575,89.487C493.802,89.073 493.922,88.525 493.922,87.857C493.922,87.737 493.922,87.576 493.909,87.349L490.354,87.349L490.354,87.95C490.354,88.592 490.461,89.113 490.689,89.5C490.902,89.901 491.397,90.102 492.158,90.102Z"/>
<path android:fillColor="#D6D2D2" android:fillType="nonZero" android:pathData="M488.591,100.765L485.677,100.698L485.677,92.814L486.279,92.814C486.279,93.362 486.359,93.71 486.519,93.87C486.666,94.017 486.934,94.097 487.321,94.097L492.88,94.097C493.134,94.097 493.334,94.07 493.468,94.03C493.615,93.977 493.722,93.857 493.802,93.67C493.882,93.483 493.922,93.202 493.922,92.814L494.524,92.814L494.524,100.151L492.225,100.271L492.225,99.67C492.733,99.536 493.107,99.376 493.321,99.202C493.535,99.028 493.682,98.828 493.722,98.614C493.775,98.387 493.802,98.066 493.802,97.625L493.802,95.968L490.675,95.968L490.675,96.863C490.675,97.171 490.702,97.411 490.755,97.558C490.809,97.705 490.916,97.812 491.063,97.879C491.223,97.932 491.464,97.972 491.784,97.999L491.784,98.627L488.844,98.627L488.844,98.026C489.165,98.013 489.406,97.972 489.566,97.892C489.713,97.825 489.82,97.719 489.873,97.572C489.927,97.411 489.954,97.184 489.954,96.877L489.954,95.968L487.869,95.968C487.522,95.968 487.268,95.968 487.107,95.995C486.947,96.008 486.813,96.062 486.706,96.128C486.599,96.209 486.519,96.329 486.479,96.503C486.426,96.676 486.399,96.917 486.399,97.237L486.399,97.946C486.399,98.253 486.439,98.534 486.519,98.801C486.586,99.082 486.787,99.349 487.107,99.603C487.415,99.87 487.909,100.044 488.591,100.151L488.591,100.765Z"/>
<path android:fillColor="#D6D2D2" android:fillType="nonZero" android:pathData="M493.922,111.198C493.922,110.784 493.882,110.477 493.802,110.29C493.709,110.116 493.588,109.996 493.428,109.956C493.254,109.916 492.987,109.889 492.613,109.889L485.597,109.889L485.597,109.288L492.479,103.501L487.602,103.501C487.228,103.501 486.96,103.528 486.8,103.568C486.626,103.622 486.506,103.729 486.412,103.916C486.319,104.103 486.279,104.41 486.279,104.824L485.677,104.824L485.677,101.537L486.279,101.537C486.279,101.925 486.319,102.219 486.412,102.392C486.506,102.566 486.626,102.673 486.8,102.713C486.96,102.753 487.228,102.78 487.602,102.78L492.118,102.78C492.479,102.78 492.76,102.766 492.934,102.753C493.121,102.726 493.281,102.686 493.415,102.606C493.562,102.539 493.668,102.419 493.749,102.245C493.842,102.072 493.896,101.844 493.922,101.55L494.524,101.55L494.524,104.129L488.577,109.167L492.613,109.167C492.947,109.167 493.201,109.141 493.374,109.1C493.548,109.047 493.682,108.94 493.775,108.753C493.882,108.579 493.922,108.285 493.922,107.898L494.524,107.898L494.524,111.198L493.922,111.198Z"/>
<path android:fillColor="#DEDEDC" android:pathData="M3.752,7.547l107.9,0l0,2.542l-107.9,0z"/>
<path android:fillColor="#DEDEDC" android:pathData="M4,283.948l51.925,0l0,2.194l-51.925,0z"/>
<path android:fillColor="#DEDEDC" android:pathData="M482.035,285.996l16.801,0l0,1.579l-16.801,0z"/>
</vector>

1
danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
View file

@ -85,6 +85,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
super(new PluginDescription()
.mainType(PluginType.PUMP)
.fragmentClass(DanaFragment.class.getName())
.pluginIcon(R.drawable.ic_dana_rs)
.pluginName(R.string.danarspump)
.shortName(R.string.danarpump_shortname)
.preferencesId(R.xml.pref_danar)

1
danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
View file

@ -63,6 +63,7 @@ class DanaRSPlugin @Inject constructor(
) : PumpPluginBase(PluginDescription()
.mainType(PluginType.PUMP)
.fragmentClass(info.nightscout.androidaps.dana.DanaFragment::class.java.name)
.pluginIcon(R.drawable.ic_dana_rs)
.pluginName(R.string.danarspump)
.shortName(R.string.danarspump_shortname)
.preferencesId(R.xml.pref_danars)

1
medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
View file

@ -146,6 +146,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
super(new PluginDescription() //
.mainType(PluginType.PUMP) //
.fragmentClass(MedtronicFragment.class.getName()) //
.pluginIcon(R.drawable.ic_medtronic_veo)
.pluginName(R.string.medtronic_name) //
.shortName(R.string.medtronic_name_short) //
.preferencesId(R.xml.pref_medtronic)

171
medtronic/src/main/res/drawable/ic_medtronic_veo.xml Normal file
View file

@ -0,0 +1,171 @@
<vector android:height="100dp" android:viewportHeight="800"
android:viewportWidth="1280" android:width="160dp"
xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#93C4DE" android:pathData="M1197.99,167.06C1197.99,164.03 1194.11,136.94 1187.7,136.94C1181.29,136.94 1176.1,139.41 1176.1,142.44L1176.1,521.06C1176.1,524.1 1181.29,526.57 1187.7,526.57C1194.11,526.57 1197.62,494.2 1197.62,491.16L1197.99,167.06Z"/>
<path android:fillColor="#0074B7" android:pathData="M233.25,465.78C233.25,455.03 224.52,446.29 213.76,446.29L101.49,446.29C90.73,446.29 82,455.03 82,465.78L82,714.24C82,725 90.73,733.73 101.49,733.73L213.76,733.73C224.52,733.73 233.25,725 233.25,714.24L233.25,465.78Z"/>
<path android:fillColor="#93C4DE" android:pathData="M110,452.08C110,444.06 104.55,444.07 96.53,444.07C88.51,444.07 82,450.58 82,458.6L82,721.42C82,729.44 88.51,735.95 96.53,735.95C104.55,735.95 111.85,735.62 111.85,727.6L110,452.08Z"/>
<path android:fillColor="#0074B7" android:pathData="M1187.05,144.23C1187.05,99.38 1150.63,62.97 1105.79,62.97L278.45,62.97C233.61,62.97 197.19,99.38 197.19,144.23L197.19,652.47C197.19,697.32 233.61,733.73 278.45,733.73L1105.79,733.73C1150.63,733.73 1187.05,697.32 1187.05,652.47L1187.05,144.23Z"/>
<path android:fillColor="#145483" android:pathData="M650.51,532.95a124.31,126.6 90,1 0,253.21 0a124.31,126.6 90,1 0,-253.21 0z"/>
<path android:fillColor="#145483" android:pathData="M373.81,447.61C367.45,504.09 350.24,389.34 418.84,418.38C584.71,488.61 604.97,671.89 373.81,662.01C300.96,658.9 227.57,552.1 225.1,490.67C203.28,-52.46 412.56,103.5 373.81,447.61Z"/>
<path android:fillColor="#145483" android:pathData="M598.35,399.05C669.37,394.91 722.54,432.61 719.83,532.12C717.65,611.97 670.74,656.99 601.07,657.26C533.47,657.51 495.75,610.75 483.95,562.77C468.65,500.54 508.62,404.28 598.35,399.05Z"/>
<path android:fillColor="#145483" android:pathData="M976.87,135.88C1064.98,113.92 1118.27,220.71 1121.19,395.08C1122.31,462.04 1122.61,498.63 1111.93,548.17C1105.17,579.59 1100.82,632.84 1019.24,643.46C783.85,674.09 658.92,479.33 868.94,380.76C1060.34,290.93 858.31,165.42 976.87,135.88Z"/>
<path android:fillColor="#145483"
android:pathData="M543.16,563.26a57.17,57.19 90,1 0,114.38 0a57.17,57.19 90,1 0,-114.38 0z" android:strokeWidth="5.05">
<aapt:attr name="android:strokeColor">
<gradient android:endX="600.34314" android:endY="524.46313"
android:startX="600.34314" android:startY="620.4341" android:type="linear">
<item android:color="#FF003C5F" android:offset="0"/>
<item android:color="#FF0074B7" android:offset="1"/>
</gradient>
</aapt:attr>
</path>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M582.08,576.55L582.08,551.73L600.04,551.73L600.04,554.67L585.37,554.67L585.37,562.27L599.1,562.27L599.1,565.18L585.37,565.18L585.37,573.64L600.59,573.64L600.59,576.55L582.08,576.55Z"/>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M604.02,568.58L607.11,568.3C607.28,569.55 607.59,570.55 608.15,571.35C608.67,572.15 609.5,572.81 610.64,573.29C611.75,573.78 613.04,574.02 614.46,574.02C615.71,574.02 616.82,573.85 617.75,573.47C618.72,573.08 619.45,572.6 619.9,571.94C620.39,571.28 620.6,570.59 620.6,569.83C620.6,569.03 620.39,568.37 619.94,567.78C619.49,567.19 618.72,566.7 617.68,566.32C617.02,566.05 615.57,565.63 613.28,565.11C610.99,564.56 609.4,564.03 608.5,563.55C607.32,562.93 606.41,562.16 605.83,561.23C605.27,560.33 604.96,559.28 604.96,558.14C604.96,556.89 605.34,555.71 606.03,554.64C606.76,553.56 607.77,552.73 609.15,552.14C610.51,551.59 612.03,551.31 613.7,551.31C615.53,551.31 617.16,551.62 618.58,552.21C619.97,552.8 621.05,553.67 621.81,554.81C622.57,555.96 622.99,557.27 623.02,558.73L619.87,558.97C619.73,557.38 619.14,556.2 618.17,555.4C617.2,554.6 615.74,554.19 613.83,554.19C611.86,554.19 610.4,554.57 609.5,555.3C608.6,556.03 608.15,556.89 608.15,557.93C608.15,558.83 608.46,559.56 609.08,560.12C609.74,560.71 611.37,561.3 614.04,561.89C616.71,562.51 618.55,563.03 619.56,563.48C620.98,564.14 622.05,565.01 622.75,566.01C623.44,567.05 623.79,568.2 623.79,569.55C623.79,570.87 623.4,572.11 622.64,573.29C621.88,574.44 620.8,575.34 619.38,576C617.96,576.66 616.37,576.97 614.6,576.97C612.34,576.97 610.47,576.66 608.95,576C607.42,575.34 606.24,574.37 605.37,573.05C604.51,571.73 604.06,570.24 604.02,568.58Z"/>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M645.98,567.85L649.27,568.68C648.58,571.39 647.33,573.43 645.52,574.85C643.76,576.27 641.57,576.97 638.97,576.97C636.3,576.97 634.12,576.45 632.45,575.34C630.79,574.26 629.51,572.67 628.64,570.62C627.74,568.54 627.32,566.32 627.32,563.97C627.32,561.37 627.81,559.11 628.81,557.2C629.78,555.26 631.2,553.81 633.01,552.8C634.85,551.8 636.86,551.31 639.04,551.31C641.5,551.31 643.62,551.93 645.28,553.22C646.98,554.47 648.16,556.23 648.82,558.52L645.59,559.28C645.04,557.48 644.17,556.16 643.1,555.37C641.99,554.53 640.64,554.12 638.97,554.12C637.06,554.12 635.47,554.57 634.19,555.51C632.9,556.41 632,557.62 631.48,559.18C630.96,560.71 630.68,562.3 630.68,563.93C630.68,566.05 631,567.88 631.62,569.48C632.25,571.04 633.18,572.22 634.5,572.98C635.78,573.78 637.2,574.16 638.69,574.16C640.53,574.16 642.09,573.64 643.37,572.56C644.66,571.52 645.52,569.93 645.98,567.85Z"/>
<path android:fillColor="#ffffff"
android:pathData="M543.85,566.13C543.14,565.66 542.94,564.71 543.41,563.99L545.1,561.41C545.57,560.7 546.52,560.5 547.23,560.97L610.48,599.8C611.19,600.27 610.7,603.37 610.23,604.08L608.54,606.66C608.07,607.37 609.95,606.06 609.24,605.59L543.85,566.13Z" android:strokeWidth="2.59">
<aapt:attr name="android:strokeColor">
<gradient android:endX="554.7165" android:endY="569.55676"
android:startX="609.3828" android:startY="605.36884" android:type="linear">
<item android:color="#FF003C5F" android:offset="0"/>
<item android:color="#FF0074B7" android:offset="1"/>
</gradient>
</aapt:attr>
</path>
<path android:fillColor="#ffffff"
android:pathData="M543.85,560.39C543.14,560.86 542.94,561.82 543.41,562.53L545.1,565.11C545.57,565.82 546.52,566.02 547.23,565.56L610.48,526.37C611.19,525.9 610.7,523.16 610.23,522.45L608.54,519.86C608.07,519.15 609.95,520.47 609.24,520.93L543.85,560.39Z" android:strokeWidth="2.59">
<aapt:attr name="android:strokeColor">
<gradient android:endX="554.7165" android:endY="556.9666"
android:startX="609.3828" android:startY="521.15454" android:type="linear">
<item android:color="#FF003C5F" android:offset="0"/>
<item android:color="#FF0074B7" android:offset="1"/>
</gradient>
</aapt:attr>
</path>
<path android:fillColor="#ffffff" android:pathData="M606.02,583.79l4.46,0l0,18.83l-4.46,-0z"/>
<path android:fillColor="#ffffff" android:pathData="M606.02,523.9l4.46,0l0,18.83l-4.46,-0z"/>
<path android:fillColor="#ffffff" android:pathData="M650.51,538.48l4,-0l0,48.96l-4,0z"/>
<path android:fillColor="#ffffff" android:pathData="M553.25,568.17C552.23,568.69 554.43,568.17 553.25,568.17C549.54,568.17 543.15,566.3 543.15,563.03C543.15,559.76 549.54,557.9 553.25,557.9C554.43,557.9 552.23,557.37 553.25,557.9C550.09,561.75 550.09,565.19 553.25,568.17Z"/>
<path android:fillColor="#ffffff" android:pathData="M606.02,583.18l44.49,-0l-0,4.25l-44.49,0z"/>
<path android:fillColor="#ffffff" android:pathData="M608.25,538.48l42.26,0l-0,4.25l-42.26,-0z"/>
<path android:fillColor="#145483"
android:pathData="M719.93,564.14a57.17,57.19 90,1 0,114.38 0a57.17,57.19 90,1 0,-114.38 0z" android:strokeWidth="5.05">
<aapt:attr name="android:strokeColor">
<gradient android:endX="777.1152" android:endY="525.3421"
android:startX="777.1152" android:startY="621.31305" android:type="linear">
<item android:color="#FF003C5F" android:offset="0"/>
<item android:color="#FF0074B7" android:offset="1"/>
</gradient>
</aapt:attr>
</path>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M731.51,580.62L744.13,547.65L748.83,547.65L762.32,580.62L757.39,580.62L753.53,570.63L739.76,570.63L736.12,580.62L731.51,580.62ZM741,567.08L752.19,567.08L748.74,557.97C747.68,555.2 746.89,552.9 746.39,551.11C745.97,553.22 745.37,555.34 744.64,557.41L741,567.08Z"/>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M789.35,569.06L793.72,570.17C792.8,573.76 791.15,576.48 788.75,578.37C786.4,580.25 783.5,581.18 780.05,581.18C776.5,581.18 773.6,580.48 771.39,579.01C769.18,577.58 767.48,575.47 766.33,572.75C765.13,569.99 764.58,567.04 764.58,563.91C764.58,560.45 765.22,557.46 766.56,554.93C767.85,552.35 769.73,550.42 772.13,549.08C774.57,547.74 777.24,547.1 780.14,547.1C783.41,547.1 786.22,547.93 788.43,549.63C790.69,551.29 792.25,553.64 793.13,556.68L788.84,557.69C788.11,555.3 786.96,553.55 785.53,552.49C784.05,551.38 782.26,550.83 780.05,550.83C777.52,550.83 775.4,551.43 773.69,552.67C771.99,553.87 770.79,555.48 770.1,557.55C769.41,559.58 769.04,561.7 769.04,563.86C769.04,566.67 769.46,569.11 770.29,571.23C771.12,573.3 772.36,574.87 774.11,575.88C775.81,576.94 777.7,577.45 779.68,577.45C782.12,577.45 784.19,576.75 785.9,575.33C787.6,573.95 788.75,571.83 789.35,569.06Z"/>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M807.45,580.62L807.45,551.57L796.59,551.57L796.59,547.65L822.74,547.65L822.74,551.57L811.83,551.57L811.83,580.62L807.45,580.62Z"/>
<path android:fillColor="#00000000"
android:pathData="M709.77,564.14a66.98,67.34 90,1 0,134.69 0a66.98,67.34 90,1 0,-134.69 0z"
android:strokeColor="#D7E5ED" android:strokeWidth="7.53"/>
<path android:fillColor="#145483"
android:pathData="M366.38,562.39a57.17,57.19 90,1 0,114.38 0a57.17,57.19 90,1 0,-114.38 0z" android:strokeWidth="5.05">
<aapt:attr name="android:strokeColor">
<gradient android:endX="423.57245" android:endY="523.5841"
android:startX="423.57245" android:startY="619.55505" android:type="linear">
<item android:color="#FF003C5F" android:offset="0"/>
<item android:color="#FF0074B7" android:offset="1"/>
</gradient>
</aapt:attr>
</path>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M433.09,584.29L433.09,540.46L449.56,540.46C452.87,540.46 455.56,540.89 457.58,541.81C459.6,542.67 461.19,544.08 462.35,545.91C463.52,547.75 464.07,549.65 464.07,551.67C464.07,553.56 463.58,555.34 462.54,556.99C461.56,558.64 460.03,559.99 457.95,560.97C460.58,561.77 462.66,563.05 464.07,564.95C465.48,566.85 466.21,569.05 466.21,571.56C466.21,573.64 465.78,575.54 464.93,577.31C464.01,579.09 462.97,580.44 461.68,581.42C460.4,582.33 458.8,583.07 456.91,583.56C454.95,584.05 452.62,584.29 449.81,584.29L433.09,584.29ZM438.91,558.89L448.4,558.89C450.97,558.89 452.81,558.71 453.91,558.4C455.38,557.91 456.48,557.24 457.27,556.2C458.01,555.15 458.38,553.93 458.38,552.4C458.38,550.93 458.01,549.65 457.34,548.54C456.6,547.44 455.62,546.65 454.34,546.28C453.05,545.85 450.79,545.67 447.66,545.67L438.91,545.67L438.91,558.89ZM438.91,579.15L449.81,579.15C451.7,579.15 452.99,579.03 453.78,578.91C455.07,578.66 456.23,578.29 457.09,577.74C458.01,577.13 458.74,576.34 459.29,575.29C459.91,574.19 460.21,572.97 460.21,571.56C460.21,569.97 459.78,568.56 458.93,567.34C458.07,566.11 456.91,565.26 455.44,564.77C453.97,564.28 451.83,564.03 449.01,564.03L438.91,564.03L438.91,579.15Z"/>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M409.02,551.69L409.02,540.47L429.22,559.46L409.02,578.44L409.02,567.22C399.36,567.22 391.45,574.99 391.45,584.48C391.45,589.31 393.39,593.62 396.55,596.73C389.34,592.59 384.43,584.82 384.43,575.85C384.43,562.39 395.49,551.69 409.02,551.69Z"/>
<path android:fillColor="#145483"
android:pathData="M975.75,532.95a57.17,57.19 90,1 0,114.38 0a57.17,57.19 90,1 0,-114.38 0z" android:strokeWidth="5.05">
<aapt:attr name="android:strokeColor">
<gradient android:endX="1032.9387" android:endY="494.14764"
android:startX="1032.9387" android:startY="590.1186" android:type="linear">
<item android:color="#FF003C5F" android:offset="0"/>
<item android:color="#FF0074B7" android:offset="1"/>
</gradient>
</aapt:attr>
</path>
<path android:fillColor="#ffffff"
android:pathData="M1037.88,606C1037.08,607.23 1035.43,607.58 1034.2,606.77L1029.74,603.85C1028.52,603.05 1028.17,601.4 1028.98,600.17L1099.66,492.27C1100.47,491.04 1102.12,490.69 1103.35,491.5L1105.95,493.21L1037.88,606Z" android:strokeWidth="2">
<aapt:attr name="android:strokeColor">
<gradient android:endX="1043.7961" android:endY="587.263"
android:startX="1105.576" android:startY="492.95734" android:type="linear">
<item android:color="#FF003C5F" android:offset="0"/>
<item android:color="#FF0074B7" android:offset="1"/>
</gradient>
</aapt:attr>
</path>
<path android:fillColor="#ffffff"
android:pathData="M1027.99,606C1028.79,607.23 1030.45,607.58 1031.67,606.77L1036.13,603.85C1037.36,603.05 1037.7,601.4 1036.9,600.17L966.21,492.27C965.4,491.04 963.75,490.69 962.52,491.5L959.92,493.21C959.92,493.21 960.09,493.26 960.89,494.49L1027.99,606Z" android:strokeWidth="2">
<aapt:attr name="android:strokeColor">
<gradient android:endX="1022.0767" android:endY="587.263"
android:startX="960.2969" android:startY="492.95734" android:type="linear">
<item android:color="#FF003C5F" android:offset="0"/>
<item android:color="#FF0074B7" android:offset="1"/>
</gradient>
</aapt:attr>
</path>
<path android:fillColor="#ffffff" android:pathData="M1041.4,589.79C1042.3,591.56 1041.4,587.75 1041.4,589.79C1041.4,596.2 1038.19,607.21 1032.54,607.21C1026.89,607.21 1023.68,596.2 1023.68,589.79C1023.68,587.75 1022.78,591.56 1023.68,589.79C1030.33,595.25 1036.26,595.24 1041.4,589.79Z"/>
<path android:fillColor="#DAD5D5" android:pathData="M1041.75,537.6C1041.75,535.8 1040.28,534.33 1038.48,534.33L1029.88,534.33C1028.08,534.33 1026.61,535.8 1026.61,537.6L1026.61,544.14C1026.61,545.95 1028.08,547.41 1029.88,547.41L1038.48,547.41C1040.28,547.41 1041.75,545.95 1041.75,544.14L1041.75,537.6Z"/>
<path android:fillColor="#DAD5D5" android:pathData="M1040.03,535.91C1045.65,532.4 1047.26,524.85 1043.63,519.04C1040,513.24 1032.5,511.37 1026.89,514.88C1021.28,518.39 1019.66,525.95 1023.29,531.75C1024.4,533.53 1025.94,535.01 1027.75,536.05L1028.74,534.21C1027.24,533.35 1025.97,532.13 1025.05,530.65C1022.05,525.85 1023.38,519.6 1028.03,516.7C1032.67,513.8 1038.87,515.34 1041.87,520.14C1044.87,524.94 1043.54,531.19 1038.89,534.09L1040.03,535.91Z"/>
<path android:fillColor="#DAD5D5" android:pathData="M1032.57,501.31l1.77,0l0,9.47l-1.77,0z"/>
<path android:fillColor="#DAD5D5" android:pathData="M1040.59,502.41l1.67,0.61l-3.24,8.89l-1.67,-0.61z"/>
<path android:fillColor="#DAD5D5" android:pathData="M1047.74,506.18l1.36,1.14l-6.08,7.25l-1.36,-1.14z"/>
<path android:fillColor="#DAD5D5" android:pathData="M1024.67,503.01l1.67,-0.61l3.24,8.89l-1.67,0.61z"/>
<path android:fillColor="#DAD5D5" android:pathData="M1017.82,507.32l1.36,-1.14l6.08,7.25l-1.36,1.14z"/>
<path android:fillColor="#145483"
android:pathData="M975.75,280.2a57.17,57.19 90,1 0,114.38 0a57.17,57.19 90,1 0,-114.38 0z" android:strokeWidth="5.05">
<aapt:attr name="android:strokeColor">
<gradient android:endX="1032.9387" android:endY="241.39958"
android:startX="1032.9387" android:startY="337.3705" android:type="linear">
<item android:color="#FF003C5F" android:offset="0"/>
<item android:color="#FF0074B7" android:offset="1"/>
</gradient>
</aapt:attr>
</path>
<path android:fillColor="#ffffff"
android:pathData="M1037.88,208.96C1037.08,207.73 1035.43,207.39 1034.2,208.19L1029.74,211.11C1028.52,211.91 1028.17,213.56 1028.98,214.79L1099.66,322.7C1100.47,323.93 1102.12,324.27 1103.35,323.47L1105.95,321.76L1037.88,208.96Z" android:strokeWidth="2">
<aapt:attr name="android:strokeColor">
<gradient android:endX="1043.7961" android:endY="227.70102"
android:startX="1105.576" android:startY="322.00668" android:type="linear">
<item android:color="#FF003C5F" android:offset="0"/>
<item android:color="#FF0074B7" android:offset="1"/>
</gradient>
</aapt:attr>
</path>
<path android:fillColor="#ffffff"
android:pathData="M1027.99,208.96C1028.79,207.73 1030.45,207.39 1031.67,208.19L1036.13,211.11C1037.36,211.91 1037.7,213.56 1036.9,214.79L966.21,322.7C965.4,323.93 963.75,324.27 962.52,323.47L959.92,321.76L1027.99,208.96Z" android:strokeWidth="2">
<aapt:attr name="android:strokeColor">
<gradient android:endX="1022.0767" android:endY="227.70102"
android:startX="960.2969" android:startY="322.00668" android:type="linear">
<item android:color="#FF003C5F" android:offset="0"/>
<item android:color="#FF0074B7" android:offset="1"/>
</gradient>
</aapt:attr>
</path>
<path android:fillColor="#ffffff" android:pathData="M1041.4,225.17C1042.3,223.41 1041.4,227.21 1041.4,225.17C1041.4,218.77 1038.19,207.76 1032.54,207.76C1026.89,207.76 1023.68,218.77 1023.68,225.17C1023.68,227.21 1022.78,223.41 1023.68,225.17C1030.33,219.71 1036.26,219.72 1041.4,225.17Z"/>
<path android:fillColor="#00000000"
android:pathData="M1033.25,261.3L1049.32,289.33L1031.69,290.12L1023.66,276.1L1033.25,261.3Z"
android:strokeColor="#DAD5D5" android:strokeWidth="3.44"/>
<path android:fillColor="#00000000"
android:pathData="M1023.79,276.38l7.46,13.74l-10.33,5.61l-7.46,-13.74z"
android:strokeColor="#DAD5D5" android:strokeWidth="1.81"/>
<path android:fillColor="#F9F7F7" android:pathData="M1044.43,256.81C1045.08,255.84 1051.86,260.84 1054.7,267.31C1057.49,273.67 1057.33,282.19 1055.95,281.83C1057.43,271.14 1053.16,262.36 1044.43,256.81Z"/>
<path android:fillColor="#F9F7F7" android:pathData="M1040.98,261.12C1041.77,260.26 1048.01,264.74 1050.15,269.64C1052.24,274.45 1052.15,281.48 1050.77,281.36C1052.04,271.57 1048.62,265.78 1040.98,261.12Z"/>
<path android:fillColor="#0D2431" android:pathData="M959.37,144.16C959.37,138.89 955.09,134.61 949.81,134.61L334.79,134.61C329.51,134.61 325.23,138.89 325.23,144.16L325.23,461.33C325.23,466.61 329.51,470.89 334.79,470.89L949.81,470.89C955.09,470.89 959.37,466.61 959.37,461.33L959.37,144.16Z"/>
<path android:fillColor="#99E3B6" android:pathData="M340.87,152.22l602.86,0l0,301.05l-602.86,0z"/>
<path android:fillColor="#0C80B2" android:pathData="M1127.31,68.2l5.13,0l0,661l-5.13,0z"/>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M299.7,433.15L268.8,433.26L268.78,426.12L290.63,417.62C292.65,416.81 294.2,416.26 295.19,415.9C294.07,415.46 292.43,414.87 290.23,414.03L268.71,405.51L268.69,399.18L299.58,399.08L299.6,403.62L273.75,403.7L299.63,413.99L299.65,418.24L273.4,428.65L299.68,428.56L299.7,433.15Z"/>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M292.3,374.3L292.75,369.76C295.04,370.5 296.82,371.79 298.12,373.73C299.38,375.67 300.03,378.12 300.04,381.11C300.05,384.9 299.03,387.9 297.05,390.15C295.03,392.35 292.19,393.46 288.56,393.47C284.81,393.48 281.87,392.4 279.79,390.16C277.71,387.92 276.67,385.03 276.65,381.44C276.64,377.99 277.63,375.15 279.69,372.95C281.71,370.74 284.56,369.64 288.27,369.62C288.48,369.62 288.83,369.67 289.26,369.67L289.32,388.98C291.78,388.77 293.68,387.97 294.97,386.52C296.26,385.06 296.9,383.27 296.89,381.12C296.89,379.52 296.54,378.13 295.8,376.98C295.06,375.89 293.89,374.94 292.3,374.3ZM286.22,388.74L286.17,374.27C284.27,374.48 282.89,375.03 281.94,375.93C280.48,377.33 279.75,379.18 279.76,381.38C279.77,383.42 280.38,385.12 281.55,386.46C282.72,387.85 284.27,388.6 286.22,388.74Z"/>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M299.41,347.48L296.61,347.49C298.81,349.12 299.94,351.52 299.95,354.71C299.96,356.75 299.45,358.65 298.51,360.4C297.52,362.1 296.14,363.45 294.38,364.41C292.61,365.36 290.58,365.87 288.3,365.87C286.05,365.88 284.02,365.44 282.21,364.6C280.39,363.75 279.01,362.46 278.01,360.72C277.06,359.03 276.57,357.08 276.57,354.99C276.56,353.39 276.82,351.99 277.42,350.79C277.97,349.59 278.7,348.59 279.61,347.84L268.52,347.88L268.5,343.49L299.4,343.38L299.41,347.48ZM288.28,361.33C291.17,361.32 293.29,360.62 294.7,359.22C296.12,357.87 296.81,356.17 296.8,354.27C296.8,352.37 296.14,350.73 294.76,349.39C293.42,348.09 291.34,347.4 288.58,347.41C285.52,347.42 283.23,348.13 281.81,349.48C280.39,350.88 279.67,352.53 279.67,354.53C279.68,356.47 280.37,358.12 281.76,359.41C283.15,360.7 285.35,361.34 288.28,361.33Z"/>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M295.94,326.92L299.3,326.26C299.52,327.51 299.65,328.61 299.66,329.61C299.66,331.2 299.45,332.45 299.02,333.3C298.59,334.2 297.99,334.8 297.3,335.15C296.57,335.5 295.1,335.71 292.81,335.72L279.96,335.76L279.97,338.95L276.99,338.96L276.98,335.77L271.46,335.79L269.15,331.45L276.96,331.43L276.95,326.99L279.93,326.98L279.94,331.42L293.02,331.37C294.09,331.37 294.79,331.27 295.09,331.12C295.43,330.97 295.65,330.72 295.82,330.37C296.03,330.02 296.12,329.52 296.11,328.87C296.11,328.37 296.07,327.72 295.94,326.92Z"/>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M299.33,322.68L276.94,322.75L276.92,318.81L280.33,318.8C278.73,317.81 277.69,316.86 277.17,316.02C276.69,315.17 276.43,314.22 276.43,313.23C276.42,311.73 276.81,310.23 277.62,308.68L281.17,310.22C280.61,311.27 280.35,312.36 280.36,313.41C280.36,314.36 280.58,315.26 281.1,316C281.58,316.75 282.27,317.3 283.18,317.64C284.51,318.09 285.98,318.33 287.62,318.33L299.32,318.29L299.33,322.68Z"/>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M288.1,307.7C283.96,307.71 280.89,306.37 278.86,303.74C277.21,301.5 276.38,298.81 276.37,295.61C276.36,292.02 277.34,289.12 279.36,286.87C281.38,284.62 284.14,283.46 287.68,283.45C290.57,283.44 292.86,283.93 294.5,284.92C296.15,285.92 297.44,287.36 298.36,289.25C299.27,291.2 299.75,293.24 299.76,295.54C299.77,299.13 298.74,302.07 296.77,304.33C294.75,306.53 291.86,307.69 288.1,307.7ZM288.09,303.16C290.94,303.15 293.09,302.44 294.51,300.99C295.93,299.54 296.62,297.74 296.61,295.55C296.6,293.35 295.91,291.56 294.48,290.11C293,288.67 290.84,287.93 287.91,287.94C285.15,287.95 283.04,288.7 281.62,290.16C280.2,291.61 279.47,293.41 279.48,295.6C279.48,297.8 280.22,299.59 281.65,301.03C283.08,302.48 285.2,303.17 288.09,303.16Z"/>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M299.18,278.27L276.79,278.34L276.78,274.4L279.97,274.39C277.5,272.5 276.29,269.76 276.27,266.17C276.27,264.62 276.48,263.17 276.99,261.87C277.46,260.58 278.11,259.58 278.88,258.92C279.66,258.27 280.6,257.82 281.68,257.57C282.37,257.37 283.58,257.31 285.35,257.31L299.11,257.26L299.13,261.65L285.54,261.7C283.98,261.7 282.82,261.86 282.04,262.21C281.31,262.56 280.66,263.16 280.24,264.01C279.76,264.91 279.55,265.91 279.56,267.05C279.56,268.95 280.09,270.55 281.13,271.89C282.12,273.28 284.07,273.93 286.96,273.92L299.17,273.88L299.18,278.27Z"/>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M272.55,250.61L268.2,250.62L268.18,246.23L272.54,246.21L272.55,250.61ZM299.09,250.52L276.7,250.59L276.68,246.2L299.08,246.13L299.09,250.52Z"/>
<path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M290.8,222.6L291.26,218.25C293.85,218.74 295.84,219.94 297.31,221.88C298.79,223.82 299.53,226.16 299.54,229C299.55,232.55 298.57,235.39 296.55,237.55C294.57,239.7 291.68,240.81 287.97,240.82C285.55,240.83 283.44,240.38 281.62,239.44C279.81,238.55 278.42,237.11 277.51,235.21C276.6,233.32 276.16,231.28 276.15,229.08C276.14,226.24 276.74,223.94 277.94,222.14C279.19,220.39 280.91,219.24 283.19,218.73L283.77,222.97C282.26,223.37 281.14,224.13 280.37,225.13C279.64,226.18 279.25,227.42 279.26,228.87C279.26,231.07 279.96,232.86 281.35,234.25C282.69,235.65 284.89,236.34 287.83,236.33C290.85,236.32 293.04,235.61 294.38,234.31C295.75,232.96 296.4,231.21 296.39,229.06C296.38,227.37 295.95,225.92 295.04,224.78C294.13,223.63 292.7,222.89 290.8,222.6Z"/>
<path android:fillAlpha="0.5" android:fillColor="#C6C2C2"
android:pathData="M547.6,737.02C560.43,734.44 568.57,734.08 568.57,734.08C568.57,734.08 501.69,711.51 421.02,711.51C340.35,711.51 272.51,734.08 272.51,734.08C272.51,734.08 281.62,734.44 294.44,737.02L547.6,737.02Z"
android:strokeColor="#D7E5ED" android:strokeWidth="0.78"/>
</vector>

1
omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
View file

@ -185,6 +185,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
super(new PluginDescription() //
.mainType(PluginType.PUMP) //
.fragmentClass(OmnipodOverviewFragment.class.getName()) //
.pluginIcon(R.drawable.ic_pod)
.pluginName(R.string.omnipod_name) //
.shortName(R.string.omnipod_name_short) //
.preferencesId(R.xml.pref_omnipod) //