#Task 902 [android] d-day, 날짜 표시 변경

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

rv 2018041201

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

@@ -65,19 +65,6 @@ public class MainHomeAssignedListViewHolder extends BaseViewHolder {
         final TaskListData data = (TaskListData) object;
 
         if (data != null) {
-            if (HFApplication.DEV_LOG) {
-                String log = "TASK : " + data.getTask_id() +
-                        " PROJECT : " + data.getProject_id() +
-                        " TRACK : " + data.getTrack_id() +
-                        "\nAuthorMemberId : " + data.getAuthor_member_id() +
-                        " MemberId : " + data.getMember_id();
-
-                mTextViewLog.setText(log);
-                mTextViewLog.setVisibility(View.VISIBLE);
-            } else {
-                mTextViewLog.setVisibility(View.GONE);
-            }
-
             mTextViewAuthorName.setText(data.getAuthor_name());
             if (data.getAuthor_member_id() == data.getMember_id()) {
                 mLayoutAuthor.setVisibility(View.GONE);
@@ -87,11 +74,7 @@ public class MainHomeAssignedListViewHolder extends BaseViewHolder {
                 mTextViewMyTask.setVisibility(View.GONE);
             }
 
-//            mTextViewAuthorName.setTextColor(HFTaskUtil.getNameFontColor(getContext(), data.getStatus()));
-//            mTextViewTitle.setTextColor(HFTaskUtil.getTaskFontColor(getContext(), data.getStatus()));
-
             mTextViewTitle.setText(data.getTask_name());
-//            mTextViewTitle.setBackground(null);
 
             if (TaskStatusType.CLOSED.getCode() == data.getStatus()) {//완료
                 mTextViewDueDate.setTextColor(HFTaskUtil.getDueDateFontColor(getContext(), data.getStatus()));
@@ -155,6 +138,19 @@ public class MainHomeAssignedListViewHolder extends BaseViewHolder {
                     }
                 });
             }
+
+            if (HFApplication.DEV_LOG) {
+                String log = "TASK : " + data.getTask_id() +
+                        " PROJECT : " + data.getProject_id() +
+                        " TRACK : " + data.getTrack_id() +
+                        "\nAuthorMemberId : " + data.getAuthor_member_id() +
+                        " MemberId : " + data.getMember_id();
+
+                mTextViewLog.setText(log);
+                mTextViewLog.setVisibility(View.VISIBLE);
+            } else {
+                mTextViewLog.setVisibility(View.GONE);
+            }
         }
     }
 }

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

@@ -45,6 +45,7 @@ public class TaskDetailHeaderViewHolder extends BaseViewHolder {
     private TextView mTextViewProject;
     private TextView mTextViewTitle;
     private ImageView mImageViewDueDate;
+    private TextView mTextViewDday;
     private TextView mTextViewDueDate;
     private View mViewClosedLine;
     private TextView mTextViewClosedDate;
@@ -76,6 +77,7 @@ public class TaskDetailHeaderViewHolder extends BaseViewHolder {
         mTextViewProject = (TextView) itemView.findViewById(R.id.project_textView);
         mTextViewTitle = (TextView) itemView.findViewById(R.id.title_textView);
         mImageViewDueDate = (ImageView) itemView.findViewById(R.id.dueDate_imageView);
+        mTextViewDday = (TextView) itemView.findViewById(R.id.dDay_textView);
         mTextViewDueDate = (TextView) itemView.findViewById(R.id.dueDate_textView);
         mViewClosedLine = (View) itemView.findViewById(R.id.closedLine_view);
         mTextViewClosedDate = (TextView) itemView.findViewById(R.id.closedDate_textView);
@@ -136,12 +138,16 @@ public class TaskDetailHeaderViewHolder extends BaseViewHolder {
                 HFSpanUtil.setDescText(getContext(), mTextViewTitle, data.getDescription(), onTaskDetailListener);
 
                 if (TaskStatusType.CLOSED.getCode() == data.getStatus()) {//완료
+                    mTextViewDday.setVisibility(View.GONE);
+
                     mImageViewDueDate.setImageDrawable(getContext().getResources().getDrawable(R.mipmap.ic_date_gray));
 
-                    mTextViewDueDate.setTextColor(HFTaskUtil.getDueDateFontColor(getContext(), data.getStatus()));
-                    mTextViewDueDate.setText(HFDateUtil.getChangeDateFormat(data.getDue_to(), HFDateUtil.FORMAT_COMMON_SERVER, HFDateUtil.FORMAT_YYYY_MM_DD));
+//                    mTextViewDueDate.setTextColor(HFTaskUtil.getDueDateFontColor(getContext(), data.getStatus()));
+                    mTextViewDueDate.setText(getContext().getString(R.string.task_detail_duedate) + " "
+                            + HFDateUtil.getChangeDateFormat(data.getDue_to(), HFDateUtil.FORMAT_COMMON_SERVER, HFDateUtil.FORMAT_YYYY_MM_DD));
 
                     if (data.getEvaluation() != TaskEvaluationType.CANCELED.getCode()) {
+
                         mViewClosedLine.setVisibility(View.VISIBLE);
                         mTextViewClosedDate.setText(HFStringUtil.getDisplayClosedDateTaskDetail(getContext(), data.getUpdated_at()));
                         mTextViewClosedDate.setVisibility(View.VISIBLE);
@@ -152,8 +158,13 @@ public class TaskDetailHeaderViewHolder extends BaseViewHolder {
                 } else {
                     mImageViewDueDate.setImageDrawable(HFTaskUtil.getDueDateIconDrawable(getContext(), data.getDue_to(), root.getServer_time()));
 
-                    mTextViewDueDate.setTextColor(HFTaskUtil.getDueDateFontColor(getContext(), data.getDue_to(), root.getServer_time()));
-                    mTextViewDueDate.setText(HFTaskUtil.getDueDateText(getContext(), data.getDue_to(), root.getServer_time()));
+                    mTextViewDday.setVisibility(View.VISIBLE);
+                    mTextViewDday.setTextColor(HFTaskUtil.getDueDateFontColor(getContext(), data.getDue_to(), root.getServer_time()));
+                    mTextViewDday.setText(HFTaskUtil.getDueDateText(getContext(), data.getDue_to(), root.getServer_time()));
+                    
+//                    mTextViewDueDate.setTextColor(HFTaskUtil.getDueDateFontColor(getContext(), data.getDue_to(), root.getServer_time()));
+                    mTextViewDueDate.setText(getContext().getString(R.string.task_detail_duedate) + " "
+                            + HFDateUtil.getChangeDateFormat(data.getDue_to(), HFDateUtil.FORMAT_COMMON_SERVER, HFDateUtil.FORMAT_YYYY_MM_DD));
 
                     mViewClosedLine.setVisibility(View.GONE);
                     mTextViewClosedDate.setVisibility(View.GONE);

app/src/main/java/kr/co/hanwha/hifive/util/HFStringUtil.java

@@ -42,7 +42,8 @@ public class HFStringUtil {
     public static String getDisplayClosedDateTaskDetail(@NonNull Context context, @NonNull String updated_at) {
         String display = "";
         if (TextUtils.isEmpty(updated_at) == false)
-            display = HFDateUtil.getChangeDateFormat(updated_at, HFDateUtil.FORMAT_TASK_DUEDATE_SERVER, HFDateUtil.FORMAT_TASK_DUEDATE_DISPLAY) + " " + context.getString(R.string.task_main_task_status_closed);
+            display = context.getString(R.string.task_detail_closed) + " "
+                    + HFDateUtil.getChangeDateFormat(updated_at, HFDateUtil.FORMAT_TASK_DUEDATE_SERVER, HFDateUtil.FORMAT_TASK_DUEDATE_DISPLAY);
 
         return display;
     }

app/src/main/java/kr/co/hanwha/hifive/util/HFTaskUtil.java

@@ -20,7 +20,7 @@ public class HFTaskUtil {
 
     public static int getDueDateFontColor(Context context, String due_to, String server_time) {
         int d_day = HFDateUtil.getCalculateDDayFromToday(due_to, HFDateUtil.FORMAT_TASK_DUEDATE_SERVER);
-        if (d_day > DUEDATE_COLOR) return HFCommonUtil.getColor(context, R.color.gray_8e);
+        if (d_day > DUEDATE_COLOR) return HFCommonUtil.getColor(context, R.color.hf_grey01);
         else
             return HFCommonUtil.getColor(context, R.color.hf_red06);
     }

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

@@ -26,13 +26,21 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="0" />
 
+            <kr.co.hanwha.hifive.view.FontTextView
+                android:id="@+id/dDay_textView"
+                style="@style/font_notosans_r_13sp_grey01"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="7dp"
+                android:text="1일 남음" />
+
             <kr.co.hanwha.hifive.view.FontTextView
                 android:id="@+id/dueDate_textView"
                 style="@style/font_notosans_r_13sp_grey01"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="7dp"
-                android:text="2018-01-01" />
+                android:text="기한 2018-01-01" />
 
             <View
                 android:id="@+id/closedLine_view"
@@ -40,16 +48,18 @@
                 android:layout_height="10dp"
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="8dp"
-                android:background="@color/hf_grey14" />
+                android:background="@color/hf_grey14"
+                android:visibility="gone" />
 
             <kr.co.hanwha.hifive.view.FontTextView
                 android:id="@+id/closedDate_textView"
-                style="@style/font_notosans_r_13sp_red06"
+                style="@style/font_notosans_r_13sp_grey01"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
                 android:gravity="center_vertical"
-                android:text="2018-03-03 완료" />
+                android:text="2018-03-03 완료"
+                android:visibility="gone" />
 
             <View
                 android:layout_width="match_parent"

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

@@ -101,7 +101,7 @@
     <string name="task_main_duedate_today">오늘</string>
     <string name="task_main_duedate_tomorrow">내일</string>
     <string name="task_main_duedate_over">%d일 지남</string>
-    <string name="task_main_duedate_left">%d일전</string>
+    <string name="task_main_duedate_left">%d일 남음</string>
 
     <string name="task_main_task_status_assigned">진행중</string>
     <string name="task_main_task_status_requested">수락대기</string>
@@ -164,6 +164,8 @@
     <string name="task_detail_task_title">제목</string>
     <string name="task_detail_description">설명</string>
     <string name="task_detail_message">메시지</string>
+    <string name="task_detail_duedate">기한</string>
+    <string name="task_detail_closed">완료</string>
     <string name="task_detail_comment">댓글</string>
     <string name="task_detail_comment_write">등록</string>
     <string name="task_detail_comment_more">이전 댓글 더 보기</string>