Переглянути джерело

[회원가입][Common] 약관동의 GUI 적용

Hasemi 7 роки тому
батько
коміт
f9a3dfbaad

BIN
app/src/main/res/drawable/icon_detail_arrow.png


+ 147 - 109
app/src/main/res/layout/fragment_sign_up_agree.xml

@@ -7,217 +7,255 @@
   android:layout_height="match_parent"
   android:orientation="vertical">
 
-  <CheckBox
-    android:id="@+id/agree_check_all"
+  <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="3pt"
-    android:layout_marginLeft="5pt"
-    android:textIsSelectable="false"
-    android:textSize="15dp"
-    />
+    android:layout_marginLeft="24.5dp"
+    android:layout_marginRight="24.5dp"
+    android:layout_marginTop="30dp"
+    android:orientation="vertical">
 
-  <View
+    <CheckBox
+      android:id="@+id/agree_check_all"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="3pt"
+      android:layout_weight="9"
+      android:button="@null"
+      android:drawableLeft="@drawable/custom_check_box"
+      android:drawablePadding="8.5dp"
+      android:lineSpacingExtra="5.5sp"
+      android:text="@string/all_agree"
+      android:textColor="#000000"
+      android:textSize="14sp"
+      />
+  </LinearLayout>
+  <LinearLayout
     android:layout_width="match_parent"
-    android:layout_height="2dp"
-    android:layout_centerInParent="true"
-    android:layout_marginLeft="5pt"
-    android:layout_marginRight="5pt"
-    android:background="@color/darkGrey"/>
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="24.5dp"
+    android:layout_marginRight="24.5dp"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="21dp"
+    android:orientation="vertical">
+
+    <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="#e5e5e5"/>
+
+  </LinearLayout>
 
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:layout_marginBottom="14dp"
+    android:layout_marginLeft="24.5dp"
+    android:layout_marginRight="24.5dp"
+    android:orientation="horizontal"
+    android:weightSum="10">
 
     <CheckBox
       android:id="@+id/agree_check0"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="5pt"
-      android:layout_marginTop="3pt"
-      android:layout_weight="4"
-      android:textSize="15dp"
-      tools:text="@string/phone_identify_agree1"
+      android:layout_weight="9"
+      android:button="@null"
+      android:drawableLeft="@drawable/custom_check_box"
+      android:drawablePadding="8.5dp"
+      android:lineSpacingExtra="5.5sp"
+      android:text="@string/agree_required"
+      android:textColor="#000000"
+      android:textSize="14sp"
       />
 
-    <TextView
+    <ImageView
       android:id="@+id/agree_detail_button0"
       android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_marginLeft="5pt"
-      android:layout_marginTop="3pt"
+      android:layout_height="17dp"
+      android:layout_gravity="center"
       android:layout_weight="1"
-      android:text=">"
-      android:textAlignment="center"
-      android:textSize="15dp"
-      />
+      android:src="@drawable/icon_detail_arrow"/>
   </LinearLayout>
 
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="14dp"
+    android:layout_marginLeft="24.5dp"
+    android:layout_marginRight="24.5dp"
     android:orientation="horizontal"
-    android:weightSum="5"
-    >
+    android:weightSum="10">
 
     <CheckBox
       android:id="@+id/agree_check1"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="5pt"
-      android:layout_marginTop="3pt"
-      android:layout_weight="4"
-      android:textSize="15dp"
-      tools:text="@string/phone_identify_agree2"
+      android:layout_weight="9"
+      android:button="@null"
+      android:drawableLeft="@drawable/custom_check_box"
+      android:drawablePadding="8.5dp"
+      android:lineSpacingExtra="5.5sp"
+      android:text="@string/agree_required"
+      android:textColor="#000000"
+      android:textSize="14sp"
       />
 
-    <TextView
+    <ImageView
       android:id="@+id/agree_detail_button1"
       android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_marginLeft="5pt"
-      android:layout_marginTop="3pt"
+      android:layout_height="17dp"
+      android:layout_gravity="center"
       android:layout_weight="1"
-
-      android:text=">"
-      android:textAlignment="center"
-      android:textSize="15dp"
-      />
+      android:src="@drawable/icon_detail_arrow"/>
   </LinearLayout>
 
   <LinearLayout
-    android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:orientation="horizontal">
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="14dp"
+    android:layout_marginLeft="24.5dp"
+    android:layout_marginRight="24.5dp"
+    android:orientation="horizontal"
+    android:weightSum="10">
 
     <CheckBox
       android:id="@+id/agree_check2"
       android:layout_width="0dp"
-      android:layout_weight="4"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="5pt"
-      android:layout_marginTop="3pt"
-      android:textSize="15dp"
-      tools:text="@string/phone_identify_agree2"
+      android:layout_weight="9"
+      android:button="@null"
+      android:drawableLeft="@drawable/custom_check_box"
+      android:drawablePadding="8.5dp"
+      android:lineSpacingExtra="5.5sp"
+      android:text="@string/agree_option"
+      android:textColor="#000000"
+      android:textSize="14sp"
       />
 
-    <TextView
+    <ImageView
       android:id="@+id/agree_detail_button2"
       android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_marginLeft="5pt"
-      android:layout_marginTop="3pt"
+      android:layout_height="17dp"
+      android:layout_gravity="center"
       android:layout_weight="1"
-      android:text=">"
-      android:textAlignment="center"
-      android:textSize="15dp"
-      />
+      android:src="@drawable/icon_detail_arrow"/>
   </LinearLayout>
 
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="14dp"
+    android:layout_marginLeft="24.5dp"
+    android:layout_marginRight="24.5dp"
     android:orientation="horizontal"
-    android:weightSum="5">
+    android:weightSum="10">
 
     <CheckBox
       android:id="@+id/agree_check3"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="5pt"
-      android:layout_marginTop="3pt"
-      android:layout_weight="4"
-      android:textSize="15dp"
-      tools:text="@string/phone_identify_agree2"
+      android:layout_weight="9"
+      android:button="@null"
+      android:drawableLeft="@drawable/custom_check_box"
+      android:drawablePadding="8.5dp"
+      android:lineSpacingExtra="5.5sp"
+      android:text="@string/agree_option"
+      android:textColor="#000000"
+      android:textSize="14sp"
       />
 
-    <TextView
+    <ImageView
       android:id="@+id/agree_detail_button3"
       android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_marginLeft="5pt"
-      android:layout_marginTop="3pt"
+      android:layout_height="17dp"
+      android:layout_gravity="center"
       android:layout_weight="1"
-      android:text=">"
-      android:textAlignment="center"
-      android:textSize="15dp"
-      />
+      android:src="@drawable/icon_detail_arrow"/>
   </LinearLayout>
 
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="14dp"
+    android:layout_marginLeft="24.5dp"
+    android:layout_marginRight="24.5dp"
     android:orientation="horizontal"
-    android:weightSum="5">
+    android:weightSum="10">
 
     <CheckBox
       android:id="@+id/agree_check4"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="5pt"
-      android:layout_marginTop="3pt"
-      android:layout_weight="4"
-      android:textSize="15dp"
-      tools:text="@string/phone_identify_agree2"
+      android:layout_weight="9"
+      android:button="@null"
+      android:drawableLeft="@drawable/custom_check_box"
+      android:drawablePadding="8.5dp"
+      android:lineSpacingExtra="5.5sp"
+      android:text="@string/agree_option"
+      android:textColor="#000000"
+      android:textSize="14sp"
       />
 
-    <TextView
+    <ImageView
       android:id="@+id/agree_detail_button4"
       android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_marginLeft="5pt"
-      android:layout_marginTop="3pt"
+      android:layout_height="17dp"
+      android:layout_gravity="center"
       android:layout_weight="1"
-      android:text=">"
-      android:textAlignment="center"
-      android:textSize="15dp"
-      />
+      android:src="@drawable/icon_detail_arrow"/>
   </LinearLayout>
 
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="14dp"
+    android:layout_marginLeft="24.5dp"
+    android:layout_marginRight="24.5dp"
     android:orientation="horizontal"
-    android:weightSum="5"
-    >
+    android:weightSum="10">
 
     <CheckBox
       android:id="@+id/agree_check5"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="5pt"
-      android:layout_marginTop="3pt"
-      android:layout_weight="4"
-      android:textSize="15dp"
-      tools:text="@string/phone_identify_agree2"
+      android:layout_weight="9"
+      android:button="@null"
+      android:drawableLeft="@drawable/custom_check_box"
+      android:drawablePadding="8.5dp"
+      android:lineSpacingExtra="5.5sp"
+      android:text="@string/agree_option"
+      android:textColor="#000000"
+      android:textSize="14sp"
       />
 
-    <TextView
+    <ImageView
       android:id="@+id/agree_detail_button5"
       android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_marginLeft="5pt"
-      android:layout_marginTop="3pt"
+      android:layout_height="17dp"
+      android:layout_gravity="center"
       android:layout_weight="1"
-      android:text=">"
-      android:textAlignment="center"
-      android:textSize="15dp"
-      />
+      android:src="@drawable/icon_detail_arrow"/>
   </LinearLayout>
+
   <LinearLayout
     android:layout_width="match_parent"
-    android:gravity="bottom"
-    android:orientation="vertical"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    android:layout_marginTop="189dp"
+    android:gravity="center"
+    >
+
     <Button
-      android:layout_gravity="center"
-      android:layout_width="wrap_content"
+      android:id="@+id/button_sign_up_agree"
+      style="?android:attr/borderlessButtonStyle"
+      android:layout_width="104dp"
       android:layout_height="wrap_content"
-      android:text="약관동의 완료"
+      android:background="@drawable/sign_up_button"
+      android:lineSpacingExtra="3.5sp"
+      android:text="@string/sign_up_agree"
+      android:textColor="#000000"
+      android:textSize="12sp"
       />
 
   </LinearLayout>
-
-
 </LinearLayout>

+ 0 - 138
app/src/main/res/layout/fragment_sign_up_authorization_result.xml

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="vertical">
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    >
-
-    <ImageView
-
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center"
-      android:src="@drawable/sign_up_authorization_result"/>
-
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="56dp"
-      android:layout_gravity="center"
-      android:text="@string/sign_up_id_confirm_completed"
-      android:textAlignment="center"
-      android:textSize="20dp"
-      />
-
-    <View
-      android:layout_marginTop="407dp"
-      android:layout_width="358dp"
-      android:layout_height="1dp"
-      android:layout_marginLeft="28dp"
-      android:layout_marginRight="28dp"
-      android:background="@color/darkGrey"/>
-
-  </LinearLayout>
-
-  <LinearLayout
-    android:gravity="bottom"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="vertical"
-      >
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="horizontal"
-      android:weightSum="4">
-
-      <TextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:text="이름"
-        />
-
-      <TextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:text="김한화"
-        />
-    </LinearLayout>
-
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="horizontal"
-      android:weightSum="4">
-
-      <TextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:text="성별"
-        />
-
-      <TextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:text="@string/phone_identify_male"
-        />
-    </LinearLayout>
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="horizontal"
-      android:weightSum="4">
-
-      <TextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:text="생년월일"
-        />
-
-      <TextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:text="1982.02.20"
-        />
-    </LinearLayout>
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="horizontal"
-      android:weightSum="4">
-
-      <TextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:text="전화번호"
-        />
-
-      <TextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:text="010-2934-3901"
-        />
-    </LinearLayout>
-    </LinearLayout>
-  </LinearLayout>
-  </LinearLayout>