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

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

@@ -11,7 +11,6 @@ import android.support.v7.widget.LinearSmoothScroller;
 import android.support.v7.widget.RecyclerView;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -32,7 +31,6 @@ import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.IndexScrollListener;
 import kr.co.zumo.app.lifeplus.view.custom.Tutorial;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
-import kr.co.zumo.app.lifeplus.view.screen.main.TouchEventWithDirection;
 
 /**
  * ContentsFragment
@@ -72,33 +70,6 @@ public class ContentsFragment extends FragmentBase<ContentsPresenter> implements
 
     snapHelper = new CustomPagerSnapHelper();
     snapHelper.attachToRecyclerView(recyclerViewContentsDetail);
-
-    TouchEventWithDirection touchEventWithDirection = new TouchEventWithDirection(100);
-
-    recyclerViewContentsDetail.addOnItemTouchListener(new RecyclerView.OnItemTouchListener() {
-      @Override
-      public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent motionEvent) {
-        if (null != layoutManager && layoutManager.findFirstVisibleItemPosition() == adapter.getItemCount() - 1) {
-          if (TouchEventWithDirection.DIRECTION_LEFT.equals(direction) && motionEvent.getAction() == MotionEvent.ACTION_UP) {
-            presenter.onEvent(new Event.Builder(Event.LAST).build());
-            direction = null;
-          }
-          else {
-            direction = touchEventWithDirection.getDirection(motionEvent);
-          }
-        }
-        return false;
-      }
-
-      @Override
-      public void onTouchEvent(RecyclerView rv, MotionEvent motionEvent) {
-      }
-
-      @Override
-      public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
-
-      }
-    });
   }
 
   @Override

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

@@ -186,11 +186,6 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
           view.showTutorialListicle();
         }
         break;
-      case Event.LAST:
-//        if (false == model.hasWithShown()) {
-        showLastPageToast();
-//        }
-        break;
       case Event.CLICK_HTML:
         // html 의 자바스크립트를 통해서 전달된 데이터
         HtmlBean htmlBean = event.fromJson(HtmlBean.class);
@@ -471,21 +466,4 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
     ContentsWebDeliveryBean contentsWebDeliveryBean = new ContentsWebDeliveryBean(model.getShareContents(), model.getSharePageIndex(), webUrl);
     model.setDeliveryPackaging(contentsWebDeliveryBean);
   }
-
-  private void showLastPageToast() {
-    int stringResource;
-
-    if (model.getContentsType().equals(ContentsItemBean.TYPE_LISTICLE)) {
-      stringResource = R.string.last_contents_listicle;
-    }
-    else {
-      stringResource = R.string.last_contents_card;
-    }
-
-    if (toast != null) {
-      toast.cancel();
-    }
-    toast = Toast.makeText(view.getActivity(), stringResource, Toast.LENGTH_SHORT);
-    toast.show();
-  }
 }

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

@@ -12,6 +12,8 @@ import java.util.List;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.EventPolicyBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventQuestionBean;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.CheckBoxAllDriver;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
@@ -61,9 +63,16 @@ class EventQuestionAgreeViewHolder extends EventQuestionViewHolder {
       View view = inflater.inflate(R.layout.setting_agree_check, null);
       CheckBox checkBox = view.findViewById(R.id.agree_check);
       checkBox.setButtonDrawable(getStateListDrawable());
-      checkBox.setText(policyBean.getTitle());
+      checkBox.setText(StringUtil.fromHtml(
+        new StringBuilder().append(policyBean.getMandatory().equals("Y") ? ResourceUtil.getString(R.string.agree_required) : ResourceUtil.getString(R.string.agree_option))
+          .append(" <font color='#999999'>").append(policyBean.getTitle()).append("</font>").toString()));
 
       checkBoxAllDriver.addChildBox(checkBox);
+
+      checkBox.setOnCheckedChangeListener((compoundButton, b) -> {
+        checkBoxAllDriver.check();
+      });
+
       // agree
       checkBox.setOnClickListener(v -> {
       });

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/introduction/guide/GuideAdapter.java

@@ -8,6 +8,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
@@ -97,7 +98,15 @@ public class GuideAdapter extends RecyclerView.Adapter<GuideView> {
 
   @Override
   public int getItemCount() {
-    return LIST_COUNT;
+    int count;
+
+    if (SuperModel.getInstance().isJoined()) {
+      count = LIST_COUNT - 1;
+    }
+    else {
+      count = LIST_COUNT;
+    }
+    return count;
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/introduction/guide/GuideLastViewHolder.java

@@ -15,7 +15,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.supervisor.AnimatorManager;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
@@ -73,7 +72,6 @@ public class GuideLastViewHolder extends GuideView {
 
   @Override
   public void init(IEventListener listener) {
-    if (SuperModel.getInstance().isJoined()) {whiteButtonWithArrowView.setVisibility(View.GONE);}
     whiteButtonWithArrowView.setOnClickListener(view -> {
       if (null != listener) {
         listener.onEvent(new Event.Builder(Event.JOINED).build());

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

@@ -11,7 +11,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="67dp"
-    android:layout_marginEnd="30dp"
+    android:layout_marginEnd="21dp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent">
 

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

@@ -56,7 +56,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="61dp"
-    android:layout_marginEnd="60dp"
+    android:layout_marginEnd="50dp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent">