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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/CategoryMainFragment.java

@@ -176,7 +176,22 @@ public abstract class CategoryMainFragment<P extends CategoryMainPresenter> exte
     onAfterDestroyViewInternal();
   }
 
-  protected abstract void onAfterDestroyViewInternal();
+  protected final void onAfterDestroyViewInternal() {
+    if (null != spinnerOrder) {
+      spinnerOrder.setOnItemSelectedListener(null);
+      spinnerOrder = null;
+    }
+    recyclerView = null;
+    mainSeriesView = null;
+    if (null != viewFilter) {
+      viewFilter.setOnClickListener(null);
+      viewFilter = null;
+    }
+    if (null != seriesPresenter) {
+      seriesPresenter.dispose();
+      seriesPresenter = null;
+    }
+  }
 
   @Override
   protected final void onAfterDestroy() {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type1/FirstCategoryMainFragment.java

@@ -44,27 +44,8 @@ public class FirstCategoryMainFragment extends CategoryMainFragment<FirstCategor
     return new FirstCategoryMainPresenter(getModel(FirstCategoryMainModel.class), this);
   }
 
-  @Override
-  protected void onAfterDestroyViewInternal() {
-    if (null != spinnerOrder) {
-      spinnerOrder.setOnItemSelectedListener(null);
-      spinnerOrder = null;
-    }
-    recyclerView = null;
-    mainSeriesView = null;
-    if (null != viewFilter) {
-      viewFilter.setOnClickListener(null);
-      viewFilter = null;
-    }
-    if (null != seriesPresenter) {
-      seriesPresenter.dispose();
-      seriesPresenter = null;
-    }
-  }
-
   @Override
   protected void onAfterDestroyInternal() {
-
   }
 
   @Override
@@ -110,16 +91,12 @@ public class FirstCategoryMainFragment extends CategoryMainFragment<FirstCategor
     });
   }
 
-  ;
-
-
   @Override
   public void drawContentsBanner(List<CategoryBannerBean> bannerBeans, List<CategoryContentsBean> contentsBeans) {
 
     adapter = new FirstCategoryMainAdapter(getActivity(), bannerBeans, contentsBeans, (Event event) -> {
       presenter.onEvent(event);
     });
-
     recyclerView.setAdapter(adapter);
 
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type2/SecondCategoryMainFragment.java

@@ -47,27 +47,8 @@ public class SecondCategoryMainFragment extends CategoryMainFragment<SecondCateg
     return new SecondCategoryMainPresenter(getModel(SecondCategoryMainModel.class), this);
   }
 
-  @Override
-  protected void onAfterDestroyViewInternal() {
-
-  }
-
   @Override
   protected void onAfterDestroyInternal() {
-    if (null != spinnerOrder) {
-      spinnerOrder.setOnItemSelectedListener(null);
-      spinnerOrder = null;
-    }
-    recyclerView = null;
-    mainSeriesView = null;
-    if (null != viewFilter) {
-      viewFilter.setOnClickListener(null);
-      viewFilter = null;
-    }
-    if (null != seriesPresenter) {
-      seriesPresenter.dispose();
-      seriesPresenter = null;
-    }
   }
 
   @Override
@@ -75,7 +56,6 @@ public class SecondCategoryMainFragment extends CategoryMainFragment<SecondCateg
     return false;
   }
 
-
   @Override
   protected String getCategoryNumber() {
     return CategoryID.CATEGORY_2;
@@ -101,6 +81,7 @@ public class SecondCategoryMainFragment extends CategoryMainFragment<SecondCateg
       }
     });
     recyclerView.setLayoutManager(gridLayoutManager);
+
     recyclerView.setPadding(ResourceUtil.dpToPx(23), ResourceUtil.dpToPx(1), ResourceUtil.dpToPx(23), ResourceUtil.dpToPx(41));
     recyclerView.addItemDecoration(new GridItemDecoration(ResourceUtil.dpToPx(2), ResourceUtil.dpToPx(13), ResourceUtil.dpToPx(2), ResourceUtil.dpToPx(13)) {
       @Override
@@ -114,9 +95,9 @@ public class SecondCategoryMainFragment extends CategoryMainFragment<SecondCateg
   }
 
   @Override
-  public void drawContentsBanner(List<CategoryBannerBean> bannerBeans, List<CategoryContentsBean> contents) {
+  public void drawContentsBanner(List<CategoryBannerBean> bannerBeans, List<CategoryContentsBean> contentsBeans) {
 
-    adapter = new SecondCategoryMainAdapter(getActivity(), bannerBeans, contents, (Event event) -> {
+    adapter = new SecondCategoryMainAdapter(getActivity(), bannerBeans, contentsBeans, (Event event) -> {
       presenter.onEvent(event);
     });
     recyclerView.setAdapter(adapter);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type3/ThirdCategoryMainFragment.java

@@ -44,23 +44,8 @@ public class ThirdCategoryMainFragment extends CategoryMainFragment<ThirdCategor
     return new ThirdCategoryMainPresenter(getModel(ThirdCategoryMainModel.class), this);
   }
 
-  @Override
-  protected void onAfterDestroyViewInternal() {
-    if (null != spinnerOrder) {
-      spinnerOrder.setOnItemSelectedListener(null);
-      spinnerOrder = null;
-    }
-    mainSeriesView = null;
-    recyclerView = null;
-    if (null != seriesPresenter) {
-      seriesPresenter.dispose();
-      seriesPresenter = null;
-    }
-  }
-
   @Override
   protected void onAfterDestroyInternal() {
-
   }
 
   @Override
@@ -107,8 +92,8 @@ public class ThirdCategoryMainFragment extends CategoryMainFragment<ThirdCategor
   }
 
   @Override
-  public void drawContentsBanner(List<CategoryBannerBean> bannerBeans, List<CategoryContentsBean> contents) {
-    adapter = new ThirdCategoryMainAdapter(getActivity(), bannerBeans, contents, event -> {
+  public void drawContentsBanner(List<CategoryBannerBean> bannerBeans, List<CategoryContentsBean> contentsBeans) {
+    adapter = new ThirdCategoryMainAdapter(getActivity(), bannerBeans, contentsBeans, event -> {
       presenter.onEvent(event);
     });
     recyclerView.setAdapter(adapter);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type5/FifthCategoryMainFragment.java

@@ -44,14 +44,8 @@ public class FifthCategoryMainFragment extends CategoryMainFragment<FifthCategor
     return new FifthCategoryMainPresenter(getModel(FifthCategoryMainModel.class), this);
   }
 
-  @Override
-  protected void onAfterDestroyViewInternal() {
-    recyclerView = null;
-  }
-
   @Override
   protected void onAfterDestroyInternal() {
-
   }
 
   @Override
@@ -93,9 +87,9 @@ public class FifthCategoryMainFragment extends CategoryMainFragment<FifthCategor
   }
 
   @Override
-  public void drawContentsBanner(List<CategoryBannerBean> beans, List<CategoryContentsBean> contents) {
+  public void drawContentsBanner(List<CategoryBannerBean> beans, List<CategoryContentsBean> contentsBeans) {
 
-    adapter = new FifthCategoryMainAdapter(getActivity(), contents, event -> {
+    adapter = new FifthCategoryMainAdapter(getActivity(), contentsBeans, event -> {
       presenter.onEvent(event);
     });
     recyclerView.setAdapter(adapter);