Merge pull request #797 from dhis2/hotbugfixing

Hotbugfixing XML R2 - 0.15.3

core/build.gradle

@@ -36,8 +36,8 @@ ext {
             buildToolsVersion: "28.0.3",
             minSdkVersion    : 19,
             targetSdkVersion : 28,
-            versionCode      : 127,
-            versionName      : "0.15.2-SNAPSHOT"
+            versionCode      : 128,
+            versionName      : "0.15.3-SNAPSHOT"
     ]
 
     libraries = [

core/gradle.properties

@@ -29,8 +29,8 @@
 # Properties which are consumed by plugins/gradle-mvn-push.gradle plugin.
 # They are used for publishing artifact to snapshot repository.
 
-VERSION_NAME=0.15.2-SNAPSHOT
-VERSION_CODE=127
+VERSION_NAME=0.15.3-SNAPSHOT
+VERSION_CODE=128
 
 GROUP=org.hisp.dhis
 
@@ -49,4 +49,4 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=DHIS 2
 POM_DEVELOPER_NAME=DHIS 2
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true

core/src/main/res/drawable/blister_pills_round_x31_positive.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#333"
+        android:pathData="M14.1,4.1 C13.23,4.1,12.53,4.8,12.53,5.67 L12.53,42.57 C12.53,43.44,13.227,44.14,14.1,44.14 L33.8,44.14 C34.67,44.14,35.37,43.44,35.37,42.57 L35.37,5.67 C35.37,4.8,34.671,4.1,33.8,4.1 C14.1,4.1,20,4.09758,14.1,4.1 Z M18.8,6.82 C18.976,6.82157,18.687,7.108,18.687,6.932 C18.6881,6.8705,18.7385,6.821,18.8,6.822 Z M23.99,6.82 C24.166,6.82157,23.877,7.108,23.877,6.932 C23.8781,6.8705,23.9285,6.821,23.99,6.822 Z M29.18,6.82 C29.356,6.82157,29.067,7.108,29.067,6.932 C29.0681,6.8705,29.1185,6.821,29.18,6.822 Z M16.28,7.91 C18.31,7.91,18.31,10.96,16.28,10.96 C14.25,10.96,14.25,7.91,16.28,7.91 Z M21.37,7.91 C23.4,7.91,23.4,10.96,21.37,10.96 C19.34,10.96,19.34,7.91,21.37,7.91 Z M26.46,7.91 C28.49,7.91,28.49,10.96,26.46,10.96 C24.43,10.96,24.43,7.91,26.46,7.91 Z M31.71,10 C33.74,10,33.74,13.05,31.71,13.05 C29.68,13.05,29.68,10,31.71,10 Z M18.81,10.188 L18.83,10.188 C18.891,10.188,18.94,10.24,18.941,10.301 C18.941,10.45,18.717,10.45,18.717,10.301 C18.717,10.246,18.757,10.195,18.81,10.188 Z M24,10.188 L24.02,10.188 C24.197,10.188,23.907,10.478,23.907,10.301 C23.907,10.246,23.947,10.195,24,10.188 Z M29.19,10.188 L29.21,10.188 C29.271,10.188,29.32,10.24,29.321,10.301 C29.321,10.45,29.097,10.45,29.097,10.301 C29.097,10.246,29.137,10.195,29.19,10.188 Z M18.79,10.748 C18.8711,10.7485,18.925,10.8316,18.893,10.906 C18.8755,10.9472,18.8348,10.9737,18.79,10.973 C18.7603,10.9744,18.7314,10.9636,18.71,10.943 C18.6882,10.9221,18.6759,10.8932,18.676,10.863 C18.676,10.801,18.727,10.748,18.79,10.748 Z M23.98,10.748 C24.043,10.748,24.092,10.801,24.091,10.863 C24.091,10.9238,24.0418,10.973,23.981,10.973 C23.9513,10.9744,23.9224,10.9636,23.901,10.943 C23.8792,10.9221,23.8669,10.8932,23.867,10.863 C23.867,10.801,23.917,10.748,23.98,10.748 Z M29.17,10.748 C29.2511,10.7485,29.305,10.8316,29.273,10.906 C29.2555,10.9472,29.2148,10.9737,29.17,10.973 C29.1403,10.9744,29.1114,10.9636,29.09,10.943 C29.0682,10.9221,29.0559,10.8932,29.056,10.863 C29.056,10.801,29.107,10.748,29.17,10.748 Z M18.77,11.868 C18.8012,11.866,18.8319,11.8769,18.855,11.898 C18.8776,11.9197,18.8902,11.9497,18.89,11.981 C18.889,12.0428,18.8397,12.093,18.778,12.095 C18.639,12.0878,18.632,11.885,18.77,11.868 Z M23.96,11.868 C23.9912,11.866,24.0219,11.8769,24.045,11.898 C24.1198,11.9684,24.0707,12.094,23.968,12.095 C23.829,12.0878,23.822,11.885,23.96,11.868 Z M29.15,11.868 C29.1812,11.866,29.2119,11.8769,29.235,11.898 C29.2576,11.9197,29.2702,11.9497,29.27,11.981 C29.269,12.0428,29.2197,12.093,29.158,12.095 C29.019,12.0878,29.012,11.885,29.15,11.868 Z M16.25,12.085 C18.28,12.085,18.28,15.135,16.25,15.135 C14.22,15.135,14.22,12.085,16.25,12.085 Z M21.34,12.085 C23.38,12.0303,23.45,15.085,21.418,15.135 C19.388,15.1844,19.308,12.145,21.34,12.085 Z M26.43,12.085 C28.46,12.085,28.46,15.135,26.43,15.135 C24.4,15.135,24.4,12.085,26.43,12.085 Z M18.77,12.431 C18.8354,12.4263,18.891,12.4785,18.89,12.544 C18.889,12.6056,18.8396,12.655,18.778,12.657 C18.645,12.6447,18.638,12.453,18.77,12.431 Z M23.96,12.431 C24.0254,12.4263,24.081,12.4785,24.08,12.544 C24.08,12.605,24.03,12.657,23.968,12.657 C23.835,12.6447,23.828,12.453,23.96,12.431 Z M29.15,12.431 C29.2154,12.4263,29.271,12.4785,29.27,12.544 C29.269,12.6056,29.2196,12.655,29.158,12.657 C29.025,12.6447,29.018,12.453,29.15,12.431 Z M31.69,14.181 C33.8,14.1047,33.8,17.301,31.69,17.231 C29.75,17.1448,29.75,14.271,31.69,14.191 Z M18.79,14.684 L18.81,14.684 C18.8802,14.6862,18.931,14.7513,18.917,14.82 C18.9027,14.8895,18.8278,14.928,18.763,14.899 C18.7213,14.881,18.6947,14.8394,18.696,14.794 C18.6954,14.739,18.7356,14.692,18.79,14.684 Z M23.98,14.684 L24,14.684 C24.176,14.6872,23.883,14.97,23.886,14.794 C23.8854,14.739,23.9256,14.692,23.98,14.684 Z M29.17,14.684 L29.19,14.684 C29.2602,14.6862,29.311,14.7513,29.297,14.82 C29.2827,14.8895,29.2078,14.928,29.143,14.899 C29.1013,14.881,29.0747,14.8394,29.076,14.794 C29.0754,14.739,29.1156,14.692,29.17,14.684 Z M18.77,15.804 C18.916,15.8061,18.7941,16.098,18.69,15.996 C18.6212,15.9251,18.6712,15.806,18.77,15.806 Z M23.96,15.804 C24.106,15.8061,23.9841,16.098,23.88,15.996 C23.8112,15.9251,23.8612,15.806,23.96,15.806 Z M29.15,15.804 C29.296,15.8061,29.1741,16.098,29.07,15.996 C29.0012,15.9251,29.0512,15.806,29.15,15.806 Z M16.25,16.269 C18.28,16.269,18.28,19.319,16.25,19.319 C14.22,19.319,14.22,16.269,16.25,16.269 Z M21.34,16.269 C23.37,16.269,23.37,19.319,21.34,19.319 C19.31,19.319,19.31,16.269,21.34,16.269 Z M26.43,16.269 C28.46,16.269,28.46,19.319,26.43,19.319 C24.4,19.319,24.4,16.269,26.43,16.269 Z M18.77,17.489 C18.8009,17.4871,18.8313,17.4979,18.854,17.519 C18.8766,17.5399,18.8896,17.5692,18.89,17.6 C18.8905,17.6447,18.8646,17.6854,18.824,17.704 C18.7602,17.7329,18.686,17.697,18.669,17.629 C18.652,17.5613,18.7004,17.495,18.77,17.49 Z M23.96,17.489 C23.9909,17.4871,24.0213,17.4979,24.044,17.519 C24.0666,17.5399,24.0796,17.5692,24.08,17.6 C24.0805,17.6447,24.0546,17.6854,24.014,17.704 C23.9502,17.7329,23.876,17.697,23.859,17.629 C23.842,17.5613,23.8904,17.495,23.96,17.49 Z M29.15,17.489 C29.1809,17.4871,29.2113,17.4979,29.234,17.519 C29.2566,17.5399,29.2696,17.5692,29.27,17.6 C29.2705,17.6447,29.2446,17.6854,29.204,17.704 C29.1402,17.7329,29.066,17.697,29.049,17.629 C29.032,17.5613,29.0804,17.495,29.15,17.49 Z M31.69,18.362 C33.72,18.362,33.72,21.412,31.69,21.412 C29.66,21.412,29.66,18.362,31.69,18.362 Z M18.79,18.614 C18.8209,18.6121,18.8513,18.6229,18.874,18.644 C18.8966,18.6649,18.9096,18.6942,18.91,18.725 C18.9105,18.7697,18.8846,18.8104,18.844,18.829 C18.7802,18.8579,18.706,18.822,18.689,18.754 C18.672,18.6863,18.7204,18.62,18.79,18.615 Z M23.98,18.614 C24.0109,18.6121,24.0413,18.6229,24.064,18.644 C24.0866,18.6649,24.0996,18.6942,24.1,18.725 C24.1005,18.7697,24.0746,18.8104,24.034,18.829 C23.9702,18.8579,23.896,18.822,23.879,18.754 C23.862,18.6863,23.9104,18.62,23.98,18.615 Z M29.17,18.614 C29.2009,18.6121,29.2313,18.6229,29.254,18.644 C29.2766,18.6649,29.2896,18.6942,29.29,18.725 C29.2905,18.7697,29.2646,18.8104,29.224,18.829 C29.1602,18.8579,29.086,18.822,29.069,18.754 C29.052,18.6863,29.1004,18.62,29.17,18.615 Z M18.77,19.734 C18.935,19.72,18.933,19.976,18.768,19.959 C18.632,19.945,18.633,19.746,18.77,19.734 Z M23.96,19.734 C24.125,19.72,24.123,19.976,23.958,19.959 C23.822,19.945,23.823,19.746,23.96,19.734 Z M29.15,19.734 C29.315,19.72,29.313,19.976,29.148,19.959 C29.012,19.945,29.013,19.746,29.15,19.734 Z M16.25,20.449 C18.28,20.449,18.28,23.499,16.25,23.499 C14.22,23.499,14.22,20.449,16.25,20.449 Z M21.34,20.449 C23.37,20.449,23.37,23.499,21.34,23.499 C19.31,23.499,19.31,20.449,21.34,20.449 Z M26.43,20.449 C28.46,20.449,28.46,23.499,26.43,23.499 C24.4,23.499,24.4,20.449,26.43,20.449 Z M18.77,21.989 C18.8009,21.9871,18.8313,21.9979,18.854,22.019 C18.8766,22.0399,18.8896,22.0692,18.89,22.1 C18.8905,22.1447,18.8646,22.1854,18.824,22.204 C18.7602,22.2329,18.686,22.197,18.669,22.129 C18.6512,22.0612,18.7,21.994,18.77,21.99 Z M23.96,21.989 C23.9909,21.9871,24.0213,21.9979,24.044,22.019 C24.0666,22.0399,24.0796,22.0692,24.08,22.1 C24.0805,22.1447,24.0546,22.1854,24.014,22.204 C23.9502,22.2329,23.876,22.197,23.859,22.129 C23.8412,22.0612,23.89,21.994,23.96,21.99 Z M29.15,21.989 C29.1809,21.9871,29.2113,21.9979,29.234,22.019 C29.2566,22.0399,29.2696,22.0692,29.27,22.1 C29.2705,22.1447,29.2446,22.1854,29.204,22.204 C29.1402,22.2329,29.066,22.197,29.049,22.129 C29.0312,22.0612,29.08,21.994,29.15,21.99 Z M31.69,22.546 C33.73,22.4857,33.81,25.556,31.767,25.596 C29.737,25.6454,29.657,22.606,31.689,22.546 Z M18.79,23.676 L18.81,23.676 C18.988,23.6776,18.693,23.965,18.696,23.787 C18.696,23.732,18.736,23.683,18.79,23.677 Z M23.98,23.676 L23.998,23.676 C24.1,23.6749,24.151,23.799,24.078,23.87 C24.0449,23.9023,23.9955,23.9114,23.953,23.893 C23.9107,23.875,23.8838,23.8329,23.885,23.787 C23.885,23.732,23.925,23.683,23.979,23.677 L23.98,23.677 Z M29.17,23.676 L29.191,23.676 C29.369,23.6776,29.074,23.965,29.077,23.787 C29.077,23.732,29.117,23.683,29.171,23.677 Z M18.77,24.238 L18.79,24.238 C18.976,24.2398,18.631,24.499,18.681,24.32 C18.6929,24.2781,18.728,24.2469,18.771,24.24 L18.771,24.238 Z M23.96,24.238 L23.978,24.238 C24.04,24.239,24.089,24.288,24.09,24.349 C24.0911,24.478,23.909,24.506,23.871,24.383 C23.858,24.3414,23.8705,24.296,23.903,24.267 C23.9186,24.2525,23.938,24.2428,23.959,24.239 L23.96,24.239 Z M29.15,24.238 L29.171,24.238 C29.357,24.2398,29.012,24.499,29.062,24.32 C29.0739,24.2781,29.109,24.2469,29.152,24.24 Z M16.25,24.638 C18.33,24.5846,18.33,27.738,16.25,27.678 C14.22,27.678,14.22,24.628,16.25,24.628 Z M21.34,24.638 C23.42,24.531,23.5,27.688,21.418,27.688 C19.388,27.7374,19.308,24.698,21.34,24.638 Z M26.43,24.638 C28.51,24.5846,28.51,27.738,26.43,27.678 C24.4,27.678,24.4,24.628,26.43,24.628 Z M31.68,26.728 C33.71,26.728,33.71,29.778,31.68,29.778 C29.65,29.778,29.65,26.728,31.68,26.728 Z M18.78,28.168 L18.8,28.168 C18.861,28.168,18.91,28.218,18.911,28.279 C18.8935,28.41,18.705,28.41,18.687,28.279 C18.6863,28.2243,18.726,28.177,18.78,28.169 Z M23.97,28.168 L23.988,28.168 C24.05,28.168,24.099,28.218,24.1,28.279 C24.0944,28.3369,24.0461,28.381,23.988,28.382 C23.9293,28.3822,23.88,28.3375,23.875,28.279 C23.875,28.224,23.915,28.175,23.969,28.169 L23.97,28.169 Z M29.16,28.168 L29.181,28.168 C29.242,28.168,29.291,28.218,29.292,28.279 C29.2841,28.3349,29.2364,28.3766,29.18,28.377 C29.1234,28.377,29.076,28.3351,29.068,28.279 C29.0673,28.2243,29.107,28.177,29.161,28.169 Z M18.76,28.728 C18.925,28.714,18.923,28.97,18.758,28.953 C18.622,28.939,18.623,28.74,18.76,28.728 Z M23.95,28.728 C23.9953,28.7283,24.036,28.756,24.053,28.798 C24.0703,28.8403,24.0604,28.8888,24.028,28.921 C23.9568,28.9919,23.836,28.9404,23.837,28.84 C23.837,28.7778,23.8878,28.727,23.95,28.728 Z M29.14,28.728 C29.1853,28.7283,29.226,28.756,29.243,28.798 C29.2603,28.8403,29.2504,28.8888,29.218,28.921 C29.1468,28.9919,29.026,28.9404,29.027,28.84 C29.027,28.7778,29.0778,28.727,29.14,28.728 Z M16.24,28.814 C18.27,28.814,18.27,31.864,16.24,31.864 C14.21,31.864,14.21,28.814,16.24,28.814 Z M21.33,28.814 C23.37,28.7593,23.44,31.814,21.408,31.864 C19.378,31.9134,19.298,28.874,21.33,28.814 Z M26.42,28.814 C28.45,28.814,28.45,31.864,26.42,31.864 C24.39,31.864,24.39,28.814,26.42,28.814 Z M31.67,30.904 C33.7,30.904,33.7,33.954,31.67,33.954 C29.64,33.954,29.64,30.904,31.67,30.904 Z M18.77,30.974 C18.8349,30.9706,18.89,31.022,18.89,31.087 C18.8897,31.262,18.595,30.985,18.77,30.974 Z M23.96,30.974 C24.0249,30.9706,24.08,31.022,24.08,31.087 C24.0797,31.262,23.785,30.985,23.96,30.974 Z M29.15,30.974 C29.2149,30.9706,29.27,31.022,29.27,31.087 C29.2697,31.262,28.975,30.985,29.15,30.974 Z M18.75,31.537 L18.758,31.537 C18.895,31.5499,18.895,31.749,18.758,31.762 C18.608,31.7673,18.6,31.542,18.75,31.537 Z M23.94,31.537 L23.948,31.537 C24.085,31.5499,24.085,31.749,23.948,31.762 C23.798,31.7673,23.79,31.542,23.94,31.537 Z M29.13,31.537 L29.138,31.537 C29.275,31.5499,29.275,31.749,29.138,31.762 C28.988,31.7673,28.98,31.542,29.13,31.537 Z M16.23,32.997 C18.26,32.997,18.26,36.047,16.23,36.047 C14.2,36.047,14.2,32.997,16.23,32.997 Z M21.32,32.997 C23.36,32.9423,23.43,35.997,21.398,36.047 C19.368,36.0964,19.288,33.057,21.32,32.997 Z M26.41,32.997 C28.44,32.997,28.44,36.047,26.41,36.047 C24.38,36.047,24.38,32.997,26.41,32.997 Z M18.76,33.223 C18.8401,33.2252,18.893,33.3071,18.862,33.381 C18.8449,33.4221,18.8045,33.4486,18.76,33.448 C18.6977,33.4503,18.646,33.4003,18.646,33.338 C18.646,33.276,18.697,33.223,18.76,33.223 Z M23.95,33.223 C24.0485,33.2266,24.096,33.345,24.028,33.416 C24.0075,33.4364,23.9799,33.4479,23.951,33.448 C23.8887,33.4503,23.837,33.4003,23.837,33.338 C23.837,33.276,23.887,33.223,23.95,33.223 Z M29.14,33.223 C29.2201,33.2252,29.273,33.3071,29.242,33.381 C29.2249,33.4221,29.1845,33.4486,29.14,33.448 C29.0777,33.4503,29.026,33.4003,29.026,33.338 C29.026,33.276,29.077,33.223,29.14,33.223 Z M18.74,33.786 L18.748,33.786 C18.8476,33.7893,18.895,33.911,18.823,33.98 C18.718,34.082,18.594,33.792,18.74,33.786 Z M23.93,33.786 L23.938,33.786 C24.0376,33.7893,24.085,33.911,24.013,33.98 C23.908,34.082,23.784,33.792,23.93,33.786 Z M29.12,33.786 L29.128,33.786 C29.2276,33.7893,29.275,33.911,29.203,33.98 C29.098,34.082,28.974,33.792,29.12,33.786 Z M31.66,35.086 C33.69,35.0867,33.69,38.136,31.659,38.136 C29.629,38.136,29.629,35.086,31.659,35.086 Z M18.76,35.468 C18.7909,35.4662,18.8212,35.477,18.844,35.498 C18.8663,35.5191,18.8793,35.5483,18.88,35.579 C18.8805,35.6237,18.8546,35.6644,18.814,35.683 C18.7502,35.7119,18.676,35.676,18.659,35.608 C18.642,35.5403,18.6904,35.474,18.76,35.469 Z M23.95,35.468 C23.9809,35.4662,24.0112,35.477,24.034,35.498 C24.0563,35.5191,24.0693,35.5483,24.07,35.579 C24.0705,35.6237,24.0446,35.6644,24.004,35.683 C23.9402,35.7119,23.866,35.676,23.849,35.608 C23.832,35.5403,23.8804,35.474,23.95,35.469 Z M29.14,35.468 C29.1709,35.4662,29.2012,35.477,29.224,35.498 C29.2463,35.5191,29.2593,35.5483,29.26,35.579 C29.2605,35.6237,29.2346,35.6644,29.194,35.683 C29.1302,35.7119,29.056,35.676,29.039,35.608 C29.022,35.5403,29.0704,35.474,29.14,35.469 Z M18.74,37.158 L18.76,37.158 C18.821,37.158,18.87,37.208,18.871,37.269 C18.8711,37.3648,18.759,37.416,18.686,37.354 S18.6464,37.173,18.741,37.158 Z M23.93,37.158 L23.948,37.158 C24.01,37.158,24.059,37.208,24.06,37.269 C24.0594,37.3364,23.9998,37.388,23.933,37.379 C23.811,37.3581,23.808,37.184,23.929,37.159 L23.93,37.159 Z M29.12,37.158 L29.141,37.158 C29.202,37.158,29.251,37.208,29.252,37.269 C29.2521,37.3648,29.14,37.416,29.067,37.354 S29.0274,37.173,29.122,37.158 L29.121,37.158 Z M16.22,37.179 C18.25,37.179,18.25,40.229,16.22,40.229 C14.19,40.229,14.19,37.179,16.22,37.179 Z M21.31,37.179 C23.34,37.179,23.34,40.229,21.31,40.229 C19.28,40.229,19.28,37.179,21.31,37.179 Z M26.4,37.179 C28.43,37.179,28.43,40.229,26.4,40.229 C24.37,40.229,24.37,37.179,26.4,37.179 Z M18.74,37.719 L18.748,37.719 C18.8476,37.7223,18.895,37.844,18.823,37.913 C18.718,38.015,18.594,37.725,18.74,37.719 Z M23.93,37.719 L23.938,37.719 C24.0376,37.7223,24.085,37.844,24.013,37.913 C23.908,38.015,23.784,37.725,23.93,37.719 Z M29.12,37.719 L29.128,37.719 C29.2276,37.7223,29.275,37.844,29.203,37.913 C29.098,38.015,28.974,37.725,29.12,37.719 Z M18.72,39.409 L18.728,39.409 C18.865,39.4219,18.865,39.621,18.728,39.634 C18.578,39.6393,18.57,39.414,18.72,39.409 Z M23.91,39.409 L23.918,39.409 C24.055,39.4219,24.055,39.621,23.918,39.634 C23.768,39.6393,23.76,39.414,23.91,39.409 Z M29.1,39.409 L29.108,39.409 C29.245,39.4219,29.245,39.621,29.108,39.634 C28.958,39.6393,28.95,39.414,29.1,39.409 Z M18.7,39.971 L18.708,39.971 C18.845,39.9839,18.845,40.183,18.708,40.196 C18.558,40.2013,18.55,39.976,18.7,39.971 Z M23.89,39.971 L23.898,39.971 C24.035,39.9839,24.035,40.183,23.898,40.196 C23.748,40.2013,23.74,39.976,23.89,39.971 Z M29.08,39.971 L29.088,39.971 C29.225,39.9839,29.225,40.183,29.088,40.196 C28.938,40.2013,28.93,39.976,29.08,39.971 Z" />
+</vector>