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

# Conflicts:
#	app/src/main/res/layout/fragment_my_bucket_list.xml

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

@@ -5,8 +5,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  tools:layout_marginTop="-300dp"
-  android:orientation="vertical">
+  android:orientation="vertical"
+  tools:layout_marginTop="-600dp">
 
   <android.support.constraint.ConstraintLayout
     android:layout_width="match_parent"
@@ -362,8 +362,8 @@
       android:layout_height="wrap_content"
       android:layout_marginTop="13dp"
       android:visibility="gone"
-      tools:visibility="visible"
-      app:layout_constraintTop_toBottomOf="@+id/fourth_layout">
+      app:layout_constraintTop_toBottomOf="@+id/fourth_layout"
+      tools:visibility="visible">
 
       <ImageView
         android:id="@+id/image_view_book_mark1"
@@ -503,8 +503,8 @@
           android:drawableLeft="@drawable/custom_like_check"
           android:paddingStart="5dp"
           android:paddingEnd="6dp"
-          android:text=""
           android:saveEnabled="false"
+          android:text=""
           app:layout_constraintBottom_toBottomOf="parent"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent"
@@ -517,10 +517,10 @@
 
           android:background="@null"
           android:button="@null"
-          android:saveEnabled="false"
           android:drawableLeft="@drawable/custom_book_mark_check"
           android:paddingStart="5dp"
           android:paddingEnd="6dp"
+          android:saveEnabled="false"
           android:text=""
           app:layout_constraintBottom_toBottomOf="parent"
           app:layout_constraintStart_toEndOf="@+id/like_check2"
@@ -601,16 +601,17 @@
 
     <android.support.constraint.ConstraintLayout
       android:id="@+id/layout_my_bucket_list_preview"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="20dp"
       android:layout_marginStart="17dp"
       android:layout_marginEnd="17dp"
-      android:layout_marginTop="20dp"
-      app:layout_constraintTop_toBottomOf="@+id/layout_best_bucket"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content">
+      app:layout_constraintTop_toBottomOf="@+id/layout_best_bucket">
+
       <android.support.v7.widget.RecyclerView
         android:id="@+id/recycler_view_bucket_preview"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
 

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

@@ -75,6 +75,7 @@
             android:id="@+id/layout_email_edit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
             >
 
             <kr.co.zumo.app.lifeplus.view.custom.ClearEditText
@@ -131,18 +132,25 @@
             android:id="@+id/layout_email"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             >
 
             <TextView
               android:id="@+id/text_email"
-              android:layout_width="wrap_content"
+              android:layout_width="0dp"
               android:layout_height="wrap_content"
-              android:gravity="end"
+              android:gravity="start"
+              android:maxLength="590"
+              android:maxLines="2"
               android:paddingTop="10dp"
+              android:paddingEnd="40dp"
               android:textColor="@color/C666666"
               android:textSize="14sp"
-              tools:text="@string/setting_register_email"
-              />
+              app:layout_constraintEnd_toStartOf="@+id/text_registration"
+              app:layout_constraintHorizontal_chainStyle="spread_inside"
+              app:layout_constraintStart_toStartOf="parent"
+              tools:text="OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"/>
 
             <TextView
               android:id="@+id/text_registration"