Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New tracker animations #355

Merged
merged 2 commits into from
Nov 29, 2021
Merged

New tracker animations #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81ed38c
New tracker animations
tomasstrba Nov 29, 2021
0dc5a04
Merge branch 'develop' into tom/final-lottie-animations
tomasstrba Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 40 additions & 24 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,18 @@
AA0877BA26D5161D00B05660 /* WebKitVersionProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA0877B926D5161D00B05660 /* WebKitVersionProviderTests.swift */; };
AA0F3DB7261A566C0077F2D9 /* SuggestionLoadingMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA0F3DB6261A566C0077F2D9 /* SuggestionLoadingMock.swift */; };
AA13DCB4271480B0006D48D3 /* FirePopoverViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA13DCB3271480B0006D48D3 /* FirePopoverViewModel.swift */; };
AA21BDF2272B001900A12034 /* dark-trackers.json in Resources */ = {isa = PBXBuildFile; fileRef = AA8AF575272AC614006A09F8 /* dark-trackers.json */; };
AA2CB12D2587BB5600AA6FBE /* TabBarFooter.xib in Resources */ = {isa = PBXBuildFile; fileRef = AA2CB12C2587BB5600AA6FBE /* TabBarFooter.xib */; };
AA2CB1352587C29500AA6FBE /* TabBarFooter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA2CB1342587C29500AA6FBE /* TabBarFooter.swift */; };
AA34396C2754D4E300B241FA /* shield.json in Resources */ = {isa = PBXBuildFile; fileRef = AA34396A2754D4E200B241FA /* shield.json */; };
AA34396D2754D4E300B241FA /* shield-dot.json in Resources */ = {isa = PBXBuildFile; fileRef = AA34396B2754D4E300B241FA /* shield-dot.json */; };
AA3439702754D4E900B241FA /* dark-shield-dot.json in Resources */ = {isa = PBXBuildFile; fileRef = AA34396E2754D4E900B241FA /* dark-shield-dot.json */; };
AA3439712754D4E900B241FA /* dark-shield.json in Resources */ = {isa = PBXBuildFile; fileRef = AA34396F2754D4E900B241FA /* dark-shield.json */; };
AA3439782754D55100B241FA /* dark-trackers-2.json in Resources */ = {isa = PBXBuildFile; fileRef = AA3439722754D55100B241FA /* dark-trackers-2.json */; };
AA3439792754D55100B241FA /* trackers-1.json in Resources */ = {isa = PBXBuildFile; fileRef = AA3439732754D55100B241FA /* trackers-1.json */; };
AA34397A2754D55100B241FA /* trackers-2.json in Resources */ = {isa = PBXBuildFile; fileRef = AA3439742754D55100B241FA /* trackers-2.json */; };
AA34397B2754D55100B241FA /* trackers-3.json in Resources */ = {isa = PBXBuildFile; fileRef = AA3439752754D55100B241FA /* trackers-3.json */; };
AA34397C2754D55100B241FA /* dark-trackers-1.json in Resources */ = {isa = PBXBuildFile; fileRef = AA3439762754D55100B241FA /* dark-trackers-1.json */; };
AA34397D2754D55100B241FA /* dark-trackers-3.json in Resources */ = {isa = PBXBuildFile; fileRef = AA3439772754D55100B241FA /* dark-trackers-3.json */; };
AA3F895324C18AD500628DDE /* SuggestionViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3F895224C18AD500628DDE /* SuggestionViewModel.swift */; };
AA4BBA3B25C58FA200C4FB0F /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA4BBA3A25C58FA200C4FB0F /* MainMenu.swift */; };
AA4D700725545EF800C3411E /* URLEventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA4D700625545EF800C3411E /* URLEventHandler.swift */; };
Expand Down Expand Up @@ -339,11 +348,6 @@
AA80EC8F256C49BC007083E7 /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = AA80EC91256C49BC007083E7 /* Localizable.stringsdict */; };
AA840A9827319D1600E63CDD /* FirePopoverWrapperViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA840A9727319D1600E63CDD /* FirePopoverWrapperViewController.swift */; };
AA88D14B252A557100980B4E /* URLRequestExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA88D14A252A557100980B4E /* URLRequestExtension.swift */; };
AA8AF570272AC601006A09F8 /* trackers.json in Resources */ = {isa = PBXBuildFile; fileRef = AA8AF56F272AC601006A09F8 /* trackers.json */; };
AA8AF572272AC608006A09F8 /* shield.json in Resources */ = {isa = PBXBuildFile; fileRef = AA8AF571272AC608006A09F8 /* shield.json */; };
AA8AF574272AC60D006A09F8 /* shield-dot.json in Resources */ = {isa = PBXBuildFile; fileRef = AA8AF573272AC60D006A09F8 /* shield-dot.json */; };
AA8AF578272AC61B006A09F8 /* dark-shield.json in Resources */ = {isa = PBXBuildFile; fileRef = AA8AF577272AC61A006A09F8 /* dark-shield.json */; };
AA8AF57A272AC620006A09F8 /* dark-shield-dot.json in Resources */ = {isa = PBXBuildFile; fileRef = AA8AF579272AC620006A09F8 /* dark-shield-dot.json */; };
AA8EDF2424923E980071C2E8 /* URLExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8EDF2324923E980071C2E8 /* URLExtension.swift */; };
AA8EDF2724923EC70071C2E8 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8EDF2624923EC70071C2E8 /* StringExtension.swift */; };
AA91F83927076F1900771A0D /* PrivacyIconViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA91F83827076F1900771A0D /* PrivacyIconViewModelTests.swift */; };
Expand Down Expand Up @@ -915,6 +919,16 @@
AA13DCB3271480B0006D48D3 /* FirePopoverViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirePopoverViewModel.swift; sourceTree = "<group>"; };
AA2CB12C2587BB5600AA6FBE /* TabBarFooter.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TabBarFooter.xib; sourceTree = "<group>"; };
AA2CB1342587C29500AA6FBE /* TabBarFooter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarFooter.swift; sourceTree = "<group>"; };
AA34396A2754D4E200B241FA /* shield.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = shield.json; sourceTree = "<group>"; };
AA34396B2754D4E300B241FA /* shield-dot.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "shield-dot.json"; sourceTree = "<group>"; };
AA34396E2754D4E900B241FA /* dark-shield-dot.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "dark-shield-dot.json"; sourceTree = "<group>"; };
AA34396F2754D4E900B241FA /* dark-shield.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "dark-shield.json"; sourceTree = "<group>"; };
AA3439722754D55100B241FA /* dark-trackers-2.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "dark-trackers-2.json"; sourceTree = "<group>"; };
AA3439732754D55100B241FA /* trackers-1.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "trackers-1.json"; sourceTree = "<group>"; };
AA3439742754D55100B241FA /* trackers-2.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "trackers-2.json"; sourceTree = "<group>"; };
AA3439752754D55100B241FA /* trackers-3.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "trackers-3.json"; sourceTree = "<group>"; };
AA3439762754D55100B241FA /* dark-trackers-1.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "dark-trackers-1.json"; sourceTree = "<group>"; };
AA3439772754D55100B241FA /* dark-trackers-3.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "dark-trackers-3.json"; sourceTree = "<group>"; };
AA3F895224C18AD500628DDE /* SuggestionViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuggestionViewModel.swift; sourceTree = "<group>"; };
AA4BBA3A25C58FA200C4FB0F /* MainMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenu.swift; sourceTree = "<group>"; };
AA4D700625545EF800C3411E /* URLEventHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLEventHandler.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -972,12 +986,6 @@
AA80EC90256C49BC007083E7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
AA840A9727319D1600E63CDD /* FirePopoverWrapperViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirePopoverWrapperViewController.swift; sourceTree = "<group>"; };
AA88D14A252A557100980B4E /* URLRequestExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLRequestExtension.swift; sourceTree = "<group>"; };
AA8AF56F272AC601006A09F8 /* trackers.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = trackers.json; sourceTree = "<group>"; };
AA8AF571272AC608006A09F8 /* shield.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = shield.json; sourceTree = "<group>"; };
AA8AF573272AC60D006A09F8 /* shield-dot.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "shield-dot.json"; sourceTree = "<group>"; };
AA8AF575272AC614006A09F8 /* dark-trackers.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "dark-trackers.json"; sourceTree = "<group>"; };
AA8AF577272AC61A006A09F8 /* dark-shield.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "dark-shield.json"; sourceTree = "<group>"; };
AA8AF579272AC620006A09F8 /* dark-shield-dot.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "dark-shield-dot.json"; sourceTree = "<group>"; };
AA8EDF2324923E980071C2E8 /* URLExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLExtension.swift; sourceTree = "<group>"; };
AA8EDF2624923EC70071C2E8 /* StringExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringExtension.swift; sourceTree = "<group>"; };
AA91F83827076F1900771A0D /* PrivacyIconViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyIconViewModelTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2437,12 +2445,16 @@
AAC5E4F025D6BF10007F5990 /* AddressBarButton.swift */,
AAA0CC32252F181A0079BC96 /* NavigationButtonMenuDelegate.swift */,
AAA0CC462533833C0079BC96 /* MoreOptionsMenu.swift */,
AA8AF56F272AC601006A09F8 /* trackers.json */,
AA8AF571272AC608006A09F8 /* shield.json */,
AA8AF573272AC60D006A09F8 /* shield-dot.json */,
AA8AF575272AC614006A09F8 /* dark-trackers.json */,
AA8AF577272AC61A006A09F8 /* dark-shield.json */,
AA8AF579272AC620006A09F8 /* dark-shield-dot.json */,
AA3439732754D55100B241FA /* trackers-1.json */,
AA3439742754D55100B241FA /* trackers-2.json */,
AA3439752754D55100B241FA /* trackers-3.json */,
AA34396A2754D4E200B241FA /* shield.json */,
AA34396B2754D4E300B241FA /* shield-dot.json */,
AA3439762754D55100B241FA /* dark-trackers-1.json */,
AA3439722754D55100B241FA /* dark-trackers-2.json */,
AA3439772754D55100B241FA /* dark-trackers-3.json */,
AA34396F2754D4E900B241FA /* dark-shield.json */,
AA34396E2754D4E900B241FA /* dark-shield-dot.json */,
);
path = View;
sourceTree = "<group>";
Expand Down Expand Up @@ -3421,16 +3433,14 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
AA21BDF2272B001900A12034 /* dark-trackers.json in Resources */,
4B02198C25E05FAC00ED7DEA /* Fireproofing.storyboard in Resources */,
AA80EC73256C46A2007083E7 /* Suggestion.storyboard in Resources */,
AA693E5E2696E5B90007BB78 /* CrashReports.storyboard in Resources */,
4B0511CE262CAA5A00F6079C /* DownloadPreferencesTableCellView.xib in Resources */,
AA8AF578272AC61B006A09F8 /* dark-shield.json in Resources */,
8511E18425F82B34002F516B /* 01_Fire_really_small.json in Resources */,
4B0511C3262CAA5A00F6079C /* Preferences.storyboard in Resources */,
B6B1E88226D5DAC30062C350 /* Downloads.storyboard in Resources */,
AA8AF57A272AC620006A09F8 /* dark-shield-dot.json in Resources */,
AA3439712754D4E900B241FA /* dark-shield.json in Resources */,
85A0117425AF2EDF00FA6A0C /* FindInPage.storyboard in Resources */,
AA80EC89256C49B8007083E7 /* Localizable.strings in Resources */,
AAE8B102258A41C000E81239 /* Tooltip.storyboard in Resources */,
Expand All @@ -3441,21 +3451,26 @@
85378D9C274E61B8007C5CBF /* MessageViews.storyboard in Resources */,
4B6160F225B15792007DE5B2 /* contentblockerrules.js in Resources */,
AA80EC79256C46AA007083E7 /* TabBar.storyboard in Resources */,
AA34396D2754D4E300B241FA /* shield-dot.json in Resources */,
AAC5E4C925D6A6E8007F5990 /* Bookmarks.storyboard in Resources */,
B6FA893D269C423100588ECD /* PrivacyDashboard.storyboard in Resources */,
AA34396C2754D4E300B241FA /* shield.json in Resources */,
B693955626F04BEC0015B914 /* SavePanelAccessoryView.xib in Resources */,
4B65027525E5F2A70054432E /* DefaultBrowserPromptView.xib in Resources */,
AA7412B324D0B3AC00D22FE0 /* TabBarViewItem.xib in Resources */,
85480F8A25CDC360009424E3 /* MainMenu.storyboard in Resources */,
4B677435255DBEB800025BD8 /* httpsMobileV2FalsePositives.json in Resources */,
AAE71E3825F7869300D74437 /* HomepageCollectionViewItem.xib in Resources */,
AA3439792754D55100B241FA /* trackers-1.json in Resources */,
AA34397C2754D55100B241FA /* dark-trackers-1.json in Resources */,
4B723E1126B0006C00E14D75 /* DataImport.storyboard in Resources */,
4B92929026670D1700AD2C21 /* BookmarkTableCellView.xib in Resources */,
339A6B5826A044BA00E3DAE8 /* duckduckgo-privacy-dashboard in Resources */,
4B92928E26670D1700AD2C21 /* BookmarkOutlineViewCell.xib in Resources */,
AA8AF570272AC601006A09F8 /* trackers.json in Resources */,
858C78FC2705EB5F009B2B44 /* HomepageHeader.xib in Resources */,
B64C84DE2692D7400048FEBE /* PermissionAuthorization.storyboard in Resources */,
AA34397D2754D55100B241FA /* dark-trackers-3.json in Resources */,
AA3439782754D55100B241FA /* dark-trackers-2.json in Resources */,
AAB7320726DD0C37002FACF9 /* Fire.storyboard in Resources */,
AA80EC8F256C49BC007083E7 /* Localizable.stringsdict in Resources */,
AAE71E2C25F781EA00D74437 /* Homepage.storyboard in Resources */,
Expand All @@ -3464,16 +3479,17 @@
4B0511C6262CAA5A00F6079C /* DefaultBrowserTableCellView.xib in Resources */,
0230C0A1271F53670018F728 /* gpc.js in Resources */,
4B677433255DBEB800025BD8 /* httpsMobileV2Bloom.bin in Resources */,
AA34397B2754D55100B241FA /* trackers-3.json in Resources */,
026ADE1426C3010C002518EE /* macos-config.json in Resources */,
4B677432255DBEB800025BD8 /* httpsMobileV2BloomSpec.json in Resources */,
AA2CB12D2587BB5600AA6FBE /* TabBarFooter.xib in Resources */,
AA8AF574272AC60D006A09F8 /* shield-dot.json in Resources */,
4B6160D825B150E4007DE5B2 /* trackerData.json in Resources */,
AA80EC67256C4691007083E7 /* BrowserTab.storyboard in Resources */,
AAE246F42709EF3B00BEEAEE /* FirePopoverCollectionViewItem.xib in Resources */,
AA3439702754D4E900B241FA /* dark-shield-dot.json in Resources */,
4B0511C1262CAA5A00F6079C /* PrivacySecurityPreferencesTableCellView.xib in Resources */,
AA8AF572272AC608006A09F8 /* shield.json in Resources */,
7B860DE427274E54006D8957 /* navigatorCredentials.js in Resources */,
AA34397A2754D55100B241FA /* trackers-2.json in Resources */,
4B0511D0262CAA5A00F6079C /* AppearancePreferencesTableCellView.xib in Resources */,
4B6160F725B157BB007DE5B2 /* contentblocker.js in Resources */,
336D5B18262D8D3C0052E0C9 /* findinpage.js in Resources */,
Expand Down
Binary file modified DuckDuckGo/Assets.xcassets/Images/ShieldDot.imageset/Shield-dot-1.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified DuckDuckGo/Assets.xcassets/Images/ShieldDot.imageset/Shield-dot.pdf
View file
Open in desktop
Binary file not shown.
Loading