From 5e5e1fd3cdf45c8c29dbc8f6319ab1e467be54c1 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sat, 25 Feb 2023 09:01:19 -0800 Subject: [PATCH] Remove widgets --- Meshtastic.xcodeproj/project.pbxproj | 202 +----------------- .../AccentColor.colorset/Contents.json | 11 - .../AppIcon.appiconset/Contents.json | 13 -- .../Assets.xcassets/Contents.json | 6 - .../WidgetBackground.colorset/Contents.json | 11 - MeshtasticWidgets/Info.plist | 11 - .../MeshActivityAttributes.swift | 23 -- MeshtasticWidgets/MeshActivityWidget.swift | 172 --------------- .../MeshtasticWidgets.intentdefinition | 59 ----- .../MeshtasticWidgetsBundle.swift | 20 -- MeshtasticWidgetsExtension.entitlements | 10 - 11 files changed, 6 insertions(+), 532 deletions(-) delete mode 100644 MeshtasticWidgets/Assets.xcassets/AccentColor.colorset/Contents.json delete mode 100644 MeshtasticWidgets/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 MeshtasticWidgets/Assets.xcassets/Contents.json delete mode 100644 MeshtasticWidgets/Assets.xcassets/WidgetBackground.colorset/Contents.json delete mode 100644 MeshtasticWidgets/Info.plist delete mode 100644 MeshtasticWidgets/MeshActivityAttributes.swift delete mode 100644 MeshtasticWidgets/MeshActivityWidget.swift delete mode 100644 MeshtasticWidgets/MeshtasticWidgets.intentdefinition delete mode 100644 MeshtasticWidgets/MeshtasticWidgetsBundle.swift delete mode 100644 MeshtasticWidgetsExtension.entitlements diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj index 604185c6..f2bfc48d 100644 --- a/Meshtastic.xcodeproj/project.pbxproj +++ b/Meshtastic.xcodeproj/project.pbxproj @@ -35,16 +35,6 @@ DD47E3CE26F103C600029299 /* NodeList.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD47E3CD26F103C600029299 /* NodeList.swift */; }; DD47E3D626F17ED900029299 /* CircleText.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD47E3D526F17ED900029299 /* CircleText.swift */; }; DD4A911E2708C65400501B7E /* AppSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD4A911D2708C65400501B7E /* AppSettings.swift */; }; - DD4C0EFA29A8735400D3316C /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD4C0EF929A8735400D3316C /* WidgetKit.framework */; }; - DD4C0EFC29A8735400D3316C /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD4C0EFB29A8735400D3316C /* SwiftUI.framework */; }; - DD4C0EFF29A8735400D3316C /* MeshtasticWidgetsBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD4C0EFE29A8735400D3316C /* MeshtasticWidgetsBundle.swift */; }; - DD4C0F0629A8735500D3316C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DD4C0F0529A8735500D3316C /* Assets.xcassets */; }; - DD4C0F0829A8735500D3316C /* MeshtasticWidgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = DD4C0F0429A8735400D3316C /* MeshtasticWidgets.intentdefinition */; }; - DD4C0F0929A8735500D3316C /* MeshtasticWidgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = DD4C0F0429A8735400D3316C /* MeshtasticWidgets.intentdefinition */; }; - DD4C0F0C29A8735500D3316C /* MeshtasticWidgetsExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = DD4C0EF829A8735400D3316C /* MeshtasticWidgetsExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - DD4C0F1329A9DDF800D3316C /* MeshActivityAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD4C0F1229A9DDF800D3316C /* MeshActivityAttributes.swift */; }; - DD4C0F1629A9EB5000D3316C /* MeshActivityWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD4C0F1429A9E21A00D3316C /* MeshActivityWidget.swift */; }; - DD4C0F1729A9EB6300D3316C /* MeshActivityWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD4C0F1429A9E21A00D3316C /* MeshActivityWidget.swift */; }; DD4F23CD28779A3C001D37CB /* EnvironmentMetricsLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD4F23CC28779A3C001D37CB /* EnvironmentMetricsLog.swift */; }; DD5394FC276993AD00AD86B1 /* SwiftProtobuf in Frameworks */ = {isa = PBXBuildFile; productRef = DD5394FB276993AD00AD86B1 /* SwiftProtobuf */; }; DD5394FE276BA0EF00AD86B1 /* PositionEntityExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD5394FD276BA0EF00AD86B1 /* PositionEntityExtension.swift */; }; @@ -129,13 +119,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - DD4C0F0A29A8735500D3316C /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DDC2E14C26CE248E0042C5E4 /* Project object */; - proxyType = 1; - remoteGlobalIDString = DD4C0EF729A8735400D3316C; - remoteInfo = MeshtasticWidgetsExtension; - }; DDC2E16B26CE248F0042C5E4 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = DDC2E14C26CE248E0042C5E4 /* Project object */; @@ -152,20 +135,6 @@ }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - DD4C0F1129A8735600D3316C /* Embed Foundation Extensions */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 13; - files = ( - DD4C0F0C29A8735500D3316C /* MeshtasticWidgetsExtension.appex in Embed Foundation Extensions */, - ); - name = "Embed Foundation Extensions"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ A65FA974296876BF00A97686 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; C9697F9C279336B700250207 /* LocalMBTileOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalMBTileOverlay.swift; sourceTree = ""; }; @@ -196,16 +165,6 @@ DD47E3CD26F103C600029299 /* NodeList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeList.swift; sourceTree = ""; }; DD47E3D526F17ED900029299 /* CircleText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircleText.swift; sourceTree = ""; }; DD4A911D2708C65400501B7E /* AppSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettings.swift; sourceTree = ""; }; - DD4C0EF829A8735400D3316C /* MeshtasticWidgetsExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = MeshtasticWidgetsExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; - DD4C0EF929A8735400D3316C /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; }; - DD4C0EFB29A8735400D3316C /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; }; - DD4C0EFE29A8735400D3316C /* MeshtasticWidgetsBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshtasticWidgetsBundle.swift; sourceTree = ""; }; - DD4C0F0429A8735400D3316C /* MeshtasticWidgets.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = MeshtasticWidgets.intentdefinition; sourceTree = ""; }; - DD4C0F0529A8735500D3316C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - DD4C0F0729A8735500D3316C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - DD4C0F0D29A8735500D3316C /* MeshtasticWidgetsExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MeshtasticWidgetsExtension.entitlements; sourceTree = ""; }; - DD4C0F1229A9DDF800D3316C /* MeshActivityAttributes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshActivityAttributes.swift; sourceTree = ""; }; - DD4C0F1429A9E21A00D3316C /* MeshActivityWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshActivityWidget.swift; sourceTree = ""; }; DD4F23CC28779A3C001D37CB /* EnvironmentMetricsLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnvironmentMetricsLog.swift; sourceTree = ""; }; DD5394FD276BA0EF00AD86B1 /* PositionEntityExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PositionEntityExtension.swift; sourceTree = ""; }; DD58C5F12919AD3C00D5BEFB /* ChannelEntityExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelEntityExtension.swift; sourceTree = ""; }; @@ -303,15 +262,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - DD4C0EF529A8735400D3316C /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - DD4C0EFC29A8735400D3316C /* SwiftUI.framework in Frameworks */, - DD4C0EFA29A8735400D3316C /* WidgetKit.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DDC2E15126CE248E0042C5E4 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -398,19 +348,6 @@ path = Settings; sourceTree = ""; }; - DD4C0EFD29A8735400D3316C /* MeshtasticWidgets */ = { - isa = PBXGroup; - children = ( - DD4C0EFE29A8735400D3316C /* MeshtasticWidgetsBundle.swift */, - DD4C0F0429A8735400D3316C /* MeshtasticWidgets.intentdefinition */, - DD4C0F0529A8735500D3316C /* Assets.xcassets */, - DD4C0F0729A8735500D3316C /* Info.plist */, - DD4C0F1229A9DDF800D3316C /* MeshActivityAttributes.swift */, - DD4C0F1429A9E21A00D3316C /* MeshActivityWidget.swift */, - ); - path = MeshtasticWidgets; - sourceTree = ""; - }; DD5E51EF298EE33B00D21B61 /* meshtastic */ = { isa = PBXGroup; children = ( @@ -505,8 +442,6 @@ DD8EDE9226F97A2B00A5A10B /* Frameworks */ = { isa = PBXGroup; children = ( - DD4C0EF929A8735400D3316C /* WidgetKit.framework */, - DD4C0EFB29A8735400D3316C /* SwiftUI.framework */, ); name = Frameworks; sourceTree = ""; @@ -522,13 +457,11 @@ DDC2E14B26CE248E0042C5E4 = { isa = PBXGroup; children = ( - DD4C0F0D29A8735500D3316C /* MeshtasticWidgetsExtension.entitlements */, DDCDC6CD29481FCC004C1DDA /* Localizable.strings */, DD3CC6BA28E366DF00FA9159 /* Meshtastic.xcdatamodeld */, DDC2E15626CE248E0042C5E4 /* Meshtastic */, DDC2E16D26CE248F0042C5E4 /* MeshtasticTests */, DDC2E17826CE248F0042C5E4 /* MeshtasticUITests */, - DD4C0EFD29A8735400D3316C /* MeshtasticWidgets */, DDC2E15526CE248E0042C5E4 /* Products */, DD8EDE9226F97A2B00A5A10B /* Frameworks */, ); @@ -541,7 +474,6 @@ DDC2E15426CE248E0042C5E4 /* Meshtastic.app */, DDC2E16A26CE248F0042C5E4 /* MeshtasticTests.xctest */, DDC2E17526CE248F0042C5E4 /* MeshtasticUITests.xctest */, - DD4C0EF829A8735400D3316C /* MeshtasticWidgetsExtension.appex */, ); name = Products; sourceTree = ""; @@ -680,23 +612,6 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - DD4C0EF729A8735400D3316C /* MeshtasticWidgetsExtension */ = { - isa = PBXNativeTarget; - buildConfigurationList = DD4C0F0E29A8735600D3316C /* Build configuration list for PBXNativeTarget "MeshtasticWidgetsExtension" */; - buildPhases = ( - DD4C0EF429A8735400D3316C /* Sources */, - DD4C0EF529A8735400D3316C /* Frameworks */, - DD4C0EF629A8735400D3316C /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = MeshtasticWidgetsExtension; - productName = MeshtasticWidgetsExtension; - productReference = DD4C0EF829A8735400D3316C /* MeshtasticWidgetsExtension.appex */; - productType = "com.apple.product-type.app-extension"; - }; DDC2E15326CE248E0042C5E4 /* Meshtastic */ = { isa = PBXNativeTarget; buildConfigurationList = DDC2E17E26CE248F0042C5E4 /* Build configuration list for PBXNativeTarget "Meshtastic" */; @@ -705,12 +620,10 @@ DDC2E15126CE248E0042C5E4 /* Frameworks */, DDC2E15226CE248E0042C5E4 /* Resources */, BB450974275599CE00509624 /* ShellScript */, - DD4C0F1129A8735600D3316C /* Embed Foundation Extensions */, ); buildRules = ( ); dependencies = ( - DD4C0F0B29A8735500D3316C /* PBXTargetDependency */, ); name = Meshtastic; packageProductDependencies = ( @@ -763,12 +676,9 @@ DDC2E14C26CE248E0042C5E4 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1420; + LastSwiftUpdateCheck = 1250; LastUpgradeCheck = 1250; TargetAttributes = { - DD4C0EF729A8735400D3316C = { - CreatedOnToolsVersion = 14.2; - }; DDC2E15326CE248E0042C5E4 = { CreatedOnToolsVersion = 12.5.1; LastSwiftMigration = 1340; @@ -806,20 +716,11 @@ DDC2E15326CE248E0042C5E4 /* Meshtastic */, DDC2E16926CE248F0042C5E4 /* MeshtasticTests */, DDC2E17426CE248F0042C5E4 /* MeshtasticUITests */, - DD4C0EF729A8735400D3316C /* MeshtasticWidgetsExtension */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - DD4C0EF629A8735400D3316C /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DD4C0F0629A8735500D3316C /* Assets.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DDC2E15226CE248E0042C5E4 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -867,16 +768,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - DD4C0EF429A8735400D3316C /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DD4C0F1629A9EB5000D3316C /* MeshActivityWidget.swift in Sources */, - DD4C0EFF29A8735400D3316C /* MeshtasticWidgetsBundle.swift in Sources */, - DD4C0F0829A8735500D3316C /* MeshtasticWidgets.intentdefinition in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DDC2E15026CE248E0042C5E4 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -889,7 +780,6 @@ DD5E523F298F5A9E00D21B61 /* AirQualityIndexCompact.swift in Sources */, DD964FBF296E76EF007C176F /* WaypointFormView.swift in Sources */, DD3501892852FC3B000FC853 /* Settings.swift in Sources */, - DD4C0F0929A8735500D3316C /* MeshtasticWidgets.intentdefinition in Sources */, DD5D0A9C2931B9F200F7EA61 /* EthernetModes.swift in Sources */, DD5E5203298EE33B00D21B61 /* config.pb.swift in Sources */, DD798B072915928D005217CD /* ChannelMessageList.swift in Sources */, @@ -946,7 +836,6 @@ DDB6ABE028B13AC700384BA1 /* DeviceRoles.swift in Sources */, DD86D40C287F401000BAEB7A /* SaveChannelQRCode.swift in Sources */, DDA1C48E28DB49D3009933EC /* ChannelRoles.swift in Sources */, - DD4C0F1729A9EB6300D3316C /* MeshActivityWidget.swift in Sources */, DD8ED9C8289CE4B900B3B0AB /* RoutingError.swift in Sources */, DD5E5202298EE33B00D21B61 /* admin.pb.swift in Sources */, DD964FC62975DBFD007C176F /* QueryCoreData.swift in Sources */, @@ -954,7 +843,6 @@ DD8ED9C52898D51F00B3B0AB /* NetworkConfig.swift in Sources */, DDC3B274283F411B00AC321C /* LastHeardText.swift in Sources */, DD2E65262767A01F00E45FC5 /* NodeDetail.swift in Sources */, - DD4C0F1329A9DDF800D3316C /* MeshActivityAttributes.swift in Sources */, DD1925B928CDA93900720036 /* SerialConfigEnums.swift in Sources */, DD86D4112881D16900BAEB7A /* WriteCsvFile.swift in Sources */, DD86D40F2881BE4C00BAEB7A /* CsvDocument.swift in Sources */, @@ -1008,11 +896,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - DD4C0F0B29A8735500D3316C /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = DD4C0EF729A8735400D3316C /* MeshtasticWidgetsExtension */; - targetProxy = DD4C0F0A29A8735500D3316C /* PBXContainerItemProxy */; - }; DDC2E16C26CE248F0042C5E4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = DDC2E15326CE248E0042C5E4 /* Meshtastic */; @@ -1039,68 +922,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - DD4C0F0F29A8735600D3316C /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CODE_SIGN_ENTITLEMENTS = MeshtasticWidgetsExtension.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = GCH7VS5Y9R; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = MeshtasticWidgets/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = MeshtasticWidgets; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - IPHONEOS_DEPLOYMENT_TARGET = 16.2; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.MeshtasticWidgets; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SUPPORTS_MACCATALYST = YES; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - DD4C0F1029A8735600D3316C /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CODE_SIGN_ENTITLEMENTS = MeshtasticWidgetsExtension.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = GCH7VS5Y9R; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = MeshtasticWidgets/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = MeshtasticWidgets; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - IPHONEOS_DEPLOYMENT_TARGET = 16.2; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.MeshtasticWidgets; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SUPPORTS_MACCATALYST = YES; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; DDC2E17C26CE248F0042C5E4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1224,7 +1045,6 @@ DDC2E17F26CE248F0042C5E4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; @@ -1239,12 +1059,12 @@ INFOPLIST_FILE = Meshtastic/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Meshtastic; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; - IPHONEOS_DEPLOYMENT_TARGET = 16.2; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.0.16; + MARKETING_VERSION = 2.0.15; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; @@ -1258,7 +1078,6 @@ DDC2E18026CE248F0042C5E4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; @@ -1273,12 +1092,12 @@ INFOPLIST_FILE = Meshtastic/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Meshtastic; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; - IPHONEOS_DEPLOYMENT_TARGET = 16.2; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.0.16; + MARKETING_VERSION = 2.0.15; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; @@ -1380,15 +1199,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - DD4C0F0E29A8735600D3316C /* Build configuration list for PBXNativeTarget "MeshtasticWidgetsExtension" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DD4C0F0F29A8735600D3316C /* Debug */, - DD4C0F1029A8735600D3316C /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; DDC2E14F26CE248E0042C5E4 /* Build configuration list for PBXProject "Meshtastic" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1481,4 +1291,4 @@ /* End XCVersionGroup section */ }; rootObject = DDC2E14C26CE248E0042C5E4 /* Project object */; -} +} \ No newline at end of file diff --git a/MeshtasticWidgets/Assets.xcassets/AccentColor.colorset/Contents.json b/MeshtasticWidgets/Assets.xcassets/AccentColor.colorset/Contents.json deleted file mode 100644 index eb878970..00000000 --- a/MeshtasticWidgets/Assets.xcassets/AccentColor.colorset/Contents.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "colors" : [ - { - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MeshtasticWidgets/Assets.xcassets/AppIcon.appiconset/Contents.json b/MeshtasticWidgets/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 13613e3e..00000000 --- a/MeshtasticWidgets/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MeshtasticWidgets/Assets.xcassets/Contents.json b/MeshtasticWidgets/Assets.xcassets/Contents.json deleted file mode 100644 index 73c00596..00000000 --- a/MeshtasticWidgets/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MeshtasticWidgets/Assets.xcassets/WidgetBackground.colorset/Contents.json b/MeshtasticWidgets/Assets.xcassets/WidgetBackground.colorset/Contents.json deleted file mode 100644 index eb878970..00000000 --- a/MeshtasticWidgets/Assets.xcassets/WidgetBackground.colorset/Contents.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "colors" : [ - { - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MeshtasticWidgets/Info.plist b/MeshtasticWidgets/Info.plist deleted file mode 100644 index 0f118fb7..00000000 --- a/MeshtasticWidgets/Info.plist +++ /dev/null @@ -1,11 +0,0 @@ - - - - - NSExtension - - NSExtensionPointIdentifier - com.apple.widgetkit-extension - - - diff --git a/MeshtasticWidgets/MeshActivityAttributes.swift b/MeshtasticWidgets/MeshActivityAttributes.swift deleted file mode 100644 index cf00b260..00000000 --- a/MeshtasticWidgets/MeshActivityAttributes.swift +++ /dev/null @@ -1,23 +0,0 @@ -// -// MeshActivityAttributes.swift -// Meshtastic -// -// Copyright(c) Garth Vander Houwen 2/24/23. -// - -import Foundation -import ActivityKit - -struct MeshActivityAttributes: ActivityAttributes { - public typealias MyActivityStatus = ContentState - - public struct ContentState: Codable, Hashable { - var timerRange: ClosedRange - } - - var nodeNum: Int - var nodeName: String - var channelUtilization: Double - var airtime: Double - var activityName: String -} diff --git a/MeshtasticWidgets/MeshActivityWidget.swift b/MeshtasticWidgets/MeshActivityWidget.swift deleted file mode 100644 index 2933be20..00000000 --- a/MeshtasticWidgets/MeshActivityWidget.swift +++ /dev/null @@ -1,172 +0,0 @@ -//// -//// MeshActivityWidget.swift -//// Meshtastic -//// -//// Created by Garth Vander Houwen on 2/24/23. -//// -// -///* -//See LICENSE folder for this sample’s licensing information. -// -//Abstract: -//Defines the live activity and dynamic island. -//*/ -// -//import SwiftUI -//import WidgetKit -// -// -//struct MeshActivityWidget: Widget { -// -// var body: some WidgetConfiguration { -// -// ActivityConfiguration(for: MeshActivityAttributes.self) { context in -// LiveActivityView(orderNumber: String(context.attributes.nodeNum), timerRange: context.state.timerRange) -// .widgetURL(URL(string: "meshtastic://node/\(context.attributes.nodeNum)")) -// } dynamicIsland: { context in -// DynamicIsland { -// DynamicIslandExpandedRegion(.leading) { -// ExpandedLeadingView() -// } -// -// DynamicIslandExpandedRegion(.trailing, priority: 1) { -// ExpandedTrailingView(orderNumber: String(context.attributes.nodeNum), timerInterval: context.state.timerRange) -// .dynamicIsland(verticalPlacement: .belowIfTooWide) -// } -// } compactLeading: { -// Image("IslandCompactIcon") -// .padding(4) -// .background(.indigo.gradient, in: ContainerRelativeShape()) -// -// } compactTrailing: { -// Text(timerInterval: context.state.timerRange, countsDown: true) -// .monospacedDigit() -// .foregroundColor(Color("LightIndigo")) -// .frame(width: 40) -// } minimal: { -// Image("IslandCompactIcon") -// .padding(4) -// .background(.indigo.gradient, in: ContainerRelativeShape()) -// } -// .contentMargins(.trailing, 32, for: .expanded) -// .contentMargins([.leading, .top, .bottom], 6, for: .compactLeading) -// .contentMargins(.all, 6, for: .minimal) -// .widgetURL(URL(string: "foodtruck://order/\(context.attributes.nodeNum)")) -// } -// } -//} -// -//struct LiveActivityView: View { -// @Environment(\.colorScheme) private var colorScheme -// @Environment(\.isLuminanceReduced) var isLuminanceReduced -// -// var orderNumber: String -// var timerRange: ClosedRange -// -// var body: some View { -// HStack { -// Image("IslandExpandedIcon") -// .clipShape(ContainerRelativeShape()) -// .opacity(isLuminanceReduced ? 0.5 : 1.0) -// OrderInfoView(orderNumber: orderNumber) -// Spacer() -// OrderTimerView(timerRange: timerRange) -// } -// .tint(.primary) -// .padding([.leading, .top, .bottom]) -// .padding(.trailing, 32) -// .activityBackgroundTint(colorScheme == .light ? Color("LiveActivityBackground") : Color("AccentColorDimmed")) -// .activitySystemActionForegroundColor(.primary) -// } -//} -// -//struct ExpandedLeadingView: View { -// var body: some View { -// Image("IslandExpandedIcon") -// .clipShape(ContainerRelativeShape()) -// } -//} -// -//struct OrderInfoView: View { -// @Environment(\.isLuminanceReduced) var isLuminanceReduced -// -// var orderNumber: String -// -// var body: some View { -// VStack(alignment: .leading, spacing: 0) { -// Text("Order \(orderNumber)") -// .font(.title3) -// .fontWeight(.semibold) -// .foregroundStyle(.tint) -// -// Text("6 donuts") -// .font(.subheadline) -// .fontWeight(.medium) -// .foregroundStyle(.secondary) -// .opacity(isLuminanceReduced ? 0.5 : 1.0) -// } -// } -//} -// -//struct OrderTimerView: View { -// @Environment(\.isLuminanceReduced) var isLuminanceReduced -// -// var timerRange: ClosedRange -// -// var body: some View { -// VStack(alignment: .trailing) { -// Text(timerInterval: timerRange, countsDown: true) -// .monospacedDigit() -// .multilineTextAlignment(.trailing) -// .frame(width: 80) -// .font(.title3) -// .fontWeight(.semibold) -// .foregroundStyle(.tint) -// Text("Remaining") -// .font(.subheadline) -// .fontWeight(.medium) -// .foregroundStyle(.secondary) -// .opacity(isLuminanceReduced ? 0.5 : 1.0) -// } -// } -//} -// -//struct ExpandedTrailingView: View { -// var orderNumber: String -// var timerInterval: ClosedRange -// -// var body: some View { -// HStack(alignment: .lastTextBaseline) { -// OrderInfoView(orderNumber: orderNumber) -// Spacer() -// OrderTimerView(timerRange: timerInterval) -// } -// .tint(Color("LightIndigo")) -// } -//} -//struct MeshActivityPreviewProvider: PreviewProvider { -// static let activityAttributes = MeshActivityAttributes( -// nodeNum: 666, nodeName: "Garth Hydra", channelUtilization: 45.0, airtime: 10.0, activityName: "activity name" -// ) -// -// static let state = MeshActivityAttributes.ContentState( -// timerRange: Date.now...Date(timeIntervalSinceNow: 30)) -// -// static var previews: some View { -// activityAttributes -// .previewContext(state, viewKind: .dynamicIsland(.compact)) -// .previewDisplayName("Compact") -// -// activityAttributes -// .previewContext(state, viewKind: .dynamicIsland(.expanded)) -// .previewDisplayName("Expanded") -// -// activityAttributes -// .previewContext(state, viewKind: .content) -// .previewDisplayName("Notification") -// -// activityAttributes -// .previewContext(state, viewKind: .dynamicIsland(.minimal)) -// .previewDisplayName("Minimal") -// } -//} diff --git a/MeshtasticWidgets/MeshtasticWidgets.intentdefinition b/MeshtasticWidgets/MeshtasticWidgets.intentdefinition deleted file mode 100644 index bdb40455..00000000 --- a/MeshtasticWidgets/MeshtasticWidgets.intentdefinition +++ /dev/null @@ -1,59 +0,0 @@ - - - - - INEnums - - INIntentDefinitionModelVersion - 1.2 - INIntentDefinitionNamespace - 88xZPY - INIntentDefinitionSystemVersion - 20A294 - INIntentDefinitionToolsBuildVersion - 12A6144 - INIntentDefinitionToolsVersion - 12.0 - INIntents - - - INIntentCategory - information - INIntentDescriptionID - tVvJ9c - INIntentEligibleForWidgets - - INIntentIneligibleForSuggestions - - INIntentName - Configuration - INIntentResponse - - INIntentResponseCodes - - - INIntentResponseCodeName - success - INIntentResponseCodeSuccess - - - - INIntentResponseCodeName - failure - - - - INIntentTitle - Configuration - INIntentTitleID - gpCwrM - INIntentType - Custom - INIntentVerb - View - - - INTypes - - - diff --git a/MeshtasticWidgets/MeshtasticWidgetsBundle.swift b/MeshtasticWidgets/MeshtasticWidgetsBundle.swift deleted file mode 100644 index 88f6af9a..00000000 --- a/MeshtasticWidgets/MeshtasticWidgetsBundle.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// MeshtasticWidgetsBundle.swift -// MeshtasticWidgets -// -// Created by Garth Vander Houwen on 2/23/23. -// - -import WidgetKit -import SwiftUI - -@main -struct MeshtasticWidgetsBundle: WidgetBundle { - var body: some Widget { - - // MARK: - Live Activity Widgets - #if canImport(ActivityKit) - //MeshActivityWidget() - #endif - } -} diff --git a/MeshtasticWidgetsExtension.entitlements b/MeshtasticWidgetsExtension.entitlements deleted file mode 100644 index ee95ab7e..00000000 --- a/MeshtasticWidgetsExtension.entitlements +++ /dev/null @@ -1,10 +0,0 @@ - - - - - com.apple.security.app-sandbox - - com.apple.security.network.client - - -