From ebb5214b949da5bb49adddddf7636bdd404bc148 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Fri, 20 Dec 2024 11:19:39 -0300 Subject: [PATCH] Updates DRK --- DuckDuckGo.xcodeproj/project.pbxproj | 6 +-- .../xcshareddata/swiftpm/Package.resolved | 2 +- .../ControlCenterWidgetEducationView.swift | 3 +- .../Colors/Contents.json | 6 --- .../Contents.json | 38 ------------------- .../WidgetEducation.xcassets/Contents.json | 6 --- 6 files changed, 4 insertions(+), 57 deletions(-) delete mode 100644 DuckDuckGo/Widgets/Education/WidgetEducation.xcassets/Colors/Contents.json delete mode 100644 DuckDuckGo/Widgets/Education/WidgetEducation.xcassets/Colors/controlCenterWidgetBackground.colorset/Contents.json delete mode 100644 DuckDuckGo/Widgets/Education/WidgetEducation.xcassets/Contents.json diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 8b13958ff1..a2cbb0905f 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -382,7 +382,6 @@ 7B059F142D03881000371ED0 /* ControlCenterWidgetEducationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B059F132D03881000371ED0 /* ControlCenterWidgetEducationView.swift */; }; 7B059F1D2D03A7E400371ED0 /* WidgetsShared.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7B059F1C2D03A7E400371ED0 /* WidgetsShared.xcassets */; }; 7B059F1E2D03A7E400371ED0 /* WidgetsShared.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7B059F1C2D03A7E400371ED0 /* WidgetsShared.xcassets */; }; - 7B059F222D03BC4400371ED0 /* WidgetEducation.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7B059F212D03BC4400371ED0 /* WidgetEducation.xcassets */; }; 7B10FF242D11A56300F36BF2 /* ControlWidgetVPNIntents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B10FF232D11A56300F36BF2 /* ControlWidgetVPNIntents.swift */; }; 7B10FF252D11A56300F36BF2 /* ControlWidgetVPNIntents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B10FF232D11A56300F36BF2 /* ControlWidgetVPNIntents.swift */; }; 7B1604E82CB685B400A44EC6 /* Logger+TipKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1604E72CB685B400A44EC6 /* Logger+TipKit.swift */; }; @@ -1771,7 +1770,6 @@ 7B059F0D2D0387E900371ED0 /* WidgetEducationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetEducationViewController.swift; sourceTree = ""; }; 7B059F132D03881000371ED0 /* ControlCenterWidgetEducationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlCenterWidgetEducationView.swift; sourceTree = ""; }; 7B059F1C2D03A7E400371ED0 /* WidgetsShared.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = WidgetsShared.xcassets; sourceTree = ""; }; - 7B059F212D03BC4400371ED0 /* WidgetEducation.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = WidgetEducation.xcassets; sourceTree = ""; }; 7B10FF232D11A56300F36BF2 /* ControlWidgetVPNIntents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlWidgetVPNIntents.swift; sourceTree = ""; }; 7B10FF282D11AA0D00F36BF2 /* VPNiOS */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = VPNiOS; sourceTree = ""; }; 7B1604E72CB685B400A44EC6 /* Logger+TipKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Logger+TipKit.swift"; sourceTree = ""; }; @@ -4280,7 +4278,6 @@ 7B059F132D03881000371ED0 /* ControlCenterWidgetEducationView.swift */, 7B059F0C2D0387E900371ED0 /* WidgetEducationView.swift */, 7B059F0D2D0387E900371ED0 /* WidgetEducationViewController.swift */, - 7B059F212D03BC4400371ED0 /* WidgetEducation.xcassets */, ); path = Education; sourceTree = ""; @@ -7486,7 +7483,6 @@ 7B059F1E2D03A7E400371ED0 /* WidgetsShared.xcassets in Resources */, 7B4F87EC2D07396A0010B18F /* SiriEducation.xcassets in Resources */, 85C2970A247EB7AA0063A335 /* Text.xcassets in Resources */, - 7B059F222D03BC4400371ED0 /* WidgetEducation.xcassets in Resources */, 98788E9A2521DA1E00D55218 /* Localizable.stringsdict in Resources */, CB9B873E278C93C2001F4906 /* HomeMessage.xcassets in Resources */, ); @@ -11872,7 +11868,7 @@ repositoryURL = "https://github.com/duckduckgo/DesignResourcesKit"; requirement = { kind = revision; - revision = 8449a35fd8c340fea4f837e2ebd19635cdd49d50; + revision = ba2f7e26575a9529ce268ce16f01760187649ce6; }; }; F486D2EF25069482002D07D7 /* XCRemoteSwiftPackageReference "Kingfisher" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 46f945764d..db0ebd8172 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -50,7 +50,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/DesignResourcesKit", "state" : { - "revision" : "8449a35fd8c340fea4f837e2ebd19635cdd49d50" + "revision" : "ba2f7e26575a9529ce268ce16f01760187649ce6" } }, { diff --git a/DuckDuckGo/Widgets/Education/ControlCenterWidgetEducationView.swift b/DuckDuckGo/Widgets/Education/ControlCenterWidgetEducationView.swift index d799d2138f..643098de37 100644 --- a/DuckDuckGo/Widgets/Education/ControlCenterWidgetEducationView.swift +++ b/DuckDuckGo/Widgets/Education/ControlCenterWidgetEducationView.swift @@ -58,7 +58,7 @@ struct ControlCenterWidgetEducationView: View { .foregroundStyle(Color.white) .frame(width: Size.widgetWidth, height: Size.widgetHeight) .padding(Padding.widgetBorder) - .background(Circle().fill(Color(.controlCenterWidgetBackground))) + .background(Circle().fill(Color.controlWidgetBackground)) .frame(maxWidth: Size.widgetMaxWidth) self.widgetIconDetail = .view(AnyView(icon), maxWidth: Size.widgetMaxWidth) @@ -95,6 +95,7 @@ struct ControlCenterWidgetEducationView: View { private extension Color { static let background = Color(designSystemColor: .background) + static let controlWidgetBackground = Color("controlWidgetBackground", bundle: DesignResourcesKit.bundle) static let font = Color("WidgetEducationFontColor") } diff --git a/DuckDuckGo/Widgets/Education/WidgetEducation.xcassets/Colors/Contents.json b/DuckDuckGo/Widgets/Education/WidgetEducation.xcassets/Colors/Contents.json deleted file mode 100644 index 73c00596a7..0000000000 --- a/DuckDuckGo/Widgets/Education/WidgetEducation.xcassets/Colors/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/DuckDuckGo/Widgets/Education/WidgetEducation.xcassets/Colors/controlCenterWidgetBackground.colorset/Contents.json b/DuckDuckGo/Widgets/Education/WidgetEducation.xcassets/Colors/controlCenterWidgetBackground.colorset/Contents.json deleted file mode 100644 index 56e647db3c..0000000000 --- a/DuckDuckGo/Widgets/Education/WidgetEducation.xcassets/Colors/controlCenterWidgetBackground.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x87", - "green" : "0x83", - "red" : "0x81" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x87", - "green" : "0x83", - "red" : "0x81" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/DuckDuckGo/Widgets/Education/WidgetEducation.xcassets/Contents.json b/DuckDuckGo/Widgets/Education/WidgetEducation.xcassets/Contents.json deleted file mode 100644 index 73c00596a7..0000000000 --- a/DuckDuckGo/Widgets/Education/WidgetEducation.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -}