[카테고리][New] 정렬 순서 적용

- '여행 어디가지' 레이아웃 메니저 오류로 아이템이 1개면 안보인다.

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

@@ -6,6 +6,7 @@ import android.util.Log;
 import kr.co.zumo.app.lifeplus.bean.ContentsBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
+import kr.co.zumo.app.lifeplus.model.module.APICategoryContentsLoadModule;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.DoubleChecker;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -98,6 +99,12 @@ public abstract class CategoryMainPresenter<M extends CategoryMainModel, V exten
   @Override
   protected final void onEventInternal(Event event) {
     switch (event.getEventId()) {
+      case Event.ORDER:
+        int index = event.getIndex();
+        setContentsOrder(index);
+        model.loadContents(getCategoryNumber());
+
+        break;
       case Event.RECOMMEND:
         Log.i("APP# CategoryMainPresenter | onEventInternal", "|" + event);
         setContentsHelper(model.getRecommendBeans().get(event.getIndex()));
@@ -119,6 +126,25 @@ public abstract class CategoryMainPresenter<M extends CategoryMainModel, V exten
     }
   }
 
+  private void setContentsOrder(int index) {
+    int order;
+    switch (index) {
+      case 1:
+        order = APICategoryContentsLoadModule.ORDER_BY_LIKE;
+        break;
+      case 2:
+        order = APICategoryContentsLoadModule.ORDER_BY_BOOKMARK;
+        break;
+      case 0:
+        /* falls through */
+      default:
+        order = APICategoryContentsLoadModule.ORDER_BY_LATEST;
+        break;
+    }
+
+    model.setCurrentOrder(order);
+  }
+
   private void setContentsHelper(LifeplusContentsBean bean) {
     ContentsBean contentsBean = new ContentsBean.Builder(bean, getCategoryNumber()).build();
 

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

@@ -26,7 +26,6 @@ import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearSmoothScroller;
 import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.SparseArray;
 import android.view.View;
 import android.view.ViewGroup;
@@ -216,7 +215,7 @@ public class SpannedGridLayoutManager extends RecyclerView.LayoutManager {
 
     int scrolled;
     int top = getDecoratedTop(getChildAt(0));
-    Log.e("APP#  SpannedGridLayoutManager | scrollVerticallyBy", "|" + "top: " + top);
+//    Log.e("APP#  SpannedGridLayoutManager | scrollVerticallyBy", "|" + "top: " + top);
 
     if (dy < 0) { // scrolling content down
       if (firstVisibleRow == 0) { // at top of content

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

@@ -113,7 +113,7 @@ public class FirstCategoryMainAdapter extends RecyclerView.Adapter<CategoryMainV
   }
 
   private boolean hasBanner() {
-    return (contentsBeans.size() > 3 && null != bannerBeans && bannerBeans.size() > 0);
+    return (contentsBeans.size() >= 4 && null != bannerBeans && bannerBeans.size() > 0);
   }
 
   @Override

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

@@ -78,6 +78,10 @@ public class FirstCategoryMainFragment extends FragmentBase<FirstCategoryMainPre
 
   @Override
   protected void onAfterDestroyView() {
+    if(null != spinnerOrder) {
+      spinnerOrder.setOnItemSelectedListener(null);
+      spinnerOrder = null;
+    }
     recyclerViewFirstCategoryMain = null;
     mainSeriesView = null;
     if (null != viewFilter) {
@@ -134,7 +138,6 @@ public class FirstCategoryMainFragment extends FragmentBase<FirstCategoryMainPre
     spinnerOrder.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
       @Override
       public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        Log.i("APP# FirstCategoryMainFragment | onItemClick", "|" + "position: " + position);
         presenter.onEvent(new Event.Builder(Event.ORDER).index(position).build());
       }
 

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

@@ -52,7 +52,7 @@ public class FirstCategoryMainGridViewHolder extends CategoryMainViewHolder<Cate
   @Override
   public void dispose() {
     if (null != imageViewMainFirstCategory) {
-      Glide.with(imageViewMainFirstCategory).clear(imageViewMainFirstCategory);
+//      Glide.with(imageViewMainFirstCategory).clear(imageViewMainFirstCategory);
       imageViewMainFirstCategory.setOnClickListener(null);
       imageViewMainFirstCategory = null;
       textViewMainFirstCategory = null;

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

@@ -6,7 +6,6 @@ import java.util.ArrayList;
 
 import kr.co.zumo.app.lifeplus.bean.FilterBean;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
-import kr.co.zumo.app.lifeplus.model.module.APICategoryContentsLoadModule;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.dialog.CategoryFirstMainFilterDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
@@ -70,12 +69,6 @@ public class FirstCategoryMainPresenter extends CategoryMainPresenter<FirstCateg
   @Override
   protected void onCategoryEvent(Event event) {
     switch (event.getEventId()) {
-      case Event.ORDER:
-        int index = event.getIndex();
-        setContentsOrder(index);
-        model.loadContents(getCategoryNumber());
-
-        break;
       case Event.FILTER:
         filterDialog = new DialogBuilder<CategoryFirstMainFilterDialog, ICustomFilterListener>(DialogID.MAIN_FIRST_FILTER)
           .listener(new ICustomFilterListener<CategoryFirstMainFilterDialog>() {
@@ -111,25 +104,6 @@ public class FirstCategoryMainPresenter extends CategoryMainPresenter<FirstCateg
     }
   }
 
-  private void setContentsOrder(int index) {
-    int order;
-    switch (index) {
-      case 1:
-        order = APICategoryContentsLoadModule.ORDER_BY_LIKE;
-        break;
-      case 2:
-        order = APICategoryContentsLoadModule.ORDER_BY_BOOKMARK;
-        break;
-      case 0:
-        /* falls through */
-      default:
-        order = APICategoryContentsLoadModule.ORDER_BY_LATEST;
-        break;
-    }
-
-    model.setCurrentOrder(order);
-  }
-
   @Override
   protected void onResultInternal(Event event) {
 

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

@@ -36,8 +36,6 @@ public class SecondCategoryMainAdapter extends RecyclerView.Adapter<CategoryMain
   private ArrayList<CategoryContentsBean> contentsBeans;
   private IEventListener listener;
 
-  private final int bannerPosition = 4;
-
   public SecondCategoryMainAdapter(Context context, ArrayList<CategoryBannerBean> bannerBeans, ArrayList<CategoryContentsBean> contentsBeans, IEventListener listener) {
     this.context = context;
     this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -104,7 +102,7 @@ public class SecondCategoryMainAdapter extends RecyclerView.Adapter<CategoryMain
     position = position % 9;
     switch (position) {
       case 0:
-        return FULL_IMAGE;
+        /* falls through */
       case 4:
         return FULL_IMAGE;
       default:

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

@@ -7,6 +7,8 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.Spinner;
 
 import java.util.ArrayList;
 
@@ -40,6 +42,7 @@ public class SecondCategoryMainFragment extends FragmentBase<SecondCategoryMainP
   private MainSeriesView mainSeriesView;
   private View viewFilter;
   private IMainSeriesContract.Presenter seriesPresenter;
+  private Spinner spinnerOrder;
 
   @Override
   protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -51,6 +54,7 @@ public class SecondCategoryMainFragment extends FragmentBase<SecondCategoryMainP
     mainSeriesView = findViewById(R.id.series_image_text_view);
     recyclerViewSecondCategoryMain = findViewById(R.id.recycler_view_second_category_main);
     viewFilter = findViewById(R.id.second_category_main_filter);
+    spinnerOrder = findViewById(R.id.spinner_select_contents);
   }
 
 
@@ -76,6 +80,10 @@ public class SecondCategoryMainFragment extends FragmentBase<SecondCategoryMainP
 
   @Override
   protected void onAfterDestroy() {
+    if(null != spinnerOrder) {
+      spinnerOrder.setOnItemSelectedListener(null);
+      spinnerOrder = null;
+    }
     recyclerViewSecondCategoryMain = null;
     mainSeriesView = null;
     if (null != viewFilter) {
@@ -117,8 +125,22 @@ public class SecondCategoryMainFragment extends FragmentBase<SecondCategoryMainP
             return new SpannedGridLayoutManager.SpanInfo(1, 1);
         }
       }, 3, 1f));
+
     recyclerViewSecondCategoryMain.setAdapter(secondCategoryMainAdapter);
+
     viewFilter.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.FILTER).build()));
+
+    spinnerOrder.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+      @Override
+      public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        presenter.onEvent(new Event.Builder(Event.ORDER).index(position).build());
+      }
+
+      @Override
+      public void onNothingSelected(AdapterView<?> parent) {
+        //
+      }
+    });
   }
 
   @Override

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

@@ -6,8 +6,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
-
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
@@ -44,7 +42,7 @@ public abstract class SecondCategoryMainHolder extends CategoryMainViewHolder {
   @Override
   public void dispose() {
     if (null != imageView) {
-      Glide.with(imageView).clear(imageView);
+//      Glide.with(imageView).clear(imageView);
       imageView.setOnClickListener(null);
       imageView = null;
       textView = null;

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

@@ -104,7 +104,7 @@ public class ThirdCategoryMainAdapter extends RecyclerView.Adapter<CategoryMainV
   public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
     this.context = null;
     this.inflater = null;
-   // this.bannerBeans = null;
+    // this.bannerBeans = null;
     this.contentsBeans = null;
     this.listener = null;
   }
@@ -115,7 +115,7 @@ public class ThirdCategoryMainAdapter extends RecyclerView.Adapter<CategoryMainV
   }
 
   private boolean hasBanner() {
-    return (null != bannerBeans && bannerBeans.size() > 0);
+    return (contentsBeans.size() >= 4 && null != bannerBeans && bannerBeans.size() > 0);
   }
 
   @Override

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

@@ -5,7 +5,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -78,6 +77,10 @@ public class ThirdCategoryMainFragment extends FragmentBase<ThirdCategoryMainPre
 
   @Override
   protected void onAfterDestroyView() {
+    if(null != spinnerOrder) {
+      spinnerOrder.setOnItemSelectedListener(null);
+      spinnerOrder = null;
+    }
     mainSeriesView = null;
     recyclerViewThirdCategoryMain = null;
     if (null != seriesPresenter) {
@@ -130,7 +133,6 @@ public class ThirdCategoryMainFragment extends FragmentBase<ThirdCategoryMainPre
     spinnerOrder.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
       @Override
       public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        Log.i("APP# FirstCategoryMainFragment | onItemClick", "|" + "position: " + position);
         presenter.onEvent(new Event.Builder(Event.ORDER).index(position).build());
       }
 

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

@@ -52,7 +52,7 @@ public class ThirdCategoryMainGridViewHolder extends CategoryMainViewHolder {
   @Override
   public void dispose() {
     if (null != imageViewMainThirdCategory) {
-      Glide.with(imageViewMainThirdCategory).clear(imageViewMainThirdCategory);
+//      Glide.with(imageViewMainThirdCategory).clear(imageViewMainThirdCategory);
       imageViewMainThirdCategory.setOnClickListener(null);
       textViewMainThirdCategory = null;
     }

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

@@ -1,7 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.category.type3;
 
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
-import kr.co.zumo.app.lifeplus.model.module.APICategoryContentsLoadModule;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.category.CategoryID;
 import kr.co.zumo.app.lifeplus.view.screen.category.CategoryMainPresenter;
@@ -56,34 +55,6 @@ public class ThirdCategoryMainPresenter extends CategoryMainPresenter<ThirdCateg
 
   @Override
   protected void onCategoryEvent(Event event) {
-    switch (event.getEventId()) {
-      case Event.ORDER:
-        int index = event.getIndex();
-        setContentsOrder(index);
-        model.loadContents(getCategoryNumber());
-        break;
-      default:
-        break;
-    }
-  }
-
-  private void setContentsOrder(int index) {
-    int order;
-    switch (index) {
-      case 1:
-        order = APICategoryContentsLoadModule.ORDER_BY_LIKE;
-        break;
-      case 2:
-        order = APICategoryContentsLoadModule.ORDER_BY_BOOKMARK;
-        break;
-      case 0:
-        /* falls through */
-      default:
-        order = APICategoryContentsLoadModule.ORDER_BY_LATEST;
-        break;
-    }
-
-    model.setCurrentOrder(order);
   }
 
   @Override

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

@@ -104,7 +104,7 @@ public class FourthCategoryMainAdapter extends RecyclerView.Adapter<CategoryMain
   public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
     this.context = null;
     this.inflater = null;
-   // this.bannerBeans = null;
+    // this.bannerBeans = null;
     this.contentsBeans = null;
     this.listener = null;
   }
@@ -116,7 +116,7 @@ public class FourthCategoryMainAdapter extends RecyclerView.Adapter<CategoryMain
   }
 
   private boolean hasBanner() {
-    return (null != bannerBeans && bannerBeans.size() > 0);
+    return (contentsBeans.size() >= 4 && null != bannerBeans && bannerBeans.size() > 0);
   }
 
   @Override

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

@@ -9,6 +9,8 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.Spinner;
 
 import java.util.ArrayList;
 
@@ -40,6 +42,7 @@ public class FourthCategoryMainFragment extends FragmentBase<FourthCategoryMainP
   private MainSeriesView mainSeriesView;
   private RecyclerView recyclerViewFourthCategoryMain;
   private IMainSeriesContract.Presenter seriesPresenter;
+  private Spinner spinnerOrder;
 
   @Override
   protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -50,6 +53,14 @@ public class FourthCategoryMainFragment extends FragmentBase<FourthCategoryMainP
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
     mainSeriesView = findViewById(R.id.series_image_text_view);
     recyclerViewFourthCategoryMain = findViewById(R.id.recycler_view_fourth_category_main);
+    recyclerViewFourthCategoryMain.addItemDecoration(new RecyclerView.ItemDecoration() {
+      @Override
+      public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        super.getItemOffsets(outRect, view, parent, state);
+        outRect.bottom = ResourceUtil.dpToPx(21);
+      }
+    });
+    spinnerOrder = findViewById(R.id.spinner_select_contents);
   }
 
   @Override
@@ -71,6 +82,10 @@ public class FourthCategoryMainFragment extends FragmentBase<FourthCategoryMainP
 
   @Override
   protected void onAfterDestroyView() {
+    if(null != spinnerOrder) {
+      spinnerOrder.setOnItemSelectedListener(null);
+      spinnerOrder = null;
+    }
     mainSeriesView = null;
     recyclerViewFourthCategoryMain = null;
     if (null != seriesPresenter) {
@@ -102,14 +117,19 @@ public class FourthCategoryMainFragment extends FragmentBase<FourthCategoryMainP
     });
     LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false);
     recyclerViewFourthCategoryMain.setLayoutManager(linearLayoutManager);
-    recyclerViewFourthCategoryMain.addItemDecoration(new RecyclerView.ItemDecoration() {
+    recyclerViewFourthCategoryMain.setAdapter(fourthCategoryMainAdapter);
+
+    spinnerOrder.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
       @Override
-      public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
-        super.getItemOffsets(outRect, view, parent, state);
-        outRect.bottom = ResourceUtil.dpToPx(21);
+      public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        presenter.onEvent(new Event.Builder(Event.ORDER).index(position).build());
+      }
+
+      @Override
+      public void onNothingSelected(AdapterView<?> parent) {
+        //
       }
     });
-    recyclerViewFourthCategoryMain.setAdapter(fourthCategoryMainAdapter);
   }
 
   @Override

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

@@ -58,7 +58,7 @@ public class FourthCategoryMainLinearViewHolder extends CategoryMainViewHolder<C
   @Override
   public void dispose() {
     if (null != imageViewMainFourthCategory) {
-      Glide.with(imageViewMainFourthCategory).clear(imageViewMainFourthCategory);
+//      Glide.with(imageViewMainFourthCategory).clear(imageViewMainFourthCategory);
       imageViewMainFourthCategory.setOnClickListener(null);
       imageViewMainFourthCategory = null;
       textViewMainFourthCategoryTitle1 = null;

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

@@ -56,7 +56,7 @@ public class FifthCategoryMainLinearViewHolder extends CategoryMainViewHolder {
   @Override
   public void dispose() {
     if (null != imageViewMainFifthCategory) {
-      Glide.with(imageViewMainFifthCategory).clear(imageViewMainFifthCategory);
+//      Glide.with(imageViewMainFifthCategory).clear(imageViewMainFifthCategory);
       imageViewMainFifthCategory.setOnClickListener(null);
       imageViewMainFifthCategory = null;
       textViewMainFifthDate = null;