diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 3e0d301fc0..b05d76ffb8 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -320,6 +320,7 @@ 6F7FB8E32C660BF300867DA7 /* DailyPixelFiring.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F7FB8E22C660BF300867DA7 /* DailyPixelFiring.swift */; }; 6F7FB8E52C66158D00867DA7 /* NewTabPageShortcutsSettingsModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F7FB8E42C66158D00867DA7 /* NewTabPageShortcutsSettingsModelTests.swift */; }; 6F7FB8E72C66197E00867DA7 /* NewTabPageSectionsSettingsModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F7FB8E62C66197E00867DA7 /* NewTabPageSectionsSettingsModelTests.swift */; }; + 6F8348E32D01E401005872E3 /* AlternateAppIcons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6F8348E22D01E401005872E3 /* AlternateAppIcons.xcassets */; }; 6F8496412BC3D8EE00ADA54E /* OnboardingButtonsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F8496402BC3D8EE00ADA54E /* OnboardingButtonsView.swift */; }; 6F934F862C58DB00008364E4 /* NewTabPageSettingsPersistentStorageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F934F852C58DB00008364E4 /* NewTabPageSettingsPersistentStorageTests.swift */; }; 6F96FF102C2B128500162692 /* NewTabPageCustomizeButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F96FF0F2C2B128500162692 /* NewTabPageCustomizeButtonView.swift */; }; @@ -816,30 +817,6 @@ AA3D854723D9E88E00788410 /* AppIconSettingsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3D854623D9E88E00788410 /* AppIconSettingsCell.swift */; }; AA3D854923DA1DFB00788410 /* AppIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3D854823DA1DFB00788410 /* AppIcon.swift */; }; AA4D6A6A23DB87B1007E8790 /* AppIconManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA4D6A6923DB87B1007E8790 /* AppIconManager.swift */; }; - AA4D6A8E23DE49A5007E8790 /* AppIconBlack60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6A8423DE49A4007E8790 /* AppIconBlack60x60@2x.png */; }; - AA4D6A8F23DE49A5007E8790 /* AppIconBlack29x29@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6A8523DE49A4007E8790 /* AppIconBlack29x29@3x.png */; }; - AA4D6A9123DE49A5007E8790 /* AppIconBlack60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6A8723DE49A5007E8790 /* AppIconBlack60x60@3x.png */; }; - AA4D6A9423DE49A5007E8790 /* AppIconBlack29x29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6A8A23DE49A5007E8790 /* AppIconBlack29x29@2x.png */; }; - AA4D6AA123DE4CC4007E8790 /* AppIconBlue60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6A9723DE4CC3007E8790 /* AppIconBlue60x60@3x.png */; }; - AA4D6AA423DE4CC4007E8790 /* AppIconBlue29x29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6A9A23DE4CC3007E8790 /* AppIconBlue29x29@2x.png */; }; - AA4D6AA523DE4CC4007E8790 /* AppIconBlue29x29@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6A9B23DE4CC3007E8790 /* AppIconBlue29x29@3x.png */; }; - AA4D6AA723DE4CC4007E8790 /* AppIconBlue60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6A9D23DE4CC4007E8790 /* AppIconBlue60x60@2x.png */; }; - AA4D6AB823DE4D15007E8790 /* AppIconYellow29x29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6AAE23DE4D14007E8790 /* AppIconYellow29x29@2x.png */; }; - AA4D6AB923DE4D15007E8790 /* AppIconYellow29x29@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6AAF23DE4D14007E8790 /* AppIconYellow29x29@3x.png */; }; - AA4D6ABC23DE4D15007E8790 /* AppIconYellow60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6AB223DE4D14007E8790 /* AppIconYellow60x60@3x.png */; }; - AA4D6ABD23DE4D15007E8790 /* AppIconYellow60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6AB323DE4D15007E8790 /* AppIconYellow60x60@2x.png */; }; - AA4D6ACC23DE4D27007E8790 /* AppIconPurple60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6AC223DE4D26007E8790 /* AppIconPurple60x60@2x.png */; }; - AA4D6ACD23DE4D27007E8790 /* AppIconPurple29x29@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6AC323DE4D26007E8790 /* AppIconPurple29x29@3x.png */; }; - AA4D6ACE23DE4D27007E8790 /* AppIconPurple60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6AC423DE4D26007E8790 /* AppIconPurple60x60@3x.png */; }; - AA4D6AD323DE4D27007E8790 /* AppIconPurple29x29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6AC923DE4D26007E8790 /* AppIconPurple29x29@2x.png */; }; - AA4D6AE323DE4D33007E8790 /* AppIconGreen60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6AD923DE4D32007E8790 /* AppIconGreen60x60@2x.png */; }; - AA4D6AE623DE4D33007E8790 /* AppIconGreen60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6ADC23DE4D33007E8790 /* AppIconGreen60x60@3x.png */; }; - AA4D6AE723DE4D33007E8790 /* AppIconGreen29x29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6ADD23DE4D33007E8790 /* AppIconGreen29x29@2x.png */; }; - AA4D6AE923DE4D33007E8790 /* AppIconGreen29x29@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6ADF23DE4D33007E8790 /* AppIconGreen29x29@3x.png */; }; - AA4D6AF623DF0312007E8790 /* AppIconRed60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6AF423DF0312007E8790 /* AppIconRed60x60@3x.png */; }; - AA4D6AF723DF0312007E8790 /* AppIconRed60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6AF523DF0312007E8790 /* AppIconRed60x60@2x.png */; }; - AA4D6AFA23DF0CF6007E8790 /* AppIconRed29x29@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6AF823DF0CF5007E8790 /* AppIconRed29x29@3x.png */; }; - AA4D6AFB23DF0CF6007E8790 /* AppIconRed29x29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA4D6AF923DF0CF6007E8790 /* AppIconRed29x29@2x.png */; }; B603974929C19F6F00902A34 /* Assertions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B603974829C19F6F00902A34 /* Assertions.swift */; }; B609D5522862EAFF0088CAC2 /* InlineWKDownloadDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B609D5512862EAFF0088CAC2 /* InlineWKDownloadDelegate.swift */; }; B60DFF072872B64B0061E7C2 /* JSAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60DFF062872B64B0061E7C2 /* JSAlertController.swift */; }; @@ -1644,6 +1621,7 @@ 6F7FB8E22C660BF300867DA7 /* DailyPixelFiring.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyPixelFiring.swift; sourceTree = ""; }; 6F7FB8E42C66158D00867DA7 /* NewTabPageShortcutsSettingsModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTabPageShortcutsSettingsModelTests.swift; sourceTree = ""; }; 6F7FB8E62C66197E00867DA7 /* NewTabPageSectionsSettingsModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTabPageSectionsSettingsModelTests.swift; sourceTree = ""; }; + 6F8348E22D01E401005872E3 /* AlternateAppIcons.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = AlternateAppIcons.xcassets; sourceTree = ""; }; 6F8496402BC3D8EE00ADA54E /* OnboardingButtonsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingButtonsView.swift; sourceTree = ""; }; 6F934F852C58DB00008364E4 /* NewTabPageSettingsPersistentStorageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTabPageSettingsPersistentStorageTests.swift; sourceTree = ""; }; 6F96FF0F2C2B128500162692 /* NewTabPageCustomizeButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTabPageCustomizeButtonView.swift; sourceTree = ""; }; @@ -2633,30 +2611,6 @@ AA3D854623D9E88E00788410 /* AppIconSettingsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIconSettingsCell.swift; sourceTree = ""; }; AA3D854823DA1DFB00788410 /* AppIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIcon.swift; sourceTree = ""; }; AA4D6A6923DB87B1007E8790 /* AppIconManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIconManager.swift; sourceTree = ""; }; - AA4D6A8423DE49A4007E8790 /* AppIconBlack60x60@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconBlack60x60@2x.png"; sourceTree = ""; }; - AA4D6A8523DE49A4007E8790 /* AppIconBlack29x29@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconBlack29x29@3x.png"; sourceTree = ""; }; - AA4D6A8723DE49A5007E8790 /* AppIconBlack60x60@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconBlack60x60@3x.png"; sourceTree = ""; }; - AA4D6A8A23DE49A5007E8790 /* AppIconBlack29x29@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconBlack29x29@2x.png"; sourceTree = ""; }; - AA4D6A9723DE4CC3007E8790 /* AppIconBlue60x60@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconBlue60x60@3x.png"; sourceTree = ""; }; - AA4D6A9A23DE4CC3007E8790 /* AppIconBlue29x29@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconBlue29x29@2x.png"; sourceTree = ""; }; - AA4D6A9B23DE4CC3007E8790 /* AppIconBlue29x29@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconBlue29x29@3x.png"; sourceTree = ""; }; - AA4D6A9D23DE4CC4007E8790 /* AppIconBlue60x60@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconBlue60x60@2x.png"; sourceTree = ""; }; - AA4D6AAE23DE4D14007E8790 /* AppIconYellow29x29@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconYellow29x29@2x.png"; sourceTree = ""; }; - AA4D6AAF23DE4D14007E8790 /* AppIconYellow29x29@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconYellow29x29@3x.png"; sourceTree = ""; }; - AA4D6AB223DE4D14007E8790 /* AppIconYellow60x60@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconYellow60x60@3x.png"; sourceTree = ""; }; - AA4D6AB323DE4D15007E8790 /* AppIconYellow60x60@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconYellow60x60@2x.png"; sourceTree = ""; }; - AA4D6AC223DE4D26007E8790 /* AppIconPurple60x60@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconPurple60x60@2x.png"; sourceTree = ""; }; - AA4D6AC323DE4D26007E8790 /* AppIconPurple29x29@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconPurple29x29@3x.png"; sourceTree = ""; }; - AA4D6AC423DE4D26007E8790 /* AppIconPurple60x60@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconPurple60x60@3x.png"; sourceTree = ""; }; - AA4D6AC923DE4D26007E8790 /* AppIconPurple29x29@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconPurple29x29@2x.png"; sourceTree = ""; }; - AA4D6AD923DE4D32007E8790 /* AppIconGreen60x60@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconGreen60x60@2x.png"; sourceTree = ""; }; - AA4D6ADC23DE4D33007E8790 /* AppIconGreen60x60@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconGreen60x60@3x.png"; sourceTree = ""; }; - AA4D6ADD23DE4D33007E8790 /* AppIconGreen29x29@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconGreen29x29@2x.png"; sourceTree = ""; }; - AA4D6ADF23DE4D33007E8790 /* AppIconGreen29x29@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconGreen29x29@3x.png"; sourceTree = ""; }; - AA4D6AF423DF0312007E8790 /* AppIconRed60x60@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconRed60x60@3x.png"; sourceTree = ""; }; - AA4D6AF523DF0312007E8790 /* AppIconRed60x60@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconRed60x60@2x.png"; sourceTree = ""; }; - AA4D6AF823DF0CF5007E8790 /* AppIconRed29x29@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconRed29x29@3x.png"; sourceTree = ""; }; - AA4D6AF923DF0CF6007E8790 /* AppIconRed29x29@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIconRed29x29@2x.png"; sourceTree = ""; }; B603974829C19F6F00902A34 /* Assertions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Assertions.swift; sourceTree = ""; }; B609D5512862EAFF0088CAC2 /* InlineWKDownloadDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlineWKDownloadDelegate.swift; sourceTree = ""; }; B60DFF062872B64B0061E7C2 /* JSAlertController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSAlertController.swift; sourceTree = ""; }; @@ -5044,82 +4998,11 @@ children = ( AA4D6A6923DB87B1007E8790 /* AppIconManager.swift */, AA3D854823DA1DFB00788410 /* AppIcon.swift */, - AA4D6A8123DE4981007E8790 /* Black */, - AA4D6A9623DE4BB3007E8790 /* Blue */, - AA4D6AAB23DE4CC9007E8790 /* Green */, - AA4D6AAC23DE4CE5007E8790 /* Purple */, - AA4D6AF323DF0282007E8790 /* Red */, - AA4D6AAD23DE4D01007E8790 /* Yellow */, + 6F8348E22D01E401005872E3 /* AlternateAppIcons.xcassets */, ); name = AppIcon; sourceTree = ""; }; - AA4D6A8123DE4981007E8790 /* Black */ = { - isa = PBXGroup; - children = ( - AA4D6A8A23DE49A5007E8790 /* AppIconBlack29x29@2x.png */, - AA4D6A8523DE49A4007E8790 /* AppIconBlack29x29@3x.png */, - AA4D6A8423DE49A4007E8790 /* AppIconBlack60x60@2x.png */, - AA4D6A8723DE49A5007E8790 /* AppIconBlack60x60@3x.png */, - ); - name = Black; - sourceTree = ""; - }; - AA4D6A9623DE4BB3007E8790 /* Blue */ = { - isa = PBXGroup; - children = ( - AA4D6A9A23DE4CC3007E8790 /* AppIconBlue29x29@2x.png */, - AA4D6A9B23DE4CC3007E8790 /* AppIconBlue29x29@3x.png */, - AA4D6A9D23DE4CC4007E8790 /* AppIconBlue60x60@2x.png */, - AA4D6A9723DE4CC3007E8790 /* AppIconBlue60x60@3x.png */, - ); - name = Blue; - sourceTree = ""; - }; - AA4D6AAB23DE4CC9007E8790 /* Green */ = { - isa = PBXGroup; - children = ( - AA4D6ADD23DE4D33007E8790 /* AppIconGreen29x29@2x.png */, - AA4D6ADF23DE4D33007E8790 /* AppIconGreen29x29@3x.png */, - AA4D6AD923DE4D32007E8790 /* AppIconGreen60x60@2x.png */, - AA4D6ADC23DE4D33007E8790 /* AppIconGreen60x60@3x.png */, - ); - name = Green; - sourceTree = ""; - }; - AA4D6AAC23DE4CE5007E8790 /* Purple */ = { - isa = PBXGroup; - children = ( - AA4D6AC923DE4D26007E8790 /* AppIconPurple29x29@2x.png */, - AA4D6AC323DE4D26007E8790 /* AppIconPurple29x29@3x.png */, - AA4D6AC223DE4D26007E8790 /* AppIconPurple60x60@2x.png */, - AA4D6AC423DE4D26007E8790 /* AppIconPurple60x60@3x.png */, - ); - name = Purple; - sourceTree = ""; - }; - AA4D6AAD23DE4D01007E8790 /* Yellow */ = { - isa = PBXGroup; - children = ( - AA4D6AAE23DE4D14007E8790 /* AppIconYellow29x29@2x.png */, - AA4D6AAF23DE4D14007E8790 /* AppIconYellow29x29@3x.png */, - AA4D6AB323DE4D15007E8790 /* AppIconYellow60x60@2x.png */, - AA4D6AB223DE4D14007E8790 /* AppIconYellow60x60@3x.png */, - ); - name = Yellow; - sourceTree = ""; - }; - AA4D6AF323DF0282007E8790 /* Red */ = { - isa = PBXGroup; - children = ( - AA4D6AF923DF0CF6007E8790 /* AppIconRed29x29@2x.png */, - AA4D6AF823DF0CF5007E8790 /* AppIconRed29x29@3x.png */, - AA4D6AF523DF0312007E8790 /* AppIconRed60x60@2x.png */, - AA4D6AF423DF0312007E8790 /* AppIconRed60x60@3x.png */, - ); - name = Red; - sourceTree = ""; - }; B652DF02287C01EE00C12A9C /* ContentBlocking */ = { isa = PBXGroup; children = ( @@ -7096,16 +6979,10 @@ buildActionMask = 2147483647; files = ( F47E53DB250A9A1C0037C686 /* Onboarding.xcassets in Resources */, - AA4D6ACC23DE4D27007E8790 /* AppIconPurple60x60@2x.png in Resources */, 1E242960293F585300584836 /* cookie-icon-animated-40-light.json in Resources */, - AA4D6AB823DE4D15007E8790 /* AppIconYellow29x29@2x.png in Resources */, 984147C024F026A300362052 /* Tab.storyboard in Resources */, 4B6ED9452B992FE4007F5CAA /* vpn-dark-mode.json in Resources */, 02F880642AB206740020C2DF /* PrivacyInfo.xcprivacy in Resources */, - AA4D6A9123DE49A5007E8790 /* AppIconBlack60x60@3x.png in Resources */, - AA4D6A8E23DE49A5007E8790 /* AppIconBlack60x60@2x.png in Resources */, - AA4D6AA423DE4CC4007E8790 /* AppIconBlue29x29@2x.png in Resources */, - AA4D6AE323DE4D33007E8790 /* AppIconGreen60x60@2x.png in Resources */, F41610BC29E5DF66001F709D /* DeprecatedColors.xcassets in Resources */, 9F8E0F2A2CCA5C9D001EA7C5 /* add-to-dock-demo.mp4 in Resources */, F4F7F10B25813FE200045D62 /* 02_Water_swirl_really_small.json in Resources */, @@ -7115,7 +6992,6 @@ 1EEF12452850A923003DDE57 /* shield.json in Resources */, 85DFEDF724CB1CAB00973FE7 /* ShareSheet.xcassets in Resources */, 98DA6B3322243CC3006EA9EB /* Feedback.xcassets in Resources */, - AA4D6ABD23DE4D15007E8790 /* AppIconYellow60x60@2x.png in Resources */, 1EE411F728587AC50003FE64 /* PrivacyIcon.xcassets in Resources */, 8548D96825262C33005AAE49 /* view_highlight.json in Resources */, 85F0E97329952D7A003D5181 /* DuckDuckGo Recovery Document.pdf in Resources */, @@ -7124,48 +7000,36 @@ 85514FFD2372DA0100DBC528 /* ios13-home-row.mp4 in Resources */, 85F98F98296F4CB100742F4A /* SyncAssets.xcassets in Resources */, 31BC5F412C2B0B540004DF37 /* DuckPlayer.xcassets in Resources */, - AA4D6A9423DE49A5007E8790 /* AppIconBlack29x29@2x.png in Resources */, 7BDBAD0E2CBFB3F1000379B7 /* VPN.xcassets in Resources */, 98B001B3251EABB40090EC07 /* InfoPlist.strings in Resources */, - AA4D6ACE23DE4D27007E8790 /* AppIconPurple60x60@3x.png in Resources */, D65CEA702B6AC6C9008A759B /* Subscription.xcassets in Resources */, F1E4A4451EE89460006F2EAE /* Bookmarks.storyboard in Resources */, 84E341A01E2F7EFB00BDBA6F /* LaunchScreen.storyboard in Resources */, 98D16973250CE707009513CC /* OmniBar.xib in Resources */, F4F7F10C25813FE200045D62 /* 03_Airstream_divided_by_four.json in Resources */, - AA4D6AB923DE4D15007E8790 /* AppIconYellow29x29@3x.png in Resources */, 6F64AA5B2C481AAA00CF4489 /* Shortcuts.xcassets in Resources */, 984147B424F0264B00362052 /* Authentication.storyboard in Resources */, 1EE411FD2858B9300003FE64 /* dark-trackers-2.json in Resources */, - AA4D6ABC23DE4D15007E8790 /* AppIconYellow60x60@3x.png in Resources */, 98D98A9B25ED954100D8E3DF /* BrowsingMenuButton.xib in Resources */, D664C7B72B289AA200CBFA76 /* Subscription.storekit in Resources */, - AA4D6AE723DE4D33007E8790 /* AppIconGreen29x29@2x.png in Resources */, 1EE412002858B9300003FE64 /* dark-shield-dot.json in Resources */, 1EE412012858B9300003FE64 /* dark-trackers-3.json in Resources */, - AA4D6ACD23DE4D27007E8790 /* AppIconPurple29x29@3x.png in Resources */, 1EEF12462850A923003DDE57 /* trackers-3.json in Resources */, 85AE668E2097206E0014CF04 /* NotificationView.xib in Resources */, - AA4D6AFA23DF0CF6007E8790 /* AppIconRed29x29@3x.png in Resources */, 85A313972028E78A00327D00 /* release_notes.txt in Resources */, 9865DFFD22A84CF300D27829 /* FavoriteHomeCell.xib in Resources */, 1EE411FE2858B9300003FE64 /* dark-shield.json in Resources */, - AA4D6AD323DE4D27007E8790 /* AppIconPurple29x29@2x.png in Resources */, - AA4D6AA123DE4CC4007E8790 /* AppIconBlue60x60@3x.png in Resources */, 1DDF402B2BA05A65006850D9 /* Settings.xcassets in Resources */, 984147A824F0259000362052 /* Onboarding.storyboard in Resources */, - AA4D6AF723DF0312007E8790 /* AppIconRed60x60@2x.png in Resources */, - AA4D6AE923DE4D33007E8790 /* AppIconGreen29x29@3x.png in Resources */, 984147AE24F0261A00362052 /* Feedback.storyboard in Resources */, 984147B724F0268D00362052 /* PrivacyDashboard.storyboard in Resources */, - AA4D6AA723DE4CC4007E8790 /* AppIconBlue60x60@2x.png in Resources */, 1EEF12532851D32B003DDE57 /* trackers-2.json in Resources */, F176699F1E40BC86003D3222 /* Settings.storyboard in Resources */, 854A012F2A5563A400FCC628 /* FindInPage.xib in Resources */, 1E8AD1DD27C653F800ABA377 /* Downloads.xcassets in Resources */, F1F533841F26ABAC00D80D4F /* Localizable.strings in Resources */, 1EEF12472850A923003DDE57 /* shield-dot.json in Resources */, - AA4D6AFB23DF0CF6007E8790 /* AppIconRed29x29@2x.png in Resources */, + 6F8348E32D01E401005872E3 /* AlternateAppIcons.xcassets in Resources */, F1ED309D1EDC2EA400651986 /* TabSwitcher.storyboard in Resources */, 8524AAAC2A3888FE00EEC6D2 /* Waitlist.xcassets in Resources */, 982686B92600C0960011A8D6 /* ActionMessageView.xib in Resources */, @@ -7177,19 +7041,15 @@ 858650DB246B111900C36F8A /* DaxOnboarding.xcassets in Resources */, 984147C324F026C800362052 /* HomeRow.storyboard in Resources */, B6BA95E828924730004ABA20 /* JSAlertController.storyboard in Resources */, - AA4D6AF623DF0312007E8790 /* AppIconRed60x60@3x.png in Resources */, 85EE7F55224667DD000FE757 /* WebContainer.storyboard in Resources */, 858566E8252E4F56007501B8 /* Debug.storyboard in Resources */, 0A6CC0EF23904D5400E4F627 /* Settings.bundle in Resources */, 85A9C37920E0E00C00073340 /* HomeRow.xcassets in Resources */, B6BA95C528894A28004ABA20 /* BrowsingMenuViewController.storyboard in Resources */, - AA4D6AE623DE4D33007E8790 /* AppIconGreen60x60@3x.png in Resources */, 850ABD032AC4D46C00A733DF /* SuggestionTray.storyboard in Resources */, 1E908BF229827C480008C8F3 /* autoconsent-bundle.js in Resources */, F143C2B21E49D78C00CFDE3A /* Assets.xcassets in Resources */, 1EEF12542851D32B003DDE57 /* trackers-1.json in Resources */, - AA4D6A8F23DE49A5007E8790 /* AppIconBlack29x29@3x.png in Resources */, - AA4D6AA523DE4CC4007E8790 /* AppIconBlue29x29@3x.png in Resources */, 9F72FE272CD223A000BA35F5 /* add-to-dock-promo.json in Resources */, 1EEF124C2850A93F003DDE57 /* Trackers.xcassets in Resources */, 4B37E0502B928CA6009E81CA /* vpn-light-mode.json in Resources */, diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Black.appiconset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-black.appiconset/Contents.json similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Black.appiconset/Contents.json rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-black.appiconset/Contents.json diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Black.appiconset/Icon-Color-Black-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-black.appiconset/Icon-Color-Black-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Black.appiconset/Icon-Color-Black-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-black.appiconset/Icon-Color-Black-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Black.appiconset/Icon-Dark-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-black.appiconset/Icon-Dark-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Black.appiconset/Icon-Dark-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-black.appiconset/Icon-Dark-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Black.appiconset/Icon-Tinted-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-black.appiconset/Icon-Tinted-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Black.appiconset/Icon-Tinted-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-black.appiconset/Icon-Tinted-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Blue.appiconset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-blue.appiconset/Contents.json similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Blue.appiconset/Contents.json rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-blue.appiconset/Contents.json diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Blue.appiconset/Icon-Color-Blue-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-blue.appiconset/Icon-Color-Blue-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Blue.appiconset/Icon-Color-Blue-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-blue.appiconset/Icon-Color-Blue-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Blue.appiconset/Icon-Dark-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-blue.appiconset/Icon-Dark-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Blue.appiconset/Icon-Dark-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-blue.appiconset/Icon-Dark-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Blue.appiconset/Icon-Tinted-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-blue.appiconset/Icon-Tinted-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Blue.appiconset/Icon-Tinted-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-blue.appiconset/Icon-Tinted-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Green.appiconset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-green.appiconset/Contents.json similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Green.appiconset/Contents.json rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-green.appiconset/Contents.json diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Green.appiconset/Icon-Color-Green-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-green.appiconset/Icon-Color-Green-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Green.appiconset/Icon-Color-Green-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-green.appiconset/Icon-Color-Green-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Green.appiconset/Icon-Dark-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-green.appiconset/Icon-Dark-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Green.appiconset/Icon-Dark-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-green.appiconset/Icon-Dark-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Green.appiconset/Icon-Tinted-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-green.appiconset/Icon-Tinted-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Green.appiconset/Icon-Tinted-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-green.appiconset/Icon-Tinted-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Purple.appiconset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-purple.appiconset/Contents.json similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Purple.appiconset/Contents.json rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-purple.appiconset/Contents.json diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Purple.appiconset/Icon-Color-Purple-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-purple.appiconset/Icon-Color-Purple-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Purple.appiconset/Icon-Color-Purple-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-purple.appiconset/Icon-Color-Purple-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Purple.appiconset/Icon-Dark-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-purple.appiconset/Icon-Dark-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Purple.appiconset/Icon-Dark-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-purple.appiconset/Icon-Dark-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Purple.appiconset/Icon-Tinted-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-purple.appiconset/Icon-Tinted-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Purple.appiconset/Icon-Tinted-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-purple.appiconset/Icon-Tinted-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Yellow.appiconset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-yellow.appiconset/Contents.json similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Yellow.appiconset/Contents.json rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-yellow.appiconset/Contents.json diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Yellow.appiconset/Icon-Color-Yellow-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-yellow.appiconset/Icon-Color-Yellow-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Yellow.appiconset/Icon-Color-Yellow-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-yellow.appiconset/Icon-Color-Yellow-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Yellow.appiconset/Icon-Dark-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-yellow.appiconset/Icon-Dark-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Yellow.appiconset/Icon-Dark-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-yellow.appiconset/Icon-Dark-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Yellow.appiconset/Icon-Tinted-1024x1024.png b/DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-yellow.appiconset/Icon-Tinted-1024x1024.png similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/AppIcon-Yellow.appiconset/Icon-Tinted-1024x1024.png rename to DuckDuckGo/AlternateAppIcons.xcassets/AppIcon-yellow.appiconset/Icon-Tinted-1024x1024.png diff --git a/DuckDuckGo/Assets.xcassets/AlternateAppIcons/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/Contents.json similarity index 100% rename from DuckDuckGo/Assets.xcassets/AlternateAppIcons/Contents.json rename to DuckDuckGo/AlternateAppIcons.xcassets/Contents.json diff --git a/DuckDuckGo/AppIconBlack60x60@2x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-medium.imageset/AppIconBlack60x60@2x.png similarity index 100% rename from DuckDuckGo/AppIconBlack60x60@2x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-medium.imageset/AppIconBlack60x60@2x.png diff --git a/DuckDuckGo/AppIconBlack60x60@3x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-medium.imageset/AppIconBlack60x60@3x.png similarity index 100% rename from DuckDuckGo/AppIconBlack60x60@3x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-medium.imageset/AppIconBlack60x60@3x.png diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-medium.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-medium.imageset/Contents.json new file mode 100644 index 0000000000..ef8473b4e9 --- /dev/null +++ b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-medium.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "AppIconBlack60x60@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "AppIconBlack60x60@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DuckDuckGo/AppIconBlack29x29@2x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-small.imageset/AppIconBlack29x29@2x.png similarity index 100% rename from DuckDuckGo/AppIconBlack29x29@2x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-small.imageset/AppIconBlack29x29@2x.png diff --git a/DuckDuckGo/AppIconBlack29x29@3x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-small.imageset/AppIconBlack29x29@3x.png similarity index 100% rename from DuckDuckGo/AppIconBlack29x29@3x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-small.imageset/AppIconBlack29x29@3x.png diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-small.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-small.imageset/Contents.json new file mode 100644 index 0000000000..fc4d5ce376 --- /dev/null +++ b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-small.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "AppIconBlack29x29@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "AppIconBlack29x29@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DuckDuckGo/AppIconBlue60x60@2x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-medium.imageset/AppIconBlue60x60@2x.png similarity index 100% rename from DuckDuckGo/AppIconBlue60x60@2x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-medium.imageset/AppIconBlue60x60@2x.png diff --git a/DuckDuckGo/AppIconBlue60x60@3x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-medium.imageset/AppIconBlue60x60@3x.png similarity index 100% rename from DuckDuckGo/AppIconBlue60x60@3x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-medium.imageset/AppIconBlue60x60@3x.png diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-medium.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-medium.imageset/Contents.json new file mode 100644 index 0000000000..e6cc07454d --- /dev/null +++ b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-medium.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "AppIconBlue60x60@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "AppIconBlue60x60@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DuckDuckGo/AppIconBlue29x29@2x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-small.imageset/AppIconBlue29x29@2x.png similarity index 100% rename from DuckDuckGo/AppIconBlue29x29@2x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-small.imageset/AppIconBlue29x29@2x.png diff --git a/DuckDuckGo/AppIconBlue29x29@3x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-small.imageset/AppIconBlue29x29@3x.png similarity index 100% rename from DuckDuckGo/AppIconBlue29x29@3x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-small.imageset/AppIconBlue29x29@3x.png diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-small.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-small.imageset/Contents.json new file mode 100644 index 0000000000..45311e5d52 --- /dev/null +++ b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-small.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "AppIconBlue29x29@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "AppIconBlue29x29@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DuckDuckGo/AppIconGreen60x60@2x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-medium.imageset/AppIconGreen60x60@2x.png similarity index 100% rename from DuckDuckGo/AppIconGreen60x60@2x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-medium.imageset/AppIconGreen60x60@2x.png diff --git a/DuckDuckGo/AppIconGreen60x60@3x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-medium.imageset/AppIconGreen60x60@3x.png similarity index 100% rename from DuckDuckGo/AppIconGreen60x60@3x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-medium.imageset/AppIconGreen60x60@3x.png diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-medium.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-medium.imageset/Contents.json new file mode 100644 index 0000000000..d93bab62ab --- /dev/null +++ b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-medium.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "AppIconGreen60x60@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "AppIconGreen60x60@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DuckDuckGo/AppIconGreen29x29@2x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-small.imageset/AppIconGreen29x29@2x.png similarity index 100% rename from DuckDuckGo/AppIconGreen29x29@2x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-small.imageset/AppIconGreen29x29@2x.png diff --git a/DuckDuckGo/AppIconGreen29x29@3x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-small.imageset/AppIconGreen29x29@3x.png similarity index 100% rename from DuckDuckGo/AppIconGreen29x29@3x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-small.imageset/AppIconGreen29x29@3x.png diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-small.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-small.imageset/Contents.json new file mode 100644 index 0000000000..ceb04a3550 --- /dev/null +++ b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-small.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "AppIconGreen29x29@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "AppIconGreen29x29@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DuckDuckGo/AppIconPurple60x60@2x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-medium.imageset/AppIconPurple60x60@2x.png similarity index 100% rename from DuckDuckGo/AppIconPurple60x60@2x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-medium.imageset/AppIconPurple60x60@2x.png diff --git a/DuckDuckGo/AppIconPurple60x60@3x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-medium.imageset/AppIconPurple60x60@3x.png similarity index 100% rename from DuckDuckGo/AppIconPurple60x60@3x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-medium.imageset/AppIconPurple60x60@3x.png diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-medium.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-medium.imageset/Contents.json new file mode 100644 index 0000000000..b6288f15a9 --- /dev/null +++ b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-medium.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "AppIconPurple60x60@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "AppIconPurple60x60@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DuckDuckGo/AppIconPurple29x29@2x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-small.imageset/AppIconPurple29x29@2x.png similarity index 100% rename from DuckDuckGo/AppIconPurple29x29@2x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-small.imageset/AppIconPurple29x29@2x.png diff --git a/DuckDuckGo/AppIconPurple29x29@3x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-small.imageset/AppIconPurple29x29@3x.png similarity index 100% rename from DuckDuckGo/AppIconPurple29x29@3x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-small.imageset/AppIconPurple29x29@3x.png diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-small.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-small.imageset/Contents.json new file mode 100644 index 0000000000..c761bace5c --- /dev/null +++ b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-small.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "AppIconPurple29x29@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "AppIconPurple29x29@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DuckDuckGo/AppIconYellow60x60@2x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-medium.imageset/AppIconYellow60x60@2x.png similarity index 100% rename from DuckDuckGo/AppIconYellow60x60@2x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-medium.imageset/AppIconYellow60x60@2x.png diff --git a/DuckDuckGo/AppIconYellow60x60@3x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-medium.imageset/AppIconYellow60x60@3x.png similarity index 100% rename from DuckDuckGo/AppIconYellow60x60@3x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-medium.imageset/AppIconYellow60x60@3x.png diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-medium.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-medium.imageset/Contents.json new file mode 100644 index 0000000000..eca8b6da2f --- /dev/null +++ b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-medium.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "AppIconYellow60x60@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "AppIconYellow60x60@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DuckDuckGo/AppIconRed29x29@2x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-small.imageset/AppIconRed29x29@2x.png similarity index 100% rename from DuckDuckGo/AppIconRed29x29@2x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-small.imageset/AppIconRed29x29@2x.png diff --git a/DuckDuckGo/AppIconRed29x29@3x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-small.imageset/AppIconRed29x29@3x.png similarity index 100% rename from DuckDuckGo/AppIconRed29x29@3x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-small.imageset/AppIconRed29x29@3x.png diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-small.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-small.imageset/Contents.json new file mode 100644 index 0000000000..77b3d35b4e --- /dev/null +++ b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-small.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "AppIconRed29x29@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "AppIconRed29x29@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/AppIconYellow60x60@2x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/AppIconYellow60x60@2x.png new file mode 100644 index 0000000000..2c1c1ffd0e Binary files /dev/null and b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/AppIconYellow60x60@2x.png differ diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/AppIconYellow60x60@3x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/AppIconYellow60x60@3x.png new file mode 100644 index 0000000000..85275e46cc Binary files /dev/null and b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/AppIconYellow60x60@3x.png differ diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/Contents.json new file mode 100644 index 0000000000..eca8b6da2f --- /dev/null +++ b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "AppIconYellow60x60@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "AppIconYellow60x60@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DuckDuckGo/AppIconYellow29x29@2x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-small.imageset/AppIconYellow29x29@2x.png similarity index 100% rename from DuckDuckGo/AppIconYellow29x29@2x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-small.imageset/AppIconYellow29x29@2x.png diff --git a/DuckDuckGo/AppIconYellow29x29@3x.png b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-small.imageset/AppIconYellow29x29@3x.png similarity index 100% rename from DuckDuckGo/AppIconYellow29x29@3x.png rename to DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-small.imageset/AppIconYellow29x29@3x.png diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-small.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-small.imageset/Contents.json new file mode 100644 index 0000000000..62915d9c17 --- /dev/null +++ b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-small.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "AppIconYellow29x29@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "AppIconYellow29x29@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/Contents.json new file mode 100644 index 0000000000..73c00596a7 --- /dev/null +++ b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DuckDuckGo/AppIcon.swift b/DuckDuckGo/AppIcon.swift index 91d09a128b..c65fac87fc 100644 --- a/DuckDuckGo/AppIcon.swift +++ b/DuckDuckGo/AppIcon.swift @@ -43,29 +43,11 @@ enum AppIcon: String, CaseIterable { } var smallImage: UIImage? { - var image: UIImage? - switch self { - case .red: image = UIImage(named: "AppIconRed29x29") - case .yellow: image = UIImage(named: "AppIconYellow29x29") - case .green: image = UIImage(named: "AppIconGreen29x29") - case .blue: image = UIImage(named: "AppIconBlue29x29") - case .purple: image = UIImage(named: "AppIconPurple29x29") - case .black: image = UIImage(named: "AppIconBlack29x29") - } - return image + UIImage(named: "\(rawValue)-small") } var mediumImage: UIImage? { - var image: UIImage? - switch self { - case .red: image = UIImage(named: "AppIconRed60x60") - case .yellow: image = UIImage(named: "AppIconYellow60x60") - case .green: image = UIImage(named: "AppIconGreen60x60") - case .blue: image = UIImage(named: "AppIconBlue60x60") - case .purple: image = UIImage(named: "AppIconPurple60x60") - case .black: image = UIImage(named: "AppIconBlack60x60") - } - return image + UIImage(named: "\(rawValue)-medium") } } diff --git a/DuckDuckGo/AppIconRed60x60@2x.png b/DuckDuckGo/AppIconRed60x60@2x.png deleted file mode 100644 index 3be64c4988..0000000000 Binary files a/DuckDuckGo/AppIconRed60x60@2x.png and /dev/null differ diff --git a/DuckDuckGo/AppIconRed60x60@3x.png b/DuckDuckGo/AppIconRed60x60@3x.png deleted file mode 100644 index 16dde5f744..0000000000 Binary files a/DuckDuckGo/AppIconRed60x60@3x.png and /dev/null differ