#Task 923 [android] 유닛, 수행자의 오늘의 to-do 표시

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

rv 2018041602

app/build.gradle

@@ -7,10 +7,10 @@ android {
         minSdkVersion 21
         targetSdkVersion 26
         versionCode 1
-        versionName '0.7.0'
+        versionName '0.7.1'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-        buildConfigField "String", "REVISION", "\"2018041303\""
+        buildConfigField "String", "REVISION", "\"2018041602\""
 
         buildConfigField "String", "WEB_REAL_URL", "\"https://qtalk.dreamplus.center/newgw/b/v2\""
         buildConfigField "String", "WEB_DEV_URL", "\"https://qtalk-dev.dreamplus.center/newgw/b/v2\""

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

@@ -3,6 +3,7 @@ package kr.co.hanwha.hifive.adapter.viewholder;
 import android.support.annotation.NonNull;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -19,6 +20,7 @@ import kr.co.hanwha.hifive.util.HFTaskUtil;
 
 public class MainProjectTaskListViewHolder extends BaseViewHolder {
     private LinearLayout mLayoutContainer;
+    private ImageView mImageViewStatus;
     private TextView mTextViewTitle;
     private TextView mTextViewDueDate;
     private TextView mTextViewReceiverName;
@@ -37,6 +39,7 @@ public class MainProjectTaskListViewHolder extends BaseViewHolder {
         mOnMainProjectListListener = onMainProjectListListener;
 
         mLayoutContainer = (LinearLayout) itemView.findViewById(R.id.container_linearLayout);
+        mImageViewStatus = (ImageView) itemView.findViewById(R.id.status_imageView);
         mTextViewTitle = (TextView) itemView.findViewById(R.id.title_textView);
         mTextViewDueDate = (TextView) itemView.findViewById(R.id.dueDate_textView);
         mTextViewReceiverName = (TextView) itemView.findViewById(R.id.receiverName_textView);
@@ -73,6 +76,9 @@ public class MainProjectTaskListViewHolder extends BaseViewHolder {
                 mLayoutContainer.setBackground(getContext().getResources().getDrawable(R.drawable.box_rounded_project_task_bg_middle));
             }
 
+            mImageViewStatus.setImageDrawable(data.isIs_today() ? getContext().getResources().getDrawable(R.drawable.circle_blue02) :
+                    getContext().getResources().getDrawable(R.drawable.circle_grey28));
+
             mTextViewTitle.setText(data.getDesc());
 
             mTextViewReceiverName.setText(data.getMember_name());

app/src/main/java/kr/co/hanwha/hifive/admin/admin/AdminVersionAddActivity.java

@@ -148,6 +148,8 @@ public class AdminVersionAddActivity extends BaseActivity {
             mEditTextUrl.setText(TextUtils.isEmpty(update_url) ? "" : update_url);
 
             mEditTextStringBundle.setText(TextUtils.isEmpty(string_bundle) ? "" : string_bundle);
+
+//            setReleasedDate(HFDateUtil.getDateFormatToday(HFDateUtil.FORMAT_TASK_ADD_DUEDATE_SERVER));
         } else {
             setReleasedDate(HFDateUtil.getDateFormatToday(HFDateUtil.FORMAT_TASK_ADD_DUEDATE_SERVER));
         }

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

@@ -30,6 +30,8 @@ public class ProjectTaskInfo {
      */
     String member_name;
 
+    boolean is_today;
+
     public int getId() {
         return id;
     }
@@ -49,15 +51,21 @@ public class ProjectTaskInfo {
     public String getMember_name() {
         return member_name;
     }
+
+    public boolean isIs_today() {
+        return is_today;
+    }
 }
 /*
 {
     "category": "T",
-    "id": 832,
-    "desc": "aa",
-    "due_to": "2018-02-14 23:59:59.0",
+    "id": 1175,
+    "desc": "보안 검토 회의",
+    "due_to": "2018-04-13 23:59:59.0",
+    "ordering": 5,
     "member_id": 327,
     "member_name": "권상훈Android",
+    "is_today": false,
     "listSubTask": [],
 }
  */

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

@@ -1,15 +0,0 @@
-package kr.co.hanwha.hifive.data.model;
-
-import java.util.ArrayList;
-
-/**
- * Created by sanghoonkwon on 2018. 1. 11..
- */
-
-public class ProjectTaskRoot extends BaseData {
-    ArrayList<TaskListData> listProjectTaskInfos;
-
-    public ArrayList<TaskListData> getListProjectTaskInfos() {
-        return listProjectTaskInfos;
-    }
-}

app/src/main/java/kr/co/hanwha/hifive/screen/main/setting/MainSettingFragment.java

@@ -39,7 +39,6 @@ public class MainSettingFragment extends BaseFragment implements MainSettingCont
     private LinearLayout mLayoutUnit;
     private LinearLayout mLayoutTab;
     private TextView mTextViewTab;
-    //    private ImageButton mImageButtonAlarm;
     private Switch mSwitchAlarm;
     private TextView mTextViewVersion;
     private TextView mTextViewUpdate;
@@ -149,10 +148,6 @@ public class MainSettingFragment extends BaseFragment implements MainSettingCont
                 case R.id.tab_linearLayout:
                     HFActivityUtil.startSettingScreenActivity(getActivity());
                     break;
-//                case R.id.alarm_imageButton:
-//                    mImageButtonAlarm.setSelected(!mImageButtonAlarm.isSelected());
-//                    mPresenter.setAlarmSetting(mImageButtonAlarm.isSelected());
-//                    break;
                 case R.id.alarm_switch:
                     mSwitchAlarm.setSelected(!mSwitchAlarm.isSelected());
                     mPresenter.setAlarmSetting(mSwitchAlarm.isSelected());

app/src/main/java/kr/co/hanwha/hifive/screen/main/setting/MainSettingPresenter.java

@@ -41,13 +41,13 @@ public class MainSettingPresenter implements MainSettingContract.Presenter {
     }
 
     @Override
-    public void doUnitManagement() {
-        HFActivityUtil.startMainSettingUnitWebviewActivity(getActivity());
+    public void doMemberManagement() {
+        HFActivityUtil.startMainSettingEditProfileWebviewActivity(getActivity());
     }
 
     @Override
-    public void doMemberManagement() {
-        HFActivityUtil.startMainSettingEditProfileWebviewActivity(getActivity());
+    public void doUnitManagement() {
+        HFActivityUtil.startMainSettingUnitWebviewActivity(getActivity());
     }
 
     @Override

app/src/main/res/drawable/circle_grey28.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="@color/hf_grey28" />
+</shape>

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

@@ -238,16 +238,6 @@
                         android:switchMinWidth="50dp"
                         android:thumb="@mipmap/btn_toggle_circle"
                         android:track="@drawable/switch_track_selector" />
-
-                    <ImageButton
-                        android:id="@+id/alarm_imageButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="16dp"
-                        android:layout_weight="0"
-                        android:background="@null"
-                        android:src="@drawable/button_toggle"
-                        android:visibility="gone" />
                 </LinearLayout>
             </LinearLayout>
             <!-- 기본화면  / 알림 END -->

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

@@ -25,13 +25,20 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="17dp"
+            android:layout_marginLeft="16dp"
             android:layout_marginRight="17dp"
             android:layout_marginTop="12.5dp"
             android:gravity="center_vertical"
             android:minHeight="20dp"
             android:orientation="horizontal">
 
+            <ImageView
+                android:id="@+id/status_imageView"
+                android:layout_width="6dp"
+                android:layout_height="6dp"
+                android:layout_marginRight="8dp"
+                android:src="@drawable/circle_grey28" />
+
             <kr.co.hanwha.hifive.view.FontTextView
                 android:id="@+id/title_textView"
                 style="@style/font_notosans_r_14sp_grey02"
@@ -62,7 +69,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="12.5dp"
-            android:layout_marginLeft="17dp"
+            android:layout_marginLeft="30dp"
             android:layout_marginRight="17dp"
             android:layout_marginTop="2dp"
             android:gravity="center_vertical"

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

@@ -52,6 +52,7 @@
     <color name="hf_grey25">#f1f5f7</color>
     <color name="hf_grey26">#b5b7bf</color>
     <color name="hf_grey27">#e8e9ea</color>
+    <color name="hf_grey28">#dde0e6</color>
 
     <color name="hf_green01">#a7f076</color>
     <color name="hf_green02">#d3f7ba</color>