diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 27dad50f..5198b52f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,11 +21,13 @@
android:exported="true">
+
-
@@ -90,7 +92,7 @@
+ android:screenOrientation="portrait" />
+ android:screenOrientation="portrait" />
+
+
(R.layout.activity_setting) {
+
+ private var quitDialog: SettingQuitDialogFragment? = null
+ private var logoutDialog: SettingLogoutDialogFragment? = null
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ initProfileClickListener()
+ initInquireClickListener()
+ initPolicyClickListener()
+ initAboutDooripClickListener()
+ initLogoutClickListener()
+ initQuitClickListener()
+ setVersionCode()
+
+ }
+
+ private fun initProfileClickListener() {
+ binding.btnSettingProfileEnter.setOnSingleClickListener {
+
+ }
+ }
+
+ private fun initInquireClickListener() {
+ binding.btnSettingInquireEnter.setOnSingleClickListener {
+
+ }
+ }
+
+ private fun initPolicyClickListener() {
+ binding.btnSettingPolicyEnter.setOnSingleClickListener {
+
+ }
+ }
+
+ private fun initAboutDooripClickListener() {
+ binding.btnSettingAboutDooripEnter.setOnSingleClickListener {
+
+ }
+ }
+
+ private fun initLogoutClickListener() {
+ binding.btnSettingLogoutEnter.setOnSingleClickListener {
+ showLogoutAlertDialog()
+ }
+ }
+
+ private fun initQuitClickListener() {
+ binding.btnSettingQuit.setOnSingleClickListener {
+ showQuitAlertDialog()
+ }
+ }
+
+ private fun showLogoutAlertDialog() {
+ logoutDialog = SettingLogoutDialogFragment()
+ logoutDialog?.show(supportFragmentManager, logoutDialog?.tag)
+ }
+
+ private fun showQuitAlertDialog() {
+ quitDialog = SettingQuitDialogFragment()
+ quitDialog?.show(supportFragmentManager, quitDialog?.tag)
+ }
+
+ private fun setVersionCode() {
+ binding.tvSettingShowServiceVersion.text = VERSION_CODE
+ }
+
+ override fun onDestroy() {
+ super.onDestroy()
+ if (logoutDialog?.isAdded == true) logoutDialog?.dismiss()
+ if (quitDialog?.isAdded == true) quitDialog?.dismiss()
+ }
+
+ companion object {
+ private const val VERSION_CODE = "v1.0"
+ }
+
+}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingLogoutDialogFragment.kt b/presentation/src/main/java/com/going/presentation/setting/SettingLogoutDialogFragment.kt
new file mode 100644
index 00000000..7154636c
--- /dev/null
+++ b/presentation/src/main/java/com/going/presentation/setting/SettingLogoutDialogFragment.kt
@@ -0,0 +1,44 @@
+package com.going.presentation.setting
+
+import android.os.Bundle
+import android.view.View
+import android.view.WindowManager
+import com.going.presentation.R
+import com.going.presentation.databinding.FragmentSettingLogoutDialogBinding
+import com.going.ui.base.BaseDialog
+import com.going.ui.extension.setOnSingleClickListener
+
+class SettingLogoutDialogFragment :
+ BaseDialog(R.layout.fragment_setting_logout_dialog) {
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ initNegativeClickListener()
+ initPositiveClickListener()
+
+ }
+
+ override fun onStart() {
+ super.onStart()
+ dialog?.window?.apply {
+ setLayout(
+ WindowManager.LayoutParams.MATCH_PARENT,
+ WindowManager.LayoutParams.WRAP_CONTENT,
+ )
+ }
+ }
+
+ private fun initPositiveClickListener() {
+ binding.tvDialogPositive.setOnSingleClickListener {
+ // 로그아웃 버튼 눌렀을 때의 로직
+ }
+ }
+
+ private fun initNegativeClickListener() {
+ binding.btnDialogNegative.setOnSingleClickListener {
+ dismiss()
+ }
+ }
+
+}
diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingQuitDialogFragment.kt b/presentation/src/main/java/com/going/presentation/setting/SettingQuitDialogFragment.kt
new file mode 100644
index 00000000..c89b983a
--- /dev/null
+++ b/presentation/src/main/java/com/going/presentation/setting/SettingQuitDialogFragment.kt
@@ -0,0 +1,44 @@
+package com.going.presentation.setting
+
+import android.os.Bundle
+import android.view.View
+import android.view.WindowManager
+import com.going.presentation.R
+import com.going.presentation.databinding.FragmentSettingQuitDialogBinding
+import com.going.ui.base.BaseDialog
+import com.going.ui.extension.setOnSingleClickListener
+
+class SettingQuitDialogFragment :
+ BaseDialog(R.layout.fragment_setting_quit_dialog) {
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ initNegativeClickListener()
+ initPositiveClickListener()
+
+ }
+
+ override fun onStart() {
+ super.onStart()
+ dialog?.window?.apply {
+ setLayout(
+ WindowManager.LayoutParams.MATCH_PARENT,
+ WindowManager.LayoutParams.WRAP_CONTENT,
+ )
+ }
+ }
+
+ private fun initPositiveClickListener() {
+ binding.tvDialogPositive.setOnSingleClickListener {
+ dismiss()
+ }
+ }
+
+ private fun initNegativeClickListener() {
+ // 탈퇴하기 버튼을 눌렀을 때의 로직
+ }
+
+}
+
+
diff --git a/presentation/src/main/res/drawable/ic_enter_large.xml b/presentation/src/main/res/drawable/ic_enter_large.xml
new file mode 100644
index 00000000..0c19b3d9
--- /dev/null
+++ b/presentation/src/main/res/drawable/ic_enter_large.xml
@@ -0,0 +1,13 @@
+
+
+
diff --git a/presentation/src/main/res/drawable/ic_unsubscribe.xml b/presentation/src/main/res/drawable/ic_unsubscribe.xml
new file mode 100644
index 00000000..4156c17b
--- /dev/null
+++ b/presentation/src/main/res/drawable/ic_unsubscribe.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/presentation/src/main/res/drawable/shape_rect_2_white000_fill.xml b/presentation/src/main/res/drawable/shape_rect_2_white000_fill.xml
new file mode 100644
index 00000000..3e32d1b3
--- /dev/null
+++ b/presentation/src/main/res/drawable/shape_rect_2_white000_fill.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/shape_rect_6_white000_fill.xml b/presentation/src/main/res/drawable/shape_rect_6_white000_fill.xml
new file mode 100644
index 00000000..77ed6fbc
--- /dev/null
+++ b/presentation/src/main/res/drawable/shape_rect_6_white000_fill.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/activity_preference_tag.xml b/presentation/src/main/res/layout/activity_preference_tag.xml
index 215bbeec..a6f18065 100644
--- a/presentation/src/main/res/layout/activity_preference_tag.xml
+++ b/presentation/src/main/res/layout/activity_preference_tag.xml
@@ -14,7 +14,7 @@
tools:context=".preferencetag.PreferenceTagActivity">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/presentation/src/main/res/layout/activity_trip_dash_board.xml b/presentation/src/main/res/layout/activity_trip_dash_board.xml
index f07c4091..d3a2495a 100644
--- a/presentation/src/main/res/layout/activity_trip_dash_board.xml
+++ b/presentation/src/main/res/layout/activity_trip_dash_board.xml
@@ -77,10 +77,10 @@
android:background="@drawable/sel_rounded_corner_button"
android:backgroundTint="@color/gray_500"
android:outlineProvider="none"
+ android:text="@string/dashboard_btn_create_trip"
android:textColor="@color/white_000"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- tools:text="@string/dashboard_btn_create_trip" />
+ app:layout_constraintStart_toStartOf="parent" />
diff --git a/presentation/src/main/res/layout/fragment_setting_logout_dialog.xml b/presentation/src/main/res/layout/fragment_setting_logout_dialog.xml
new file mode 100644
index 00000000..582c24f7
--- /dev/null
+++ b/presentation/src/main/res/layout/fragment_setting_logout_dialog.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/presentation/src/main/res/layout/fragment_setting_quit_dialog.xml b/presentation/src/main/res/layout/fragment_setting_quit_dialog.xml
new file mode 100644
index 00000000..869776e2
--- /dev/null
+++ b/presentation/src/main/res/layout/fragment_setting_quit_dialog.xml
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/presentation/src/main/res/layout/item_dash_board_ongoing.xml b/presentation/src/main/res/layout/item_dash_board_ongoing.xml
index be503a15..a3544899 100644
--- a/presentation/src/main/res/layout/item_dash_board_ongoing.xml
+++ b/presentation/src/main/res/layout/item_dash_board_ongoing.xml
@@ -23,9 +23,9 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
- android:text="굉굉이들이랑 합숙"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="굉굉이들이랑 합숙" />
+ app:layout_constraintTop_toBottomOf="@id/tv_dashboard_trip_title"
+ tools:text="2024 .03 .24" />
+ app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_dash"
+ tools:text="2024 .03 .31" />
#00000000
#B3000000
+ #99000000
#80000000
#4D000000
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
index 530d9ad8..0f1425c3 100644
--- a/presentation/src/main/res/values/strings.xml
+++ b/presentation/src/main/res/values/strings.xml
@@ -119,6 +119,23 @@
입장하기
초대코드가 복사되었어요.
+
+ 설정
+ 프로필
+ 문의하기
+ 서비스 버전
+ 약관 및 정책
+ About doorip
+ 로그아웃
+ 정말 탈퇴하시겠어요?
+ 탈퇴시, 정보가 모두 없어져요.
+ 탈퇴하기
+ 남아있기
+ 회원탈퇴
+ 정말 로그아웃하시겠어요?
+ 취소
+ 로그아웃
+
프로필 생성
두릅이