From 4abfea5a4dc47f3ed3e8da86c7a822ea2fa4c246 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Tue, 25 Jun 2024 12:48:21 +0900
Subject: [PATCH 01/34] readme

---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index cc0acc5a..8a88ea3b 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,12 @@
 # android-contacts
+
+### 구현할 기능 목록
+## 얼굴 사진
+- 입력란
+    - 이름
+    - 전화번호
+    - 메일
+- 더보기
+    - 생일
+    - 성별(라디오 버튼)
+    - 메모
\ No newline at end of file

From 8254ab10b0fef64d639379bf52d2b79624e880b6 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Tue, 25 Jun 2024 15:59:17 +0900
Subject: [PATCH 02/34] =?UTF-8?q?UI=EC=9E=91=EC=84=B1(=EB=8D=94=EB=B3=B4?=
 =?UTF-8?q?=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EC=8B=9C=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=ED=8F=BC=20=ED=99=95=EC=9E=A5=EC=9D=80=20=EB=AF=B8=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   7 +-
 .../main/res/drawable/baseline_face_24.xml    |   5 +
 app/src/main/res/layout/activity_main.xml     | 134 +++++++++++++++++-
 app/src/main/res/values/colors.xml            |   2 +
 app/src/main/res/values/styles.xml            |  13 ++
 5 files changed, 154 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/baseline_face_24.xml
 create mode 100644 app/src/main/res/values/styles.xml

diff --git a/README.md b/README.md
index 8a88ea3b..f9803700 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,11 @@
 ### 구현할 기능 목록
 ## 얼굴 사진
 - 입력란
-    - 이름
+    - 이름(필수값)
     - 전화번호
     - 메일
 - 더보기
-    - 생일
+    - 생일(캘린더로 선택 가능하게끔)
     - 성별(라디오 버튼)
-    - 메모
\ No newline at end of file
+    - 메모
+- 저장 -> 완료시 토스트 전송
\ No newline at end of file
diff --git a/app/src/main/res/drawable/baseline_face_24.xml b/app/src/main/res/drawable/baseline_face_24.xml
new file mode 100644
index 00000000..665f371f
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_face_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M9,11.75c-0.69,0 -1.25,0.56 -1.25,1.25s0.56,1.25 1.25,1.25 1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM15,11.75c-0.69,0 -1.25,0.56 -1.25,1.25s0.56,1.25 1.25,1.25 1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8 0,-0.29 0.02,-0.58 0.05,-0.86 2.36,-1.05 4.23,-2.98 5.21,-5.37C11.07,8.33 14.05,10 17.42,10c0.78,0 1.53,-0.09 2.25,-0.26 0.21,0.71 0.33,1.47 0.33,2.26 0,4.41 -3.59,8 -8,8z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 24d17df2..144acf6d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.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:id="@+id/main"
@@ -7,13 +8,138 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/face"
+        android:layout_width="match_parent"
+        android:layout_height="130dp"
+        android:src="@drawable/baseline_face_24"
+        app:layout_constraintTop_toTopOf="@id/main"
+        
+        />
+
+    <EditText
+        android:id="@+id/name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="이름"
+        style="@style/inputBox"
+        app:layout_constraintTop_toBottomOf="@id/face"/>
+
+    <EditText
+        android:id="@+id/tel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="전화번호"
+        style="@style/inputBox"
+        app:layout_constraintTop_toBottomOf="@id/name"/>
+
+    <EditText
+        android:id="@+id/mail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="메일"
+        style="@style/inputBox"
+        app:layout_constraintTop_toBottomOf="@id/tel"/>
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/mail"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        android:text="더보기"/>
+
+
+
+
+    <EditText
+        android:id="@+id/birth"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="생일"
+        style="@style/inputBox"
+        app:layout_constraintTop_toBottomOf="@id/mail"
+        android:visibility="invisible"/>
+
+
+    <EditText
+        android:id="@+id/gender"
+        style="@style/inputBox"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="28dp"
+        android:hint="성별"
+        app:layout_constraintTop_toBottomOf="@id/birth"
+        android:visibility="invisible"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="@id/gender"
+        app:layout_constraintRight_toRightOf="@id/gender">
+
+        <RadioGroup
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="invisible">
+
+            <RadioButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="여성"
+                android:padding="5dp"
+                android:layout_marginRight="15dp"/>
+
+            <RadioButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="남성"
+                android:padding="5dp"/>
+
+        </RadioGroup>
+
+    </LinearLayout>
+
+
+
+    <EditText
+        android:id="@+id/memo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="메모"
+        style="@style/inputBox"
+        app:layout_constraintTop_toBottomOf="@id/gender"
+        android:visibility="invisible"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:orientation="horizontal"
+        android:weightSum="1"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <Button
+            style="@style/btn"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.5"
+            android:text="취소" />
+
+        <Button
+            style="@style/btn"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.5"
+            android:text="저장"/>
+
+    </LinearLayout>
+
+
+
+
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 768b058a..70433a5c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,4 +2,6 @@
 <resources>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="mint">#B9EAE8</color>
+    <color name="transparent">#00ff0000</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 00000000..2c28f7f4
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="inputBox">
+        <item name="android:background">@color/mint</item>
+        <item name="android:padding">30px</item>
+        <item name="android:layout_margin">50px</item>
+    </style>
+    <style name="btn">
+        <item name="android:backgroundTint">@color/transparent</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="android:textSize">20dp</item>
+    </style>
+</resources>
\ No newline at end of file

From 6d173196bd20eb0cf47f1e5d23dd9cf0f73ebf6f Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Wed, 26 Jun 2024 15:07:33 +0900
Subject: [PATCH 03/34] =?UTF-8?q?=EB=AA=A8=EB=93=A0=20=EC=9A=94=EC=86=8C?=
 =?UTF-8?q?=20=EB=B0=9B=EC=95=84=EC=98=A4=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tech/kakao/contacts/MainActivity.kt       | 36 +++++++++++++++++++
 app/src/main/res/layout/activity_main.xml     | 14 +++++---
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
index 7aae79fe..81f5c3a6 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
@@ -1,11 +1,47 @@
 package campus.tech.kakao.contacts
 
 import android.os.Bundle
+import android.view.View
+import android.widget.Button
+import android.widget.EditText
+import android.widget.LinearLayout
+import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.isVisible
 
 class MainActivity : AppCompatActivity() {
+    private lateinit var name: EditText
+    private lateinit var tel: EditText
+    private lateinit var mail: EditText
+    private lateinit var birth: EditText
+    private lateinit var gender: EditText
+    private lateinit var genderRadio: LinearLayout
+    private lateinit var memo: EditText
+    private lateinit var viewMore: TextView
+    private lateinit var cancel: Button
+    private lateinit var save: Button
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+
+        initializeView()
+    }
+
+    private fun initializeView() {
+        name = findViewById(R.id.name)
+        tel = findViewById(R.id.tel)
+        mail = findViewById(R.id.mail)
+        birth = findViewById(R.id.birth)
+        gender = findViewById(R.id.gender)
+        genderRadio = findViewById(R.id.genderRadio)
+        memo = findViewById(R.id.memo)
+        viewMore = findViewById(R.id.viewMore)
+        cancel = findViewById(R.id.cancel)
+        save = findViewById(R.id.save)
     }
+
+
+
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 144acf6d..34b9db83 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:hint="전화번호"
         style="@style/inputBox"
-        app:layout_constraintTop_toBottomOf="@id/name"/>
+        app:layout_constraintTop_toBottomOf="@id/name" />
 
     <EditText
         android:id="@+id/mail"
@@ -42,6 +42,7 @@
         app:layout_constraintTop_toBottomOf="@id/tel"/>
 
     <TextView
+        android:id="@+id/viewMore"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@id/mail"
@@ -70,19 +71,22 @@
         android:layout_marginTop="28dp"
         android:hint="성별"
         app:layout_constraintTop_toBottomOf="@id/birth"
-        android:visibility="invisible"/>
+        android:visibility="invisible"
+        android:focusable="false"/>
 
     <LinearLayout
+        android:id="@+id/genderRadio"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="@id/gender"
-        app:layout_constraintRight_toRightOf="@id/gender">
+        app:layout_constraintRight_toRightOf="@id/gender"
+        android:visibility="invisible">
 
         <RadioGroup
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:visibility="invisible">
+            >
 
             <RadioButton
                 android:layout_width="wrap_content"
@@ -122,6 +126,7 @@
         app:layout_constraintEnd_toEndOf="parent">
 
         <Button
+            android:id="@+id/cancel"
             style="@style/btn"
             android:layout_width="0dp"
             android:layout_height="match_parent"
@@ -129,6 +134,7 @@
             android:text="취소" />
 
         <Button
+            android:id="@+id/save"
             style="@style/btn"
             android:layout_width="0dp"
             android:layout_height="match_parent"

From dce38ccf2a324fe7af53be0eab45deff7f673acc Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Wed, 26 Jun 2024 15:08:18 +0900
Subject: [PATCH 04/34] =?UTF-8?q?=EB=8D=94=EB=B3=B4=EA=B8=B0=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../campus/tech/kakao/contacts/MainActivity.kt   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
index 81f5c3a6..77fa1fde 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
@@ -27,6 +27,7 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
 
         initializeView()
+        setUpListeners()
     }
 
     private fun initializeView() {
@@ -43,5 +44,20 @@ class MainActivity : AppCompatActivity() {
     }
 
 
+    private fun setUpListeners() {
+        viewMore.setOnClickListener {
+            expandView()
+        }
+    }
+
+    private fun expandView() {
+        birth.visibility = View.VISIBLE
+        gender.visibility = View.VISIBLE
+        genderRadio.visibility = View.VISIBLE
+        memo.visibility = View.VISIBLE
+        viewMore.visibility = View.INVISIBLE
+    }
+
+
 
 }

From 19a21e21601db3f653108dbf4ce467be7817d9d3 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Wed, 26 Jun 2024 15:08:55 +0900
Subject: [PATCH 05/34] =?UTF-8?q?=EC=B7=A8=EC=86=8C,=20=EC=A0=80=EC=9E=A5?=
 =?UTF-8?q?=20=EB=B2=84=ED=8A=BC=EC=97=90=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EB=B6=99=EC=97=AC=EC=A4=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/campus/tech/kakao/contacts/MainActivity.kt    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
index 77fa1fde..72f6e043 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
@@ -48,6 +48,12 @@ class MainActivity : AppCompatActivity() {
         viewMore.setOnClickListener {
             expandView()
         }
+        cancel.setOnClickListener {
+            Toast.makeText(this, "취소되었습니다.", Toast.LENGTH_SHORT).show()
+        }
+        save.setOnClickListener {
+            Toast.makeText(this, "저장되었습니다.", Toast.LENGTH_SHORT).show()
+        }
     }
 
     private fun expandView() {

From f21e03cb8ca45fc04bb70b283eaca00e2a237b5e Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Wed, 26 Jun 2024 15:10:22 +0900
Subject: [PATCH 06/34] =?UTF-8?q?=EC=A0=84=ED=99=94=EB=B2=88=ED=98=B8?=
 =?UTF-8?q?=EB=8A=94=20=EC=88=AB=EC=9E=90=EB=A7=8C=20=EC=9E=85=EB=A0=A5/?=
 =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=ED=82=A4=ED=8C=A8=EB=93=9C=20=EC=88=AB?=
 =?UTF-8?q?=EC=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_main.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 34b9db83..ec0605fc 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -31,7 +31,9 @@
         android:layout_height="wrap_content"
         android:hint="전화번호"
         style="@style/inputBox"
-        app:layout_constraintTop_toBottomOf="@id/name" />
+        app:layout_constraintTop_toBottomOf="@id/name"
+        android:inputType="number"
+        android:digits="0123456789"/>
 
     <EditText
         android:id="@+id/mail"

From e7dd2cf0bea2788c678a74aa14ac43a7b28a66aa Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Wed, 26 Jun 2024 15:25:30 +0900
Subject: [PATCH 07/34] =?UTF-8?q?=EB=A6=AC=EB=93=9C=EB=AF=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                 | 19 ++++++++++---------
 app/src/main/res/layout/activity_main.xml |  3 ++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index f9803700..eb00d32b 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,14 @@
 # android-contacts
 
 ### 구현할 기능 목록
-## 얼굴 사진
+- 얼굴 사진 ✅
 - 입력란
-    - 이름(필수값)
-    - 전화번호
-    - 메일
-- 더보기
-    - 생일(캘린더로 선택 가능하게끔)
-    - 성별(라디오 버튼)
-    - 메모
-- 저장 -> 완료시 토스트 전송
\ No newline at end of file
+        - 이름(필수값)
+        - 전화번호(필수, 숫자만 입력) 
+        - 메일 ✅
+    - 더보기 ✅
+        - 생일(캘린더로 선택 가능하게끔)
+        - 성별(라디오 버튼) ✅
+        - 메모 ✅
+- 저장 -> 완료시 토스트 전송 ✅
+- 취소 -> 토스트 전송 ✅
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ec0605fc..ec3eb985 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -32,7 +32,7 @@
         android:hint="전화번호"
         style="@style/inputBox"
         app:layout_constraintTop_toBottomOf="@id/name"
-        android:inputType="number"
+        android:inputType="numberDecimal"
         android:digits="0123456789"/>
 
     <EditText
@@ -62,6 +62,7 @@
         android:hint="생일"
         style="@style/inputBox"
         app:layout_constraintTop_toBottomOf="@id/mail"
+        android:inputType="date"
         android:visibility="invisible"/>
 
 

From 9ed9f610b3f558bb01c60d50bbd0808d9e636d19 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Thu, 27 Jun 2024 14:19:52 +0900
Subject: [PATCH 08/34] =?UTF-8?q?=EB=8D=94=EB=B3=B4=EA=B8=B0=20=EC=98=86?=
 =?UTF-8?q?=20=ED=99=94=EC=82=B4=ED=91=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/arrow_down.xml  | 9 +++++++++
 app/src/main/res/layout/activity_main.xml | 8 +++++---
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/arrow_down.xml

diff --git a/app/src/main/res/drawable/arrow_down.xml b/app/src/main/res/drawable/arrow_down.xml
new file mode 100644
index 00000000..a5936707
--- /dev/null
+++ b/app/src/main/res/drawable/arrow_down.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="30dp"
+    android:viewportWidth="48"
+    android:viewportHeight="65">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M14.83,16.42l9.17,9.17 9.17,-9.17 2.83,2.83 -12,12 -12,-12z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ec3eb985..cbae50e4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -32,7 +32,7 @@
         android:hint="전화번호"
         style="@style/inputBox"
         app:layout_constraintTop_toBottomOf="@id/name"
-        android:inputType="numberDecimal"
+        android:inputType="number"
         android:digits="0123456789"/>
 
     <EditText
@@ -50,7 +50,10 @@
         app:layout_constraintTop_toBottomOf="@id/mail"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:text="더보기"/>
+        android:text="더보기"
+        android:drawableEnd="@drawable/arrow_down"
+        />
+
 
 
 
@@ -62,7 +65,6 @@
         android:hint="생일"
         style="@style/inputBox"
         app:layout_constraintTop_toBottomOf="@id/mail"
-        android:inputType="date"
         android:visibility="invisible"/>
 
 

From e2ba8bf0f8f77cd36a33608b09da942b4e323bab Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Thu, 27 Jun 2024 14:31:27 +0900
Subject: [PATCH 09/34] =?UTF-8?q?=ED=82=A4=EB=B3=B4=EB=93=9C=20=EC=98=AC?=
 =?UTF-8?q?=EB=9D=BC=EC=98=AC=20=EB=95=8C=20=EC=A0=80=EC=9E=A5,=EC=B7=A8?=
 =?UTF-8?q?=EC=86=8C=20=EB=B2=84=ED=8A=BC=20=ED=95=A8=EA=BB=98=20=EC=98=AC?=
 =?UTF-8?q?=EB=9D=BC=EC=98=A4=EA=B8=B0/=EC=9D=B4=EB=A6=84,=EC=A0=84?=
 =?UTF-8?q?=ED=99=94=EB=B2=88=ED=98=B8=20=EB=AF=B8=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=EC=8B=9C=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EB=B3=B4=EB=82=B4?=
 =?UTF-8?q?=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  3 +-
 .../tech/kakao/contacts/MainActivity.kt       | 18 +++++++-
 app/src/main/res/layout/activity_main.xml     | 42 +++++++++----------
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 89dc9d8b..58361343 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,8 @@
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
index 72f6e043..6d7c4f4a 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
@@ -52,7 +52,9 @@ class MainActivity : AppCompatActivity() {
             Toast.makeText(this, "취소되었습니다.", Toast.LENGTH_SHORT).show()
         }
         save.setOnClickListener {
-            Toast.makeText(this, "저장되었습니다.", Toast.LENGTH_SHORT).show()
+            if (checkValide()) {
+                Toast.makeText(this, "저장되었습니다.", Toast.LENGTH_SHORT).show()
+            }
         }
     }
 
@@ -64,6 +66,20 @@ class MainActivity : AppCompatActivity() {
         viewMore.visibility = View.INVISIBLE
     }
 
+    private fun checkValide(): Boolean {
+        if (name.text.isEmpty()) {
+            Toast.makeText(this, "이름은 필수 입력값입니다.", Toast.LENGTH_SHORT).show()
+            return false
+        }
+        else if (tel.text.isEmpty()) {
+            Toast.makeText(this, "전화번호는 필수 입력값입니다.", Toast.LENGTH_SHORT).show()
+            return false
+        }
+        else {
+            return true
+        }
+    }
+
 
 
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index cbae50e4..c3e3b812 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -121,32 +121,28 @@
         app:layout_constraintTop_toBottomOf="@id/gender"
         android:visibility="invisible"/>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:orientation="horizontal"
-        android:weightSum="1"
+
+    <Button
+        android:id="@+id/cancel"
+        style="@style/btn"
+        android:layout_width="0dp"
+        app:layout_constraintWidth_percent="0.5"
+        android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <Button
-            android:id="@+id/cancel"
-            style="@style/btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.5"
-            android:text="취소" />
-
-        <Button
-            android:id="@+id/save"
-            style="@style/btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.5"
-            android:text="저장"/>
+        android:text="취소" />
+
+    <Button
+        android:id="@+id/save"
+        style="@style/btn"
+        android:layout_width="0dp"
+        app:layout_constraintWidth_percent="0.5"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:text="저장"/>
+
 
-    </LinearLayout>
 
 
 

From 14ad72f7aa1324207397cb4a37e1725cc1a9fd24 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Thu, 27 Jun 2024 14:47:31 +0900
Subject: [PATCH 10/34] =?UTF-8?q?=EC=83=9D=EC=9D=BC=20=EB=88=84=EB=A5=B4?=
 =?UTF-8?q?=EB=A9=B4=20=EC=BA=98=EB=A6=B0=EB=8D=94=20=EB=9D=84=EC=9A=B0?=
 =?UTF-8?q?=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../campus/tech/kakao/contacts/MainActivity.kt | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
index 6d7c4f4a..fea65d6d 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
@@ -1,8 +1,11 @@
 package campus.tech.kakao.contacts
 
+import android.app.DatePickerDialog
+import android.icu.util.Calendar
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
+import android.widget.DatePicker
 import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -56,6 +59,9 @@ class MainActivity : AppCompatActivity() {
                 Toast.makeText(this, "저장되었습니다.", Toast.LENGTH_SHORT).show()
             }
         }
+        birth.setOnClickListener {
+            showCalendar()
+        }
     }
 
     private fun expandView() {
@@ -80,6 +86,18 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun showCalendar() {
+        var dateString = ""
+        val cal = Calendar.getInstance()
+        val dateSetListener = DatePickerDialog.OnDateSetListener { view, year, month, dayOfMonth ->
+            dateString = "${year}.${month+1}.${dayOfMonth}"
+            birth.setText(dateString)
+
+        }
+        DatePickerDialog(this, dateSetListener, cal.get(Calendar.YEAR),
+            cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH)).show()
+    }
+
 
 
 }

From 1fa7c630454ac6dd56a7371b902a4d3293c32876 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Thu, 27 Jun 2024 15:14:04 +0900
Subject: [PATCH 11/34] =?UTF-8?q?Revert=20"=EC=83=9D=EC=9D=BC=20=EB=88=84?=
 =?UTF-8?q?=EB=A5=B4=EB=A9=B4=20=EC=BA=98=EB=A6=B0=EB=8D=94=20=EB=9D=84?=
 =?UTF-8?q?=EC=9A=B0=EA=B8=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 14ad72f7aa1324207397cb4a37e1725cc1a9fd24.
---
 .../campus/tech/kakao/contacts/MainActivity.kt | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
index fea65d6d..6d7c4f4a 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
@@ -1,11 +1,8 @@
 package campus.tech.kakao.contacts
 
-import android.app.DatePickerDialog
-import android.icu.util.Calendar
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
-import android.widget.DatePicker
 import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -59,9 +56,6 @@ class MainActivity : AppCompatActivity() {
                 Toast.makeText(this, "저장되었습니다.", Toast.LENGTH_SHORT).show()
             }
         }
-        birth.setOnClickListener {
-            showCalendar()
-        }
     }
 
     private fun expandView() {
@@ -86,18 +80,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun showCalendar() {
-        var dateString = ""
-        val cal = Calendar.getInstance()
-        val dateSetListener = DatePickerDialog.OnDateSetListener { view, year, month, dayOfMonth ->
-            dateString = "${year}.${month+1}.${dayOfMonth}"
-            birth.setText(dateString)
-
-        }
-        DatePickerDialog(this, dateSetListener, cal.get(Calendar.YEAR),
-            cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH)).show()
-    }
-
 
 
 }

From c6773b073f48d2a3383c0a24115f6fba40c6a63b Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Thu, 27 Jun 2024 15:18:29 +0900
Subject: [PATCH 12/34] =?UTF-8?q?=EB=B7=B0=EA=B0=80=20=EC=8A=A4=ED=81=AC?=
 =?UTF-8?q?=EB=A1=A4=20=EB=90=98=EA=B2=8C=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_main.xml | 244 ++++++++++++----------
 1 file changed, 129 insertions(+), 115 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c3e3b812..dedf563e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,150 +3,164 @@
     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:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <ImageView
-        android:id="@+id/face"
+    <ScrollView
+        android:id="@+id/scrollView"
         android:layout_width="match_parent"
-        android:layout_height="130dp"
-        android:src="@drawable/baseline_face_24"
-        app:layout_constraintTop_toTopOf="@id/main"
-        
-        />
-
-    <EditText
-        android:id="@+id/name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="이름"
-        style="@style/inputBox"
-        app:layout_constraintTop_toBottomOf="@id/face"/>
-
-    <EditText
-        android:id="@+id/tel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="전화번호"
-        style="@style/inputBox"
-        app:layout_constraintTop_toBottomOf="@id/name"
-        android:inputType="number"
-        android:digits="0123456789"/>
-
-    <EditText
-        android:id="@+id/mail"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="메일"
-        style="@style/inputBox"
-        app:layout_constraintTop_toBottomOf="@id/tel"/>
-
-    <TextView
-        android:id="@+id/viewMore"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/mail"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:text="더보기"
-        android:drawableEnd="@drawable/arrow_down"
-        />
-
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/buttonLayout"
+        android:fillViewport="true">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/face"
+                android:layout_width="match_parent"
+                android:layout_height="130dp"
+                android:src="@drawable/baseline_face_24"
+                app:layout_constraintTop_toTopOf="parent"
+
+                />
+
+            <EditText
+                android:id="@+id/name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="이름"
+                style="@style/inputBox"
+                app:layout_constraintTop_toBottomOf="@id/face"/>
 
+            <EditText
+                android:id="@+id/tel"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="전화번호"
+                style="@style/inputBox"
+                app:layout_constraintTop_toBottomOf="@id/name"
+                android:inputType="number"
+                android:digits="0123456789"/>
+
+            <EditText
+                android:id="@+id/mail"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="메일"
+                style="@style/inputBox"
+                app:layout_constraintTop_toBottomOf="@id/tel"/>
 
+            <TextView
+                android:id="@+id/viewMore"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@id/mail"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:text="더보기"
+                android:drawableEnd="@drawable/arrow_down"
+                />
 
 
-    <EditText
-        android:id="@+id/birth"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="생일"
-        style="@style/inputBox"
-        app:layout_constraintTop_toBottomOf="@id/mail"
-        android:visibility="invisible"/>
 
 
-    <EditText
-        android:id="@+id/gender"
-        style="@style/inputBox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="28dp"
-        android:hint="성별"
-        app:layout_constraintTop_toBottomOf="@id/birth"
-        android:visibility="invisible"
-        android:focusable="false"/>
 
-    <LinearLayout
-        android:id="@+id/genderRadio"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="@id/gender"
-        app:layout_constraintRight_toRightOf="@id/gender"
-        android:visibility="invisible">
+            <EditText
+                android:id="@+id/birth"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="생일"
+                style="@style/inputBox"
+                app:layout_constraintTop_toBottomOf="@id/mail"
+                android:visibility="invisible"/>
 
-        <RadioGroup
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            >
 
-            <RadioButton
-                android:layout_width="wrap_content"
+            <EditText
+                android:id="@+id/gender"
+                style="@style/inputBox"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="여성"
-                android:padding="5dp"
-                android:layout_marginRight="15dp"/>
-
-            <RadioButton
+                android:layout_marginTop="28dp"
+                android:hint="성별"
+                app:layout_constraintTop_toBottomOf="@id/birth"
+                android:visibility="invisible"
+                android:focusable="false"/>
+
+            <LinearLayout
+                android:id="@+id/genderRadio"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="남성"
-                android:padding="5dp"/>
+                app:layout_constraintBottom_toBottomOf="@id/gender"
+                app:layout_constraintRight_toRightOf="@id/gender"
+                android:visibility="invisible">
 
-        </RadioGroup>
+                <RadioGroup
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    >
 
-    </LinearLayout>
+                    <RadioButton
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="여성"
+                        android:padding="5dp"
+                        android:layout_marginRight="15dp"/>
 
+                    <RadioButton
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="남성"
+                        android:padding="5dp"/>
 
+                </RadioGroup>
 
-    <EditText
-        android:id="@+id/memo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="메모"
-        style="@style/inputBox"
-        app:layout_constraintTop_toBottomOf="@id/gender"
-        android:visibility="invisible"/>
+            </LinearLayout>
 
 
-    <Button
-        android:id="@+id/cancel"
-        style="@style/btn"
-        android:layout_width="0dp"
-        app:layout_constraintWidth_percent="0.5"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:text="취소" />
-
-    <Button
-        android:id="@+id/save"
-        style="@style/btn"
-        android:layout_width="0dp"
-        app:layout_constraintWidth_percent="0.5"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:text="저장"/>
-
 
+            <EditText
+                android:id="@+id/memo"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="메모"
+                style="@style/inputBox"
+                app:layout_constraintTop_toBottomOf="@id/gender"
+                android:visibility="invisible"/>
 
+            <!-- 기존 내용을 여기에 그대로 넣습니다 (버튼 제외) -->
 
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
 
+    <LinearLayout
+        android:id="@+id/buttonLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <Button
+            android:id="@+id/cancel"
+            style="@style/btn"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="취소" />
 
+        <Button
+            android:id="@+id/save"
+            style="@style/btn"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="저장"/>
 
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
+

From a8cc88254a8cb847e24e765be8a6ef8a59b90f82 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Thu, 27 Jun 2024 15:20:21 +0900
Subject: [PATCH 13/34] =?UTF-8?q?revert=20=EC=9E=98=EB=AA=BB=20=ED=95=9C?=
 =?UTF-8?q?=EA=B1=B0=20=EB=90=98=EB=8F=8C=EB=A6=BC(=EC=BA=98=EB=A6=B0?=
 =?UTF-8?q?=EB=8D=94=20=EB=9D=84=EC=9A=B0=EB=8A=94=20=EB=B6=80=EB=B6=84)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../campus/tech/kakao/contacts/MainActivity.kt   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
index 6d7c4f4a..af181f7a 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
@@ -1,5 +1,6 @@
 package campus.tech.kakao.contacts
 
+import android.app.DatePickerDialog
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
@@ -9,6 +10,7 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
+import java.util.Calendar
 
 class MainActivity : AppCompatActivity() {
     private lateinit var name: EditText
@@ -56,6 +58,9 @@ class MainActivity : AppCompatActivity() {
                 Toast.makeText(this, "저장되었습니다.", Toast.LENGTH_SHORT).show()
             }
         }
+        birth.setOnClickListener {
+            showCalendar()
+        }
     }
 
     private fun expandView() {
@@ -79,6 +84,17 @@ class MainActivity : AppCompatActivity() {
             return true
         }
     }
+    private fun showCalendar() {
+        var dateString = ""
+        val cal = Calendar.getInstance()
+        val dateSetListener = DatePickerDialog.OnDateSetListener { view, year, month, dayOfMonth ->
+            dateString = "${year}.${month+1}.${dayOfMonth}"
+            birth.setText(dateString)
+
+        }
+        DatePickerDialog(this, dateSetListener, cal.get(Calendar.YEAR),
+            cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH)).show()
+    }
 
 
 

From a0ee0bc3581edb4d1844d7d5f3a770202eb1d0a6 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Thu, 27 Jun 2024 15:44:42 +0900
Subject: [PATCH 14/34] =?UTF-8?q?=EB=A6=AC=EB=93=9C=EB=AF=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                 | 11 +++++++----
 app/src/main/res/layout/activity_main.xml |  1 -
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index eb00d32b..2062665c 100644
--- a/README.md
+++ b/README.md
@@ -3,12 +3,15 @@
 ### 구현할 기능 목록
 - 얼굴 사진 ✅
 - 입력란
-        - 이름(필수값)
-        - 전화번호(필수, 숫자만 입력) 
+        - 이름(필수값) ✅
+        - 전화번호(필수, 숫자만 입력) ✅
         - 메일 ✅
     - 더보기 ✅
-        - 생일(캘린더로 선택 가능하게끔)
+        - 생일(캘린더로 선택 가능하게끔) ✅
         - 성별(라디오 버튼) ✅
         - 메모 ✅
 - 저장 -> 완료시 토스트 전송 ✅
-- 취소 -> 토스트 전송 ✅
\ No newline at end of file
+- 취소 -> 토스트 전송 ✅
+
+- 스크롤뷰 ✅
+- 저장, 취소 버튼 키보드와 함께 올리기 ✅
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index dedf563e..2d6d7f1d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -132,7 +132,6 @@
                 app:layout_constraintTop_toBottomOf="@id/gender"
                 android:visibility="invisible"/>
 
-            <!-- 기존 내용을 여기에 그대로 넣습니다 (버튼 제외) -->
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>

From 10aebb7896fccc62ae75abd5a241040613dc47e6 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Fri, 28 Jun 2024 14:36:01 +0900
Subject: [PATCH 15/34] =?UTF-8?q?=EC=97=B0=EB=9D=BD=EC=B2=98=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20=EB=B7=B0=20=EA=B5=AC=EC=84=B1/=ED=94=8C=EB=9F=AC?=
 =?UTF-8?q?=EC=8A=A4=20=EB=B2=84=ED=8A=BC=20=EB=88=84=EB=A5=B4=EB=A9=B4=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EB=84=98=EC=96=B4=EA=B0=80=EB=8A=94=20?=
 =?UTF-8?q?=EA=B2=83=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                          |  1 +
 app/src/main/AndroidManifest.xml              |  5 ++-
 .../campus/tech/kakao/contacts/addInfo.kt     | 39 ++++++++++++++++++
 app/src/main/res/layout/activity_add_info.xml | 41 +++++++++++++++++++
 app/src/main/res/values/colors.xml            |  1 +
 5 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/campus/tech/kakao/contacts/addInfo.kt
 create mode 100644 app/src/main/res/layout/activity_add_info.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c5add08f..d751bb40 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -41,6 +41,7 @@ dependencies {
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.google.android.material:material:1.11.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.activity:activity:1.9.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 58361343..19a341fd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,9 @@
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
+            android:exported="false" />
+        <activity
+            android:name=".addInfo"
             android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
@@ -24,4 +27,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/contacts/addInfo.kt b/app/src/main/java/campus/tech/kakao/contacts/addInfo.kt
new file mode 100644
index 00000000..2c0a0b3c
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/contacts/addInfo.kt
@@ -0,0 +1,39 @@
+package campus.tech.kakao.contacts
+
+import android.content.ComponentName
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Button
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+
+class addInfo : AppCompatActivity() {
+    private lateinit var addBtn: Button
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_add_info)
+
+        initialize()
+        setUpListeners()
+
+    }
+
+    private fun initialize() {
+        addBtn = findViewById(R.id.addBtn)
+    }
+
+    private fun setUpListeners() {
+        addBtn.setOnClickListener {
+            val intent: Intent = Intent()
+            val componentName: ComponentName = ComponentName(
+                "campus.tech.kakao.contacts",
+                "campus.tech.kakao.contacts.MainActivity"
+            )
+            intent.component = componentName
+            startActivity(intent)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_info.xml b/app/src/main/res/layout/activity_add_info.xml
new file mode 100644
index 00000000..ca20ea8d
--- /dev/null
+++ b/app/src/main/res/layout/activity_add_info.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.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:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".addInfo">
+
+    <Button
+        android:id="@+id/addBtn"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:text="+"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_margin="20dp"
+        android:backgroundTint="@color/yellow"
+        android:textColor="@color/black"
+        android:textSize="30dp"/>
+
+    <TextView
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:text="오른쪽 + 버튼을 클릭하여 연락처를 등록해보세요."
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+
+
+
+
+
+
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 70433a5c..28120f87 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,4 +4,5 @@
     <color name="white">#FFFFFFFF</color>
     <color name="mint">#B9EAE8</color>
     <color name="transparent">#00ff0000</color>
+    <color name="yellow">#FFC107</color>
 </resources>

From e333b16c17a30027a9f5ede51781450f3367266b Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Fri, 28 Jun 2024 14:57:28 +0900
Subject: [PATCH 16/34] =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EB=B2=84=ED=8A=BC?=
 =?UTF-8?q?=20=EB=88=84=EB=A5=B4=EB=A9=B4=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?=
 =?UTF-8?q?=EB=B3=B4=EB=82=B4=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tech/kakao/contacts/MainActivity.kt       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
index af181f7a..ffbf9d36 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
@@ -1,6 +1,8 @@
 package campus.tech.kakao.contacts
 
 import android.app.DatePickerDialog
+import android.content.Intent
+import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
@@ -55,6 +57,7 @@ class MainActivity : AppCompatActivity() {
         }
         save.setOnClickListener {
             if (checkValide()) {
+                saveData()
                 Toast.makeText(this, "저장되었습니다.", Toast.LENGTH_SHORT).show()
             }
         }
@@ -96,6 +99,25 @@ class MainActivity : AppCompatActivity() {
             cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH)).show()
     }
 
+    private fun saveData() {
+        val nameData = name.text.toString()
+        val telData = tel.text.toString()
+        val mailData = mail.text.toString()
+        val birthData = birth.text.toString()
+        val genderData = genderRadio
+        val memoData = memo.text.toString()
 
+        val intent = Intent().apply {
+            putExtra("newData", true)
+            putExtra("name", nameData)
+            putExtra("tel", telData)
+            putExtra("mail", mailData)
+            putExtra("birth", birthData)
+            putExtra("memo", memoData)
+        }
+
+        setResult(RESULT_OK, intent)
+        finish()
+    }
 
 }

From f99583a589539ab72c43281aea1ebafb1264efa7 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Fri, 28 Jun 2024 17:16:18 +0900
Subject: [PATCH 17/34] =?UTF-8?q?Revert=20"=EC=A0=80=EC=9E=A5=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EB=88=84=EB=A5=B4=EB=A9=B4=20=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=84=B0=20=EB=B3=B4=EB=82=B4=EA=B8=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e333b16c17a30027a9f5ede51781450f3367266b.
---
 .../tech/kakao/contacts/MainActivity.kt       | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
index ffbf9d36..af181f7a 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
@@ -1,8 +1,6 @@
 package campus.tech.kakao.contacts
 
 import android.app.DatePickerDialog
-import android.content.Intent
-import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
@@ -57,7 +55,6 @@ class MainActivity : AppCompatActivity() {
         }
         save.setOnClickListener {
             if (checkValide()) {
-                saveData()
                 Toast.makeText(this, "저장되었습니다.", Toast.LENGTH_SHORT).show()
             }
         }
@@ -99,25 +96,6 @@ class MainActivity : AppCompatActivity() {
             cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH)).show()
     }
 
-    private fun saveData() {
-        val nameData = name.text.toString()
-        val telData = tel.text.toString()
-        val mailData = mail.text.toString()
-        val birthData = birth.text.toString()
-        val genderData = genderRadio
-        val memoData = memo.text.toString()
 
-        val intent = Intent().apply {
-            putExtra("newData", true)
-            putExtra("name", nameData)
-            putExtra("tel", telData)
-            putExtra("mail", mailData)
-            putExtra("birth", birthData)
-            putExtra("memo", memoData)
-        }
-
-        setResult(RESULT_OK, intent)
-        finish()
-    }
 
 }

From 611e32094a23fbbee98ed5f6cbe43cce3df8267f Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Fri, 28 Jun 2024 17:18:54 +0900
Subject: [PATCH 18/34] =?UTF-8?q?=EB=90=98=EB=8F=8C=EB=A6=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tech/kakao/contacts/MainActivity.kt       | 23 +++++++++++++++++++
 .../campus/tech/kakao/contacts/addInfo.kt     |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
index af181f7a..a01f4708 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
@@ -1,6 +1,7 @@
 package campus.tech.kakao.contacts
 
 import android.app.DatePickerDialog
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
@@ -55,6 +56,7 @@ class MainActivity : AppCompatActivity() {
         }
         save.setOnClickListener {
             if (checkValide()) {
+                saveData()
                 Toast.makeText(this, "저장되었습니다.", Toast.LENGTH_SHORT).show()
             }
         }
@@ -96,6 +98,27 @@ class MainActivity : AppCompatActivity() {
             cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH)).show()
     }
 
+    private fun saveData() {
+        val nameData = name.text.toString()
+        val telData = tel.text.toString()
+        val mailData = mail.text.toString()
+        val birthData = birth.text.toString()
+        val genderData = genderRadio
+        val memoData = memo.text.toString()
+
+        val intent = Intent().apply {
+            putExtra("newData", true)
+            putExtra("name", nameData)
+            putExtra("tel", telData)
+            putExtra("mail", mailData)
+            putExtra("birth", birthData)
+            putExtra("memo", memoData)
+        }
+
+        setResult(RESULT_OK, intent)
+        finish()
+    }
+
 
 
 }
diff --git a/app/src/main/java/campus/tech/kakao/contacts/addInfo.kt b/app/src/main/java/campus/tech/kakao/contacts/addInfo.kt
index 2c0a0b3c..f549b08c 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/addInfo.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/addInfo.kt
@@ -36,4 +36,6 @@ class addInfo : AppCompatActivity() {
             startActivity(intent)
         }
     }
+
+
 }
\ No newline at end of file

From 3d9aafdd88b5481c0ce7d2f546f7987b0cba9aa9 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Sat, 29 Jun 2024 00:35:59 +0900
Subject: [PATCH 19/34] =?UTF-8?q?contact=20z=ED=81=B4=EB=9E=98=EC=8A=A4,?=
 =?UTF-8?q?=20adapter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../kakao/contacts/{addInfo.kt => AddInfo.kt} | 10 +++--
 .../campus/tech/kakao/contacts/Contact.kt     | 10 +++++
 .../tech/kakao/contacts/ContactAdapter.kt     | 37 +++++++++++++++++++
 .../tech/kakao/contacts/MainActivity.kt       | 15 ++++++--
 app/src/main/res/layout/activity_add_info.xml | 14 ++++++-
 app/src/main/res/layout/activity_main.xml     |  2 +
 app/src/main/res/layout/caontact_item.xml     | 20 ++++++++++
 8 files changed, 101 insertions(+), 9 deletions(-)
 rename app/src/main/java/campus/tech/kakao/contacts/{addInfo.kt => AddInfo.kt} (85%)
 create mode 100644 app/src/main/java/campus/tech/kakao/contacts/Contact.kt
 create mode 100644 app/src/main/java/campus/tech/kakao/contacts/ContactAdapter.kt
 create mode 100644 app/src/main/res/layout/caontact_item.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 19a341fd..7628f633 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
             android:name=".MainActivity"
             android:exported="false" />
         <activity
-            android:name=".addInfo"
+            android:name=".AddInfo"
             android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
diff --git a/app/src/main/java/campus/tech/kakao/contacts/addInfo.kt b/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
similarity index 85%
rename from app/src/main/java/campus/tech/kakao/contacts/addInfo.kt
rename to app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
index f549b08c..c6c5bea1 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/addInfo.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
@@ -3,13 +3,13 @@ package campus.tech.kakao.contacts
 import android.content.ComponentName
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
 import android.widget.Button
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
+import androidx.recyclerview.widget.RecyclerView
 
-class addInfo : AppCompatActivity() {
+class AddInfo : AppCompatActivity() {
     private lateinit var addBtn: Button
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -19,6 +19,7 @@ class addInfo : AppCompatActivity() {
         initialize()
         setUpListeners()
 
+
     }
 
     private fun initialize() {
@@ -38,4 +39,5 @@ class addInfo : AppCompatActivity() {
     }
 
 
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/contacts/Contact.kt b/app/src/main/java/campus/tech/kakao/contacts/Contact.kt
new file mode 100644
index 00000000..db007ad3
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/contacts/Contact.kt
@@ -0,0 +1,10 @@
+package campus.tech.kakao.contacts
+
+data class Contact(
+    var name: String,
+    var tel: String,
+    var mail: String?,
+    var birth: String?,
+    var gender: String?,
+    var memo: String?
+)
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/contacts/ContactAdapter.kt b/app/src/main/java/campus/tech/kakao/contacts/ContactAdapter.kt
new file mode 100644
index 00000000..8d721ef0
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/contacts/ContactAdapter.kt
@@ -0,0 +1,37 @@
+package campus.tech.kakao.contacts
+
+import android.view.LayoutInflater
+import androidx.recyclerview.widget.RecyclerView
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.appcompat.view.menu.MenuView.ItemView
+
+class ContactAdapter (
+    var contactList: MutableList<Contact>,
+    var inflater: LayoutInflater
+): RecyclerView.Adapter<ContactAdapter.ViewHolder>() {
+    class ViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
+        val faceIcon: ImageView
+        val contactName: TextView
+
+        init {
+            faceIcon = itemView.findViewById(R.id.faceIcon)
+            contactName = itemView.findViewById(R.id.contactName)
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = inflater.inflate(R.layout.caontact_item, parent, false)
+        return ContactAdapter.ViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.contactName.text = contactList.get(position).name
+    }
+
+    override fun getItemCount(): Int {
+        return contactList.size
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
index a01f4708..849f6fe3 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
@@ -7,6 +7,7 @@ import android.view.View
 import android.widget.Button
 import android.widget.EditText
 import android.widget.LinearLayout
+import android.widget.RadioButton
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -101,9 +102,16 @@ class MainActivity : AppCompatActivity() {
     private fun saveData() {
         val nameData = name.text.toString()
         val telData = tel.text.toString()
-        val mailData = mail.text.toString()
-        val birthData = birth.text.toString()
-        val genderData = genderRadio
+        val mailData = mail.text?.toString()
+        val birthData = birth.text?.toString()
+        var genderData: String?
+
+        var male = findViewById<RadioButton>(R.id.male)
+        var female = findViewById<RadioButton>(R.id.female)
+
+        if (male.isChecked) genderData = "male"
+        else genderData = "female"
+
         val memoData = memo.text.toString()
 
         val intent = Intent().apply {
@@ -112,6 +120,7 @@ class MainActivity : AppCompatActivity() {
             putExtra("tel", telData)
             putExtra("mail", mailData)
             putExtra("birth", birthData)
+            putExtra("gender", genderData)
             putExtra("memo", memoData)
         }
 
diff --git a/app/src/main/res/layout/activity_add_info.xml b/app/src/main/res/layout/activity_add_info.xml
index ca20ea8d..2b0345bd 100644
--- a/app/src/main/res/layout/activity_add_info.xml
+++ b/app/src/main/res/layout/activity_add_info.xml
@@ -6,7 +6,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".addInfo">
+    tools:context=".AddInfo">
 
     <Button
         android:id="@+id/addBtn"
@@ -29,6 +29,18 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    </LinearLayout>
+
+
 
 
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2d6d7f1d..46984607 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -105,6 +105,7 @@
                     >
 
                     <RadioButton
+                        android:id="@+id/female"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="여성"
@@ -112,6 +113,7 @@
                         android:layout_marginRight="15dp"/>
 
                     <RadioButton
+                        android:id="@+id/male"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="남성"
diff --git a/app/src/main/res/layout/caontact_item.xml b/app/src/main/res/layout/caontact_item.xml
new file mode 100644
index 00000000..829fe294
--- /dev/null
+++ b/app/src/main/res/layout/caontact_item.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <ImageView
+        android:id="@+id/faceIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/contactName"
+        android:layout_width="150dp"
+        android:layout_height="50dp" />
+
+
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file

From a9263504e8a43c361b76a3cceeb76e45f6022a49 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 1 Jul 2024 01:03:30 +0900
Subject: [PATCH 20/34] =?UTF-8?q?contact=20item=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../campus/tech/kakao/contacts/AddInfo.kt     | 43 ---------------
 .../campus/tech/kakao/contacts/Contact.kt     | 18 ++++---
 .../tech/kakao/contacts/ContactAdapter.kt     | 37 -------------
 .../tech/kakao/contacts/MainActivity.kt       | 54 ++++++++++---------
 .../{baseline_face_24.xml => face.xml}        |  6 +--
 app/src/main/res/drawable/rectangled.xml      |  5 ++
 app/src/main/res/layout/activity_add_info.xml | 53 ------------------
 7 files changed, 47 insertions(+), 169 deletions(-)
 delete mode 100644 app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
 delete mode 100644 app/src/main/java/campus/tech/kakao/contacts/ContactAdapter.kt
 rename app/src/main/res/drawable/{baseline_face_24.xml => face.xml} (97%)
 create mode 100644 app/src/main/res/drawable/rectangled.xml
 delete mode 100644 app/src/main/res/layout/activity_add_info.xml

diff --git a/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt b/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
deleted file mode 100644
index c6c5bea1..00000000
--- a/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package campus.tech.kakao.contacts
-
-import android.content.ComponentName
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.widget.Button
-import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.RecyclerView
-
-class AddInfo : AppCompatActivity() {
-    private lateinit var addBtn: Button
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_add_info)
-
-        initialize()
-        setUpListeners()
-
-
-    }
-
-    private fun initialize() {
-        addBtn = findViewById(R.id.addBtn)
-    }
-
-    private fun setUpListeners() {
-        addBtn.setOnClickListener {
-            val intent: Intent = Intent()
-            val componentName: ComponentName = ComponentName(
-                "campus.tech.kakao.contacts",
-                "campus.tech.kakao.contacts.MainActivity"
-            )
-            intent.component = componentName
-            startActivity(intent)
-        }
-    }
-
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/contacts/Contact.kt b/app/src/main/java/campus/tech/kakao/contacts/Contact.kt
index db007ad3..8be339e4 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/Contact.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/Contact.kt
@@ -1,10 +1,14 @@
 package campus.tech.kakao.contacts
 
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class Contact(
-    var name: String,
-    var tel: String,
-    var mail: String?,
-    var birth: String?,
-    var gender: String?,
-    var memo: String?
-)
\ No newline at end of file
+    val name: String,
+    val tel: String,
+    val mail: String,
+    val birth: String,
+    val gender: String,
+    val memo: String
+): Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/contacts/ContactAdapter.kt b/app/src/main/java/campus/tech/kakao/contacts/ContactAdapter.kt
deleted file mode 100644
index 8d721ef0..00000000
--- a/app/src/main/java/campus/tech/kakao/contacts/ContactAdapter.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package campus.tech.kakao.contacts
-
-import android.view.LayoutInflater
-import androidx.recyclerview.widget.RecyclerView
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.appcompat.view.menu.MenuView.ItemView
-
-class ContactAdapter (
-    var contactList: MutableList<Contact>,
-    var inflater: LayoutInflater
-): RecyclerView.Adapter<ContactAdapter.ViewHolder>() {
-    class ViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
-        val faceIcon: ImageView
-        val contactName: TextView
-
-        init {
-            faceIcon = itemView.findViewById(R.id.faceIcon)
-            contactName = itemView.findViewById(R.id.contactName)
-        }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view = inflater.inflate(R.layout.caontact_item, parent, false)
-        return ContactAdapter.ViewHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.contactName.text = contactList.get(position).name
-    }
-
-    override fun getItemCount(): Int {
-        return contactList.size
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
index 849f6fe3..fa534210 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
@@ -1,8 +1,10 @@
 package campus.tech.kakao.contacts
 
+import android.app.AlertDialog
 import android.app.DatePickerDialog
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.widget.Button
 import android.widget.EditText
@@ -53,7 +55,7 @@ class MainActivity : AppCompatActivity() {
             expandView()
         }
         cancel.setOnClickListener {
-            Toast.makeText(this, "취소되었습니다.", Toast.LENGTH_SHORT).show()
+            
         }
         save.setOnClickListener {
             if (checkValide()) {
@@ -100,34 +102,34 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun saveData() {
-        val nameData = name.text.toString()
-        val telData = tel.text.toString()
-        val mailData = mail.text?.toString()
-        val birthData = birth.text?.toString()
-        var genderData: String?
+        val contact = createContact()
+        val resultIntent = Intent().apply {
+            putExtra("CONTACT_RESULT", contact)
+            Log.d("Gender", "${gender}")
+        }
+        setResult(RESULT_OK, resultIntent)
+        finish()
+    }
 
+    private fun createContact(): Contact {
+        var genderData: String?
         var male = findViewById<RadioButton>(R.id.male)
         var female = findViewById<RadioButton>(R.id.female)
 
         if (male.isChecked) genderData = "male"
-        else genderData = "female"
-
-        val memoData = memo.text.toString()
-
-        val intent = Intent().apply {
-            putExtra("newData", true)
-            putExtra("name", nameData)
-            putExtra("tel", telData)
-            putExtra("mail", mailData)
-            putExtra("birth", birthData)
-            putExtra("gender", genderData)
-            putExtra("memo", memoData)
-        }
-
-        setResult(RESULT_OK, intent)
-        finish()
+        else if (female.isChecked) genderData = "female"
+        else genderData = "null"
+
+        val contact: Contact
+        contact = Contact(
+            name.text.toString(),
+            tel.text.toString(),
+            mail.text.toString(),
+            birth.text.toString(),
+            genderData,
+            memo.text.toString()
+        )
+
+        return contact
     }
-
-
-
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/baseline_face_24.xml b/app/src/main/res/drawable/face.xml
similarity index 97%
rename from app/src/main/res/drawable/baseline_face_24.xml
rename to app/src/main/res/drawable/face.xml
index 665f371f..b61d61ce 100644
--- a/app/src/main/res/drawable/baseline_face_24.xml
+++ b/app/src/main/res/drawable/face.xml
@@ -1,5 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
+
     <path android:fillColor="@android:color/white" android:pathData="M9,11.75c-0.69,0 -1.25,0.56 -1.25,1.25s0.56,1.25 1.25,1.25 1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM15,11.75c-0.69,0 -1.25,0.56 -1.25,1.25s0.56,1.25 1.25,1.25 1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8 0,-0.29 0.02,-0.58 0.05,-0.86 2.36,-1.05 4.23,-2.98 5.21,-5.37C11.07,8.33 14.05,10 17.42,10c0.78,0 1.53,-0.09 2.25,-0.26 0.21,0.71 0.33,1.47 0.33,2.26 0,4.41 -3.59,8 -8,8z"/>
-    
-</vector>
+
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangled.xml b/app/src/main/res/drawable/rectangled.xml
new file mode 100644
index 00000000..cead1e45
--- /dev/null
+++ b/app/src/main/res/drawable/rectangled.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="18dp"/>
+    <solid android:color="@color/white"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_info.xml b/app/src/main/res/layout/activity_add_info.xml
deleted file mode 100644
index 2b0345bd..00000000
--- a/app/src/main/res/layout/activity_add_info.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".AddInfo">
-
-    <Button
-        android:id="@+id/addBtn"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:text="+"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_margin="20dp"
-        android:backgroundTint="@color/yellow"
-        android:textColor="@color/black"
-        android:textSize="30dp"/>
-
-    <TextView
-        android:layout_width="150dp"
-        android:layout_height="wrap_content"
-        android:text="오른쪽 + 버튼을 클릭하여 연락처를 등록해보세요."
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
-
-    </LinearLayout>
-
-
-
-
-
-
-
-
-
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 130a35e7b1569a5bc6193a011cfeaa239bfe7a15 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 1 Jul 2024 01:03:59 +0900
Subject: [PATCH 21/34] =?UTF-8?q?=EC=B7=A8=EC=86=8C=20=EC=8B=9C=20?=
 =?UTF-8?q?=EA=B2=BD=EA=B3=A0=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EB=B3=B4?=
 =?UTF-8?q?=EB=82=B4=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../campus/tech/kakao/contacts/MainActivity.kt  | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
index fa534210..9d811610 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
@@ -55,7 +55,7 @@ class MainActivity : AppCompatActivity() {
             expandView()
         }
         cancel.setOnClickListener {
-            
+            showCancelMsg()
         }
         save.setOnClickListener {
             if (checkValide()) {
@@ -132,4 +132,19 @@ class MainActivity : AppCompatActivity() {
 
         return contact
     }
+
+    private fun showCancelMsg() {
+        AlertDialog.Builder(this).apply {
+            setMessage("작성 중인 내용이 있습니다. 정말 나가시겠습니까?")
+            setPositiveButton("나가기") { _, _ ->
+                finish()
+            }
+            setNegativeButton("작성하기", null)
+            create()
+            show()
+        }
+    }
+
+
+
 }
\ No newline at end of file

From 128f905febf862818b8dbacd0388d32dfe345651 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 1 Jul 2024 01:06:18 +0900
Subject: [PATCH 22/34] =?UTF-8?q?info=20=ED=99=94=EB=A9=B4=20=EA=B7=B8?=
 =?UTF-8?q?=EB=A6=AC=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  8 ++--
 .../campus/tech/kakao/contacts/AddInfo.kt     | 17 ++++++++
 app/src/main/res/layout/activity_add_info.xml | 42 +++++++++++++++++++
 3 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
 create mode 100644 app/src/main/res/layout/activity_add_info.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7628f633..397edf76 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,12 +12,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Contacts"
         tools:targetApi="31">
-        <activity
-            android:name=".MainActivity"
-            android:exported="false" />
         <activity
             android:name=".AddInfo"
-            android:exported="true"
+            android:exported="false"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -25,6 +22,9 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".MainActivity"
+            android:exported="false" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt b/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
new file mode 100644
index 00000000..66ae8fea
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
@@ -0,0 +1,17 @@
+package campus.tech.kakao.contacts
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+
+
+class AddInfo : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_add_info)
+
+
+    }
+
+}
+
diff --git a/app/src/main/res/layout/activity_add_info.xml b/app/src/main/res/layout/activity_add_info.xml
new file mode 100644
index 00000000..38e75063
--- /dev/null
+++ b/app/src/main/res/layout/activity_add_info.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.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:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".AddInfo">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <TextView
+        android:id="@+id/infoText"
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:text="오른쪽 + 버튼을 클릭하여 연락처를 등록해보세요."
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <Button
+        android:id="@+id/addBtn"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:text="+"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_margin="20dp"
+        android:backgroundTint="@color/yellow"
+        android:textColor="@color/black"
+        android:textSize="30dp"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

From 4533d62485428df6cb6dbf0cd026254cd0543b84 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 1 Jul 2024 01:08:24 +0900
Subject: [PATCH 23/34] =?UTF-8?q?initial=20=ED=95=A8=EC=88=98,=20=EB=A6=AC?=
 =?UTF-8?q?=EC=8A=A4=EB=84=88=20=EC=84=B8=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../campus/tech/kakao/contacts/AddInfo.kt     | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt b/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
index 66ae8fea..69628c89 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
@@ -1,16 +1,42 @@
 package campus.tech.kakao.contacts
 
+import android.content.Intent
 import android.os.Bundle
+import android.widget.Button
+import android.widget.TextView
+import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.app.AppCompatActivity
-
+import androidx.recyclerview.widget.RecyclerView
 
 class AddInfo : AppCompatActivity() {
+    private lateinit var addBtn: Button
+    private lateinit var recyclerView: RecyclerView
+    private lateinit var infoText: TextView
+    private var contactList = ArrayList<Contact>()
+
+    private lateinit var resultLauncher: ActivityResultLauncher<Intent>
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_add_info)
 
+        initialize()
+        setUpListeners()
+
+    }
+
+    private fun initialize() {
+        addBtn = findViewById(R.id.addBtn)
+        recyclerView = findViewById(R.id.recyclerView)
+        infoText = findViewById(R.id.infoText)
+
+    }
 
+    private fun setUpListeners() {
+        addBtn.setOnClickListener {
+            val intent = Intent(this@AddInfo, MainActivity::class.java)
+            resultLauncher.launch(intent)
+        }
     }
 
 }

From b1430b9becd3e35aaebd4288fd790303056e38de Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 1 Jul 2024 01:11:49 +0900
Subject: [PATCH 24/34] =?UTF-8?q?=EB=A6=AC=EC=82=AC=EC=9D=B4=ED=81=B4?=
 =?UTF-8?q?=EB=9F=AC=20=EB=B7=B0=20=EC=84=B8=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../campus/tech/kakao/contacts/AddInfo.kt     | 47 +++++++++++++++++++
 app/src/main/res/layout/activity_main.xml     |  5 +-
 app/src/main/res/layout/caontact_item.xml     | 20 --------
 app/src/main/res/layout/contact_item.xml      | 40 ++++++++++++++++
 4 files changed, 89 insertions(+), 23 deletions(-)
 delete mode 100644 app/src/main/res/layout/caontact_item.xml
 create mode 100644 app/src/main/res/layout/contact_item.xml

diff --git a/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt b/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
index 69628c89..ea213d3e 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
@@ -1,11 +1,20 @@
 package campus.tech.kakao.contacts
 
+import android.app.Activity
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.Button
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 
 class AddInfo : AppCompatActivity() {
@@ -22,6 +31,7 @@ class AddInfo : AppCompatActivity() {
 
         initialize()
         setUpListeners()
+        setRecyclerView()
 
     }
 
@@ -39,5 +49,42 @@ class AddInfo : AppCompatActivity() {
         }
     }
 
+
+    private fun setRecyclerView() {
+        recyclerView.adapter = RecyclerViewAdapter(contactList, LayoutInflater.from(this),this)
+        recyclerView.layoutManager = LinearLayoutManager(this)
+    }
+
+    class RecyclerViewAdapter(
+        var contactList: ArrayList<Contact>,
+        var inflater: LayoutInflater,
+        private val context: Context
+    ): RecyclerView.Adapter<RecyclerViewAdapter.ViewHolder>() {
+
+        inner class ViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
+            val faceImg: ImageView
+            val name_text_view: TextView
+
+            init {
+                faceImg = itemView.findViewById(R.id.faceImg)
+                name_text_view = itemView.findViewById(R.id.name_text_view)
+            }
+
+        }
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+            val view = inflater.inflate(R.layout.contact_item, parent, false)
+            return ViewHolder(view)
+        }
+
+        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+            val contact = contactList[position]
+            holder.name_text_view.text = contact.name
+
+        }
+
+        override fun getItemCount(): Int {
+            return contactList.size
+        }
+    }
 }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 46984607..3745836c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,7 +23,7 @@
                 android:id="@+id/face"
                 android:layout_width="match_parent"
                 android:layout_height="130dp"
-                android:src="@drawable/baseline_face_24"
+                android:src="@drawable/face"
                 app:layout_constraintTop_toTopOf="parent"
 
                 />
@@ -62,7 +62,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 android:text="더보기"
-                android:drawableEnd="@drawable/arrow_down"
                 />
 
 
@@ -76,6 +75,7 @@
                 android:hint="생일"
                 style="@style/inputBox"
                 app:layout_constraintTop_toBottomOf="@id/mail"
+
                 android:visibility="invisible"/>
 
 
@@ -164,4 +164,3 @@
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
diff --git a/app/src/main/res/layout/caontact_item.xml b/app/src/main/res/layout/caontact_item.xml
deleted file mode 100644
index 829fe294..00000000
--- a/app/src/main/res/layout/caontact_item.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-
-    <ImageView
-        android:id="@+id/faceIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:id="@+id/contactName"
-        android:layout_width="150dp"
-        android:layout_height="50dp" />
-
-
-
-</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/layout/contact_item.xml b/app/src/main/res/layout/contact_item.xml
new file mode 100644
index 00000000..5dfc65a4
--- /dev/null
+++ b/app/src/main/res/layout/contact_item.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="90dp"
+    android:layout_marginStart="20dp"
+    android:layout_marginTop="30dp"
+    android:layout_marginEnd="20dp"
+    android:background="@drawable/rectangled"
+    android:elevation="8dp"
+    android:paddingStart="20dp"
+    android:paddingEnd="20dp">
+
+    <ImageView
+        android:id="@+id/faceImg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/face"
+        android:gravity="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/name_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:gravity="center"
+        android:text="제이지"
+        android:textColor="@color/black"
+        android:textSize="25sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/faceImg"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From c9f77a1c953fd868eb26e6708f5dfb26d7555df8 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 1 Jul 2024 01:12:55 +0900
Subject: [PATCH 25/34] =?UTF-8?q?detail=20=ED=99=94=EB=A9=B4=20=EA=B7=B8?=
 =?UTF-8?q?=EB=A6=AC=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |   3 +
 .../tech/kakao/contacts/ContactDetail.kt      |  20 ++
 .../res/layout/activity_contact_detail.xml    | 205 ++++++++++++++++++
 3 files changed, 228 insertions(+)
 create mode 100644 app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
 create mode 100644 app/src/main/res/layout/activity_contact_detail.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 397edf76..b097fca6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Contacts"
         tools:targetApi="31">
+        <activity
+            android:name=".ContactDetail"
+            android:exported="false" />
         <activity
             android:name=".AddInfo"
             android:exported="false"
diff --git a/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt b/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
new file mode 100644
index 00000000..d0c6cce5
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
@@ -0,0 +1,20 @@
+package campus.tech.kakao.contacts
+
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+
+class ContactDetail : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContentView(R.layout.activity_contact_detail)
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+            insets
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_contact_detail.xml b/app/src/main/res/layout/activity_contact_detail.xml
new file mode 100644
index 00000000..adb3c84f
--- /dev/null
+++ b/app/src/main/res/layout/activity_contact_detail.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.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:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ContactDetail">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="20dp"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/detailImg"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:src="@drawable/face" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/detailName_layout"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_marginTop="20dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:text="이름"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/detailName"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/detailTel_layout"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_marginTop="20dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:text="전화번호"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/detailTel"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/detailMail_layout"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_marginTop="20dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:text="메일"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/detailMail"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/detailBirth_layout"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_marginTop="20dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:text="생일"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/detailBirth"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/detailGender_layout"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_marginTop="20dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:text="성별"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/detailGender"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/detailMemo_layout"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_marginTop="20dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:text="메모"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/detailMemo"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

From 5fc5229a07859a147eb98950457806ebfcaa7fd2 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 1 Jul 2024 01:14:05 +0900
Subject: [PATCH 26/34] =?UTF-8?q?=EB=94=94=ED=85=8C=EC=9D=BC=20=EC=95=A1?=
 =?UTF-8?q?=ED=8B=B0=EB=B9=84=ED=8B=B0=20=EC=9D=B4=EB=8B=88=EC=85=9C?=
 =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EC=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tech/kakao/contacts/ContactDetail.kt      | 42 ++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt b/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
index d0c6cce5..de7b9b6f 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
@@ -1,20 +1,42 @@
 package campus.tech.kakao.contacts
 
 import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
+import androidx.constraintlayout.widget.ConstraintLayout
 
 class ContactDetail : AppCompatActivity() {
+    lateinit var detailName: TextView
+    lateinit var detailTel: TextView
+    lateinit var detailMail: TextView
+    lateinit var detailBirth: TextView
+    lateinit var detailGender: TextView
+    lateinit var detailMemo: TextView
+
+    lateinit var detailMailLayout: ConstraintLayout
+    lateinit var detailBirthLayout: ConstraintLayout
+    lateinit var detailGenderLayout: ConstraintLayout
+    lateinit var detailMemoLayout: ConstraintLayout
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
         setContentView(R.layout.activity_contact_detail)
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
-            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
-            insets
-        }
+
+        initialize()
     }
-}
\ No newline at end of file
+    private fun initialize() {
+        detailName = findViewById(R.id.detailName)
+        detailTel = findViewById(R.id.detailTel)
+        detailMail = findViewById(R.id.detailMail)
+        detailBirth = findViewById(R.id.detailBirth)
+        detailGender = findViewById(R.id.detailGender)
+        detailMemo = findViewById(R.id.detailMemo)
+
+        detailMailLayout = findViewById(R.id.detailMail_layout)
+        detailBirthLayout = findViewById(R.id.detailBirth_layout)
+        detailGenderLayout = findViewById(R.id.detailGender_layout)
+        detailMemoLayout = findViewById(R.id.detailMemo_layout)
+    }
+
+
+}

From f48ea10d7d338bcdd67296e62b9b46947f1349d6 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 1 Jul 2024 01:15:23 +0900
Subject: [PATCH 27/34] =?UTF-8?q?info=20=ED=99=94=EB=A9=B4=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EB=94=94=ED=85=8C=EC=9D=BC=20=ED=99=94=EB=A9=B4?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=84=98=EC=96=B4=EA=B0=80=EB=8A=94=20?=
 =?UTF-8?q?=EA=B2=83=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../campus/tech/kakao/contacts/AddInfo.kt     | 24 +++++++++++++++++++
 .../tech/kakao/contacts/ContactDetail.kt      |  3 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt b/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
index ea213d3e..9315cb08 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
@@ -11,11 +11,13 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import kotlin.collections.ArrayList
 
 class AddInfo : AppCompatActivity() {
     private lateinit var addBtn: Button
@@ -32,6 +34,7 @@ class AddInfo : AppCompatActivity() {
         initialize()
         setUpListeners()
         setRecyclerView()
+        setupResultLauncher()
 
     }
 
@@ -55,6 +58,21 @@ class AddInfo : AppCompatActivity() {
         recyclerView.layoutManager = LinearLayoutManager(this)
     }
 
+    private fun setupResultLauncher() {
+        resultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == Activity.RESULT_OK) {
+                val data: Intent? = result.data
+                val contact = data?.getParcelableExtra<Contact>("CONTACT_RESULT")
+                contact?.let {
+                    contactList.add(it)
+                    recyclerView.adapter?.notifyItemInserted(contactList.size - 1)
+                    Log.d("AddInfo", "New contact added: ${it.name}")
+
+                }
+            }
+        }
+    }
+
     class RecyclerViewAdapter(
         var contactList: ArrayList<Contact>,
         var inflater: LayoutInflater,
@@ -80,6 +98,12 @@ class AddInfo : AppCompatActivity() {
             val contact = contactList[position]
             holder.name_text_view.text = contact.name
 
+            holder.itemView.setOnClickListener {
+                val intent = Intent(context, ContactDetail::class.java).apply {
+                    putExtra("CONTACT", contact)
+                }
+                context.startActivity(intent)
+            }
         }
 
         override fun getItemCount(): Int {
diff --git a/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt b/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
index de7b9b6f..b1d9b5d6 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
@@ -1,6 +1,8 @@
 package campus.tech.kakao.contacts
 
+import android.os.Build
 import android.os.Bundle
+import android.view.View
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -38,5 +40,4 @@ class ContactDetail : AppCompatActivity() {
         detailMemoLayout = findViewById(R.id.detailMemo_layout)
     }
 
-
 }

From 06f938d7199f8b3a931de9f33dee2bbbd5931728 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 1 Jul 2024 01:17:40 +0900
Subject: [PATCH 28/34] =?UTF-8?q?setDetail=20=ED=95=A8=EC=88=98=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                          |  1 +
 .../tech/kakao/contacts/ContactDetail.kt      | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d751bb40..bc29bd5f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    id("kotlin-parcelize")
 }
 
 android {
diff --git a/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt b/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
index b1d9b5d6..f28eea2a 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
@@ -25,6 +25,7 @@ class ContactDetail : AppCompatActivity() {
         setContentView(R.layout.activity_contact_detail)
 
         initialize()
+        setContactDetail()
     }
     private fun initialize() {
         detailName = findViewById(R.id.detailName)
@@ -40,4 +41,25 @@ class ContactDetail : AppCompatActivity() {
         detailMemoLayout = findViewById(R.id.detailMemo_layout)
     }
 
+    private fun setContactDetail() {
+        val contact: Contact? =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                intent.getParcelableExtra("CONTACT", Contact::class.java)
+            } else {
+                intent.getParcelableExtra("CONTACT")
+            }
+
+        contact?.let {
+            setDetail(it)
+        }
+    }
+    private fun setDetail(contact: Contact) {
+        detailName.text = contact.name
+        detailTel.text = contact.tel
+        detailMail.text = contact.mail ?: ""
+        detailBirth.text = contact.birth ?: ""
+        detailGender.text = contact.gender
+        detailMemo.text = contact.memo ?: ""
+    }
+
 }

From cfb56244b98ee6529568e474b45f8f7a8feecd0a Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 1 Jul 2024 01:18:33 +0900
Subject: [PATCH 29/34] =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83?=
 =?UTF-8?q?=EC=9D=84=20=EB=B3=B4=EC=97=AC=EC=A4=84=EC=A7=80=20=EB=A7=90?=
 =?UTF-8?q?=EC=A7=80=20=EC=A0=95=ED=95=98=EB=8A=94=20=ED=95=A8=EC=88=98=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/campus/tech/kakao/contacts/ContactDetail.kt  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt b/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
index f28eea2a..a9fbce29 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
@@ -51,6 +51,7 @@ class ContactDetail : AppCompatActivity() {
 
         contact?.let {
             setDetail(it)
+            setDetailLayoutVisibility(it)
         }
     }
     private fun setDetail(contact: Contact) {
@@ -62,4 +63,10 @@ class ContactDetail : AppCompatActivity() {
         detailMemo.text = contact.memo ?: ""
     }
 
+    private fun setDetailLayoutVisibility(contact: Contact) {
+        detailMailLayout.visibility = if (contact.mail.isEmpty()) View.GONE else View.VISIBLE
+        detailBirthLayout.visibility = if (contact.birth.isEmpty()) View.GONE else View.VISIBLE
+        detailGenderLayout.visibility = if (contact.gender == "null") View.GONE else View.VISIBLE
+        detailMemoLayout.visibility = if (contact.memo.isEmpty()) View.GONE else View.VISIBLE
+    }
 }

From 40eb7dc889d8d998ef362d8f86ccbf8f9f357717 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 1 Jul 2024 01:19:27 +0900
Subject: [PATCH 30/34] =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=9D=98=20?=
 =?UTF-8?q?=EA=B0=92=20=EC=97=AC=EB=B6=80=EC=97=90=20=EB=94=B0=EB=9D=BC=20?=
 =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EB=B3=B4=EC=9D=BC=EC=A7=80=20?=
 =?UTF-8?q?=EB=A7=90=EC=A7=80=20=EC=A0=95=ED=95=98=EB=8A=94=20=ED=95=A8?=
 =?UTF-8?q?=EC=88=98=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/campus/tech/kakao/contacts/AddInfo.kt  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt b/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
index 9315cb08..8e29d57d 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
@@ -67,12 +67,22 @@ class AddInfo : AppCompatActivity() {
                     contactList.add(it)
                     recyclerView.adapter?.notifyItemInserted(contactList.size - 1)
                     Log.d("AddInfo", "New contact added: ${it.name}")
-
+                    isShowText()
                 }
             }
         }
     }
 
+    private fun isShowText() {
+        if (contactList.isEmpty()) {
+            infoText.visibility = View.VISIBLE
+        }
+        else {
+            infoText.visibility = View.GONE
+        }
+    }
+
+
     class RecyclerViewAdapter(
         var contactList: ArrayList<Contact>,
         var inflater: LayoutInflater,

From 4a32d515df24689693e0f7b4825047cb35378c1c Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 1 Jul 2024 01:23:19 +0900
Subject: [PATCH 31/34] =?UTF-8?q?=EC=9D=B8=ED=92=8B=ED=85=8D=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EB=9D=BC=EC=9A=B4=EB=93=9C=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              | 2 +-
 app/src/main/res/drawable/rectangled_mint.xml | 5 +++++
 app/src/main/res/layout/activity_main.xml     | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/rectangled_mint.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b097fca6..d8cc704e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
             android:exported="false" />
         <activity
             android:name=".AddInfo"
-            android:exported="false"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/res/drawable/rectangled_mint.xml b/app/src/main/res/drawable/rectangled_mint.xml
new file mode 100644
index 00000000..6325bd6d
--- /dev/null
+++ b/app/src/main/res/drawable/rectangled_mint.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="15dp"/>
+    <solid android:color="@color/mint"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3745836c..82dfe47f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -34,6 +34,7 @@
                 android:layout_height="wrap_content"
                 android:hint="이름"
                 style="@style/inputBox"
+                android:background="@drawable/rectangled_mint"
                 app:layout_constraintTop_toBottomOf="@id/face"/>
 
             <EditText
@@ -42,6 +43,7 @@
                 android:layout_height="wrap_content"
                 android:hint="전화번호"
                 style="@style/inputBox"
+                android:background="@drawable/rectangled_mint"
                 app:layout_constraintTop_toBottomOf="@id/name"
                 android:inputType="number"
                 android:digits="0123456789"/>
@@ -52,6 +54,7 @@
                 android:layout_height="wrap_content"
                 android:hint="메일"
                 style="@style/inputBox"
+                android:background="@drawable/rectangled_mint"
                 app:layout_constraintTop_toBottomOf="@id/tel"/>
 
             <TextView
@@ -62,6 +65,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 android:text="더보기"
+                android:drawableEnd="@drawable/arrow_down"
                 />
 
 
@@ -74,6 +78,7 @@
                 android:layout_height="wrap_content"
                 android:hint="생일"
                 style="@style/inputBox"
+                android:background="@drawable/rectangled_mint"
                 app:layout_constraintTop_toBottomOf="@id/mail"
 
                 android:visibility="invisible"/>
@@ -86,6 +91,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="28dp"
                 android:hint="성별"
+                android:background="@drawable/rectangled_mint"
                 app:layout_constraintTop_toBottomOf="@id/birth"
                 android:visibility="invisible"
                 android:focusable="false"/>
@@ -131,6 +137,7 @@
                 android:layout_height="wrap_content"
                 android:hint="메모"
                 style="@style/inputBox"
+                android:background="@drawable/rectangled_mint"
                 app:layout_constraintTop_toBottomOf="@id/gender"
                 android:visibility="invisible"/>
 

From 886d4d0a0348ac42fa273eec7ed93d94c9f8bcb5 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 1 Jul 2024 11:45:12 +0900
Subject: [PATCH 32/34] =?UTF-8?q?=EB=A6=AC=EB=93=9C=EB=AF=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                           | 6 +++++-
 app/src/main/res/layout/activity_contact_detail.xml | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2062665c..c95eaf5d 100644
--- a/README.md
+++ b/README.md
@@ -14,4 +14,8 @@
 - 취소 -> 토스트 전송 ✅
 
 - 스크롤뷰 ✅
-- 저장, 취소 버튼 키보드와 함께 올리기 ✅
\ No newline at end of file
+- 저장, 취소 버튼 키보드와 함께 올리기 ✅
+
+- 저장 버튼 누르면 Info 액티비티로 데이터 보내기
+- 데이터 받아서 화면 띄우기
+- 데이터 아이템을 누르면 디테일 화면으로 이동시키기
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_contact_detail.xml b/app/src/main/res/layout/activity_contact_detail.xml
index adb3c84f..601abb6e 100644
--- a/app/src/main/res/layout/activity_contact_detail.xml
+++ b/app/src/main/res/layout/activity_contact_detail.xml
@@ -11,11 +11,11 @@
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center_horizontal"
         android:layout_marginStart="20dp"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="20dp"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">

From 99c9bdc83aeb9843f23ed47c146ccdd47326426d Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 1 Jul 2024 15:21:05 +0900
Subject: [PATCH 33/34] =?UTF-8?q?=EB=A6=AC=EB=93=9C=EB=AF=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c95eaf5d..a7f20b8c 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,6 @@
 - 스크롤뷰 ✅
 - 저장, 취소 버튼 키보드와 함께 올리기 ✅
 
-- 저장 버튼 누르면 Info 액티비티로 데이터 보내기
-- 데이터 받아서 화면 띄우기
-- 데이터 아이템을 누르면 디테일 화면으로 이동시키기
\ No newline at end of file
+- 저장 버튼 누르면 Info 액티비티로 데이터 보내기 ✅
+- 데이터 받아서 화면 띄우기 ✅
+- 데이터 아이템을 누르면 디테일 화면으로 이동시키기 ✅
\ No newline at end of file

From b7d8ec688b3637191445e7f8f8b7f70ad0097cc4 Mon Sep 17 00:00:00 2001
From: leeghy <epuy109@gmail.com>
Date: Mon, 8 Jul 2024 14:59:27 +0900
Subject: [PATCH 34/34] =?UTF-8?q?fix:=20=ED=94=BC=EB=93=9C=EB=B0=B1=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../{AddInfo.kt => AddInfoActivity.kt}        | 15 +++++++------
 .../tech/kakao/contacts/ContactDetail.kt      |  9 ++++----
 .../tech/kakao/contacts/MainActivity.kt       | 21 +++++++++----------
 app/src/main/res/layout/activity_add_info.xml |  2 +-
 5 files changed, 24 insertions(+), 25 deletions(-)
 rename app/src/main/java/campus/tech/kakao/contacts/{AddInfo.kt => AddInfoActivity.kt} (88%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d8cc704e..758e1649 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
             android:name=".ContactDetail"
             android:exported="false" />
         <activity
-            android:name=".AddInfo"
+            android:name=".AddInfoActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
diff --git a/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt b/app/src/main/java/campus/tech/kakao/contacts/AddInfoActivity.kt
similarity index 88%
rename from app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
rename to app/src/main/java/campus/tech/kakao/contacts/AddInfoActivity.kt
index 8e29d57d..e8dea234 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/AddInfo.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/AddInfoActivity.kt
@@ -11,7 +11,6 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
-import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
@@ -19,11 +18,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import kotlin.collections.ArrayList
 
-class AddInfo : AppCompatActivity() {
+class AddInfoActivity : AppCompatActivity() {
     private lateinit var addBtn: Button
     private lateinit var recyclerView: RecyclerView
     private lateinit var infoText: TextView
-    private var contactList = ArrayList<Contact>()
+    private val contactList = ArrayList<Contact>()
 
     private lateinit var resultLauncher: ActivityResultLauncher<Intent>
 
@@ -47,7 +46,7 @@ class AddInfo : AppCompatActivity() {
 
     private fun setUpListeners() {
         addBtn.setOnClickListener {
-            val intent = Intent(this@AddInfo, MainActivity::class.java)
+            val intent = Intent(this@AddInfoActivity, MainActivity::class.java)
             resultLauncher.launch(intent)
         }
     }
@@ -89,13 +88,13 @@ class AddInfo : AppCompatActivity() {
         private val context: Context
     ): RecyclerView.Adapter<RecyclerViewAdapter.ViewHolder>() {
 
-        inner class ViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
+        class ViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
             val faceImg: ImageView
-            val name_text_view: TextView
+            val nameTextView: TextView
 
             init {
                 faceImg = itemView.findViewById(R.id.faceImg)
-                name_text_view = itemView.findViewById(R.id.name_text_view)
+                nameTextView = itemView.findViewById(R.id.name_text_view)
             }
 
         }
@@ -106,7 +105,7 @@ class AddInfo : AppCompatActivity() {
 
         override fun onBindViewHolder(holder: ViewHolder, position: Int) {
             val contact = contactList[position]
-            holder.name_text_view.text = contact.name
+            holder.nameTextView.text = contact.name
 
             holder.itemView.setOnClickListener {
                 val intent = Intent(context, ContactDetail::class.java).apply {
diff --git a/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt b/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
index a9fbce29..cee2102f 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/ContactDetail.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
 
 class ContactDetail : AppCompatActivity() {
     lateinit var detailName: TextView
@@ -64,9 +65,9 @@ class ContactDetail : AppCompatActivity() {
     }
 
     private fun setDetailLayoutVisibility(contact: Contact) {
-        detailMailLayout.visibility = if (contact.mail.isEmpty()) View.GONE else View.VISIBLE
-        detailBirthLayout.visibility = if (contact.birth.isEmpty()) View.GONE else View.VISIBLE
-        detailGenderLayout.visibility = if (contact.gender == "null") View.GONE else View.VISIBLE
-        detailMemoLayout.visibility = if (contact.memo.isEmpty()) View.GONE else View.VISIBLE
+        detailMailLayout.isVisible = contact.mail.isNotEmpty()
+        detailBirthLayout.isVisible = contact.birth.isNotEmpty()
+        detailGenderLayout.isVisible = contact.gender != "null"
+        detailMemoLayout.isVisible = contact.memo.isNotEmpty()
     }
 }
diff --git a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
index 9d811610..ca8ac0e9 100644
--- a/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
+++ b/app/src/main/java/campus/tech/kakao/contacts/MainActivity.kt
@@ -13,7 +13,6 @@ import android.widget.RadioButton
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.isVisible
 import java.util.Calendar
 
 class MainActivity : AppCompatActivity() {
@@ -77,16 +76,16 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun checkValide(): Boolean {
-        if (name.text.isEmpty()) {
-            Toast.makeText(this, "이름은 필수 입력값입니다.", Toast.LENGTH_SHORT).show()
-            return false
-        }
-        else if (tel.text.isEmpty()) {
-            Toast.makeText(this, "전화번호는 필수 입력값입니다.", Toast.LENGTH_SHORT).show()
-            return false
-        }
-        else {
-            return true
+        return when {
+            name.text.isEmpty() -> {
+                Toast.makeText(this, "이름은 필수 입력값입니다.", Toast.LENGTH_SHORT).show()
+                false
+            }
+            tel.text.isEmpty() -> {
+                Toast.makeText(this, "전화번호는 필수 입력값입니다.", Toast.LENGTH_SHORT).show()
+                false
+            }
+            else -> true
         }
     }
     private fun showCalendar() {
diff --git a/app/src/main/res/layout/activity_add_info.xml b/app/src/main/res/layout/activity_add_info.xml
index 38e75063..2a9de002 100644
--- a/app/src/main/res/layout/activity_add_info.xml
+++ b/app/src/main/res/layout/activity_add_info.xml
@@ -6,7 +6,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".AddInfo">
+    tools:context=".AddInfoActivity">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"