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

# Conflicts:
#	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/FragmentBase.java

@@ -58,12 +58,12 @@ public abstract class FragmentBase extends Fragment {
   }
 
   @Override
-  public final void onStart() {
+  public void onStart() {
     super.onStart();
   }
 
   @Override
-  public final void onResume() {
+  public void onResume() {
     super.onResume();
   }
 

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

@@ -20,7 +20,7 @@ import kr.co.zumo.app.lifeplus.view.model.SignUpViewModel;
  * @history 하세미   [2018-09-11]   [최초 작성]
  * @since 2018-09-11
  */
-public class SignUpAdapter extends RecyclerView.Adapter {
+public class SignUpAdapter extends RecyclerView.Adapter<BaseViewHolder> {
 
   private SignUpViewModel signUpViewModel;
 
@@ -36,7 +36,6 @@ public class SignUpAdapter extends RecyclerView.Adapter {
       case SignUpListItem.SIGN_UP_HELLO:
         View textView = LayoutInflater.from(parent.getContext()).inflate(R.layout.sign_up_text_view, parent, false);
         holder = new TextViewHolder(textView);
-        holder.draw();
         break;
 //      case SignUpListItem.SIGN_UP_BENEFIT:
 //        dataObj = viewModel.getCurrentData();
@@ -51,12 +50,13 @@ public class SignUpAdapter extends RecyclerView.Adapter {
   }
 
   @Override
-  public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+  public void onBindViewHolder(@NonNull BaseViewHolder holder, int position) {
+    holder.draw();
   }
 
   @Override
   public int getItemCount() {
-    return 0;
+    return signUpViewModel.getSignUpList().size();
   }
 
   @Override

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

@@ -5,6 +5,8 @@ package kr.co.zumo.app.lifeplus.view.fragment.signup;
 
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -20,6 +22,7 @@ import kr.co.zumo.app.lifeplus.view.fragment.factory.BasicFragmentFactory;
 import kr.co.zumo.app.lifeplus.view.model.SignUpListItem;
 import kr.co.zumo.app.lifeplus.view.model.SignUpViewModel;
 import kr.co.zumo.app.lifeplus.view.model.ViewModel;
+import kr.co.zumo.app.lifeplus.view.model.bean.SignUpTextBean;
 
 /**
  * 회원 가입 화면
@@ -31,23 +34,26 @@ import kr.co.zumo.app.lifeplus.view.model.ViewModel;
  * @history 민효동   [2018. 9. 5.]   [최초 작성]
  * @since 2018. 9. 5.
  */
+
 public class SignUpFragment extends FragmentBase {
 
+  private SignUpAdapter adapter;
+
   public SignUpFragment() {
     // Required empty public constructor
   }
 
+  @Nullable
   @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    // Inflate the layout for this fragment
+  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
     return DataBindingUtil.inflate(inflater, R.layout.fragment_sign_up, container, false).getRoot();
   }
 
+
   @Override
   protected ViewModel defineViewModel() {
     ScreenChangerHelper helper = ScreenChangerHelper.getInstance();
     SignUpViewModel signUpViewModel = new SignUpViewModel(new FragmentChanger(helper.getFragmentActivity(), helper.getContainerId(), new BasicFragmentFactory()));
-    signUpViewModel.addItem(new SignUpListItem(SignUpListItem.SIGN_UP_HELLO, App.getInstance().getString(R.string.sign_up_hello_text)));
     SignUpAdapter adapter = new SignUpAdapter(signUpViewModel);
     RecyclerView recyclerView = getActivity().findViewById(R.id.sign_up_list);
     recyclerView.setHasFixedSize(true);
@@ -58,4 +64,13 @@ public class SignUpFragment extends FragmentBase {
     return viewModel;
   }
 
+  @Override
+  public void onStart() {
+    super.onStart();
+
+
+    // fixme for test
+    ((SignUpViewModel) viewModel).addItem(new SignUpListItem(SignUpListItem.SIGN_UP_HELLO, new SignUpTextBean(App.getInstance().getString(R.string.sign_up_hello_text)).toJson()));
+    adapter.notifyDataSetChanged();
+  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/model/SignUpViewModel.java

@@ -7,8 +7,6 @@ import android.databinding.ObservableArrayList;
 import android.databinding.ObservableList;
 import android.support.annotation.Nullable;
 
-import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.application.App;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenChanger;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 
@@ -31,8 +29,6 @@ public class SignUpViewModel extends ViewModel {
 
     signUpList = new ObservableArrayList<>();
 
-    // fixme for test
-    signUpList.add(new SignUpListItem(SignUpListItem.SIGN_UP_HELLO, App.getInstance().getString(R.string.sign_up_hello_text)));
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/model/bean/SignUpTextBean.java

@@ -20,6 +20,10 @@ public class SignUpTextBean extends JsonBean {
   @SerializedName("text")
   private String text;
 
+  public SignUpTextBean(String text) {
+    this.text = text;
+  }
+
   public String getText() {
     return text;
   }

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

@@ -2,14 +2,6 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools">
 
-  <data>
-    <import type="android.databinding.ObservableList"/>
-    <variable
-      name="model"
-      type="kr.co.zumo.app.lifeplus.view.model.SignUpViewModel"/>
-  </data>
-
-
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"

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

@@ -5,30 +5,32 @@
   android:layout_height="match_parent">
 
   <LinearLayout
-    android:weightSum="5"
-    android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:weightSum="5">
 
     <View
       android:layout_width="0dp"
       android:layout_height="2dp"
-      android:background="@color/colorPrimary"
       android:layout_marginTop="5dp"
-      android:layout_weight="2"/>
+      android:layout_weight="2"
+      android:background="@color/colorPrimary"/>
+
     <TextView
       android:layout_width="0dp"
       android:layout_height="wrap_content"
+      android:layout_weight="1"
       android:text="text"
       android:textAlignment="center"
-      android:layout_weight="1"
       />
+
     <View
       android:layout_width="0dp"
-      android:layout_marginTop="5dp"
       android:layout_height="2dp"
-      android:background="@color/colorPrimary"
-      android:layout_weight="2"/>
+      android:layout_marginTop="5dp"
+      android:layout_weight="2"
+      android:background="@color/colorPrimary"/>
 
   </LinearLayout>
 </LinearLayout>

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

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  xmlns:tools="http://schemas.android.com/tools">
+  android:layout_height="match_parent">
 
   <TextView
     android:id="@+id/sign_up_text_view"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@color/colorPrimary"
-    tools:text="text"
+    android:layout_marginLeft="20dp"
     android:layout_marginTop="20dp"
-    android:layout_marginLeft="20dp"/>
+    android:background="@color/colorPrimary"
+    tools:text="text"/>
 
 </LinearLayout>