Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
This commit is contained in:
commit
f08f32c581
1 changed files with 23 additions and 15 deletions
|
@ -1,22 +1,30 @@
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:width="64dp"
|
|
||||||
android:height="64dp"
|
|
||||||
android:viewportWidth="64"
|
android:viewportWidth="64"
|
||||||
android:viewportHeight="64">
|
android:viewportHeight="64"
|
||||||
|
android:width="64dp"
|
||||||
|
android:height="64dp">
|
||||||
<path
|
<path
|
||||||
android:fillColor="?attr/colorControlNormal"
|
android:pathData="M48.9 43.7c0.9 -0.2 3.8 4 5.8 8s-1.1 9.1 -5.8 9.2c-3.9 0.1 -8 -5.1 -5.5 -9.8C44.7 48.6 47.4 44 48.9 43.7zM47.6 50c-1.2 -0.4 -3.5 2.2 -2.9 4.7c0.6 2.3 2.9 4.8 3.5 4.6c1.4 -0.5 -1.4 -3.8 -1.5 -5.2C46.5 52.3 48.3 50.3 47.6 50z"
|
||||||
android:pathData="M26.974,28.633c2.447,-4.486 5.781,-8.918 9.638,-13.317l3.594,4.239c-1.265,2.24 -2.645,4.425 -4.439,6.402l-8.793,2.676ZM46.37,28.633l-7.664,-2.644l3.351,-4.189l4.313,6.833ZM35.349,41.533c-0,3.178 -2.597,5.758 -5.797,5.758c-3.199,-0 -5.796,-2.58 -5.796,-5.758c-0,-0.951 0.232,-1.848 0.643,-2.638c-0.118,-1.207 0.853,-4.15 2.623,-6.373c0.178,-0.224 0.353,-0.432 0.522,-0.624c0.604,-1.645 4.255,-2.912 8.664,-2.912c2.719,-0 5.149,0.482 6.755,1.237c0.042,0.019 0.084,0.039 0.126,0.061c0.715,0.352 1.254,0.761 1.565,1.206c0.115,0.118 0.23,0.242 0.345,0.374c2.301,2.631 3.834,5.883 3.857,7.058c0.402,0.784 0.629,1.671 0.629,2.611c0,3.178 -2.597,5.758 -5.796,5.758c-3.199,-0 -5.797,-2.58 -5.797,-5.758l0,-7.108c-0.186,-0.106 -0.322,-0.221 -0.397,-0.347l-3.196,-0c0,-0 1.087,-0 1.087,-0l-0,7.455l-0.037,-0ZM45.369,36.021c-0.051,-0.056 -0.098,-0.063 -0.147,-0.042c0.049,0.014 0.098,0.028 0.147,0.042ZM43.689,45.909c-2.432,-0 -4.406,-1.961 -4.406,-4.376c0,-2.415 1.974,-4.376 4.406,-4.376c2.431,0 4.405,1.961 4.405,4.376c0,2.415 -1.974,4.376 -4.405,4.376ZM29.552,45.909c-2.431,-0 -4.405,-1.961 -4.405,-4.376c-0,-2.415 1.974,-4.376 4.405,-4.376c2.432,0 4.406,1.961 4.406,4.376c-0,2.415 -1.974,4.376 -4.406,4.376ZM43.689,43.618c-1.157,-0 -2.096,-0.935 -2.096,-2.085c-0,-1.151 0.939,-2.085 2.096,-2.085c1.157,0 2.096,0.934 2.096,2.085c-0,1.15 -0.939,2.085 -2.096,2.085ZM29.552,43.618c-1.156,-0 -2.096,-0.935 -2.096,-2.085c0,-1.151 0.94,-2.085 2.096,-2.085c1.157,0 2.096,0.934 2.096,2.085c0,1.15 -0.939,2.085 -2.096,2.085ZM43.284,53.001c-1.541,0.761 -4.041,1.256 -6.862,1.256c-4.229,0 -7.739,-1.114 -8.37,-2.568c-0.582,-0.608 -1.036,-1.296 -1.404,-1.99l2.356,0.052c0.027,-0.017 0.054,-0.034 0.081,-0.052l3.199,0l4.304,-3.361l4.303,3.361l2.868,0c0.006,0.004 0.012,0.008 0.018,0.012l2.699,0.015c-0.688,1.644 -1.835,2.709 -3.171,3.325l-0.021,-0.05Z" />
|
android:fillColor="?attr/colorControlNormal" />
|
||||||
<path
|
<path
|
||||||
android:pathData="M36.472,7.728c-2.167,-1.778 -20.58,21.776 -18.727,34.474c1.511,10.356 8.067,18.397 18.727,18.626c10.775,0.231 17.757,-7.836 18.727,-18.626c1.144,-12.715 -16.12,-36.225 -18.727,-34.474Z"
|
android:pathData="M46.9 22.5c0 1.7 -0.2 3.9 -0.3 4.6c-0.3 2 -0.8 3.9 -1.4 5.8c-0.8 2.5 -1.8 4.8 -3.1 7.1c-0.8 1.4 -1.6 2.8 -2.4 4.1c-0.9 1.4 -1.9 2.8 -3 4.2c-1 1.3 -2 2.5 -3.1 3.8c-0.4 0.4 -0.7 0.8 -1.1 1.2c-0.7 0.8 -1.3 1.4 -2.1 2.1c-1.7 1.6 -4.3 1.5 -5.8 -0.2c-1.1 -1.1 -2.2 -2.3 -3.3 -3.5c-1.3 -1.5 -2.5 -3 -3.7 -4.6c-1.7 -2.3 -3.3 -4.8 -4.7 -7.4c-1 -1.8 -1.8 -3.8 -2.5 -5.7c-0.9 -2.7 -1.7 -5.4 -1.9 -8.2c0 -0.3 -0.1 -1.7 -0.1 -3.2c0 -1.6 0.2 -2.8 0.2 -3.3c0.3 -1.8 0.9 -3.5 1.7 -5.2c0.6 -1.4 1.5 -2.6 2.4 -3.8c0.9 -1.1 2 -2.1 3.1 -3c1.3 -1 2.6 -1.8 4.1 -2.4c1.6 -0.7 3.3 -1.2 5 -1.4c0.3 0 1.4 -0.2 2.8 -0.2c1.8 0 3.5 0.3 4.3 0.4c1.8 0.4 3.5 1.1 5.1 2c2.3 1.3 4.2 2.9 5.8 5c1.1 1.5 2.1 3.1 2.7 4.8c0.5 1.2 0.8 2.5 1.1 3.8C46.7 19.6 46.9 21 46.9 22.5zM27.8 6.2c-0.8 0 -1.5 0.1 -2.2 0.2c-1.6 0.2 -3 0.6 -4.5 1.3c-2.4 1.1 -4.5 2.7 -6.1 4.8c-1.2 1.5 -2 3.1 -2.6 4.8c-0.3 1 -0.6 1.9 -0.7 2.9c-0.1 0.8 -0.2 1.7 -0.2 2.5c0 1 0.1 1.9 0.2 2.9c0.1 0.9 0.2 1.9 0.5 2.8c0.6 2.6 1.5 5.2 2.6 7.6c1 2.1 2.1 4.2 3.4 6.1c1.3 2 2.7 3.9 4.2 5.7c1.4 1.7 2.8 3.3 4.3 4.8c0.6 0.6 1.3 0.6 1.9 0c1.5 -1.5 3.7 -4 4.7 -5.3c1 -1.2 1.9 -2.4 2.7 -3.6c1.1 -1.6 2.1 -3.2 3.1 -4.9c1 -1.9 2 -3.9 2.7 -5.9c0.7 -1.8 1.2 -3.7 1.5 -5.6c0.3 -1.4 0.4 -2.8 0.5 -4.3c0 -0.8 -0.1 -1.7 -0.2 -2.5c-0.2 -1.6 -0.6 -3.1 -1.3 -4.5c-0.9 -2 -2.2 -3.8 -3.9 -5.4c-1.2 -1.1 -2.6 -2 -4.1 -2.8C32.3 6.8 30.1 6.3 27.8 6.2z"
|
||||||
android:strokeWidth="3.09"
|
android:fillColor="?attr/colorControlNormal" />
|
||||||
android:strokeColor="?attr/colorControlNormal" />
|
|
||||||
<path
|
<path
|
||||||
android:fillColor="?attr/colorBackgroundFloating"
|
android:pathData="M26.2 26c0 1.2 0 2.4 0 3.6c0 0.6 0.2 0.9 0.8 0.8c0.4 0 0.9 0 1.3 0c0.7 0 0.8 -0.1 0.8 -0.8c0 -2.3 -0.1 -4.7 0 -7c0.1 -2.1 1 -3.7 2.8 -4.8c1.9 -1.1 3.9 -1.1 5.8 -0.2c1.6 0.8 2.6 2.1 3 3.9c0.4 1.5 0 3 -0.3 4.5c-0.4 1.8 -1.3 3.4 -2.5 4.9c-1.8 2.2 -4 3.6 -6.7 4.4c-1.6 0.4 -3.1 0.6 -4.7 0.5c-2.5 -0.2 -4.7 -1.1 -6.7 -2.5c-1.6 -1.1 -2.8 -2.5 -3.7 -4.2c-0.7 -1.2 -1.2 -2.6 -1.4 -4c-0.1 -0.8 -0.3 -1.5 -0.2 -2.3c0.1 -2.7 1.9 -5.2 4.7 -5.6c1.6 -0.3 3.1 -0.1 4.5 0.8c1.3 0.8 2.1 2 2.5 3.5c0.1 0.5 0.2 1 0.2 1.5C26.2 24 26.2 25 26.2 26zM35 17.7c-2.8 0 -5.1 2.2 -5.1 5c0 2.9 2.3 5.2 5.1 5.2c2.9 0 5.1 -2.2 5.1 -5C40.1 19.9 37.8 17.7 35 17.7zM25.4 22.7c0 -2.8 -2.3 -5 -4.9 -5c-3.1 -0.1 -5.3 2.3 -5.3 5c0 2.9 2.2 5.1 5.1 5.1C23 27.8 25.3 25.7 25.4 22.7z"
|
||||||
android:pathData="M26,42a1.113,1.107 0,1 0,7 0a1.113,1.107 0,1 0,-7 0z" />
|
android:fillColor="?attr/colorControlNormal" />
|
||||||
<path
|
<path
|
||||||
android:fillColor="?attr/colorBackgroundFloating"
|
android:pathData="M38.5 14.8c-0.5 -0.1 -0.9 -0.2 -1.3 -0.3c-2.8 -0.6 -5.4 -0.1 -7.7 1.6c-0.6 0.5 -1.2 1 -1.6 1.7c-0.2 0.4 -0.4 0.2 -0.5 0c-0.3 -0.4 -0.6 -0.8 -1 -1.1c-1.4 -1.3 -2.9 -2 -4.8 -2.3c-1.4 -0.2 -2.8 -0.1 -4.2 0.3c-0.2 0.1 -0.3 0.1 -0.5 0.2c0 0 -0.1 0 -0.2 0C19.6 11 23.5 9 28.2 9.2C32.5 9.3 36 11.3 38.5 14.8z"
|
||||||
android:pathData="M40,42a1.113,1.107 0,1 0,7 0a1.113,1.107 0,1 0,-7 0z" />
|
android:fillColor="?attr/colorControlNormal" />
|
||||||
<path
|
<path
|
||||||
android:fillColor="?attr/colorControlNormal"
|
android:pathData="M27.6 49.6c-0.9 -1 -1.8 -2 -2.7 -3c-0.4 -0.4 -0.7 -0.9 -1.1 -1.3c-0.1 -0.2 -0.1 -0.2 0 -0.4c1.1 -1.6 2.2 -3.2 3.2 -4.9c0.2 -0.4 0.4 -0.7 0.6 -1.1c0.1 -0.2 0.2 -0.2 0.4 -0.3c2.6 -0.1 5 -0.7 7.2 -2c0.8 -0.4 1.6 -0.9 2.3 -1.5C35.2 40.6 31.7 45.2 27.6 49.6z"
|
||||||
android:pathData="M15.033,3.173c0.86,-0.187 3.831,4.041 5.767,7.976c1.97,4.005 -1.144,9.071 -5.767,9.169c-3.916,0.084 -8.031,-5.067 -5.515,-9.774c1.298,-2.429 4.076,-7.057 5.515,-7.371ZM13.751,9.511c-1.167,-0.437 -3.511,2.215 -2.886,4.685c0.582,2.301 2.948,4.824 3.5,4.626c1.44,-0.517 -1.41,-3.828 -1.541,-5.219c-0.174,-1.834 1.591,-3.843 0.927,-4.092Z" />
|
android:fillColor="?attr/colorControlNormal" />
|
||||||
|
<path
|
||||||
|
android:pathData="M17.6 35.2c1 0.7 2 1.4 3.2 1.9c1.2 0.6 2.4 1 3.7 1.2c0.3 0.1 0.3 0.2 0.2 0.4c-0.7 1.1 -1.3 2.2 -2.1 3.2c-0.2 0.3 -0.4 0.5 -0.6 0.8C20.3 40.3 18.8 37.8 17.6 35.2z"
|
||||||
|
android:fillColor="?attr/colorControlNormal" />
|
||||||
|
<path
|
||||||
|
android:pathData="M35 20.6c1.2 -0.2 2.3 1 2.2 2.2c0 1 -1 2.2 -2.2 2.2c-1.1 0 -2.2 -1.1 -2.2 -2.3C32.8 21.6 33.9 20.4 35 20.6z"
|
||||||
|
android:fillColor="?attr/colorControlNormal" />
|
||||||
|
<path
|
||||||
|
android:pathData="M22.5 22.7c0.1 1.2 -1.1 2.3 -2.2 2.3c-1.2 0 -2.2 -1 -2.2 -2.3c0 -1 0.9 -2.2 2.4 -2.1C21.4 20.6 22.6 21.6 22.5 22.7z"
|
||||||
|
android:fillColor="?attr/colorControlNormal" />
|
||||||
</vector>
|
</vector>
|
Loading…
Reference in a new issue