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

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

@@ -4,14 +4,6 @@
         android:fillType="nonZero"
         android:pathData="M13.9565,20.3913L47.9574,20.3913L47.9574,13.4348L10.5106,13.4348C8.5718,13.4348 7,15.0065 7,16.9454L7,64.9241C7,66.863 8.5718,68.4348 10.5106,68.4348L58.4894,68.4348C60.4282,68.4348 62,66.863 62,64.9241L62,45.0305L55.0435,45.0305L55.0435,61.4783L13.9565,61.4783L13.9565,20.3913Z"
         android:strokeAlpha="0.5" android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillAlpha="0.5" android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M47.5,16.9348m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"
-        android:strokeAlpha="0.5" android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillAlpha="0.5" android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M58.5,44.9348m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"
-        android:strokeAlpha="0.5" android:strokeColor="#00000000" android:strokeWidth="1"/>
     <path android:fillAlpha="0.5" android:fillColor="#FFFFFF"
         android:fillType="nonZero"
         android:pathData="M36.193,43.52L65.4533,12.0657C66.7617,10.6592 68.9626,10.5797 70.3691,11.8881C71.7756,13.1965 71.8551,15.3973 70.5467,16.8039L38.9184,50.8039C37.6103,52.21 35.4103,52.2899 34.0036,50.9825L20.632,38.5538C19.2249,37.2459 19.1445,35.0451 20.4523,33.6381C21.7601,32.231 23.961,32.1506 25.368,33.4584L36.193,43.52Z"

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

@@ -1,18 +0,0 @@
-<vector android:height="19dp" android:viewportHeight="77"
-    android:viewportWidth="76" android:width="19dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.5" android:fillColor="#00000000"
-        android:fillType="nonZero"
-        android:pathData="M58.522,45.769L45.697,16.913L10.511,16.913a0.032,0.032 0,0 0,-0.033 0.033v47.978c0,0.018 0.015,0.033 0.033,0.033h47.978a0.032,0.032 0,0 0,0.033 -0.033L58.522,45.769z"
-        android:strokeAlpha="0.5" android:strokeColor="#FFF" android:strokeWidth="6.957"/>
-    <path android:fillAlpha="0.5" android:fillColor="#FFF"
-        android:fillType="nonZero"
-        android:pathData="M46.5,16.935m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0" android:strokeAlpha="0.5"/>
-    <path android:fillAlpha="0.5" android:fillColor="#FFF"
-        android:fillType="nonZero"
-        android:pathData="M58.5,44.935m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0" android:strokeAlpha="0.5"/>
-    <path android:fillAlpha="0.5" android:fillColor="#00000000"
-        android:fillType="nonZero"
-        android:pathData="M23,36.006L36.372,48.435 68,14.435"
-        android:strokeAlpha="0.5" android:strokeColor="#FFF"
-        android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="6.957"/>
-</vector>

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

@@ -1,12 +0,0 @@
-<vector android:height="19dp" android:viewportHeight="77"
-    android:viewportWidth="76" android:width="19dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000" android:fillType="nonZero"
-        android:pathData="M58.522,45.769L45.697,16.913L10.511,16.913a0.032,0.032 0,0 0,-0.033 0.033v47.978c0,0.018 0.015,0.033 0.033,0.033h47.978a0.032,0.032 0,0 0,0.033 -0.033L58.522,45.769z"
-        android:strokeColor="#FFF" android:strokeWidth="6.957"/>
-    <path android:fillColor="#FFF" android:fillType="nonZero" android:pathData="M46.5,16.935m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"/>
-    <path android:fillColor="#FFF" android:fillType="nonZero" android:pathData="M58.5,44.935m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"/>
-    <path android:fillColor="#00000000" android:fillType="nonZero"
-        android:pathData="M23,36.006L36.372,48.435 68,14.435"
-        android:strokeColor="#F27824" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="6.957"/>
-</vector>

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

@@ -4,14 +4,6 @@
         android:fillType="nonZero"
         android:pathData="M13.9565,19.9565L47.9574,19.9565L47.9574,13L10.5106,13C8.5718,13 7,14.5718 7,16.5106L7,64.4894C7,66.4282 8.5718,68 10.5106,68L58.4894,68C60.4282,68 62,66.4282 62,64.4894L62,44.5957L55.0435,44.5957L55.0435,61.0435L13.9565,61.0435L13.9565,19.9565Z"
         android:strokeAlpha="0.2" android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillAlpha="0.2" android:fillColor="#000000"
-        android:fillType="nonZero"
-        android:pathData="M47.5,16.5m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"
-        android:strokeAlpha="0.2" android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillAlpha="0.2" android:fillColor="#000000"
-        android:fillType="nonZero"
-        android:pathData="M58.5,44.5m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"
-        android:strokeAlpha="0.2" android:strokeColor="#00000000" android:strokeWidth="1"/>
     <path android:fillAlpha="0.2" android:fillColor="#000000"
         android:fillType="nonZero"
         android:pathData="M36.193,43.0852L65.4533,11.6309C66.7617,10.2244 68.9626,10.1449 70.3691,11.4533C71.7756,12.7617 71.8551,14.9626 70.5467,16.3691L38.9184,50.3691C37.6103,51.7752 35.4103,51.8551 34.0036,50.5477L20.632,38.119C19.2249,36.8112 19.1445,34.6103 20.4523,33.2033C21.7601,31.7962 23.961,31.7158 25.368,33.0236L36.193,43.0852Z"