change activity for divide action

Author: Razeeman

app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsSplitTest.kt

@@ -4,6 +4,7 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.action.GeneralLocation
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.hasSibling
 import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -200,6 +201,70 @@ class RecordActionsSplitTest : BaseUiTest() {
         checkRecord(fullName, timeStartedPreview, timeEndedPreview, timeRangePreview, comment)
     }
 
+    @Test
+    fun recordSplitChangeActivityBefore() {
+        val firstName = "First"
+        val secondName = "Second"
+        val calendar = Calendar.getInstance()
+        val comment = "Some_comment"
+        val tag = "Tag"
+        val fullName = "$firstName - $tag"
+
+        // Add data
+        val timeStartedTimestamp = calendar.getMillis(hour = 15, minute = 0)
+        val timeEndedTimestamp = calendar.getMillis(hour = 16, minute = 0)
+        testUtils.addActivity(name = firstName, color = firstColor, icon = firstIcon)
+        testUtils.addActivity(name = secondName, color = lastColor, icon = lastIcon)
+        testUtils.addRecordTag(tag)
+        testUtils.addRecord(
+            typeName = firstName,
+            timeStarted = timeStartedTimestamp,
+            timeEnded = timeEndedTimestamp,
+            tagNames = listOf(tag),
+            comment = comment,
+        )
+
+        // Open split action
+        NavUtils.openRecordsScreen()
+        clickOnView(allOf(withText(fullName), isCompletelyDisplayed()))
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
+        clickOnViewWithText(coreR.string.change_record_actions_hint)
+
+        // Change activity for the first split part
+        clickOnAdjustment("+30")
+        clickOnView(
+            allOf(
+                withId(R.id.btn_change_record_preview_before_action),
+                hasSibling(hasDescendant(withText(firstName))),
+                isCompletelyDisplayed()
+            )
+        )
+        clickOnViewWithText(secondName)
+
+        // Split
+        clickOnViewWithText(coreR.string.change_record_split)
+
+        // Check that two records created with different activities
+        checkRecord(
+            name = secondName,
+            timeStartedPreview = timeStartedTimestamp.formatTime(),
+            timeEndedPreview = (timeStartedTimestamp + TimeUnit.MINUTES.toMillis(30)).formatTime(),
+            timeRangePreview = TimeUnit.MINUTES.toMillis(30).formatInterval(),
+            comment = comment,
+            color = lastColor,
+            icon = lastIcon,
+        )
+        checkRecord(
+            name = fullName,
+            timeStartedPreview = (timeStartedTimestamp + TimeUnit.MINUTES.toMillis(30)).formatTime(),
+            timeEndedPreview = timeEndedTimestamp.formatTime(),
+            timeRangePreview = TimeUnit.MINUTES.toMillis(30).formatInterval(),
+            comment = comment,
+            color = firstColor,
+            icon = firstIcon,
+        )
+    }
+
     @Test
     fun recordUntrackedSplit() {
         val name = "Name"
@@ -361,13 +426,15 @@ class RecordActionsSplitTest : BaseUiTest() {
         timeEndedPreview: String,
         timeRangePreview: String,
         comment: String,
+        color: Int? = null,
+        icon: Int? = null,
     ) {
         checkViewIsDisplayed(
             allOf(
                 withId(baseR.id.viewRecordItem),
-                withCardColor(firstColor),
+                withCardColor(color ?: firstColor),
                 hasDescendant(withText(name)),
-                hasDescendant(withTag(firstIcon)),
+                hasDescendant(withTag(icon ?: firstIcon)),
                 hasDescendant(withText(timeStartedPreview)),
                 hasDescendant(withText(timeEndedPreview)),
                 hasDescendant(withText(timeRangePreview)),

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/adapter/ChangeRecordChangePreviewAdapterDelegate.kt

@@ -4,15 +4,16 @@ import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.createRecyclerBindingAdapterDelegate
-import com.example.util.simpletimetracker.feature_change_record.utils.setData
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordSimpleViewData
-import com.example.util.simpletimetracker.feature_views.extension.setMargins
+import com.example.util.simpletimetracker.feature_change_record.utils.setData
 import com.example.util.simpletimetracker.feature_views.extension.setOnClick
+import com.example.util.simpletimetracker.feature_views.extension.setMargins
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordChangePreviewViewData as ViewData
 import com.example.util.simpletimetracker.feature_change_record.databinding.ChangeRecordPreviewItemBinding as Binding
 
 fun createChangeRecordChangePreviewAdapterDelegate(
     onCheckboxClicked: (ViewData) -> Unit,
+    onBeforeActionClicked: () -> Unit,
 ) = createRecyclerBindingAdapterDelegate<ViewData, Binding>(
     Binding::inflate,
 ) { binding, item, _ ->
@@ -23,6 +24,7 @@ fun createChangeRecordChangePreviewAdapterDelegate(
         root.setMargins(top = item.marginTopDp)
         ivChangeRecordPreviewCompare.isInvisible = !item.isCompareVisible
         checkChangeRecordPreviewItem.isVisible = item.isCheckVisible
+        btnChangeRecordPreviewBeforeAction.isVisible = item.isBeforeActionVisible
         viewChangeRecordPreviewBefore.setData(item.before)
         viewChangeRecordPreviewAfter.setData(item.after)
         viewChangeRecordPreviewRemoved.isVisible = item.isRemoveVisible
@@ -33,6 +35,7 @@ fun createChangeRecordChangePreviewAdapterDelegate(
         }
 
         checkChangeRecordPreviewItem.setOnClick { onCheckboxClicked(item) }
+        btnChangeRecordPreviewBeforeAction.setOnClick { onBeforeActionClicked() }
     }
 }
 
@@ -45,6 +48,7 @@ data class ChangeRecordChangePreviewViewData(
     val isRemoveVisible: Boolean,
     val isCheckVisible: Boolean,
     val isCompareVisible: Boolean,
+    val isBeforeActionVisible: Boolean,
 ) : ViewHolderType {
 
     override fun getUniqueId(): Long = id

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt

@@ -92,7 +92,10 @@ class ChangeRecordCore(
             createDividerAdapterDelegate(),
             createHintAdapterDelegate(),
             createHintAccentAdapterDelegate(),
-            createChangeRecordChangePreviewAdapterDelegate(viewModel::onChangePreviewCheckClick),
+            createChangeRecordChangePreviewAdapterDelegate(
+                onCheckboxClicked = viewModel::onChangePreviewCheckClick,
+                onBeforeActionClicked = viewModel::onChangePreviewBeforeActionClick,
+            ),
             createChangeRecordTimePreviewAdapterDelegate(viewModel::onItemTimePreviewClick),
             createChangeRecordTimeDoublePreviewAdapterDelegate(
                 onTimeStartedClick = viewModel::onItemTimeStartedClick,

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordFragment.kt

@@ -11,11 +11,13 @@ import com.example.util.simpletimetracker.core.di.BaseViewModelFactory
 import com.example.util.simpletimetracker.core.dialog.DateTimeDialogListener
 import com.example.util.simpletimetracker.core.dialog.DurationDialogListener
 import com.example.util.simpletimetracker.core.dialog.OnTagValueSelectedListener
+import com.example.util.simpletimetracker.core.dialog.TypesSelectionDialogListener
 import com.example.util.simpletimetracker.core.extension.setSharedTransitions
 import com.example.util.simpletimetracker.core.extension.toViewData
 import com.example.util.simpletimetracker.core.sharedViewModel.RemoveRecordViewModel
 import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.core.utils.fragmentArgumentDelegate
+import com.example.util.simpletimetracker.domain.record.model.RecordBase
 import com.example.util.simpletimetracker.feature_base_adapter.record.RecordViewData
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordViewData
 import com.example.util.simpletimetracker.feature_change_record.viewModel.ChangeRecordViewModel
@@ -33,6 +35,7 @@ class ChangeRecordFragment :
     BaseFragment<Binding>(),
     DateTimeDialogListener,
     DurationDialogListener,
+    TypesSelectionDialogListener,
     OnTagValueSelectedListener {
 
     override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
@@ -123,6 +126,15 @@ class ChangeRecordFragment :
         viewModel.onCategoryValueSelected(params, data)
     }
 
+    override fun onDataSelected(
+        tag: String?,
+        dataIds: List<Long>,
+        tagValues: List<RecordBase.Tag>,
+        selectValueOnStartTagIds: List<Long>,
+    ) {
+        viewModel.onDataSelected(tag, dataIds)
+    }
+
     private fun setPreview() = when (extra) {
         is ChangeRecordParams.Tracked -> (extra as? ChangeRecordParams.Tracked)?.preview
         is ChangeRecordParams.Untracked -> (extra as? ChangeRecordParams.Untracked)?.preview

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt

@@ -11,6 +11,7 @@ import com.example.util.simpletimetracker.core.extension.toParams
 import com.example.util.simpletimetracker.core.interactor.RecordTagViewDataInteractor
 import com.example.util.simpletimetracker.core.interactor.RecordTypesViewDataInteractor
 import com.example.util.simpletimetracker.core.interactor.SnackBarMessageNavigationInteractor
+import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.core.view.timeAdjustment.TimeAdjustmentView
 import com.example.util.simpletimetracker.domain.extension.addOrRemove
 import com.example.util.simpletimetracker.domain.extension.dropSeconds
@@ -50,12 +51,14 @@ import com.example.util.simpletimetracker.navigation.params.screen.DateTimeDialo
 import com.example.util.simpletimetracker.navigation.params.screen.DateTimeDialogType
 import com.example.util.simpletimetracker.navigation.params.screen.DurationDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.RecordTagValueSelectionParams
+import com.example.util.simpletimetracker.navigation.params.screen.TypesSelectionDialogParams
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.util.concurrent.TimeUnit
 
 abstract class ChangeRecordBaseViewModel(
     private val router: Router,
+    private val resourceRepo: ResourceRepo,
     private val snackBarMessageNavigationInteractor: SnackBarMessageNavigationInteractor,
     private val prefsInteractor: PrefsInteractor,
     private val recordTypesViewDataInteractor: RecordTypesViewDataInteractor,
@@ -108,10 +111,11 @@ abstract class ChangeRecordBaseViewModel(
     protected var newTimeEnded: Long = 0
     protected var newTimeStarted: Long = 0
     protected var newTimeSplit: Long = 0
+    protected var newSplitBeforeTypeId: Long? = null
     protected var newTags: List<RecordBase.Tag> = emptyList()
     protected var originalRecordId: Long = 0
     protected var originalTypeId: Long = 0
-    protected var originalTagIds: List<Long> = emptyList()
+    protected var originalTags: List<RecordBase.Tag> = emptyList()
     protected var originalTimeStarted: Long = 0
     protected var originalTimeEnded: Long = 0
     protected var dateTimeState = ChangeRecordDateTimeFieldsState(
@@ -268,6 +272,22 @@ abstract class ChangeRecordBaseViewModel(
         changeRecordActionsDelegate.onChangePreviewCheckClick(item)
     }
 
+    fun onChangePreviewBeforeActionClick() {
+        TypesSelectionDialogParams(
+            tag = SPLIT_BEFORE_TYPE_SELECTION,
+            title = resourceRepo.getString(R.string.change_record_message_choose_type),
+            subtitle = "",
+            type = TypesSelectionDialogParams.Type.Activity,
+            selectedTypeIds = emptyList(),
+            selectedTagValues = emptyList(),
+            selectedTagValueOnStart = emptyList(),
+            isMultiSelectAvailable = false,
+            idsShouldBeVisible = emptyList(),
+            showHints = false,
+            allowTagValueSelection = false,
+        ).let(router::navigate)
+    }
+
     fun onSaveClick() {
         onRecordChangeButtonClick(
             onProceed = ::onSaveClickDelegate,
@@ -339,6 +359,15 @@ abstract class ChangeRecordBaseViewModel(
         }
     }
 
+    fun onDataSelected(
+        tag: String?,
+        dataIds: List<Long>,
+    ) {
+        if (tag != SPLIT_BEFORE_TYPE_SELECTION) return
+        newSplitBeforeTypeId = dataIds.firstOrNull()
+        updateActionsData()
+    }
+
     fun onCategoryLongClick(item: CategoryViewData, sharedElements: Pair<Any, String>) {
         val icon = (item as? CategoryViewData.Record)?.icon?.toParams()
 
@@ -810,8 +839,11 @@ abstract class ChangeRecordBaseViewModel(
                     ),
                     splitParams = ViewDataParams.SplitParams(
                         newTimeSplit = newTimeSplit,
+                        newBeforeTypeId = newSplitBeforeTypeId,
                         splitPreviewTimeEnded = previewTimeEnded,
                         showTimeEndedOnSplitPreview = showTimeEndedOnSplitPreview,
+                        originalTypeId = originalTypeId,
+                        originalTags = originalTags,
                     ),
                     duplicateParams = ViewDataParams.DuplicateParams(
                         isAvailable = isDuplicateActionAvailable,
@@ -913,5 +945,6 @@ abstract class ChangeRecordBaseViewModel(
         private const val TIME_ENDED_TAG = "time_ended_tag"
         private const val TIME_SPLIT_TAG = "time_split_tag"
         private const val CHANGE_RECORD_TAG_VALUE_SELECTION = "CHANGE_RECORD_TAG_VALUE_SELECTION"
+        private const val SPLIT_BEFORE_TYPE_SELECTION = "SPLIT_BEFORE_TYPE_SELECTION"
     }
 }

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt

@@ -11,6 +11,7 @@ import com.example.util.simpletimetracker.core.interactor.RecordTypesViewDataInt
 import com.example.util.simpletimetracker.core.interactor.SnackBarMessageNavigationInteractor
 import com.example.util.simpletimetracker.core.interactor.StatisticsDetailNavigationInteractor
 import com.example.util.simpletimetracker.core.mapper.TimeMapper
+import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.domain.base.UNTRACKED_ITEM_ID
 import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.domain.record.interactor.AddRecordMediator
@@ -40,6 +41,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class ChangeRecordViewModel @Inject constructor(
+    resourceRepo: ResourceRepo,
     recordTypesViewDataInteractor: RecordTypesViewDataInteractor,
     recordTagViewDataInteractor: RecordTagViewDataInteractor,
     snackBarMessageNavigationInteractor: SnackBarMessageNavigationInteractor,
@@ -59,6 +61,7 @@ class ChangeRecordViewModel @Inject constructor(
     private val commentSelectionViewModelDelegate: CommentSelectionViewModelDelegateImpl,
 ) : ChangeRecordBaseViewModel(
     router = router,
+    resourceRepo = resourceRepo,
     snackBarMessageNavigationInteractor = snackBarMessageNavigationInteractor,
     prefsInteractor = prefsInteractor,
     recordTypesViewDataInteractor = recordTypesViewDataInteractor,
@@ -160,7 +163,7 @@ class ChangeRecordViewModel @Inject constructor(
             externalViewsInteractor.onRecordChangeType(listOf(originalTypeId))
         }
         val newTagIds = newTags.map(RecordBase.Tag::tagId)
-        val removedTagIds = originalTagIds.filter { it !in newTagIds }
+        val removedTagIds = originalTags.map { it.tagId }.filter { it !in newTagIds }
         if (removedTagIds.isNotEmpty()) {
             externalViewsInteractor.onRecordChangeTags(removedTagIds)
         }
@@ -238,7 +241,7 @@ class ChangeRecordViewModel @Inject constructor(
         newTimeSplit = newTimeStarted
         originalRecordId = recordId.orZero()
         originalTypeId = newTypeId
-        originalTagIds = newTags.map(RecordBase.Tag::tagId)
+        originalTags = newTags.toList() // Creates a copy.
         originalTimeStarted = newTimeStarted
         originalTimeEnded = newTimeEnded
         super.initializePreviewViewData()

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/base/ChangeRecordDelegateBridge.kt

@@ -60,8 +60,11 @@ class ChangeRecordDelegateBridge(
 
         data class SplitParams(
             val newTimeSplit: Long,
+            val newBeforeTypeId: Long?,
             val splitPreviewTimeEnded: Long,
             val showTimeEndedOnSplitPreview: Boolean,
+            val originalTypeId: Long,
+            val originalTags: List<RecordBase.Tag>,
         )
 
         data class DuplicateParams(

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/delegates/ChangeRecordActionsAdjustDelegate.kt

@@ -125,6 +125,7 @@ class ChangeRecordActionsAdjustDelegate @Inject constructor(
             isRemoveVisible = false,
             isCheckVisible = false,
             isCompareVisible = true,
+            isBeforeActionVisible = false,
         )
         result += ChangeRecordTimeDoublePreviewViewData(
             block = ChangeRecordActionsBlock.AdjustTimePreview,
@@ -281,6 +282,7 @@ class ChangeRecordActionsAdjustDelegate @Inject constructor(
                 isRemoveVisible = isRemoveVisible,
                 isCheckVisible = true,
                 isCompareVisible = true,
+                isBeforeActionVisible = false,
             )
         }
 

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/delegates/ChangeRecordActionsMergeDelegate.kt

@@ -67,6 +67,7 @@ class ChangeRecordActionsMergeDelegate @Inject constructor(
                 isRemoveVisible = false,
                 isCheckVisible = false,
                 isCompareVisible = true,
+                isBeforeActionVisible = false,
             )
             result += changeRecordViewDataMapper.mapRecordActionButton(
                 action = action,