浏览代码

[회원가입][New] 회원가입 divider Holder 추가

hyodong.min 7 年之前
父节点
当前提交
9930e037aa

+ 2 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/BenefitHolder.java

@@ -43,10 +43,9 @@ public class BenefitHolder extends BaseViewHolder {
     SignUpBenefitCustomView view2 = (SignUpBenefitCustomView) itemView.findViewById(R.id.custom_view2);
     SignUpBenefitCustomView view3 = (SignUpBenefitCustomView) itemView.findViewById(R.id.custom_view3);
 
-
     view.setSignUpBenefit(list.get(0).getImgRes(), list.get(0).getText(), list.get(0).getBenefitText(), list.get(0).getCategoryText());
-    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());
+    view2.setSignUpBenefit(list.get(1).getImgRes(), list.get(1).getText(), list.get(1).getBenefitText(), list.get(1).getCategoryText());
+    view3.setSignUpBenefit(list.get(2).getImgRes(), list.get(2).getText(), list.get(2).getBenefitText(), list.get(2).getCategoryText());
 
   }
 }

+ 5 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpAdapter.java

@@ -72,6 +72,10 @@ public class SignUpAdapter extends RecyclerView.Adapter<BaseViewHolder> {
         view = LayoutInflater.from(parent.getContext()).inflate(R.layout.sign_up_text_view, parent, false);
         holder = new SignUpWaitingHolder(view);
         break;
+      case SignUpItem.SIGN_UP_DIVIDER:
+        view = LayoutInflater.from(parent.getContext()).inflate(R.layout.sign_up_divider, parent, false);
+        holder = new SignUpDividerHolder(view);
+        break;
       default:
         break;
     }
@@ -91,7 +95,6 @@ public class SignUpAdapter extends RecyclerView.Adapter<BaseViewHolder> {
   @Override
   public int getItemViewType(int position) {
     SignUpItem item = signUpViewModel.getItem(position);
-    int itemType = item.getItemType();
-    return itemType;
+    return item.getItemType();
   }
 }

+ 27 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpDividerHolder.java

@@ -0,0 +1,27 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.view.fragment.signup;
+
+import android.view.View;
+
+/**
+ * SignUpDividerHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 9. 12.]   [최초 작성]
+ * @since 2018. 9. 12.
+ */
+public class SignUpDividerHolder extends BaseViewHolder {
+  public SignUpDividerHolder(View itemView) {
+    super(itemView);
+  }
+
+  @Override
+  void draw(int index) {
+
+  }
+}

+ 4 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpFragment.java

@@ -70,6 +70,7 @@ 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_DIVIDER));
 
     SignUpBenefitBean bean = new SignUpBenefitBean("3 번째 텍스트", R.drawable.circle, "benefit text1", "benefit text2");
     SignUpBenefitBean bean2 = new SignUpBenefitBean("3 번째 텍스트", R.drawable.circle, "benefit text1", "benefit text2");
@@ -82,11 +83,14 @@ 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_DIVIDER));
     ((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_DIVIDER));
     ((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_DIVIDER));
     ((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();

+ 21 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/model/SignUpItem.java

@@ -26,6 +26,7 @@ public class SignUpItem {
   public static final int SIGN_UP_WAITING = 6;
   public static final int SIGN_UP_COIN = 7;
   public static final int SIGN_UP_NOTICE = 8;
+  public static final int SIGN_UP_DIVIDER = 9;
 
   public static final int ALIGN_LEFT = 0;
   public static final int ALIGN_CENTER = 1;
@@ -38,8 +39,8 @@ public class SignUpItem {
   /**
    * 회원 가입에 사용되는 아이템
    *
-   * @param itemType 텍스트, 버튼 등 아이템의 타입 지정
-   * @param alignType 정렬 타입 지정
+   * @param itemType   텍스트, 버튼 등 아이템의 타입 지정
+   * @param alignType  정렬 타입 지정
    * @param jsonString 타입에 사용되는 json 타입의 데이터
    */
   public SignUpItem(int itemType, int alignType, String jsonString) {
@@ -48,6 +49,15 @@ public class SignUpItem {
     this.alignType = alignType;
   }
 
+  public SignUpItem(int itemType, int alignType) {
+    this.itemType = itemType;
+    this.alignType = alignType;
+  }
+
+  public SignUpItem(int itemType) {
+    this.itemType = itemType;
+  }
+
   /**
    * 아이템의 데이터로 사용되는 string
    *
@@ -75,4 +85,13 @@ public class SignUpItem {
   public <T> T getBean(Class<T> beanClass) {
     return new Gson().fromJson(jsonString, beanClass);
   }
+
+  /**
+   * 좌/우/중앙 정렬
+   *
+   * @return ALIGN_LEFT|ALIGN_CENTER|ALIGN_RIGHT
+   */
+  public int getAlignType() {
+    return alignType;
+  }
 }

+ 1 - 1
app/src/main/res/layout/sign_up_divider.xml

@@ -2,7 +2,7 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:layout_height="wrap_content">
 
   <LinearLayout
     android:layout_width="match_parent"