Watch folders PR with fixed pbxproj by joelhawksley · Pull Request #4396 · home-assistant/iOS

joelhawksley · 2026-02-27T16:34:15Z

#4376, but with pbxproj rebuilt with minimum changes.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…nto watch-folders

…ew.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…rationView.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Adds “folder” support to the Apple Watch Magic Items configuration, allowing users to group items into folders in the iOS configuration UI and navigate into those folders in the watchOS app.

Changes:

Extend MagicItem/MagicItemProvider/watch communication to support a new .folder item type and include folder children when sending watch config metadata.
Add iOS configuration UI for creating folders and managing folder contents (add/reorder/delete items, edit folder appearance).
Add watchOS UI to render folders as rows and show folder contents in a dedicated view, plus update tests.

Reviewed changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
Tests/App/Watch/WatchConfig.test.swift	Adds unit tests covering folder operations in `WatchConfigurationViewModel`.
Sources/Watch/WatchCommunicatorService.swift	Includes folder children when collecting `magicItemsInfo`; prevents executing folder “items”.
Sources/Shared/Resources/Swiftgen/Strings.swift	Adds generated SwiftGen accessors for new watch folder strings.
Sources/Shared/MagicItem/MagicItemProvider.swift	Adds `getInfo(for:)` support for `.folder`.
Sources/Shared/MagicItem/MagicItem.swift	Adds `items` (children) and new `.folder` item type.
Sources/Extensions/Watch/Home/WatchHomeViewModel.swift	Replaces list refresh workaround with a config version UUID.
Sources/Extensions/Watch/Home/WatchHomeView.swift	Adds folder navigation behavior and uses `configVersion` to force list refresh.
Sources/Extensions/Watch/Home/WatchFolderContentView.swift	New watchOS view to display folder contents.
Sources/Extensions/Watch/Home/MagicItemRow/WatchMagicViewRow.swift	Refactors icon color usage to avoid repeated hex parsing.
Sources/Extensions/Watch/Home/MagicItemRow/WatchFolderRow.swift	New watchOS row UI for folders.
Sources/App/Settings/AppleWatch/HomeCustomization/WatchConfigurationViewModel.swift	Adds folder CRUD/move logic in config view model.
Sources/App/Settings/AppleWatch/HomeCustomization/WatchConfigurationView.swift	Adds “Add Folder” sheet and folder detail navigation; updates icon coloring logic.
Sources/App/Settings/AppleWatch/HomeCustomization/FolderEditView.swift	New iOS view to edit folder name/icon/colors.
Sources/App/Settings/AppleWatch/HomeCustomization/FolderDetailView.swift	New iOS view to manage items inside a folder.
Sources/App/Resources/en.lproj/Localizable.strings	Adds new English localization keys for folder UI.
HomeAssistant.xcodeproj/project.pbxproj	Registers new Swift source files in the Xcode project/targets.

Copilot · 2026-02-27T16:41:36Z

Sources/App/Settings/AppleWatch/HomeCustomization/WatchConfigurationViewModel.swift

+    func moveItemToFolder(itemId: String, serverId: String, toFolderId: String) {
+        // Remove from root if present
+        if let rootIndex = watchConfig.items.firstIndex(where: { $0.id == itemId && $0.serverId == serverId }) {
+            let item = watchConfig.items.remove(at: rootIndex)
+            addItemToFolder(folderId: toFolderId, item: item)
+            return
+        }
+        // Remove from any folder if present
+        for (folderIndex, folder) in watchConfig.items.enumerated() where folder.type == .folder {
+            if var items = folder.items,
+               let index = items.firstIndex(where: { $0.id == itemId && $0.serverId == serverId }) {
+                let item = items.remove(at: index)
+                var updatedFolder = folder
+                updatedFolder.items = items
+                watchConfig.items[folderIndex] = updatedFolder
+                addItemToFolder(folderId: toFolderId, item: item)
+                return
+            }


moveItemToFolder removes the item from the root / source folder before verifying that toFolderId exists. If the destination folder ID is invalid (or the folder was deleted concurrently), addItemToFolder will no-op and the item is effectively lost. Consider first validating the destination folder index (or making addItemToFolder return a Bool) and only removing the item when the destination write succeeds; otherwise, keep the item in its original location.

Copilot · 2026-02-27T16:41:37Z

Sources/Shared/MagicItem/MagicItemProvider.swift

+        case .folder:
+            return .init(
+                id: item.serverUniqueId,
+                name: item.displayText ?? L10n.Watch.Configuration.Folder.defaultName,
+                iconName: MaterialDesignIcons.folderIcon.name,
+                customization: item.customization
+            )


Folders introduce nested MagicItems, but the watch-config migration (migrateItemsIfNeeded) only considers the root items array. This means any server-ID repair/migration logic will be skipped for items inside folder.items, and those children can remain broken after server re-add/ID changes. Consider updating the migration logic to recursively migrate children of .folder items (and then persist the updated config).

Copilot · 2026-02-27T16:41:37Z

Sources/App/Settings/AppleWatch/HomeCustomization/FolderEditView.swift

+        .onChange(of: useCustomColors) { newValue in
+            if newValue {
+                folder.customization?.backgroundColor = folder.customization?.backgroundColor ?? UIColor.black
+                    .hexString()
+                folder.customization?.textColor = folder.customization?.textColor ?? UIColor.white.hexString()
+            } else {
+                folder.customization?.backgroundColor = nil
+                folder.customization?.textColor = nil
+            }


folder.customization is optional, but several setters here use optional chaining (e.g., folder.customization?.backgroundColor = ...). If customization is nil (which can happen when decoding older configs), toggling custom colors and the color pickers will silently do nothing. Initializing folder.customization in init (or inside the onChange before writing) would make the edit screen robust without relying on onAppear timing.

codecov · 2026-03-01T17:02:31Z

Codecov Report

❌ Patch coverage is 15.38462% with 11 lines in your changes missing coverage. Please review.
⚠️ Please upload report for BASE (main@b8bd9ba). Learn more about missing BASE report.

Files with missing lines	Patch %	Lines
Sources/Shared/MagicItem/MagicItemProvider.swift	14.28%	6 Missing ⚠️
Sources/Shared/MagicItem/MagicItem.swift	16.66%	5 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #4396   +/-   ##
=======================================
  Coverage        ?   42.75%           
=======================================
  Files           ?      265           
  Lines           ?    15505           
  Branches        ?        0           
=======================================
  Hits            ?     6629           
  Misses          ?     8876           
  Partials        ?        0

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

bgoncal · 2026-03-03T13:03:40Z

@joelhawksley It's in TestFlight already, thank you for your contribution! Quite cool feature 🚀

joelhawksley and others added 30 commits January 23, 2026 14:22

folders can be added with items

0b1460d

basic folder name and icon editing

e439c28

got it working on the watch!

5039d8c

fix icon color issue, kind of

364e20d

fix color sync issue

f48a20e

fix folder contents item icon color bug

39c81c6

use gear for icon

a9eadd5

Merge branch 'main' into watch-folders

5b0eb68

Update Sources/Shared/MagicItem/MagicItemProvider.swift

37f3d53

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update Sources/Extensions/Watch/Home/MagicItemRow/WatchFolderRow.swift

7d4af73

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update HomeAssistant.xcworkspace/contents.xcworkspacedata

ca91bca

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Merge branch 'watch-folders' of https://github.com/joelhawksley/iOS i…

a09ce52

…nto watch-folders

fix issues from code review

53bf201

Update Sources/App/Settings/AppleWatch/HomeCustomization/FolderEditVi…

c0652aa

…ew.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update Sources/Extensions/Watch/Home/WatchHomeView.swift

b94a552

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update Sources/App/Settings/AppleWatch/HomeCustomization/WatchConfigu…

4d5aa46

…rationView.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update Sources/App/Settings/AppleWatch/HomeCustomization/WatchConfigu…

7423d44

…rationView.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

fix code review suggestions?

a57d10c

pod install

d61e420

fix default folder colors

8571eeb

Fix lint issues

21a697a

Merge branch 'main' into watch-folders

58c6117

Merge branch 'main' into watch-folders

3f1ab7a

revert translations

a98574b

try again

435b50b

reset podfile.lock to main

38d095d

force dark color scheme

93de3e2

update manifest

95be9b4

dark mode fix

caeeec4

use existing property

8c1406e

joelhawksley and others added 20 commits February 24, 2026 19:36

better transition

0a74f91

fix missing back button

86e0f6e

fix folder item padding

ff7cf0a

fix navigation bug

a64104e

folder row styling

2dd41ff

show chevron in preview

3e8b78d

Merge branch 'main' into watch-folders

4348ce9

Update Sources/Shared/MagicItem/MagicItemProvider.swift

a35f707

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update Sources/Extensions/Watch/Home/WatchHomeView.swift

84ec837

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

add test

c19c77e

suggestions from code review

2e2159e

working

d8cca0e

use custom view transition

18153ba

Merge branch 'main' into watch-folders

84352b4

lints

df7c3c2

fix errors

748ba94

respond to code review

01c9cbd

Merge branch 'main' into watch-folders

e84f58e

reset pbxproj to main

64114e8

rebuild pbxproj

e1295df

Copilot AI review requested due to automatic review settings February 27, 2026 16:34

home-assistant bot added the cla-signed label Feb 27, 2026

Copilot started reviewing on behalf of joelhawksley February 27, 2026 16:34 View session

joelhawksley mentioned this pull request Feb 27, 2026

Add support for folders in Watch app #4376

Merged

Copilot AI reviewed Feb 27, 2026

View reviewed changes

bgoncal merged commit fff4731 into home-assistant:main Mar 1, 2026
16 of 18 checks passed

joelhawksley deleted the watch-folders branch March 2, 2026 02:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Watch folders PR with fixed pbxproj#4396

Watch folders PR with fixed pbxproj#4396
bgoncal merged 50 commits intohome-assistant:mainfrom
joelhawksley:watch-folders

joelhawksley commented Feb 27, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 27, 2026

Uh oh!

Copilot AI Feb 27, 2026

Uh oh!

Copilot AI Feb 27, 2026

Uh oh!

codecov bot commented Mar 1, 2026

Uh oh!

Uh oh!

bgoncal commented Mar 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

joelhawksley commented Feb 27, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Mar 1, 2026

Codecov Report

Uh oh!

Uh oh!

bgoncal commented Mar 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants