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

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

@@ -9,6 +9,7 @@ import android.graphics.drawable.Drawable;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -80,7 +81,7 @@ public class MainCategoryContentsImageView extends MainCategoryContentsView {
     float ratio;
 
     // text
-    if (null != textBig) {
+    /*if (null != textBig) {
       cy = getScreenY(textBig);
 
       // 적당한 위치에 있을 때만 처리한다.
@@ -101,7 +102,7 @@ public class MainCategoryContentsImageView extends MainCategoryContentsView {
         }
         textBig.setY(y);
       }
-    }
+    }*/
 
     // image
     if (null != imageView) {
@@ -233,16 +234,17 @@ public class MainCategoryContentsImageView extends MainCategoryContentsView {
   @Override
   public void init(int index, MainContentsCategoryBean bean, IEventListener listener) {
     this.index = index;
-    this.screenWidth = SuperModel.getInstance().getScreenWidth();
-    this.screenHeight = SuperModel.getInstance().getScreenHeight();
-    this.textPositionMaxYOnMask = ResourceUtil.dpToPx(218);
-    this.textPositionTargetYOnScreen = screenHeight - ResourceUtil.dpToPx(71);
 
     textBig = itemView.findViewById(R.id.text_big);
     textSmall = itemView.findViewById(R.id.text_small);
     imageView = itemView.findViewById(R.id.image_contents);
     imageView.setOnClickListener(v -> listener.onEvent(new Event.Builder(Event.CONTENTS).integer(index).build()));
 
+    this.screenWidth = SuperModel.getInstance().getScreenWidth();
+    this.screenHeight = SuperModel.getInstance().getScreenHeight();
+    this.textPositionMaxYOnMask = (((ViewGroup.MarginLayoutParams) textBig.getLayoutParams()).topMargin); //ResourceUtil.dpToPx(218); <- 레이아웃의 위치를 최대값으로 지정.
+    this.textPositionTargetYOnScreen = screenHeight - ResourceUtil.dpToPx(71);
+
     textBig.setText(bean.getTitle());
     textSmall.setText(bean.getSubTitle());
 

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

@@ -13,7 +13,7 @@
     android:layout_height="@dimen/main_contents_image_height"
     android:background="@color/CFFFFFF"
     android:scaleType="matrix"
-    android:src="@drawable/img_bestbucket_1"
+    tools:src="@drawable/main_layout_guide_____must_be_deleted"
     />
 
   <TextView
@@ -22,7 +22,7 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="32dp"
     android:layout_marginTop="218dp"
-    android:lineSpacingExtra="7.5sp"
+    android:lineSpacingExtra="4dp"
     android:textColor="#ffffff"
     android:textSize="19sp"
     android:textStyle="bold"
@@ -35,7 +35,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="32dp"
-    android:layout_marginBottom="25dp"
+    android:layout_marginBottom="28.5dp"
     android:lineSpacingExtra="9.5sp"
     android:textColor="#ffffff"
     android:textSize="12sp"

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

@@ -3,12 +3,18 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="92dp"
-  android:layout_height="match_parent">
+  android:layout_width="wrap_content"
+  android:layout_height="match_parent"
+  android:paddingStart="1dp"
+  android:paddingEnd="11dp">
+  <!--
+    '더 둘러보기' 좌우 여백 19dp
+    이전 이미지 뒤쪽에 12dp 마진 있음
+  -->
 
   <TextView
     android:id="@+id/text_more"
-    android:layout_width="0dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:paddingStart="6dp"
     android:paddingTop="8dp"
@@ -18,6 +24,7 @@
     android:textColor="#999999"
     android:textSize="12sp"
     app:layout_constraintBottom_toTopOf="@id/icon_more"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     app:layout_constraintVertical_chainStyle="packed"/>
@@ -26,8 +33,8 @@
     android:id="@+id/icon_more"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
-    android:scaleType="center"
     android:paddingEnd="4dp"
+    android:scaleType="center"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="@+id/text_more"
     app:layout_constraintStart_toStartOf="@+id/text_more"

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

@@ -27,7 +27,7 @@
       android:id="@+id/text_weather"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:lineSpacingExtra="7sp"
+      android:lineSpacingExtra="5dp"
       android:paddingStart="20dp"
       android:text="@string/weather_sunny"
       android:textColor="@color/C333333"

app/src/sandbox/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java

@@ -21,6 +21,7 @@ import kr.co.zumo.app.lifeplus.bean.api.BucketListTagResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketMyListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketNumberRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketRegisterRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.BucketRegisterResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketUpdateRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.CategoryBannerResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.CategoryContentsResultBean;