mirror of
https://github.com/home-assistant/iOS.git
synced 2026-04-13 01:12:53 -05:00
## Summary Adds a new widget called "Common Controls" that displays commonly used entities based on usage patterns from the `usage_prediction/common_control` endpoint. **New Files:** - `WidgetCommonlyUsedEntities.swift` - Widget definition using `WidgetBasicContainerView` (same UI as WidgetCustom) - `WidgetCommonlyUsedEntitiesTimelineProvider.swift` - Timeline provider with state fetching and caching **Key Changes:** - Filters entities to supported domains: `light`, `switch`, `cover`, `fan`, `climate`, `lock` - Added `climate` domain to `Domain` enum with thermostat icon - Added climate interaction in `MagicItem` (opens more info dialog) - Registered in iOS 17/18 widget bundles - Added `commonlyUsedEntities` to `WidgetsKind` and `DataWidgetsUpdater` - Updated `WidgetsKindTests` to include the new widget kind **Widget Behavior:** - Fetches entities from the configured server (or first available) via `usagePredictionCommonControl()` - Entity info from app database via `MagicItemProvider` - Entity states via `ControlEntityProvider` (same as WidgetCustom) - 15-minute refresh policy with 1-second state cache (iOS reload bug workaround) - Supports systemSmall/Medium/Large families ## Screenshots <img src="https://github.com/user-attachments/assets/ad37542d-b3b4-4476-81b4-8be7425b5f31"> ## Link to pull request in Documentation repository Documentation: home-assistant/companion.home-assistant# ## Any other notes <!-- START COPILOT CODING AGENT TIPS --> --- ✨ Let Copilot coding agent [set things up for you](https://github.com/home-assistant/iOS/issues/new?title=✨+Set+up+Copilot+instructions&body=Configure%20instructions%20for%20this%20repository%20as%20documented%20in%20%5BBest%20practices%20for%20Copilot%20coding%20agent%20in%20your%20repository%5D%28https://gh.io/copilot-coding-agent-tips%29%2E%0A%0A%3COnboard%20this%20repo%3E&assignees=copilot) — coding agent works faster and does higher quality work when set up for your repo. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: bgoncal <5808343+bgoncal@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
388 lines
13 KiB
Swift
388 lines
13 KiB
Swift
import AppIntents
|
|
import Intents
|
|
import SFSafeSymbols
|
|
import Shared
|
|
import SwiftUI
|
|
import WidgetKit
|
|
|
|
@available(iOS 17, *)
|
|
struct WidgetCustom: Widget {
|
|
var body: some WidgetConfiguration {
|
|
AppIntentConfiguration(
|
|
kind: WidgetsKind.custom.rawValue,
|
|
provider: WidgetCustomTimelineProvider()
|
|
) { timelineEntry in
|
|
if let widget = timelineEntry.widget {
|
|
WidgetBasicContainerView(emptyViewGenerator: {
|
|
AnyView(emptyView)
|
|
}, contents: modelsForWidget(
|
|
widget,
|
|
infoProvider: timelineEntry.magicItemInfoProvider,
|
|
states: timelineEntry.entitiesState,
|
|
showStates: timelineEntry.showStates
|
|
), type: .custom, showLastUpdate: timelineEntry.showLastUpdateTime)
|
|
} else {
|
|
emptyView
|
|
.widgetBackground(Color.clear)
|
|
}
|
|
}
|
|
.contentMarginsDisabledIfAvailable()
|
|
.configurationDisplayName(L10n.Widgets.Preview.Custom.title)
|
|
.description(L10n.Widgets.Preview.Custom.description)
|
|
.supportedFamilies(WidgetCustomSupportedFamilies.families)
|
|
}
|
|
|
|
private var emptyView: some View {
|
|
Link(destination: AppConstants.createCustomWidgetURL.withWidgetAuthenticity()) {
|
|
VStack(spacing: DesignSystem.Spaces.two) {
|
|
Image(systemSymbol: .squareBadgePlusFill)
|
|
.foregroundStyle(Color.haPrimary)
|
|
.font(.system(size: 55))
|
|
Text(verbatim: L10n.Widgets.Preview.Empty.Create.button)
|
|
.foregroundStyle(.secondary)
|
|
.font(.footnote)
|
|
}
|
|
}
|
|
}
|
|
|
|
private func modelsForWidget(
|
|
_ widget: CustomWidget?,
|
|
infoProvider: MagicItemProviderProtocol,
|
|
states: [MagicItem: WidgetEntityState],
|
|
showStates: Bool
|
|
) -> [WidgetBasicViewModel] {
|
|
guard let widget else { return [] }
|
|
|
|
return widget.items.map { magicItem in
|
|
let info = infoProvider.getInfo(for: magicItem)
|
|
let state: WidgetEntityState? = states[magicItem]
|
|
|
|
var backgroundColor: Color? = nil
|
|
var textColor: Color? = nil
|
|
|
|
if let backgroundColorHex = magicItem.customization?.backgroundColor {
|
|
backgroundColor = Color(hex: backgroundColorHex)
|
|
}
|
|
|
|
if let textColorHex = magicItem.customization?.textColor {
|
|
textColor = Color(hex: textColorHex)
|
|
}
|
|
|
|
let icon: MaterialDesignIcons = {
|
|
if let info {
|
|
return magicItem.icon(info: info)
|
|
} else {
|
|
return .gridIcon
|
|
}
|
|
}()
|
|
|
|
let iconColor: Color = {
|
|
let magicItemIconColor = {
|
|
if let iconColor = magicItem.customization?.iconColor {
|
|
return Color(hex: iconColor)
|
|
} else {
|
|
return Color.haPrimary
|
|
}
|
|
}()
|
|
|
|
if !widget.itemsStates.isEmpty {
|
|
return Color.gray
|
|
} else if showStates, [.light, .switch, .inputBoolean, .cover, .fan].contains(magicItem.domain) {
|
|
if state?.domainState?.isActive ?? false {
|
|
return state?.color ?? magicItemIconColor
|
|
} else {
|
|
return Color.gray
|
|
}
|
|
} else {
|
|
return magicItemIconColor
|
|
}
|
|
}()
|
|
|
|
let title: String = {
|
|
if let info {
|
|
return magicItem.name(info: info)
|
|
} else {
|
|
return magicItem.id
|
|
}
|
|
}()
|
|
|
|
let useCustomColors = backgroundColor != nil || textColor != nil
|
|
|
|
let showConfirmation = {
|
|
if let itemState = widget.itemsStates.first(where: { $0.key == magicItem.serverUniqueId })?.value {
|
|
return itemState == .pendingConfirmation
|
|
} else {
|
|
return false
|
|
}
|
|
}()
|
|
|
|
let interactionType = magicItem.widgetInteractionType
|
|
let showIconBackground = {
|
|
switch interactionType {
|
|
case .widgetURL:
|
|
return true
|
|
case let .appIntent(widgetIntentType):
|
|
return widgetIntentType != .refresh
|
|
}
|
|
}()
|
|
|
|
return WidgetBasicViewModel(
|
|
id: magicItem.serverUniqueId,
|
|
title: title,
|
|
subtitle: state?.value,
|
|
interactionType: interactionType,
|
|
icon: icon,
|
|
showIconBackground: showIconBackground,
|
|
textColor: textColor ?? Color(uiColor: .label),
|
|
iconColor: iconColor,
|
|
backgroundColor: backgroundColor ?? Color.tileBackground,
|
|
useCustomColors: useCustomColors,
|
|
showConfirmation: showConfirmation,
|
|
requiresConfirmation: magicItem.customization?.requiresConfirmation ?? true,
|
|
widgetId: widget.id,
|
|
disabled: !widget.itemsStates.isEmpty
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
enum WidgetCustomSupportedFamilies {
|
|
@available(iOS 16.0, *)
|
|
static let families: [WidgetFamily] = [
|
|
.systemSmall,
|
|
.systemMedium,
|
|
.systemLarge,
|
|
]
|
|
}
|
|
|
|
#if DEBUG
|
|
|
|
// UNCOMMENT ON DEMAND: If all previews are uncommented, Xcode will, most probably, fail to render them all at once.
|
|
|
|
// @available(iOS 17, *)
|
|
// #Preview("Small empty", as: .systemSmall) {
|
|
// WidgetCustom()
|
|
// } timeline: {
|
|
// WidgetCustomEntry(
|
|
// date: .now,
|
|
// widget: .init(id: "123", name: "My widget", items: []),
|
|
// magicItemInfoProvider: MockMagicItemProvider(),
|
|
// entitiesState: [:],
|
|
// showLastUpdateTime: true,
|
|
// showStates: true
|
|
// )
|
|
// }
|
|
|
|
// @available(iOS 17, *)
|
|
// #Preview("Small 1 Item", as: .systemSmall) {
|
|
// WidgetCustom()
|
|
// } timeline: {
|
|
// WidgetCustomEntry(
|
|
// date: .now,
|
|
// widget: .init(id: "123", name: "My widget", items: [
|
|
// .init(id: "light.one", serverId: "1", type: .entity, action: .navigate("/lovelace/0")),
|
|
// ]),
|
|
// magicItemInfoProvider: MockMagicItemProvider(),
|
|
// entitiesState: [:],
|
|
// showLastUpdateTime: true,
|
|
// showStates: true
|
|
// )
|
|
// }
|
|
//
|
|
// @available(iOS 17, *)
|
|
// #Preview("Small 2 Items", as: .systemSmall) {
|
|
// WidgetCustom()
|
|
// } timeline: {
|
|
// WidgetCustomEntry(
|
|
// date: .now,
|
|
// widget: .init(id: "123", name: "My widget", items: [
|
|
// .init(id: "light.one", serverId: "1", type: .entity, action: .navigate("/lovelace/0")),
|
|
// .init(id: "2", serverId: "2", type: .entity),
|
|
// ]),
|
|
// magicItemInfoProvider: MockMagicItemProvider(),
|
|
// entitiesState: [:],
|
|
// showLastUpdateTime: true,
|
|
// showStates: true
|
|
// )
|
|
// }
|
|
//
|
|
// @available(iOS 17, *)
|
|
// #Preview("Small 3 Items", as: .systemSmall) {
|
|
// WidgetCustom()
|
|
// } timeline: {
|
|
// WidgetCustomEntry(
|
|
// date: .now,
|
|
// widget: .init(id: "123", name: "My widget", items: [
|
|
// .init(id: "light.one", serverId: "1", type: .entity, action: .navigate("/lovelace/0")),
|
|
// .init(id: "2", serverId: "2", type: .entity),
|
|
// .init(id: "3", serverId: "3", type: .entity),
|
|
// ]),
|
|
// magicItemInfoProvider: MockMagicItemProvider(),
|
|
// entitiesState: [.init(id: "3", serverId: "3", type: .entity): .init(value: "On", domainState: .on)],
|
|
// showLastUpdateTime: true,
|
|
// showStates: true
|
|
// )
|
|
// }
|
|
|
|
// @available(iOS 17, *)
|
|
// #Preview("Medium 1 item", as: .systemMedium) {
|
|
// WidgetCustom()
|
|
// } timeline: {
|
|
// WidgetCustomEntry(
|
|
// date: .now,
|
|
// widget: .init(id: "123", name: "My widget", items: [
|
|
// .init(id: "light.one", serverId: "1", type: .entity, action: .navigate("/lovelace/0")),
|
|
// ]),
|
|
// magicItemInfoProvider: MockMagicItemProvider(),
|
|
// entitiesState: [:],
|
|
// showLastUpdateTime: true,
|
|
// showStates: true
|
|
// )
|
|
// }
|
|
//
|
|
// @available(iOS 17, *)
|
|
// #Preview("Medium 2 items", as: .systemMedium) {
|
|
// WidgetCustom()
|
|
// } timeline: {
|
|
// WidgetCustomEntry(
|
|
// date: .now,
|
|
// widget: .init(id: "123", name: "My widget", items: [
|
|
// .init(id: "light.one", serverId: "1", type: .entity, action: .navigate("/lovelace/0")),
|
|
// .init(id: "2", serverId: "2", type: .entity),
|
|
// ]),
|
|
// magicItemInfoProvider: MockMagicItemProvider(),
|
|
// entitiesState: [.init(id: "2", serverId: "2", type: .entity): .init(value: "On", domainState: .on)],
|
|
// showLastUpdateTime: true,
|
|
// showStates: true
|
|
// )
|
|
// }
|
|
|
|
// @available(iOS 17, *)
|
|
// #Preview("Medium 3 items", as: .systemMedium) {
|
|
// WidgetCustom()
|
|
// } timeline: {
|
|
// WidgetCustomEntry(
|
|
// date: .now,
|
|
// widget: .init(id: "123", name: "My widget", items: [
|
|
// .init(id: "light.one", serverId: "1", type: .entity, action: .navigate("/lovelace/0")),
|
|
// .init(id: "2", serverId: "2", type: .entity),
|
|
// .init(id: "3", serverId: "3", type: .entity),
|
|
// ]),
|
|
// magicItemInfoProvider: MockMagicItemProvider(),
|
|
// entitiesState: [.init(id: "2", serverId: "2", type: .entity): .init(value: "On", domainState: .on)],
|
|
// showLastUpdateTime: true,
|
|
// showStates: true
|
|
// )
|
|
// }
|
|
|
|
// @available(iOS 17, *)
|
|
// #Preview("Medium 4 items", as: .systemMedium) {
|
|
// WidgetCustom()
|
|
// } timeline: {
|
|
// WidgetCustomEntry(
|
|
// date: .now,
|
|
// widget: .init(id: "123", name: "My widget", items: [
|
|
// .init(id: "light.one", serverId: "1", type: .entity, action: .navigate("/lovelace/0")),
|
|
// .init(id: "2", serverId: "2", type: .entity),
|
|
// .init(id: "3", serverId: "3", type: .entity),
|
|
// .init(id: "4", serverId: "4", type: .entity),
|
|
// ]),
|
|
// magicItemInfoProvider: MockMagicItemProvider(),
|
|
// entitiesState: [:],
|
|
// showLastUpdateTime: true,
|
|
// showStates: true
|
|
// )
|
|
// }
|
|
|
|
// @available(iOS 17, *)
|
|
// #Preview("Medium 5 items", as: .systemMedium) {
|
|
// WidgetCustom()
|
|
// } timeline: {
|
|
// WidgetCustomEntry(
|
|
// date: .now,
|
|
// widget: .init(id: "123", name: "My widget", items: [
|
|
// .init(id: "light.one", serverId: "1", type: .entity, action: .navigate("/lovelace/0")),
|
|
// .init(id: "2", serverId: "2", type: .entity),
|
|
// .init(id: "3", serverId: "3", type: .entity),
|
|
// .init(id: "4", serverId: "4", type: .entity),
|
|
// .init(id: "5", serverId: "5", type: .entity),
|
|
// ]),
|
|
// magicItemInfoProvider: MockMagicItemProvider(),
|
|
// entitiesState: [:],
|
|
// showLastUpdateTime: true,
|
|
// showStates: true
|
|
// )
|
|
// }
|
|
//
|
|
// @available(iOS 17, *)
|
|
// #Preview("Medium 6 items", as: .systemMedium) {
|
|
// WidgetCustom()
|
|
// } timeline: {
|
|
// WidgetCustomEntry(
|
|
// date: .now,
|
|
// widget: .init(id: "123", name: "My widget", items: [
|
|
// .init(id: "light.one", serverId: "1", type: .entity, action: .navigate("/lovelace/0")),
|
|
// .init(id: "2", serverId: "2", type: .entity),
|
|
// .init(id: "3", serverId: "3", type: .entity),
|
|
// .init(id: "4", serverId: "4", type: .entity),
|
|
// .init(id: "5", serverId: "5", type: .entity),
|
|
// .init(id: "6", serverId: "6", type: .entity),
|
|
// ]),
|
|
// magicItemInfoProvider: MockMagicItemProvider(),
|
|
// entitiesState: [:],
|
|
// showLastUpdateTime: true,
|
|
// showStates: true
|
|
// )
|
|
// }
|
|
//
|
|
// @available(iOS 17, *)
|
|
// #Preview("Medium empty", as: .systemMedium) {
|
|
// WidgetCustom()
|
|
// } timeline: {
|
|
// WidgetCustomEntry(
|
|
// date: .now,
|
|
// widget: nil,
|
|
// magicItemInfoProvider: MockMagicItemProvider(),
|
|
// entitiesState: [:],
|
|
// showLastUpdateTime: true,
|
|
// showStates: true
|
|
// )
|
|
// }
|
|
//
|
|
// @available(iOS 17, *)
|
|
// #Preview("Large empty", as: .systemLarge) {
|
|
// WidgetCustom()
|
|
// } timeline: {
|
|
// WidgetCustomEntry(
|
|
// date: .now,
|
|
// widget: nil,
|
|
// magicItemInfoProvider: MockMagicItemProvider(),
|
|
// entitiesState: [:],
|
|
// showLastUpdateTime: true,
|
|
// showStates: true
|
|
// )
|
|
// }
|
|
|
|
final class MockMagicItemProvider: MagicItemProviderProtocol {
|
|
func loadInformation(completion: @escaping ([String: [Shared.HAAppEntity]]) -> Void) {
|
|
/* no-op */
|
|
}
|
|
|
|
func loadInformation() async -> [String: [Shared.HAAppEntity]] {
|
|
[:]
|
|
}
|
|
|
|
func getInfo(for item: Shared.MagicItem) -> Shared.MagicItem.Info? {
|
|
if item.id == "light.one" {
|
|
return .init(id: "1", name: "Abc", iconName: "script", customization: nil)
|
|
} else {
|
|
return .init(id: "2", name: "Cba", iconName: "heart", customization: .init(iconColor: "#FFFFFF"))
|
|
}
|
|
}
|
|
|
|
func getAreaName(for item: Shared.MagicItem) -> String? {
|
|
nil
|
|
}
|
|
}
|
|
#endif
|