[CHORE] : 함수화 수정#54

Author: lsakee

Diff for: presentation/src/main/java/com/velogm/presentation/ui/addtag/AddTagFragment.kt

@@ -20,7 +20,6 @@ import com.velogm.presentation.ui.addtag.dialog.DeleteDialogFragment
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
 
 @AndroidEntryPoint
 class AddTagFragment : BindingFragment<FragmentAddTagBinding>(R.layout.fragment_add_tag) {
@@ -31,24 +30,11 @@ class AddTagFragment : BindingFragment<FragmentAddTagBinding>(R.layout.fragment_
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setNavigation()
+        setAdapter()
         collectMyTagListData()
         collectPopularTagListData()
         addTag()
         collectEventData()
-        myTagAdapter = AddTagAdapter(deleteTagClick = {
-            Timber.tag("deleteTag").d(it.tag)
-            val dialog = DeleteDialogFragment(
-                deleteTag = {
-                    viewModel.deleteTag(it.tag)
-                }
-            )
-            dialog.show(childFragmentManager, "delete")
-        })
-        binding.rvAddTagList.adapter = myTagAdapter
-        popularTagAdapter = PopularTagAdapter(tagClick = {
-            viewModel.addTag(it.tag)
-        })
-        binding.rvAddTagPopularList.adapter = popularTagAdapter
         //QA임시 코드
         popularTagAdapter.submitList(
             listOf<TagModel>
@@ -72,6 +58,23 @@ class AddTagFragment : BindingFragment<FragmentAddTagBinding>(R.layout.fragment_
         }
     }
 
+    private fun setAdapter() {
+        myTagAdapter = AddTagAdapter(deleteTagClick = {
+            val dialog = DeleteDialogFragment(
+                deleteTag = {
+                    viewModel.deleteTag(it.tag)
+                }
+            )
+            dialog.show(childFragmentManager, "delete")
+        })
+        binding.rvAddTagList.adapter = myTagAdapter
+        popularTagAdapter = PopularTagAdapter(tagClick = {
+            viewModel.addTag(it.tag)
+        })
+        binding.rvAddTagPopularList.adapter = popularTagAdapter
+    }
+
+
     private fun collectMyTagListData() {
         viewModel.tagListData.flowWithLifecycle(lifecycle).onEach {
             when (it) {
@@ -87,9 +90,6 @@ class AddTagFragment : BindingFragment<FragmentAddTagBinding>(R.layout.fragment_
     private fun collectPopularTagListData() {
         viewModel.tagPopularListData.flowWithLifecycle(lifecycle).onEach {
             when (it) {
-                is UiState.Loading -> {
-                }
-
                 is UiState.Success -> {
                     popularTagAdapter.submitList(it.data)
                 }
@@ -120,7 +120,6 @@ class AddTagFragment : BindingFragment<FragmentAddTagBinding>(R.layout.fragment_
                     toast("태그가 추가 되었습니다.")
                     viewModel.getTag()
                 }
-
                 else -> {}
             }
         }.launchIn(lifecycleScope)

Diff for: presentation/src/main/java/com/velogm/presentation/ui/addtag/AddTagViewModel.kt

@@ -56,17 +56,17 @@ class AddTagViewModel @Inject constructor(
         }
     }
 
-    fun deleteTag(tag:String) = viewModelScope.launch {
+    fun deleteTag(tag: String) = viewModelScope.launch {
         deleteTagUseCase(tag).collect {
-            _eventData.value=UiState.Success(true)
+            _eventData.value = UiState.Success(true)
         }
-        _eventData.value=UiState.Loading
+        _eventData.value = UiState.Loading
     }
 
-    fun addTag(tag:String) = viewModelScope.launch {
+    fun addTag(tag: String) = viewModelScope.launch {
         addTagUseCase(tag).collect {
-            _eventData.value=UiState.Success(true)
+            _eventData.value = UiState.Success(true)
         }
-        _eventData.value=UiState.Loading
+        _eventData.value = UiState.Loading
     }
 }

Diff for: presentation/src/main/java/com/velogm/presentation/ui/home/HomeFragment.kt

@@ -28,20 +28,27 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>(R.layout.fragment_home
     private val viewModel by viewModels<HomeViewModel>()
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        viewModel.getTag()
+
+        navigateBack()
+        initAdapter()
+        collectTagListData()
+        moveToAddTag()
+    }
+
+    private fun navigateBack() {
         binding.ivSearchBtn.setOnClickListener {
             findNavController().navigate(
                 R.id.navigation_home_to_home_search, bundleOf(
                 )
             )
         }
-        collectTagListData()
-        moveToAddTag()
+    }
+
+    private fun initAdapter() {
         homeCollectionAdapter = HomeCollectionAdapter(childFragmentManager, lifecycle)
         viewPager = binding.pager
-        viewPager.offscreenPageLimit=6
+        viewPager.offscreenPageLimit = 6
         viewPager.adapter = homeCollectionAdapter
-
     }
 
     override fun onResume() {

Diff for: presentation/src/main/java/com/velogm/presentation/ui/home/HomeViewModel.kt

@@ -21,6 +21,10 @@ class HomeViewModel @Inject constructor(
 
     private val _tagListData = MutableStateFlow<UiState<List<TagModel>>>(UiState.Loading)
     val tagListData: StateFlow<UiState<List<TagModel>>> = _tagListData.asStateFlow()
+
+    init {
+        getTag()
+    }
     fun getTag() = viewModelScope.launch {
         getTagUseCase().collect {
             val tagList = it.toTagModelEntity()

Diff for: presentation/src/main/java/com/velogm/presentation/ui/home/screenhome/ScreenHomeSlidePageFragment.kt

@@ -32,16 +32,7 @@ class ScreenHomeSlidePageFragment :
 
         val data = arguments?.getString("data")
         collectData(data)
-        postAdapter = PostAdapter(bookMarkClick = {
-            val intent = Intent(requireContext(), WebViewActivity::class.java).apply {
-                putExtra("url", it.url)
-                putExtra("followName", it.name)
-                putExtra("subscribed", it.subscribed)
-            }
-            startActivity(intent)
-        })
-        binding.rvPostList.adapter = postAdapter
-
+        initAdapter()
         collectPostListData(data)
     }
 
@@ -53,6 +44,18 @@ class ScreenHomeSlidePageFragment :
         }
     }
 
+    private fun initAdapter() {
+        postAdapter = PostAdapter(bookMarkClick = {
+            val intent = Intent(requireContext(), WebViewActivity::class.java).apply {
+                putExtra("url", it.url)
+                putExtra("followName", it.name)
+                putExtra("subscribed", it.subscribed)
+            }
+            startActivity(intent)
+        })
+        binding.rvPostList.adapter = postAdapter
+    }
+
     private fun collectPostListData(data: String?) {
         viewModel.postListData.flowWithLifecycle(lifecycle).onEach {
             when (it) {