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

app/src/main/java/kr/co/zumo/app/lifeplus/view/Event.java

@@ -120,6 +120,7 @@ public class Event {
   public static final int ADDRESS = 92;
   public static final int SCROLL = 93;
   public static final int SORT = 94;
+  public static final int TUTORIAL = 95;
 
 
   @Retention(RetentionPolicy.SOURCE)
@@ -132,7 +133,7 @@ public class Event {
     ACTION_BAR_SEARCH, ACTION_BAR_MENU, ACTION_BAR_TITLE, FIRST_CATEGORY, SECOND_CATEGORY, THIRD_CATEGORY, FOURTH_CATEGORY, FIFTH_CATEGORY,
     SWITCH, BOOK_MARK_DEFAULT, BOOK_MARK_LIST, ADD, MY_COIN_MAIN, MY_PURCHASE_HISTORY, GUIDE, ADD_BUCKET, MY_MAIN_GUEST, COUPON_MALL, CATEGORY_CLICK,
     MY_FAQ, UPDATE, FILTER, CLOSE, HELP, CONTENTS, MORE, BANNER, RECOMMEND, KAKAO_TALK, FACE_BOOK, CODE_COPY, EVENT, TAG, BOOKMARK, ORDER, DEFAULT, COMPLETE_BUCKET,
-    LIKE, FRAGMENT_STACK_EMPTY, OVER_VIEW, SHARE, CALL_INFO, LINK, HOME_PAGE, INSTAGRAM, ADDRESS, SCROLL, SORT
+    LIKE, FRAGMENT_STACK_EMPTY, OVER_VIEW, SHARE, CALL_INFO, LINK, HOME_PAGE, INSTAGRAM, ADDRESS, SCROLL, SORT, TUTORIAL
   })
   public @interface ID {}
 

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

@@ -167,6 +167,13 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
         // TODO:  추후 구현 예정
         showErrorDialog(R.string.ready_comment);
         break;
+      case Event.TUTORIAL:
+        // TODO: 튜토리얼
+//        FrameLayout frameLayout = (FrameLayout) getActivity().getWindow().findViewById(android.R.id.content);
+//        LayoutInflater inflater = (LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+//        View view = inflater.inflate(R.layout.tutorial_listicle_cover, null);
+//        frameLayout.addView(view);
+        break;
       default:
         break;
     }

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

@@ -4,7 +4,7 @@
   <gradient
     android:angle="90"
     android:endColor="#00000000"
-    android:centerColor="#26000000"
-    android:startColor="#66000000"
+    android:centerColor="#05000000"
+    android:startColor="#1F000000"
     android:type="linear" />
 </shape>

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+  <size
+    android:width="15dp"
+    android:height="15dp"/>
+  <gradient
+    android:endColor="#00000000"
+    android:centerColor="#03000000"
+    android:startColor="#08000000"/>
+  <corners
+    android:bottomRightRadius="15dp"
+    android:topRightRadius="0dp"/>
+</shape>

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

@@ -0,0 +1,7 @@
+<vector android:height="59dp" android:viewportHeight="282"
+    android:viewportWidth="561" android:width="129dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M257.5,22l11,-22 11,22H526v214.02H11V22h246.5z"/>
+    <path android:fillColor="#FFF" android:fillType="evenOdd"
+        android:pathData="M13,24v210.02h511V24H278.264L268.5,4.472 258.736,24H13z"
+        android:strokeColor="#000" android:strokeLineJoin="miter" android:strokeWidth="4"/>
+</vector>

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

@@ -0,0 +1,7 @@
+<vector android:height="71dp" android:viewportHeight="282"
+    android:viewportWidth="725" android:width="181dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M99.5,260l11,22 11,-22l569.07,-0l0,-214L11,46L11,260l88.5,-0z"/>
+    <path android:fillColor="#FFF" android:fillType="evenOdd"
+        android:pathData="M13,258l0,-210l675.57,-0L688.57,258L120.265,258L110.5,277.528 100.736,258L13,258z"
+        android:strokeColor="#000" android:strokeLineJoin="round" android:strokeWidth="4"/>
+</vector>

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

@@ -20,4 +20,11 @@
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent"/>
+
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="138dp"
+    android:background="@drawable/card_dim_bottom_12"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent"/>
 </android.support.constraint.ConstraintLayout>

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

@@ -24,7 +24,7 @@
 
   <View
     android:layout_width="match_parent"
-    android:layout_height="226dp"
+    android:layout_height="235dp"
     android:background="@drawable/card_cover_dim_top"
     android:rotation="180"
     app:layout_constraintEnd_toEndOf="parent"
@@ -75,8 +75,16 @@
 
   <View
     android:layout_width="match_parent"
-    android:layout_height="72dp"
-    android:background="@drawable/card_dim_bottom_40"
+    android:layout_height="138dp"
+    android:background="@drawable/card_dim_bottom_12"
+    app:layout_constraintBottom_toBottomOf="parent"/>
+
+  <View
+    android:rotation="-180"
+    android:layout_width="166dp"
+    android:layout_height="162dp"
+    android:background="@drawable/card_dim_bottom_3"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintBottom_toBottomOf="parent"/>
 
   <TextView
@@ -86,7 +94,7 @@
     android:layout_marginEnd="25dp"
     android:layout_marginBottom="28dp"
     android:gravity="end"
-    android:lineSpacingExtra="3.5sp"
+    android:lineSpacingExtra="4sp"
     android:textColor="@color/CFFFFFF"
     android:textSize="12sp"
     android:textStyle="bold"

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

@@ -142,16 +142,14 @@
 
     </android.support.design.widget.CollapsingToolbarLayout>
 
-    <RelativeLayout
+    <android.support.constraint.ConstraintLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginStart="25dp"
       android:layout_marginTop="33dp"
       android:layout_marginEnd="25dp"
       android:layout_marginBottom="11dp"
-      android:background="@color/CFFFFFF"
-      app:layout_collapseMode="pin"
-      tools:background="@color/C888888">
+      app:layout_collapseMode="pin">
 
       <TextView
         android:layout_width="wrap_content"
@@ -160,51 +158,35 @@
         android:text="조회결과 5건"
         android:textColor="@color/C999999"
         android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         />
 
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/text_view_mark"
-        android:lineSpacingExtra="4sp"
-        android:text="2018.05.01"
-        android:textColor="@color/C999999"
-        android:textSize="12sp"
-        />
-
-      <TextView
-        android:id="@+id/text_view_mark"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
-        android:layout_toLeftOf="@+id/text_view_select_date2"
-        android:lineSpacingExtra="4sp"
-        android:text="~"
-        android:textColor="@color/C999999"
-        android:textSize="12sp"
-        />
 
       <TextView
         android:id="@+id/text_view_select_date2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="9dp"
-        android:layout_toLeftOf="@+id/image_view_filter"
+        android:layout_marginEnd="4dp"
         android:lineSpacingExtra="4sp"
-        android:text="2018.06.05"
+        android:text="2018.06.05 ~ 2018.06.05"
         android:textColor="@color/C999999"
         android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/image_view_filter"
+        app:layout_constraintTop_toTopOf="parent"
         />
 
       <ImageView
         android:id="@+id/image_view_filter"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
+        android:padding="5dp"
+        app:layout_constraintEnd_toEndOf="parent"
         app:srcCompat="@drawable/icon_filter"
         />
-    </RelativeLayout>
+    </android.support.constraint.ConstraintLayout>
   </android.support.design.widget.AppBarLayout>
 
 

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

@@ -5,6 +5,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent">
     <android.support.v7.widget.RecyclerView
+      android:descendantFocusability="blocksDescendants"
       android:id="@+id/recycler_view_main_banner_view"
       android:layout_width="match_parent"
       android:layout_height="match_parent"/>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                             android:layout_width="match_parent"
+                                             android:layout_height="match_parent">
+
+</android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                             android:layout_width="match_parent"
+                                             android:layout_height="match_parent">
+
+</android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="@color/C4D000000">
+
+  <ImageView
+    android:id="@+id/image_view_tutorial_share"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="67dp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:srcCompat="@drawable/ic_bubble_tutorial_share"
+    />
+
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:lineSpacingExtra="4sp"
+    android:textColor="@color/C000000"
+    android:textSize="12sp"
+    android:layout_marginTop="18dp"
+    android:layout_marginBottom="22dp"
+    app:layout_constraintBottom_toBottomOf="@+id/image_view_tutorial_share"
+    app:layout_constraintEnd_toEndOf="@+id/image_view_tutorial_share"
+    app:layout_constraintStart_toStartOf="@+id/image_view_tutorial_share"
+    app:layout_constraintTop_toTopOf="@+id/image_view_tutorial_share"
+    tools:text="전체 콘텐츠
+공유하고 싶다면 꾹!"
+    />
+
+  <ImageView
+    android:id="@+id/image_view_tutorial_tag"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="20dp"
+    android:layout_marginBottom="74dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:srcCompat="@drawable/ic_bubble_tutorial_tag"
+    />
+
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:lineSpacingExtra="4sp"
+    android:textColor="@color/C000000"
+    android:textSize="12sp"
+    app:layout_constraintBottom_toBottomOf="@+id/image_view_tutorial_tag"
+    app:layout_constraintEnd_toEndOf="@+id/image_view_tutorial_tag"
+    app:layout_constraintStart_toStartOf="@+id/image_view_tutorial_tag"
+    app:layout_constraintTop_toTopOf="@+id/image_view_tutorial_tag"
+    tools:text="태그를 누르면
+다른 콘텐츠를 확인 가능해요"
+    />
+</android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                             android:layout_width="match_parent"
+                                             android:layout_height="match_parent">
+
+</android.support.constraint.ConstraintLayout>

app/src/main/res/values/colors.xml

@@ -12,6 +12,7 @@
   <color name="C33FFFFFF">#33FFFFFF</color>
   <!--opacity 30%-->
   <color name="C4DFFFFFF">#4DFFFFFF</color>
+  <color name="C4D000000">#4D000000</color>
   <!--opacity 40%-->
   <color name="C66000000">#66000000</color>
   <color name="C66FFFFFF">#66FFFFFF</color>