Browse Source

[메인][Common] more info 팝업 레이아웃 구현중

Hasemi 7 years ago
parent
commit
886b8bd773

+ 3 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/ContentsDetailBean.java

@@ -120,4 +120,7 @@ public class ContentsDetailBean extends LifeplusContentsBean {
   public void setDescriptionList(List<ContentsDescriptionBean> descriptionList) {
     this.descriptionList = descriptionList;
   }
+
+
+
 }

+ 10 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/ContentsMoreInfoBean.java

@@ -23,6 +23,8 @@ public class ContentsMoreInfoBean extends JsonBeanBase {
   private String itemMoreInfoNumber;
   @SerializedName("dtalCten")
   private String moreInfo;
+  @SerializedName("dtalDvsn")
+  private String detailType;
 
   public String getItemMoreInfoNumber() {
     return itemMoreInfoNumber;
@@ -43,4 +45,12 @@ public class ContentsMoreInfoBean extends JsonBeanBase {
   public String getDescriptionWithHtml() {
     return moreInfo;
   }
+
+  public String getDetailType() {
+    return detailType;
+  }
+
+  public void setDetailType(String detailType) {
+    this.detailType = detailType;
+  }
 }

+ 9 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsDetailListicleDetailViewHolder.java

@@ -1,5 +1,7 @@
 package kr.co.zumo.app.lifeplus.view.screen.contents;
 
+import android.support.constraint.ConstraintLayout;
+import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 
@@ -27,6 +29,7 @@ import kr.co.zumo.app.lifeplus.view.custom.contents.CustomListicleInformationVie
 public class ContentsDetailListicleDetailViewHolder extends ContentsDetailView<ContentsDetailBean> {
 
   private CustomListicleImageView customListicleImageView;
+  private ConstraintLayout layoutMoreInfo;
   private LinearLayout layoutContainer;
 
   public ContentsDetailListicleDetailViewHolder(View itemView) {
@@ -39,6 +42,7 @@ public class ContentsDetailListicleDetailViewHolder extends ContentsDetailView<C
 
     customListicleImageView = itemView.findViewById(R.id.custom_listicle_image_view);
     layoutContainer = itemView.findViewById(R.id.layout_container);
+    layoutMoreInfo = itemView.findViewById(R.id.layout_more_info);
 
     List<ContentsDetailImageBean> contentsDetailImageBeans = bean.getItemImageList();
     customListicleImageView.init(itemView.getContext(), index, bean.getTitle(), bean.getSubTitle(), contentsDetailImageBeans, new IEventListener() {
@@ -53,6 +57,11 @@ public class ContentsDetailListicleDetailViewHolder extends ContentsDetailView<C
       layoutContainer.addView(informationView);
     }
 
+    for(int i = 0; i<bean.getMoreInfoList().size(); i++){
+      Log.e("APP#  ContentsDetailListicleDetailViewHolder | attach", "|" + bean.getMoreInfoList().get(i).getDetailType());
+      Log.e("APP#  ContentsDetailListicleDetailViewHolder | attach", "|" + bean.getMoreInfoList().get(i).getMoreInfo());
+    }
+
   }
 
   @Override

+ 9 - 0
app/src/main/res/drawable/icon_info_address_wh.xml

@@ -0,0 +1,9 @@
+<vector android:height="17dp" android:viewportHeight="66"
+    android:viewportWidth="66" android:width="17dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000" android:fillType="nonZero"
+        android:pathData="M32.819,55.587c0.64,-0.534 1.352,-1.126 1.836,-1.55a74.34,74.34 0,0 0,6.357 -6.248c5.077,-5.654 8.321,-11.23 8.897,-16.237 0.06,-0.526 0.091,-1.043 0.091,-1.552 0,-10.008 -7.932,-18 -18,-18 -9.207,0 -17,8.136 -17,18 0,5.396 3.42,11.602 9.114,17.775a64.362,64.362 0,0 0,6.62 6.224,38.15 38.15,0 0,0 2.085,1.588z"
+        android:strokeColor="#FFF" android:strokeWidth="4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M33,30m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
+        android:strokeColor="#FFF" android:strokeWidth="4"/>
+</vector>

File diff suppressed because it is too large
+ 6 - 0
app/src/main/res/drawable/icon_info_call_wh.xml


+ 9 - 0
app/src/main/res/drawable/icon_info_facebook_wh.xml

@@ -0,0 +1,9 @@
+<vector android:height="17dp" android:viewportHeight="66"
+    android:viewportWidth="66" android:width="17dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000" android:fillType="nonZero"
+        android:pathData="M19,13L47,13A6,6 0,0 1,53 19L53,47A6,6 0,0 1,47 53L19,53A6,6 0,0 1,13 47L13,19A6,6 0,0 1,19 13z"
+        android:strokeColor="#FFF" android:strokeWidth="4"/>
+    <path android:fillColor="#00000000" android:fillType="nonZero"
+        android:pathData="M36.191,52.466l-0.734,0.577 -0.218,-0.217 0.254,-1.048h0.698v0.688zM36.191,48.899L42,24.95v-0.611c-3.245,0.185 -5.809,2.83 -5.809,6.054v18.507zM29.292,35.811h14.707"
+        android:strokeColor="#FFF" android:strokeWidth="4"/>
+</vector>

+ 6 - 0
app/src/main/res/drawable/icon_info_home_wh.xml

@@ -0,0 +1,6 @@
+<vector android:height="17dp" android:viewportHeight="66"
+    android:viewportWidth="66" android:width="17dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M39,53h8a1,1 0,0 0,1 -1V30h3.677L33.028,13.682 15.157,30H18v22a1,1 0,0 0,1 1h8V39h12v14z"
+        android:strokeColor="#FFF" android:strokeWidth="4"/>
+</vector>

+ 9 - 0
app/src/main/res/drawable/icon_info_info.xml

@@ -0,0 +1,9 @@
+<vector android:height="12dp" android:viewportHeight="54"
+    android:viewportWidth="54" android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M27,27m-21,0a21,21 0,1 1,42 0a21,21 0,1 1,-42 0"
+        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M27,15v18M27,36v4"
+        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
+</vector>

+ 10 - 0
app/src/main/res/drawable/icon_info_instagram_wh.xml

@@ -0,0 +1,10 @@
+<vector android:height="12dp" android:viewportHeight="66"
+    android:viewportWidth="66" android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000" android:fillType="nonZero"
+        android:pathData="M24.191,12.191L39.867,12.191A12,12 0,0 1,51.867 24.191L51.867,39.867A12,12 0,0 1,39.867 51.867L24.191,51.867A12,12 0,0 1,12.191 39.867L12.191,24.191A12,12 0,0 1,24.191 12.191z"
+        android:strokeColor="#FFF" android:strokeWidth="4"/>
+    <path android:fillColor="#00000000" android:fillType="nonZero"
+        android:pathData="M32.029,32.029m-8.919,0a8.919,8.919 0,1 1,17.838 0a8.919,8.919 0,1 1,-17.838 0"
+        android:strokeColor="#FFF" android:strokeWidth="4"/>
+    <path android:fillColor="#FFF" android:fillType="nonZero" android:pathData="M44,21m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"/>
+</vector>

File diff suppressed because it is too large
+ 9 - 0
app/src/main/res/drawable/icon_info_menu.xml


+ 21 - 0
app/src/main/res/drawable/icon_info_parking.xml

@@ -0,0 +1,21 @@
+<vector android:height="12dp" android:viewportHeight="54"
+    android:viewportWidth="54" android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M48,26.35L42.314,10.64A4,4 0,0 0,38.552 8H15.448a4,4 0,0 0,-3.762 2.639L6,26.35V39h42V26.35z"
+        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M8,40L10,40A2,2 0,0 1,12 42L12,44A2,2 0,0 1,10 46L8,46A2,2 0,0 1,6 44L6,42A2,2 0,0 1,8 40z"
+        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M13.5,32L14.5,32A0.5,0.5 0,0 1,15 32.5L15,32.5A0.5,0.5 0,0 1,14.5 33L13.5,33A0.5,0.5 0,0 1,13 32.5L13,32.5A0.5,0.5 0,0 1,13.5 32z"
+        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M39.5,32L40.5,32A0.5,0.5 0,0 1,41 32.5L41,32.5A0.5,0.5 0,0 1,40.5 33L39.5,33A0.5,0.5 0,0 1,39 32.5L39,32.5A0.5,0.5 0,0 1,39.5 32z"
+        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M44,40L46,40A2,2 0,0 1,48 42L48,44A2,2 0,0 1,46 46L44,46A2,2 0,0 1,42 44L42,42A2,2 0,0 1,44 40z"
+        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M48,21.5v1.939h2V21l-2,0.5zM6,21.5v1.939H4V21l2,0.5zM5.5,24.5h43"
+        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
+</vector>

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

@@ -0,0 +1,8 @@
+<vector android:height="12dp" android:viewportHeight="54"
+    android:viewportWidth="54" android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M27,27m-21,0a21,21 0,1 1,42 0a21,21 0,1 1,-42 0"
+        android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M27,15v12h12" android:strokeColor="#C5C5C5" android:strokeWidth="4"/>
+</vector>

+ 9 - 0
app/src/main/res/drawable/icon_link.xml

@@ -0,0 +1,9 @@
+<vector android:height="17dp" android:viewportHeight="66"
+    android:viewportWidth="66" android:width="17dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M12,24a1,1 0,0 0,-1 1v25a1,1 0,0 0,1 1h33a1,1 0,0 0,1 -1V25a1,1 0,0 0,-1 -1H12z"
+        android:strokeColor="#FFF" android:strokeWidth="4"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M19,19.006L50.672,43H52c1.302,0 2,-0.7 2,-2V18c0,-1.3 -0.698,-2 -2,-2H21c-1.302,0 -2,0.7 -2,2v1.006z"
+        android:strokeColor="#FFF" android:strokeWidth="4"/>
+</vector>

+ 1 - 0
app/src/main/res/layout/contents_listicle_detail.xml

@@ -52,6 +52,7 @@
     android:paddingEnd="13dp"
     android:paddingBottom="5dp"
     android:visibility="gone"
+    tools:visibility="visible"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent">

+ 226 - 0
app/src/main/res/layout/contents_more_info.xml

@@ -0,0 +1,226 @@
+<?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.support.constraint.ConstraintLayout
+    android:id="@+id/first_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="25dp"
+    android:layout_marginTop="25dp"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:lineSpacingExtra="6sp"
+      android:text="@string/more_info"
+      android:textColor="@color/C000000"
+      android:textSize="15sp"
+      android:textStyle="bold"
+      />
+  </android.support.constraint.ConstraintLayout>
+
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_time_info"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="19dp"
+    app:layout_constraintTop_toBottomOf="@+id/first_layout">
+
+    <ImageView
+      android:id="@+id/image_view_time"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="26dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:srcCompat="@drawable/icon_info_time"
+      />
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="14dp"
+      android:lineSpacingExtra="9.5sp"
+      android:textColor="@color/C000000"
+      android:textSize="12sp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintStart_toEndOf="@+id/image_view_time"
+      app:layout_constraintTop_toTopOf="parent"
+      tools:text="월 ~ 목요일 : 오후 12시 ~ 오후 9시
+토요일 : 오전 10시 ~ 오후 11시
+일요일 : 오전 11시 ~ 오후 11시
+화요일 : 휴무"
+      />
+  </android.support.constraint.ConstraintLayout>
+
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_menu"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="19dp"
+    app:layout_constraintTop_toBottomOf="@+id/layout_time_info">
+
+    <ImageView
+      android:id="@+id/image_view_menu"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="26dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:srcCompat="@drawable/icon_info_menu"
+      />
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="14dp"
+      android:lineSpacingExtra="9.5sp"
+      android:textColor="@color/C000000"
+      android:textSize="12sp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintStart_toEndOf="@+id/image_view_menu"
+      app:layout_constraintTop_toTopOf="parent"
+      tools:text="월 ~ 목요일 : 오후 12시 ~ 오후 9시
+토요일 : 오전 10시 ~ 오후 11시
+일요일 : 오전 11시 ~ 오후 11시
+화요일 : 휴무"
+      />
+  </android.support.constraint.ConstraintLayout>
+
+  <android.support.constraint.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="65dp"
+    android:layout_marginBottom="25dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent">
+
+    <ImageView
+      android:id="@+id/image_view_call_info"
+      android:layout_width="37dp"
+      android:layout_height="37dp"
+      android:background="@drawable/circle_c000000"
+      app:layout_constraintEnd_toStartOf="@+id/image_view_link"
+      app:layout_constraintHorizontal_bias="0.5"
+      app:layout_constraintStart_toStartOf="parent"/>
+
+    <ImageView
+      android:id="@+id/image_view_link"
+      android:layout_width="37dp"
+      android:layout_height="37dp"
+      android:background="@drawable/circle_c000000"
+      app:layout_constraintEnd_toStartOf="@+id/image_view_home"
+      app:layout_constraintHorizontal_bias="0.5"
+      app:layout_constraintStart_toEndOf="@+id/image_view_call_info"/>
+
+    <ImageView
+      android:id="@+id/image_view_home"
+      android:layout_width="37dp"
+      android:layout_height="37dp"
+      android:background="@drawable/circle_c000000"
+      app:layout_constraintEnd_toStartOf="@+id/image_view_instagram"
+      app:layout_constraintHorizontal_bias="0.5"
+      app:layout_constraintStart_toEndOf="@+id/image_view_link"/>
+
+    <ImageView
+      android:id="@+id/image_view_instagram"
+      android:layout_width="37dp"
+      android:layout_height="37dp"
+      android:background="@drawable/circle_c000000"
+      app:layout_constraintEnd_toStartOf="@+id/image_view_facebook"
+      app:layout_constraintHorizontal_bias="0.5"
+      app:layout_constraintStart_toEndOf="@+id/image_view_home"/>
+
+    <ImageView
+      android:id="@+id/image_view_facebook"
+      android:layout_width="37dp"
+      android:layout_height="37dp"
+      android:background="@drawable/circle_c000000"
+      app:layout_constraintEnd_toStartOf="@+id/image_view_address"
+      app:layout_constraintHorizontal_bias="0.5"
+      app:layout_constraintStart_toEndOf="@+id/image_view_instagram"/>
+
+    <ImageView
+      android:id="@+id/image_view_address"
+      android:layout_width="37dp"
+      android:layout_height="37dp"
+      android:background="@drawable/circle_c000000"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintHorizontal_bias="0.5"
+      app:layout_constraintStart_toEndOf="@+id/image_view_facebook"/>
+
+
+    <ImageView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:layout_constraintBottom_toBottomOf="@+id/image_view_call_info"
+      app:layout_constraintEnd_toEndOf="@+id/image_view_call_info"
+      app:layout_constraintStart_toStartOf="@+id/image_view_call_info"
+      app:layout_constraintTop_toTopOf="@+id/image_view_call_info"
+      app:srcCompat="@drawable/icon_info_call_wh"
+      />
+
+    <ImageView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:layout_constraintBottom_toBottomOf="@+id/image_view_link"
+      app:layout_constraintEnd_toEndOf="@+id/image_view_link"
+      app:layout_constraintStart_toStartOf="@+id/image_view_link"
+      app:layout_constraintTop_toTopOf="@+id/image_view_link"
+      app:srcCompat="@drawable/icon_link"
+      />
+
+    <ImageView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:layout_constraintBottom_toBottomOf="@+id/image_view_home"
+      app:layout_constraintEnd_toEndOf="@+id/image_view_home"
+      app:layout_constraintStart_toStartOf="@+id/image_view_home"
+      app:layout_constraintTop_toTopOf="@+id/image_view_home"
+      app:srcCompat="@drawable/icon_info_home_wh"
+      />
+
+    <ImageView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:layout_constraintBottom_toBottomOf="@+id/image_view_instagram"
+      app:layout_constraintEnd_toEndOf="@+id/image_view_instagram"
+      app:layout_constraintStart_toStartOf="@+id/image_view_instagram"
+      app:layout_constraintTop_toTopOf="@+id/image_view_instagram"
+      app:srcCompat="@drawable/icon_info_instagram_wh"
+      />
+
+    <ImageView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:layout_constraintBottom_toBottomOf="@+id/image_view_facebook"
+      app:layout_constraintEnd_toEndOf="@+id/image_view_facebook"
+      app:layout_constraintStart_toStartOf="@+id/image_view_facebook"
+      app:layout_constraintTop_toTopOf="@+id/image_view_facebook"
+      app:srcCompat="@drawable/icon_info_facebook_wh"
+      />
+
+    <ImageView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:layout_constraintBottom_toBottomOf="@+id/image_view_address"
+      app:layout_constraintEnd_toEndOf="@+id/image_view_address"
+      app:layout_constraintStart_toStartOf="@+id/image_view_address"
+      app:layout_constraintTop_toTopOf="@+id/image_view_address"
+      app:srcCompat="@drawable/icon_info_address_wh"
+      />
+
+    <ImageView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:srcCompat="@drawable/icon_info_call_wh"
+      />
+  </android.support.constraint.ConstraintLayout>
+
+</android.support.constraint.ConstraintLayout>