fix tag dropdown opening when no tags selectable

Author: Razeeman

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

@@ -18,6 +18,7 @@ import com.example.util.simpletimetracker.domain.record.interactor.RecordInterac
 import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTypeToTagInteractor
 import com.example.util.simpletimetracker.domain.favourite.model.FavouriteComment
 import com.example.util.simpletimetracker.domain.record.model.Record
+import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.button.ButtonViewData
 import com.example.util.simpletimetracker.feature_base_adapter.category.CategoryViewData
@@ -55,6 +56,7 @@ abstract class ChangeRecordBaseViewModel(
     private val recordTagViewDataInteractor: RecordTagViewDataInteractor,
     private val changeRecordViewDataInteractor: ChangeRecordViewDataInteractor,
     private val recordInteractor: RecordInteractor,
+    private val recordTagInteractor: RecordTagInteractor,
     private val recordTypeToTagInteractor: RecordTypeToTagInteractor,
     private val favouriteCommentInteractor: FavouriteCommentInteractor,
     private val changeRecordActionsDelegate: ChangeRecordActionsDelegateImpl,
@@ -285,11 +287,7 @@ abstract class ChangeRecordBaseViewModel(
 
             // Close type selection after type is selected
             onTypeChooserClick()
-            // If type has any record tags - open tag selection
-            if (recordTypeToTagInteractor.getTags(newTypeId).isNotEmpty()) {
-                delay(300)
-                onCategoryChooserClick()
-            }
+            openTagSelectionIfNeeded()
         }
     }
 
@@ -458,6 +456,19 @@ abstract class ChangeRecordBaseViewModel(
         }
     }
 
+    private suspend fun openTagSelectionIfNeeded() {
+        // If type has any record tags - open tag selection
+        val tags = recordTagInteractor.getAll().associateBy { it.id }
+        val tagsForThisType = recordTypeToTagInteractor.getTags(newTypeId)
+            .mapNotNull(tags::get)
+            .filterNot { it.archived }
+
+        if (tagsForThisType.isNotEmpty()) {
+            delay(300)
+            onCategoryChooserClick()
+        }
+    }
+
     private fun onAdjustTimeChangeClick(viewData: TimeAdjustmentView.ViewData) {
         when (changeRecordActionsDelegate.timeChangeAdjustmentState) {
             TimeAdjustmentState.TIME_STARTED -> {

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

@@ -21,6 +21,7 @@ import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterTyp
 import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
 import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
 import com.example.util.simpletimetracker.domain.record.model.Record
+import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor
 import com.example.util.simpletimetracker.feature_change_record.interactor.ChangeRecordViewDataInteractor
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordViewData
 import com.example.util.simpletimetracker.navigation.Router
@@ -38,6 +39,7 @@ class ChangeRecordViewModel @Inject constructor(
     recordTagViewDataInteractor: RecordTagViewDataInteractor,
     snackBarMessageNavigationInteractor: SnackBarMessageNavigationInteractor,
     changeRecordActionsDelegate: ChangeRecordActionsDelegateImpl,
+    recordTagInteractor: RecordTagInteractor,
     recordTypeToTagInteractor: RecordTypeToTagInteractor,
     favouriteCommentInteractor: FavouriteCommentInteractor,
     private val prefsInteractor: PrefsInteractor,
@@ -56,6 +58,7 @@ class ChangeRecordViewModel @Inject constructor(
     recordTagViewDataInteractor = recordTagViewDataInteractor,
     changeRecordViewDataInteractor = changeRecordViewDataInteractor,
     recordInteractor = recordInteractor,
+    recordTagInteractor = recordTagInteractor,
     recordTypeToTagInteractor = recordTypeToTagInteractor,
     favouriteCommentInteractor = favouriteCommentInteractor,
     changeRecordActionsDelegate = changeRecordActionsDelegate,

features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/viewModel/ChangeRunningRecordViewModel.kt

@@ -20,6 +20,7 @@ import com.example.util.simpletimetracker.domain.record.interactor.RunningRecord
 import com.example.util.simpletimetracker.domain.record.interactor.UpdateRunningRecordFromChangeScreenInteractor
 import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType
 import com.example.util.simpletimetracker.domain.record.model.RunningRecord
+import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor
 import com.example.util.simpletimetracker.feature_change_record.interactor.ChangeRecordViewDataInteractor
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordChooserState
 import com.example.util.simpletimetracker.feature_change_record.viewModel.ChangeRecordActionsDelegateImpl
@@ -50,6 +51,7 @@ class ChangeRunningRecordViewModel @Inject constructor(
     changeRecordViewDataInteractor: ChangeRecordViewDataInteractor,
     changeRecordActionsDelegate: ChangeRecordActionsDelegateImpl,
     recordInteractor: RecordInteractor,
+    recordTagInteractor: RecordTagInteractor,
     recordTypeToTagInteractor: RecordTypeToTagInteractor,
     favouriteCommentInteractor: FavouriteCommentInteractor,
     snackBarMessageNavigationInteractor: SnackBarMessageNavigationInteractor,
@@ -70,6 +72,7 @@ class ChangeRunningRecordViewModel @Inject constructor(
     recordTagViewDataInteractor = recordTagViewDataInteractor,
     changeRecordViewDataInteractor = changeRecordViewDataInteractor,
     recordInteractor = recordInteractor,
+    recordTagInteractor = recordTagInteractor,
     recordTypeToTagInteractor = recordTypeToTagInteractor,
     favouriteCommentInteractor = favouriteCommentInteractor,
     changeRecordActionsDelegate = changeRecordActionsDelegate,