Navigation Safe Args Migration

core/ui/src/main/java/com/jslee/core/ui/Const.kt

@@ -6,6 +6,4 @@ package com.jslee.core.ui
  * @created 2023/11/06
  */
 
-const val UNKNOWN_FIELD = "확인불가"
-
-const val MOVIE_ID_KEY = "movieId"
+const val UNKNOWN_FIELD = "확인불가"

presentation/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.kapt)
     alias(libs.plugins.hilt.plugin)
+    id("androidx.navigation.safeargs.kotlin")
     id("kotlin-parcelize")
 }
 

presentation/src/main/java/com/jslee/presentation/feature/bookmark/BookmarkFragment.kt

@@ -1,14 +1,13 @@
 package com.jslee.presentation.feature.bookmark
 
-import androidx.core.os.bundleOf
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
-import com.jslee.core.ui.MOVIE_ID_KEY
 import com.jslee.core.ui.base.view.BaseFragment
 import com.jslee.presentation.R
 import com.jslee.presentation.databinding.FragmentBookmarkBinding
 import com.jslee.presentation.feature.bookmark.FilterBottomSheetFragment.Companion.FILTER_BOTTOM_SHEET_TAG
 import com.jslee.presentation.feature.bookmark.adapter.BookmarkAdapter
+import com.jslee.presentation.feature.detail.MovieDetailFragmentDirections
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
 import javax.inject.Inject
@@ -29,8 +28,8 @@ class BookmarkFragment : BaseFragment<FragmentBookmarkBinding>(R.layout.fragment
     private val bookmarkAdapter by lazy {
         BookmarkAdapter(
             onBookmarkClick = { movieId ->
-                val args = bundleOf(Pair(MOVIE_ID_KEY, movieId))
-                findNavController().navigate(R.id.action_to_movie_detail, args)
+                val action = MovieDetailFragmentDirections.actionToMovieDetail(movieId)
+                findNavController().navigate(action)
             },
             onNavigateHome = {
                 findNavController().popBackStack()

presentation/src/main/java/com/jslee/presentation/feature/boxoffice/BoxOfficeFragment.kt

@@ -1,6 +1,5 @@
 package com.jslee.presentation.feature.boxoffice
 
-import androidx.core.os.bundleOf
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
@@ -9,7 +8,6 @@ import androidx.navigation.fragment.findNavController
 import com.google.android.material.datepicker.CalendarConstraints
 import com.google.android.material.datepicker.DateValidatorPointBackward
 import com.google.android.material.datepicker.MaterialDatePicker
-import com.jslee.core.ui.MOVIE_ID_KEY
 import com.jslee.core.ui.base.view.BaseFragment
 import com.jslee.core.ui.extension.toDisplayedDateWithDay
 import com.jslee.core.ui.extension.toDisplayedPreviousDateWithDay
@@ -18,6 +16,7 @@ import com.jslee.core.ui.extension.toShortenDate
 import com.jslee.presentation.R
 import com.jslee.presentation.databinding.FragmentBoxOfficeBinding
 import com.jslee.presentation.feature.boxoffice.adapter.BoxOfficeAdapter
+import com.jslee.presentation.feature.detail.MovieDetailFragmentDirections
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
@@ -44,8 +43,8 @@ class BoxOfficeFragment : BaseFragment<FragmentBoxOfficeBinding>(R.layout.fragme
     }
 
     private fun navigateToMovieDetail(movieId: Long) {
-        val argument = bundleOf(Pair(MOVIE_ID_KEY, movieId))
-        findNavController().navigate(R.id.action_to_movie_detail, argument)
+        val action = MovieDetailFragmentDirections.actionToMovieDetail(movieId)
+        findNavController().navigate(action)
     }
 
     override fun initViews() {

presentation/src/main/java/com/jslee/presentation/feature/detail/MovieDetailFragment.kt

@@ -3,6 +3,7 @@ package com.jslee.presentation.feature.detail
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
 import com.jslee.core.external.ExternalLauncher
 import com.jslee.core.ui.base.view.BaseFragment
 import com.jslee.core.ui.decoration.DividerViewItemDecoration
@@ -32,7 +33,7 @@ class MovieDetailFragment :
     lateinit var externalLauncher: ExternalLauncher
 
     private val viewModel: MovieDetailViewModel by viewModels()
-    private val movieId: Long by lazy { arguments?.getLong("movieId") ?: 0L }
+    private val safeArgs: MovieDetailFragmentArgs by navArgs()
     private val movieDetailAdapter by lazy {
         MovieDetailAdapter(
             onTrailerClick = { videoId ->
@@ -49,18 +50,10 @@ class MovieDetailFragment :
     }
 
     override fun initViews() {
-//        runCatching {
-//            requireArguments().getLong("movieId")
-//        }.onSuccess {
-//            viewModel.getMovieDetails(it)
-//        }.getOrElse {
-//            requireActivity().showToast("Error !!")
-//        }
-        viewModel.getMovieDetails(movieId)
+        viewModel.getMovieDetails(safeArgs.movieId)
         initRecyclerView()
         initClickListener()
         setActionBarCollapsedListener()
-
     }
 
     private fun initRecyclerView() = with(binding.rvMovieDetail) {
@@ -79,7 +72,7 @@ class MovieDetailFragment :
         }
 
         binding.ivHeart.setOnClickListener {
-            viewModel.toggleBookmark(movieId)
+            viewModel.toggleBookmark(safeArgs.movieId)
         }
     }
 

presentation/src/main/java/com/jslee/presentation/feature/home/HomeFragment.kt

@@ -1,16 +1,15 @@
 package com.jslee.presentation.feature.home
 
-import androidx.core.os.bundleOf
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.navigation.fragment.findNavController
 import com.jslee.core.designsystem.tooltip.builder.TooltipBuilder
-import com.jslee.core.ui.MOVIE_ID_KEY
 import com.jslee.core.ui.base.view.BaseFragment
 import com.jslee.core.ui.decoration.DividerViewItemDecoration
 import com.jslee.core.ui.model.PaddingValues
 import com.jslee.presentation.R
 import com.jslee.presentation.databinding.FragmentHomeBinding
+import com.jslee.presentation.feature.detail.MovieDetailFragmentDirections
 import com.jslee.presentation.feature.home.adapter.HomeAdapter
 import com.jslee.presentation.feature.home.model.BannerUiModel
 import com.jslee.presentation.feature.home.model.NowPlayingUiModel
@@ -107,16 +106,9 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home) {
         6 -> findNavController().navigate(R.id.action_home_to_upComing)
         else -> Unit
     }
-
-
-    /**
-     * Android Studio Giraffe에서 발생중인 이슈
-     * - navArgs 사용 시 argument name에서 에러 발생
-     * - https://issuetracker.google.com/issues/293665984
-     * - 해결 시 navArgs로 전환
-     */
+
     private fun navigateToMovieDetail(movieId: Long) {
-        val bundle = bundleOf(MOVIE_ID_KEY to movieId)
-        findNavController().navigate(R.id.action_to_movie_detail, bundle)
+        val action = MovieDetailFragmentDirections.actionToMovieDetail(movieId)
+        findNavController().navigate(action)
     }
 }

presentation/src/main/java/com/jslee/presentation/feature/now/NowPlayingFragment.kt

@@ -1,16 +1,15 @@
 package com.jslee.presentation.feature.now
 
-import androidx.core.os.bundleOf
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.navigation.fragment.findNavController
-import com.jslee.core.ui.MOVIE_ID_KEY
 import com.jslee.core.ui.base.view.BaseFragment
 import com.jslee.core.ui.decoration.CommonItemDecoration
 import com.jslee.core.ui.decoration.LayoutType
 import com.jslee.core.ui.model.PaddingValues
 import com.jslee.presentation.R
 import com.jslee.presentation.databinding.FragmentNowPlayingBinding
+import com.jslee.presentation.feature.detail.MovieDetailFragmentDirections
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
@@ -28,8 +27,8 @@ class NowPlayingFragment :
     private val nowPlayingAdapter: NowPlayingPagingAdapter by lazy {
         NowPlayingPagingAdapter(
             onPosterClick = {
-                val arguments = bundleOf(Pair(MOVIE_ID_KEY, it.movieId))
-                findNavController().navigate(R.id.action_to_movie_detail, arguments)
+                val action = MovieDetailFragmentDirections.actionToMovieDetail(it.movieId)
+                findNavController().navigate(action)
             }
         )
     }

presentation/src/main/java/com/jslee/presentation/feature/search/SearchFragment.kt

@@ -1,17 +1,16 @@
 package com.jslee.presentation.feature.search
 
-import androidx.core.os.bundleOf
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
-import com.jslee.core.ui.MOVIE_ID_KEY
 import com.jslee.core.ui.base.view.BaseFragment
 import com.jslee.core.ui.extension.showToast
 import com.jslee.presentation.R
 import com.jslee.presentation.databinding.FragmentSearchBinding
+import com.jslee.presentation.feature.detail.MovieDetailFragmentDirections
 import com.jslee.presentation.feature.search.adapter.SearchAdapter
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
@@ -36,8 +35,8 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(R.layout.fragment_sea
     }
 
     private fun navigateToDetail(movieId: Long) {
-        val argument = bundleOf(Pair(MOVIE_ID_KEY, movieId))
-        findNavController().navigate(R.id.action_to_movie_detail, argument)
+        val action = MovieDetailFragmentDirections.actionToMovieDetail(movieId)
+        findNavController().navigate(action)
     }
 
     override fun initViews() {

presentation/src/main/java/com/jslee/presentation/feature/upcoming/UpComingFragment.kt

@@ -1,15 +1,14 @@
 package com.jslee.presentation.feature.upcoming
 
-import androidx.core.os.bundleOf
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
-import com.jslee.core.ui.MOVIE_ID_KEY
 import com.jslee.core.ui.base.view.BaseFragment
 import com.jslee.core.ui.decoration.CommonItemDecoration
 import com.jslee.core.ui.decoration.LayoutType
 import com.jslee.core.ui.model.PaddingValues
 import com.jslee.presentation.R
 import com.jslee.presentation.databinding.FragmentUpComingBinding
+import com.jslee.presentation.feature.detail.MovieDetailFragmentDirections
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
@@ -26,8 +25,8 @@ class UpComingFragment : BaseFragment<FragmentUpComingBinding>(R.layout.fragment
     private val upComingPagingAdapter: UpComingPagingAdapter by lazy {
         UpComingPagingAdapter(
             onPosterClick = {
-                val argument = bundleOf(Pair(MOVIE_ID_KEY, it.movieId))
-                findNavController().navigate(R.id.action_to_movie_detail, argument)
+                val action = MovieDetailFragmentDirections.actionToMovieDetail(it.movieId)
+                findNavController().navigate(action)
             }
         )
     }

presentation/src/main/res/navigation/navigation_bottom_bar.xml

@@ -13,7 +13,11 @@
         android:id="@+id/movieDetailFragment"
         android:name="com.jslee.presentation.feature.detail.MovieDetailFragment"
         android:label="MovieDetailFragment"
-        tools:layout="@layout/fragment_movie_detail" />
+        tools:layout="@layout/fragment_movie_detail">
+
+        <argument android:name="movieId"
+            app:argType="long" />
+    </fragment>
 
     <action
         android:id="@+id/action_to_movie_detail"