diff --git a/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/AppIcon.appiconset/Contents.json b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Debug Icon.appiconset/Contents.json similarity index 100% rename from iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/AppIcon.appiconset/Contents.json rename to iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Debug Icon.appiconset/Contents.json diff --git a/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Icon.appiconset/Contents.json b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Icon.appiconset/Contents.json new file mode 100644 index 000000000..230588010 --- /dev/null +++ b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Icon.appiconset/Contents.json @@ -0,0 +1,35 @@ +{ + "images" : [ + { + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "tinted" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/AccentColor.colorset/Contents.json b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Interface/Contents.json similarity index 51% rename from iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/AccentColor.colorset/Contents.json rename to iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Interface/Contents.json index eb8789700..73c00596a 100644 --- a/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/AccentColor.colorset/Contents.json +++ b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Interface/Contents.json @@ -1,9 +1,4 @@ { - "colors" : [ - { - "idiom" : "universal" - } - ], "info" : { "author" : "xcode", "version" : 1 diff --git a/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/WidgetBackground.colorset/Contents.json b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Interface/Symbols/Contents.json similarity index 51% rename from iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/WidgetBackground.colorset/Contents.json rename to iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Interface/Symbols/Contents.json index eb8789700..73c00596a 100644 --- a/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/WidgetBackground.colorset/Contents.json +++ b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Interface/Symbols/Contents.json @@ -1,9 +1,4 @@ { - "colors" : [ - { - "idiom" : "universal" - } - ], "info" : { "author" : "xcode", "version" : 1 diff --git a/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Interface/Symbols/comaps.symbolset/Contents.json b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Interface/Symbols/comaps.symbolset/Contents.json new file mode 100644 index 000000000..74d71d862 --- /dev/null +++ b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Interface/Symbols/comaps.symbolset/Contents.json @@ -0,0 +1,15 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "symbol-rendering-intent" : "multicolor" + }, + "symbols" : [ + { + "filename" : "comaps.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Interface/Symbols/comaps.symbolset/comaps.svg b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Interface/Symbols/comaps.symbolset/comaps.svg new file mode 100644 index 000000000..816c27a67 --- /dev/null +++ b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Interface/Symbols/comaps.symbolset/comaps.svg @@ -0,0 +1,109 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.6.0 + Requires Xcode 16 or greater + Generated from comaps + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/logo.imageset/Contents.json b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/logo.imageset/Contents.json deleted file mode 100644 index 7c58c478f..000000000 --- a/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/logo.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "logo.png", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/logo.imageset/logo.png b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/logo.imageset/logo.png deleted file mode 100644 index cf55cf3c0..000000000 Binary files a/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/logo.imageset/logo.png and /dev/null differ diff --git a/iphone/Maps/CoMapsWidgetExtension/LiveActivity/AppLogo.swift b/iphone/Maps/CoMapsWidgetExtension/LiveActivity/AppLogo.swift index bbd87296d..91f16c461 100644 --- a/iphone/Maps/CoMapsWidgetExtension/LiveActivity/AppLogo.swift +++ b/iphone/Maps/CoMapsWidgetExtension/LiveActivity/AppLogo.swift @@ -2,7 +2,7 @@ import SwiftUI struct AppLogo: View { var body: some View { - Image(.logo) + Image("comaps") .resizable() .aspectRatio(contentMode: .fit) } diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 359ca0678..1698a9be3 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -5118,7 +5118,6 @@ 6741AA571BF340DE002C974C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "Debug Icon"; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; CODE_SIGN_ENTITLEMENTS = "CoMaps-Debug.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; @@ -5153,7 +5152,6 @@ 6741AA5A1BF340DE002C974C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = Icon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; CODE_SIGN_ENTITLEMENTS = "CoMaps-Release.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; @@ -5283,7 +5281,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 347526FA1DC0B00F00918CF5 /* common-debug.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = Icon; + ASSETCATALOG_COMPILER_APPICON_NAME = "Debug Icon"; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; BUNDLE_IDENTIFIER = app.comaps.debug; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;