From e43cb18559bf96a94daa4976b04be2ce79db5772 Mon Sep 17 00:00:00 2001
From: Dani43 <eldms0406@naver.com>
Date: Tue, 9 Jan 2024 21:00:47 +0900
Subject: [PATCH 1/7] =?UTF-8?q?[add]=20#73=20=EB=8D=94=EB=B3=B4=EA=B8=B0?=
 =?UTF-8?q?=20=EB=B7=B0=20=EA=B5=AC=ED=98=84=EC=9D=84=20=EC=9C=84=ED=95=9C?=
 =?UTF-8?q?=20=EC=8A=A4=ED=8A=B8=EB=A7=81=20=EB=A6=AC=EC=86=8C=EC=8A=A4=20?=
 =?UTF-8?q?=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/values/strings.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 224cfb2a..06f65760 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -111,4 +111,20 @@
     <string name="plan_recruitment_minus">-</string>
     <string name="plan_recruitment_plus">+</string>
     <string name="plan_recruitment_snackbar">최대 선택 가능 인원은 99명이에요!</string>
+
+    <!--  setting  -->
+    <string name="setting_title">더보기</string>
+    <string name="setting_my_group">나의 단체</string>
+    <string name="setting_content_title">문의하기</string>
+    <string name="setting_notice_title">공지사항</string>
+    <string name="setting_version_title">버전</string>
+    <string name="setting_logout_title">로그아웃</string>
+    <string name="setting_withdraw_title">탈퇴하기</string>
+    <string name="setting_logout_modal_title">정말로 로그아웃 하실건가요?</string>
+    <string name="setting_logout_modal_detail">카카오 계정을 로그아웃합니다</string>
+    <string name="setting_modal_back">돌아가기</string>
+    <string name="setting_logout_modal_btn_text">로그아웃</string>
+    <string name="setting_withdraw_modal_title">정말로 탈퇴하실건가요?</string>
+    <string name="setting_withdraw_modal_detail">탈퇴 시 계정은 삭제되며 복구할 수 있어요</string>
+    <string name="setting_withdraw_modal_btn_text">탈퇴하기</string>
 </resources>
\ No newline at end of file

From 2585b84f078eab9d7e273e641c6740a80b1a9a78 Mon Sep 17 00:00:00 2001
From: Dani43 <eldms0406@naver.com>
Date: Tue, 9 Jan 2024 22:06:30 +0900
Subject: [PATCH 2/7] =?UTF-8?q?[feat]=20#73=20=EB=8D=94=EB=B3=B4=EA=B8=B0(?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95)=20=EB=B7=B0=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/ui/main/MainActivity.kt      |   2 +
 .../ui/main/setting/SettingFragment.kt        |  53 ++++++
 app/src/main/res/layout/fragment_setting.xml  | 168 +++++++++++++++++-
 3 files changed, 216 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/main/MainActivity.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/main/MainActivity.kt
index 51bbda25..dc58b64c 100644
--- a/app/src/main/java/org/sopt/pingle/presentation/ui/main/MainActivity.kt
+++ b/app/src/main/java/org/sopt/pingle/presentation/ui/main/MainActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import androidx.fragment.app.replace
+import dagger.hilt.android.AndroidEntryPoint
 import org.sopt.pingle.R
 import org.sopt.pingle.databinding.ActivityMainBinding
 import org.sopt.pingle.presentation.ui.main.commend.CommendFragment
@@ -14,6 +15,7 @@ import org.sopt.pingle.presentation.ui.main.plan.PlanActivity
 import org.sopt.pingle.presentation.ui.main.setting.SettingFragment
 import org.sopt.pingle.util.base.BindingActivity
 
+@AndroidEntryPoint
 class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main) {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/main/setting/SettingFragment.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/main/setting/SettingFragment.kt
index fdfc7eb8..8e6d9668 100644
--- a/app/src/main/java/org/sopt/pingle/presentation/ui/main/setting/SettingFragment.kt
+++ b/app/src/main/java/org/sopt/pingle/presentation/ui/main/setting/SettingFragment.kt
@@ -2,12 +2,65 @@ package org.sopt.pingle.presentation.ui.main.setting
 
 import android.os.Bundle
 import android.view.View
+import dagger.hilt.android.AndroidEntryPoint
+import org.sopt.pingle.BuildConfig
 import org.sopt.pingle.R
 import org.sopt.pingle.databinding.FragmentSettingBinding
 import org.sopt.pingle.util.base.BindingFragment
+import org.sopt.pingle.util.component.AllModalDialogFragment
 
+@AndroidEntryPoint
 class SettingFragment : BindingFragment<FragmentSettingBinding>(R.layout.fragment_setting) {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
+        initLayout()
+        addListeners()
+    }
+
+    private fun initLayout() {
+        binding.tvSettingVersionContent.text = BuildConfig.VERSION_NAME.toString()
+    }
+
+    private fun addListeners() {
+        binding.tvSettingLogoutTitle.setOnClickListener {
+            showLogoutDialogFragment()
+        }
+        binding.tvSettingWithdrawTitle.setOnClickListener {
+            showWithDrawLogoutDialogFragment()
+        }
+    }
+
+    private fun showLogoutDialogFragment() {
+        AllModalDialogFragment(
+            title = getString(R.string.setting_logout_modal_title),
+            detail = getString(R.string.setting_logout_modal_detail),
+            buttonText = getString(R.string.setting_modal_back),
+            textButtonText = getString(R.string.setting_logout_modal_btn_text),
+            clickBtn = {},
+            clickTextBtn = {
+                // TODO 로그아웃 서버통신
+            },
+            onDialogClosed = {}
+        ).show(parentFragmentManager, LOGOUT_MODAL)
+    }
+
+    private fun showWithDrawLogoutDialogFragment() {
+        AllModalDialogFragment(
+            title = getString(R.string.setting_withdraw_modal_title),
+            detail = getString(R.string.setting_withdraw_modal_detail),
+            buttonText = getString(R.string.setting_modal_back),
+            textButtonText = getString(R.string.setting_withdraw_modal_btn_text),
+            clickBtn = { },
+            clickTextBtn = {
+                // TODO 회원탈퇴 서버통신
+            },
+            onDialogClosed = {}
+        ).show(parentFragmentManager, WITHDRAW_MODAL)
+    }
+
+    companion object {
+        private const val LOGOUT_MODAL = "logoutModal"
+        private const val WITHDRAW_MODAL = "withModal"
     }
 }
diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml
index d68dacb2..c8c648dc 100644
--- a/app/src/main/res/layout/fragment_setting.xml
+++ b/app/src/main/res/layout/fragment_setting.xml
@@ -9,19 +9,173 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".presentation.ui.main.setting.SettingFragment">
+        android:layout_height="match_parent">
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/gl_start"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_begin="@dimen/spacing16" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/gl_end"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_end="@dimen/spacing16" />
 
         <TextView
+            android:id="@+id/tv_setting_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="설정"
-            android:textAppearance="@style/TextAppearance.Pingle.Title.Semi.32"
+            android:layout_marginTop="31dp"
+            android:text="@string/setting_title"
+            android:textAppearance="@font/suit_semibold"
             android:textColor="@color/white"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+            android:textSize="18dp"
+            app:layout_constraintStart_toEndOf="@id/gl_start"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <TextView
+            android:id="@+id/tv_setting_nickName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing18"
+            android:textAppearance="@style/TextAppearance.Pingle.Sub.Semi.18"
+            android:textColor="@color/white"
+            app:layout_constraintStart_toStartOf="@+id/tv_setting_title"
+            app:layout_constraintTop_toBottomOf="@+id/tv_setting_title"
+            tools:text="김핑글" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/layout_setting_my_group"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing20"
+            android:background="@drawable/shape_border_radius_12"
+            android:backgroundTint="#252930"
+            android:paddingVertical="@dimen/spacing14"
+            android:paddingStart="@dimen/spacing14"
+            app:layout_constraintEnd_toStartOf="@+id/gl_end"
+            app:layout_constraintStart_toStartOf="@+id/gl_start"
+            app:layout_constraintTop_toBottomOf="@id/tv_setting_nickName">
+
+            <TextView
+                android:id="@+id/tv_setting_my_group_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/setting_my_group"
+                android:textAppearance="@style/TextAppearance.Pingle.Cap.Med.12"
+                android:textColor="@color/g_03"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_setting_my_group_content"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textAppearance="@style/TextAppearance.Pingle.Sub.Bold.18"
+                android:textColor="@color/white"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_setting_my_group_title"
+                tools:text="SOPT" />
+
+            <ImageView
+                android:id="@+id/iv_setting_move_to_my_group"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/spacing10"
+                android:src="@drawable/ic_all_arrow_right_24"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <TextView
+            android:id="@+id/tv_setting_contact_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="40dp"
+            android:paddingVertical="@dimen/spacing14"
+            android:paddingStart="4dp"
+            android:text="@string/setting_content_title"
+            android:textAppearance="@style/TextAppearance.Pingle.Body.Med.16"
+            android:textColor="@color/white"
+            app:layout_constraintEnd_toStartOf="@+id/gl_end"
+            app:layout_constraintStart_toStartOf="@+id/gl_start"
+            app:layout_constraintTop_toBottomOf="@id/layout_setting_my_group" />
+
+        <TextView
+            android:id="@+id/tv_setting_notice_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/spacing14"
+            android:paddingStart="4dp"
+            android:text="@string/setting_notice_title"
+            android:textAppearance="@style/TextAppearance.Pingle.Body.Med.16"
+            android:textColor="@color/white"
+            app:layout_constraintEnd_toStartOf="@+id/gl_end"
+            app:layout_constraintStart_toStartOf="@+id/gl_start"
+            app:layout_constraintTop_toBottomOf="@id/tv_setting_contact_title" />
+
+        <TextView
+            android:id="@+id/tv_setting_version_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/spacing14"
+            android:paddingStart="4dp"
+            android:text="@string/setting_version_title"
+            android:textAppearance="@style/TextAppearance.Pingle.Body.Med.16"
+            android:textColor="@color/white"
+            app:layout_constraintStart_toStartOf="@+id/gl_start"
+            app:layout_constraintTop_toBottomOf="@+id/tv_setting_notice_title" />
+
+        <TextView
+            android:id="@+id/tv_setting_version_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="4dp"
+            android:textColor="@color/g_03"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_setting_version_title"
+            app:layout_constraintEnd_toStartOf="@+id/gl_end"
+            app:layout_constraintTop_toTopOf="@+id/tv_setting_version_title"
+            tools:text="0.0.0" />
+
+        <View
+            android:id="@+id/view_setting_divider"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:background="@color/g_08"
+            app:layout_constraintEnd_toStartOf="@id/gl_end"
+            app:layout_constraintStart_toEndOf="@id/gl_start"
+            app:layout_constraintTop_toBottomOf="@+id/tv_setting_version_title" />
+
+        <TextView
+            android:id="@+id/tv_setting_logout_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/spacing14"
+            android:paddingStart="4dp"
+            android:text="@string/setting_logout_title"
+            android:textAppearance="@style/TextAppearance.Pingle.Body.Med.16"
+            android:textColor="@color/white"
+            app:layout_constraintEnd_toStartOf="@+id/gl_end"
+            app:layout_constraintStart_toStartOf="@+id/gl_start"
+            app:layout_constraintTop_toBottomOf="@+id/view_setting_divider" />
+
+        <TextView
+            android:id="@+id/tv_setting_withdraw_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="4dp"
+            android:paddingVertical="@dimen/spacing14"
+            android:text="@string/setting_withdraw_title"
+            android:textAppearance="@style/TextAppearance.Pingle.Cap.Semi.12"
+            android:textColor="@color/g_06"
+            app:layout_constraintEnd_toStartOf="@+id/gl_end"
+            app:layout_constraintTop_toBottomOf="@+id/tv_setting_logout_title" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file

From e286ebe957d9e0d63ada772a3a19ad0cbef07c98 Mon Sep 17 00:00:00 2001
From: Dani43 <eldms0406@naver.com>
Date: Wed, 10 Jan 2024 00:52:29 +0900
Subject: [PATCH 3/7] =?UTF-8?q?[mod]=20#73=20=EB=8D=94=EB=B3=B4=EA=B8=B0?=
 =?UTF-8?q?=20=EC=8A=A4=ED=8A=B8=EB=A7=81=20=EC=B6=94=EA=B0=80=20=EB=B0=8F?=
 =?UTF-8?q?=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/fragment_setting.xml | 4 ++--
 app/src/main/res/values/strings.xml          | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml
index c8c648dc..96d1ae99 100644
--- a/app/src/main/res/layout/fragment_setting.xml
+++ b/app/src/main/res/layout/fragment_setting.xml
@@ -41,7 +41,7 @@
             android:id="@+id/tv_setting_nickName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing18"
+            android:layout_marginTop="32dp"
             android:textAppearance="@style/TextAppearance.Pingle.Sub.Semi.18"
             android:textColor="@color/white"
             app:layout_constraintStart_toStartOf="@+id/tv_setting_title"
@@ -101,7 +101,7 @@
             android:layout_marginTop="40dp"
             android:paddingVertical="@dimen/spacing14"
             android:paddingStart="4dp"
-            android:text="@string/setting_content_title"
+            android:text="@string/setting_contact_title"
             android:textAppearance="@style/TextAppearance.Pingle.Body.Med.16"
             android:textColor="@color/white"
             app:layout_constraintEnd_toStartOf="@+id/gl_end"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e4a0ad4d..40685747 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -111,4 +111,13 @@
     <string name="plan_recruitment_minus">-</string>
     <string name="plan_recruitment_plus">+</string>
     <string name="plan_recruitment_snackbar">최대 선택 가능 인원은 99명이에요!</string>
+
+    <!-- setting   -->
+    <string name="setting_contact_title">문의하기</string>
+    <string name="setting_notice_title">공지사항</string>
+    <string name="setting_version_title">버전</string>
+    <string name="setting_logout_title">로그아웃</string>
+    <string name="setting_withdraw_title">탈퇴하기</string>
+    <string name="setting_title">더보기</string>
+    <string name="setting_my_group">나의 단체</string>
 </resources>
\ No newline at end of file

From 136010d738f09dee229757bb283646af6a1a122c Mon Sep 17 00:00:00 2001
From: Dani43 <eldms0406@naver.com>
Date: Wed, 10 Jan 2024 01:02:45 +0900
Subject: [PATCH 4/7] =?UTF-8?q?[mod]=20#73=20plan=20announcement=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/res/layout/activity_plan_announcement.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/src/main/res/layout/activity_plan_announcement.xml b/app/src/main/res/layout/activity_plan_announcement.xml
index 43abb7e9..0c6ec4b3 100644
--- a/app/src/main/res/layout/activity_plan_announcement.xml
+++ b/app/src/main/res/layout/activity_plan_announcement.xml
@@ -28,7 +28,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="21dp"
             android:layout_marginTop="48dp"
-            android:text="@string/plan_announcement_title"
             android:textAppearance="@style/TextAppearance.Pingle.Title.Semi.24"
             android:textColor="@color/white"
             app:layout_constraintStart_toStartOf="parent"
@@ -39,7 +38,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="21dp"
-            android:text="@string/plan_announcement_detail_top"
             android:textAppearance="@style/TextAppearance.Pingle.Body.Med.16"
             android:textColor="@color/g_04"
             app:layout_constraintStart_toStartOf="parent"
@@ -51,7 +49,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="21dp"
             android:layout_marginTop="@dimen/spacing4"
-            android:text="@string/plan_announcement_detail_bottom"
             android:textAppearance="@style/TextAppearance.Pingle.Body.Med.16"
             android:textColor="@color/g_04"
             app:layout_constraintStart_toStartOf="parent"

From f3372c41a7b27790ddd41053b6c7798266d1b105 Mon Sep 17 00:00:00 2001
From: Dani43 <eldms0406@naver.com>
Date: Wed, 10 Jan 2024 01:09:48 +0900
Subject: [PATCH 5/7] =?UTF-8?q?[mod]=20#73=20plan=20announcement=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/res/layout/activity_plan_announcement.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_plan_announcement.xml b/app/src/main/res/layout/activity_plan_announcement.xml
index 0c6ec4b3..4ff78287 100644
--- a/app/src/main/res/layout/activity_plan_announcement.xml
+++ b/app/src/main/res/layout/activity_plan_announcement.xml
@@ -73,7 +73,6 @@
             android:layout_marginTop="@dimen/spacing28"
             android:layout_marginBottom="54dp"
             android:backgroundTint="@color/g_01"
-            android:text="@string/plan_announcement_button"
             android:textColor="@color/black"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

From 17596ccee023b9e681cbb3445643808de9a71035 Mon Sep 17 00:00:00 2001
From: Dani43 <eldms0406@naver.com>
Date: Wed, 10 Jan 2024 01:25:55 +0900
Subject: [PATCH 6/7] =?UTF-8?q?[add]=20#73=20=EB=88=84=EB=9D=BD=EB=90=9C?=
 =?UTF-8?q?=20=EC=8A=A4=ED=8A=B8=EB=A7=81=20=EB=A6=AC=EC=86=8C=EC=8A=A4=20?=
 =?UTF-8?q?=EC=B6=94=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/strings.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 22725747..4c70877f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,6 +59,7 @@
     <string name="plan_open_chatting_title">오픈채팅방 링크를\n추가해주세요!</string>
     <string name="plan_open_chatting_hint">링크를 입력해주세요</string>
     <string name="plan_open_chatting_text_title">채팅방 링크</string>
+    <string name="plan_announcement_detail_top">PIN 과 MINGLE의 합성어로,</string>
 
     <!--  plan modal -->
     <string name="plan_exit_modal_dialog_title">잠깐! 나가실건가요?</string>
@@ -123,7 +124,7 @@
     <string name="plan_summary_confirmation_location">장소</string>
     <string name="plan_summary_confirmation_recruitment">모집인원</string>
     <string name="plan_summary_confirmation_recruitment_number">%s명</string>
-]
+    ]
     <!-- plan recruitment -->
     <string name="plan_recruitment_title">몇 명의 핑글러들과\n만날까요?</string>
     <string name="plan_recruitment_description">본인을 포함하여,\n최소 1명부터 참여 인원을 선택해주세요</string>
@@ -139,4 +140,11 @@
     <string name="setting_withdraw_title">탈퇴하기</string>
     <string name="setting_title">더보기</string>
     <string name="setting_my_group">나의 단체</string>
+    <string name="setting_logout_modal_title">정말로 로그아웃 하실건가요?</string>
+    <string name="setting_logout_modal_detail">카카오 계정을 로그아웃합니다</string>
+    <string name="setting_modal_back">돌아기기</string>
+    <string name="setting_logout_modal_btn_text">로그아웃</string>
+    <string name="setting_withdraw_modal_title">정말로 탈퇴하실건가요?</string>
+    <string name="setting_withdraw_modal_detail">탈퇴 시 계정은 삭제되며 복구할 수 없어요</string>
+    <string name="setting_withdraw_modal_btn_text">탈퇴하기</string>
 </resources>
\ No newline at end of file

From 9fda8b9a08010fbfe180c92377c199aa3e06efd6 Mon Sep 17 00:00:00 2001
From: Dani43 <eldms0406@naver.com>
Date: Wed, 10 Jan 2024 01:35:08 +0900
Subject: [PATCH 7/7] =?UTF-8?q?[add]=20#73=20=EB=88=84=EB=9D=BD=EB=90=9C?=
 =?UTF-8?q?=20=EC=8A=A4=ED=8A=B8=EB=A7=81=20=EB=A6=AC=EC=86=8C=EC=8A=A4=20?=
 =?UTF-8?q?=EC=B6=94=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4c70877f..7ca62476 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,7 +59,7 @@
     <string name="plan_open_chatting_title">오픈채팅방 링크를\n추가해주세요!</string>
     <string name="plan_open_chatting_hint">링크를 입력해주세요</string>
     <string name="plan_open_chatting_text_title">채팅방 링크</string>
-    <string name="plan_announcement_detail_top">PIN 과 MINGLE의 합성어로,</string>
+    <string name="plan_announcement_detail_top">%s과 %s의 합성어로,</string>
 
     <!--  plan modal -->
     <string name="plan_exit_modal_dialog_title">잠깐! 나가실건가요?</string>