[MOD/#8] 프래그먼트 newInstance() 함수 적용

DO-SOPT-ANDROID · Oct 24, 2023 · 2538239 · 2538239
1 parent fd948a1
commit 2538239
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 15 deletions.
diff --git a/app/src/main/java/org/sopt/dosopttemplate/presentation/BnvActivity.kt b/app/src/main/java/org/sopt/dosopttemplate/presentation/BnvActivity.kt
@@ -31,30 +31,24 @@ class BnvActivity : AppCompatActivity() {
         binding.bnvHome.setOnItemSelectedListener {
             when (it.itemId) {
                 R.id.menu_home -> {
-                    replaceFragment(HomeFragment())
+                    val fragment = HomeFragment.newInstance()
+                    replaceFragment(fragment)
                     true
                 }
 
                 R.id.menu_do_android -> {
-                    replaceFragment(DoAndroidFragment())
+                    val fragment = DoAndroidFragment.newInstance()
+                    replaceFragment(fragment)
                     true
                 }
 
                 R.id.menu_mypage -> {
-                    val fragment = MypageFragment()
-
-                    val getId = intent.getStringExtra("ID")
-                    val getNickname = intent.getStringExtra("Nickname")
-                    val getAge = intent.getStringExtra("Age")
+                    val getId = intent.getStringExtra("ID")!!
+                    val getNickname = intent.getStringExtra("Nickname")!!
+                    val getAge = intent.getStringExtra("Age")!!
 
                     // 자동 로그인이 아닌 경우 프래그먼트로 유저 정보 전달
-                    val bundle = Bundle().apply {
-                        putString("userId", getId)
-                        putString("userNickname", getNickname)
-                        putString("userAge", getAge)
-                    }
-
-                    fragment.arguments = bundle
+                    val fragment = MypageFragment.newInstance(getId, getNickname, getAge)
 
                     replaceFragment(fragment)
                     true

diff --git a/app/src/main/java/org/sopt/dosopttemplate/presentation/DoAndroidFragment.kt b/app/src/main/java/org/sopt/dosopttemplate/presentation/DoAndroidFragment.kt
@@ -8,6 +8,11 @@ import androidx.fragment.app.Fragment
 import org.sopt.dosopttemplate.databinding.FragmentDoAndroidBinding
 
 class DoAndroidFragment : Fragment() {
+    companion object {
+        fun newInstance(): DoAndroidFragment {
+            return DoAndroidFragment()
+        }
+    }
 
     private var _binding: FragmentDoAndroidBinding? = null
     private val binding: FragmentDoAndroidBinding

diff --git a/app/src/main/java/org/sopt/dosopttemplate/presentation/HomeFragment.kt b/app/src/main/java/org/sopt/dosopttemplate/presentation/HomeFragment.kt
@@ -10,6 +10,11 @@ import org.sopt.dosopttemplate.databinding.FragmentHomeBinding
 import org.sopt.dosopttemplate.presentation.adapter.FriendsSealedAdapter
 
 class HomeFragment : Fragment() {
+    companion object {
+        fun newInstance(): HomeFragment {
+            return HomeFragment()
+        }
+    }
 
     private var _binding: FragmentHomeBinding? = null
     private val binding: FragmentHomeBinding
@@ -28,7 +33,7 @@ class HomeFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        var friendsSealedAdapter = FriendsSealedAdapter(requireContext())
+        val friendsSealedAdapter = FriendsSealedAdapter(requireContext())
         binding.rvFriends.adapter = friendsSealedAdapter
         friendsSealedAdapter.addFriendsData(ArrayList(DummyFriendsData.dummyFriendList))
     }

diff --git a/app/src/main/java/org/sopt/dosopttemplate/presentation/MypageFragment.kt b/app/src/main/java/org/sopt/dosopttemplate/presentation/MypageFragment.kt
@@ -12,6 +12,17 @@ import org.sopt.dosopttemplate.di.UserSharedPreferences
 import org.sopt.dosopttemplate.presentation.auth.LoginActivity
 
 class MypageFragment : Fragment() {
+    companion object {
+        fun newInstance(userId: String, userNickname: String, userAge: String): MypageFragment {
+            val fragment = MypageFragment()
+            val args = Bundle()
+            args.putString("userId", userId)
+            args.putString("userNickname", userNickname)
+            args.putString("userAge", userAge)
+            fragment.arguments = args
+            return fragment
+        }
+    }
 
     private var _binding: FragmentMypageBinding? = null
     private val binding: FragmentMypageBinding