[컨텐츠][New] 시리즈 contentsItemNumber -> conentsNo 이름 변경

app/src/main/java/kr/co/zumo/app/lifeplus/bean/SeriesListBean.java

@@ -21,14 +21,14 @@ public class SeriesListBean extends JsonBeanBase {
 
   private SeriesItemBean seriesInfo;
   private List<SeriesItemBean> seriesItemList;
-  private String contentsItemNumber;
+  private String contentsNo;
 
-  public String getContentsItemNumber() {
-    return contentsItemNumber;
+  public String getContentsNo() {
+    return contentsNo;
   }
 
-  public void setContentsItemNumber(String contentsItemNumber) {
-    this.contentsItemNumber = contentsItemNumber;
+  public void setContentsNo(String contentsNo) {
+    this.contentsNo = contentsNo;
   }
 
   public SeriesItemBean getSeriesInfo() {

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/SeriesItemBean.java

@@ -17,19 +17,19 @@ import com.google.gson.annotations.SerializedName;
  */
 public class SeriesItemBean extends LifeplusContentsBean {
   @SerializedName("seriesItemNo")
-  private String seriesItemNumber;
+  private String seriesItemNo;
 
   /**
-   * 시리즈 리스트 안의 Item 은 seriesItemNo 이 컨텐츠의 No 이므로 이를 맵핑해줌.
+   * 시리즈 리스트 안의 Item 은 seriesItemNo 가 컨텐츠의 No 이므로 이를 맵핑해줌.
    * @return
    */
   @Override
   public String getContentsNo() {
-    return seriesItemNumber;
+    return seriesItemNo;
   }
 
   @Override
   public void setContentsNo(String contentsNo) {
-    this.seriesItemNumber = contentsNo;
+    this.seriesItemNo = contentsNo;
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/contents/series/CustomContentsSeriesView.java

@@ -95,10 +95,10 @@ public class CustomContentsSeriesView extends FrameLayout {
     layoutParams.setMargins(0, ResourceUtil.dpToPx(52), 0,0);
   }
 
-  public void draw(List<SeriesItemBean> list, String contentsItemNumber, IEventListener listener) {
+  public void draw(List<SeriesItemBean> list, String contentsNo, IEventListener listener) {
     LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
-    adapter = new ContentsSeriesAdapter(inflater, contentsItemNumber, list, event -> {
+    adapter = new ContentsSeriesAdapter(inflater, contentsNo, list, event -> {
       listener.onEvent(event);
     });
 

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

@@ -40,7 +40,7 @@ public class ContentsAdapter extends RecyclerView.Adapter<ContentsHolder> {
   private List<WithShownItemBean> withItemBeans;
   private SeriesItemBean seriesInfo;
   private final String listType;
-  private final String itemNumber;
+  private final String contentsNo;  // 현재 컨텐츠 와 비교하기 위해서 필요
 
   private static final int LISTICLE_COVER = 0;
   private static final int LISTICLE_DETAIL = 1;
@@ -55,7 +55,7 @@ public class ContentsAdapter extends RecyclerView.Adapter<ContentsHolder> {
 
 
   public ContentsAdapter(Activity activity,
-                         String itemNumber,
+                         String contentsNo,
                          String listType,
                          List<ContentsItemBean> contentsItemBeans,
                          List<SeriesItemBean> seriesItemBeans,
@@ -70,7 +70,7 @@ public class ContentsAdapter extends RecyclerView.Adapter<ContentsHolder> {
     this.withItemBeans = withItemBeans;
     this.seriesInfo = seriesInfo;
     this.listType = listType;
-    this.itemNumber = itemNumber;
+    this.contentsNo = contentsNo;
   }
 
   @NonNull
@@ -128,7 +128,7 @@ public class ContentsAdapter extends RecyclerView.Adapter<ContentsHolder> {
       SeriesListBean seriesListBean = new SeriesListBean();
       seriesListBean.setSeriesInfo(seriesInfo);
       seriesListBean.setSeriesItemList(seriesItemBeans);
-      seriesListBean.setContentsItemNumber(itemNumber);
+      seriesListBean.setContentsNo(contentsNo);
       holder.bind(activity, position, seriesListBean, getItemCount(), eventListener);
     }
     else if (holder instanceof ContentsWithShownHolder) {

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

@@ -221,12 +221,12 @@ public class ContentsFragment extends FragmentBase<ContentsPresenter> implements
   }
 
   @Override
-  public void draw(String itemNumber, String listType, ContentsDetailListBean contentsDetailListBean) {
+  public void draw(String contentsNo, String listType, ContentsDetailListBean contentsDetailListBean) {
     List<ContentsItemBean> contentsItemBeans = contentsDetailListBean.getItemDetailList();
     List<SeriesItemBean> seriesItemBeans = contentsDetailListBean.getSeriesItemList();
     List<WithShownItemBean> withItemBeans = contentsDetailListBean.getWithItemList();
 
-    adapter = new ContentsAdapter(getActivity(), itemNumber, listType, contentsItemBeans, seriesItemBeans, contentsDetailListBean.getSeriesInfo(), withItemBeans, event -> {
+    adapter = new ContentsAdapter(getActivity(), contentsNo, listType, contentsItemBeans, seriesItemBeans, contentsDetailListBean.getSeriesInfo(), withItemBeans, event -> {
       presenter.onEvent(event);
     });
 

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

@@ -36,7 +36,7 @@ public class ContentsSeriesHolder extends ContentsHolder<SeriesListBean> {
     //풀스크린일때 간격 조정
     seriesView.setSeriesTitleSpacingInFullScreen();
 
-    seriesView.draw(bean.getSeriesItemList(), bean.getContentsItemNumber(), event -> {
+    seriesView.draw(bean.getSeriesItemList(), bean.getContentsNo(), event -> {
       listener.onEvent(event);
     });
 

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

@@ -13,7 +13,7 @@ import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailListBean;
  * @since 2018-11-27
  */
 public interface IContentsView extends IContentsBaseView {
-  void draw(String itemNumber, String listType, ContentsDetailListBean contentsDetailListBean);
+  void draw(String contentsNo, String listType, ContentsDetailListBean contentsDetailListBean);
 
   void setVisibleDotDotDot(boolean isVisible);
 

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

@@ -28,13 +28,13 @@ public class ContentsSeriesAdapter extends RecyclerView.Adapter<ContentsSeriesVi
   private LayoutInflater inflater;
   private IEventListener listener;
   private List<SeriesItemBean> list;
-  private String contentsItemNumber;
+  private String contentsNo;
 
-  public ContentsSeriesAdapter(LayoutInflater inflater, String contentsItemNumber, List<SeriesItemBean> list, IEventListener listener) {
+  public ContentsSeriesAdapter(LayoutInflater inflater, String contentsNo, List<SeriesItemBean> list, IEventListener listener) {
     this.listener = listener;
     this.list = list;
     this.inflater = inflater;
-    this.contentsItemNumber = contentsItemNumber;
+    this.contentsNo = contentsNo;
   }
 
   @NonNull
@@ -50,7 +50,7 @@ public class ContentsSeriesAdapter extends RecyclerView.Adapter<ContentsSeriesVi
 
     bean.updateFlags(ContentsFlagHelper.getInstance());
 
-    holder.bind(position, this.contentsItemNumber, bean, event -> {
+    holder.bind(position, this.contentsNo, bean, event -> {
       listener.onEvent(event);
     });
   }

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

@@ -35,7 +35,7 @@ public class ContentsSeriesViewHolder extends RecyclerView.ViewHolder {
   private SeriesItemBean bean;
   private IEventListener listener;
   private int index;
-  private String contentsItemNumber;
+  private String contentsNo;  // fixme contentsNo 로 변경 필요
 
   public ContentsSeriesViewHolder(View itemView) {
     super(itemView);
@@ -49,11 +49,11 @@ public class ContentsSeriesViewHolder extends RecyclerView.ViewHolder {
 
   }
 
-  public void bind(int index, String contentsItemNumber, SeriesItemBean bean, IEventListener listener) {
+  public void bind(int index, String contentsNo, SeriesItemBean bean, IEventListener listener) {
     this.index = index;
     this.bean = bean;
     this.listener = listener;
-    this.contentsItemNumber = contentsItemNumber;
+    this.contentsNo = contentsNo;
   }
 
   public void attach() {
@@ -67,7 +67,7 @@ public class ContentsSeriesViewHolder extends RecyclerView.ViewHolder {
     textViewSmall.setText(bean.getSubTitle());
     textViewBig.setText(bean.getTwoLineTitle());
 
-    if (bean.getContentsNo().equals(contentsItemNumber)) {
+    if (bean.getContentsNo().equals(contentsNo)) {
       // 현재 표시되는 컨텐츠라면 배경 변경
       itemView.setBackgroundColor(ResourceUtil.getColor(R.color.CF8F8F8));
     }