Revert "Add support for folders in Watch app"#4394
Merged
Conversation
This reverts commit 0071cc2.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR reverts #4376 which added folder support to the Watch app. The revert removes all folder-related functionality from the Watch app, returning to the previous simple list-based approach for organizing Watch items.
Changes:
- Removed folder item type from MagicItem model and all associated folder handling logic
- Deleted all folder-specific UI components (WatchFolderRow, WatchFolderContentView, FolderEditView, FolderDetailView)
- Removed folder-related view model methods and test cases
- Removed folder-related localization strings
Reviewed changes
Copilot reviewed 16 out of 16 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| Tests/App/Watch/WatchConfig.test.swift | Removed WatchConfigurationViewModel tests for folder functionality and unused HomeAssistant import |
| Sources/Watch/WatchCommunicatorService.swift | Reverted folder handling in watch config response and magic item press handler |
| Sources/Shared/Resources/Swiftgen/Strings.swift | Removed auto-generated localization string accessors for folder-related strings |
| Sources/Shared/MagicItem/MagicItemProvider.swift | Removed folder case from getInfo method |
| Sources/Shared/MagicItem/MagicItem.swift | Removed folder item type, items property, and folder-related logic |
| Sources/Extensions/Watch/Home/WatchHomeViewModel.swift | Renamed configVersion to refreshListID and updated comment |
| Sources/Extensions/Watch/Home/WatchHomeView.swift | Removed folder navigation state and UI, simplified to single content view |
| Sources/Extensions/Watch/Home/WatchFolderContentView.swift | Deleted entire folder content view file |
| Sources/Extensions/Watch/Home/MagicItemRow/WatchMagicViewRow.swift | Removed iconColor computed property, inline color initialization |
| Sources/Extensions/Watch/Home/MagicItemRow/WatchFolderRow.swift | Deleted entire folder row view file |
| Sources/App/Settings/AppleWatch/HomeCustomization/WatchConfigurationViewModel.swift | Removed all folder-related methods (addFolder, updateFolder, addItemToFolder, etc.) |
| Sources/App/Settings/AppleWatch/HomeCustomization/WatchConfigurationView.swift | Removed folder UI elements, folder sheet, and folder customization navigation |
| Sources/App/Settings/AppleWatch/HomeCustomization/FolderEditView.swift | Deleted entire folder edit view file |
| Sources/App/Settings/AppleWatch/HomeCustomization/FolderDetailView.swift | Deleted entire folder detail view file |
| Sources/App/Resources/en.lproj/Localizable.strings | Removed folder-related localization strings |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #4394 +/- ##
=======================================
Coverage ? 42.61%
=======================================
Files ? 265
Lines ? 15456
Branches ? 0
=======================================
Hits ? 6587
Misses ? 8869
Partials ? 0 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Reverts #4376