Merge remote-tracking branch 'origin/bugfix/settings-navigation' into release/v2.2.1

Author: unam98

app/src/main/AndroidManifest.xml

@@ -159,6 +159,9 @@
         <activity
             android:name=".presentation.mypage.upload.MyUploadActivity"
             android:exported="false" />
+        <activity
+            android:name=".presentation.mypage.setting.MySettingActivity"
+            android:exported="false" />
         <activity
             android:name=".presentation.profile.ProfileActivity"
             android:exported="false" />

app/src/main/java/com/runnect/runnect/presentation/mypage/MyPageFragment.kt

@@ -14,8 +14,6 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.commit
-import androidx.fragment.app.replace
 import com.kakao.sdk.common.util.KakaoCustomTabsClient
 import com.kakao.sdk.talk.TalkApiClient
 import com.runnect.runnect.BuildConfig
@@ -25,7 +23,7 @@ import com.runnect.runnect.presentation.login.LoginActivity
 import com.runnect.runnect.presentation.mypage.editname.MyPageEditNameActivity
 import com.runnect.runnect.presentation.mypage.history.MyHistoryActivity
 import com.runnect.runnect.presentation.mypage.reward.MyRewardActivity
-import com.runnect.runnect.presentation.mypage.setting.MySettingFragment
+import com.runnect.runnect.presentation.mypage.setting.MySettingActivity
 import com.runnect.runnect.presentation.mypage.upload.MyUploadActivity
 import com.runnect.runnect.presentation.ui.theme.RunnectTheme
 import com.runnect.runnect.util.analytics.Analytics
@@ -122,11 +120,11 @@ class MyPageFragment : Fragment() {
     }
 
     private fun moveToSettingFragment() {
-        val bundle = Bundle().apply { putString(ACCOUNT_INFO_TAG, viewModel.currentState.email) }
-        requireActivity().supportFragmentManager.commit {
-            setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_left)
-            replace<MySettingFragment>(R.id.fl_main, args = bundle)
+        val intent = Intent(requireContext(), MySettingActivity::class.java).apply {
+            putExtra(ACCOUNT_INFO_TAG, viewModel.currentState.email)
         }
+        startActivity(intent)
+        requireActivity().overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left)
     }
 
     private fun inquiryKakao() {

app/src/main/java/com/runnect/runnect/presentation/mypage/setting/MySettingActivity.kt

@@ -0,0 +1,29 @@
+package com.runnect.runnect.presentation.mypage.setting
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.commit
+import androidx.fragment.app.replace
+import com.runnect.runnect.R
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class MySettingActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_my_setting)
+
+        if (savedInstanceState == null) {
+            val bundle = Bundle().apply {
+                putString(
+                    MySettingFragment.ACCOUNT_INFO_TAG,
+                    intent.getStringExtra(MySettingFragment.ACCOUNT_INFO_TAG)
+                )
+            }
+            supportFragmentManager.commit {
+                replace<MySettingFragment>(R.id.fl_main, args = bundle)
+            }
+        }
+    }
+}

app/src/main/java/com/runnect/runnect/presentation/mypage/setting/MySettingFragment.kt

@@ -12,7 +12,6 @@ import com.runnect.runnect.BuildConfig
 import com.runnect.runnect.R
 import com.runnect.runnect.binding.BindingFragment
 import com.runnect.runnect.databinding.FragmentMySettingBinding
-import com.runnect.runnect.presentation.mypage.MyPageFragment
 import com.runnect.runnect.presentation.mypage.setting.accountinfo.MySettingAccountInfoFragment
 import com.runnect.runnect.util.extension.showWebBrowser
 
@@ -57,10 +56,8 @@ class MySettingFragment : BindingFragment<FragmentMySettingBinding>(R.layout.fra
     }
 
     private fun navigateToMyPageFragment() {
-        parentFragmentManager.commit {
-            setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_right)
-            replace<MyPageFragment>(R.id.fl_main)
-        }
+        requireActivity().finish()
+        requireActivity().overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right)
     }
 
     private fun moveToMySettingAccountInfo() {

app/src/main/res/layout/activity_my_setting.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fl_main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true" />