Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

app/src/main/res/drawable/circle_empty.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval">
-  <stroke
-    android:width="1dp"
-    android:color="@color/black"/>
+  <solid
+    android:color="#e5e5e5"/>
 </shape>

app/src/main/res/drawable/circle_full.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval">
   <solid
-    android:color="@color/black"/>
+    android:color="#000000"/>
 </shape>

app/src/main/res/layout/fragment_pin.xml

@@ -1,10 +1,304 @@
+<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   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:background="@color/colorAccent"
-  android:orientation="horizontal"
-  tools:fragmentActivity=".LoginFragment">
+  android:orientation="vertical"
+  >
 
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentStart="true"
+    android:layout_alignParentTop="true"
+    android:layout_marginTop="77.5dp"
+    android:orientation="vertical">
+
+    <TextView
+      android:id="@+id/text_title"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:gravity="center_horizontal"
+      android:lineSpacingExtra="7sp"
+      android:textAlignment="center"
+      android:textColor="#000000"
+      android:textSize="17.5sp"
+      tools:text="@string/sign_up_register_pin_title"
+      />
+
+    <Space
+      android:layout_width="match_parent"
+      android:layout_height="12dp"/>
+
+    <TextView
+      android:id="@+id/text_guide"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:lineSpacingExtra="5.5sp"
+      android:textAlignment="center"
+      android:textColor="#999999"
+      android:textSize="14sp"
+      tools:text="@string/sign_up_register_pin"
+      />
+  </LinearLayout>
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="35dp"
+    android:layout_marginBottom="123dp"
+    android:gravity="center"
+    android:orientation="horizontal"
+    >
+
+    <ImageView
+      android:id="@+id/image_pin_code1"
+      android:layout_width="10.5dp"
+      android:layout_height="10.5dp"
+      android:layout_marginLeft="5dp"
+      android:layout_marginRight="5dp"
+      android:src="@drawable/circle_empty"
+      />
+
+    <ImageView
+      android:id="@+id/image_pin_code2"
+      android:layout_width="10.5dp"
+      android:layout_height="10.5dp"
+      android:layout_marginLeft="5dp"
+      android:layout_marginRight="5dp"
+      android:src="@drawable/circle_empty"
+      />
+
+    <ImageView
+      android:id="@+id/image_pin_code3"
+      android:layout_width="10.5dp"
+      android:layout_height="10.5dp"
+      android:layout_marginLeft="5dp"
+      android:layout_marginRight="5dp"
+      android:src="@drawable/circle_empty"
+      />
+
+    <ImageView
+      android:id="@+id/image_pin_code4"
+      android:layout_width="10.5dp"
+      android:layout_height="10.5dp"
+      android:layout_marginLeft="5dp"
+      android:layout_marginRight="5dp"
+      android:src="@drawable/circle_empty"
+      />
+
+  </LinearLayout>
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="76.5dp"
+    android:orientation="vertical">
+
+    <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="#ebebeb"/>
+
+  </LinearLayout>
+
+
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_marginTop="27dp"
+
+    >
+
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_gravity="bottom"
+      android:orientation="horizontal"
+      android:weightSum="3"
+      >
+
+      <Button
+        android:background="#ffffff"
+        android:id="@+id/button_0"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="24.5sp"
+        android:textColor="#666666"
+        android:lineSpacingExtra="9.5sp"
+        android:gravity="center_horizontal"
+        tools:text="2"
+        />
+
+      <Button
+        android:background="#ffffff"
+        android:id="@+id/button_1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="24.5sp"
+        android:textColor="#666666"
+        android:lineSpacingExtra="9.5sp"
+        android:gravity="center_horizontal"
+        tools:text="0"
+        />
+
+      <Button
+        android:background="#ffffff"
+        android:id="@+id/button_2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="24.5sp"
+        android:textColor="#666666"
+        android:lineSpacingExtra="9.5sp"
+        android:gravity="center_horizontal"
+        tools:text="5"
+        />
+    </LinearLayout>
+
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_gravity="bottom"
+      android:orientation="horizontal"
+      android:weightSum="3"
+      >
+
+      <Button
+        android:background="#ffffff"
+        android:id="@+id/button_3"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="24.5sp"
+        android:textColor="#666666"
+        android:lineSpacingExtra="9.5sp"
+        android:gravity="center_horizontal"
+        tools:text="7"
+        />
+
+      <Button
+        android:background="#ffffff"
+        android:id="@+id/button_4"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="24.5sp"
+        android:textColor="#666666"
+        android:lineSpacingExtra="9.5sp"
+        android:gravity="center_horizontal"
+        tools:text="3"
+        />
+
+      <Button
+        android:background="#ffffff"
+        android:id="@+id/button_5"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="24.5sp"
+        android:textColor="#666666"
+        android:lineSpacingExtra="9.5sp"
+        android:gravity="center_horizontal"
+        tools:text="8"
+        />
+    </LinearLayout>
+
+    <LinearLayout
+      android:background="#ffffff"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_gravity="bottom"
+      android:orientation="horizontal"
+      android:weightSum="3"
+      >
+
+      <Button
+        android:background="#ffffff"
+        android:id="@+id/button_6"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="24.5sp"
+        android:textColor="#666666"
+        android:lineSpacingExtra="9.5sp"
+        android:gravity="center_horizontal"
+        tools:text="4"
+        />
+
+      <Button
+        android:id="@+id/button_7"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="24.5sp"
+        android:textColor="#666666"
+        android:lineSpacingExtra="9.5sp"
+        android:gravity="center_horizontal"
+        android:background="#ffffff"
+        tools:text="6"
+        />
+
+      <Button
+        android:background="#ffffff"
+        android:id="@+id/button_8"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="24.5sp"
+        android:textColor="#666666"
+        android:lineSpacingExtra="9.5sp"
+        android:gravity="center_horizontal"
+        tools:text="9"
+        />
+    </LinearLayout>
+
+    <LinearLayout
+
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal"
+      android:weightSum="3"
+      >
+
+      <Button
+        android:background="#ffffff"
+        android:id="@+id/button_shuffle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="14sp"
+        android:textColor="#666666"
+        android:lineSpacingExtra="5.5sp"
+        android:text="@string/sign_up_shuffle"/>
+
+      <Button
+        android:background="#ffffff"
+        android:id="@+id/button_9"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="24.5sp"
+        android:textColor="#666666"
+        android:lineSpacingExtra="9.5sp"
+        android:gravity="center_horizontal"
+        tools:text="1"
+        />
+
+      <ImageButton
+        android:background="#ffffff"
+        android:id="@+id/button_delete"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:src="@drawable/icon_keypad_delete_copy"
+        android:scaleType="fitCenter"
+        />
+    </LinearLayout>
+  </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/fragment_sign_up_start.xml

@@ -1,119 +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="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="24dp"
-    android:orientation="vertical">
-
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="70dp"
-      android:text="@string/sign_up_hello_text"
-      android:textSize="24dp"
-      />
-
-
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="20dp"
-      android:text="@string/sign_up_need_id"
-      android:textSize="16dp"
-      />
-
-  </LinearLayout>
-    <LinearLayout
-      android:layout_marginTop="88dp"
-      android:layout_marginLeft="28dp"
-      android:layout_marginRight="28dp"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="40dp"
-      android:orientation="vertical">
-
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/darkGrey"/>
-
-    </LinearLayout>
-
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="28dp"
-      android:layout_marginRight="28dp"
-      android:orientation="vertical">
-
-      <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/sign_up_benefit1"
-        android:textSize="16dp"
-        />
-
-      <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
-        android:text="@string/sign_up_benefit1_detail"
-        android:textSize="14dp"
-        />
-
-      <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/sign_up_benefit2"
-        android:textSize="16dp"
-        />
-
-      <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
-        android:text="@string/sign_up_benefit2_detail"
-        android:textSize="14dp"
-        />
-
-
-      <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/sign_up_benefit3"
-        android:textSize="16dp"
-        />
-
-      <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/sign_up_benefit3_detail"
-        android:textSize="14dp"
-        />
-    </LinearLayout>
-      <LinearLayout
-        android:gravity="center"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="40dp"
-        >
-        <Button
-          android:id="@+id/sign_up_mobile_authorization_button"
-          android:layout_width="104dp"
-          android:layout_height="wrap_content"
-          android:text="@string/sign_up_mobile_identify_pop_up"
-          android:textSize="14dp"
-          android:background="@drawable/sign_up_button"
-          style="?android:attr/borderlessButtonStyle"
-          />
-
-      </LinearLayout>
-</LinearLayout>

app/src/main/res/layout/fragment_sign_up_start1.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  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:layout_marginLeft="24.5dp"
+    android:layout_marginTop="53.5dp"
+    android:orientation="vertical">
+
+    <TextView
+      tools:text="@string/sign_up_hello_text2"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:lineSpacingExtra="8sp"
+      android:textColor="#000000"
+      android:textSize="21sp"
+      />
+
+
+    <TextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="17.5dp"
+      android:lineSpacingExtra="5.5sp"
+      android:text="@string/sign_up_hello_text2_detail"
+      android:textColor="#999999"
+      android:textSize="14sp"
+      />
+
+  </LinearLayout>
+
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="342dp"
+    android:gravity="center"
+    >
+
+    <Button
+      android:id="@+id/sign_up_mobile_authorization_button"
+      style="?android:attr/borderlessButtonStyle"
+      android:layout_width="104dp"
+      android:layout_height="wrap_content"
+      android:background="@drawable/sign_up_button"
+      android:lineSpacingExtra="3.5sp"
+      android:text="@string/sign_up_mobile_identify_pop_up"
+      android:textColor="#000000"
+      android:textSize="12sp"
+      />
+
+  </LinearLayout>
+</LinearLayout>

app/src/main/res/layout/fragment_sign_up_start2.xml

@@ -0,0 +1,142 @@
+<?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="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="24.5dp"
+    android:layout_marginTop="53.5dp"
+    android:orientation="vertical">
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:lineSpacingExtra="8sp"
+      android:text="@string/sign_up_hello_text"
+      android:textColor="#000000"
+      android:textSize="21sp"
+      />
+
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="17.5dp"
+      android:lineSpacingExtra="5.5sp"
+      android:text="@string/sign_up_need_id"
+      android:textColor="#999999"
+      android:textSize="14sp"
+      />
+
+  </LinearLayout>
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="40dp"
+    android:layout_marginLeft="24.8dp"
+    android:layout_marginRight="24.3dp"
+    android:layout_marginTop="76.5dp"
+    android:orientation="vertical">
+
+    <View
+      android:layout_width="311dp"
+      android:layout_height="1dp"
+      android:background="@color/darkGrey"/>
+
+  </LinearLayout>
+
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="24.5dp"
+    android:orientation="vertical">
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:lineSpacingExtra="5.5sp"
+      android:text="@string/sign_up_benefit1"
+      android:textColor="#000000"
+      android:textSize="14sp"
+      />
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="1dp"
+      android:lineSpacingExtra="9.5sp"
+      android:text="@string/sign_up_benefit1_detail"
+      android:textColor="#c5c5c5"
+      android:textSize="12sp"
+
+      />
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="13.3dp"
+      android:lineSpacingExtra="5.5sp"
+      android:text="@string/sign_up_benefit2"
+      android:textColor="#000000"
+      android:textSize="14sp"
+      />
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="1dp"
+      android:lineSpacingExtra="9.5sp"
+      android:text="@string/sign_up_benefit2_detail"
+      android:textColor="#c5c5c5"
+      android:textSize="12sp"
+      />
+
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="13.3dp"
+      android:lineSpacingExtra="5.5sp"
+      android:text="@string/sign_up_benefit3"
+      android:textColor="#000000"
+      android:textSize="14sp"
+      />
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:lineSpacingExtra="9.5sp"
+      android:text="@string/sign_up_benefit3_detail"
+      android:textColor="#c5c5c5"
+      android:textSize="12sp"
+      />
+  </LinearLayout>
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="61dp"
+    android:gravity="center"
+    >
+
+    <Button
+      android:id="@+id/sign_up_mobile_authorization_button"
+      style="?android:attr/borderlessButtonStyle"
+      android:layout_width="104dp"
+      android:layout_height="wrap_content"
+      android:background="@drawable/sign_up_button"
+      android:text="@string/sign_up_mobile_identify_pop_up"
+      android:textSize="12sp"
+      android:textColor="#000000"
+      android:lineSpacingExtra="3.5sp"
+      />
+
+  </LinearLayout>
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -14,6 +14,9 @@
   <string name="sign_up_hello_text">Lifeplus만의 \n 다양한 혜택을 이용해 보세요.</string>
   <string name="sign_up_need_id">Lifeplus만의 혜택을 이용하기 위해서는 \n 본인인증 과정이 필요해요.</string>
   <string name="sign_up_need_pin">Lifeplus에서 사용할 간편암호를 등록해주세요.</string>
+  <string name="sign_up_hello_text2">"간편암호로 편리하게 \n Lifeplus를 이용해 보세요.</string>
+  <string name="sign_up_hello_text2_detail">"간편암호 최초 설정을 위해서 본인인증 과정이 필요해요.</string>
+
 
   <string name="sign_up_benefit1">혜택 하나. 코인</string>
   <string name="sign_up_benefit1_detail">서비스만 이용해도 코인을 드려요.</string>