瀏覽代碼

[LP소개][Common] 수정 디자인 반영

Hasemi 7 年之前
父節點
當前提交
e94bdaa648

+ 11 - 10
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/guide/GuideLastViewHolder.java

@@ -1,7 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.guide;
 
 import android.content.Context;
-import android.support.constraint.ConstraintLayout;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -10,6 +9,7 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
+import kr.co.zumo.app.lifeplus.view.custom.WhiteButtonWithArrowView;
 
 /**
  * GuideLastViewHolder
@@ -26,29 +26,30 @@ public class GuideLastViewHolder extends GuideView {
   private ImageView imageViewFullImage;
   private TextView textViewTitle;
   private TextView textViewContents;
-  private ConstraintLayout buttonJoin;
+  private WhiteButtonWithArrowView whiteButtonWithArrowView;
 
   public GuideLastViewHolder(Context context, View itemView) {
     super(context, itemView);
     imageViewFullImage = itemView.findViewById(R.id.image_view_full_image);
     textViewTitle = itemView.findViewById(R.id.text_view_title);
     textViewContents = itemView.findViewById(R.id.text_view_contents);
-    buttonJoin = itemView.findViewById(R.id.button_join);
+    whiteButtonWithArrowView = itemView.findViewById(R.id.black_button_with_arrow);
   }
 
   @Override
   public void init(IEventListener listener) {
     super.init(listener);
-    imageViewFullImage.setImageDrawable(itemView.getResources().getDrawable(R.drawable.img_lpguide_6));
+    imageViewFullImage.setImageDrawable(itemView.getResources().getDrawable(R.drawable.img_lpguide_6_object));
     textViewTitle.setText(R.string.life_plus_guide_title_6);
     textViewContents.setText(R.string.life_plus_guide_contents_6);
-    if(SuperModel.getInstance().isMember()){
-      buttonJoin.setVisibility(View.GONE);
-    }else{
+    if (SuperModel.getInstance().isMember()) {
+      whiteButtonWithArrowView.setVisibility(View.GONE);
+    }
+    else {
 
-      buttonJoin.setVisibility(View.VISIBLE);
-      buttonJoin.setOnClickListener(view -> {
-        if(null != listener){
+      whiteButtonWithArrowView.setVisibility(View.VISIBLE);
+      whiteButtonWithArrowView.setOnClickListener(view -> {
+        if (null != listener) {
           listener.onEvent(new Event.Builder(Event.SIGN_UP).build());
         }
       });

+ 12 - 36
app/src/main/res/layout/app_guide_last_view.xml

@@ -11,7 +11,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scaleType="centerCrop"
-    app:srcCompat="@drawable/img_lpguide_6"
+    app:srcCompat="@drawable/img_lpguide_6_object"
     />
 
   <TextView
@@ -31,7 +31,7 @@
   <TextView
     android:id="@+id/text_view_contents"
     android:layout_width="wrap_content"
-    android:layout_height="39dp"
+    android:layout_height="wrap_content"
     android:layout_marginTop="10dp"
     android:gravity="center_horizontal"
     android:lineSpacingExtra="6sp"
@@ -43,41 +43,17 @@
     tools:text="@string/life_plus_guide_contents_6"/>
 
 
-  <android.support.constraint.ConstraintLayout
-    android:id="@+id/button_join"
+
+  <kr.co.zumo.app.lifeplus.view.custom.WhiteButtonWithArrowView
+    android:id="@+id/black_button_with_arrow"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="94dp"
-    android:background="@drawable/button_border_c000000"
-    app:layout_constraintBottom_toBottomOf="parent"
+    android:layout_height="42dp"
+    android:layout_marginStart="8dp"
+    android:layout_marginTop="18dp"
+    android:layout_marginEnd="8dp"
     app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent">
-
-    <TextView
-      android:id="@+id/text_view_button_message"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:lineSpacingExtra="6sp"
-      android:paddingStart="22dp"
-      android:paddingTop="11dp"
-      android:paddingEnd="3dp"
-      android:paddingBottom="11dp"
-      android:text="@string/join_and_get_coin"
-      android:textColor="@color/C000000"
-      android:textSize="15sp"
-      />
-
-    <ImageView
-      android:id="@+id/image_view_arrow"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:paddingEnd="23dp"
-      app:layout_constraintBottom_toBottomOf="@+id/text_view_button_message"
-      app:layout_constraintStart_toEndOf="@+id/text_view_button_message"
-      app:layout_constraintTop_toTopOf="@+id/text_view_button_message"
-      app:srcCompat="@drawable/icon_guide_arrow_b"
-      />
-
-  </android.support.constraint.ConstraintLayout>
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/text_view_contents"
+    app:text="@string/join_and_get_coin"/>
 
 </android.support.constraint.ConstraintLayout>