Implemented the TaskListView view and its respective view model in. the app target.
This commit is contained in:
@@ -45,6 +45,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
},
|
||||||
"view.new-task.navigation.title" : {
|
"view.new-task.navigation.title" : {
|
||||||
"extractionState" : "manual",
|
"extractionState" : "manual",
|
||||||
"localizations" : {
|
"localizations" : {
|
||||||
@@ -121,6 +122,17 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
"view.task-list-content.content-unavailable.title" : {
|
||||||
|
"extractionState" : "manual",
|
||||||
|
"localizations" : {
|
||||||
|
"en" : {
|
||||||
|
"stringUnit" : {
|
||||||
|
"state" : "translated",
|
||||||
|
"value" : "All Tasks Completed"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"view.task-list-item.placeholder.completed" : {
|
"view.task-list-item.placeholder.completed" : {
|
||||||
"extractionState" : "manual",
|
"extractionState" : "manual",
|
||||||
"localizations" : {
|
"localizations" : {
|
||||||
@@ -154,13 +166,35 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"view.task-list.content-unavailable.title" : {
|
"view.task-list.label.actions" : {
|
||||||
"extractionState" : "manual",
|
"extractionState" : "manual",
|
||||||
"localizations" : {
|
"localizations" : {
|
||||||
"en" : {
|
"en" : {
|
||||||
"stringUnit" : {
|
"stringUnit" : {
|
||||||
"state" : "translated",
|
"state" : "translated",
|
||||||
"value" : "All Tasks Completed"
|
"value" : "Menu Actions"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"view.task-list.label.hide-completed" : {
|
||||||
|
"extractionState" : "manual",
|
||||||
|
"localizations" : {
|
||||||
|
"en" : {
|
||||||
|
"stringUnit" : {
|
||||||
|
"state" : "translated",
|
||||||
|
"value" : "Hide Completed"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"view.task-list.label.show-completed" : {
|
||||||
|
"extractionState" : "manual",
|
||||||
|
"localizations" : {
|
||||||
|
"en" : {
|
||||||
|
"stringUnit" : {
|
||||||
|
"state" : "translated",
|
||||||
|
"value" : "Show Completed"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,13 +3,18 @@ import SwiftUI
|
|||||||
|
|
||||||
extension TaskListView {
|
extension TaskListView {
|
||||||
|
|
||||||
/// View model for managing the logic for the task list view.
|
/// View model for managing the state and business logic of the task list view.
|
||||||
///
|
///
|
||||||
/// This observable class encapsulates the state and business logic for the task list view.
|
/// This observable class encapsulates the presentation logic for the task list view, following the MVVM pattern to
|
||||||
/// It follows the MVVM pattern to separate presentation logic from the view layer.
|
/// separate concerns between the view and business logic layers.
|
||||||
///
|
///
|
||||||
/// ## Responsibilities
|
/// ## Responsibilities
|
||||||
/// - Providing the navigation title for the current group
|
///
|
||||||
|
/// - Maintains the task group category (today, upcoming, overdue, completed)
|
||||||
|
/// - Manages the visibility preference for completed tasks
|
||||||
|
/// - Provides the localized title for the navigation bar
|
||||||
|
/// - Determines whether the completion filter toggle should be displayed
|
||||||
|
/// - Provides label and icon configuration for the completion toggle button
|
||||||
@Observable
|
@Observable
|
||||||
final class ViewModel {
|
final class ViewModel {
|
||||||
|
|
||||||
@@ -18,7 +23,15 @@ extension TaskListView {
|
|||||||
/// The task group to display tasks for.
|
/// The task group to display tasks for.
|
||||||
///
|
///
|
||||||
/// This property determines which tasks are fetched and displayed in the list.
|
/// This property determines which tasks are fetched and displayed in the list.
|
||||||
private let group: TodoGroup
|
/// It is used by the content view to initialize the SwiftData query with the appropriate predicates and sort descriptors for the group.
|
||||||
|
let group: TodoGroup
|
||||||
|
|
||||||
|
/// Whether to show completed tasks in the list.
|
||||||
|
///
|
||||||
|
/// This property controls the inclusion of completed tasks in the query results:
|
||||||
|
/// - `true`: Completed tasks are included in the fetch results
|
||||||
|
/// - `false`: Completed tasks are filtered out at the database level
|
||||||
|
var showCompleted: Bool
|
||||||
|
|
||||||
// MARK: Initialization
|
// MARK: Initialization
|
||||||
|
|
||||||
@@ -27,17 +40,55 @@ extension TaskListView {
|
|||||||
/// - Parameter group: The task group to display tasks for.
|
/// - Parameter group: The task group to display tasks for.
|
||||||
init(group: TodoGroup) {
|
init(group: TodoGroup) {
|
||||||
self.group = group
|
self.group = group
|
||||||
|
showCompleted = false
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: Computed
|
// MARK: Computed Properties
|
||||||
|
|
||||||
/// The navigation title for the current task group.
|
/// The localized button title and icon for the show/hide completed todo tasks.
|
||||||
///
|
///
|
||||||
/// This computed property provides the localized title for the current group,
|
/// This computed property provides the appropriate label and icon based on
|
||||||
/// suitable for display in a navigation bar.
|
/// the current `showCompleted` state.
|
||||||
///
|
///
|
||||||
/// - Returns: The localized title key for the current group.
|
/// - Returns: A tuple containing the localized title key and SF Symbol icon name.
|
||||||
var navigationTitle: LocalizedStringKey { group.title }
|
var buttonCompleted: (title: LocalizedStringKey, icon: String) {
|
||||||
|
let title: LocalizedStringKey = showCompleted
|
||||||
|
? "view.task-list.label.hide-completed"
|
||||||
|
: "view.task-list.label.show-completed"
|
||||||
|
let icon = showCompleted
|
||||||
|
? "eye.slash"
|
||||||
|
: "eye"
|
||||||
|
|
||||||
|
return (title, icon)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Whether the completed todo tasks should be displayed.
|
||||||
|
///
|
||||||
|
/// This property delegates to the group's `canShowCompleted` property to determine if completed todo tasks should be shown.
|
||||||
|
///
|
||||||
|
/// - Returns: `true` if the completed todo tasks should be displayed, `false` otherwise.
|
||||||
|
var canShowCompleted: Bool {
|
||||||
|
group.canShowCompleted
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The navigation title for the task list view.
|
||||||
|
///
|
||||||
|
/// This computed property provides the localized title for the task list view, suitable for display in a navigation bar.
|
||||||
|
///
|
||||||
|
/// - Returns: The localized title key for the task list view.
|
||||||
|
var navigationTitle: LocalizedStringKey {
|
||||||
|
group.title
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: Methods
|
||||||
|
|
||||||
|
/// Toggles the visibility of completed tasks.
|
||||||
|
///
|
||||||
|
/// This method flips the `showCompleted` state, which triggers SwiftUI to recreate the task list view and its children.
|
||||||
|
/// The toggle has no effect when `canShowCompleted` is `false`.
|
||||||
|
func toggleCompletedVisibility() {
|
||||||
|
showCompleted.toggle()
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,28 +1,26 @@
|
|||||||
import SwiftData
|
import SwiftData
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
/// A view that displays all todo tasks for a specific task group.
|
/// A view that displays filtered todo tasks for a specific task group.
|
||||||
///
|
///
|
||||||
/// This view shows a filtered list of tasks based on the selected group (today, upcoming, past, or completed).
|
/// This view provides the presentation layer for displaying and managing tasks within a specific group category.
|
||||||
/// The view uses a view model to separate business logic from presentation.
|
/// It follows the MVVM pattern, delegating business logic to a view model and data fetching to a separate content view.
|
||||||
struct TaskListView: View {
|
struct TaskListView: View {
|
||||||
|
|
||||||
// MARK: Properties
|
// MARK: Properties
|
||||||
|
|
||||||
/// Query to fetch todos filtered by the current group.
|
/// The view model managing the state and business logic for this view.
|
||||||
@Query
|
///
|
||||||
private var tasks: [Todo]
|
/// This view model holds the group configuration and completion filter state.
|
||||||
|
|
||||||
/// The view model managing the business logic for this view.
|
|
||||||
@State
|
@State
|
||||||
private var viewModel: ViewModel
|
private var viewModel: ViewModel
|
||||||
|
|
||||||
// MARK: Initialization
|
// MARK: Initialization
|
||||||
|
|
||||||
/// Creates a new task list view for a specific group.
|
/// Creates a new task list view for a specific group.
|
||||||
/// - Parameter group: The todo group to display tasks for.
|
///
|
||||||
|
/// - Parameter group: The todo group category to display tasks for.
|
||||||
init(group: TodoGroup) {
|
init(group: TodoGroup) {
|
||||||
_tasks = .init(FetchDescriptor<Todo>(group: group))
|
|
||||||
_viewModel = .init(initialValue: ViewModel(group: group))
|
_viewModel = .init(initialValue: ViewModel(group: group))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,25 +28,33 @@ struct TaskListView: View {
|
|||||||
|
|
||||||
/// The content and behavior of the view.
|
/// The content and behavior of the view.
|
||||||
///
|
///
|
||||||
/// Displays a list of tasks filtered by the current group.
|
/// Displays the task list content with navigation title and toolbar controls.
|
||||||
|
/// The toolbar includes a completion filter toggle for groups that support it.
|
||||||
var body: some View {
|
var body: some View {
|
||||||
Group {
|
Content(
|
||||||
if tasks.isEmpty {
|
group: viewModel.group,
|
||||||
ContentUnavailableView(
|
showCompleted: viewModel.showCompleted
|
||||||
"view.task-list.content-unavailable.title",
|
|
||||||
systemImage: "checkmark.circle"
|
|
||||||
)
|
)
|
||||||
} else {
|
|
||||||
List {
|
|
||||||
ForEach(tasks) { todo in
|
|
||||||
Item(todo)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.listStyle(.grouped)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.navigationTitle(viewModel.navigationTitle)
|
.navigationTitle(viewModel.navigationTitle)
|
||||||
|
.toolbar {
|
||||||
|
if viewModel.canShowCompleted {
|
||||||
|
Menu {
|
||||||
|
Button.init(
|
||||||
|
viewModel.buttonCompleted.title,
|
||||||
|
systemImage: viewModel.buttonCompleted.icon
|
||||||
|
) {
|
||||||
|
viewModel.toggleCompletedVisibility()
|
||||||
}
|
}
|
||||||
|
} label: {
|
||||||
|
Label(
|
||||||
|
"view.task-list.label.actions",
|
||||||
|
systemImage: "ellipsis"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - Previews
|
// MARK: - Previews
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
import SwiftData
|
import SwiftData
|
||||||
|
import SwiftUI
|
||||||
import Testing
|
import Testing
|
||||||
|
|
||||||
@testable import Todos
|
@testable import Todos
|
||||||
@@ -7,10 +8,73 @@ import Testing
|
|||||||
@Suite("TaskList view model tests")
|
@Suite("TaskList view model tests")
|
||||||
struct TaskListViewModelTests {
|
struct TaskListViewModelTests {
|
||||||
|
|
||||||
// MARK: Computed tests
|
// MARK: Initializers tests
|
||||||
|
|
||||||
@Test(
|
@Test(
|
||||||
"navigationTitle returns correct title for each and every group",
|
"properties are set correctly during initialization",
|
||||||
|
arguments: TodoGroup.allCases
|
||||||
|
)
|
||||||
|
func initialization(for group: TodoGroup) {
|
||||||
|
// GIVEN
|
||||||
|
// WHEN
|
||||||
|
let viewModel = TaskListView.ViewModel(group: group)
|
||||||
|
|
||||||
|
// THEN
|
||||||
|
#expect(viewModel.group == group)
|
||||||
|
#expect(viewModel.showCompleted == false)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: Computed property tests
|
||||||
|
|
||||||
|
@Test(
|
||||||
|
"buttonCompleted returns correct values when showCompleted is true",
|
||||||
|
arguments: TodoGroup.allCases, [true, false]
|
||||||
|
)
|
||||||
|
func buttonCompleted(
|
||||||
|
for group: TodoGroup,
|
||||||
|
showCompleted: Bool
|
||||||
|
) {
|
||||||
|
// GIVEN
|
||||||
|
let viewModel = TaskListView.ViewModel(group: group)
|
||||||
|
|
||||||
|
viewModel.showCompleted = showCompleted
|
||||||
|
|
||||||
|
// WHEN
|
||||||
|
let (title, icon) = viewModel.buttonCompleted
|
||||||
|
|
||||||
|
// THEN
|
||||||
|
if showCompleted {
|
||||||
|
#expect(title == "view.task-list.label.hide-completed")
|
||||||
|
#expect(icon == "eye.slash")
|
||||||
|
} else {
|
||||||
|
#expect(title == "view.task-list.label.show-completed")
|
||||||
|
#expect(icon == "eye")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test(
|
||||||
|
"canShowCompleted returns correct value for each group",
|
||||||
|
arguments: zip(
|
||||||
|
TodoGroup.allCases,
|
||||||
|
[true, true, true, false]
|
||||||
|
)
|
||||||
|
)
|
||||||
|
func canShowCompleted(
|
||||||
|
for group: TodoGroup,
|
||||||
|
expects expectation: Bool
|
||||||
|
) {
|
||||||
|
// GIVEN
|
||||||
|
let viewModel = TaskListView.ViewModel(group: group)
|
||||||
|
|
||||||
|
// WHEN
|
||||||
|
let canShowCompleted = viewModel.canShowCompleted
|
||||||
|
|
||||||
|
// THEN
|
||||||
|
#expect(canShowCompleted == expectation)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test(
|
||||||
|
"navigationTitle returns correct view title for each group",
|
||||||
arguments: TodoGroup.allCases
|
arguments: TodoGroup.allCases
|
||||||
)
|
)
|
||||||
func navigationTitle(for group: TodoGroup) {
|
func navigationTitle(for group: TodoGroup) {
|
||||||
@@ -24,4 +88,25 @@ struct TaskListViewModelTests {
|
|||||||
#expect(title == group.title)
|
#expect(title == group.title)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MARK: Method tests
|
||||||
|
|
||||||
|
@Test("toggleCompletedVisbility toggles the showCompleted property")
|
||||||
|
func toggleCompletedVisibility() {
|
||||||
|
// GIVEN
|
||||||
|
let viewModel = TaskListView.ViewModel(group: .today)
|
||||||
|
let initialValue = viewModel.showCompleted
|
||||||
|
|
||||||
|
// WHEN
|
||||||
|
viewModel.toggleCompletedVisibility()
|
||||||
|
let afterFirstToggle = viewModel.showCompleted
|
||||||
|
|
||||||
|
viewModel.toggleCompletedVisibility()
|
||||||
|
let afterSecondToggle = viewModel.showCompleted
|
||||||
|
|
||||||
|
// THEN
|
||||||
|
#expect(initialValue == false)
|
||||||
|
#expect(afterFirstToggle == true)
|
||||||
|
#expect(afterSecondToggle == false)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user