DCA-551 [UXD] To-do 등록, 마진 개선 - Android

DCA-552 [UXD] To-do 등록, KR 하단 마진 좁음 - Android
OKR이 없는 유닛이 있을 시 발생하는 exception 처리

app/src/main/java/kr/co/hanwha/hifive/data/source/TaskCampaignDataRepository.java

@@ -81,26 +81,29 @@ public class TaskCampaignDataRepository implements TaskCampaignDataSource {
 
     @Override
     public ProjectCampaignData getSelectedCampaignData() {
-        // TODO: 30/10/2018 88번라인 NullPointerException 발생했었음 tra-catch 처리 필요
         if (sListCampaignTreeData != null && TextUtils.isEmpty(sVerifiedCampaignKey) == false) {
             for (CampaignTreeData projectData : sListCampaignTreeData) {
                 int projectId = projectData.getProject_id();
                 String projectName = projectData.getProject_name();
-                for (ProjectCampaignsTree objectData : projectData.getListProjectCampaignsTree()) {
-                    for (MemberCampaignsTree keyResultData : objectData.getListMemberCampaignsTree()) {
-                        String dataKey = projectId + "_" + keyResultData.getMember_campaign_id();
-                        if (dataKey.equals(sVerifiedCampaignKey)) return new ProjectCampaignData(new CampaignData(
-                                keyResultData.getMember_campaign_id(),
-                                keyResultData.getMember_campaign_desc(),
-                                projectId,
-                                projectName
-                        ));
+                if (projectData.getListProjectCampaignsTree() != null) {
+                    for (ProjectCampaignsTree objectData : projectData.getListProjectCampaignsTree()) {
+                        for (MemberCampaignsTree keyResultData : objectData.getListMemberCampaignsTree()) {
+                            String dataKey = projectId + "_" + keyResultData.getMember_campaign_id();
+                            if (dataKey.equals(sVerifiedCampaignKey)) return new ProjectCampaignData(new CampaignData(
+                                    keyResultData.getMember_campaign_id(),
+                                    keyResultData.getMember_campaign_desc(),
+                                    projectId,
+                                    projectName
+                            ));
+                        }
                     }
                 }
 //                if (data.getKey().equals(sVerifiedCampaignKey)) return data;
             }
         }
+
         if (sCampaignData != null) return new ProjectCampaignData(sCampaignData);
+
         return null;
     }
 

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

@@ -163,7 +163,9 @@
             <kr.co.hanwha.hifive.view.HFCampaignContainerView
                 android:id="@+id/campaignContainerView"
                 android:layout_width="match_parent"
-                android:layout_height="45dp"
+                android:layout_height="wrap_content"
+                android:paddingTop="6.5dp"
+                android:paddingBottom="6.5dp"
                 android:layout_weight="0" />
 
             <View
@@ -189,7 +191,9 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="45dp"
+                android:layout_height="wrap_content"
+                android:paddingTop="6dp"
+                android:paddingBottom="6dp"
                 android:layout_weight="0"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
@@ -198,7 +202,7 @@
                     android:id="@+id/cancel_textView"
                     style="@style/font_notosans_r_14sp_grey18"
                     android:layout_width="80dp"
-                    android:layout_height="55dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
                     android:gravity="center_vertical"
                     android:paddingLeft="14dp"

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

@@ -6,7 +6,6 @@
     android:layout_weight="0"
     android:background="@drawable/list_bg_translucent_grey13"
     android:gravity="center_vertical"
-    android:minHeight="45dp"
     android:orientation="horizontal">
 
     <LinearLayout
@@ -29,7 +28,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="0dp"
-            android:maxHeight="45dp"
             android:paddingBottom="3dp"
             android:paddingTop="3dp"
             android:text="" />
@@ -45,7 +43,7 @@
     <ImageButton
         android:id="@+id/clearCampaign_imageButton"
         android:layout_width="44dp"
-        android:layout_height="44dp"
+        android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_weight="0"
@@ -56,7 +54,7 @@
 
     <ImageView
         android:layout_width="wrap_content"
-        android:layout_height="44dp"
+        android:layout_height="wrap_content"
         android:layout_marginRight="14dp"
         android:scaleType="centerInside"
         android:src="@mipmap/ic_ar_right" />