Skip to content

Commit

Permalink
updated icons (#32)
Browse files Browse the repository at this point in the history 
Task/Issue URL: https://app.asana.com/0/0/1204474909245234/f
Tech Design URL:
CC:

Description:

Updates icons and some other assets.

Steps to test this PR:

Build, Run, Smoke test, look for any graphical glitches
  • Loading branch information
@brindy
brindy committed May 4, 2023
1 parent a6ea35f commit 038dc1d
Show file tree
Hide file tree
Showing 48 changed files with 130 additions and 67 deletions.
Binary file modified App/Assets.xcassets/OnboardingLogo.imageset/updatedLogo.pdf
View file
Binary file not shown.
Binary file modified App/Assets.xcassets/OnboardingLogo.imageset/updatedLogoDarkTheme.pdf
View file
Binary file not shown.
24 changes: 12 additions & 12 deletions App/Assets.xcassets/ScreenshotExtensions.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
{
"images" : [
{
"filename" : "enable_light-theme@1x.png",
"idiom" : "universal",
"filename" : "enable_light-theme@1x.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "enable_dark-theme@1x.jpg",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "enable_dark-theme@1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "enable_light-theme@2x.png",
"idiom" : "universal",
"filename" : "enable_light-theme@2x.jpg",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "enable_dark-theme@2x.jpg",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "enable_dark-theme@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
},
{
"idiom" : "universal",
"scale" : "3x",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
]
],
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Binary file removed App/Assets.xcassets/ScreenshotExtensions.imageset/enable_dark-theme@1x.jpg
View file
Binary file not shown.
Binary file added App/Assets.xcassets/ScreenshotExtensions.imageset/enable_dark-theme@1x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed App/Assets.xcassets/ScreenshotExtensions.imageset/enable_dark-theme@2x.jpg
View file
Binary file not shown.
Binary file added App/Assets.xcassets/ScreenshotExtensions.imageset/enable_dark-theme@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed App/Assets.xcassets/ScreenshotExtensions.imageset/enable_light-theme@1x.jpg
View file
Binary file not shown.
Binary file added App/Assets.xcassets/ScreenshotExtensions.imageset/enable_light-theme@1x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed App/Assets.xcassets/ScreenshotExtensions.imageset/enable_light-theme@2x.jpg
View file
Binary file not shown.
Binary file added App/Assets.xcassets/ScreenshotExtensions.imageset/enable_light-theme@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 12 additions & 12 deletions App/Assets.xcassets/ScreenshotSearchEngine.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
{
"images" : [
{
"filename" : "Default_light-theme@1x.jpg",
"idiom" : "universal",
"filename" : "image_2.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "image_4.jpg",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "Default_dark-theme@1x.jpg",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Default_light-theme@2x.jpg",
"idiom" : "universal",
"filename" : "image_2@2x.jpg",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "image_4@2x.jpg",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "Default_dark-theme@2x.jpg",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
},
{
"idiom" : "universal",
"scale" : "3x",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
]
],
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Binary file added App/Assets.xcassets/ScreenshotSearchEngine.imageset/Default_dark-theme@1x.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added App/Assets.xcassets/ScreenshotSearchEngine.imageset/Default_dark-theme@2x.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added App/Assets.xcassets/ScreenshotSearchEngine.imageset/Default_light-theme@1x.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added App/Assets.xcassets/ScreenshotSearchEngine.imageset/Default_light-theme@2x.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed App/Assets.xcassets/ScreenshotSearchEngine.imageset/image_2.jpg
View file
Binary file not shown.
Binary file removed App/Assets.xcassets/ScreenshotSearchEngine.imageset/image_2@2x.jpg
View file
Binary file not shown.
Binary file removed App/Assets.xcassets/ScreenshotSearchEngine.imageset/image_4.jpg
View file
Binary file not shown.
Binary file removed App/Assets.xcassets/ScreenshotSearchEngine.imageset/image_4@2x.jpg
View file
Binary file not shown.
18 changes: 9 additions & 9 deletions App/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down Expand Up @@ -745,19 +745,19 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="rKT-0T-Bla">
<rect key="frame" x="268" y="323" width="154" height="122"/>
<rect key="frame" x="268" y="322" width="154" height="123"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="OnboardingLogo" id="ei6-Rw-d6d"/>
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ok5-Tf-GTo">
<rect key="frame" x="249" y="302" width="193" height="13"/>
<rect key="frame" x="249" y="301" width="193" height="13"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="P R I V A C Y E S S E N T I A L S 1 . 0" id="H7j-Jt-dzE">
<font key="font" metaFont="systemHeavy" size="10"/>
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FJI-1H-589">
<rect key="frame" x="91" y="233" width="508" height="46"/>
<rect key="frame" x="91" y="232" width="508" height="46"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="rZP-Y1-M6U">
<rect key="frame" x="0.0" y="0.0" width="508" height="46"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand Down Expand Up @@ -797,7 +797,7 @@
</scroller>
</scrollView>
<box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="y39-xW-L0p">
<rect key="frame" x="135" y="102" width="420" height="89"/>
<rect key="frame" x="135" y="101" width="420" height="89"/>
<view key="contentView" id="ZhB-tg-FZD">
<rect key="frame" x="1" y="1" width="418" height="87"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand Down Expand Up @@ -910,7 +910,7 @@
<color key="fillColor" name="HomeScreenFill"/>
</box>
<box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="lHt-jp-tUY">
<rect key="frame" x="135" y="54" width="420" height="49"/>
<rect key="frame" x="135" y="53" width="420" height="49"/>
<view key="contentView" id="IVi-6S-oql">
<rect key="frame" x="1" y="1" width="418" height="47"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand Down Expand Up @@ -958,7 +958,7 @@
<color key="fillColor" name="HomeScreenFill"/>
</box>
<button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SMy-5a-asi">
<rect key="frame" x="564" y="65" width="25" height="25"/>
<rect key="frame" x="564" y="64" width="25" height="25"/>
<buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="SSc-Dd-hfP">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
Expand Down Expand Up @@ -1077,7 +1077,7 @@
<image name="ExtensionActive" width="14" height="14"/>
<image name="ExtensionInactive" width="14" height="14"/>
<image name="FeedbackSent" width="140" height="98"/>
<image name="OnboardingLogo" width="154" height="122"/>
<image name="OnboardingLogo" width="154" height="123"/>
<image name="RemoveEntry" width="24" height="24"/>
<image name="SearchExtension" width="14" height="14"/>
<namedColor name="HomeEssentialsStateEnabled">
Expand Down
10 changes: 7 additions & 3 deletions App/Onboarding/Onboarding.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="AfP-Og-hqd">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="AfP-Og-hqd">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down Expand Up @@ -164,6 +164,10 @@
</button>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gxl-lN-A6s">
<rect key="frame" x="27" y="442" width="140" height="38"/>
<constraints>
<constraint firstAttribute="height" constant="38" id="MCg-XH-0eb"/>
<constraint firstAttribute="width" constant="140" id="dv5-wg-zLq"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="LogoHorizontalText" id="dhZ-2E-Eae"/>
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UET-kF-jZx">
Expand Down Expand Up @@ -483,7 +487,7 @@
</scene>
</scenes>
<resources>
<image name="LogoHorizontalText" width="140" height="38"/>
<image name="LogoHorizontalText" width="2000" height="551"/>
<image name="OnboardingOpen" width="160" height="108"/>
<image name="ScreenshotExtensions" width="800" height="270"/>
<image name="ScreenshotSearchEngine" width="800" height="230"/>
Expand Down
36 changes: 18 additions & 18 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1956,15 +1956,15 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = App/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 1.6.4;
MARKETING_VERSION = 1.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.macos.PrivacyEssentials;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -1979,7 +1979,7 @@
CODE_SIGN_ENTITLEMENTS = SafariAppExtension/SafariCI.entitlements;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = SafariAppExtension/Info.plist;
Expand All @@ -1988,7 +1988,7 @@
"@executable_path/../Frameworks",
"@executable_path/../../../../Frameworks",
);
MARKETING_VERSION = 1.6.4;
MARKETING_VERSION = 1.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.macos.PrivacyEssentials.SafariAppExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -2004,7 +2004,7 @@
CODE_SIGN_ENTITLEMENTS = ContentBlockerExtension/ContentBlockerCI.entitlements;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = ContentBlockerExtension/Info.plist;
Expand All @@ -2013,7 +2013,7 @@
"@executable_path/../Frameworks",
"@executable_path/../../../../Frameworks",
);
MARKETING_VERSION = 1.6.4;
MARKETING_VERSION = 1.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.macos.PrivacyEssentials.ContentBlockerExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -2351,15 +2351,15 @@
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = HKE973VLUW;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = App/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 1.6.4;
MARKETING_VERSION = 1.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.macos.PrivacyEssentials;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -2376,15 +2376,15 @@
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = HKE973VLUW;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = App/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 1.6.4;
MARKETING_VERSION = 1.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.macos.PrivacyEssentials;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -2399,7 +2399,7 @@
CODE_SIGN_ENTITLEMENTS = SafariAppExtension/Safari.entitlements;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = HKE973VLUW;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = SafariAppExtension/Info.plist;
Expand All @@ -2408,7 +2408,7 @@
"@executable_path/../Frameworks",
"@executable_path/../../../../Frameworks",
);
MARKETING_VERSION = 1.6.4;
MARKETING_VERSION = 1.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.macos.PrivacyEssentials.SafariAppExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -2424,7 +2424,7 @@
CODE_SIGN_ENTITLEMENTS = SafariAppExtension/Safari.entitlements;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = HKE973VLUW;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = SafariAppExtension/Info.plist;
Expand All @@ -2433,7 +2433,7 @@
"@executable_path/../Frameworks",
"@executable_path/../../../../Frameworks",
);
MARKETING_VERSION = 1.6.4;
MARKETING_VERSION = 1.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.macos.PrivacyEssentials.SafariAppExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -2449,7 +2449,7 @@
CODE_SIGN_ENTITLEMENTS = ContentBlockerExtension/ContentBlocker.entitlements;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = HKE973VLUW;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = ContentBlockerExtension/Info.plist;
Expand All @@ -2458,7 +2458,7 @@
"@executable_path/../Frameworks",
"@executable_path/../../../../Frameworks",
);
MARKETING_VERSION = 1.6.4;
MARKETING_VERSION = 1.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.macos.PrivacyEssentials.ContentBlockerExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -2474,7 +2474,7 @@
CODE_SIGN_ENTITLEMENTS = ContentBlockerExtension/ContentBlocker.entitlements;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = HKE973VLUW;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = ContentBlockerExtension/Info.plist;
Expand All @@ -2483,7 +2483,7 @@
"@executable_path/../Frameworks",
"@executable_path/../../../../Frameworks",
);
MARKETING_VERSION = 1.6.4;
MARKETING_VERSION = 1.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.macos.PrivacyEssentials.ContentBlockerExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down

0 comments on commit 038dc1d

Please sign in to comment.