[북마크][New] 북마크 리스트 카테고리 정리

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

@@ -7,6 +7,7 @@ import com.google.gson.annotations.SerializedName;
 
 import kr.co.zumo.app.lifeplus.supervisor.IFlags;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.view.screen.category.CategoryID;
 
 /**
  * BookmarkBean
@@ -89,11 +90,8 @@ public class BookmarkBean extends LifeplusContentsBean {
     return categoryTitle;
   }
 
-  public void setCategoryTitle(int categoryIndex) {
-
-    String[] names = ResourceUtil.getStringArray("category_names");
-
-    this.categoryTitle = names[categoryIndex];
+  public void setCategoryTitleByIndex(int categoryIndex) {
+    this.categoryTitle = ResourceUtil.getString(CategoryID.getCategoryNameByNo(CategoryID.ofNo(categoryIndex)));
   }
 
   public void setCategoryTitle(String categoryTitle) {

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

@@ -1,31 +0,0 @@
-/*
- * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
- */
-package kr.co.zumo.app.lifeplus.bean.api;
-
-import kr.co.zumo.app.lifeplus.util.ResourceUtil;
-
-/**
- * BookmarkTitleBean
- * <pre>
- * </pre>
- *
- * @author 민효동
- * @version 1.0
- * @history 민효동   [2018. 12. 7.]   [최초 작성]
- * @since 2018. 12. 7.
- */
-public class BookmarkTitleBean extends BookmarkBean {
-
-  public BookmarkTitleBean(LifeplusContentsBean contentsBean) {
-    super(contentsBean);
-  }
-
-  public BookmarkTitleBean(int categoryIndex) {
-    super(new LifeplusContentsBean());
-
-    String[] names = ResourceUtil.getStringArray("category_names");
-
-    setTitle(names[categoryIndex]);
-  }
-}

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

@@ -22,6 +22,9 @@ import kr.co.zumo.app.R;
  * @since 2018. 11. 6.
  */
 public class CategoryID {
+
+  public final static int CATEGORY_NUM = 4;
+
   public final static String CATEGORY_NONE = "-1";
   public final static String CATEGORY_1 = "2";
   public final static String CATEGORY_2 = "3";

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/BookMarkListFragment.java

@@ -31,6 +31,7 @@ import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
+import kr.co.zumo.app.lifeplus.view.screen.category.CategoryID;
 import kr.co.zumo.app.lifeplus.view.screen.category.FocusArrayAdapter;
 import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
 
@@ -263,7 +264,8 @@ public class BookMarkListFragment extends FragmentBase<BookMarkListPresenter> im
 
   @Override
   public void updateCategory(boolean[] categories) {
-    int len = 5;
+    int len = CategoryID.CATEGORY_NUM;
+
     View lastVisibleDot = null;
     for (int i = 0; i < len; ++i) {
       View textView = findViewById(ResourceUtil.getId("text_view_category_" + i));
@@ -303,7 +305,8 @@ public class BookMarkListFragment extends FragmentBase<BookMarkListPresenter> im
     }
 
     Log.d("APP# BookMarkListFragment | setCategoryFocus", "|" + " categoryIndex: " + categoryIndex);
-    int len = 5;
+    int len = CategoryID.CATEGORY_NUM;
+
     for (int i = 0; i < len; ++i) {
       TextView textView = findViewById(ResourceUtil.getId("text_view_category_" + i));
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/BookMarkListModel.java

@@ -129,13 +129,13 @@ public class BookMarkListModel extends Model {
      * bookmarkBeans 과 size가 연동되야하므로 항상 요청할 때 동적 생성을 해야한다.
      */
 
-    List<ArrayList<BookmarkBean>> bookmarks = new ArrayList<>(5);
-    bookmarks.add(new ArrayList<>());
+    List<ArrayList<BookmarkBean>> bookmarks = new ArrayList<>(4);
     bookmarks.add(new ArrayList<>());
     bookmarks.add(new ArrayList<>());
     bookmarks.add(new ArrayList<>());
     bookmarks.add(new ArrayList<>());
 
+    // 카테고리 별로 구분
     for (BookmarkBean bean : bookmarkBeans) {
       int index;
       String categoryNumber = bean.getCategoryNumber();
@@ -147,10 +147,6 @@ public class BookMarkListModel extends Model {
 
       if (index > -1) {
         List<BookmarkBean> beans = bookmarks.get(index);
-//        if (null == beans) {
-//          beans = new ArrayList<>();
-//          bookmarks.set(index, beans);
-//        }
         // 복사해서 넣어준다.
         beans.add(bean.getClone());
       }
@@ -170,7 +166,7 @@ public class BookMarkListModel extends Model {
           categoryAnchorIndies.add(categorizedBookmarkList.size());
 
           // 첫번째 아이템에 타이틀 지정
-          beans.get(0).setCategoryTitle(i);
+          beans.get(0).setCategoryTitleByIndex(i);
           categorizedBookmarkList.addAll(beans);
 
           // 카테고리 인덱스 저장
@@ -190,28 +186,7 @@ public class BookMarkListModel extends Model {
   }
 
   private int getCategoryIndexById(String categoryNumber) {
-    int index;
-    switch (categoryNumber) {
-      case CategoryID.CATEGORY_1:
-        index = 0;
-        break;
-      case CategoryID.CATEGORY_2:
-        index = 1;
-        break;
-      case CategoryID.CATEGORY_3:
-        index = 2;
-        break;
-      case CategoryID.CATEGORY_4:
-        index = 3;
-        break;
-      case CategoryID.CATEGORY_5:
-        index = 4;
-        break;
-      default:
-        index = -1;
-        break;
-    }
-    return index;
+    return CategoryID.ofIndex(categoryNumber);
   }
 
   /**
@@ -299,7 +274,7 @@ public class BookMarkListModel extends Model {
   /**
    * 좋아요 갱신
    *
-   * @param index data 의 index
+   * @param index         data 의 index
    * @param viewListIndex view 의 index
    */
   public void updateLiked(int index, int viewListIndex) {
@@ -323,7 +298,7 @@ public class BookMarkListModel extends Model {
   /**
    * 북마크 갱신
    *
-   * @param index data 의 index
+   * @param index         data 의 index
    * @param viewListIndex view 의 index
    */
   public void updateBookmarked(int index, int viewListIndex) {

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

@@ -135,35 +135,12 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:padding="8dp"
-          android:text="@string/book_mark_category4"
-          android:textColor="@color/C999999"
-          android:textSize="12sp"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toStartOf="@+id/circle_3"
-          app:layout_constraintStart_toEndOf="@+id/circle_2"
-          app:layout_constraintTop_toTopOf="parent"/>
-
-        <ImageView
-          android:id="@+id/circle_3"
-          android:layout_width="2dp"
-          android:layout_height="2dp"
-          android:src="@drawable/grey_circle"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toStartOf="@+id/text_view_category_4"
-          app:layout_constraintStart_toEndOf="@+id/text_view_category_3"
-          app:layout_constraintTop_toTopOf="parent"/>
-
-        <TextView
-          android:id="@+id/text_view_category_4"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:padding="8dp"
           android:text="@string/book_mark_category5"
           android:textColor="@color/C999999"
           android:textSize="12sp"
           app:layout_constraintBottom_toBottomOf="parent"
           app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toEndOf="@+id/circle_3"
+          app:layout_constraintStart_toEndOf="@+id/circle_2"
           app:layout_constraintTop_toTopOf="parent"/>
 
       </android.support.constraint.ConstraintLayout>

app/src/main/res/values/arrays.xml

@@ -44,12 +44,4 @@
     <item>@string/book_mark_sort_category</item>
   </string-array>
 
-  <string-array name="category_names">
-    <item>@string/contents_category1_action_bar_title</item>
-    <item>@string/contents_category2_action_bar_title</item>
-    <item>@string/contents_category3_action_bar_title</item>
-    <item>@string/contents_category4_action_bar_title</item>
-    <item>@string/contents_category5_action_bar_title</item>
-  </string-array>
-
 </resources>