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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type5/FifthCategoryMainItemViewHolder.java

@@ -28,9 +28,11 @@ public class FifthCategoryMainItemViewHolder extends CategoryMainViewHolder {
   private TextView textViewSubTitle;
   private TextView textViewTitle;
   private TextView textFlag;
+  private View view;
 
   public FifthCategoryMainItemViewHolder(View itemView) {
     super(itemView);
+    view = itemView.findViewById(R.id.view);
     imageViewMainFifthCategory = itemView.findViewById(R.id.image_view_thumbnail);
     textViewSubTitle = itemView.findViewById(R.id.text_view_sub_title);
     textViewTitle = itemView.findViewById(R.id.text_view_title);
@@ -62,7 +64,7 @@ public class FifthCategoryMainItemViewHolder extends CategoryMainViewHolder {
       showFlag(textFlag, bean);
     }
 
-    itemView.setOnClickListener(v -> {
+    view.setOnClickListener(v -> {
       if (null != listener) {
         listener.onEvent(new Event.Builder(Event.CONTENTS).index(index).build());
       }

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

@@ -9,6 +9,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -110,7 +111,7 @@ public class MainDebugFragment extends FragmentBase<MainPresenter> implements IM
     contentsRecyclerView = findViewById(R.id.recycler_view_main);
     contentsRecyclerView.addOnScrollListener(scrollListener);
 
-   TextView buttonAddSpecialCode = findViewById(R.id.button_add_special_code);
+    TextView buttonAddSpecialCode = findViewById(R.id.button_add_special_code);
 
     buttonAddSpecialCode.setOnClickListener(v -> {
       presenter.onEvent(new Event.Builder(Event.SPECIAL_CODE_CLICK).build());
@@ -347,6 +348,7 @@ public class MainDebugFragment extends FragmentBase<MainPresenter> implements IM
   public void setNewbieLayoutVisible(boolean visible) {
     if (visible) {
       layoutNewbie.setVisibility(View.VISIBLE);
+
     }
     else {
       layoutNewbie.animate().withLayer().setStartDelay(200).setDuration(400).translationY(layoutNewbie.getHeight()).start();

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

@@ -33,9 +33,10 @@
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
     android:layout_gravity="bottom"
-    android:background="#000000"
+    android:background="@color/C333333"
     android:orientation="vertical"
     android:visibility="gone"
+    android:animateLayoutChanges="true"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"

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

@@ -78,4 +78,10 @@
     tools:alpha="1"
     tools:text="Get"/>
 
+
+  <View
+    android:id="@+id/view"
+    android:layout_width="match_parent"
+    android:layout_height="93dp"/>
+
 </android.support.constraint.ConstraintLayout>

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

@@ -312,7 +312,7 @@
 
   <string name="special_code_register_title">회원님만을 위한 특별한 혜택</string>
   <string name="special_code_register_detail">제공받은 스페셜 /추천인 코드를 입력해주세요.\n회원님을 위한 특별한 혜택을 드립니다.</string>
-  <string name="special_code">special</string>
+  <string name="special_code">스페셜 코드</string>
   <string name="special_code_characters">4자리</string>
   <string name="special_code_input">지급받은 코드가 있는 경우 입력해주세요.</string>
   <string name="special_code_error">"&lt;font color='#F13F15'>지급받은 코드가 유효하지 않습니다.&lt;/font>"</string>