[컨텐츠][New] 페이지 변경 반응 적용 중

app/src/main/java/kr/co/zumo/app/lifeplus/helper/ActionBarHelper.java

@@ -189,6 +189,15 @@ public class ActionBarHelper extends Helper {
   public void setCategory(int categoryIndex) {
     setFocusCategoryAt(categoryIndex);
   }
+
+  /**
+   * dotdotdot 아이콘 표시
+   *
+   * @param isVisible
+   */
+  public void setVisibleDotDotDot(boolean isVisible) {
+    navigationBar.setVisibleDotDotDot(isVisible);
+  }
   /***********************************
    * private
    ***********************************/

app/src/main/java/kr/co/zumo/app/lifeplus/helper/NavigationBar.java

@@ -466,6 +466,15 @@ public class NavigationBar {
     actionBarTitle.setText(title);
   }
 
+  /**
+   * dotdotdot 아이콘 표시
+   *
+   * @param isVisible
+   */
+  public void setVisibleDotDotDot(boolean isVisible) {
+    setDotDotDotVisible(isVisible);
+  }
+
   /***********************************
    * Builder
    ***********************************/

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

@@ -194,14 +194,14 @@ public abstract class ContentsBasePresenter<M extends ContentsModel, V extends I
         }
       })
       .attribute(dialog -> {
-        dialog.setDialogType(ShareDialog.TYPE_PAGE_CURRENT);
+        dialog.setDialogType(model.getShareDialogType());
       })
       .show();
   }
 
   protected void sendKakaoLink() {
     share = new ShareKakaoTalk(view.getActivity());
-    share.shareContents(model.getContentsBean().toJson(), new IShareListener() {
+    share.shareContents(model.getKakaoTalkShareData(), new IShareListener() {
       @Override
       public void onSuccess(String result) {
       }
@@ -220,7 +220,7 @@ public abstract class ContentsBasePresenter<M extends ContentsModel, V extends I
 
   protected void sendFaceBook() {
     share = new ShareFacebook(view.getActivity(), getHelper(FacebookHelper.class).getCallbackManager());
-    share.shareContents(model.getContentsBean().getContentsUrlWithParamForShare(), new IShareListener() {
+    share.shareContents(model.getFacebookShareData(), new IShareListener() {
       @Override
       public void onSuccess(String result) {
         showToast("", ResourceUtil.getString(R.string.share_completed_message), 1);
@@ -236,7 +236,7 @@ public abstract class ContentsBasePresenter<M extends ContentsModel, V extends I
 
   protected void sendClipBoardCopy() {
     share = new ShareClipBoard(view.getActivity());
-    share.shareContents(model.getContentsBean().getContentsUrlWithParamForShare(), new IShareListener() {
+    share.shareContents(model.getUrlCopyShareData(), new IShareListener() {
       @Override
       public void onSuccess(String result) {
         showToast("", ResourceUtil.getString(R.string.url_copy_message), 1);
@@ -252,7 +252,7 @@ public abstract class ContentsBasePresenter<M extends ContentsModel, V extends I
 
   protected void sendEmail() {
     String subject = ResourceUtil.getString(R.string.share_title, model.getContentsBean().getTitle());
-    String contents = ResourceUtil.getString(R.string.share_current_page_contents, model.getContentsBean().getTitle(), model.getContentsBean().getContentsUrl());
+    String contents = model.getEmailShareData();
     onCommand(new EmailSendingCommand("", subject, contents));
   }
 

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

@@ -7,7 +7,10 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.PagerSnapHelper;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.SnapHelper;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -49,6 +52,8 @@ public class ContentsDetailFragment extends FragmentBase<ContentsDetailPresenter
     recyclerViewContentsDetail = findViewById(R.id.recycler_view_contents_detail);
     SnapHelper snapHelper = new PagerSnapHelper();
     snapHelper.attachToRecyclerView(recyclerViewContentsDetail);
+
+    recyclerViewContentsDetail.addOnScrollListener(scrollEventListener);
   }
 
   @Override
@@ -64,6 +69,7 @@ public class ContentsDetailFragment extends FragmentBase<ContentsDetailPresenter
       .transparent()
       .show();
     this.actionBarHelper = actionBarHelper;
+
   }
 
   @Override
@@ -74,7 +80,7 @@ public class ContentsDetailFragment extends FragmentBase<ContentsDetailPresenter
 
   @Override
   protected void onAfterDestroyView() {
-
+    recyclerViewContentsDetail.removeOnScrollListener(scrollEventListener);
   }
 
   @Override
@@ -99,9 +105,7 @@ public class ContentsDetailFragment extends FragmentBase<ContentsDetailPresenter
   }
 
   @Override
-  public void render(String url) {
-
-  }
+  public void render(String url) {}
 
   @Override
   public void setLiked(boolean isChecked) {
@@ -113,6 +117,11 @@ public class ContentsDetailFragment extends FragmentBase<ContentsDetailPresenter
     actionBarHelper.setBookmarked(isChecked);
   }
 
+  @Override
+  public void setVisibleDotDotDot(boolean isVisible) {
+    actionBarHelper.setVisibleDotDotDot(isVisible);
+  }
+
   @Override
   public void draw(ContentsDetailListBean contentsDetailListBean) {
     List<ContentsDetailBean> contentsDetailBeans = contentsDetailListBean.getItemDetailList();
@@ -128,4 +137,22 @@ public class ContentsDetailFragment extends FragmentBase<ContentsDetailPresenter
     recyclerViewContentsDetail.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false));
     recyclerViewContentsDetail.setAdapter(adapter);
   }
+
+  private int currentPageIndex = 0;
+  private RecyclerView.OnScrollListener scrollEventListener = new RecyclerView.OnScrollListener() {
+    @Override
+    public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+      int index = ((LinearLayoutManager) recyclerView.getLayoutManager()).findFirstVisibleItemPosition();
+      if (currentPageIndex != index) {
+        currentPageIndex = index;
+        Log.w("APP# ContentsDetailFragment | onScrolled", "|" + "current index ===> " + index);
+
+        /**
+         * 액션 바
+         */
+
+        presenter.onChangedPageIndex(currentPageIndex);
+      }
+    }
+  };
 }

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

@@ -2,13 +2,19 @@ package kr.co.zumo.app.lifeplus.view.screen.contents;
 
 import android.util.Log;
 
+import java.util.List;
+
 import io.reactivex.disposables.Disposable;
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailListBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.StringRequestBean;
 import kr.co.zumo.app.lifeplus.model.module.APIContentsDetailModule;
 import kr.co.zumo.app.lifeplus.model.module.IAPIModuleListener;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.dialog.ShareDialog;
 
 /**
  * ContentsDetailModel
@@ -25,6 +31,52 @@ public class ContentsDetailModel extends ContentsModel {
   private Disposable disposableDetail;
   private ContentsDetailListBean contentsDetailListBean;
 
+  private int currentPageIndex = 0;
+
+  @Override
+  public int getShareDialogType() {
+    /**
+     * 카드 형은 항상 전체 공유, 그외는 페이지 분기
+     */
+    if (ContentsDetailBean.TYPE_CARD.equals(getContentsType())) {
+      return ShareDialog.TYPE_PAGE_TOTAL;
+    }
+    else {
+      return currentPageIndex == 0 ? ShareDialog.TYPE_PAGE_TOTAL : ShareDialog.TYPE_PAGE_CURRENT;
+    }
+  }
+
+  @Override
+  public String getContentsType() {
+    if (null != contentsDetailListBean && null != contentsDetailListBean.getItemDetailList()) {
+      List<ContentsDetailBean> list = contentsDetailListBean.getItemDetailList();
+      if (list.size() > 0) {
+        return list.get(0).getListType();
+      }
+    }
+    return ContentsDetailBean.TYPE_CARD;
+  }
+
+  @Override
+  public String getKakaoTalkShareData() {
+    return getContentsBean().toJson();
+  }
+
+  @Override
+  public String getFacebookShareData() {
+    return getContentsBean().getContentsUrlWithParamForShare();
+  }
+
+  @Override
+  public String getEmailShareData() {
+    return ResourceUtil.getString(R.string.share_current_page_contents, getContentsBean().getTitle(), getContentsBean().getContentsUrl());
+  }
+
+  @Override
+  public String getUrlCopyShareData() {
+    return getContentsBean().getContentsUrlWithParamForShare();
+  }
+
   @Override
   protected void stopLoadingInternal() {
 
@@ -62,4 +114,12 @@ public class ContentsDetailModel extends ContentsModel {
       }
     });
   }
+
+  public int getCurrentPageIndex() {
+    return currentPageIndex;
+  }
+
+  public void setCurrentPageIndex(int currentPageIndex) {
+    this.currentPageIndex = currentPageIndex;
+  }
 }

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

@@ -8,7 +8,6 @@ import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.DoubleChecker;
 import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.dialog.AppReviewDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.ConfirmDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
@@ -105,36 +104,41 @@ public class ContentsDetailPresenter extends ContentsBasePresenter<ContentsDetai
     view.setLiked(model.isLiked());
     view.setBookmarked(model.isBookmarked());
 
+    // todo 첫 페이지가 아닐 수도 있음
+    // -> 공유/북마크(페이지 단위)로 진입
+    view.setVisibleDotDotDot(false);
+
     /**
      * fixme 조건 변경 -> 5회 이상 진입 + 마지막 페이지 일 경우.
+     * 12/5 오픈에서는 제외
      */
-    int count = model.getCountForReview();
-    if (count < 100) {
-      ++count;
-      model.setCountForReview(count);
-      if (count == 3) {
-        model.setCountForReview(100);
-        reviewDialog = new DialogBuilder<AppReviewDialog, ICustomDialogListener>(getFragmentManager(), DialogID.APP_REVIEW)
-          .listener(new ICustomDialogListener<AppReviewDialog>() {
-            @Override
-            public void onDialogResult(AppReviewDialog dialog, Event event) {
-              switch (event.getEventId()) {
-                case Event.ADD:
-                  view.goGooglePlay();
-                  break;
-                default:
-                  break;
-              }
-            }
-
-            @Override
-            public void onDialogCanceled(AppReviewDialog dialog) {
-              dialog.dispose();
-            }
-          })
-          .show();
-      }
-    }
+//    int count = model.getCountForReview();
+//    if (count < 100) {
+//      ++count;
+//      model.setCountForReview(count);
+//      if (count == 3) {
+//        model.setCountForReview(100);
+//        reviewDialog = new DialogBuilder<AppReviewDialog, ICustomDialogListener>(getFragmentManager(), DialogID.APP_REVIEW)
+//          .listener(new ICustomDialogListener<AppReviewDialog>() {
+//            @Override
+//            public void onDialogResult(AppReviewDialog dialog, Event event) {
+//              switch (event.getEventId()) {
+//                case Event.ADD:
+//                  view.goGooglePlay();
+//                  break;
+//                default:
+//                  break;
+//              }
+//            }
+//
+//            @Override
+//            public void onDialogCanceled(AppReviewDialog dialog) {
+//              dialog.dispose();
+//            }
+//          })
+//          .show();
+//      }
+//    }
 
   }
 
@@ -252,4 +256,19 @@ public class ContentsDetailPresenter extends ContentsBasePresenter<ContentsDetai
       .show();
   }
 
+  /**
+   * 페이지가 변경되었을 때 호출
+   *
+   * @param currentIndex
+   */
+  public void onChangedPageIndex(int currentIndex) {
+    model.setCurrentPageIndex(currentIndex);
+
+    /**
+     * 0 보다 크면 전체보기 버튼 노출
+     */
+    view.setVisibleDotDotDot(currentIndex > 0);
+
+  }
+
 }

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

@@ -32,7 +32,7 @@ import kr.co.zumo.app.lifeplus.view.screen.my.bookmark.BookmarkModelHelper;
  * @history 민효동   [2018. 11. 6.]   [최초 작성]
  * @since 2018. 11. 6.
  */
-public class ContentsModel extends Model {
+public abstract class ContentsModel extends Model {
 
   private Disposable disposableLiked;
   private Disposable disposableBookmarked;
@@ -80,6 +80,25 @@ public class ContentsModel extends Model {
 
   }
 
+  /**
+   * 컨텐츠 타입 + 페이지에 따른 공유 타입 반환
+   *
+   * @return
+   */
+  public abstract int getShareDialogType();
+
+  /**
+   * 컨텐츠 타입
+   *
+   * @return
+   */
+  public abstract String getContentsType();
+
+  public abstract String getKakaoTalkShareData();
+  public abstract String getFacebookShareData();
+  public abstract String getEmailShareData();
+  public abstract String getUrlCopyShareData();
+
   /**
    * 리뷰 다이얼로그를 표시하기 위한 카운트
    *

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

@@ -3,12 +3,15 @@ package kr.co.zumo.app.lifeplus.view.screen.contents;
 import java.util.List;
 
 import io.reactivex.disposables.Disposable;
+import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.StringRequestBean;
 import kr.co.zumo.app.lifeplus.model.module.APIContentsDetailModule;
 import kr.co.zumo.app.lifeplus.model.module.IAPIModuleListener;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.dialog.ShareDialog;
 
 /**
  * ContentsOverviewModel
@@ -28,6 +31,42 @@ public class ContentsOverviewModel extends ContentsModel {
     return contentsDetailBeans;
   }
 
+  @Override
+  public int getShareDialogType() {
+    return ShareDialog.TYPE_PAGE_TOTAL;
+  }
+
+  @Override
+  public String getContentsType() {
+    if (null != contentsDetailBeans ) {
+      List<ContentsDetailBean> list = contentsDetailBeans;
+      if (list.size() > 0) {
+        return list.get(0).getListType();
+      }
+    }
+    return ContentsDetailBean.TYPE_CARD;
+  }
+
+  @Override
+  public String getKakaoTalkShareData() {
+    return getContentsBean().toJson();
+  }
+
+  @Override
+  public String getFacebookShareData() {
+    return getContentsBean().getContentsUrlWithParamForShare();
+  }
+
+  @Override
+  public String getEmailShareData() {
+    return ResourceUtil.getString(R.string.share_current_page_contents, getContentsBean().getTitle(), getContentsBean().getContentsUrl());
+  }
+
+  @Override
+  public String getUrlCopyShareData() {
+    return getContentsBean().getContentsUrlWithParamForShare();
+  }
+
   protected void stopLoadingInternal() {
     if (null != disposable) {
       disposable.dispose();

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

@@ -63,7 +63,7 @@ public class ContentsWebFragment extends FragmentBase<ContentsWebPresenter> impl
 
   @Override
   protected ContentsWebPresenter definePresenter() {
-    return new ContentsWebPresenter(getModel(ContentsModel.class), this);
+    return new ContentsWebPresenter(getModel(ContentsWebModel.class), this);
   }
 
   @Override

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

@@ -0,0 +1,50 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.view.screen.contents;
+
+import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailBean;
+import kr.co.zumo.app.lifeplus.view.dialog.ShareDialog;
+
+/**
+ * ContentsModel
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 6.]   [최초 작성]
+ * @since 2018. 11. 6.
+ */
+public class ContentsWebModel extends ContentsModel {
+
+  @Override
+  public int getShareDialogType() {
+    return ShareDialog.TYPE_PAGE_TOTAL;
+  }
+
+  @Override
+  public String getContentsType() {
+    return ContentsDetailBean.TYPE_CARD;
+  }
+
+  @Override
+  public String getKakaoTalkShareData() {
+    return null;
+  }
+
+  @Override
+  public String getFacebookShareData() {
+    return null;
+  }
+
+  @Override
+  public String getEmailShareData() {
+    return null;
+  }
+
+  @Override
+  public String getUrlCopyShareData() {
+    return null;
+  }
+}

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

@@ -11,7 +11,6 @@ import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.tool.Share;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.dialog.AppReviewDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.ConfirmDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
@@ -30,12 +29,12 @@ import kr.co.zumo.app.lifeplus.view.dialog.TooltipDialog;
  * @history 민효동   [2018. 11. 6.]   [최초 작성]
  * @since 2018. 11. 6.
  */
-public class ContentsWebPresenter extends ContentsBasePresenter<ContentsModel, IContentsView> {
+public class ContentsWebPresenter extends ContentsBasePresenter<ContentsWebModel, IContentsView> {
 
   protected DialogBase reviewDialog;
   protected Share share;
 
-  public ContentsWebPresenter(ContentsModel model, IContentsView view) {
+  public ContentsWebPresenter(ContentsWebModel model, IContentsView view) {
     super(model, view);
 
   }
@@ -81,34 +80,35 @@ public class ContentsWebPresenter extends ContentsBasePresenter<ContentsModel, I
 
     /**
      * fixme 조건 변경 -> 5회 이상 진입 + 마지막 페이지 일 경우.
+     * 12/5 오픈에서는 제외
      */
-    int count = model.getCountForReview();
-    if (count < 100) {
-      ++count;
-      model.setCountForReview(count);
-      if (count == 3) {
-        model.setCountForReview(100);
-        reviewDialog = new DialogBuilder<AppReviewDialog, ICustomDialogListener>(getFragmentManager(), DialogID.APP_REVIEW)
-          .listener(new ICustomDialogListener<AppReviewDialog>() {
-            @Override
-            public void onDialogResult(AppReviewDialog dialog, Event event) {
-              switch (event.getEventId()) {
-                case Event.ADD:
-                  view.goGooglePlay();
-                  break;
-                default:
-                  break;
-              }
-            }
-
-            @Override
-            public void onDialogCanceled(AppReviewDialog dialog) {
-              dialog.dispose();
-            }
-          })
-          .show();
-      }
-    }
+//    int count = model.getCountForReview();
+//    if (count < 100) {
+//      ++count;
+//      model.setCountForReview(count);
+//      if (count == 3) {
+//        model.setCountForReview(100);
+//        reviewDialog = new DialogBuilder<AppReviewDialog, ICustomDialogListener>(getFragmentManager(), DialogID.APP_REVIEW)
+//          .listener(new ICustomDialogListener<AppReviewDialog>() {
+//            @Override
+//            public void onDialogResult(AppReviewDialog dialog, Event event) {
+//              switch (event.getEventId()) {
+//                case Event.ADD:
+//                  view.goGooglePlay();
+//                  break;
+//                default:
+//                  break;
+//              }
+//            }
+//
+//            @Override
+//            public void onDialogCanceled(AppReviewDialog dialog) {
+//              dialog.dispose();
+//            }
+//          })
+//          .show();
+//      }
+//    }
 
     view.setLiked(model.isLiked());
     view.setBookmarked(model.isBookmarked());

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

@@ -14,4 +14,6 @@ import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailListBean;
  */
 public interface IContentsDetailView extends IContentsView {
   void draw(ContentsDetailListBean contentsDetailListBean);
+
+  void setVisibleDotDotDot(boolean isVisible);
 }

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

@@ -3,10 +3,12 @@ package kr.co.zumo.app.lifeplus.view.screen.contents.series;
 import java.util.List;
 
 import kr.co.zumo.app.lifeplus.bean.GuestLikedListBean;
+import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailListBean;
 import kr.co.zumo.app.lifeplus.bean.api.SeriesItemBean;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.supervisor.ContentsFlagHelper;
+import kr.co.zumo.app.lifeplus.view.dialog.ShareDialog;
 import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsModel;
 
 /**
@@ -28,6 +30,42 @@ public class ContentsSeriesModel extends ContentsModel {
   public ContentsSeriesModel() {
   }
 
+  @Override
+  public int getShareDialogType() {
+    return ShareDialog.TYPE_PAGE_TOTAL;
+  }
+
+  @Override
+  public String getContentsType() {
+    if (null != contentsDetailListBean && null != contentsDetailListBean.getItemDetailList()) {
+      List<ContentsDetailBean> list = contentsDetailListBean.getItemDetailList();
+      if (list.size() > 0) {
+        return list.get(0).getListType();
+      }
+    }
+    return ContentsDetailBean.TYPE_CARD;
+  }
+
+  @Override
+  public String getKakaoTalkShareData() {
+    return null;
+  }
+
+  @Override
+  public String getFacebookShareData() {
+    return null;
+  }
+
+  @Override
+  public String getEmailShareData() {
+    return null;
+  }
+
+  @Override
+  public String getUrlCopyShareData() {
+    return null;
+  }
+
   public void setContentsDetailListBean(ContentsDetailListBean contentsDetailListBean) {
     this.contentsDetailListBean = contentsDetailListBean;
     seriesInfo = contentsDetailListBean.getSeriesItemList().remove(0);