feature/custom 일기카드 달력 기능 구현

app/src/main/java/com/toyou/toyouandroid/model/CalendarItem.kt

@@ -4,3 +4,8 @@ data class CalendarItem(
     val emotion: Int,
     val nickname: String
 )
+
+data class DateWithItems(
+    val date: String,
+    val items: List<CalendarItem>
+)

app/src/main/java/com/toyou/toyouandroid/model/FriendDate.kt

@@ -0,0 +1,8 @@
+package com.toyou.toyouandroid.model
+
+import java.util.Date
+
+data class FriendDate(
+    val date: Date,
+    val people: String
+)

app/src/main/java/com/toyou/toyouandroid/model/MyDate.kt

@@ -0,0 +1,8 @@
+package com.toyou.toyouandroid.model
+
+import java.util.Date
+
+data class MyDate(
+    val date: Date,
+    val imageResId: Int?
+)

app/src/main/java/com/toyou/toyouandroid/presentation/base/MainActivity.kt

@@ -40,8 +40,8 @@ class MainActivity : AppCompatActivity() {
                     navController.navigate(R.id.navigation_social)
                     true
                 }
-                R.id.navigation_calendar -> {
-                    navController.navigate(R.id.navigation_calendar)
+                R.id.navigation_record -> {
+                    navController.navigate(R.id.navigation_record)
                     true
                 }
                 R.id.navigation_mypage -> {

app/src/main/java/com/toyou/toyouandroid/presentation/fragment/emotionstamp/HomeOptionFragment.kt

@@ -53,7 +53,7 @@ class HomeOptionFragment : Fragment() {
             homeViewModel.updateHomeEmotion(
                 R.drawable.home_emotion_anxiety,
                 getString(R.string.home_emotion_anxiety_title),
-                R.color.g01,
+                R.color.g02,
                 R.drawable.background_green)
 
             homeViewModel.updateMypageEmotion(R.drawable.home_stamp_option_anxiety)

app/src/main/java/com/toyou/toyouandroid/presentation/fragment/emotionstamp/HomeResultFragment.kt

@@ -46,7 +46,7 @@ class HomeResultFragment : Fragment() {
         binding.homeResultTv.text = text
 
         ObjectAnimator.ofFloat(binding.homeResultTv, "alpha", 0f, 1f).apply {
-            duration = 3000
+            duration = 2000
             interpolator = DecelerateInterpolator()
             start()
         }

app/src/main/java/com/toyou/toyouandroid/presentation/fragment/mypage/MypageDialog.kt

@@ -0,0 +1,49 @@
+package com.toyou.toyouandroid.presentation.fragment.mypage
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.Window
+import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.activityViewModels
+import com.toyou.toyouandroid.R
+import com.toyou.toyouandroid.databinding.DialogMypageBinding
+
+class MypageDialog : DialogFragment() {
+
+    private val viewModel: MypageDialogViewModel by activityViewModels()
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        val binding: DialogMypageBinding = DataBindingUtil.inflate(
+            inflater, R.layout.dialog_mypage, container, false
+        )
+        binding.lifecycleOwner = this
+        binding.viewModel = viewModel
+        return binding.root
+    }
+
+    override fun onResume() {
+        super.onResume()
+        dialog?.window?.setLayout(
+            convertDpToPx(280),
+            convertDpToPx(120)
+        )
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return Dialog(requireContext(), R.style.MypageDialog).apply {
+            requestWindowFeature(Window.FEATURE_NO_TITLE)
+            window?.setBackgroundDrawableResource(android.R.color.transparent)
+        }
+    }
+
+    private fun convertDpToPx(dp: Int): Int {
+        return (dp * resources.displayMetrics.density).toInt()
+    }
+}

app/src/main/java/com/toyou/toyouandroid/presentation/fragment/mypage/MypageDialogViewModel.kt

@@ -0,0 +1,56 @@
+package com.toyou.toyouandroid.presentation.fragment.mypage
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+
+class MypageDialogViewModel : ViewModel() {
+    private val _title = MutableLiveData<String>()
+    val title: LiveData<String> get() = _title
+
+    private val _subTitle = MutableLiveData<String?>()
+    val subTitle: LiveData<String?> get() = _subTitle
+
+    private val _leftButtonText = MutableLiveData<String>()
+    val leftButtonText: LiveData<String> get() = _leftButtonText
+
+    private val _rightButtonText = MutableLiveData<String>()
+    val rightButtonText: LiveData<String> get() = _rightButtonText
+
+    private val _leftButtonTextColor = MutableLiveData<Int>()
+    val leftButtonTextColor: LiveData<Int> get() = _leftButtonTextColor
+
+    private val _rightButtonTextColor = MutableLiveData<Int>()
+    val rightButtonTextColor: LiveData<Int> get() = _rightButtonTextColor
+
+    private val _leftButtonClickAction = MutableLiveData<() -> Unit>()
+    private val _rightButtonClickAction = MutableLiveData<() -> Unit>()
+
+    fun setDialogData(
+        title: String,
+        subTitle: String?,
+        leftButtonText: String,
+        rightButtonText: String,
+        leftButtonTextColor: Int,
+        rightButtonTextColor: Int,
+        leftButtonClickAction: () -> Unit,
+        rightButtonClickAction: () -> Unit
+    ) {
+        _title.value = title
+        _subTitle.value = subTitle
+        _leftButtonText.value = leftButtonText
+        _rightButtonText.value = rightButtonText
+        _leftButtonTextColor.value = leftButtonTextColor
+        _rightButtonTextColor.value = rightButtonTextColor
+        _leftButtonClickAction.value = leftButtonClickAction
+        _rightButtonClickAction.value = rightButtonClickAction
+    }
+
+    fun onLeftButtonClick() {
+        _leftButtonClickAction.value?.invoke()
+    }
+
+    fun onRightButtonClick() {
+        _rightButtonClickAction.value?.invoke()
+    }
+}

app/src/main/java/com/toyou/toyouandroid/presentation/fragment/mypage/MypageFragment.kt

@@ -1,6 +1,7 @@
 package com.toyou.toyouandroid.presentation.fragment.mypage
 
 import android.content.ContentValues.TAG
+import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -28,7 +29,9 @@ class MypageFragment : Fragment() {
     private val nicknameViewModel: SignupNicknameViewModel by activityViewModels()
     private val homeViewModel: HomeViewModel by activityViewModels()
     private val viewModel: MypageViewModel by viewModels()
+    private val mypageDialogViewModel: MypageDialogViewModel by activityViewModels()
     private lateinit var viewModelManager: ViewModelManager
+    private var mypageDialog: MypageDialog? = null
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -37,6 +40,7 @@ class MypageFragment : Fragment() {
     ): View {
 
         _binding = FragmentMypageBinding.inflate(inflater, container, false)
+
         binding.viewModel = viewModel
         binding.lifecycleOwner = this
 
@@ -68,41 +72,66 @@ class MypageFragment : Fragment() {
             navController.navigate(R.id.action_navigation_mypage_to_terms_of_use_fragment)
         }
 
-        binding.mypageVersion.setOnClickListener {
-            navController.navigate(R.id.action_navigation_mypage_to_version_fragment)
-        }
-
-        binding.mypageLogoutBtn.setOnClickListener {
-            UserApiClient.instance.logout { error ->
-                if (error != null) {
-                    Timber.tag(TAG).e(error, "로그아웃 실패. SDK에서 토큰 삭제됨")
-                }
-                else {
-                    Timber.tag(TAG).i("로그아웃 성공. SDK에서 토큰 삭제됨")
-                }
-            }
-            viewModelManager.resetAllViewModels()
-//            resetApp()
-            navController.navigate(R.id.action_navigation_mypage_to_login_fragment)
+        // ViewModel에서 닉네임을 가져와서 TextView에 설정
+        nicknameViewModel.nickname.observe(viewLifecycleOwner) { nickname ->
+            binding.profileNickname.text = nickname
         }
 
         binding.mypageSignoutBtn.setOnClickListener {
-            activity?.finishAffinity()
+            mypageDialogViewModel.setDialogData(
+                title = "정말 탈퇴하시겠어요?",
+                subTitle = "탈퇴 시, 모든 정보가 사라집니다",
+                leftButtonText = "탈퇴하기",
+                rightButtonText = "취소",
+                leftButtonTextColor = Color.RED,
+                rightButtonTextColor = R.color.black,
+                leftButtonClickAction = { handleSignout() },
+                rightButtonClickAction = { dismissDialog() }
+            )
+            mypageDialog = MypageDialog()
+            mypageDialog?.show(parentFragmentManager, "CustomDialog")
         }
 
-        // ViewModel에서 닉네임을 가져와서 TextView에 설정
-        nicknameViewModel.nickname.observe(viewLifecycleOwner) { nickname ->
-            binding.profileNickname.text = nickname
+        binding.mypageLogoutBtn.setOnClickListener {
+            mypageDialogViewModel.setDialogData(
+                title = "정말 로그아웃하시겠어요?",
+                subTitle = "",
+                leftButtonText = "취소",
+                rightButtonText = "로그아웃",
+                leftButtonTextColor = R.color.black,
+                rightButtonTextColor = Color.RED,
+                leftButtonClickAction = { dismissDialog() },
+                rightButtonClickAction = { handleLogout() }
+            )
+            mypageDialog = MypageDialog()
+            mypageDialog?.show(parentFragmentManager, "CustomDialog")
         }
+    }
 
-        homeViewModel.mypageEmotionStamp.observe(viewLifecycleOwner) { emotion ->
-            binding.mypageEmotionStamp.setImageResource(emotion)
+    private fun handleSignout() {
+        Timber.tag("handleSignout").d("handleSignout")
+        activity?.finishAffinity()
+    }
+
+    private fun handleLogout() {
+        Timber.tag("handleLogout").d("handleWithdraw")
+
+        UserApiClient.instance.logout { error ->
+            if (error != null) {
+                Timber.tag(TAG).e(error, "로그아웃 실패. SDK에서 토큰 삭제됨")
+            }
+            else {
+                Timber.tag(TAG).i("로그아웃 성공. SDK에서 토큰 삭제됨")
+            }
         }
+        viewModelManager.resetAllViewModels()
+        navController.navigate(R.id.action_navigation_mypage_to_login_fragment)
+        mypageDialog?.dismiss()
     }
 
-    private fun resetApp() {
-        val navGraph = navController.navInflater.inflate(R.navigation.nav_graph)
-        navController.graph = navGraph
+    private fun dismissDialog() {
+        Timber.tag("dismissDialog").d("dismissDialog")
+        mypageDialog?.dismiss()
     }
 
     override fun onDestroyView() {

app/src/main/java/com/toyou/toyouandroid/presentation/fragment/mypage/MypageViewModel.kt

@@ -1,13 +1,6 @@
 package com.toyou.toyouandroid.presentation.fragment.mypage
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 
 class MypageViewModel : ViewModel() {
-
-    private val _text = MutableLiveData<String>().apply {
-        value = "This is mypage Fragment"
-    }
-    val text: LiveData<String> = _text
 }