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

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

@@ -1,9 +1,9 @@
 <vector android:height="17dp" android:viewportHeight="66"
-    android:viewportWidth="66" android:width="17dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:viewportWidth="67" android:width="17dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#00000000" android:fillType="nonZero"
-        android:pathData="M32.819,55.587c0.64,-0.534 1.352,-1.126 1.836,-1.55a74.34,74.34 0,0 0,6.357 -6.248c5.077,-5.654 8.321,-11.23 8.897,-16.237 0.06,-0.526 0.091,-1.043 0.091,-1.552 0,-10.008 -7.932,-18 -18,-18 -9.207,0 -17,8.136 -17,18 0,5.396 3.42,11.602 9.114,17.775a64.362,64.362 0,0 0,6.62 6.224,38.15 38.15,0 0,0 2.085,1.588z"
+        android:pathData="M33.715,54.654a49.35,49.35 0,0 0,1.975 -1.57,68.8 68.8,0 0,0 6.49,-6.174c5.666,-6.16 9.05,-12.264 9.05,-17.583 0,-9.813 -7.88,-17.789 -17.547,-17.789 -9.669,0 -17.548,7.976 -17.548,17.789 0,5.319 3.398,11.431 9.08,17.59a68.348,68.348 0,0 0,6.518 6.174,47.616 47.616,0 0,0 1.982,1.563z"
         android:strokeColor="#FFF" android:strokeWidth="4"/>
     <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M33,30m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
+        android:pathData="M27.741,29.697a5.997,5.941 0,1 0,11.994 0a5.997,5.941 0,1 0,-11.994 0z"
         android:strokeColor="#FFF" android:strokeWidth="4"/>
 </vector>

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

@@ -3,5 +3,5 @@
     <path android:fillColor="#00000000" android:fillType="evenOdd"
         android:pathData="M29,7l6,13 14,1c0.958,0.27 1.372,1.51 1,2l-11,9 2,15c1.047,0.585 -0.032,1.351 -1,1l-12,-7 -13,7c-0.968,0.349 -2.044,-0.418 -1,-1l2,-15 -11,-9c-0.371,-0.492 0.04,-1.733 1,-2l14,-1 6,-13c0.834,-1.23 2.167,-1.23 3,0z"
         android:strokeColor="#C5C5C5" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="3"/>
+        android:strokeLineJoin="round" android:strokeWidth="4"/>
 </vector>

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

@@ -1,6 +1,9 @@
 <vector android:height="14dp" android:viewportHeight="54"
     android:viewportWidth="54" android:width="14dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M6.087,49h42.825C47.928,37.84 38.797,29 28,29 16.384,29 7.078,37.721 6.087,49zM28,26c4.523,0 9,-4.477 9,-9 0,-6.243 -4.24,-11 -9,-11 -6.523,0 -11,4.477 -11,11 0,4.76 4.757,9 11,9z"
+        android:pathData="M6.087,49h42.825c-0.985,-11.16 -10.115,-20 -20.912,-20 -11.616,0 -20.922,8.721 -21.913,20z"
+        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M27,18m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
         android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
 </vector>

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

@@ -4,6 +4,6 @@
         android:pathData="M19,13L47,13A6,6 0,0 1,53 19L53,47A6,6 0,0 1,47 53L19,53A6,6 0,0 1,13 47L13,19A6,6 0,0 1,19 13z"
         android:strokeColor="#FFF" android:strokeWidth="4"/>
     <path android:fillColor="#00000000" android:fillType="nonZero"
-        android:pathData="M36.191,52.466l-0.734,0.577 -0.218,-0.217 0.254,-1.048h0.698v0.688zM36.191,48.899L42,24.95v-0.611c-3.245,0.185 -5.809,2.83 -5.809,6.054v18.507zM29.292,35.811h14.707"
+        android:pathData="M29.292,35.811h14.707M44,24.5h-2.406c-3.73,0.343 -5.594,2.677 -5.594,7L36,53"
         android:strokeColor="#FFF" android:strokeWidth="4"/>
 </vector>

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

@@ -1,10 +1,10 @@
 <vector android:height="17dp" android:viewportHeight="66"
-    android:viewportWidth="66" android:width="17dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:viewportWidth="67" android:width="17dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#00000000" android:fillType="nonZero"
-        android:pathData="M24.191,12.191L39.867,12.191A12,12 0,0 1,51.867 24.191L51.867,39.867A12,12 0,0 1,39.867 51.867L24.191,51.867A12,12 0,0 1,12.191 39.867L12.191,24.191A12,12 0,0 1,24.191 12.191z"
+        android:pathData="M25.191,12.191L40.867,12.191A12,12 0,0 1,52.867 24.191L52.867,39.867A12,12 0,0 1,40.867 51.867L25.191,51.867A12,12 0,0 1,13.191 39.867L13.191,24.191A12,12 0,0 1,25.191 12.191z"
         android:strokeColor="#FFF" android:strokeWidth="4"/>
     <path android:fillColor="#00000000" android:fillType="nonZero"
-        android:pathData="M32.029,32.029m-8.919,0a8.919,8.919 0,1 1,17.838 0a8.919,8.919 0,1 1,-17.838 0"
+        android:pathData="M33.029,32.029m-8.919,0a8.919,8.919 0,1 1,17.838 0a8.919,8.919 0,1 1,-17.838 0"
         android:strokeColor="#FFF" android:strokeWidth="4"/>
-    <path android:fillColor="#FFF" android:fillType="nonZero" android:pathData="M44,21m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"/>
+    <path android:fillColor="#FFF" android:fillType="nonZero" android:pathData="M45,21m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"/>
 </vector>

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

@@ -1,9 +1,9 @@
 <vector android:height="14dp" android:viewportHeight="54"
     android:viewportWidth="54" android:width="14dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M27.464,49.06C39.534,38.817 45.5,30.078 45.5,23c0,-10.018 -8.283,-18.5 -18.012,-18.5C16.924,4.5 8.5,12.842 8.5,23c0,7.062 6.274,15.807 18.964,26.06z"
-        android:strokeColor="#C5C5C5" android:strokeWidth="3"/>
+        android:pathData="M27.457,48.41C39.21,38.37 45,29.832 45,23c0,-9.744 -8.061,-18 -17.512,-18C17.199,5 9,13.119 9,23c0,6.811 6.09,15.358 18.457,25.41z"
+        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
     <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M27,22m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
-        android:strokeColor="#C5C5C5" android:strokeWidth="3"/>
+        android:pathData="M27,22m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
 </vector>

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

@@ -7,15 +7,17 @@
         android:pathData="M8,40L10,40A2,2 0,0 1,12 42L12,44A2,2 0,0 1,10 46L8,46A2,2 0,0 1,6 44L6,42A2,2 0,0 1,8 40z"
         android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
     <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M13.5,32L14.5,32A0.5,0.5 0,0 1,15 32.5L15,32.5A0.5,0.5 0,0 1,14.5 33L13.5,33A0.5,0.5 0,0 1,13 32.5L13,32.5A0.5,0.5 0,0 1,13.5 32z"
-        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
+        android:pathData="M13,31L15,31A0.5,0.5 0,0 1,15.5 31.5L15.5,31.5A0.5,0.5 0,0 1,15 32L13,32A0.5,0.5 0,0 1,12.5 31.5L12.5,31.5A0.5,0.5 0,0 1,13 31z"
+        android:strokeColor="#C5C5C5" android:strokeWidth="3"/>
     <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M39.5,32L40.5,32A0.5,0.5 0,0 1,41 32.5L41,32.5A0.5,0.5 0,0 1,40.5 33L39.5,33A0.5,0.5 0,0 1,39 32.5L39,32.5A0.5,0.5 0,0 1,39.5 32z"
-        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
+        android:pathData="M39,31L41,31A0.5,0.5 0,0 1,41.5 31.5L41.5,31.5A0.5,0.5 0,0 1,41 32L39,32A0.5,0.5 0,0 1,38.5 31.5L38.5,31.5A0.5,0.5 0,0 1,39 31z"
+        android:strokeColor="#C5C5C5" android:strokeWidth="3"/>
     <path android:fillColor="#00000000" android:fillType="evenOdd"
         android:pathData="M44,40L46,40A2,2 0,0 1,48 42L48,44A2,2 0,0 1,46 46L44,46A2,2 0,0 1,42 44L42,42A2,2 0,0 1,44 40z"
         android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
     <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M48,21.5v1.939h2V21l-2,0.5zM6,21.5v1.939H4V21l2,0.5zM5.5,24.5h43"
-        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
+        android:pathData="M47.5,21.11v2.829h3V20.36l-3,0.75zM6.5,21.11v2.829h-3V20.36l3,0.75z"
+        android:strokeColor="#C5C5C5" android:strokeWidth="3"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M5.5,24.5h43" android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
 </vector>

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

@@ -1,16 +1,9 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="17dp"
-        android:height="17dp"
-        android:viewportWidth="67"
-        android:viewportHeight="66">
-  <path
-    android:fillColor="#00000000"
-    android:fillType="evenOdd"
-    android:pathData="M13,24a1,1 0,0 0,-1 1v25a1,1 0,0 0,1 1h33a1,1 0,0 0,1 -1V25a1,1 0,0 0,-1 -1H13z"
-    android:strokeWidth="4"
-    android:strokeColor="#FFF"/>
-  <path
-    android:fillColor="#FFF"
-    android:fillType="nonZero"
-    android:pathData="M53,41V18H22v2h-4v-2c0,-2.399 1.587,-4 4,-4h31c2.413,0 4,1.601 4,4v23c0,2.399 -1.587,4 -4,4h-2v-4h2z"/>
+<vector android:height="17dp" android:viewportHeight="66"
+    android:viewportWidth="67" android:width="17dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M15.076,24.279L44.551,24.279A3,3 0,0 1,47.551 27.279L47.551,48.381A3,3 0,0 1,44.551 51.381L15.076,51.381A3,3 0,0 1,12.076 48.381L12.076,27.279A3,3 0,0 1,15.076 24.279z"
+        android:strokeColor="#FFF" android:strokeWidth="4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M20.5,20v-2.5c0,-1 0.667,-1.5 2,-1.5h32c1,-0.028 1.5,0.472 1.5,1.5v24c-0.074,1 -0.574,1.5 -1.5,1.5L52,43"
+        android:strokeColor="#FFF" android:strokeWidth="4"/>
 </vector>