瀏覽代碼

- 기타 디자인 이슈 수정

sanghoonkwon 7 年之前
父節點
當前提交
d7fdf2952c

二進制
.gradle/4.1/fileHashes/fileHashes.bin


二進制
.gradle/4.1/fileHashes/fileHashes.lock


二進制
.gradle/4.1/taskHistory/fileSnapshots.bin


二進制
.gradle/4.1/taskHistory/taskHistory.bin


二進制
.gradle/4.1/taskHistory/taskHistory.lock


+ 7 - 0
app/src/main/java/kr/co/hanwha/hifive/adapter/viewholder/MainProjectHeaderViewHolder.java

@@ -41,6 +41,7 @@ public class MainProjectHeaderViewHolder extends BaseViewHolder {
     private TextView mTextViewSubTitle;
     private View mViewStatus;
     private View mViewStatus2;
+    private View mViewStatus3;
     private TextView mTextViewColor;
 
     private LinearLayout mLayoutIssueTop;
@@ -71,6 +72,7 @@ public class MainProjectHeaderViewHolder extends BaseViewHolder {
         mTextViewSubTitle = (TextView) itemView.findViewById(R.id.subTitle_textView);
         mViewStatus = (View) itemView.findViewById(R.id.status_view);
         mViewStatus2 = (View) itemView.findViewById(R.id.status2_view);
+        mViewStatus3 = (View) itemView.findViewById(R.id.status3_view);
         mTextViewColor = (TextView) itemView.findViewById(R.id.color_textView);
 
         mLayoutIssueTop = (LinearLayout) itemView.findViewById(R.id.issueTop_linearLayout);
@@ -176,13 +178,18 @@ public class MainProjectHeaderViewHolder extends BaseViewHolder {
             if (status == null) {
                 mViewStatus.setVisibility(View.GONE);
                 mViewStatus2.setVisibility(View.GONE);
+                mViewStatus3.setVisibility(View.GONE);
             } else {
                 mViewStatus.setBackground(status);
                 mViewStatus.setVisibility(View.VISIBLE);
                 if (data.getEvaluation() == ProjectEvaluationType.YELLOW_DOUBLE.getCode()) {
+                    mViewStatus.setVisibility(View.GONE);
                     mViewStatus2.setVisibility(View.VISIBLE);
+                    mViewStatus3.setVisibility(View.VISIBLE);
                 } else {
+                    mViewStatus.setVisibility(View.VISIBLE);
                     mViewStatus2.setVisibility(View.GONE);
+                    mViewStatus3.setVisibility(View.GONE);
                 }
             }
 

+ 4 - 0
app/src/main/res/layout/activity_test_design.xml

@@ -312,6 +312,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="20dp" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:background="@color/hf_grey22" />
             <!-- Unit -->
             <LinearLayout
                 android:layout_width="match_parent"

+ 1 - 4
app/src/main/res/layout/item_main_project_campaign_header.xml

@@ -5,9 +5,6 @@
     android:background="@color/hf_grey21"
     android:orientation="vertical">
 
-    <!--android:layout_marginTop="5dp"
-        android:layout_marginBottom="10dp"
-        android:elevation="@dimen/main_unit_item_elevation"-->
     <LinearLayout
         android:id="@+id/container_linearLayout"
         android:layout_width="match_parent"
@@ -16,7 +13,7 @@
         android:layout_marginRight="@dimen/main_unit_item_task_left_margin"
         android:layout_marginTop="5dp"
         android:background="@drawable/box_rounded_project_campaign_bg"
-        android:elevation="1dp"
+        android:elevation="@dimen/main_unit_item_elevation"
         android:orientation="horizontal">
 
 

+ 15 - 5
app/src/main/res/layout/item_main_project_header.xml

@@ -24,23 +24,33 @@
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:layout_centerInParent="true"
+                android:layout_marginBottom="1dp"
                 android:background="@drawable/rounded_rectangle_status_evaluation_green"
                 android:elevation="0dp"
                 android:visibility="visible" />
 
             <View
                 android:id="@+id/status2_view"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
                 android:layout_centerInParent="true"
-                android:layout_marginLeft="8dp"
+                android:layout_marginBottom="3dp"
+                android:background="@drawable/rounded_rectangle_status_evaluation_yellow"
+                android:visibility="gone" />
+
+            <View
+                android:id="@+id/status3_view"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:layout_centerInParent="true"
+                android:layout_marginBottom="3dp"
+                android:layout_marginLeft="3.5dp"
                 android:background="@drawable/rounded_rectangle_status_evaluation_yellow"
-                android:elevation="0dp"
                 android:visibility="gone" />
 
             <kr.co.hanwha.hifive.view.FontTextView
                 android:id="@+id/color_textView"
-                style="@style/font_notosans_r_13sp_blue03"
+                style="@style/font_notosans_r_13sp_blue02"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingLeft="7dp"

+ 1 - 1
app/src/main/res/layout/item_main_project_task_list.xml

@@ -12,7 +12,7 @@
         android:layout_marginLeft="@dimen/main_unit_item_task_left_margin"
         android:layout_marginRight="@dimen/main_unit_item_task_left_margin"
         android:background="@drawable/box_rounded_project_task_bg_bottom"
-        android:elevation="1dp"
+        android:elevation="@dimen/main_unit_item_elevation"
         android:orientation="vertical">
 
         <View

+ 1 - 1
app/src/main/res/values/dimens.xml

@@ -22,7 +22,7 @@
     <dimen name="main_home_item_elevation">2dp</dimen>
 
     <dimen name="main_unit_item_margin_top">10dp</dimen>
-    <dimen name="main_unit_item_elevation">3dp</dimen>
+    <dimen name="main_unit_item_elevation">1dp</dimen>
     <dimen name="main_unit_item_task_left_margin">9dp</dimen>
     <dimen name="main_unit_item_track_min_height">40dp</dimen>
     <dimen name="main_unit_item_project_min_height">55dp</dimen>