Browse Source

DCAU-271 [Android] 유닛뷰 UI 변경

aaron 6 years ago
parent
commit
8867382005

+ 1 - 1
.idea/misc.xml

@@ -25,5 +25,5 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>

+ 1 - 0
app/app.iml

@@ -89,6 +89,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />

+ 6 - 18
app/src/main/java/kr/co/hanwha/hifive/adapter/viewholder/MainProjectHeaderViewHolder.java

@@ -38,7 +38,6 @@ public class MainProjectHeaderViewHolder extends BaseViewHolder {
 
     private TextView mTextViewProject;
     private TextView mTextViewMember;
-    private TextView mTextViewTitle;
     private TextView mTextViewSubTitle;
     private View mViewStatus;
     private View mViewStatus2;
@@ -76,7 +75,6 @@ public class MainProjectHeaderViewHolder extends BaseViewHolder {
 
         mTextViewProject = (TextView) itemView.findViewById(R.id.project_textView);
         mTextViewMember = (TextView) itemView.findViewById(R.id.member_textView);
-        mTextViewTitle = (TextView) itemView.findViewById(R.id.title_textView);
         mTextViewSubTitle = (TextView) itemView.findViewById(R.id.subTitle_textView);
         mViewStatus = (View) itemView.findViewById(R.id.status_view);
         mViewStatus2 = (View) itemView.findViewById(R.id.status2_view);
@@ -162,25 +160,15 @@ public class MainProjectHeaderViewHolder extends BaseViewHolder {
                 mTextViewMember.setText("");
             }
 
-            if (data.getCmdr_intent() != null && data.getCmdr_intent().size() > 0) {
-                if (TextUtils.isEmpty(data.getCmdr_intent().get(0)) == false) {
-                    mTextViewTitle.setText(data.getCmdr_intent().get(0));
+            if (data.getCmdr_intent() != null && data.getCmdr_intent().size() > 1) {
+                if (TextUtils.isEmpty(data.getCmdr_intent().get(1)) == false) {
+                    mTextViewSubTitle.setText(data.getCmdr_intent().get(1));
                 } else {
-                    mTextViewTitle.setText(getContext().getString(R.string.main_project_commander_empty));
-                }
-                if (data.getCmdr_intent() != null && data.getCmdr_intent().size() > 1) {
-                    if (TextUtils.isEmpty(data.getCmdr_intent().get(1)) == false) {
-                        mTextViewSubTitle.setText(data.getCmdr_intent().get(1));
-                    } else {
-                        mTextViewSubTitle.setText(getContext().getString(R.string.main_project_commander_empty));
-                    }
-                } else {
-                    mTextViewSubTitle.setText("");
-                    mTextViewSubTitle.setVisibility(View.GONE);
+                    mTextViewSubTitle.setText(getContext().getString(R.string.main_project_commander_empty));
                 }
             } else {
-                mTextViewTitle.setText(getContext().getString(R.string.main_project_commander_empty));
-                mTextViewSubTitle.setText(getContext().getString(R.string.main_project_commander_empty));
+                mTextViewSubTitle.setText("");
+                mTextViewSubTitle.setVisibility(View.GONE);
             }
 
             //Achievement

+ 0 - 17
app/src/main/res/layout/item_main_project_header.xml

@@ -105,23 +105,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:minHeight="18dp"
-                android:text="@string/main_project_commander_intent_title_1" />
-
-            <kr.co.hanwha.hifive.view.FontTextView
-                android:id="@+id/title_textView"
-                style="@style/font_notosans_r_14sp_grey02"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:lineSpacingExtra="3dp"
-                android:text="" />
-
-            <kr.co.hanwha.hifive.view.FontTextView
-                style="@style/font_notosans_b_14sp_grey01"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="28dp"
-                android:minHeight="18dp"
                 android:text="@string/main_project_commander_intent_title_2" />
 
             <kr.co.hanwha.hifive.view.FontTextView