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

@@ -41,7 +41,7 @@ public abstract class CategoryMainFragment<P extends CategoryMainPresenter> exte
 
   protected MainSeriesView mainSeriesView;
   protected RecyclerView recyclerView;
-  protected RelativeLayout relativeLayoutSpinnerFilter;
+  protected RelativeLayout layoutSpinnerFilter;
   protected ImageView imageViewFilter;
   protected CoordinatorLayout layoutRoot;
   protected AppBarLayout appBarLayout;
@@ -64,7 +64,7 @@ public abstract class CategoryMainFragment<P extends CategoryMainPresenter> exte
     recyclerView = findViewById(R.id.recycler_view_category_main);
     space = findViewById(R.id.space);
     mainSeriesView = findViewById(R.id.series_image_text_view);
-    relativeLayoutSpinnerFilter = findViewById(R.id.relative_layout_spinner_filter);
+    layoutSpinnerFilter = findViewById(R.id.layout_spinner_filter);
     List<String> spinnerList = Arrays.asList(ResourceUtil.getStringArray("main_filter"));
     arrayAdapter = new FocusArrayAdapter(getActivity(), R.layout.custom_spinner, spinnerList);
     layoutRoot = findViewById(R.id.root_layout);
@@ -124,22 +124,23 @@ public abstract class CategoryMainFragment<P extends CategoryMainPresenter> exte
   }
 
   private void init() {
+    mainSeriesView.setVisibility(View.GONE);
+    space.setVisibility(View.VISIBLE);
     switch (getCategoryNumber()) {
-      case CategoryID.CATEGORY_1:
-        break;
-      case CategoryID.CATEGORY_2:
-        break;
       case CategoryID.CATEGORY_3:
-        imageViewFilter.setVisibility(View.INVISIBLE);
-        break;
+        /* falls through */
       case CategoryID.CATEGORY_4:
         imageViewFilter.setVisibility(View.INVISIBLE);
         break;
       case CategoryID.CATEGORY_5:
-        relativeLayoutSpinnerFilter.setVisibility(View.GONE);
-        mainSeriesView.setVisibility(View.GONE);
+        layoutSpinnerFilter.setVisibility(View.GONE);
         toolbar.setVisibility(View.GONE);
+        space.setVisibility(View.GONE);
         break;
+      case CategoryID.CATEGORY_1:
+        /* falls through */
+      case CategoryID.CATEGORY_2:
+        /* falls through */
       default:
         break;
 
@@ -151,9 +152,9 @@ public abstract class CategoryMainFragment<P extends CategoryMainPresenter> exte
   protected abstract void addItemDecoration();
 
   @Override
-  public void hideRecommendArea() {
-    mainSeriesView.setVisibility(View.GONE);
-    space.setVisibility(View.VISIBLE);
+  public void showRecommendArea() {
+    mainSeriesView.setVisibility(View.VISIBLE);
+    space.setVisibility(View.GONE);
   }
 
   @Override

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

@@ -72,10 +72,8 @@ public abstract class CategoryMainPresenter<M extends CategoryMainModel, V exten
   }
 
   private void render() {
-    if (model.getRecommendBeans().size() == 0 || model.getRecommendBeans().size() < 5) {
-      view.hideRecommendArea();
-    }
-    else {
+    if (model.getRecommendBeans().size() > 4) {
+      view.showRecommendArea();
       view.drawRecommend(model.getRecommendBeans());
     }
   }
@@ -242,7 +240,6 @@ public abstract class CategoryMainPresenter<M extends CategoryMainModel, V exten
       case Event.ERROR:
         if (event.getIndex() == Event.LOADED_RECOMMEND) {
           doubleChecker.checkSecond();
-          view.hideRecommendArea();
         }
         else if (event.getIndex() == Event.LOADED_BANNER) {
           doubleCheckerBanner.checkSecond();

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

@@ -21,7 +21,7 @@ import kr.co.zumo.app.lifeplus.view.IView;
  * @since 2018. 11. 6.
  */
 public interface ICategoryMainView extends IView {
-  void hideRecommendArea();
+  void showRecommendArea();
   void drawContentsBanner(List<CategoryBannerBean> bannerBeans, List<CategoryContentsBean> contentsBeans);
   void drawRecommend(List<CategoryRecommendBean> beans);
   void updateContents(List<CategoryContentsBean> contentsBeans);

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

@@ -80,10 +80,8 @@ public class FifthCategoryMainFragment extends CategoryMainFragment<FifthCategor
   }
 
   @Override
-  public void hideRecommendArea() {
-    mainSeriesView.setVisibility(View.GONE);
-    // this week 는 space 도 가려줌
-    space.setVisibility(View.GONE);
+  public void showRecommendArea() {
+    // this week 는 표시하지 않음
   }
 
   @Override

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

@@ -49,7 +49,7 @@
       </kr.co.zumo.app.lifeplus.view.custom.category.series.MainSeriesView>
 
       <RelativeLayout
-        android:id="@+id/relative_layout_spinner_filter"
+        android:id="@+id/layout_spinner_filter"
         android:layout_width="wrap_content"
         android:layout_height="35dp"
         android:layout_gravity="bottom"