Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

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

@@ -105,7 +105,7 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     textBucketLabel = findViewById(R.id.text_view_exists_bucket_list);
 
     imageViewCheckedBucket1 = findViewById(R.id.image_view_bucket_check1);
-    imageViewCheckedBucket2 = findViewById(R.id.image_view_bucket_check1);
+    imageViewCheckedBucket2 = findViewById(R.id.image_view_bucket_check2);
 
     layoutMyBucketListPreview = findViewById(R.id.layout_my_bucket_list_preview);
     layoutBucketCardView1 = findViewById(R.id.my_bucket_list_card_view1);
@@ -121,6 +121,13 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
 
 
     findViewById(R.id.text_view_my_coin).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
+    findViewById(R.id.image_view_my_coin_arrow).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
+    findViewById(R.id.text_view_my_coin).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
+
+    findViewById(R.id.text_view_guest_coin).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
+    findViewById(R.id.image_view_guest_coin).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
+    findViewById(R.id.image_view_my_guest_coin_arrow).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
+
     textViewBookmarkCount.setOnClickListener(view -> { presenter.onEvent(new Event.Builder(Event.BOOK_MARK_LIST).build());});
     findViewById(R.id.text_view_purchase).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_PURCHASE_HISTORY).build());});
 
@@ -129,6 +136,7 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     textViewConfirmUser.setOnClickListener(view -> { presenter.onEvent(new Event.Builder(Event.SIGN_UP).build());});
     findViewById(R.id.image_view_coupon_mall).setOnClickListener(view -> { presenter.onEvent(new Event.Builder(Event.COUPON_MALL).build());});
 
+    findViewById(R.id.text_view_become_extinction).setOnClickListener(view -> { presenter.onEvent(new Event.Builder(Event.COUPON_MALL).build());});
     createMemberOrGuest();
   }
 
@@ -248,7 +256,16 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
       layoutBucketCardView2.setVisibility(View.GONE);
       textViewBucketCardViewTitle1.setText(myBucketBeans.get(0).getTitle());
       layoutBucketCardView1.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.DETAIL).index(0).build()));
-      imageViewCheckedBucket1.setVisibility(myBucketBeans.get(0).getCompleted().equals("Y")? View.VISIBLE : View.INVISIBLE);
+
+      if(myBucketBeans.get(0).isCompleted()){
+        layoutBucketCardView1.setBackgroundColor( getResources().getColor(R.color.CE5E5E5));
+      }else{
+        layoutBucketCardView1.setBackground(getResources().getDrawable(R.drawable.faq_text_border));
+      }
+
+      imageViewCheckedBucket1.setVisibility(myBucketBeans.get(0).isCompleted() ? View.VISIBLE : View.INVISIBLE);
+
+
     }
     else {
       layoutMyBucketListPreview.setVisibility(View.VISIBLE);
@@ -259,8 +276,20 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
       layoutBucketCardView1.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.DETAIL).index(0).build()));
       layoutBucketCardView2.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.DETAIL).index(1).build()));
 
-      imageViewCheckedBucket1.setVisibility(myBucketBeans.get(0).getCompleted().equals("Y")? View.VISIBLE : View.INVISIBLE);
-      imageViewCheckedBucket2.setVisibility(myBucketBeans.get(1).getCompleted().equals("Y")? View.VISIBLE : View.INVISIBLE);
+      if(myBucketBeans.get(0).isCompleted()){
+        layoutBucketCardView1.setBackgroundColor( getResources().getColor(R.color.CE5E5E5));
+      }else{
+        layoutBucketCardView1.setBackground(getResources().getDrawable(R.drawable.faq_text_border));
+      }
+
+      if(myBucketBeans.get(1).isCompleted()){
+        layoutBucketCardView2.setBackgroundColor( getResources().getColor(R.color.CE5E5E5));
+      }else{
+        layoutBucketCardView2.setBackground(getResources().getDrawable(R.drawable.faq_text_border));
+      }
+
+      imageViewCheckedBucket1.setVisibility(myBucketBeans.get(0).isCompleted() ? View.VISIBLE : View.INVISIBLE);
+      imageViewCheckedBucket2.setVisibility(myBucketBeans.get(1).isCompleted() ? View.VISIBLE : View.INVISIBLE);
     }
 
   }

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

@@ -69,6 +69,8 @@
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:layout_marginStart="25dp"
+      android:layout_marginTop="18dp"
       android:layout_marginBottom="13dp"
       android:orientation="vertical">
 
@@ -103,6 +105,8 @@
     android:id="@+id/recycler_view_bucket_list_detail"
     android:layout_width="match_parent"
     android:layout_height="0dp"
+    android:layout_marginStart="25dp"
+    app:layout_constraintStart_toStartOf="parent"
     android:paddingTop="25dp"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/layout_tags"/>

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

@@ -5,8 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical"
-  tools:layout_marginTop="-500dp">
+  android:orientation="vertical">
 
   <android.support.constraint.ConstraintLayout
     android:layout_width="match_parent"
@@ -20,7 +19,7 @@
       android:layout_height="wrap_content"
       android:layout_marginBottom="16dp"
       app:layout_constraintBottom_toTopOf="@+id/divider"
-      tools:visibility="gone">
+      tools:visibility="visible">
 
       <TextView
         android:id="@+id/text_view_my_coin"
@@ -224,6 +223,7 @@
         />
 
       <TextView
+        android:id="@+id/text_view_become_extinction"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
@@ -607,10 +607,10 @@
         android:id="@+id/my_bucket_list_card_view1"
         android:layout_width="148dp"
         android:layout_height="148dp"
-        app:layout_constraintHorizontal_chainStyle="spread"
         android:background="@drawable/faq_text_border"
         app:layout_constraintEnd_toStartOf="@+id/my_bucket_list_card_view2"
         app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_chainStyle="spread"
         app:layout_constraintStart_toStartOf="parent">
 
         <TextView
@@ -680,9 +680,9 @@
         android:layout_width="148dp"
         android:layout_height="148dp"
         android:background="@drawable/faq_text_border"
-        app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintStart_toEndOf="@+id/my_bucket_list_card_view1">
 
         <TextView

app/src/main/res/values/strings.xml

@@ -365,7 +365,7 @@
   <string name="contents_category1_action_bar_title">주말에 뭐하지</string>
   <string name="contents_category2_action_bar_title">여행 어디가지</string>
   <string name="contents_category3_action_bar_title">취미생활 뭐있지</string>
-  <string name="contents_category4_action_bar_title">트랜드 이슈 뭐있지</string>
+  <string name="contents_category4_action_bar_title">트렌드 이슈 뭐있지</string>
   <string name="contents_category5_action_bar_title">This Week</string>
 
 
@@ -441,8 +441,8 @@
 
 
   <string name="contents_category2"><b>여행</b> 어디가지</string>
-  <string name="contents_category3"><b>취미로</b> 뭐하지</string>
-  <string name="contents_category4"><b>트랜드이슈</b> 뭐있지</string>
+  <string name="contents_category3"><b>취미생활</b> 뭐하지</string>
+  <string name="contents_category4"><b>트렌드이슈</b> 뭐있지</string>
   <string name="contents_category5"><b>This</b> Week</string>
 
   <string name="menu_category1">MY</string>