#Task 750 [android] 유닛, Task 목표 디자인 반영

http://www.junstarok.com/redmine/issues/750

rv 2018041201

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

@@ -94,6 +94,7 @@ public class MainProjectListAdapter extends RecyclerView.Adapter<RecyclerView.Vi
             for (int i = 0; i < data.getListProjectCampaignsInfo().size(); i++) {
                 // Campaign contents
                 ProjectCampaignsInfo campaign = data.getListProjectCampaignsInfo().get(i);
+                campaign.setNumber(i + 1);
                 mListData.add(new UnitListViewHolderData(ViewHolderUnitType.HEADER_CAMPAIGN, campaign, (campaign.getListSubTask() != null ? campaign.getListSubTask().size() : 0)));
 
                 // TASK

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

@@ -40,7 +40,7 @@ public class TaskDetailListAdapter extends RecyclerView.Adapter<RecyclerView.Vie
     private TaskDetailRoot mTaskData;
     private ArrayList<MessageListData> mListData;
 
-    private int mEmptyHeight = 300;
+    private int mEmptyHeight = 200;
     private int mTotalCount;
     private int mFlag;
     private Activity mActivity;
@@ -148,20 +148,20 @@ public class TaskDetailListAdapter extends RecyclerView.Adapter<RecyclerView.Vie
             view.onBind(mTaskData, 0);
             mEmptyHeight = HFCommonUtil.getScreenHeight(mContext)
                     - HFCommonUtil.getStatusBarHeight(mContext)
+                    - HFCommonUtil.getPixelFromDimension(mContext, R.dimen.toolbar_height)
                     - view.getHeight();
         } else if (getItemViewType(position) == TYPE_COMMENT_HEADER) {
             CommentHeaderViewHolder view = (CommentHeaderViewHolder) holder;
             boolean isMore = mTotalCount > getCommentCount();
             view.onBind(isMore, mTotalCount);
-            mEmptyHeight -= view.getHeight()
-                    + HFCommonUtil.getPixelFromDimension(mContext, R.dimen.toolbar_height)
-                    + HFCommonUtil.getPixelFromDimension(mContext, R.dimen.comment_min_height);
+            mEmptyHeight -= view.getHeight();
         } else if (getItemViewType(position) == TYPE_COMMENT_CONTENT) {
             CommentListViewHolder view = (CommentListViewHolder) holder;
             int index = getCommentIndex(position);
             view.onBind(mListData.get(index), index);
             view.setLastItem(getCommentCount() - 1 == index);
         } else if (getItemViewType(position) == TYPE_COMMENT_EMPTY) {
+            mEmptyHeight -= HFCommonUtil.getPixelFromDimension(mContext, R.dimen.comment_min_height);
             MarginViewHolder view = (MarginViewHolder) holder;
             view.onBind(mContext.getString(R.string.task_detail_comment_empty), mEmptyHeight);
         }

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

@@ -17,6 +17,7 @@ import kr.co.hanwha.hifive.util.HFDateUtil;
 
 public class MainProjectCampaignHeaderViewHolder extends BaseViewHolder {
     private LinearLayout mLayoutContainer;
+    private TextView mTextViewGoalNumber;
     private TextView mTextViewTitle;
     private TextView mTextViewDueDate;
     private View mViewUnderline;
@@ -26,6 +27,7 @@ public class MainProjectCampaignHeaderViewHolder extends BaseViewHolder {
         super(viewGroup, R.layout.item_main_project_campaign_header);
 
         mLayoutContainer = (LinearLayout) itemView.findViewById(R.id.container_linearLayout);
+        mTextViewGoalNumber = (TextView) itemView.findViewById(R.id.goalNumber_textView);
         mTextViewTitle = (TextView) itemView.findViewById(R.id.title_textView);
         mTextViewDueDate = (TextView) itemView.findViewById(R.id.dueDate_textView);
         mViewUnderline = (View) itemView.findViewById(R.id.underline_view);
@@ -40,6 +42,8 @@ public class MainProjectCampaignHeaderViewHolder extends BaseViewHolder {
             ProjectCampaignsInfo data = (ProjectCampaignsInfo) object;
             mTextViewTitle.setText(data.getDesc());
 
+            mTextViewGoalNumber.setText(Integer.toString(data.getNumber()));
+
             mTextViewDueDate.setText(HFDateUtil.getChangeDateFormat(data.getDue_to(),
                     HFDateUtil.FORMAT_COMMON_SERVER, HFDateUtil.FORMAT_YYYY_MM_DD));
 

app/src/main/java/kr/co/hanwha/hifive/data/model/ProjectCampaignsInfo.java

@@ -7,6 +7,7 @@ import java.util.ArrayList;
  */
 
 public class ProjectCampaignsInfo {
+    int number;
     /**
      * ": "C",
      */
@@ -28,6 +29,14 @@ public class ProjectCampaignsInfo {
      */
     ArrayList<ProjectTaskInfo> listSubTask;
 
+    public int getNumber() {
+        return number;
+    }
+
+    public void setNumber(int number) {
+        this.number = number;
+    }
+
     public int getId() {
         return id;
     }

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

@@ -14,21 +14,42 @@
         android:layout_marginTop="5dp"
         android:background="@drawable/box_rounded_project_campaign_bg"
         android:elevation="@dimen/main_unit_item_elevation"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
 
         <LinearLayout
-            android:layout_width="39.5dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="21.5dp"
-            android:gravity="center_horizontal|top">
+            android:layout_marginBottom="16.5dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="16.5dp"
+            android:gravity="center"
+            android:orientation="vertical">
 
-            <ImageView
+            <kr.co.hanwha.hifive.view.FontTextView
+                style="@style/font_notosans_r_12sp_grey01"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/ic_tq_blue" />
+                android:layout_marginTop="1dp"
+                android:text="@string/main_project_goal" />
+
+            <kr.co.hanwha.hifive.view.FontTextView
+                android:id="@+id/goalNumber_textView"
+                style="@style/font_notosans_b_24sp_grey01"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="-7dp"
+                android:text="0" />
         </LinearLayout>
 
+        <View
+            android:layout_width="0.5dp"
+            android:layout_height="39dp"
+            android:layout_marginLeft="14.5dp"
+            android:layout_marginRight="15dp"
+            android:background="@color/hf_grey11" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

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

@@ -199,7 +199,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:minHeight="55dp"
-            android:visibility="visible">
+            android:visibility="gone">
 
             <View
                 android:layout_width="match_parent"

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@null"
-    android:minHeight="53dp"
+    android:minHeight="@dimen/comment_min_height"
     android:orientation="vertical">
 
     <LinearLayout

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

@@ -86,7 +86,7 @@
     <dimen name="dimen_sp28">28sp</dimen>
     <dimen name="dimen_sp13">13sp</dimen>
 
-    <dimen name="comment_min_height">66dp</dimen>
+    <dimen name="comment_min_height">53dp</dimen><!--66dp-->
     <dimen name="floating_button_bottom_margin_close">72dp</dimen>
     <dimen name="floating_menu_width">41dp</dimen>
     <dimen name="floating_animation_radius">100dp</dimen>

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

@@ -68,6 +68,7 @@
     <string name="main_project_issue_empty">이슈가 없습니다.</string>
     <string name="main_project_member_format">%s 외 %d명</string>
     <string name="main_project_evaluation_subtitle">의 신호등</string>
+    <string name="main_project_goal">목표</string>
 
     <string name="main_dashboard_title">대시보드</string>
     <string name="main_dashboard_empty_project">유닛이 없습니다.</string>

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

@@ -817,6 +817,14 @@
         <item name="fontFamily">NOTOSANS_R</item>
     </style>
 
+    <style name="font_notosans_b_24sp_grey01">
+        <item name="android:textColor">@color/hf_grey01</item>
+        <item name="android:textSize">24sp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="textStyle">bold</item>
+        <item name="fontFamily">NOTOSANS_R</item>
+    </style>
+
     <style name="font_notosans_r_26sp_grey01">
         <item name="android:textColor">@color/hf_grey01</item>
         <item name="android:textSize">26sp</item>