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

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

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/CustomAlertDialog.java

@@ -30,7 +30,7 @@ public class CustomAlertDialog extends TextDialog {
     // Use the Builder class for convenient dialog construction
     AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
     builder.setMessage(text)
-      .setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
+      .setPositiveButton(R.string.member_confirm, new DialogInterface.OnClickListener() {
         public void onClick(DialogInterface dialog, int id) {
           if (null != getCustomListener()) {
             getCustomListener().onDialogResult(CustomAlertDialog.this, new Event.Builder(Event.CONFIRM).build());

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

@@ -29,6 +29,7 @@ import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.command.EmailSendingCommand;
 import kr.co.zumo.app.lifeplus.view.dialog.AppReviewDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.ShareDialog;
+import kr.co.zumo.app.lifeplus.view.dialog.CustomAlertDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
@@ -188,7 +189,12 @@ public class ContentsPresenter extends Presenter<ContentsModel, IContentsView> {
    * @param navigationBar
    */
   public void onNavigationClickLike(NavigationBar navigationBar) {
-    model.updateLiked();
+    if (model.isMember()) {
+      model.updateLiked();
+    }
+    else {
+      showPopupForGuest();
+    }
   }
 
   /**
@@ -197,7 +203,12 @@ public class ContentsPresenter extends Presenter<ContentsModel, IContentsView> {
    * @param navigationBar
    */
   public void onNavigationClickBookmark(NavigationBar navigationBar) {
-    model.updateBookmarked();
+    if (model.isMember()) {
+      model.updateBookmarked();
+    }
+    else {
+      showPopupForGuest();
+    }
   }
 
   /**
@@ -322,4 +333,28 @@ public class ContentsPresenter extends Presenter<ContentsModel, IContentsView> {
     toast.setView(view);
     toast.show();
   }
+
+  private void showPopupForGuest() {
+    // 비회원 가입 유도
+    new DialogBuilder<CustomAlertDialog, ICustomDialogListener>(getFragmentManager(), DialogID.ALERT)
+      .listener(new ICustomDialogListener<CustomAlertDialog>() {
+        @Override
+        public void onDialogResult(CustomAlertDialog dialog, Event event) {
+          if (event.getEventId() == Event.CONFIRM) {
+            dialog.dispose();
+            go(ScreenID.SIGN_UP_START);
+          }
+        }
+
+        @Override
+        public void onDialogCanceled(CustomAlertDialog dialog) {
+          dialog.dispose();
+        }
+      })
+      .attribute(dialog -> {
+        dialog.setText(ResourceUtil.getString(R.string.best_bucket_guest_guide));
+      })
+      .show();
+  }
+
 }

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

@@ -23,40 +23,49 @@
       android:scaleType="centerCrop"
       tools:src="@drawable/img_bestbucket_banner_1"/>
 
-    <ImageView
-      android:id="@+id/image_checker"
+    <android.support.constraint.ConstraintLayout
+      android:id="@+id/layout_select_bucket"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_centerVertical="true"
-      android:layout_marginTop="8dp"
-      android:layout_marginEnd="8dp"
-      app:layout_constraintEnd_toStartOf="@+id/text_view_select_bucket"
-      app:layout_constraintHorizontal_chainStyle="packed"
-      app:layout_constraintStart_toEndOf="@+id/image_background"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="@+id/text_view_select_bucket"
-      app:srcCompat="@drawable/icon_bucket_complete_white"/>
-
-    <TextView
-      android:id="@+id/text_view_select_bucket"
-      android:layout_width="190dp"
-      android:layout_height="wrap_content"
-      android:layout_centerInParent="true"
-      android:layout_marginTop="20dp"
-      android:layout_marginBottom="20dp"
-      android:ellipsize="end"
-      android:lineSpacingExtra="8sp"
-      android:maxLength="40"
-      android:maxLines="3"
-      android:textColor="@color/CFFFFFF"
-      android:textSize="21sp"
+      android:paddingStart="80dp"
+      android:paddingEnd="80dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintHorizontal_chainStyle="packed"
-      app:layout_constraintStart_toEndOf="@+id/image_checker"
-      app:layout_constraintTop_toTopOf="parent"
-      tools:text="OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"/>
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent">
 
+      <ImageView
+        android:id="@+id/image_checker"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toStartOf="@+id/text_view_select_bucket"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        android:layout_marginTop="10dp"
+        app:layout_constraintTop_toTopOf="@+id/text_view_select_bucket"
+        app:srcCompat="@drawable/icon_bucket_complete_white"
+        tools:visibility="visible"/>
+
+      <TextView
+        android:id="@+id/text_view_select_bucket"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_marginTop="20dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginBottom="20dp"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:lineSpacingExtra="8sp"
+        android:maxLength="40"
+        android:maxLines="3"
+        android:textColor="@color/CFFFFFF"
+        android:textSize="21dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toEndOf="@+id/image_checker"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"/>
+    </android.support.constraint.ConstraintLayout>
   </android.support.constraint.ConstraintLayout>
 
   <LinearLayout

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

@@ -4,17 +4,23 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical">
+  android:paddingTop="@dimen/action_bar_height"
+  android:orientation="vertical"
+ >
 
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/action_bar_height"
     android:orientation="vertical">
 
-    <RelativeLayout
+    <android.support.constraint.ConstraintLayout
+      android:id="@+id/first_layout"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content">
+      android:layout_height="wrap_content"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent">
 
       <android.support.v4.view.ViewPager
         android:id="@+id/view_pager_best_bucket_list"
@@ -25,20 +31,23 @@
         android:id="@+id/tab_layout_bucket_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/view_pager_best_bucket_list"
-        android:layout_alignParentStart="true"
-        android:layout_marginStart="0dp"
+        app:layout_constraintBottom_toBottomOf="@+id/view_pager_best_bucket_list"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:tabBackground="@drawable/tab_selector"
         app:tabGravity="center"
         app:tabIndicatorHeight="0dp"/>
-    </RelativeLayout>
+    </android.support.constraint.ConstraintLayout>
 
     <android.support.constraint.ConstraintLayout
+      android:id="@+id/second_layout"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="25dp"
       android:layout_marginTop="30dp"
-      android:orientation="vertical">
+      android:orientation="vertical"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/first_layout">
 
       <TextView
         android:layout_width="wrap_content"
@@ -51,12 +60,14 @@
     </android.support.constraint.ConstraintLayout>
 
     <android.support.constraint.ConstraintLayout
+      android:id="@+id/third_layout"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_gravity="center"
       android:layout_marginStart="25dp"
       android:layout_marginTop="3dp"
-      android:layout_marginEnd="25dp">
+      android:layout_marginEnd="25dp"
+      app:layout_constraintTop_toBottomOf="@+id/second_layout">
 
       <TextView
         android:layout_width="wrap_content"
@@ -89,22 +100,27 @@
         app:layout_constraintTop_toTopOf="parent"/>
     </android.support.constraint.ConstraintLayout>
 
-    <LinearLayout
+    <android.support.constraint.ConstraintLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_gravity="center"
       android:layout_marginStart="17dp"
       android:layout_marginTop="20dp"
       android:layout_marginEnd="17dp"
-      android:orientation="vertical">
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/third_layout"
+      >
 
       <android.support.v7.widget.RecyclerView
         android:id="@+id/recycler_view_my_bucket_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="30dp"
         android:layout_gravity="center">
       </android.support.v7.widget.RecyclerView>
 
-    </LinearLayout>
+    </android.support.constraint.ConstraintLayout>
   </LinearLayout>
 </android.support.v4.widget.NestedScrollView>

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

@@ -655,7 +655,7 @@
   <string name="app_join_recommend">\n회원가입하시면 특별한 혜택을 드립니다.</string>
   <string name="recommend_code_title">추천인코드</string>
 
-  <string name="best_bucket_guest_guide">서비스 이용을 위해서 Lifeplus 회원 확인이 필요합니다.</string>
+  <string name="best_bucket_guest_guide">서비스 이용을 위해서 Lifeplus app 회원 확인이 필요합니다.</string>
   <string name="best_bucket_delete_guide">선택된 버킷리스트가 삭제됩니다.</string>
 
   <string name="inside">실내</string>