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

# Conflicts:
#	app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/BenefitHolder.java
#	app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpFragment.java

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/BenefitHolder.java

@@ -48,7 +48,5 @@ public class BenefitHolder extends BaseViewHolder {
     view2.setSignUpBenefit(list.get(0).getImgRes(), list.get(0).getText(), list.get(0).getBenefitText(), list.get(0).getCategoryText());
     view3.setSignUpBenefit(list.get(0).getImgRes(), list.get(0).getText(), list.get(0).getBenefitText(), list.get(0).getCategoryText());
 
-
-
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpAdapter.java

@@ -46,23 +46,34 @@ public class SignUpAdapter extends RecyclerView.Adapter<BaseViewHolder> {
         break;
       case SignUpItem.SIGN_UP_BUTTON:
         view = LayoutInflater.from(parent.getContext()).inflate(R.layout.sign_up_text_view, parent, false);
-        holder = new TextViewHolder(view);
+        holder = new SignUpButtonHolder(view);
         break;
       case SignUpItem.SIGN_UP_TWO_BUTTON:
+        view = LayoutInflater.from(parent.getContext()).inflate(R.layout.sign_up_text_view, parent, false);
+        holder = new SignUpTwoButtonHolder(view);
         break;
       case SignUpItem.SIGN_UP_COIN:
+        view = LayoutInflater.from(parent.getContext()).inflate(R.layout.sign_up_text_view, parent, false);
+        holder = new SignUpCoinHolder(view);
         break;
       case SignUpItem.SIGN_UP_NOTICE:
+        view = LayoutInflater.from(parent.getContext()).inflate(R.layout.sign_up_text_view, parent, false);
+        holder = new SignUpNoticeHolder(view);
         break;
       case SignUpItem.SIGN_UP_TERMS:
+        view = LayoutInflater.from(parent.getContext()).inflate(R.layout.sign_up_text_view, parent, false);
+        holder = new SignUpTermsHolder(view);
         break;
       case SignUpItem.SIGN_UP_TEXT_WITH_TITLE:
+        view = LayoutInflater.from(parent.getContext()).inflate(R.layout.sign_up_text_view, parent, false);
+        holder = new SignUpTextWithTitleHolder(view);
         break;
       case SignUpItem.SIGN_UP_WAITING:
+        view = LayoutInflater.from(parent.getContext()).inflate(R.layout.sign_up_text_view, parent, false);
+        holder = new SignUpWaitingHolder(view);
         break;
       default:
         break;
-
     }
     return holder;
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpButtonHolder.java

@@ -0,0 +1,41 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.view.fragment.signup;
+
+import android.view.View;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.model.SuperModel;
+import kr.co.zumo.app.lifeplus.view.model.SignUpItem;
+import kr.co.zumo.app.lifeplus.view.model.SignUpViewModel;
+import kr.co.zumo.app.lifeplus.view.model.bean.TextBean;
+
+/**
+ * SignUpButtonHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 9. 12.]   [최초 작성]
+ * @since 2018. 9. 12.
+ */
+public class SignUpButtonHolder extends BaseViewHolder {
+  public SignUpButtonHolder(View itemView) {
+    super(itemView);
+  }
+
+  @Override
+  void draw(int index) {
+
+    SignUpViewModel model = (SignUpViewModel) SuperModel.getInstance().getViewModel();
+
+    SignUpItem item = model.getItem(index);
+    TextBean bean = item.getBean(TextBean.class);
+    String text = bean.getText();
+
+    ((TextView) itemView.findViewById(R.id.sign_up_text_view)).setText(text);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpCoinHolder.java

@@ -0,0 +1,41 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.view.fragment.signup;
+
+import android.view.View;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.model.SuperModel;
+import kr.co.zumo.app.lifeplus.view.model.SignUpItem;
+import kr.co.zumo.app.lifeplus.view.model.SignUpViewModel;
+import kr.co.zumo.app.lifeplus.view.model.bean.TextBean;
+
+/**
+ * SignUpCoinHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 9. 12.]   [최초 작성]
+ * @since 2018. 9. 12.
+ */
+public class SignUpCoinHolder extends BaseViewHolder {
+  public SignUpCoinHolder(View itemView) {
+    super(itemView);
+  }
+
+  @Override
+  void draw(int index) {
+
+    SignUpViewModel model = (SignUpViewModel) SuperModel.getInstance().getViewModel();
+
+    SignUpItem item = model.getItem(index);
+    TextBean bean = item.getBean(TextBean.class);
+    String text = bean.getText();
+
+    ((TextView) itemView.findViewById(R.id.sign_up_text_view)).setText(text);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpFragment.java

@@ -70,8 +70,6 @@ public class SignUpFragment extends FragmentBase {
 
     // fixme for test
     ((SignUpViewModel) viewModel).addItem(new SignUpItem(SignUpItem.SIGN_UP_TEXT, SignUpItem.ALIGN_LEFT, new TextBean(App.getInstance().getString(R.string.sign_up_hello_text)).toJson()));
-    ((SignUpViewModel) viewModel).addItem(new SignUpItem(SignUpItem.SIGN_UP_TEXT, SignUpItem.ALIGN_RIGHT, new TextBean("2 번째 텍스트").toJson()));
-    ((SignUpViewModel) viewModel).addItem(new SignUpItem(SignUpItem.SIGN_UP_TEXT, SignUpItem.ALIGN_CENTER, new TextBean("3 번째 텍스트").toJson()));
 
     SignUpBenefitBean bean = new SignUpBenefitBean("3 번째 텍스트", R.drawable.circle, "benefit text1", "benefit text2");
     SignUpBenefitBean bean2 = new SignUpBenefitBean("3 번째 텍스트", R.drawable.circle, "benefit text1", "benefit text2");
@@ -84,6 +82,13 @@ public class SignUpFragment extends FragmentBase {
     list.add(bean3);
 
     ((SignUpViewModel) viewModel).addItem(new SignUpItem(SignUpItem.SIGN_UP_BENEFIT, SignUpItem.ALIGN_CENTER, new SignUpBenefitListBean(list).toJson()));
+    ((SignUpViewModel) viewModel).addItem(new SignUpItem(SignUpItem.SIGN_UP_BUTTON, SignUpItem.ALIGN_RIGHT, new TextBean("button").toJson()));
+    ((SignUpViewModel) viewModel).addItem(new SignUpItem(SignUpItem.SIGN_UP_TWO_BUTTON, SignUpItem.ALIGN_CENTER, new TextBean("two button").toJson()));
+    ((SignUpViewModel) viewModel).addItem(new SignUpItem(SignUpItem.SIGN_UP_COIN, SignUpItem.ALIGN_CENTER, new TextBean("coin").toJson()));
+    ((SignUpViewModel) viewModel).addItem(new SignUpItem(SignUpItem.SIGN_UP_NOTICE, SignUpItem.ALIGN_CENTER, new TextBean("SIGN_UP_NOTICE").toJson()));
+    ((SignUpViewModel) viewModel).addItem(new SignUpItem(SignUpItem.SIGN_UP_TERMS, SignUpItem.ALIGN_CENTER, new TextBean("SIGN_UP_TERMS").toJson()));
+    ((SignUpViewModel) viewModel).addItem(new SignUpItem(SignUpItem.SIGN_UP_TEXT_WITH_TITLE, SignUpItem.ALIGN_CENTER, new TextBean("SIGN_UP_TEXT_WITH_TITLE").toJson()));
+    ((SignUpViewModel) viewModel).addItem(new SignUpItem(SignUpItem.SIGN_UP_WAITING, SignUpItem.ALIGN_CENTER, new TextBean("SIGN_UP_WAITING").toJson()));
     adapter.notifyDataSetChanged();
     return viewModel;
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpNoticeHolder.java

@@ -0,0 +1,41 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.view.fragment.signup;
+
+import android.view.View;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.model.SuperModel;
+import kr.co.zumo.app.lifeplus.view.model.SignUpItem;
+import kr.co.zumo.app.lifeplus.view.model.SignUpViewModel;
+import kr.co.zumo.app.lifeplus.view.model.bean.TextBean;
+
+/**
+ * SignUpNoticeHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 9. 12.]   [최초 작성]
+ * @since 2018. 9. 12.
+ */
+public class SignUpNoticeHolder extends BaseViewHolder {
+  public SignUpNoticeHolder(View itemView) {
+    super(itemView);
+  }
+
+  @Override
+  void draw(int index) {
+
+    SignUpViewModel model = (SignUpViewModel) SuperModel.getInstance().getViewModel();
+
+    SignUpItem item = model.getItem(index);
+    TextBean bean = item.getBean(TextBean.class);
+    String text = bean.getText();
+
+    ((TextView) itemView.findViewById(R.id.sign_up_text_view)).setText(text);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpTermsHolder.java

@@ -0,0 +1,41 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.view.fragment.signup;
+
+import android.view.View;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.model.SuperModel;
+import kr.co.zumo.app.lifeplus.view.model.SignUpItem;
+import kr.co.zumo.app.lifeplus.view.model.SignUpViewModel;
+import kr.co.zumo.app.lifeplus.view.model.bean.TextBean;
+
+/**
+ * SignUpTermsHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 9. 12.]   [최초 작성]
+ * @since 2018. 9. 12.
+ */
+public class SignUpTermsHolder extends BaseViewHolder {
+  public SignUpTermsHolder(View itemView) {
+    super(itemView);
+  }
+
+  @Override
+  void draw(int index) {
+
+    SignUpViewModel model = (SignUpViewModel) SuperModel.getInstance().getViewModel();
+
+    SignUpItem item = model.getItem(index);
+    TextBean bean = item.getBean(TextBean.class);
+    String text = bean.getText();
+
+    ((TextView) itemView.findViewById(R.id.sign_up_text_view)).setText(text);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpTextWithTitleHolder.java

@@ -0,0 +1,41 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.view.fragment.signup;
+
+import android.view.View;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.model.SuperModel;
+import kr.co.zumo.app.lifeplus.view.model.SignUpItem;
+import kr.co.zumo.app.lifeplus.view.model.SignUpViewModel;
+import kr.co.zumo.app.lifeplus.view.model.bean.TextBean;
+
+/**
+ * SignUpTextWithTitleHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 9. 12.]   [최초 작성]
+ * @since 2018. 9. 12.
+ */
+public class SignUpTextWithTitleHolder extends BaseViewHolder {
+  public SignUpTextWithTitleHolder(View itemView) {
+    super(itemView);
+  }
+
+  @Override
+  void draw(int index) {
+
+    SignUpViewModel model = (SignUpViewModel) SuperModel.getInstance().getViewModel();
+
+    SignUpItem item = model.getItem(index);
+    TextBean bean = item.getBean(TextBean.class);
+    String text = bean.getText();
+
+    ((TextView) itemView.findViewById(R.id.sign_up_text_view)).setText(text);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpTwoButtonHolder.java

@@ -0,0 +1,41 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.view.fragment.signup;
+
+import android.view.View;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.model.SuperModel;
+import kr.co.zumo.app.lifeplus.view.model.SignUpItem;
+import kr.co.zumo.app.lifeplus.view.model.SignUpViewModel;
+import kr.co.zumo.app.lifeplus.view.model.bean.TextBean;
+
+/**
+ * SignUpTwoButtonHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 9. 12.]   [최초 작성]
+ * @since 2018. 9. 12.
+ */
+public class SignUpTwoButtonHolder extends BaseViewHolder {
+  public SignUpTwoButtonHolder(View itemView) {
+    super(itemView);
+  }
+
+  @Override
+  void draw(int index) {
+
+    SignUpViewModel model = (SignUpViewModel) SuperModel.getInstance().getViewModel();
+
+    SignUpItem item = model.getItem(index);
+    TextBean bean = item.getBean(TextBean.class);
+    String text = bean.getText();
+
+    ((TextView) itemView.findViewById(R.id.sign_up_text_view)).setText(text);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpWaitingHolder.java

@@ -0,0 +1,41 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.view.fragment.signup;
+
+import android.view.View;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.model.SuperModel;
+import kr.co.zumo.app.lifeplus.view.model.SignUpItem;
+import kr.co.zumo.app.lifeplus.view.model.SignUpViewModel;
+import kr.co.zumo.app.lifeplus.view.model.bean.TextBean;
+
+/**
+ * SignUpWaitingHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 9. 12.]   [최초 작성]
+ * @since 2018. 9. 12.
+ */
+public class SignUpWaitingHolder extends BaseViewHolder {
+  public SignUpWaitingHolder(View itemView) {
+    super(itemView);
+  }
+
+  @Override
+  void draw(int index) {
+
+    SignUpViewModel model = (SignUpViewModel) SuperModel.getInstance().getViewModel();
+
+    SignUpItem item = model.getItem(index);
+    TextBean bean = item.getBean(TextBean.class);
+    String text = bean.getText();
+
+    ((TextView) itemView.findViewById(R.id.sign_up_text_view)).setText(text);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/TextViewHolder.java

@@ -4,7 +4,6 @@
 package kr.co.zumo.app.lifeplus.view.fragment.signup;
 
 
-import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
@@ -39,8 +38,6 @@ public class TextViewHolder extends BaseViewHolder {
     TextBean bean = item.getBean(TextBean.class);
     String text = bean.getText();
 
-    Log.i("APP# TextViewHolder | draw", "| text: " + text);
-
     ((TextView) itemView.findViewById(R.id.sign_up_text_view)).setText(text);
   }
 }

app/src/test/java/kr/co/zumo/app/lifeplus/util/ResourceUtil.java

@@ -0,0 +1,33 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.util;
+
+import android.support.annotation.IdRes;
+
+import kr.co.zumo.app.lifeplus.application.App;
+
+/**
+ * ResourceUtil
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 9. 12.]   [최초 작성]
+ * @since 2018. 9. 12.
+ */
+public class ResourceUtil {
+
+  /**
+   * 뷰 찾기
+   *
+   * @param idName "title"
+   * @return R.id.title
+   */
+  @IdRes
+  public static int getId(String idName) {
+    return App.getInstance().getContext().getResources().getIdentifier(idName, "id", App.getInstance().getPackageName());
+  }
+
+}