Update Task model #163
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,20 +18,55 @@ struct FocusTasksView: View { | |
| @Query(filter: TasksQuery.predicateTodayActive()) var tasksTodayActive: [Todo] | ||
|
|
||
| var body: some View { | ||
| if tasksTodayActive.count > 0 { | ||
| List(selection: $selectedTask) { | ||
| ForEach(tasksTodayActive.sorted(by: TasksQuery.defaultSorting), | ||
| id: \.self) { task in | ||
| if task.visibleSubtasks?.isEmpty == false { | ||
| OutlineGroup([task], | ||
| id: \.self, | ||
| children: \.visibleSubtasks) { maintask in | ||
| HStack { | ||
| TaskRowView(task: maintask) | ||
| .modifier(FocusTaskRowModifier(task: maintask, viewMode: $viewMode)) | ||
| .tag(maintask) | ||
| .listRowSeparator(.hidden) | ||
|
|
||
| if let focus = focusTask.task, focus == maintask { | ||
| Button { | ||
| timer.reset() | ||
| if timer.mode == .pause || timer.mode == .longbreak { | ||
| timer.skip() | ||
| } | ||
| focusTask.task = nil | ||
| } label: { | ||
| Image(systemName: "stop.fill") | ||
| } | ||
| } else { | ||
| Button { | ||
| focusTask.task = maintask | ||
| viewMode = 1 | ||
| if timer.state == .idle { | ||
| timer.reset() | ||
| timer.start() | ||
| } else if timer.state == .paused { | ||
| timer.resume() | ||
| } | ||
| } label: { | ||
| Image(systemName: "play.fill") | ||
| } | ||
| .accessibility(identifier: "\(maintask.name)PlayButton") | ||
| } | ||
| } | ||
| } | ||
| .listRowSeparator(.hidden) | ||
| } else { | ||
| HStack { | ||
| TaskRowView(task: task) | ||
| .modifier(FocusTaskRowModifier(task: task, viewMode: $viewMode)) | ||
| .tag(task) | ||
|
|
||
| if let focus = focusTask.task, focus == task { | ||
| Button { | ||
| timer.reset() | ||
| if timer.mode == .pause || timer.mode == .longbreak { | ||
|
|
@@ -43,7 +78,7 @@ struct FocusTasksView: View { | |
| } | ||
| } else { | ||
| Button { | ||
| focusTask.task = task | ||
| viewMode = 1 | ||
| if timer.state == .idle { | ||
| timer.reset() | ||
|
|
@@ -54,46 +89,24 @@ struct FocusTasksView: View { | |
| } label: { | ||
| Image(systemName: "play.fill") | ||
| } | ||
| .accessibility(identifier: "\(task.name)PlayButton") | ||
| } | ||
| } | ||
| .listRowSeparator(.hidden) | ||
| } | ||
| } | ||
| } | ||
| } else { | ||
| VStack { | ||
| Spacer() | ||
| Image(systemName: "checkmark.circle") | ||
| .resizable() | ||
| .foregroundStyle(Color.gray) | ||
| .frame(width: 100, height: 100) | ||
|
|
||
| Text("No tasks for today") | ||
| Spacer() | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. Ниже — только замечания по проблемным/сомнительным местам и предложениям улучшения. Структура/дублирование
Идентичности/selection
Сепараторы списка
Логика таймера/фокуса
Состояния/пустой список
Сортировка/Query
Доступность/идентификаторы
Прочее
Рефакторинг-скетч (упрощённо, чтобы показать направления):
Эти шаги уберут дубли, стабилизируют идентичности, улучшат доступность и сделают логику таймера предсказуемой. There was a problem hiding this comment. Ниже — только те замечания, которые реально улучшат код или устранят потенциальные проблемы.
Итоговая «быстрая выжимка» того, что стоит сделать в первую очередь:
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Коротко: по сути это механическое повышение CURRENT_PROJECT_VERSION с 109 до 110 во всех конфигурациях/таргетах. Работать будет, но есть несколько мест, где сейчас заложены риски и лишний шум в PR.
Рекомендации:
Централизуйте версионирование, чтобы не плодить десятки правок в pbxproj при каждом инкременте:
Приведите к единому подходу работу с Info.plist:
Согласованность версий между контейнером и расширениями/виджетами:
Проверьте deployment targets:
DEVELOPMENT_TEAM:
Сократите шум в тестовых таргетах:
Итого: текущая правка допустима, но лучше упразднить дубли, выровнять политику Info.plist и deployment target’ов и автоматизировать инкремент сборочного номера. Это уменьшит вероятность расхождений и избавит от «инкрементных» PR.