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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainCategoryContentsImageView.java

@@ -375,7 +375,7 @@ public class MainCategoryContentsImageView extends MainCategoryContentsView {
           /*
           스페셜 최우선, 나머지는 중복되지 않음.
            */
-          textFlag.setVisibility(View.VISIBLE);
+          textFlag.setAlpha(1f);
           if (APIData.isTrue(bean.getFlagSpecial())) {
             textFlag.setText(R.string.main_flag_special);
           }
@@ -386,7 +386,7 @@ public class MainCategoryContentsImageView extends MainCategoryContentsView {
             textFlag.setText(R.string.main_flag_get);
           }
           else {
-            textFlag.setVisibility(View.GONE);
+            textFlag.setAlpha(0f);
           }
 
           return false;

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

@@ -1,15 +1,15 @@
 <vector android:height="66dp" android:viewportHeight="264"
     android:viewportWidth="265" android:width="66dp"
     xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillType="evenOdd" android:pathData="M64,65m-52,0a52,52 0,1 1,104 0a52,52 0,1 1,-104 0">
+    <path android:fillType="evenOdd" android:pathData="M65,65m-52,0a52,52 0,1 1,104 0a52,52 0,1 1,-104 0">
         <aapt:attr name="android:fillColor">
-            <gradient android:endX="-8.2644" android:endY="3.80432"
-                android:startX="123.9144" android:startY="117" android:type="linear">
-                <item android:color="#FFFF8D8D" android:offset="0"/>
-                <item android:color="#FFFF9423" android:offset="1"/>
+            <gradient android:endX="-7.2644" android:endY="3.80432"
+                android:startX="124.9144" android:startY="117" android:type="linear">
+                <item android:color="#FFE25163" android:offset="0"/>
+                <item android:color="#FFEB652B" android:offset="1"/>
             </gradient>
         </aapt:attr>
     </path>
-    <path android:fillColor="#000" android:fillType="nonZero" android:pathData="M200,217c-17.807,16.174 -41.256,26 -67,26 -54.676,0 -99,-44.324 -99,-99s44.324,-99 99,-99 99,44.324 99,99c0,12.431 -2.291,24.327 -6,35l-7,-2c3.997,-10.57 6.053,-21.638 6,-33 0.053,-50.84 -41.16,-92.053 -92,-92 -50.84,-0.053 -92.053,41.16 -92,92 -0.053,50.84 41.16,92.053 92,92 23.316,0.053 45.256,-8.64 62,-24l5,5z"/>
-    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M131,106h7v53h-7L131,106zM131,172h7v17h-7v-17z"/>
+    <path android:fillColor="#000" android:fillType="nonZero" android:pathData="M201,217c-17.807,16.174 -41.256,26 -67,26 -54.676,0 -99,-44.324 -99,-99s44.324,-99 99,-99 99,44.324 99,99c0,12.431 -2.291,24.327 -6,35l-7,-2c3.997,-10.57 6.053,-21.638 6,-33 0.053,-50.84 -41.16,-92.053 -92,-92 -50.84,-0.053 -92.053,41.16 -92,92 -0.053,50.84 41.16,92.053 92,92 23.316,0.053 45.256,-8.64 62,-24l5,5z"/>
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M132,106h7v53h-7L132,106zM132,172h7v17h-7v-17z"/>
 </vector>

app/src/main/res/layout/main_contents_category_image.xml

@@ -38,6 +38,7 @@
     android:layout_width="wrap_content"
     android:layout_height="38dp"
     android:layout_marginStart="12dp"
+    android:alpha="0"
     android:background="@color/CFF0053"
     android:gravity="center"
     android:minWidth="38dp"