DCAU-196 - [Android] 소스 리팩토링

app/app.iml

@@ -116,7 +116,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />

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

@@ -13,6 +13,7 @@ import kr.co.hanwha.hifive.R;
 import kr.co.hanwha.hifive.adapter.contract.MainDashboardListContract;
 import kr.co.hanwha.hifive.base.BaseViewHolder;
 import kr.co.hanwha.hifive.data.model.DabProjectData;
+import kr.co.hanwha.hifive.enums.ProjectAchievementType;
 import kr.co.hanwha.hifive.util.HFLogUtil;
 
 /**
@@ -57,17 +58,19 @@ public class MainDashboardListViewHolder extends BaseViewHolder {
             mTextViewMember.setText(makeMemberStr(data));
             mTextViewUnit.setText(data.getTrack_name());
 
-            int achievement = data.getProject_avg_achieve_rate();
-            if (achievement >= 100)
-                mViewStatus.setBackground(getContext().getResources().getDrawable(R.mipmap.ic_unit_g));
-            else if (achievement >= 60)
-                mViewStatus.setBackground(getContext().getResources().getDrawable(R.mipmap.ic_unit_y));
-            else if (achievement >= 40)
-                mViewStatus.setBackground(getContext().getResources().getDrawable(R.mipmap.ic_unit_o));
-            else if (achievement >= 0)
-                mViewStatus.setBackground(getContext().getResources().getDrawable(R.mipmap.ic_unit_r));
-            else
-                mViewStatus.setBackground(getContext().getResources().getDrawable(R.mipmap.ic_unit_g));
+            ProjectAchievementType achieveType = ProjectAchievementType.valueOf(data.getProject_avg_achieve_rate());
+            switch (achieveType) {
+                case GREEN:
+                    mViewStatus.setBackground(getContext().getResources().getDrawable(R.mipmap.ic_unit_g));
+                case YELLOW:
+                    mViewStatus.setBackground(getContext().getResources().getDrawable(R.mipmap.ic_unit_y));
+                case ORANGE:
+                    mViewStatus.setBackground(getContext().getResources().getDrawable(R.mipmap.ic_unit_o));
+                case RED:
+                    mViewStatus.setBackground(getContext().getResources().getDrawable(R.mipmap.ic_unit_r));
+                default:
+                    mViewStatus.setBackground(getContext().getResources().getDrawable(R.mipmap.ic_unit_g));
+            }
 
             if (mOnMainDashboardListListener != null) {
                 mLayoutBody.setOnClickListener(new View.OnClickListener() {

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

@@ -12,6 +12,7 @@ import kr.co.hanwha.hifive.adapter.model.SearchListViewHolderData;
 import kr.co.hanwha.hifive.data.model.ProjectTaskInfo;
 import kr.co.hanwha.hifive.data.model.TaskData;
 import kr.co.hanwha.hifive.enums.MessageType;
+import kr.co.hanwha.hifive.enums.ProjectAchievementType;
 import kr.co.hanwha.hifive.enums.TaskEvaluationType;
 import kr.co.hanwha.hifive.enums.TaskStatusType;
 
@@ -279,16 +280,19 @@ public class HFTaskUtil {
      * @return 컬러
      */
     public static Drawable getProjectStatusBackground(@NonNull Context context, @NonNull int achievement) {
-        if (achievement >= 100)
-            return context.getResources().getDrawable(R.drawable.rounded_rectangle_status_achievement_green);
-        else if (achievement >= 60)
-            return context.getResources().getDrawable(R.drawable.rounded_rectangle_status_achievement_yellow);
-        else if (achievement >= 40)
-            return context.getResources().getDrawable(R.drawable.rounded_rectangle_status_achievement_orange);
-        else if (achievement >= 0)
-            return context.getResources().getDrawable(R.drawable.rounded_rectangle_status_achievement_red);
-
-        return context.getResources().getDrawable(R.drawable.rounded_rectangle_status_achievement_green);
+        ProjectAchievementType achieveType = ProjectAchievementType.valueOf(achievement);
+        switch (achieveType) {
+            case GREEN:
+                return context.getResources().getDrawable(R.drawable.rounded_rectangle_status_achievement_green);
+            case YELLOW:
+                return context.getResources().getDrawable(R.drawable.rounded_rectangle_status_achievement_yellow);
+            case ORANGE:
+                return context.getResources().getDrawable(R.drawable.rounded_rectangle_status_achievement_orange);
+            case RED:
+                return context.getResources().getDrawable(R.drawable.rounded_rectangle_status_achievement_red);
+            default:
+                return context.getResources().getDrawable(R.drawable.rounded_rectangle_status_achievement_green);
+        }
     }
 
     /**
@@ -299,16 +303,19 @@ public class HFTaskUtil {
      * @return 텍스트 컬러
      */
     public static int getProjectStatusTextColor(@NonNull Context context, @NonNull int achievement) {
-        if (achievement >= 100)
-            return context.getResources().getColor(R.color.hf_green06);
-        else if (achievement >= 60)
-            return context.getResources().getColor(R.color.hf_yellow07);
-        else if (achievement >= 40)
-            return context.getResources().getColor(R.color.hf_orange04);
-        else if (achievement >= 0)
-            return context.getResources().getColor(R.color.hf_red11);
-
-        return context.getResources().getColor(R.color.hf_green06);
+        ProjectAchievementType achieveType = ProjectAchievementType.valueOf(achievement);
+        switch (achieveType) {
+            case GREEN:
+                return context.getResources().getColor(R.color.hf_green06);
+            case YELLOW:
+                return context.getResources().getColor(R.color.hf_yellow07);
+            case ORANGE:
+                return context.getResources().getColor(R.color.hf_orange04);
+            case RED:
+                return context.getResources().getColor(R.color.hf_red11);
+            default:
+                return context.getResources().getColor(R.color.hf_green06);
+        }
     }
 
     /**
@@ -319,16 +326,19 @@ public class HFTaskUtil {
      * @return 컬러
      */
     public static Drawable getProjectIssueTopBackground(@NonNull Context context, @NonNull int achievement) {
-        if (achievement >= 100)
-            return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_green_top);
-        else if (achievement >= 60)
-            return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_yellow_top);
-        else if (achievement >= 40)
-            return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_orange_top);
-        else if (achievement >= 0)
-            return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_red_top);
-
-        return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_green_top);
+        ProjectAchievementType achieveType = ProjectAchievementType.valueOf(achievement);
+        switch (achieveType) {
+            case GREEN:
+                return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_green_top);
+            case YELLOW:
+                return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_yellow_top);
+            case ORANGE:
+                return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_orange_top);
+            case RED:
+                return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_red_top);
+            default:
+                return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_green_top);
+        }
     }
 
     /**
@@ -339,16 +349,19 @@ public class HFTaskUtil {
      * @return 컬러
      */
     public static Drawable getProjectIssueBottomBackground(@NonNull Context context, @NonNull int achievement) {
-        if (achievement >= 100)
-            return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_green_bottom);
-        else if (achievement >= 60)
-            return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_yellow_bottom);
-        else if (achievement >= 40)
-            return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_orange_bottom);
-        else if (achievement >= 0)
-            return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_red_bottom);
-
-        return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_green_bottom);
+        ProjectAchievementType achieveType = ProjectAchievementType.valueOf(achievement);
+        switch (achieveType) {
+            case GREEN:
+                return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_green_bottom);
+            case YELLOW:
+                return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_yellow_bottom);
+            case ORANGE:
+                return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_orange_bottom);
+            case RED:
+                return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_red_bottom);
+            default:
+                return context.getResources().getDrawable(R.drawable.box_rounded_campaign_bg_green_bottom);
+        }
     }