TaskDetailData.kt: Remove deprecated properties from interface

* Remove implementations

Author: EdricChan03

features/tasks/src/main/kotlin/com/edricchan/studybuddy/features/tasks/detail/data/TaskDetailData.kt

@@ -1,7 +1,6 @@
 package com.edricchan.studybuddy.features.tasks.detail.data
 
 import com.edricchan.studybuddy.features.tasks.data.model.TodoItem
-import com.edricchan.studybuddy.features.tasks.data.model.TodoProject
 import com.edricchan.studybuddy.features.tasks.detail.data.state.TaskDetailState
 import com.edricchan.studybuddy.features.tasks.domain.model.TaskItem
 import kotlinx.coroutines.flow.StateFlow
@@ -13,27 +12,6 @@ interface TaskDetailData {
     /** The currently selected [TodoItem]'s ID. */
     val currentTaskId: String
 
-    /** The currently selected [TodoItem]'s data. (Alias of `currTaskFlow.value`) */
-    @Deprecated(
-        "This may return the initial `null` value if the underlying flow" +
-            "hasn't started emitting values. Use the currentTask() suspend method " +
-            "instead to get the current value (note that it returns the domain-specific " +
-            "TaskItem data class)."
-    )
-    val currentTask: TodoItem?
-        get() = currTaskFlow.value
-
-    /** The currently selected [TodoItem]'s data, as a [StateFlow]. */
-    @Deprecated(
-        "There is an ambiguity between having no such task item " +
-            "existing (represented by `null`) and the initial `null` value when the underlying " +
-            "flow has yet to start emitting values. Use the currentTaskStateFlow property " +
-            "instead which uses a sealed interface to differentiate between these 2 possible " +
-            "states. Note that the state class uses the domain-specific TaskItem data class " +
-            "which also provides access to the project-related information, if any."
-    )
-    val currTaskFlow: StateFlow<TodoItem?>
-
     /** The currently selected task data, as a [StateFlow] of [TaskDetailState]. */
     val currentTaskStateFlow: StateFlow<TaskDetailState>
 
@@ -46,13 +24,6 @@ interface TaskDetailData {
         return currentTaskStateFlow.filterIsInstance<TaskDetailState.Success>()
             .first().item
     }
-
-    /** The currently selected [TodoItem]'s [TodoProject] data, as a [StateFlow]. */
-    @Deprecated(
-        "The project data is now available in the TaskItem domain class. " +
-            "To get the current task data, use the currentTaskStateFlow property"
-    )
-    val currTaskProjectFlow: StateFlow<TodoProject?>
 }
 
 /**

features/tasks/src/main/kotlin/com/edricchan/studybuddy/features/tasks/detail/data/impl/FirestoreTaskDetailData.kt

@@ -1,29 +1,22 @@
 package com.edricchan.studybuddy.features.tasks.detail.data.impl
 
-import com.edricchan.studybuddy.features.tasks.data.model.TodoItem
-import com.edricchan.studybuddy.features.tasks.data.model.TodoProject
-import com.edricchan.studybuddy.features.tasks.data.repo.TaskProjectDataSource
 import com.edricchan.studybuddy.features.tasks.data.repo.TaskRepository
 import com.edricchan.studybuddy.features.tasks.detail.data.TaskDetailData
 import com.edricchan.studybuddy.features.tasks.detail.data.state.TaskDetailState
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flatMapConcat
-import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 
 class FirestoreTaskDetailData @AssistedInject constructor(
     @Assisted private val selectedTaskId: String,
     @Assisted private val coroutineScope: CoroutineScope,
-    repo: TaskRepository,
-    private val projectSource: TaskProjectDataSource
+    repo: TaskRepository
 ) : TaskDetailData {
     @AssistedFactory
     fun interface Factory {
@@ -32,17 +25,6 @@ class FirestoreTaskDetailData @AssistedInject constructor(
 
     override val currentTaskId: String = selectedTaskId
 
-    @Deprecated(
-        "There is an ambiguity between having no such task item " +
-            "existing (represented by `null`) and the initial `null` value when the underlying " +
-            "flow has yet to start emitting values. Use the currentTaskStateFlow property " +
-            "instead which uses a sealed interface to differentiate between these 2 possible " +
-            "states. Note that the state class uses the domain-specific TaskItem data class " +
-            "which also provides access to the project-related information, if any."
-    )
-    override val currTaskFlow: StateFlow<TodoItem?> = repo.observeTask(selectedTaskId)
-        .stateIn(coroutineScope, SharingStarted.WhileSubscribed(), null)
-
     override val currentTaskStateFlow: StateFlow<TaskDetailState> =
         repo.observeTaskById(selectedTaskId)
             .map {
@@ -55,16 +37,4 @@ class FirestoreTaskDetailData @AssistedInject constructor(
                 started = SharingStarted.WhileSubscribed(),
                 initialValue = TaskDetailState.Loading
             )
-
-    @Suppress("DEPRECATION")
-    @Deprecated(
-        "The project data is now available in the TaskItem domain class. " +
-            "To get the current task data, use the currentTaskStateFlow property"
-    )
-    @OptIn(ExperimentalCoroutinesApi::class)
-    override val currTaskProjectFlow: StateFlow<TodoProject?> = currTaskFlow
-        .flatMapConcat { item ->
-            item?.project?.id?.let(projectSource::get) ?: flowOf(null)
-        }
-        .stateIn(coroutineScope, SharingStarted.WhileSubscribed(), null)
 }

features/tasks/src/main/kotlin/com/edricchan/studybuddy/features/tasks/vm/TaskDetailViewModel.kt

@@ -7,8 +7,6 @@ import androidx.lifecycle.viewModelScope
 import androidx.navigation.toRoute
 import com.edricchan.studybuddy.core.compat.navigation.CompatDestination
 import com.edricchan.studybuddy.features.tasks.R
-import com.edricchan.studybuddy.features.tasks.data.model.TodoItem
-import com.edricchan.studybuddy.features.tasks.data.model.TodoProject
 import com.edricchan.studybuddy.features.tasks.data.repo.TaskRepository
 import com.edricchan.studybuddy.features.tasks.data.repo.setCompletion
 import com.edricchan.studybuddy.features.tasks.data.repo.toggleArchived
@@ -44,25 +42,8 @@ class TaskDetailViewModel @Inject constructor(
     private val detailData =
         detailDataFactory.create(selectedTaskId = routeData.taskId, coroutineScope = viewModelScope)
 
-    @Suppress("DEPRECATION") // Deprecation usage from FirestoreDetailData::currTaskFlow
-    @Deprecated(
-        "There is an ambiguity between having no such task item actually " +
-            "existing (represented by `null`) and the initial `null` value when the underlying " +
-            "flow has yet to start emitting values. Use the currentTaskStateFlow property " +
-            "instead which uses a sealed interface to differentiate between these 2 possible " +
-            "states. Note that the state class uses the domain-specific TaskItem data class " +
-            "which also provides access to the project-related information, if any."
-    )
-    override val currTaskFlow: StateFlow<TodoItem?> by detailData::currTaskFlow
     override val currentTaskStateFlow: StateFlow<TaskDetailState> by detailData::currentTaskStateFlow
 
-    @Suppress("DEPRECATION") // Deprecation usage from FirestoreDetailData::currTaskProjectFlow
-    @Deprecated(
-        "The project data is now available in the TaskItem domain class. " +
-            "To get the current task data, use the currentTaskStateFlow property"
-    )
-    override val currTaskProjectFlow: StateFlow<TodoProject?> by detailData::currTaskProjectFlow
-
     suspend fun toggleCompleted(item: TaskItem) {
         repo.toggleCompleted(item)
     }