Selaa lähdekoodia

Main Tab 버그 수정

sanghoonkwon 7 vuotta sitten
vanhempi
commit
a9321b9098

+ 1 - 1
app/src/main/java/kr/co/hanwha/hifive/data/source/AlarmDataRepository.java

@@ -51,7 +51,7 @@ public class AlarmDataRepository implements AlarmDataSource {
 
             @Override
             public void onFailure(HanwhaNetworkError error) {
-                if (error != null && error.getStatusCode() == -2) {
+                if (error != null && error.getStatusCode() == HanwhaNetworkError.CODE_EMPTY_DATA) {
                     callback.onSuccess(null);
                 } else
                     callback.onFailure(error);

+ 3 - 3
app/src/main/java/kr/co/hanwha/hifive/data/source/ProjectDataRepository.java

@@ -66,7 +66,7 @@ public class ProjectDataRepository implements ProjectDataSource {
 
             @Override
             public void onFailure(HanwhaNetworkError error) {
-                if (error != null && error.getStatusCode() == -2) {
+                if (error != null && error.getStatusCode() == HanwhaNetworkError.CODE_EMPTY_DATA) {
                     callback.onSuccess(null);
                 } else
                     callback.onFailure(error);
@@ -97,7 +97,7 @@ public class ProjectDataRepository implements ProjectDataSource {
 
             @Override
             public void onFailure(HanwhaNetworkError error) {
-                if (error != null && error.getStatusCode() == -2) {
+                if (error != null && error.getStatusCode() == HanwhaNetworkError.CODE_EMPTY_DATA) {
                     callback.onSuccess(null);
                 } else
                     callback.onFailure(error);
@@ -156,7 +156,7 @@ public class ProjectDataRepository implements ProjectDataSource {
 
             @Override
             public void onFailure(HanwhaNetworkError error) {
-                if (error != null && error.getStatusCode() == -2) {
+                if (error != null && error.getStatusCode() == HanwhaNetworkError.CODE_EMPTY_DATA) {
                     callback.onSuccess(null);
                 } else
                     callback.onFailure(error);

+ 53 - 22
app/src/main/java/kr/co/hanwha/hifive/data/source/TaskDataRepository.java

@@ -152,7 +152,7 @@ public class TaskDataRepository implements TaskDataSource {
      */
     public static int getSelectedMemberid() {
         ArrayList<MemberInfoData> list = getSelectedMemberList();
-        if (list != null && list.size() > 0) {
+        if (list.size() > 0) {
             return list.get(0).getMember_id();
         }
         return 0;
@@ -232,8 +232,10 @@ public class TaskDataRepository implements TaskDataSource {
     };
 
     @Override
-    public void requestSetTaskToday(@NonNull Context context, @NonNull TaskData taskData,
-                                    @NonNull boolean isToday, @Nullable HanwhaNetworkCallback callback) {
+    public void requestSetTaskToday(@NonNull Context context,
+                                    @NonNull TaskData taskData,
+                                    @NonNull boolean isToday,
+                                    @Nullable HanwhaNetworkCallback callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
         taskData.setIs_today(isToday);
         HFNetworkUtil networkUtil = new HFNetworkUtil();
@@ -241,7 +243,8 @@ public class TaskDataRepository implements TaskDataSource {
     }
 
     @Override
-    public void requestTasksGetMainAssigned(@NonNull Context context, @NonNull final HanwhaNetworkCallback<MainHomeAssignedRoot> callback) {
+    public void requestTasksGetMainAssigned(@NonNull Context context,
+                                            @NonNull final HanwhaNetworkCallback<MainHomeAssignedRoot> callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
 
         HFNetworkUtil networkUtil = new HFNetworkUtil();
@@ -253,7 +256,7 @@ public class TaskDataRepository implements TaskDataSource {
 
             @Override
             public void onFailure(HanwhaNetworkError error) {
-                if (error != null && error.getStatusCode() == -2) {
+                if (error != null && error.getStatusCode() == HanwhaNetworkError.CODE_EMPTY_DATA) {
                     callback.onSuccess(null);
                 } else
                     callback.onFailure(error);
@@ -272,7 +275,8 @@ public class TaskDataRepository implements TaskDataSource {
     }
 
     @Override
-    public void requestTasksGetMainRequest(@NonNull Context context, @NonNull final HanwhaNetworkCallback<MainHomeRequestRoot> callback) {
+    public void requestTasksGetMainRequest(@NonNull Context context,
+                                           @NonNull final HanwhaNetworkCallback<MainHomeRequestRoot> callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
 
         HFNetworkUtil networkUtil = new HFNetworkUtil();
@@ -284,7 +288,7 @@ public class TaskDataRepository implements TaskDataSource {
 
             @Override
             public void onFailure(HanwhaNetworkError error) {
-                if (error != null && error.getStatusCode() == -2) {
+                if (error != null && error.getStatusCode() == HanwhaNetworkError.CODE_EMPTY_DATA) {
                     callback.onSuccess(null);
                 } else
                     callback.onFailure(error);
@@ -303,7 +307,8 @@ public class TaskDataRepository implements TaskDataSource {
     }
 
     @Override
-    public void requestAllMember(@NonNull Context context, @NonNull final HanwhaNetworkCallback callback) {
+    public void requestAllMember(@NonNull Context context,
+                                 @NonNull final HanwhaNetworkCallback callback) {
         if (sListMemberInfo == null || sListMemberInfo.size() == 0) {
             String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
             HFNetworkUtil networkUtil = new HFNetworkUtil();
@@ -355,7 +360,9 @@ public class TaskDataRepository implements TaskDataSource {
     }
 
     @Override
-    public void requestCampaignListByProjectId(@NonNull Context context, @NonNull ArrayList<Integer> listReqProjectId, @NonNull final HanwhaNetworkCallback callback) {
+    public void requestCampaignListByProjectId(@NonNull Context context,
+                                               @NonNull ArrayList<Integer> listReqProjectId,
+                                               @NonNull final HanwhaNetworkCallback callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
         HFNetworkUtil networkUtil = new HFNetworkUtil();
         networkUtil.requestCampaignListByProjectId(context, encryption_member_id,
@@ -388,7 +395,9 @@ public class TaskDataRepository implements TaskDataSource {
     }
 
     @Override
-    public void requestCampaignListByMemberId(@NonNull Context context, @NonNull ArrayList<Integer> listMemberInfo, @NonNull final HanwhaNetworkCallback callback) {
+    public void requestCampaignListByMemberId(@NonNull Context context,
+                                              @NonNull ArrayList<Integer> listMemberInfo,
+                                              @NonNull final HanwhaNetworkCallback callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
         HFNetworkUtil networkUtil = new HFNetworkUtil();
         networkUtil.requestCampaignListByMemberId(context, encryption_member_id,
@@ -514,7 +523,9 @@ public class TaskDataRepository implements TaskDataSource {
     }
 
     @Override
-    public void requestDeleteTask(@NonNull Context context, @NonNull TaskData taskData, @Nullable HanwhaNetworkCallback callback) {
+    public void requestDeleteTask(@NonNull Context context,
+                                  @NonNull TaskData taskData,
+                                  @Nullable HanwhaNetworkCallback callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
         HFNetworkUtil networkUtil = new HFNetworkUtil();
         networkUtil.requestTaskDelete(context, taskData, encryption_member_id, callback);
@@ -530,7 +541,10 @@ public class TaskDataRepository implements TaskDataSource {
     }
 
     @Override
-    public void requestTaskReject(@NonNull Context context, @NonNull TaskData taskData, @NonNull String message, @Nullable HanwhaNetworkCallback<BaseData> callback) {
+    public void requestTaskReject(@NonNull Context context,
+                                  @NonNull TaskData taskData,
+                                  @NonNull String message,
+                                  @Nullable HanwhaNetworkCallback<BaseData> callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
 
         HFNetworkUtil networkUtil = new HFNetworkUtil();
@@ -538,7 +552,9 @@ public class TaskDataRepository implements TaskDataSource {
     }
 
     @Override
-    public void requestGetMessageList(@NonNull Context context, @NonNull int task_id, @NonNull int current_page,
+    public void requestGetMessageList(@NonNull Context context,
+                                      @NonNull int task_id,
+                                      @NonNull int current_page,
                                       @Nullable final HanwhaNetworkCallback<MessageListRoot> callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
         HFNetworkUtil networkUtil = new HFNetworkUtil();
@@ -546,21 +562,28 @@ public class TaskDataRepository implements TaskDataSource {
     }
 
     @Override
-    public void requestAddMessage(@NonNull Context context, @NonNull int task_id, @NonNull String contents, @Nullable HanwhaNetworkCallback<MessageAddData> callback) {
+    public void requestAddMessage(@NonNull Context context,
+                                  @NonNull int task_id,
+                                  @NonNull String contents,
+                                  @Nullable HanwhaNetworkCallback<MessageAddData> callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
         HFNetworkUtil networkUtil = new HFNetworkUtil();
         networkUtil.requestAddMessage(context, encryption_member_id, task_id, contents, callback);
     }
 
     @Override
-    public void requestDeleteMessage(@NonNull Context context, @NonNull int id, @Nullable HanwhaNetworkCallback callback) {
+    public void requestDeleteMessage(@NonNull Context context,
+                                     @NonNull int id,
+                                     @Nullable HanwhaNetworkCallback callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
         HFNetworkUtil networkUtil = new HFNetworkUtil();
         networkUtil.requestDeleteMessage(context, encryption_member_id, id, callback);
     }
 
     @Override
-    public void requestSearchTaskByTag(@NonNull Context context, @NonNull String searchTag, @Nullable final HanwhaNetworkCallback<SearchTagData> callback) {
+    public void requestSearchTaskByTag(@NonNull Context context,
+                                       @NonNull String searchTag,
+                                       @Nullable final HanwhaNetworkCallback<SearchTagData> callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
         HFNetworkUtil networkUtil = new HFNetworkUtil();
         networkUtil.requestSearchTaskByTag(context, encryption_member_id, searchTag, new HanwhaNetworkCallback<SearchTagData>() {
@@ -571,7 +594,7 @@ public class TaskDataRepository implements TaskDataSource {
 
             @Override
             public void onFailure(HanwhaNetworkError error) {
-                if (error != null && error.getStatusCode() == -2) {
+                if (error != null && error.getStatusCode() == HanwhaNetworkError.CODE_EMPTY_DATA) {
                     callback.onSuccess(null);
                 } else
                     callback.onFailure(error);
@@ -590,7 +613,9 @@ public class TaskDataRepository implements TaskDataSource {
     }
 
     @Override
-    public void requestSetTaskDeleteRequest(@NonNull Context context, @NonNull TaskData taskData, @Nullable HanwhaNetworkCallback callback) {
+    public void requestSetTaskDeleteRequest(@NonNull Context context,
+                                            @NonNull TaskData taskData,
+                                            @Nullable HanwhaNetworkCallback callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
 
         HFNetworkUtil networkUtil = new HFNetworkUtil();
@@ -598,7 +623,9 @@ public class TaskDataRepository implements TaskDataSource {
     }
 
     @Override
-    public void requestSetTaskReRequest(@NonNull Context context, @NonNull TaskData taskData, @Nullable HanwhaNetworkCallback callback) {
+    public void requestSetTaskReRequest(@NonNull Context context,
+                                        @NonNull TaskData taskData,
+                                        @Nullable HanwhaNetworkCallback callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
 
         HFNetworkUtil networkUtil = new HFNetworkUtil();
@@ -616,7 +643,9 @@ public class TaskDataRepository implements TaskDataSource {
     }
 
     @Override
-    public void requestSetTaskEvaluationAccept(@NonNull Context context, @NonNull TaskData taskData, @Nullable HanwhaNetworkCallback callback) {
+    public void requestSetTaskEvaluationAccept(@NonNull Context context,
+                                               @NonNull TaskData taskData,
+                                               @Nullable HanwhaNetworkCallback callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
 
         HFNetworkUtil networkUtil = new HFNetworkUtil();
@@ -624,8 +653,10 @@ public class TaskDataRepository implements TaskDataSource {
     }
 
     @Override
-    public void requestSetTaskEvaluationReject(@NonNull Context context, @NonNull TaskData taskData,
-                                               @NonNull String message, @Nullable HanwhaNetworkCallback callback) {
+    public void requestSetTaskEvaluationReject(@NonNull Context context,
+                                               @NonNull TaskData taskData,
+                                               @NonNull String message,
+                                               @Nullable HanwhaNetworkCallback callback) {
         String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
 
         HFNetworkUtil networkUtil = new HFNetworkUtil();

+ 2 - 0
app/src/main/java/kr/co/hanwha/hifive/network/hanwha/HanwhaNetworkError.java

@@ -9,6 +9,8 @@ import okhttp3.Response;
  */
 
 public class HanwhaNetworkError {
+    public static final int CODE_EMPTY_DATA = -2;
+    
     public static final int CODE_SUCCESS = 200;
     public static final int CODE_404_NOT_FOUND_ERROR = 404;
     public static final int CODE_DEFAULT = 9000;

+ 4 - 6
app/src/main/java/kr/co/hanwha/hifive/screen/main/home/MainHomeFragment.java

@@ -63,20 +63,18 @@ public class MainHomeFragment extends BaseFragment implements MainHomeContract.V
         mViewAssigned = layoutInflater.inflate(R.layout.fragment_main_home_sub, container, false);
         mViewRequest = layoutInflater.inflate(R.layout.fragment_main_home_sub, container, false);
 
+        // 내 업무
         mAdapterAssigned = new MainHomeAssignedListAdapter(getActivity(), onMainHomeListListener);
-
         mRefreshLayoutAssigned = (SwipeRefreshLayout) mViewAssigned.findViewById(R.id.swipeRefreshLayout);
-//        mRefreshLayoutAssigned.setLoadEnable(false);
         mRefreshLayoutAssigned.setOnRefreshListener(onMineRefreshListener);
 
         mRecyclerViewAssigned = (RecyclerView) mViewAssigned.findViewById(R.id.recyclerView);
         mRecyclerViewAssigned.setLayoutManager(new LinearLayoutManager(getActivity()));
         mRecyclerViewAssigned.setAdapter(mAdapterAssigned);
 
+        // 요청함
         mAdapterRequest = new MainHomeRequestListAdapter(getActivity(), onMainHomeListListener);
-
         mRefreshLayoutRequest = (SwipeRefreshLayout) mViewRequest.findViewById(R.id.swipeRefreshLayout);
-//        mRefreshLayoutRequest.setLoadEnable(false);
         mRefreshLayoutRequest.setOnRefreshListener(onRequestRefreshListener);
 
         mRecyclerViewRequest = (RecyclerView) mViewRequest.findViewById(R.id.recyclerView);
@@ -91,7 +89,7 @@ public class MainHomeFragment extends BaseFragment implements MainHomeContract.V
 
         parent.findViewById(R.id.alarm_imageButton).setOnClickListener(onClickListener);
         parent.findViewById(R.id.search_imageButton).setOnClickListener(onClickListener);
-        parent.findViewById(R.id.okr_textView).setOnClickListener(onClickListener);
+        parent.findViewById(R.id.okr_linearLayout).setOnClickListener(onClickListener);
 
         mPresenter = new MainHomePresenter(getActivity(), this,
                 mAdapterAssigned, mAdapterAssigned,
@@ -137,7 +135,7 @@ public class MainHomeFragment extends BaseFragment implements MainHomeContract.V
                 case R.id.search_imageButton:
                     HFActivityUtil.startSearchActivity(getActivity());
                     break;
-                case R.id.okr_textView:
+                case R.id.okr_linearLayout:
                     HFActivityUtil.startMainOKRActivity(getActivity());
                     break;
             }

+ 3 - 17
app/src/main/java/kr/co/hanwha/hifive/screen/main/project/MainProjectFragment.java

@@ -6,32 +6,18 @@ import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.Spinner;
 import android.widget.TextView;
 
-import java.lang.reflect.Field;
-
 import kr.co.hanwha.hifive.R;
 import kr.co.hanwha.hifive.adapter.MainProjectListAdapter;
-import kr.co.hanwha.hifive.adapter.ProjectSpinnerAdapter;
 import kr.co.hanwha.hifive.adapter.contract.MainProjectListContract;
 import kr.co.hanwha.hifive.base.BaseFragment;
-import kr.co.hanwha.hifive.data.model.ProjectInfo;
 import kr.co.hanwha.hifive.data.model.ProjectTaskInfo;
-import kr.co.hanwha.hifive.data.source.MemberDataRepository;
-import kr.co.hanwha.hifive.dialog.HFProjectColorDialog;
-import kr.co.hanwha.hifive.dialog.HFSingleDialog;
-import kr.co.hanwha.hifive.enums.ProjectEvaluationType;
 import kr.co.hanwha.hifive.enums.ProjectFilterType;
-import kr.co.hanwha.hifive.network.HFNetworkUtil;
-import kr.co.hanwha.hifive.screen.main.dashboard.DashboardProjectActivity;
 import kr.co.hanwha.hifive.util.HFActivityUtil;
-import kr.co.hanwha.hifive.util.HFCommonUtil;
 import kr.co.hanwha.hifive.util.HFInfoUtil;
 
 /**
@@ -104,7 +90,7 @@ public class MainProjectFragment extends BaseFragment implements MainProjectCont
 
     @Override
     public void setBackgroundView(boolean visible) {
-        mViewBackground.setVisibility(visible?View.VISIBLE: View.GONE);
+        mViewBackground.setVisibility(visible ? View.VISIBLE : View.GONE);
     }
 
     @Override
@@ -118,9 +104,9 @@ public class MainProjectFragment extends BaseFragment implements MainProjectCont
         }
     }
 
-    /**
+    /**************************************************
      * SwipeRefreshLayout.OnRefreshListener
-     */
+     **************************************************/
     SwipeRefreshLayout.OnRefreshListener onRefreshListener = new SwipeRefreshLayout.OnRefreshListener() {
         @Override
         public void onRefresh() {

+ 12 - 11
app/src/main/java/kr/co/hanwha/hifive/view/HFMainTabUnderlineView.java

@@ -9,6 +9,7 @@ import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import kr.co.hanwha.hifive.BuildConfig;
 import kr.co.hanwha.hifive.R;
 import kr.co.hanwha.hifive.util.HFCommonUtil;
 
@@ -89,20 +90,18 @@ public class HFMainTabUnderlineView extends RelativeLayout {
     }
 
     public void onPageScrolled(int position, float positionOffset) {
-        Log.d("onPageScrolled", "onPageScrolled ::: " + position + " , " + positionOffset);
+        int margin = mAssignedWidth + HFCommonUtil.getPixelFromDimension(getContext(), R.dimen.dimen_dp23);
+        final float selectedRed = 55;
+        final float selectedGreen = 56;
+        final float selectedBlue = 59;
+        final float unselectedRed = 190;
+        final float unselectedGreen = 192;
+        final float unselectedBlue = 198;
 
         if (position == 0 && positionOffset > 0) {
-            int margin = mAssignedWidth + HFCommonUtil.getPixelFromDimension(getContext(), R.dimen.dimen_dp23);
             float transX = ((float) margin) * positionOffset;
             mViewUnderline.setTranslationX(transX);
 
-            final float selectedRed = 55;
-            final float selectedGreen = 56;
-            final float selectedBlue = 59;
-            final float unselectedRed = 190;
-            final float unselectedGreen = 192;
-            final float unselectedBlue = 198;
-
             float assignedRed = unselectedRed - (unselectedRed - selectedRed) * (1.0f - positionOffset);
             float assignedGreen = unselectedGreen - (unselectedGreen - selectedGreen) * (1.0f - positionOffset);
             float assignedBlue = unselectedBlue - (unselectedBlue - selectedBlue) * (1.0f - positionOffset);
@@ -113,8 +112,10 @@ public class HFMainTabUnderlineView extends RelativeLayout {
 
             mTextViewAssigned.setTextColor(HFCommonUtil.getColor((int) assignedRed, (int) assignedGreen, (int) assignedBlue));
             mTextViewRequest.setTextColor(HFCommonUtil.getColor((int) requestRed, (int) requestGreen, (int) requestBlue));
-        } else {
-//            mViewUnderline.setTranslationX(0);
+        } else if (position == 1 && positionOffset == 0) {
+            mViewUnderline.setTranslationX(margin);
+            mTextViewAssigned.setTextColor(HFCommonUtil.getColor((int) unselectedRed, (int) unselectedGreen, (int) unselectedBlue));
+            mTextViewRequest.setTextColor(HFCommonUtil.getColor((int) selectedRed, (int) selectedGreen, (int) selectedBlue));
         }
     }
 

+ 1 - 1
app/src/main/res/drawable/rounded_rectangle_okr_selected.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/hf_grey27" />
+    <solid android:color="@color/hf_grey26" />
 
     <corners
         android:bottomLeftRadius="100dp"

+ 24 - 14
app/src/main/res/layout/fragment_main_home.xml

@@ -96,23 +96,33 @@
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="11dp" />
 
-            <kr.co.hanwha.hifive.view.FontTextView
-                android:id="@+id/okr_textView"
-                style="@style/font_notosans_b_16sp_grey01"
+            <LinearLayout
+                android:id="@+id/okr_linearLayout"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/main_top_tabbar_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                android:layout_marginRight="11dp"
-                android:background="@drawable/button_circle_okr_bg"
-                android:gravity="center"
-                android:minHeight="26dp"
-                android:minWidth="47.5dp"
-                android:paddingBottom="3dp"
-                android:paddingLeft="8.5dp"
-                android:paddingRight="8.5dp"
-                android:paddingTop="2dp"
-                android:text="@string/main_okr_title" />
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <kr.co.hanwha.hifive.view.FontTextView
+                    android:id="@+id/okr_textView"
+                    style="@style/font_notosans_b_16sp_grey01"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="11dp"
+                    android:layout_marginRight="11dp"
+                    android:background="@drawable/button_circle_okr_bg"
+                    android:duplicateParentState="true"
+                    android:gravity="center"
+                    android:minHeight="26dp"
+                    android:minWidth="47.5dp"
+                    android:paddingBottom="3dp"
+                    android:paddingLeft="8.5dp"
+                    android:paddingRight="8.5dp"
+                    android:paddingTop="2dp"
+                    android:text="@string/main_okr_title" />
+            </LinearLayout>
         </RelativeLayout>
 
     </LinearLayout>

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

@@ -13,7 +13,7 @@
             android:layout_width="@dimen/main_tab_min_width"
             android:layout_height="@dimen/dimen_dp3"
             android:layout_alignParentBottom="true"
-            android:background="@color/black" />
+            android:background="@color/hf_grey01" />
 
         <LinearLayout
             android:layout_width="wrap_content"