Pārlūkot izejas kodu

[회원가입][Commom] 가입 축하 쿠폰 이미지 추가

Hasemi 7 gadi atpakaļ
vecāks
revīzija
2e58819808

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

@@ -96,7 +96,7 @@ public class SignUpAdapter extends RecyclerView.Adapter<BaseViewHolder> {
         holder = new SignUpTwoButtonHolder(view);
         break;
       case SignUpItem.SIGN_UP_COIN:
-        view = inflater.inflate(R.layout.sign_up_text_view, parent, false);
+        view = inflater.inflate(R.layout.sign_up_coin, parent, false);
         view = getWrappedView(parent, view);
         holder = new SignUpCoinHolder(view);
         break;

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

@@ -4,11 +4,12 @@
 package kr.co.zumo.app.lifeplus.view.fragment.signup;
 
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.view.presenter.bean.SignUpCoinBean;
 import kr.co.zumo.app.lifeplus.view.presenter.signup.SignUpItem;
-import kr.co.zumo.app.lifeplus.view.presenter.bean.TextBean;
 
 /**
  * SignUpCoinHolder
@@ -27,10 +28,10 @@ public class SignUpCoinHolder extends BaseViewHolder {
 
   @Override
   void draw(SignUpItem item) {
-    TextBean bean = item.getBean(TextBean.class);
-    String text = bean.getText();
 
-    ((TextView) itemView.findViewById(R.id.sign_up_text_view)).setText(text);
+    SignUpCoinBean bean = item.getBean(SignUpCoinBean.class);
+    ((ImageView)itemView.findViewById(R.id.image_view_coupon)).setImageResource(bean.getCouponImage());
+    ((TextView) itemView.findViewById(R.id.text_view_coupon)).setText(bean.getText());
   }
 
   @Override

+ 23 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/bean/SignUpCoinBean.java

@@ -3,6 +3,8 @@
  */
 package kr.co.zumo.app.lifeplus.view.presenter.bean;
 
+import android.support.annotation.DrawableRes;
+
 /**
  * SignUpCoinBean
  * <pre>
@@ -14,6 +16,27 @@ package kr.co.zumo.app.lifeplus.view.presenter.bean;
  * @since 2018. 9. 12.
  */
 public class SignUpCoinBean extends TextBean {
+
+  @DrawableRes
+  protected int couponImage;
+
+
+  public SignUpCoinBean(String text, int couponImage) {
+    super(text);
+    this.couponImage = couponImage;
+
+  }
+
+
+
+  public int getCouponImage() {
+    return couponImage;
+  }
+
+  public void setCouponImage(int couponImage) {
+    this.couponImage = couponImage;
+  }
+
   public SignUpCoinBean(String text) {
     super(text);
   }

+ 6 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/signup/SignUpStepComplete.java

@@ -9,6 +9,7 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.presenter.Event;
 import kr.co.zumo.app.lifeplus.view.presenter.bean.SignUpButtonBean;
+import kr.co.zumo.app.lifeplus.view.presenter.bean.SignUpCoinBean;
 import kr.co.zumo.app.lifeplus.view.presenter.bean.TextBean;
 
 /**
@@ -30,7 +31,11 @@ public class SignUpStepComplete extends SignUpStep {
   void __start() {
     model.addItem(new SignUpItem(SignUpItem.SIGN_UP_DIVIDER, new TextBean(ResourceUtil.getString(R.string.sign_up_completed)).toJson()));
     model.addItem(new SignUpItem(SignUpItem.SIGN_UP_TEXT, SignUpItem.ALIGN_START, new TextBean(ResourceUtil.getString(R.string.sign_up_completed_message, "한화")).toJson()));
-    model.addItem(new SignUpItem(SignUpItem.SIGN_UP_COIN, SignUpItem.ALIGN_START, new TextBean("가입 완료 코인 300c 지급 완료").toJson()));
+    model.addItem(new SignUpItem(SignUpItem.SIGN_UP_COIN, SignUpItem.ALIGN_START, new SignUpCoinBean(ResourceUtil.getString(R.string.coupon_message, "한화"), R.drawable.coupon_image).toJson()))
+
+
+
+    ;
     model.addItem(new SignUpItem(SignUpItem.SIGN_UP_BUTTON, SignUpItem.ALIGN_CENTER, new SignUpButtonBean(ResourceUtil.getString(R.string.sign_up_start_lifeplus), SignUpItem.BUTTON_ID_JOINED).toJson(), (holder, eventId, type, param) -> {
       Log.i("APP# SignUpStepComplete | onSignUpHolderEvent", "| eventId: " + eventId + ", type: " + type);
 

+ 8 - 0
app/src/main/res/drawable/coupon_image.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle"
+  >
+  <stroke
+    android:width="2dp"
+    android:color="@color/darkGrey"/>
+</shape>

+ 37 - 0
app/src/main/res/layout/sign_up_coin.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+  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"
+  tools:layout_editor_absoluteY="81dp">
+
+  <ImageView
+    android:id="@+id/image_view_coupon"
+    android:layout_width="match_parent"
+    android:layout_height="100dp"
+    android:layout_alignParentStart="true"
+    android:layout_alignParentTop="true"
+    android:background="@drawable/coupon_image"
+    android:layout_marginRight="20dp"
+    android:layout_marginLeft="20dp"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="20dp"
+    />
+
+  <TextView
+    android:id="@+id/text_view_coupon"
+    android:layout_width="78dp"
+    android:layout_height="wrap_content"
+    android:layout_alignBottom="@id/image_view_coupon"
+    android:layout_alignLeft="@id/image_view_coupon"
+    android:layout_alignRight="@id/image_view_coupon"
+    android:layout_alignTop="@id/image_view_coupon"
+    android:gravity="center"
+    android:layout_weight="1"
+    android:textAlignment="center"
+    android:textSize="18dp"/>
+
+
+</RelativeLayout>

+ 11 - 5
app/src/main/res/values/strings.xml

@@ -76,13 +76,19 @@
   <string name="phone_identify_birth_date_length_validation_message">YYYYMMDD 숫자를 입력해 주세요</string>
   <string name="phone_identify_birth_date_input_validation_message">생년월일을 입력해주세요</string>
   <string name="phone_identify_phone_validation">휴대전화 번호 뒤 7~8자리를 입력해주세요</string>
+  <string name="coupon_message">가입 완료 축하\n 300 코인 지급 완료</string>
 
-
-
-  <string name="network_disconnected_message">서버와의 통신이 원활하지 않습니다.</string>
-  <string name="network_disconnected_message_detail">네트워크 연결이 원활하지 않습니다. 사용중인 네트워크 상태를 확인해주세요.</string>
-
+  <string name="network_disconnected_message">서버와의 통신이 \n 원활하지 않습니다.</string>
+  <string name="network_disconnected_message_detail">네트워크 연결이 원활하지 않습니다. \n8사용중인 네트워크 상태를 확인해주세요.</string>
+  <string name="error_message_404type">잠시 서비스를 \n 이용하실 수 없습니다.</string>
+  <string name="error_detail_message_404type">서비스 이용에 불편을 드려 죄송합니다. \n 잠시 후 다시 이용해 주시기 바랍니다.</string>
+  <string name="error_message_500type">서비스 이용에 불편을 드려 \n 죄송합니다.</string>
+  <string name="error_detail_message_500type">잠시 후 다시 이용해 주시기 바립니다.</string>
+  <string name="email_inquiry">이메일 문의</string>
+  <string name="email_address">lifeplus@hanwha.com</string>
   <string name="retry">다시 시도</string>
+  <string name="main">메인</string>
+  <string name="previous_page">이전 페이지</string>
 
   <string name="tutorial_title">내일상의 플러스</string>
   <string name="tutorial_start">삶을 더 잘 살기 위한 이야기, \n 시작해볼까요?</string>