Fix mac reference to asset, move design system folder to shared and fix color init reference passing bundle (#2468)

<!-- Thank you for submitting a Pull Request and helping to improve Home
Assistant. Please complete the following sections to help the processing
and review of your changes. Please do not delete anything from this
template. -->

## Summary
<!-- Provide a brief summary of the changes you have made and most
importantly what they aim to achieve -->
Fix mac reference to asset, move design system folder to shared and fix
color init reference passing bundle
## Screenshots
<!-- If this is a user-facing change not in the frontend, please include
screenshots in light and dark mode. -->

## Link to pull request in Documentation repository
<!-- Pull requests that add, change or remove functionality must have a
corresponding pull request in the Companion App Documentation repository
(https://github.com/home-assistant/companion.home-assistant). Please add
the number of this pull request after the "#" -->
Documentation: home-assistant/companion.home-assistant#

## Any other notes
<!-- If there is any other information of note, like if this Pull
Request is part of a bigger change, please include it here. -->
This commit is contained in:
Bruno Pantaleão Gonçalves
2023-12-04 11:55:56 -03:00
committed by GitHub
parent 9f9179178c
commit 65244eb4c8
5 changed files with 4 additions and 4 deletions

View File

@@ -3368,7 +3368,6 @@
children = (
B657A8E91CA646EB00121384 /* AppDelegate.swift */,
D03D893720E0AF1B00D4F28D /* ClientEvents */,
42CA28AC2B101D320093B31A /* DesignSystem */,
11A183B22511BCF300CA326A /* LifecycleManager.swift */,
117EB13E2569AD3000049541 /* Notifications */,
11AF1ED82528FBAA00AAE364 /* Onboarding */,
@@ -3710,6 +3709,7 @@
isa = PBXGroup;
children = (
426740A42B17348700C1DD73 /* Assets */,
42CA28AC2B101D320093B31A /* DesignSystem */,
11B38EE0275C545C00205C7B /* Intents */,
D014EEAA212928EC008EA6F5 /* API */,
D0FF79C920D7787F0034574D /* ClientEvents */,

View File

@@ -404,8 +404,8 @@ class MenuManager {
Current.macBridge.configureStatusItem(using: AppMacBridgeStatusItemConfiguration(
isVisible: Current.settingsStore.locationVisibility.isStatusItemVisible,
image: Asset.Assets.statusItemIcon.image.cgImage!,
imageSize: Asset.Assets.statusItemIcon.image.size,
image: Asset.SharedAssets.statusItemIcon.image.cgImage!,
imageSize: Asset.SharedAssets.statusItemIcon.image.size,
accessibilityLabel: appName,
items: menuItems,
primaryActionHandler: { callbackInfo in

View File

@@ -4,6 +4,6 @@ import SwiftUI
@available(iOS 13.0, *)
public extension Color {
static func asset(_ colorAsset: ColorAsset) -> Color {
Color(colorAsset.name)
Color(colorAsset.name, bundle: Bundle(for: SettingsStore.self))
}
}