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

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

@@ -126,6 +126,7 @@ public class MainFragment extends FragmentBase<MainPresenter> implements IMainVi
         SuperModel.getInstance().setUserId("201811150001008105");
         SuperModel.getInstance().setUserName("한화맨");
         SuperModel.getInstance().setUserEmail("");
+        presenter.onEvent(new Event.Builder(Event.DEFAULT).build()); // pin 0000
 
         render();
       });

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

@@ -1,8 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.main;
 
 
-import android.util.Log;
-
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.ContentsDeliveryBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
@@ -271,12 +269,10 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
   }
 
   private void setDefaultBookmarkList() {
-    Log.e("APP#  MyMainPresenter | setDefaultBookmarkList", "|" + model.getDefaultBookmarkList());
     view.setDefaultBookmarkList(model.getDefaultBookmarkList());
   }
 
   private void setMyBookmarkList() {
-    Log.e("APP#  MyMainPresenter | setMyBookmarkList", "|" + model.getMyBookmarkList());
     view.setMyBookmarkList(model.getMyBookmarkList());
     int len = model.getMyBookmarkSize();
 
@@ -287,7 +283,6 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
     LifeplusContentsBean bean;
     for (int i = 0; i < len; ++i) {
       bean = model.getMyBookmarkList().get(i);
-      Log.i("APP# MyMainPresenter | setMyBookmarkList", "|" + bean.toPrettyJson());
       // 북마크의 좋아요(체크박스)
       view.setBookmarkContentsLiked(i, bean.isLiked());
       // 북마크의 북마크(체크박스)

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/code/SettingCodePresenter.java

@@ -210,6 +210,9 @@ public class SettingCodePresenter extends Presenter<SettingCodeModel, ISettingCo
       if (isDisplayFailMessage) {
         view.setValidationSpecialCode(ResourceUtil.getString(R.string.special_code_input_need_12_characters));
       }
+      else {
+        view.setValidationSpecialCode(ResourceUtil.getString(R.string.empty_string));
+      }
     }
     else {
       result = true;
@@ -234,6 +237,9 @@ public class SettingCodePresenter extends Presenter<SettingCodeModel, ISettingCo
         if (isDisplayFailMessage) {
           view.setValidationRecommendCode(ResourceUtil.getString(R.string.recommend_code_input_need_5_characters));
         }
+        else {
+          view.setValidationRecommendCode(ResourceUtil.getString(R.string.empty_string));
+        }
       }
       else {
         result = true;

app/src/main/res/drawable/button_underline_background.xml

@@ -6,7 +6,7 @@
     android:state_focused="true">
     <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
-      <item android:bottom="1dp"
+      <item android:bottom="36dp"
             android:left="-2dp"
             android:right="-2dp"
             android:top="-2dp">
@@ -22,10 +22,9 @@
 
   <item
     android:state_focused="false">
-
     <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
-      <item android:bottom="1dp"
+      <item android:bottom="36dp"
             android:left="-2dp"
             android:right="-2dp"
             android:top="-2dp">

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

@@ -88,100 +88,110 @@
       app:layout_constraintTop_toTopOf="@+id/textView6"
       tools:visibility="visible"/>
 
-
-    <EditText
-      android:id="@+id/edit_special_code0"
-      android:layout_width="0dp"
-      android:layout_height="45dp"
+    <android.support.constraint.ConstraintLayout
+      android:id="@+id/layout_special_code"
+      android:layout_width="match_parent"
+      android:layout_height="77dp"
       android:layout_marginTop="2dp"
-      android:background="@drawable/button_underline_background"
-      android:hint="@string/special_code_characters"
-      android:inputType="number"
-      android:lineSpacingExtra="6sp"
-      android:maxLength="4"
-      android:maxLines="1"
-      android:paddingStart="5dp"
-      android:textColorHint="@color/CC5C5C5"
-      android:textSize="14sp"
-      app:layout_constraintEnd_toStartOf="@+id/view2"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/textView6"/>
+      app:layout_constraintTop_toBottomOf="@+id/textView6">
 
-    <View
-      android:id="@+id/view2"
-      android:layout_width="7dp"
-      android:layout_height="1dp"
-      android:layout_gravity="center"
-      android:layout_marginStart="6dp"
-      android:layout_marginEnd="6dp"
-      android:background="@color/C666666"
-      app:layout_constraintBottom_toBottomOf="@+id/edit_special_code0"
-      app:layout_constraintEnd_toStartOf="@+id/edit_special_code1"
-      app:layout_constraintStart_toEndOf="@+id/edit_special_code0"
-      app:layout_constraintTop_toTopOf="@+id/edit_special_code0"/>
+      <EditText
+        android:id="@+id/edit_special_code0"
+        android:layout_width="0dp"
+        android:layout_height="80dp"
+        android:background="@drawable/button_underline_background"
+        android:hint="@string/special_code_characters"
+        android:inputType="textVisiblePassword"
+        android:lineSpacingExtra="6sp"
+        android:maxLength="4"
+        android:maxLines="1"
+        android:paddingStart="5dp"
+        android:paddingBottom="35dp"
+        android:textColorHint="@color/CC5C5C5"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toStartOf="@+id/view2"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="abcd"/>
 
-    <EditText
-      android:id="@+id/edit_special_code1"
-      android:layout_width="0dp"
-      android:layout_height="45dp"
-      android:background="@drawable/button_underline_background"
-      android:hint="@string/special_code_characters"
-      android:inputType="number"
-      android:lineSpacingExtra="6sp"
-      android:maxLength="4"
-      android:maxLines="1"
-      android:paddingStart="5dp"
-      android:textColorHint="@color/CC5C5C5"
-      android:textSize="14sp"
-      app:layout_constraintBottom_toBottomOf="@+id/view2"
-      app:layout_constraintEnd_toStartOf="@+id/view"
-      app:layout_constraintStart_toEndOf="@+id/view2"
-      app:layout_constraintTop_toTopOf="@+id/view2"/>
-
-    <View
-      android:id="@+id/view"
-      android:layout_width="7dp"
-      android:layout_height="1dp"
-      android:layout_gravity="center"
-      android:layout_marginStart="6dp"
-      android:layout_marginEnd="6dp"
-      android:background="@color/C666666"
-      app:layout_constraintBottom_toBottomOf="@+id/edit_special_code1"
-      app:layout_constraintEnd_toStartOf="@+id/edit_special_code2"
-      app:layout_constraintStart_toEndOf="@+id/edit_special_code1"
-      app:layout_constraintTop_toTopOf="@+id/edit_special_code1"/>
+      <View
+        android:id="@+id/view2"
+        android:layout_width="7dp"
+        android:layout_height="1dp"
+        android:layout_gravity="center"
+        android:layout_marginStart="6dp"
+        android:layout_marginEnd="6dp"
+        android:layout_marginBottom="32dp"
+        android:background="@color/C666666"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/edit_special_code1"
+        app:layout_constraintStart_toEndOf="@+id/edit_special_code0"
+        app:layout_constraintTop_toTopOf="parent"/>
 
-    <EditText
-      android:id="@+id/edit_special_code2"
-      android:layout_width="0dp"
-      android:layout_height="45dp"
-      android:background="@drawable/button_underline_background"
-      android:hint="@string/special_code_characters"
-      android:inputType="number"
-      android:lineSpacingExtra="6sp"
-      android:maxLength="4"
-      android:maxLines="1"
-      android:paddingStart="5dp"
-      android:textColorHint="@color/CC5C5C5"
-      android:textSize="14sp"
-      app:layout_constraintBottom_toBottomOf="@+id/view"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toEndOf="@+id/view"
-      app:layout_constraintTop_toTopOf="@+id/view"/>
+      <EditText
+        android:id="@+id/edit_special_code1"
+        android:layout_width="0dp"
+        android:layout_height="80dp"
+        android:background="@drawable/button_underline_background"
+        android:hint="@string/special_code_characters"
+        android:inputType="textVisiblePassword"
+        android:lineSpacingExtra="6sp"
+        android:maxLength="4"
+        android:maxLines="1"
+        android:paddingStart="5dp"
+        android:paddingBottom="35dp"
+        android:textColorHint="@color/CC5C5C5"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toStartOf="@+id/view"
+        app:layout_constraintStart_toEndOf="@+id/view2"
+        />
 
+      <View
+        android:id="@+id/view"
+        android:layout_width="7dp"
+        android:layout_height="1dp"
+        android:layout_gravity="center"
+        android:layout_marginStart="6dp"
+        android:layout_marginEnd="6dp"
+        android:layout_marginBottom="32dp"
+        android:background="@color/C666666"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/edit_special_code2"
+        app:layout_constraintStart_toEndOf="@+id/edit_special_code1"
+        app:layout_constraintTop_toTopOf="parent"/>
 
-    <TextView
-      android:id="@+id/text_special_validation"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="7dp"
-      android:lineSpacingExtra="3.5sp"
-      android:text="@string/special_code_input"
-      android:textColor="@color/C666666"
-      android:textSize="10.5sp"
-      app:layout_constraintStart_toStartOf="@+id/edit_special_code0"
-      app:layout_constraintTop_toBottomOf="@+id/edit_special_code0"/>
+      <EditText
+        android:id="@+id/edit_special_code2"
+        android:layout_width="0dp"
+        android:layout_height="80dp"
+        android:background="@drawable/button_underline_background"
+        android:hint="@string/special_code_characters"
+        android:inputType="textVisiblePassword"
+        android:lineSpacingExtra="6sp"
+        android:maxLength="4"
+        android:maxLines="1"
+        android:paddingStart="5dp"
+        android:paddingBottom="35dp"
+        android:textColorHint="@color/CC5C5C5"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/view"/>
+
+
+      <TextView
+        android:id="@+id/text_special_validation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="52dp"
+        android:lineSpacingExtra="3.5sp"
+        android:text="@string/special_code_input"
+        android:textColor="@color/C666666"
+        android:textSize="10.5sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0"/>
 
+    </android.support.constraint.ConstraintLayout>
 
     <TextView
       android:id="@+id/textView7"
@@ -193,21 +203,22 @@
       android:textColor="@color/C999999"
       android:textSize="12sp"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/text_special_validation"/>
+      app:layout_constraintTop_toBottomOf="@+id/layout_special_code"/>
 
 
     <EditText
       android:id="@+id/edit_recommend_code"
       android:layout_width="match_parent"
-      android:layout_height="45dp"
+      android:layout_height="80dp"
       android:layout_marginTop="2dp"
       android:background="@drawable/button_underline_background"
       android:hint="@string/recommend_code_input_characters"
-      android:inputType="text"
+      android:inputType="textVisiblePassword"
       android:lineSpacingExtra="6sp"
       android:maxLength="5"
       android:maxLines="1"
       android:paddingStart="5dp"
+      android:paddingBottom="35dp"
       android:textColorHint="@color/CC5C5C5"
       android:textSize="14sp"
       app:layout_constraintTop_toBottomOf="@+id/textView7"/>
@@ -216,7 +227,7 @@
       android:id="@+id/text_recommend_validation"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="7dp"
+      android:layout_marginTop="54dp"
       android:layout_marginBottom="8dp"
       android:lineSpacingExtra="3.5sp"
       android:text="@string/recommend_code_input"
@@ -224,7 +235,7 @@
       android:textSize="10.5sp"
       app:layout_constraintBottom_toTopOf="@+id/button_registering"
       app:layout_constraintStart_toStartOf="@+id/edit_recommend_code"
-      app:layout_constraintTop_toBottomOf="@+id/edit_recommend_code"
+      app:layout_constraintTop_toBottomOf="@+id/textView7"
       app:layout_constraintVertical_chainStyle="spread_inside"
       />