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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/BucketListWithTagDetailPresenter.java

@@ -9,7 +9,6 @@ import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.DoubleChecker;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -83,14 +82,10 @@ public class BucketListWithTagDetailPresenter extends Presenter<BucketListWithTa
   protected void startInternalOnce() {
     if (null != this.model.getBucketWithTagBean()) {
       this.model.loadTag();
-      // TODO: 앱 배포시 튜토리얼 미표시
-      if (AppUtil.isDebug()) {
         if (false == SuperModel.getInstance().getPreferences().isTutorialBucketListDone()) {
           view.showTutorialBucketTag();
           SuperModel.getInstance().getPreferences().setTutorialBucketListDone(true);
         }
-      }
-
     }
     else {
       showErrorDialog("Invalid data: BucketMyBean");

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

@@ -54,6 +54,8 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
   protected TextView textEventCount;
   protected RecyclerView recyclerViewBookmark;
   protected ConstraintLayout layoutMyBucketListPreview;
+  protected ConstraintLayout layoutGuestCoinArea;
+  protected ConstraintLayout layoutMemberCoinArea;
   protected RecyclerView recyclerViewBucketListPreview;
 
   protected ConstraintLayout layoutMemberHeader;
@@ -97,6 +99,9 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     textPurchaseCount = findViewById(R.id.text_view_purchase_count);
     textEventCount = findViewById(R.id.text_view_event_count);
 
+    layoutGuestCoinArea = findViewById(R.id.guest_coin_area);
+    layoutMemberCoinArea = findViewById(R.id.member_coin_area);
+
     layoutMyBucketListPreview = findViewById(R.id.layout_my_bucket_list_preview);
     recyclerViewBucketListPreview = findViewById(R.id.recycler_view_bucket_preview);
     recyclerViewBucketListPreview.addItemDecoration(new RecyclerView.ItemDecoration() {
@@ -107,16 +112,14 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
       }
     });
 
-    findViewById(R.id.third_layout).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.BANNER).build());});
+    findViewById(R.id.image_view_benefit).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.BANNER).build());});
 
     textCoin = findViewById(R.id.text_view_my_coin);
-    textCoin.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
-    findViewById(R.id.image_view_my_coin_arrow).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
-    findViewById(R.id.image_view_coin).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
+    layoutMemberCoinArea.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
+    layoutMemberCoinArea.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
+    layoutMemberCoinArea.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
 
-    findViewById(R.id.text_view_guest_coin).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
-    findViewById(R.id.image_view_guest_coin).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
-    findViewById(R.id.image_view_my_guest_coin_arrow).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
+    layoutGuestCoinArea.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
 
 
     findViewById(R.id.text_view_purchase).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_PURCHASE_HISTORY).build());});

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

@@ -3,10 +3,6 @@
     android:height="10dp"
     android:viewportWidth="42"
     android:viewportHeight="42">
-  <path
-      android:pathData="M-1288,-1560H152v3178h-1440z"
-      android:fillColor="#FFF"
-      android:fillType="evenOdd"/>
   <path
       android:pathData="M24,8l14,12.48L24,34"
       android:strokeWidth="3"

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

@@ -48,7 +48,6 @@
       android:layout_marginTop="16dp"
       android:ellipsize="end"
       android:lineSpacingExtra="4sp"
-      android:maxLength="25"
       android:maxLines="2"
       android:textColor="@color/C000000"
       android:textSize="14sp"
@@ -60,7 +59,7 @@
       app:layout_constraintVertical_chainStyle="packed"
       app:layout_goneMarginBottom="10dp"
       app:layout_goneMarginTop="27dp"
-      tools:text="@string/book_mark_default_text2"
+      tools:text="연말에도 따스하게 12월 1주 넷플릭스 신작 7연말에도 따스하게 12월 1주 넷플릭스 신작 7"
       />
 
     <TextView
@@ -72,7 +71,7 @@
       android:layout_marginBottom="7dp"
       android:ellipsize="end"
       android:lineSpacingExtra="3.5sp"
-      android:maxLines="1"
+      android:singleLine="true"
       android:textColor="@color/C666666"
       android:textSize="12sp"
       app:layout_constrainedWidth="true"
@@ -81,7 +80,7 @@
       app:layout_constraintStart_toEndOf="@+id/image_view_book_mark"
       app:layout_constraintTop_toBottomOf="@id/text_view_book_mark_title"
       app:layout_constraintVertical_chainStyle="packed"
-      tools:text="한가위 송편빚기 교실dddd"
+      tools:text="연말에도 따스하게 12월 1주 넷플릭스 신작 7"
       tools:visibility="visible"
       />
 

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

@@ -3,7 +3,7 @@
   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="wrap_content"
+  android:layout_width="133dp"
   android:layout_height="wrap_content">
 
   <ImageView
@@ -40,14 +40,13 @@
 
   <CheckBox
     android:id="@+id/check_box"
-    android:layout_width="0dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="5dp"
     android:layout_marginTop="6dp"
     android:layout_marginEnd="5dp"
     android:background="@null"
     android:button="@null"
-    android:textAlignment="textStart"
     android:drawableLeft="@drawable/radio_selector"
     android:drawablePadding="8dp"
     android:includeFontPadding="false"
@@ -61,7 +60,7 @@
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/image_view"
-    tools:text="김포"
+    tools:text="김포김포김포김포김포김포"
     />
 
   <TextView

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

@@ -26,49 +26,55 @@
       app:layout_constraintTop_toTopOf="parent"
       tools:visibility="visible">
 
-      <TextView
-        android:id="@+id/text_view_my_coin"
+      <android.support.constraint.ConstraintLayout
+        android:id="@+id/member_coin_area"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
-        android:includeFontPadding="false"
-        android:lineSpacingExtra="0dp"
-        android:textColor="@color/C000000"
-        android:textSize="21sp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@string/my_coin_detail"/>
+        app:layout_constraintTop_toTopOf="parent">
 
-      <ImageView
-        android:id="@+id/image_view_coin"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?android:attr/selectableItemBackground"
-        android:paddingStart="3dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
-        app:layout_constraintBottom_toBottomOf="@+id/text_view_my_coin"
-        app:layout_constraintEnd_toStartOf="@+id/image_view_my_coin_arrow"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toEndOf="@+id/text_view_my_coin"
-        app:layout_constraintTop_toTopOf="@+id/text_view_my_coin"
-        app:srcCompat="@drawable/icon_coin"/>
+        <TextView
+          android:id="@+id/text_view_my_coin"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:includeFontPadding="false"
+          android:lineSpacingExtra="0dp"
+          android:textColor="@color/C000000"
+          android:textSize="21sp"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintHorizontal_chainStyle="packed"
+          app:layout_constraintTop_toTopOf="parent"
+          tools:text="@string/my_coin_detail"/>
 
-      <ImageView
-        android:id="@+id/image_view_my_coin_arrow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?android:attr/selectableItemBackground"
-        android:paddingTop="10dp"
-        android:paddingEnd="3dp"
-        android:paddingBottom="10dp"
-        app:layout_constraintBottom_toBottomOf="@+id/image_view_coin"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/image_view_coin"
-        app:layout_constraintTop_toTopOf="@+id/image_view_coin"
-        app:srcCompat="@drawable/icon_detail_arrow"/>
+        <ImageView
+          android:id="@+id/image_view_coin"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:paddingStart="3dp"
+          android:paddingTop="10dp"
+          android:paddingBottom="10dp"
+          app:layout_constraintBottom_toBottomOf="@+id/text_view_my_coin"
+          app:layout_constraintEnd_toStartOf="@+id/image_view_my_coin_arrow"
+          app:layout_constraintHorizontal_chainStyle="packed"
+          app:layout_constraintStart_toEndOf="@+id/text_view_my_coin"
+          app:layout_constraintTop_toTopOf="@+id/text_view_my_coin"
+          app:srcCompat="@drawable/icon_coin"/>
+
+        <ImageView
+          android:id="@+id/image_view_my_coin_arrow"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:paddingTop="10dp"
+          android:paddingEnd="3dp"
+          android:paddingBottom="10dp"
+          app:layout_constraintBottom_toBottomOf="@+id/image_view_coin"
+          app:layout_constraintHorizontal_bias="0.5"
+          app:layout_constraintStart_toEndOf="@+id/image_view_coin"
+          app:layout_constraintTop_toTopOf="@+id/image_view_coin"
+          app:srcCompat="@drawable/icon_detail_arrow"/>
+      </android.support.constraint.ConstraintLayout>
 
       <android.support.constraint.ConstraintLayout
         android:id="@+id/first_layout2"
@@ -77,7 +83,7 @@
         android:layout_marginTop="23dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_my_coin">
+        app:layout_constraintTop_toBottomOf="@+id/member_coin_area">
 
         <TextView
           android:id="@+id/text_view_coupon"
@@ -217,50 +223,56 @@
       app:layout_constraintTop_toTopOf="parent"
       tools:visibility="visible">
 
-      <TextView
-        android:id="@+id/text_view_guest_coin"
+      <android.support.constraint.ConstraintLayout
+        android:id="@+id/guest_coin_area"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="25dp"
         android:layout_marginTop="18dp"
         android:background="?android:attr/selectableItemBackground"
-        android:includeFontPadding="false"
-        android:lineSpacingExtra="8sp"
-        android:textColor="@color/C000000"
-        android:textSize="21sp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@string/my_coin_detail"/>
+        app:layout_constraintTop_toTopOf="parent">
 
-      <ImageView
-        android:id="@+id/image_view_guest_coin"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:paddingStart="3dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
-        android:scaleType="fitXY"
-        app:layout_constraintStart_toEndOf="@id/text_view_guest_coin"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/icon_coin"/>
+        <TextView
+          android:id="@+id/text_view_guest_coin"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:includeFontPadding="false"
+          android:lineSpacingExtra="8sp"
+          android:textColor="@color/C000000"
+          android:textSize="21sp"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent"
+          tools:text="@string/my_coin_detail"/>
 
-      <ImageView
-        android:id="@+id/image_view_my_guest_coin_arrow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="17dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:paddingStart="3dp"
-        android:paddingTop="10dp"
-        android:paddingEnd="3dp"
-        android:paddingBottom="10dp"
-        android:scaleType="fitXY"
-        app:layout_constraintStart_toEndOf="@id/image_view_guest_coin"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/icon_detail_arrow"/>
+        <ImageView
+          android:id="@+id/image_view_guest_coin"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:paddingStart="3dp"
+          android:paddingTop="10dp"
+          android:paddingBottom="10dp"
+          android:scaleType="fitXY"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintStart_toEndOf="@id/text_view_guest_coin"
+          app:layout_constraintTop_toTopOf="parent"
+          app:srcCompat="@drawable/icon_coin"/>
 
+        <ImageView
+          android:id="@+id/image_view_my_guest_coin_arrow"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:paddingTop="10dp"
+          android:paddingEnd="3dp"
+          android:paddingBottom="10dp"
+          android:scaleType="fitXY"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintStart_toEndOf="@id/image_view_guest_coin"
+          app:layout_constraintTop_toTopOf="parent"
+          app:srcCompat="@drawable/icon_detail_arrow"/>
+
+      </android.support.constraint.ConstraintLayout>
 
       <TextView
         android:id="@+id/text_view_user_confirm"