154 add safe args

app/build.gradle.kts

@@ -3,6 +3,8 @@ plugins {
     alias(libs.plugins.jetbrainsKotlinAndroid)
     alias(libs.plugins.serialization)
     alias(libs.plugins.ksp)
+    alias(libs.plugins.navigationSafeArgs)
+    alias(libs.plugins.kotlinParcelize)
 }
 
 android {

app/src/main/java/com/davay/android/base/BaseBottomSheetFragment.kt

@@ -70,7 +70,7 @@ abstract class BaseBottomSheetFragment<VB : ViewBinding, VM : BaseViewModel>(
         when (navCommand) {
             is NavigationCommand.ToDirection -> findNavController().navigate(
                 navCommand.directions,
-                navCommand.bundle
+                navCommand.navOptions
             )
 
             is NavigationCommand.Back -> findNavController().navigateUp()

app/src/main/java/com/davay/android/base/BaseFragment.kt

@@ -76,7 +76,6 @@ abstract class BaseFragment<VB : ViewBinding, VM : BaseViewModel>(
         when (navCommand) {
             is NavigationCommand.ToDirection -> findNavController().navigate(
                 navCommand.directions,
-                navCommand.bundle,
                 navCommand.navOptions
             )
 

app/src/main/java/com/davay/android/base/BaseViewModel.kt

@@ -1,12 +1,11 @@
 package com.davay.android.base
 
-import android.os.Bundle
 import android.util.Log
-import androidx.annotation.IdRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.navigation.NavDirections
 import androidx.navigation.NavOptions
 import com.davai.util.debounceUnitFun
 import com.davay.android.BuildConfig
@@ -28,26 +27,14 @@ abstract class BaseViewModel : ViewModel() {
         coroutineScope = viewModelScope
     )
 
-    fun navigate(@IdRes navDirections: Int) {
+    fun navigate(navDirections: NavDirections) {
         debounceNavigate(NavigationCommand.ToDirection(navDirections)) { command ->
             _navigation.value = Event(command)
         }
     }
 
-    fun navigate(@IdRes navDirections: Int, bundle: Bundle) {
-        debounceNavigate(NavigationCommand.ToDirection(navDirections, bundle)) { command ->
-            _navigation.value = Event(command)
-        }
-    }
-
-    fun navigate(@IdRes navDirections: Int, navOptions: NavOptions) {
-        debounceNavigate(NavigationCommand.ToDirection(navDirections, null, navOptions)) { command ->
-            _navigation.value = Event(command)
-        }
-    }
-
-    fun navigate(@IdRes navDirections: Int, bundle: Bundle, navOptions: NavOptions) {
-        debounceNavigate(NavigationCommand.ToDirection(navDirections, bundle, navOptions)) { command ->
+    fun navigate(navDirections: NavDirections, navOptions: NavOptions) {
+        debounceNavigate(NavigationCommand.ToDirection(navDirections, navOptions)) { command ->
             _navigation.value = Event(command)
         }
     }
@@ -61,17 +48,22 @@ abstract class BaseViewModel : ViewModel() {
     /**
      * Метод чистит backstack до MainFragment и делает сооветствующий переход
      */
-    fun clearBackStackToMain() {
+
+    fun clearBackStackToMain(navDirections: NavDirections) {
         val navOptions = NavOptions.Builder()
-            .setPopUpTo(R.id.main_navigation_graph, inclusive = true)
+            .setPopUpTo(R.id.mainFragment, inclusive = false)
             .build()
 
-        navigate(R.id.mainFragment, navOptions)
+        _navigation.value = Event(
+            NavigationCommand.ToDirection(
+                navDirections,
+                navOptions
+            )
+        )
     }
 
-    fun clearBackStackToMainAndNavigate(@IdRes navDirections: Int) {
-        clearBackStackToMain()
-        navigate(navDirections)
+    fun clearBackStackToMainAndNavigate(navDirections: NavDirections) {
+        clearBackStackToMain(navDirections)
     }
 
     protected fun mapErrorToUiState(errorType: ErrorType): ErrorScreenState {

app/src/main/java/com/davay/android/base/NavigationCommand.kt

@@ -1,13 +1,11 @@
 package com.davay.android.base
 
-import android.os.Bundle
-import androidx.annotation.IdRes
+import androidx.navigation.NavDirections
 import androidx.navigation.NavOptions
 
 sealed class NavigationCommand {
     class ToDirection(
-        @IdRes val directions: Int,
-        val bundle: Bundle? = null,
+        val directions: NavDirections,
         val navOptions: NavOptions? = null
     ) : NavigationCommand()
 

app/src/main/java/com/davay/android/core/data/impl/SessionsHistoryRepositoryImpl.kt

@@ -34,25 +34,25 @@ class SessionsHistoryRepositoryImpl @Inject constructor(
             Result.Error(ErrorType.UNKNOWN_ERROR)
         }
 
-    override suspend fun getSessionWithMovies(sessionId: String): SessionWithMovies? =
+    override suspend fun getSessionWithMovies(session: Session): SessionWithMovies? =
         @Suppress("TooGenericExceptionCaught", "PrintStackTrace")
         try {
-            historyDao.getSessionWithMovies(sessionId).toDomain()
+            historyDao.getSessionWithMovies(session.id).toDomain()
         } catch (e: Exception) {
             if (BuildConfig.DEBUG) {
                 e.printStackTrace()
             }
             null
         }
 
-    override suspend fun getSessionsHistory(): List<Session>? =
+    override suspend fun getSessionsHistory(): List<Session> =
         @Suppress("TooGenericExceptionCaught", "PrintStackTrace")
         try {
             historyDao.getSessions().map { it.toDomain() }
         } catch (e: Exception) {
             if (BuildConfig.DEBUG) {
                 e.printStackTrace()
             }
-            null
+            emptyList()
         }
 }

app/src/main/java/com/davay/android/core/domain/api/SessionsHistoryRepository.kt

@@ -12,6 +12,6 @@ interface SessionsHistoryRepository {
         movies: List<MovieDetails>
     ): Result<Unit, ErrorType>
 
-    suspend fun getSessionsHistory(): List<Session>?
-    suspend fun getSessionWithMovies(sessionId: String): SessionWithMovies?
+    suspend fun getSessionsHistory(): List<Session>
+    suspend fun getSessionWithMovies(session: Session): SessionWithMovies?
 }

app/src/main/java/com/davay/android/core/domain/models/MovieDetails.kt

@@ -1,8 +1,9 @@
 package com.davay.android.core.domain.models
 
-import kotlinx.serialization.Serializable
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
-@Serializable
+@Parcelize
 data class MovieDetails(
     val id: Int,
     val name: String,
@@ -19,4 +20,4 @@ data class MovieDetails(
     val genres: List<String>,
     val directors: List<String>?,
     val actors: List<String>?
-)
+) : Parcelable

app/src/main/java/com/davay/android/core/domain/models/Session.kt

@@ -1,11 +1,11 @@
 package com.davay.android.core.domain.models
 
+import android.os.Parcelable
 import com.davay.android.extensions.timeStamp
-import kotlinx.serialization.Serializable
+import kotlinx.parcelize.Parcelize
 
 typealias userName = String
-
-@Serializable
+@Parcelize
 data class Session(
     val id: String,
     val users: List<userName>,
@@ -14,4 +14,4 @@ data class Session(
     val date: timeStamp,
     val status: SessionStatus,
     val imgUrl: String
-)
+) : Parcelable

app/src/main/java/com/davay/android/core/domain/models/SessionShort.kt

@@ -1,12 +1,13 @@
 package com.davay.android.core.domain.models
 
+import android.os.Parcelable
 import com.davay.android.extensions.timeStamp
-import kotlinx.serialization.Serializable
+import kotlinx.parcelize.Parcelize
 
-@Serializable
+@Parcelize
 data class SessionShort(
     val id: String,
     val users: List<userName>,
     val date: timeStamp,
     val imgUrl: String
-)
+) : Parcelable

app/src/main/java/com/davay/android/feature/changename/presentation/ChangeNameBottomSheetFragment.kt

@@ -155,14 +155,7 @@ class ChangeNameBottomSheetFragment :
         private const val BOTTOM_SHEET_HIDE_PERCENT_60 = 0.6f
         private const val BOTTOM_SHEET_HEIGHT = 0.9f
 
-        private const val ARG_NAME = "name"
         const val REQUEST_KEY = "changeNameRequestKey"
         const val BUNDLE_KEY_NAME = "changedName"
-
-        fun newInstance(name: String) = ChangeNameBottomSheetFragment().apply {
-            arguments = Bundle().apply {
-                putString(ARG_NAME, name)
-            }
-        }
     }
 }

app/src/main/java/com/davay/android/feature/coincidences/presentation/CoincidencesFragment.kt

@@ -23,12 +23,8 @@ import com.davay.android.di.ScreenComponent
 import com.davay.android.feature.coincidences.bottomsheetdialog.RouletteBottomSheetDialogFragment
 import com.davay.android.feature.coincidences.di.DaggerCoincidencesFragmentComponent
 import com.davay.android.feature.coincidences.presentation.adapter.MoviesGridAdapter
-import com.davay.android.feature.moviecard.presentation.MovieCardFragment
-import com.davay.android.feature.roulette.presentation.RouletteFragment.Companion.ROULETTE_INITIATOR
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
 
 class CoincidencesFragment : BaseFragment<FragmentCoincidencesBinding, CoincidencesViewModel>(
     FragmentCoincidencesBinding::inflate
@@ -37,11 +33,9 @@ class CoincidencesFragment : BaseFragment<FragmentCoincidencesBinding, Coinciden
     override val viewModel: CoincidencesViewModel by injectViewModel<CoincidencesViewModel>()
 
     private val moviesGridAdapter = MoviesGridAdapter(lifecycleScope) { movieDetails ->
-        val movie = Json.encodeToString(movieDetails)
-        val bundle = Bundle().apply {
-            putString(MovieCardFragment.MOVIE_DETAILS_KEY, movie)
-        }
-        viewModel.navigate(R.id.action_coincidencesFragment_to_movieCardFragment, bundle)
+        val action = CoincidencesFragmentDirections
+            .actionCoincidencesFragmentToMovieCardFragment(movieDetails)
+        viewModel.navigate(action)
     }
 
     private val bottomSheetFragmentLifecycleCallbacks =
@@ -128,10 +122,9 @@ class CoincidencesFragment : BaseFragment<FragmentCoincidencesBinding, Coinciden
             setEndIconClickListener {
                 val coincidences = viewModel.getCoincidencesCount()
                 if (coincidences >= MIN_COINCIDENCES_FOR_NAVIGATION_3) {
-                    val bundle = Bundle().apply {
-                        putBoolean(ROULETTE_INITIATOR, true)
-                    }
-                    viewModel.navigate(R.id.action_coincidencesFragment_to_rouletteFragment, bundle)
+                    val action = CoincidencesFragmentDirections
+                        .actionCoincidencesFragmentToRouletteFragment(true)
+                    viewModel.navigate(action)
                 } else {
                     val activity = requireActivity() as MainActivity
                     activity.updateBanner(

app/src/main/java/com/davay/android/feature/createsession/presentation/createsession/CreateSessionViewModel.kt

@@ -1,27 +1,14 @@
 package com.davay.android.feature.createsession.presentation.createsession
 
-import android.os.Bundle
-import com.davay.android.R
 import com.davay.android.base.BaseViewModel
 import com.davay.android.core.domain.models.SessionShort
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
 import javax.inject.Inject
 
 open class CreateSessionViewModel @Inject constructor() : BaseViewModel() {
 
     protected fun navigateToWaitSession(session: SessionShort) {
-        val sessionJson = Json.encodeToString(session)
-        val bundle = Bundle().apply {
-            putString(SESSION_DATA, sessionJson)
-        }
-        navigate(
-            R.id.action_createSessionFragment_to_waitSessionFragment,
-            bundle
-        )
-    }
-
-    companion object {
-        const val SESSION_DATA = "session_data"
+        val action = CreateSessionFragmentDirections
+            .actionCreateSessionFragmentToWaitSessionFragment(session)
+        navigate(action)
     }
 }

app/src/main/java/com/davay/android/feature/main/presentation/MainFragment.kt

@@ -63,7 +63,7 @@ class MainFragment :
     override fun subscribe() {
         with(binding) {
             msbFavorite.setOnClickListener {
-                viewModel.navigate(R.id.action_mainFragment_to_matchedSessionListFragment)
+                viewModel.navigate(MainFragmentDirections.actionMainFragmentToMatchedSessionListFragment())
             }
             msbJoinSession.setOnClickListener {
                 joinSession()
@@ -74,8 +74,7 @@ class MainFragment :
             ivEditUserName.setOnDebouncedClickListener(
                 coroutineScope = lifecycleScope
             ) {
-                val currentName = tvUserName.text.toString()
-                changeName(currentName)
+                changeName()
             }
         }
     }
@@ -91,16 +90,16 @@ class MainFragment :
     }
 
     private fun joinSession() {
-        viewModel.navigate(R.id.action_mainFragment_to_sessionConnectionFragment)
+        viewModel.navigate(MainFragmentDirections.actionMainFragmentToSessionConnectionFragment())
     }
 
-    private fun changeName(oldName: String) {
-        val bottomSheetFragment = ChangeNameBottomSheetFragment.newInstance(oldName)
-        bottomSheetFragment.show(parentFragmentManager, "tag")
+    private fun changeName() {
+        val action = MainFragmentDirections.actionMainFragmentToChangeNameFragment()
+        viewModel.navigate(action)
     }
 
     private fun createSession() {
-        viewModel.navigate(R.id.action_mainFragment_to_createSessionFragment)
+        viewModel.navigate(MainFragmentDirections.actionMainFragmentToCreateSessionFragment())
     }
 
     private fun updateUserName(newName: String?) {

app/src/main/java/com/davay/android/feature/match/presentation/MatchBottomSheetArgs.kt

@@ -0,0 +1,13 @@
+package com.davay.android.feature.match.presentation
+
+import android.os.Parcelable
+import com.davay.android.core.domain.models.MovieDetails
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+class MatchBottomSheetArgs(
+    val movieDetails: MovieDetails,
+    val buttonText: String? = null,
+    val showDismisAnimation: Boolean = true,
+    val action: (() -> Unit)? = null
+) : Parcelable