Task #1166 [Android] OKR 목록 조회 (유닛별로 모아서 정렬)

http://13.124.195.61/redmine/issues/1166

app/build.gradle

@@ -11,7 +11,7 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
-        buildConfigField "String", "REVISION", "\"2018061101\""
+        buildConfigField "String", "REVISION", "\"2018061201\""
         buildConfigField "String", "RC", "\"rc5\""
 
         buildConfigField "String", "WEB_REAL_URL", "\"https://qtalk.dreamplus.center/newgw/b/v2\""
@@ -23,9 +23,8 @@ android {
         buildConfigField "String", "LOCAL_URL", "\"http://192.168.0.156:38999/a/v2\""
 
         buildConfigField "String", "DOWNLOAD_URL", "\"http://qtalk.dreamplus.center/downloads/\""
-
-
     }
+
     buildTypes {
         release {
             minifyEnabled false

app/src/main/java/kr/co/hanwha/hifive/adapter/AddTaskSelectCampaignListAdapter.java

@@ -6,10 +6,13 @@ import android.widget.Filter;
 import android.widget.Filterable;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 
 import kr.co.hanwha.hifive.adapter.contract.AddTaskSelectCampaignListContract;
 import kr.co.hanwha.hifive.adapter.viewholder.SelectCampaignListViewHolder;
 import kr.co.hanwha.hifive.data.model.CampaignData;
+import kr.co.hanwha.hifive.data.model.MemberInfoData;
 import kr.co.hanwha.hifive.data.model.ProjectCampaignData;
 
 /**
@@ -69,6 +72,8 @@ public class AddTaskSelectCampaignListAdapter extends RecyclerView.Adapter<Recyc
 
         if (list == null) return;
 
+        Collections.sort(list, sortProject);
+
         int lastProjectId = 0;
         for (int i = 0; i < list.size(); i++) {
             ProjectCampaignData data = list.get(i);
@@ -83,6 +88,13 @@ public class AddTaskSelectCampaignListAdapter extends RecyclerView.Adapter<Recyc
         mListSearchData.addAll(mListData);
     }
 
+    private Comparator<ProjectCampaignData> sortProject = new Comparator<ProjectCampaignData>() {
+        @Override
+        public int compare(ProjectCampaignData o1, ProjectCampaignData o2) {
+            return Long.compare(o1.getProject_id(), o2.getProject_id());
+        }
+    };
+
     @Override
     public void setSelectedCampaignKey(String selectedCampaignKey) {
         this.mSelectedCampaignKey = selectedCampaignKey;

app/src/main/java/kr/co/hanwha/hifive/adapter/MainOKRListAdapter.java

@@ -4,6 +4,8 @@ import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 
 import kr.co.hanwha.hifive.adapter.contract.MainOKRListContract;
 import kr.co.hanwha.hifive.adapter.viewholder.OKRCampaignListViewHolder;
@@ -54,6 +56,8 @@ public class MainOKRListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
 
         if (list == null) return;
 
+        Collections.sort(list, sortProject);
+
         int lastProjectId = 0;
         for (int i = 0; i < list.size(); i++) {
             ProjectCampaignData data = list.get(i);
@@ -65,6 +69,13 @@ public class MainOKRListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
 
     }
 
+    private Comparator<ProjectCampaignData> sortProject = new Comparator<ProjectCampaignData>() {
+        @Override
+        public int compare(ProjectCampaignData o1, ProjectCampaignData o2) {
+            return Long.compare(o1.getProject_id(), o2.getProject_id());
+        }
+    };
+
     /**************************************************
      * Adapter
      **************************************************/

app/src/main/java/kr/co/hanwha/hifive/adapter/viewholder/OKRCampaignListViewHolder.java

@@ -14,7 +14,6 @@ import kr.co.hanwha.hifive.data.model.CampaignData;
 public class OKRCampaignListViewHolder extends BaseViewHolder {
     private LinearLayout mLayoutBody;
     private TextView mTextViewProject;
-    private TextView mTextViewCampaignNumber;
     private TextView mTextViewCampaign;
     private View mViewLine;
 
@@ -22,7 +21,6 @@ public class OKRCampaignListViewHolder extends BaseViewHolder {
         super(viewGroup, R.layout.item_okr_campaign_list);
         mLayoutBody = (LinearLayout) itemView.findViewById(R.id.body_linearLayout);
         mTextViewProject = (TextView) itemView.findViewById(R.id.project_textView);
-        mTextViewCampaignNumber = (TextView) itemView.findViewById(R.id.campaignNumber_textView);
         mTextViewCampaign = (TextView) itemView.findViewById(R.id.campaign_textView);
         mViewLine = (View) itemView.findViewById(R.id.line_view);
     }
@@ -40,16 +38,7 @@ public class OKRCampaignListViewHolder extends BaseViewHolder {
             if (TextUtils.isEmpty(data.getCampaign_desc()) == false)
                 mTextViewCampaign.setText(data.getCampaign_desc());
 
-            // TODO ...CHECK
-            mTextViewCampaignNumber.setVisibility(View.GONE);
-
-            if (data.isFirstItem()) {
-                mTextViewProject.setVisibility(View.VISIBLE);
-//                mViewLine.setVisibility(View.VISIBLE);
-            } else {
-                mTextViewProject.setVisibility(View.GONE);
-//                mViewLine.setVisibility(View.GONE);
-            }
+            mTextViewProject.setVisibility(data.isFirstItem() ? View.VISIBLE : View.GONE);
         }
     }
 }

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

@@ -63,7 +63,7 @@
 
         <kr.co.hanwha.hifive.view.FontTextView
             android:id="@+id/project_textView"
-            style="@style/font_notosans_r_26sp_grey01"
+            style="@style/font_notosans_b_26sp_grey01"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/main_unit_header_margin_left"

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

@@ -29,20 +29,6 @@
             android:text="Project"
             android:visibility="gone" />
 
-
-        <kr.co.hanwha.hifive.view.FontTextView
-            android:id="@+id/campaignNumber_textView"
-            style="@style/font_notosans_b_13sp_grey01"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginLeft="28dp"
-            android:layout_marginRight="28dp"
-            android:duplicateParentState="true"
-            android:minHeight="18dp"
-            android:text="0)"
-            android:visibility="gone" />
-
         <kr.co.hanwha.hifive.view.FontTextView
             android:id="@+id/campaign_textView"
             style="@style/font_notosans_r_13sp_grey29"