remove unnecessary id from change tag params

Author: Razeeman

feature_categories/src/main/java/com/example/util/simpletimetracker/feature_categories/viewModel/CategoriesViewModel.kt

@@ -8,6 +8,7 @@ import com.example.util.simpletimetracker.core.adapter.ViewHolderType
 import com.example.util.simpletimetracker.core.adapter.loader.LoaderViewData
 import com.example.util.simpletimetracker.core.adapter.category.CategoryViewData
 import com.example.util.simpletimetracker.core.extension.toParams
+import com.example.util.simpletimetracker.core.view.TransitionNames
 import com.example.util.simpletimetracker.domain.model.TagType
 import com.example.util.simpletimetracker.feature_categories.interactor.CategoriesViewDataInteractor
 import com.example.util.simpletimetracker.feature_categories.viewData.CategoryAddViewData
@@ -38,10 +39,15 @@ class CategoriesViewModel @Inject constructor(
             is CategoryViewData.Record -> Screen.CHANGE_RECORD_TAG
         }
         val icon = (item as? CategoryViewData.Record)?.icon?.toParams()
+        val transitionName = when (item) {
+            is CategoryViewData.Activity -> TransitionNames.ACTIVITY_TAG
+            is CategoryViewData.Record -> TransitionNames.RECORD_TAG
+        } + item.id
 
         router.navigate(
             screen = screen,
             data = ChangeCategoryParams.Change(
+                transitionName = transitionName,
                 id = item.id,
                 preview = ChangeCategoryParams.Change.Preview(
                     name = item.name,

feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/view/ChangeCategoryFragment.kt

@@ -25,7 +25,6 @@ import com.example.util.simpletimetracker.core.extension.showKeyboard
 import com.example.util.simpletimetracker.core.extension.visible
 import com.example.util.simpletimetracker.core.utils.BuildVersions
 import com.example.util.simpletimetracker.core.utils.setFlipChooserColor
-import com.example.util.simpletimetracker.core.view.TransitionNames
 import com.example.util.simpletimetracker.feature_change_category.viewModel.ChangeCategoryViewModel
 import com.example.util.simpletimetracker.navigation.params.ChangeCategoryParams
 import com.google.android.flexbox.FlexDirection
@@ -75,10 +74,8 @@ class ChangeCategoryFragment : BaseFragment<Binding>() {
                 .inflateTransition(android.R.transition.move)
         }
 
-        ViewCompat.setTransitionName(
-            previewChangeCategory,
-            TransitionNames.ACTIVITY_TAG + params.id
-        )
+        val transitionName: String = (params as? ChangeCategoryParams.Change)?.transitionName.orEmpty()
+        ViewCompat.setTransitionName(previewChangeCategory, transitionName)
 
         rvChangeCategoryColor.apply {
             layoutManager = FlexboxLayoutManager(requireContext()).apply {

feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/viewModel/ChangeCategoryViewModel.kt

@@ -13,6 +13,7 @@ import com.example.util.simpletimetracker.core.viewData.ColorViewData
 import com.example.util.simpletimetracker.core.viewData.RecordTypeViewData
 import com.example.util.simpletimetracker.domain.extension.flip
 import com.example.util.simpletimetracker.domain.extension.orTrue
+import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.domain.interactor.CategoryInteractor
 import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.interactor.RecordTypeCategoryInteractor
@@ -63,9 +64,10 @@ class ChangeCategoryViewModel @Inject constructor(
     val flipTypesChooser: LiveData<Boolean> = MutableLiveData()
     val deleteButtonEnabled: LiveData<Boolean> = MutableLiveData(true)
     val saveButtonEnabled: LiveData<Boolean> = MutableLiveData(true)
-    val deleteIconVisibility: LiveData<Boolean> by lazy { MutableLiveData(extra.id != 0L) }
-    val keyboardVisibility: LiveData<Boolean> by lazy { MutableLiveData(extra.id == 0L) }
+    val deleteIconVisibility: LiveData<Boolean> by lazy { MutableLiveData(categoryId != 0L) }
+    val keyboardVisibility: LiveData<Boolean> by lazy { MutableLiveData(categoryId == 0L) }
 
+    private val categoryId: Long get() = (extra as? ChangeCategoryParams.Change)?.id.orZero()
     private var initialTypes: List<Long> = emptyList()
     private var newName: String = ""
     private var newColorId: Int = (0..ColorMapper.colorsNumber).random()
@@ -123,8 +125,8 @@ class ChangeCategoryViewModel @Inject constructor(
     fun onDeleteClick() {
         (deleteButtonEnabled as MutableLiveData).value = false
         viewModelScope.launch {
-            if (extra.id != 0L) {
-                categoryInteractor.remove(extra.id)
+            if (categoryId != 0L) {
+                categoryInteractor.remove(categoryId)
                 showMessage(R.string.change_category_removed)
                 (keyboardVisibility as MutableLiveData).value = false
                 router.back()
@@ -140,7 +142,7 @@ class ChangeCategoryViewModel @Inject constructor(
         (saveButtonEnabled as MutableLiveData).value = false
         viewModelScope.launch {
             Category(
-                id = extra.id,
+                id = categoryId,
                 name = newName,
                 color = newColorId
             ).let {
@@ -154,7 +156,7 @@ class ChangeCategoryViewModel @Inject constructor(
 
     private suspend fun saveCategory(): Long {
         val category = Category(
-            id = extra.id,
+            id = categoryId,
             name = newName,
             color = newColorId
         )
@@ -171,7 +173,7 @@ class ChangeCategoryViewModel @Inject constructor(
     }
 
     private suspend fun initializeSelectedTypes() {
-        recordTypeCategoryInteractor.getTypes(extra.id)
+        recordTypeCategoryInteractor.getTypes(categoryId)
             .let {
                 newTypes = it.toMutableList()
                 initialTypes = it
@@ -183,7 +185,7 @@ class ChangeCategoryViewModel @Inject constructor(
     }
 
     private suspend fun loadCategoryViewData(): CategoryViewData {
-        categoryInteractor.get(extra.id)
+        categoryInteractor.get(categoryId)
             ?.let {
                 newName = it.name
                 newColorId = it.color

feature_change_record_tag/src/main/java/com/example/util/simpletimetracker/feature_change_record_tag/view/ChangeRecordTagFragment.kt

@@ -23,7 +23,6 @@ import com.example.util.simpletimetracker.core.extension.toViewData
 import com.example.util.simpletimetracker.core.extension.visible
 import com.example.util.simpletimetracker.core.utils.BuildVersions
 import com.example.util.simpletimetracker.core.utils.setFlipChooserColor
-import com.example.util.simpletimetracker.core.view.TransitionNames
 import com.example.util.simpletimetracker.feature_change_record_tag.viewModel.ChangeRecordTagViewModel
 import com.example.util.simpletimetracker.navigation.params.ChangeCategoryParams
 import com.google.android.flexbox.FlexDirection
@@ -67,10 +66,8 @@ class ChangeRecordTagFragment : BaseFragment<Binding>() {
                 .inflateTransition(android.R.transition.move)
         }
 
-        ViewCompat.setTransitionName(
-            previewChangeRecordTag,
-            TransitionNames.RECORD_TAG + params.id
-        )
+        val transitionName: String = (params as? ChangeCategoryParams.Change)?.transitionName.orEmpty()
+        ViewCompat.setTransitionName(previewChangeRecordTag, transitionName)
 
         rvChangeRecordTagType.apply {
             layoutManager = FlexboxLayoutManager(requireContext()).apply {

feature_change_record_tag/src/main/java/com/example/util/simpletimetracker/feature_change_record_tag/viewModel/ChangeRecordTagViewModel.kt

@@ -13,6 +13,7 @@ import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.core.viewData.RecordTypeViewData
 import com.example.util.simpletimetracker.domain.extension.flip
 import com.example.util.simpletimetracker.domain.extension.orTrue
+import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.interactor.RecordTagInteractor
 import com.example.util.simpletimetracker.domain.interactor.RecordTypeInteractor
@@ -58,10 +59,11 @@ class ChangeRecordTagViewModel @Inject constructor(
     val flipTypesChooser: LiveData<Boolean> = MutableLiveData()
     val deleteButtonEnabled: LiveData<Boolean> = MutableLiveData(true)
     val saveButtonEnabled: LiveData<Boolean> = MutableLiveData(true)
-    val deleteIconVisibility: LiveData<Boolean> by lazy { MutableLiveData(extra.id != 0L) }
-    val keyboardVisibility: LiveData<Boolean> by lazy { MutableLiveData(extra.id == 0L) }
-    val typesChooserVisibility: LiveData<Boolean> by lazy { MutableLiveData(extra.id == 0L) }
+    val deleteIconVisibility: LiveData<Boolean> by lazy { MutableLiveData(recordTagId != 0L) }
+    val keyboardVisibility: LiveData<Boolean> by lazy { MutableLiveData(recordTagId == 0L) }
+    val typesChooserVisibility: LiveData<Boolean> by lazy { MutableLiveData(recordTagId == 0L) }
 
+    private val recordTagId: Long get() = (extra as? ChangeCategoryParams.Change)?.id.orZero()
     private var newName: String = ""
     private var newTypeId: Long = 0L
 
@@ -92,8 +94,8 @@ class ChangeRecordTagViewModel @Inject constructor(
     fun onDeleteClick() {
         (deleteButtonEnabled as MutableLiveData).value = false
         viewModelScope.launch {
-            if (extra.id != 0L) {
-                recordTagInteractor.archive(extra.id)
+            if (recordTagId != 0L) {
+                recordTagInteractor.archive(recordTagId)
                 showMessage(R.string.change_category_archived)
                 (keyboardVisibility as MutableLiveData).value = false
                 router.back()
@@ -114,20 +116,20 @@ class ChangeRecordTagViewModel @Inject constructor(
         viewModelScope.launch {
             // Zero id creates new record
             RecordTag(
-                id = extra.id,
+                id = recordTagId,
                 typeId = newTypeId,
                 name = newName
             ).let {
                 recordTagInteractor.add(it)
-                notificationTypeInteractor.checkAndShow(extra.id)
+                notificationTypeInteractor.checkAndShow(recordTagId)
                 (keyboardVisibility as MutableLiveData).value = false
                 router.back()
             }
         }
     }
 
     private suspend fun initializePreviewViewData() {
-        recordTagInteractor.get(extra.id)?.let {
+        recordTagInteractor.get(recordTagId)?.let {
             newTypeId = it.typeId
             newName = it.name
         }

navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/ChangeCategoryParams.kt

@@ -5,11 +5,10 @@ import androidx.annotation.ColorInt
 import kotlinx.parcelize.Parcelize
 
 sealed class ChangeCategoryParams : Parcelable {
-    abstract val id: Long
-
     @Parcelize
     data class Change(
-        override val id: Long,
+        val transitionName: String,
+        val id: Long,
         val preview: Preview? = null
     ) : ChangeCategoryParams() {
 
@@ -22,7 +21,5 @@ sealed class ChangeCategoryParams : Parcelable {
     }
 
     @Parcelize
-    object New : ChangeCategoryParams() {
-        override val id: Long get() = 0 // TODO remove
-    }
+    object New : ChangeCategoryParams()
 }

navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/ChangeRecordTypeParams.kt

@@ -27,7 +27,7 @@ sealed class ChangeRecordTypeParams : Parcelable {
     data class New(
         override val sizePreview: SizePreview
     ) : ChangeRecordTypeParams() {
-        override val id: Long get() = 0
+        override val id: Long get() = 0 // TODO remove
     }
 
     @Parcelize