[feat]: Add Logout Dialog

Team-HMH · Jan 13, 2024 · b81b477 · b81b477
1 parent 31d26c3
commit b81b477
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 19 deletions.
diff --git a/core/common/src/main/java/com/hmh/hamyeonham/common/dialog/TwoButtonCommonDialog.kt b/core/common/src/main/java/com/hmh/hamyeonham/common/dialog/TwoButtonCommonDialog.kt
@@ -7,6 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentManager
 import com.hmh.hamyeonham.common.context.dialogWidthPercent
 import com.hmh.hamyeonham.common.databinding.DialogCommonTwoButtonBinding
 import com.hmh.hamyeonham.common.view.setOnSingleClickListener
@@ -51,14 +52,13 @@ class TwoButtonCommonDialog : DialogFragment() {
 
     private fun initViews() {
         val title = arguments?.getString(TITLE, "")
-        val description = arguments?.getString(DESCRIPTION, "")
+        val description = arguments?.getString(DESCRIPTION)
         val confirmButtonText = arguments?.getString(CONFIRM_BUTTON_TEXT, "")
         val dismissButtonText = arguments?.getString(DISMISS_BUTTON_TEXT, "")
 
         with(binding) {
             tvDialogTitle.text = title
             tvDialogDescription.text = description
-
             tvConfirmButton.text = confirmButtonText
             tvDismissButton.text = dismissButtonText
         }
@@ -75,6 +75,11 @@ class TwoButtonCommonDialog : DialogFragment() {
         }
     }
 
+    fun showAllowingStateLoss(fm: FragmentManager, tag: String = "") {
+        fm.beginTransaction().add(this, tag)
+            .commitAllowingStateLoss()
+    }
+
     companion object {
         const val TAG = "TwoButtonCommonDialog"
 
@@ -86,7 +91,7 @@ class TwoButtonCommonDialog : DialogFragment() {
 
         fun newInstance(
             title: String,
-            description: String,
+            description: String? = null,
             confirmButtonText: String,
             dismissButtonText: String
         ): TwoButtonCommonDialog {

diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="all_okay">확인</string>
+    <string name="all_cancel">취소</string>
+</resources>
diff --git a/feature/mypage/src/main/java/com/hmh/hamyeonham/mypage/MyPageFragment.kt b/feature/mypage/src/main/java/com/hmh/hamyeonham/mypage/MyPageFragment.kt
@@ -11,6 +11,7 @@ import androidx.core.content.ContextCompat.getColor
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.flowWithLifecycle
+import com.hmh.hamyeonham.common.dialog.TwoButtonCommonDialog
 import com.hmh.hamyeonham.common.fragment.viewLifeCycle
 import com.hmh.hamyeonham.common.fragment.viewLifeCycleScope
 import com.hmh.hamyeonham.common.view.viewBinding
@@ -40,9 +41,27 @@ class MyPageFragment : Fragment() {
         savedInstanceState: Bundle?
     ) {
         super.onViewCreated(view, savedInstanceState)
+        initViews()
         collectMainState()
     }
 
+    private fun initViews() {
+        binding.tvLogout.setOnClickListener {
+            TwoButtonCommonDialog.newInstance(
+                title = getString(R.string.logout_description),
+                confirmButtonText = getString(com.hmh.hamyeonham.core.designsystem.R.string.all_okay),
+                dismissButtonText = getString(com.hmh.hamyeonham.core.designsystem.R.string.all_cancel)
+            ).apply {
+                setConfirmButtonClickListener {
+
+                }
+                setDismissButtonClickListener {
+
+                }
+            }.showAllowingStateLoss(childFragmentManager)
+        }
+    }
+
     private fun collectMainState() {
         activityViewModel.mainState.flowWithLifecycle(viewLifeCycle).onEach {
             bindMyPageWithUserInfo(it.userInfo)

diff --git a/feature/mypage/src/main/res/layout/fragment_my_page.xml b/feature/mypage/src/main/res/layout/fragment_my_page.xml
@@ -297,7 +297,7 @@
         android:id="@+id/tv_logout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="19dp"
+        android:padding="19dp"
         android:text="로그아웃"
         android:textAppearance="?textAppearanceBodyLarge"
         android:textColor="?gray3"
@@ -321,7 +321,7 @@
         android:id="@+id/tv_withdrawal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="19dp"
+        android:padding="19dp"
         android:text="회원탈퇴"
         android:textAppearance="?textAppearanceBodyLarge"
         android:textColor="?gray3"

diff --git a/...ure/mypage/src/main/res/values/string.xml → ...re/mypage/src/main/res/values/strings.xml b/...ure/mypage/src/main/res/values/string.xml → ...re/mypage/src/main/res/values/strings.xml
@@ -1,11 +1,12 @@
-<resources>
-    <string name="mypage_title">마이페이지</string>
-    <string name = "mypage_point_title">보유 포인트</string>
-    <string name="mypage_point_unit">P</string>
-    <string name="mypage_badge_collection">배지 컬렉션</string>
-    <string name="mypage_journey">지금까지의 여정</string>
-    <string name="mypage_store">상점</string>
-    <string name="mypage_info">정보</string>
-    <string name="mypage_termofuse">이용약관</string>
-    <string name="mypage_privacy">개인정보처리방침</string>
-</resources>
+<resources>
+    <string name="mypage_title">마이페이지</string>
+    <string name="mypage_point_title">보유 포인트</string>
+    <string name="mypage_point_unit">P</string>
+    <string name="mypage_badge_collection">배지 컬렉션</string>
+    <string name="mypage_journey">지금까지의 여정</string>
+    <string name="mypage_store">상점</string>
+    <string name="mypage_info">정보</string>
+    <string name="mypage_termofuse">이용약관</string>
+    <string name="mypage_privacy">개인정보처리방침</string>
+    <string name="logout_description">하면함을 로그아웃 하시겠어요?</string>
+</resources>
diff --git a/feature/onboarding/src/main/res/layout/activity_on_boarding_done_sing_up.xml b/feature/onboarding/src/main/res/layout/activity_on_boarding_done_sing_up.xml
@@ -56,10 +56,10 @@
         android:background="@drawable/all_next_btn_able"
         android:gravity="center"
         android:text="@string/all_okay"
-        android:textColor="?white_text"
         android:textAppearance="@style/TextAppearance.Hmh.TitleMedium"
+        android:textColor="?white_text"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/feature/onboarding/src/main/res/values/strings.xml b/feature/onboarding/src/main/res/values/strings.xml
@@ -25,7 +25,6 @@
     <string name="onboarding_done_sing_up_image">celebrate sign up image</string>
     <string name="onboarding_done_sing_up_title">회원가입 완료</string>
     <string name="onboarding_done_sing_up_description">이제 하면함에서 블랙홀 탈출을 위한\n여정을 시작해 볼까요?</string>
-    <string name="all_okay">확인</string>
     <string name="onboarding_select_data_question">하루 평균 휴대폰을 \n얼마나 사용하시나요?</string>
     <string name="onboarding_select_data_description">해당 문항은 최대 2개까지 선택할 수 있어요</string>
     <string name="success_accessibility_settings">접근성 허용이 승인되었습니다</string>