Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

.idea/assetWizardSettings.xml

@@ -14,11 +14,11 @@
                         <option name="values">
                           <map>
                             <entry key="assetSourceType" value="FILE" />
-                            <entry key="height" value="43" />
-                            <entry key="outputName" value="icon_inqurebtn" />
+                            <entry key="height" value="57" />
+                            <entry key="outputName" value="icon_cancel_stop" />
                             <entry key="overrideSize" value="true" />
-                            <entry key="sourceFile" value="C:\Users\Hasemi\Downloads\icon_inqurebtn.svg" />
-                            <entry key="width" value="43" />
+                            <entry key="sourceFile" value="C:\Users\Hasemi\Downloads\icon_cancel_stop.svg" />
+                            <entry key="width" value="57" />
                           </map>
                         </option>
                       </PersistentState>

app/src/main/res/drawable/icon_cancel_stop.xml

@@ -0,0 +1,20 @@
+<vector android:height="57dp" android:viewportHeight="228"
+    android:viewportWidth="228" android:width="57dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillType="evenOdd" android:pathData="M70,45m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0">
+        <aapt:attr name="android:fillColor">
+            <gradient android:endX="7.4635" android:endY="-8.821243"
+                android:startX="121.849" android:startY="90.733696" android:type="linear">
+                <item android:color="#FFFF8D8D" android:offset="0"/>
+                <item android:color="#FFFF9423" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M49.385,105.538L179.385,105.538A6,6 0,0 1,185.385 111.538L185.385,201.538A6,6 0,0 1,179.385 207.538L49.385,207.538A6,6 0,0 1,43.385 201.538L43.385,111.538A6,6 0,0 1,49.385 105.538z"
+        android:strokeColor="#000" android:strokeWidth="6"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M78.102,65.386l76.263,38.437 0.123,-0.31 9.104,-42.835c3.158,-14.856 -6.325,-29.459 -21.181,-32.616l-26.11,-5.55C101.447,19.354 86.844,28.838 83.685,43.694l-0.03,0.124 -5.553,21.568z"
+        android:strokeColor="#000" android:strokeWidth="6"/>
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M111.385,156.026a9,9 0,1 1,6 0L117.385,176.538h-6v-20.512z"/>
+</vector>