[AN/USER] 안드로이드 네비게이션을 적용한다. (#758)

android/festago/build.gradle.kts

@@ -18,6 +18,8 @@ plugins {
     id("com.google.dagger.hilt.android") version "2.44" apply false
 
     id("org.jetbrains.kotlin.plugin.serialization") version "1.8.10" apply false
+
+    id("androidx.navigation.safeargs") version "2.5.3" apply false
 }
 
 allprojects {

android/festago/data/src/main/java/com/festago/festago/data/repository/FakeArtistRepository.kt

@@ -48,7 +48,7 @@ class FakeArtistRepository @Inject constructor() : ArtistRepository {
                             "예시 페스티벌 1",
                             LocalDate.parse("2024-05-01"),
                             LocalDate.parse("2024-05-03"),
-                            "https://source.unsplash.com/random/300×${300 + index++}",
+                            "https://source.unsplash.com/random/300×${300}",
                             School(
                                 1,
                                 "예시 학교",

android/festago/gradle.properties

@@ -21,4 +21,4 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.defaults.buildfeatures.buildconfig=true
+android.defaults.buildfeatures.buildconfig=true

android/festago/presentation/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
     id("kotlin-kapt")
     id("org.jlleitschuh.gradle.ktlint")
     id("com.google.dagger.hilt.android")
+    id("androidx.navigation.safeargs")
 }
 
 android {
@@ -54,6 +55,12 @@ dependencies {
     implementation(project(":common"))
     implementation(project(":domain"))
 
+    // Feature module Support
+    implementation("androidx.navigation:navigation-dynamic-features-fragment:2.7.7")
+    implementation("androidx.navigation:navigation-ui-ktx:2.7.7")
+
+    // Testing Navigation
+    androidTestImplementation("androidx.navigation:navigation-testing:2.7.7")
     // android
     implementation("androidx.core:core-ktx:1.10.1")
     implementation("androidx.appcompat:appcompat:1.6.1")

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/ArtistDetailEvent.kt

@@ -0,0 +1,7 @@
+package com.festago.festago.presentation.ui.artistdetail
+
+sealed interface ArtistDetailEvent {
+    class ShowArtistDetail(val artistId: Long) : ArtistDetailEvent
+
+    class ShowFestivalDetail(val festivalId: Long) : ArtistDetailEvent
+}

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/ArtistDetailFragment.kt

@@ -7,10 +7,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentTransaction
-import androidx.fragment.app.commit
 import androidx.fragment.app.viewModels
-import com.festago.festago.presentation.R
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
 import com.festago.festago.presentation.databinding.FragmentArtistDetailBinding
 import com.festago.festago.presentation.databinding.ItemMediaBinding
 import com.festago.festago.presentation.ui.artistdetail.adapter.festival.ArtistDetailAdapter
@@ -25,28 +24,24 @@ class ArtistDetailFragment : Fragment() {
 
     private val vm: ArtistDetailViewModel by viewModels()
 
-    private val adapter = ArtistDetailAdapter { artistId ->
-        // TODO: Navigation으로 변경
-        requireActivity().supportFragmentManager.commit {
-            add(R.id.fcvHomeContainer, newInstance(artistId))
-            setTransition(FragmentTransaction.TRANSIT_FRAGMENT_MATCH_ACTIVITY_OPEN)
-            addToBackStack(null)
-        }
-    }
+    private val args: ArtistDetailFragmentArgs by navArgs()
+
+    private val adapter = ArtistDetailAdapter()
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
     ): View {
-        _binding = FragmentArtistDetailBinding.inflate(inflater)
+        if (_binding == null) {
+            _binding = FragmentArtistDetailBinding.inflate(inflater)
+        }
         return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val id = requireArguments().getLong(KEY_ID)
-        initView(id)
+        initView(args.artistId)
         initObserve()
     }
 
@@ -70,6 +65,11 @@ class ArtistDetailFragment : Fragment() {
                 updateUi(it)
             }
         }
+        repeatOnStarted(viewLifecycleOwner) {
+            vm.event.collect {
+                handleEvent(it)
+            }
+        }
     }
 
     private fun updateUi(uiState: ArtistDetailUiState) = when (uiState) {
@@ -95,6 +95,22 @@ class ArtistDetailFragment : Fragment() {
         }
     }
 
+    private fun handleEvent(event: ArtistDetailEvent) = when (event) {
+        is ArtistDetailEvent.ShowArtistDetail -> {
+            findNavController().navigate(
+                ArtistDetailFragmentDirections.actionArtistDetailFragmentSelf(event.artistId),
+            )
+        }
+
+        is ArtistDetailEvent.ShowFestivalDetail -> {
+            findNavController().navigate(
+                ArtistDetailFragmentDirections.actionArtistDetailFragmentToFestivalDetailFragment(
+                    event.festivalId,
+                ),
+            )
+        }
+    }
+
     private fun startBrowser(url: String) {
         val intent = Intent(Intent.ACTION_VIEW)
         intent.data = Uri.parse(url)
@@ -105,16 +121,4 @@ class ArtistDetailFragment : Fragment() {
         _binding = null
         super.onDestroyView()
     }
-
-    companion object {
-        private const val KEY_ID = "ID"
-
-        fun newInstance(
-            id: Long,
-        ) = ArtistDetailFragment().apply {
-            arguments = Bundle().apply {
-                putLong(KEY_ID, id)
-            }
-        }
-    }
 }

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/ArtistDetailViewModel.kt

@@ -8,8 +8,11 @@ import com.festago.festago.presentation.ui.artistdetail.uistate.ArtistDetailUiSt
 import com.festago.festago.presentation.ui.artistdetail.uistate.ArtistUiState
 import com.festago.festago.presentation.ui.artistdetail.uistate.FestivalItemUiState
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -18,11 +21,16 @@ import javax.inject.Inject
 class ArtistDetailViewModel @Inject constructor(
     private val artistRepository: ArtistRepository,
 ) : ViewModel() {
+    private val _event: MutableSharedFlow<ArtistDetailEvent> = MutableSharedFlow()
+    val event: SharedFlow<ArtistDetailEvent> = _event.asSharedFlow()
+
     private val _uiState: MutableStateFlow<ArtistDetailUiState> =
         MutableStateFlow(ArtistDetailUiState.Loading)
     val uiState: StateFlow<ArtistDetailUiState> = _uiState.asStateFlow()
 
-    fun loadArtistDetail(id: Long) {
+    fun loadArtistDetail(id: Long, refresh: Boolean = false) {
+        if (!refresh && _uiState.value is ArtistDetailUiState.Success) return
+
         viewModelScope.launch {
             runCatching {
                 _uiState.value = ArtistDetailUiState.Success(
@@ -43,7 +51,21 @@ class ArtistDetailViewModel @Inject constructor(
             startDate = it.startDate,
             endDate = it.endDate,
             artists = it.artists.map { artist ->
-                ArtistUiState(artist.id, artist.name, artist.imageUrl)
+                ArtistUiState(
+                    id = artist.id,
+                    name = artist.name,
+                    imageUrl = artist.imageUrl,
+                    onArtistDetailClick = { id ->
+                        viewModelScope.launch {
+                            _event.emit(ArtistDetailEvent.ShowArtistDetail(id))
+                        }
+                    },
+                )
+            },
+            onFestivalDetailClick = { id ->
+                viewModelScope.launch {
+                    _event.emit(ArtistDetailEvent.ShowFestivalDetail(id))
+                }
             },
         )
     }

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/adapter/artistlist/ArtistAdapter.kt

@@ -5,11 +5,9 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import com.festago.festago.presentation.ui.artistdetail.uistate.ArtistUiState
 
-class ArtistAdapter(
-    private val onArtistClick: (Long) -> Unit,
-) : ListAdapter<ArtistUiState, ArtistViewHolder>(diffUtil) {
+class ArtistAdapter() : ListAdapter<ArtistUiState, ArtistViewHolder>(diffUtil) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ArtistViewHolder {
-        return ArtistViewHolder.of(parent, onArtistClick)
+        return ArtistViewHolder.of(parent)
     }
 
     override fun onBindViewHolder(holder: ArtistViewHolder, position: Int) {

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/adapter/artistlist/ArtistViewHolder.kt

@@ -6,28 +6,20 @@ import androidx.recyclerview.widget.RecyclerView
 import com.festago.festago.presentation.databinding.ItemArtistDetailArtistBinding
 import com.festago.festago.presentation.ui.artistdetail.uistate.ArtistUiState
 
-class ArtistViewHolder(
-    private val binding: ItemArtistDetailArtistBinding,
-    onArtistClick: (Long) -> Unit,
-) : RecyclerView.ViewHolder(binding.root) {
-    init {
-        binding.root.setOnClickListener {
-            binding.artist?.id?.let(onArtistClick)
-        }
-    }
-
+class ArtistViewHolder(private val binding: ItemArtistDetailArtistBinding) :
+    RecyclerView.ViewHolder(binding.root) {
     fun bind(item: ArtistUiState) {
         binding.artist = item
     }
 
     companion object {
-        fun of(parent: ViewGroup, onArtistClick: (Long) -> Unit): ArtistViewHolder {
+        fun of(parent: ViewGroup): ArtistViewHolder {
             val binding = ItemArtistDetailArtistBinding.inflate(
                 LayoutInflater.from(parent.context),
                 parent,
                 false,
             )
-            return ArtistViewHolder(binding, onArtistClick)
+            return ArtistViewHolder(binding)
         }
     }
 }

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/adapter/festival/ArtistDetailAdapter.kt

@@ -5,11 +5,9 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import com.festago.festago.presentation.ui.artistdetail.uistate.FestivalItemUiState
 
-class ArtistDetailAdapter(
-    private val onArtistClick: (Long) -> Unit,
-) : ListAdapter<FestivalItemUiState, ArtistDetailFestivalViewHolder>(diffUtil) {
+class ArtistDetailAdapter : ListAdapter<FestivalItemUiState, ArtistDetailFestivalViewHolder>(diffUtil) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ArtistDetailFestivalViewHolder {
-        return ArtistDetailFestivalViewHolder.of(parent, onArtistClick)
+        return ArtistDetailFestivalViewHolder.of(parent)
     }
 
     override fun onBindViewHolder(holder: ArtistDetailFestivalViewHolder, position: Int) {

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/adapter/festival/ArtistDetailFestivalViewHolder.kt

@@ -15,11 +15,9 @@ import com.festago.festago.presentation.ui.artistdetail.adapter.artistlist.Artis
 import com.festago.festago.presentation.ui.artistdetail.uistate.FestivalItemUiState
 import java.time.LocalDate
 
-class ArtistDetailFestivalViewHolder(
-    private val binding: ItemArtistDetailFestivalBinding,
-    onArtistClick: (Long) -> Unit,
-) : RecyclerView.ViewHolder(binding.root) {
-    private val artistAdapter = ArtistAdapter(onArtistClick)
+class ArtistDetailFestivalViewHolder(private val binding: ItemArtistDetailFestivalBinding) :
+    RecyclerView.ViewHolder(binding.root) {
+    private val artistAdapter = ArtistAdapter()
 
     init {
         binding.rvFestivalArtists.adapter = artistAdapter
@@ -89,13 +87,13 @@ class ArtistDetailFestivalViewHolder(
     }
 
     companion object {
-        fun of(parent: ViewGroup, onArtistClick: (Long) -> Unit): ArtistDetailFestivalViewHolder {
+        fun of(parent: ViewGroup): ArtistDetailFestivalViewHolder {
             val binding = ItemArtistDetailFestivalBinding.inflate(
                 LayoutInflater.from(parent.context),
                 parent,
                 false,
             )
-            return ArtistDetailFestivalViewHolder(binding, onArtistClick)
+            return ArtistDetailFestivalViewHolder(binding)
         }
     }
 }

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/uistate/ArtistUiState.kt

@@ -4,4 +4,5 @@ data class ArtistUiState(
     val id: Long,
     val name: String,
     val imageUrl: String,
+    val onArtistDetailClick: (Long) -> Unit,
 )

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/uistate/FestivalItemUiState.kt

@@ -9,4 +9,5 @@ data class FestivalItemUiState(
     val endDate: LocalDate,
     val imageUrl: String,
     val artists: List<ArtistUiState>,
+    val onFestivalDetailClick: (Long) -> Unit,
 )

android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/festivaldetail/FestivalDetailFragment.kt

@@ -10,13 +10,12 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentTransaction
-import androidx.fragment.app.commit
 import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
 import com.festago.festago.presentation.R
 import com.festago.festago.presentation.databinding.FragmentFestivalDetailBinding
 import com.festago.festago.presentation.databinding.ItemMediaBinding
-import com.festago.festago.presentation.ui.artistdetail.ArtistDetailFragment
 import com.festago.festago.presentation.ui.festivaldetail.adapter.stage.StageListAdapter
 import com.festago.festago.presentation.ui.festivaldetail.uiState.FestivalDetailUiState
 import com.festago.festago.presentation.util.repeatOnStarted
@@ -25,20 +24,23 @@ import java.time.LocalDate
 
 @AndroidEntryPoint
 class FestivalDetailFragment : Fragment() {
-
     private var _binding: FragmentFestivalDetailBinding? = null
     private val binding get() = _binding!!
 
     private val vm: FestivalDetailViewModel by viewModels()
 
+    private val args: FestivalDetailFragmentArgs by navArgs()
+
     private lateinit var adapter: StageListAdapter
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
     ): View {
-        _binding = FragmentFestivalDetailBinding.inflate(inflater)
+        if (_binding == null) {
+            _binding = FragmentFestivalDetailBinding.inflate(inflater)
+        }
         return binding.root
     }
 
@@ -49,7 +51,7 @@ class FestivalDetailFragment : Fragment() {
     }
 
     private fun initView() {
-        val id = requireArguments().getLong(FESTIVAL_ID)
+        val id = args.festivalId
         adapter = StageListAdapter()
         binding.rvStageList.adapter = adapter
         vm.loadFestivalDetail(id)
@@ -144,11 +146,11 @@ class FestivalDetailFragment : Fragment() {
     private fun handleEvent(event: FestivalDetailEvent) {
         when (event) {
             is FestivalDetailEvent.ShowArtistDetail -> {
-                requireActivity().supportFragmentManager.commit {
-                    add(R.id.fcvHomeContainer, ArtistDetailFragment.newInstance(event.artistId))
-                    setTransition(FragmentTransaction.TRANSIT_FRAGMENT_MATCH_ACTIVITY_OPEN)
-                    addToBackStack(null)
-                }
+                findNavController().navigate(
+                    FestivalDetailFragmentDirections.actionFestivalDetailFragmentToArtistDetailFragment(
+                        event.artistId,
+                    ),
+                )
             }
         }
     }
@@ -157,14 +159,4 @@ class FestivalDetailFragment : Fragment() {
         _binding = null
         super.onDestroyView()
     }
-
-    companion object {
-        private const val FESTIVAL_ID = "FESTIVAL_ID"
-
-        fun newInstance(id: Long) = FestivalDetailFragment().apply {
-            arguments = Bundle().apply {
-                putLong(FESTIVAL_ID, id)
-            }
-        }
-    }
 }