[마이][Common] 버킷리스트 달성 아이콘 드로어블로 바꿈

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/BucketListDefaultDetailFragment.java

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bucketlist;
 
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -32,7 +33,6 @@ import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 public class BucketListDefaultDetailFragment extends FragmentBase<BucketListDefaultDetailPresenter> implements IBucketListDefaultDetailView {
 
   private TextView textViewBucketTitle;
-  private ImageView imageViewBucketCheck;
   private ImageView imageViewBucketBackground;
 
   @Override
@@ -44,7 +44,6 @@ public class BucketListDefaultDetailFragment extends FragmentBase<BucketListDefa
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
     textViewBucketTitle = findViewById(R.id.text_view_bucket_title);
-    imageViewBucketCheck = findViewById(R.id.image_checker);
     imageViewBucketBackground = findViewById(R.id.image_view_bucket_background);
     textViewBucketTitle.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.UPDATE).build());});
   }
@@ -128,7 +127,13 @@ public class BucketListDefaultDetailFragment extends FragmentBase<BucketListDefa
 
   @Override
   public void setNavigationBarCompleted(boolean isCompleted) {
-    imageViewBucketCheck.setVisibility(isCompleted ? View.VISIBLE : View.GONE);
+    Drawable checkImageResource = getActivity().getResources().getDrawable(R.drawable.icon_bucket_complete_white);
+    if (isCompleted) {
+      textViewBucketTitle.setCompoundDrawablesWithIntrinsicBounds(checkImageResource, null, null, null);
+    }
+    else {
+      textViewBucketTitle.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
+    }
     getHelper(ActionBarHelper.class).setCompleted(isCompleted);
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/BucketListDefaultDetailPresenter.java

@@ -5,6 +5,7 @@ import kr.co.zumo.app.lifeplus.bean.api.BucketWithTagBean;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.dialog.AlertDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.ConfirmDialog;
@@ -101,7 +102,7 @@ public class BucketListDefaultDetailPresenter extends Presenter<BucketListDefaul
   @Override
   public void onScreenReady() {
     BucketWithTagBean bean = model.getBucketMyBeanForEditing();
-    view.setContentsText(bean.getTitle());
+    view.setContentsText(StringUtil.trim(bean.getTitle()));
     view.setNavigationBarCompleted(bean.isCompleted());
     view.changeBackground(bean.getImageUrl());
   }

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

@@ -21,44 +21,31 @@
     />
 
   <ImageView
+    android:id="@+id/imageView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:src="@drawable/rectangle_dim_black_50"
-    app:layout_constraintTop_toTopOf="@+id/image_view_bucket_background"
-    />
-
-  <ImageView
-    android:layout_marginStart="50dp"
-    android:id="@+id/image_checker"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="10dp"
-    app:layout_constraintEnd_toStartOf="@+id/text_view_bucket_title"
-    app:layout_constraintHorizontal_chainStyle="packed"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="@+id/text_view_bucket_title"
-    app:srcCompat="@drawable/icon_bucket_complete_white"
-    tools:visibility="visible"/>
+    app:layout_constraintTop_toTopOf="@+id/image_view_bucket_background"/>
 
   <TextView
     android:id="@+id/text_view_bucket_title"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginStart="5dp"
+    android:layout_marginStart="70dp"
+    android:layout_marginEnd="70dp"
     android:ellipsize="end"
     android:gravity="center"
     android:lineSpacingExtra="8sp"
     android:maxLines="3"
+    android:drawableStart="@drawable/icon_bucket_complete_white"
+    android:drawablePadding="5dp"
     android:textColor="@color/CFFFFFF"
     android:textSize="21sp"
-    android:layout_marginEnd="50dp"
     app:layout_constrainedWidth="true"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintHorizontal_chainStyle="packed"
-    app:layout_constraintStart_toEndOf="@+id/image_checker"
+    app:layout_constraintStart_toStartOf="@+id/imageView"
     app:layout_constraintTop_toTopOf="parent"
     app:layout_goneMarginStart="50dp"
-    tools:text="OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
-    />
+    tools:text="나를 위한 선물, 명풍\n구매하기나를 위한 선물, 명풍\n구매하기나를 위한 선물, 명풍\n구매하기"/>
 </android.support.constraint.ConstraintLayout>