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

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

@@ -0,0 +1,48 @@
+package kr.co.zumo.app.lifeplus.view.fragment.signup;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.DialogFragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+
+import kr.co.zumo.app.R;
+
+/**
+ * PasswordDialog
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-09-13]   [최초 작성]
+ * @since 2018-09-13
+ */
+public class PasswordDialog extends DialogFragment{
+
+  public PasswordDialog() {
+  }
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    setStyle(DialogFragment.STYLE_NO_TITLE, android.R.style.Theme_Translucent_NoTitleBar_Fullscreen);
+    setStyle(DialogFragment.STYLE_NO_FRAME, android.R.style.Theme_Translucent_NoTitleBar_Fullscreen);
+    super.onCreate(savedInstanceState);
+  }
+
+
+  @Nullable
+  @Override
+  public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+   getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+    View view = inflater.inflate(R.layout.password_dialog, container, false);
+
+    return view;
+
+  }
+
+
+
+}

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

@@ -3,10 +3,12 @@
  */
 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.v4.app.FragmentManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -56,7 +58,7 @@ public class SignUpFragment extends FragmentBase {
   @Nullable
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
+    showDialog();
     return DataBindingUtil.inflate(inflater, R.layout.fragment_sign_up, container, false).getRoot();
   }
 
@@ -81,6 +83,7 @@ public class SignUpFragment extends FragmentBase {
     });
 
     // fixme for test
+
     signUpViewModel.addItem(new SignUpItem(SignUpItem.SIGN_UP_TEXT, SignUpItem.ALIGN_START, new TextBean(ResourceUtil.getString(R.string.sign_up_hello_text)).toJson()));
 
     SignUpBenefitBean bean = new SignUpBenefitBean("1 번째 텍스트", R.drawable.common_full_open_on_phone, "benefit text1", "category text1");
@@ -108,6 +111,7 @@ public class SignUpFragment extends FragmentBase {
     signUpViewModel.addItem(new SignUpItem(SignUpItem.SIGN_UP_NOTICE, SignUpItem.ALIGN_CENTER, new TextBean("SIGN_UP_NOTICE").toJson()));
     signUpViewModel.addItem(new SignUpItem(SignUpItem.SIGN_UP_WAITING, SignUpItem.ALIGN_CENTER, new TextBean("SIGN_UP_WAITING").toJson()));
 
+
     adapter.notifyDataSetChanged();
     return viewModel;
   }
@@ -124,4 +128,13 @@ public class SignUpFragment extends FragmentBase {
     super.onStart();
 
   }
+
+  public void showDialog(){
+    FragmentManager manager = getFragmentManager();
+    PasswordDialog dialog = new PasswordDialog();
+    dialog.show(manager, "example");
+
+  }
+
+
 }

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="@color/colorAccent"
+  tools:layout_editor_absoluteY="81dp">
+
+
+  <TextView
+    android:id="@+id/textView"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="101dp"
+    android:text="@string/sign_up_input_password"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    />
+
+</android.support.constraint.ConstraintLayout>

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

@@ -26,4 +26,7 @@
   <string name="service_agree4">선택) 제휴사 서비스 이용을 위한 개인 정보 수집 및 활용 동의 > </string>
   <string name="service_agree5">선택) 위치기반 서비스 이용 동의 > </string>
   <string name="service_agree6">선택) 마케팅 정보 수집 동의 > </string>
+
+  <string name="sign_up_password">Lifeplus에 사용할 간편 암호를 등록해주세요. </string>
+  <string name="sign_up_input_password">등록하실 간편암호 4자리를 입력해주세요.</string>
 </resources>