- 기타 디자인 이슈 수정

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

@@ -65,14 +65,6 @@ public class MainDashboardGridViewHolder extends BaseViewHolder {
                 for (int i = 0; i < data.getListCaptains().size(); i++) {
                     memberStr += (i == 0 ? "" : ", ") + data.getListCaptains().get(i).getMember_name();
                 }
-//                String captainStr = data.getListCaptains().get(0).getMember_name();
-                /*
-                if (data.getMemberCount() > 1) {
-                    memberStr += String.format(getContext().getString(R.string.project_main_member_format), captainStr, data.getMemberCount());
-                } else {
-                    memberStr = captainStr;
-                }
-                */
             }
             mTextViewMember.setText(memberStr);
 

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

@@ -59,30 +59,30 @@ public class TaskDetailData extends TaskData {
     @Override
     public String toString() {
         return "TaskDetailData{" +
-                "flag=" + flag +
-                ", task_id=" + task_id +
-                ", author_name='" + author_name + '\'' +
-                ", author_profile_url='" + author_profile_url + '\'' +
-                ", task_name='" + task_name + '\'' +
-                ", author_member_id=" + author_member_id +
-                ", created_at='" + created_at + '\'' +
-                ", member_id=" + member_id +
-                ", updated_at='" + updated_at + '\'' +
-                ", member_name='" + member_name + '\'' +
-                ", message_type=" + message_type +
-                ", member_profile_url='" + member_profile_url + '\'' +
-                ", message_contents='" + message_contents + '\'' +
-                ", project_id=" + project_id +
-                ", ref_task_id=" + ref_task_id +
-                ", project_name='" + project_name + '\'' +
-                ", track_id=" + track_id +
-                ", due_to='" + due_to + '\'' +
-                ", timezone='" + timezone + '\'' +
-                ", repeat_day='" + repeat_day + '\'' +
-                ", description='" + description + '\'' +
-                ", evaluation=" + evaluation +
-                ", is_today=" + is_today +
-                ", status=" + status +
+                "\nflag=" + flag +
+                "\n, task_id=" + task_id +
+                "\n, author_name='" + author_name + '\'' +
+                "\n, author_profile_url='" + author_profile_url + '\'' +
+                "\n, task_name='" + task_name + '\'' +
+                "\n, author_member_id=" + author_member_id +
+                "\n, created_at='" + created_at + '\'' +
+                "\n, member_id=" + member_id +
+                "\n, updated_at='" + updated_at + '\'' +
+                "\n, member_name='" + member_name + '\'' +
+                "\n, message_type=" + message_type +
+                "\n, member_profile_url='" + member_profile_url + '\'' +
+                "\n, message_contents='" + message_contents + '\'' +
+                "\n, project_id=" + project_id +
+                "\n, ref_task_id=" + ref_task_id +
+                "\n, project_name='" + project_name + '\'' +
+                "\n, track_id=" + track_id +
+                "\n, due_to='" + due_to + '\'' +
+                "\n, timezone='" + timezone + '\'' +
+                "\n, repeat_day='" + repeat_day + '\'' +
+                "\n, description='" + description + '\'' +
+                "\n, evaluation=" + evaluation +
+                "\n, is_today=" + is_today +
+                "\n, status=" + status +
                 '}';
     }
 }

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

@@ -5,42 +5,6 @@
     android:background="@color/white"
     android:orientation="vertical">
     <!--android:background="@color/hf_grey21"-->
-    <!-- Toolbar -->
-    <LinearLayout
-        android:id="@+id/toolbarContainer_linearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:id="@+id/toolbar_relativeLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_top_toolbar_height"
-            android:background="@color/white"
-            android:orientation="horizontal">
-
-            <ImageButton
-                android:id="@+id/search_imageButton"
-                android:layout_width="44dp"
-                android:layout_height="44dp"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="1dp"
-                android:layout_toLeftOf="@+id/alarm_imageButton"
-                android:background="@null"
-                android:src="@mipmap/ic_ab_search" />
-
-            <ImageButton
-                android:id="@+id/alarm_imageButton"
-                android:layout_width="44dp"
-                android:layout_height="44dp"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="3dp"
-                android:background="@null"
-                android:src="@mipmap/ic_ab_notice" />
-        </RelativeLayout>
-    </LinearLayout>
-    <!-- Toolbar End -->
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -52,6 +16,7 @@
             style="@style/font_notosans_r_15sp_grey18"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginTop="46dp"
             android:gravity="center"
             android:text="@string/main_project_empty"
             android:visibility="gone" />
@@ -60,6 +25,7 @@
             android:id="@+id/swipeRefreshLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginTop="46dp"
             android:background="@null">
 
             <android.support.v7.widget.RecyclerView
@@ -71,6 +37,38 @@
                 android:overScrollMode="never" />
         </android.support.v4.widget.SwipeRefreshLayout>
 
+        <!-- Toolbar -->
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/main_top_toolbar_height"
+            android:orientation="horizontal">
+
+            <ImageButton
+                android:id="@+id/search_imageButton"
+                android:layout_width="44dp"
+                android:layout_height="44dp"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="1dp"
+                android:layout_toLeftOf="@+id/alarm_imageButton"
+                android:background="@null"
+                android:src="@mipmap/ic_ab_search" />
 
+            <ImageButton
+                android:id="@+id/alarm_imageButton"
+                android:layout_width="44dp"
+                android:layout_height="44dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="3dp"
+                android:background="@null"
+                android:src="@mipmap/ic_ab_notice" />
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="8dp"
+                android:layout_alignParentBottom="true"
+                android:background="@mipmap/gradient_white" />
+        </RelativeLayout>
+        <!-- Toolbar End -->
     </RelativeLayout>
 </LinearLayout>

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

@@ -10,7 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/circle_project_evaluation_green"
-        android:duplicateParentState="true"
         android:elevation="2dp"
         android:gravity="center_vertical"
         android:minHeight="100dp"

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

@@ -15,16 +15,10 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/main_unit_header_margin_left"
             android:layout_marginRight="@dimen/main_unit_header_margin_right"
+            android:layout_marginTop="8dp"
             android:gravity="bottom"
             android:orientation="horizontal">
 
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-            </LinearLayout>
-
             <View
                 android:id="@+id/status_view"
                 android:layout_width="16dp"