diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index cf1217f9bc..af68f97904 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -394,6 +394,14 @@ AA7412B724D1687000D22FE0 /* TabBarScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7412B624D1687000D22FE0 /* TabBarScrollView.swift */; }; AA7412BD24D2BEEE00D22FE0 /* MainWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7412BC24D2BEEE00D22FE0 /* MainWindow.swift */; }; AA75A0AE26F3500C0086B667 /* PrivacyIconViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA75A0AD26F3500C0086B667 /* PrivacyIconViewModel.swift */; }; + AA7EB6DF27E7C57D00036718 /* MouseOverAnimationButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7EB6DE27E7C57D00036718 /* MouseOverAnimationButton.swift */; }; + AA7EB6E227E7D05500036718 /* flame-mouse-over.json in Resources */ = {isa = PBXBuildFile; fileRef = AA7EB6E027E7D05500036718 /* flame-mouse-over.json */; }; + AA7EB6E327E7D05500036718 /* dark-flame-mouse-over.json in Resources */ = {isa = PBXBuildFile; fileRef = AA7EB6E127E7D05500036718 /* dark-flame-mouse-over.json */; }; + AA7EB6E527E7D6DC00036718 /* AnimationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7EB6E427E7D6DC00036718 /* AnimationView.swift */; }; + AA7EB6E727E8809D00036718 /* shield-mouse-over.json in Resources */ = {isa = PBXBuildFile; fileRef = AA7EB6E627E8809D00036718 /* shield-mouse-over.json */; }; + AA7EB6E927E880A600036718 /* shield-dot-mouse-over.json in Resources */ = {isa = PBXBuildFile; fileRef = AA7EB6E827E880A600036718 /* shield-dot-mouse-over.json */; }; + AA7EB6EB27E880AE00036718 /* dark-shield-mouse-over.json in Resources */ = {isa = PBXBuildFile; fileRef = AA7EB6EA27E880AE00036718 /* dark-shield-mouse-over.json */; }; + AA7EB6ED27E880B600036718 /* dark-shield-dot-mouse-over.json in Resources */ = {isa = PBXBuildFile; fileRef = AA7EB6EC27E880B600036718 /* dark-shield-dot-mouse-over.json */; }; AA80EC54256BE3BC007083E7 /* UserText.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA80EC53256BE3BC007083E7 /* UserText.swift */; }; AA80EC67256C4691007083E7 /* BrowserTab.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA80EC69256C4691007083E7 /* BrowserTab.storyboard */; }; AA80EC73256C46A2007083E7 /* Suggestion.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA80EC75256C46A2007083E7 /* Suggestion.storyboard */; }; @@ -1125,6 +1133,14 @@ AA7412BC24D2BEEE00D22FE0 /* MainWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindow.swift; sourceTree = ""; }; AA75A0AD26F3500C0086B667 /* PrivacyIconViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyIconViewModel.swift; sourceTree = ""; }; AA7DE8E026A9BD000012B490 /* History 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "History 2.xcdatamodel"; sourceTree = ""; }; + AA7EB6DE27E7C57D00036718 /* MouseOverAnimationButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MouseOverAnimationButton.swift; sourceTree = ""; }; + AA7EB6E027E7D05500036718 /* flame-mouse-over.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "flame-mouse-over.json"; sourceTree = ""; }; + AA7EB6E127E7D05500036718 /* dark-flame-mouse-over.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "dark-flame-mouse-over.json"; sourceTree = ""; }; + AA7EB6E427E7D6DC00036718 /* AnimationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationView.swift; sourceTree = ""; }; + AA7EB6E627E8809D00036718 /* shield-mouse-over.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "shield-mouse-over.json"; sourceTree = ""; }; + AA7EB6E827E880A600036718 /* shield-dot-mouse-over.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "shield-dot-mouse-over.json"; sourceTree = ""; }; + AA7EB6EA27E880AE00036718 /* dark-shield-mouse-over.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "dark-shield-mouse-over.json"; sourceTree = ""; }; + AA7EB6EC27E880B600036718 /* dark-shield-dot-mouse-over.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "dark-shield-dot-mouse-over.json"; sourceTree = ""; }; AA80EC53256BE3BC007083E7 /* UserText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserText.swift; sourceTree = ""; }; AA80EC68256C4691007083E7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/BrowserTab.storyboard; sourceTree = ""; }; AA80EC74256C46A2007083E7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Suggestion.storyboard; sourceTree = ""; }; @@ -2173,6 +2189,7 @@ B693954426F04BE90015B914 /* LongPressButton.swift */, B693953F26F04BE80015B914 /* MouseClickView.swift */, B693954926F04BEB0015B914 /* MouseOverButton.swift */, + AA7EB6DE27E7C57D00036718 /* MouseOverAnimationButton.swift */, 4B379C2327BDE1B0008A968E /* FlatButton.swift */, B693953D26F04BE70015B914 /* MouseOverView.swift */, B693953C26F04BE70015B914 /* NibLoadable.swift */, @@ -2728,6 +2745,29 @@ path = View; sourceTree = ""; }; + AA7EB6EE27E880EA00036718 /* Animations */ = { + isa = PBXGroup; + children = ( + AA3439732754D55100B241FA /* trackers-1.json */, + AA3439742754D55100B241FA /* trackers-2.json */, + AA3439752754D55100B241FA /* trackers-3.json */, + AA34396A2754D4E200B241FA /* shield.json */, + AA34396B2754D4E300B241FA /* shield-dot.json */, + AA7EB6E027E7D05500036718 /* flame-mouse-over.json */, + AA7EB6E627E8809D00036718 /* shield-mouse-over.json */, + AA7EB6E827E880A600036718 /* shield-dot-mouse-over.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 */, + AA7EB6E127E7D05500036718 /* dark-flame-mouse-over.json */, + AA7EB6EA27E880AE00036718 /* dark-shield-mouse-over.json */, + AA7EB6EC27E880B600036718 /* dark-shield-dot-mouse-over.json */, + ); + path = Animations; + sourceTree = ""; + }; AA80EC52256BE33A007083E7 /* Localizables */ = { isa = PBXGroup; children = ( @@ -2802,6 +2842,7 @@ AA86491624D8339A001BABEE /* View */ = { isa = PBXGroup; children = ( + AA7EB6EE27E880EA00036718 /* Animations */, 85589E8C27BBBB870038AD11 /* NavigationBar.storyboard */, AA68C3D22490ED62001B8783 /* NavigationBarViewController.swift */, 14D9B8F924F7E089000D4D13 /* AddressBarViewController.swift */, @@ -2810,16 +2851,6 @@ AAC5E4F025D6BF10007F5990 /* AddressBarButton.swift */, AAA0CC32252F181A0079BC96 /* NavigationButtonMenuDelegate.swift */, AAA0CC462533833C0079BC96 /* MoreOptionsMenu.swift */, - 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 = ""; @@ -3173,6 +3204,7 @@ children = ( B6DB3CF826A00E2D00D459B7 /* AVCaptureDevice+SwizzledAuthState.swift */, AA61C0D12727F59B00E6B681 /* ArrayExtension.swift */, + AA7EB6E427E7D6DC00036718 /* AnimationView.swift */, B6106B9D26A565DA0013B453 /* BundleExtension.swift */, 4BA1A6C1258B0A1300F6F690 /* ContiguousBytesExtension.swift */, 85AC3AF625D5DBFD00C7D2AA /* DataExtension.swift */, @@ -3871,6 +3903,7 @@ 9833913127AAA4B500DAF119 /* trackerData.json in Resources */, 4B0511CE262CAA5A00F6079C /* DownloadPreferencesTableCellView.xib in Resources */, B31055CA27A1BA1D001AC618 /* background.js in Resources */, + AA7EB6ED27E880B600036718 /* dark-shield-dot-mouse-over.json in Resources */, 8511E18425F82B34002F516B /* 01_Fire_really_small.json in Resources */, 85B7184A27677C2D00B4277F /* Onboarding.storyboard in Resources */, 4B0511C3262CAA5A00F6079C /* Preferences.storyboard in Resources */, @@ -3878,6 +3911,7 @@ B6B1E88226D5DAC30062C350 /* Downloads.storyboard in Resources */, AA3439712754D4E900B241FA /* dark-shield.json in Resources */, B31055C827A1BA1D001AC618 /* background-bundle.js in Resources */, + AA7EB6EB27E880AE00036718 /* dark-shield-mouse-over.json in Resources */, B31055CB27A1BA1D001AC618 /* autoconsent-bundle.js in Resources */, 7B1E819F27C8874900FF0E60 /* ContentOverlay.storyboard in Resources */, 85A0117425AF2EDF00FA6A0C /* FindInPage.storyboard in Resources */, @@ -3908,6 +3942,7 @@ 4B92929026670D1700AD2C21 /* BookmarkTableCellView.xib in Resources */, 85AC7AD927BD625000FFB69B /* HomePageAssets.xcassets in Resources */, 339A6B5826A044BA00E3DAE8 /* duckduckgo-privacy-dashboard in Resources */, + AA7EB6E727E8809D00036718 /* shield-mouse-over.json in Resources */, 4B379C1B27BD9F88008A968E /* LoginsPreferencesTableCellView.xib in Resources */, B31055C727A1BA1D001AC618 /* browser-shim.js in Resources */, 4B92928E26670D1700AD2C21 /* BookmarkOutlineViewCell.xib in Resources */, @@ -3918,10 +3953,13 @@ AAB7320726DD0C37002FACF9 /* Fire.storyboard in Resources */, 85589E8F27BBBBF10038AD11 /* Main.storyboard in Resources */, EA18D1CA272F0DC8006DC101 /* social_images in Resources */, + AA7EB6E927E880A600036718 /* shield-dot-mouse-over.json in Resources */, AA80EC8F256C49BC007083E7 /* Localizable.stringsdict in Resources */, EAC80DE0271F6C0100BBF02D /* fb-sdk.js in Resources */, 85625994269C8F9600EE44BC /* PasswordManager.storyboard in Resources */, 4B0511C6262CAA5A00F6079C /* DefaultBrowserTableCellView.xib in Resources */, + AA7EB6E327E7D05500036718 /* dark-flame-mouse-over.json in Resources */, + AA7EB6E227E7D05500036718 /* flame-mouse-over.json in Resources */, 4B677433255DBEB800025BD8 /* httpsMobileV2Bloom.bin in Resources */, AA34397B2754D55100B241FA /* trackers-3.json in Resources */, 026ADE1426C3010C002518EE /* macos-config.json in Resources */, @@ -4356,6 +4394,7 @@ 4B9292A326670D2A00AD2C21 /* BookmarkManagedObject.swift in Sources */, 4B723E1326B0007A00E14D75 /* CSVLoginExporter.swift in Sources */, 85C48CCC278D808F00D3263E /* NSAttributedStringExtension.swift in Sources */, + AA7EB6E527E7D6DC00036718 /* AnimationView.swift in Sources */, 8562599A269CA0A600EE44BC /* NSRectExtension.swift in Sources */, 4B0511C5262CAA5A00F6079C /* PrivacySecurityPreferencesTableCellView.swift in Sources */, B6040856274B830F00680351 /* DictionaryExtension.swift in Sources */, @@ -4412,6 +4451,7 @@ B693954A26F04BEB0015B914 /* NibLoadable.swift in Sources */, AA3D531527A1ED9300074EC1 /* FeedbackWindow.swift in Sources */, 85F0FF1327CFAB04001C7C6E /* RecentlyVisitedView.swift in Sources */, + AA7EB6DF27E7C57D00036718 /* MouseOverAnimationButton.swift in Sources */, AA7412B724D1687000D22FE0 /* TabBarScrollView.swift in Sources */, 4B0511C7262CAA5A00F6079C /* PreferenceTableCellView.swift in Sources */, 4B9292D92667124B00AD2C21 /* BookmarkListTreeControllerDataSource.swift in Sources */, diff --git a/DuckDuckGo/Common/Extensions/AnimationView.swift b/DuckDuckGo/Common/Extensions/AnimationView.swift new file mode 100644 index 0000000000..548086307d --- /dev/null +++ b/DuckDuckGo/Common/Extensions/AnimationView.swift @@ -0,0 +1,33 @@ +// +// AnimationView.swift +// +// Copyright © 2022 DuckDuckGo. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation +import Lottie + +extension AnimationView { + + convenience init?(named animationName: String, imageProvider: AnimationImageProvider? = nil) { + guard let animation = Animation.named(animationName, animationCache: LottieAnimationCache.shared) else { + return nil + } + + self.init(animation: animation, imageProvider: imageProvider) + identifier = NSUserInterfaceItemIdentifier(rawValue: animationName) + } + +} diff --git a/DuckDuckGo/Common/View/AppKit/MouseOverAnimationButton.swift b/DuckDuckGo/Common/View/AppKit/MouseOverAnimationButton.swift new file mode 100644 index 0000000000..bc73dd6387 --- /dev/null +++ b/DuckDuckGo/Common/View/AppKit/MouseOverAnimationButton.swift @@ -0,0 +1,178 @@ +// +// MouseOverAnimationButton.swift +// +// Copyright © 2022 DuckDuckGo. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation +import Lottie +import Combine + +final class MouseOverAnimationButton: AddressBarButton { + + // MARK: - Events + + override func awakeFromNib() { + super.awakeFromNib() + + subscribeToIsMouseOver() + subscribeToEffectiveAppearance() + } + + private var isMouseOverCancellable: AnyCancellable? + + private func subscribeToIsMouseOver() { + isMouseOverCancellable = $isMouseOver + .dropFirst() + .sink { [weak self] isMouseOver in + if isMouseOver { + self?.animate() + } else { + self?.stopAnimation() + } + } + } + + private var effectiveAppearanceCancellable: AnyCancellable? + + private func subscribeToEffectiveAppearance() { + effectiveAppearanceCancellable = NSApp.publisher(for: \.effectiveAppearance) + .dropFirst() + .receive(on: DispatchQueue.main) + .sink { [weak self] _ in + self?.updateAnimationView() + } + } + + // MARK: - Loading & Updating of Animation Views + + struct AnimationNames: Equatable { + let aqua: String + let dark: String + } + + var animationNames: AnimationNames? { + didSet { + if oldValue != animationNames { + loadAnimationViews() + updateAnimationView() + } + } + } + + struct AnimationViews { + let aqua: AnimationView + let dark: AnimationView + } + + private var animationViewCache: AnimationViews? + + private func loadAnimationViews() { + guard let animationNames = animationNames, + let aquaAnimationView = AnimationView(named: animationNames.aqua), + let darkAnimationView = AnimationView(named: animationNames.dark) else { + assertionFailure("Missing animation names or animation files in the bundle") + return + } + + animationViewCache = AnimationViews( + aqua: aquaAnimationView, + dark: darkAnimationView) + } + + private var currentAnimationView: AnimationView? + + private func updateAnimationView() { + guard let animationViewCache = animationViewCache else { + return + } + + let isAquaMode = NSApp.effectiveAppearance.name == NSAppearance.Name.aqua + let newAnimationView: AnimationView + // Animation view causes problems in tests + if AppDelegate.isRunningTests { + newAnimationView = AnimationView() + } else { + newAnimationView = isAquaMode ? animationViewCache.aqua : animationViewCache.dark + } + + guard currentAnimationView?.identifier != newAnimationView.identifier else { + // No need to update + return + } + + currentAnimationView?.removeFromSuperview() + currentAnimationView = newAnimationView + + newAnimationView.isHidden = true + addAndLayout(newAnimationView) + } + + // MARK: - Animating + + @Published var isAnimationViewVisible = false + + override var image: NSImage? { + get { + return super.image + } + + set { + if isAnimationViewVisible { + imageCache = newValue + } else { + super.image = newValue + } + } + } + + var imageCache: NSImage? + + private func hideImage() { + imageCache = image + super.image = nil + } + + private func showImage() { + if let imageCache = imageCache { + NSAppearance.withAppAppearance { + image = imageCache + } + } + } + + private func hideAnimation() { + currentAnimationView?.isHidden = true + isAnimationViewVisible = false + } + + private func showAnimation() { + currentAnimationView?.isHidden = false + isAnimationViewVisible = true + } + + private func animate() { + hideImage() + showAnimation() + currentAnimationView?.play() + } + + private func stopAnimation() { + hideAnimation() + showImage() + currentAnimationView?.stop() + } + +} diff --git a/DuckDuckGo/Common/View/AppKit/MouseOverButton.swift b/DuckDuckGo/Common/View/AppKit/MouseOverButton.swift index a5a9965a21..3bb96bc402 100644 --- a/DuckDuckGo/Common/View/AppKit/MouseOverButton.swift +++ b/DuckDuckGo/Common/View/AppKit/MouseOverButton.swift @@ -121,12 +121,14 @@ internal class MouseOverButton: NSButton { @Published private(set) var isMouseOver = false { didSet { updateTintColor() + updateLayer() } } var isMouseDown = false { didSet { updateTintColor() + updateLayer() } } @@ -140,7 +142,6 @@ internal class MouseOverButton: NSButton { self.contentTintColor = self.normalTintColor } } - updateLayer() } override func updateLayer() { diff --git a/DuckDuckGo/Navigation Bar/View/AddressBarButtonsViewController.swift b/DuckDuckGo/Navigation Bar/View/AddressBarButtonsViewController.swift index a903827cae..e45b279d1c 100644 --- a/DuckDuckGo/Navigation Bar/View/AddressBarButtonsViewController.swift +++ b/DuckDuckGo/Navigation Bar/View/AddressBarButtonsViewController.swift @@ -73,7 +73,7 @@ final class AddressBarButtonsViewController: NSViewController { } @IBOutlet weak var privacyDashboardPositioningView: NSView! - @IBOutlet weak var privacyEntryPointButton: AddressBarButton! + @IBOutlet weak var privacyEntryPointButton: MouseOverAnimationButton! @IBOutlet weak var bookmarkButton: AddressBarButton! @IBOutlet weak var imageButtonWrapper: NSView! @IBOutlet weak var imageButton: NSButton! @@ -154,6 +154,7 @@ final class AddressBarButtonsViewController: NSViewController { private var effectiveAppearanceCancellable: AnyCancellable? private var permissionsCancellables = Set() private var trackerAnimationTriggerCancellable: AnyCancellable? + private var isMouseOverAnimationVisibleCancellable: AnyCancellable? required init?(coder: NSCoder) { fatalError("AddressBarButtonsViewController: Bad initializer") @@ -174,6 +175,7 @@ final class AddressBarButtonsViewController: NSViewController { subscribeToBookmarkList() subscribePrivacyDashboardPendingUpdates() subscribeToEffectiveAppearance() + subscribeToIsMouseOverAnimationVisible() updateBookmarkButtonVisibility() } @@ -459,14 +461,17 @@ final class AddressBarButtonsViewController: NSViewController { } private var animationViewCache = [String: AnimationView]() - private func getAnimationView(for animationName: String) -> AnimationView { + private func getAnimationView(for animationName: String) -> AnimationView? { if let animationView = animationViewCache[animationName] { return animationView } - let animation = Animation.named(animationName, animationCache: LottieAnimationCache.shared) - let animationView = AnimationView(animation: animation, imageProvider: trackerAnimationImageProvider) - animationView.identifier = NSUserInterfaceItemIdentifier(rawValue: animationName) + guard let animationView = AnimationView(named: animationName, + imageProvider: trackerAnimationImageProvider) else { + assertionFailure("Missing animation file") + return nil + } + animationViewCache[animationName] = animationView return animationView } @@ -484,7 +489,7 @@ final class AddressBarButtonsViewController: NSViewController { newAnimationView = AnimationView() } else { // For unknown reason, this caused infinite execution of various unit tests. - newAnimationView = getAnimationView(for: animationName) + newAnimationView = getAnimationView(for: animationName) ?? AnimationView() } animationWrapperView.addAndLayout(newAnimationView) newAnimationView.isHidden = true @@ -684,7 +689,7 @@ final class AddressBarButtonsViewController: NSViewController { return } - guard !isAnyTrackerAnimationPlaying else { + guard !isAnyShieldAnimationPlaying else { privacyEntryPointButton.image = nil return } @@ -702,7 +707,15 @@ final class AddressBarButtonsViewController: NSViewController { let configuration = ContentBlocking.shared.privacyConfigurationManager.privacyConfig let isUnprotected = configuration.isUserUnprotected(domain: host) - privacyEntryPointButton.image = isNotSecure || isMajorTrackingNetwork || isUnprotected ? Self.shieldDotImage : Self.shieldImage + let isShieldDotVisible = isNotSecure || isMajorTrackingNetwork || isUnprotected + + privacyEntryPointButton.image = isShieldDotVisible ? Self.shieldDotImage : Self.shieldImage + + let shieldDotMouseOverAnimationNames = MouseOverAnimationButton.AnimationNames(aqua: "shield-dot-mouse-over", + dark: "dark-shield-dot-mouse-over") + let shieldMouseOverAnimationNames = MouseOverAnimationButton.AnimationNames(aqua: "shield-mouse-over", + dark: "dark-shield-mouse-over") + privacyEntryPointButton.animationNames = isShieldDotVisible ? shieldDotMouseOverAnimationNames: shieldMouseOverAnimationNames default: break } @@ -718,6 +731,11 @@ final class AddressBarButtonsViewController: NSViewController { switch selectedTabViewModel.tab.content { case .url(let url): + // Don't play the shield animation if mouse is over + guard !privacyEntryPointButton.isAnimationViewVisible else { + break + } + var animationView: AnimationView if url.scheme == "http" { animationView = shieldDotAnimationView @@ -757,7 +775,7 @@ final class AddressBarButtonsViewController: NSViewController { updatePermissionButtons() } - private func stopAnimations() { + private func stopAnimations(trackerAnimations: Bool = true, shieldAnimations: Bool = true) { func stopAnimation(_ animationView: AnimationView) { if animationView.isAnimationPlaying || !animationView.isHidden { animationView.isHidden = true @@ -765,11 +783,15 @@ final class AddressBarButtonsViewController: NSViewController { } } - stopAnimation(trackerAnimationView1) - stopAnimation(trackerAnimationView2) - stopAnimation(trackerAnimationView3) - stopAnimation(shieldAnimationView) - stopAnimation(shieldDotAnimationView) + if trackerAnimations { + stopAnimation(trackerAnimationView1) + stopAnimation(trackerAnimationView2) + stopAnimation(trackerAnimationView3) + } + if shieldAnimations { + stopAnimation(shieldAnimationView) + stopAnimation(shieldDotAnimationView) + } } private var isAnyTrackerAnimationPlaying: Bool { @@ -778,6 +800,11 @@ final class AddressBarButtonsViewController: NSViewController { trackerAnimationView3.isAnimationPlaying } + private var isAnyShieldAnimationPlaying: Bool { + shieldAnimationView.isAnimationPlaying || + shieldDotAnimationView.isAnimationPlaying + } + private func stopAnimationsAfterFocus() { if isTextFieldEditorFirstResponder { stopAnimations() @@ -820,6 +847,18 @@ final class AddressBarButtonsViewController: NSViewController { } } + private func subscribeToIsMouseOverAnimationVisible() { + isMouseOverAnimationVisibleCancellable = privacyEntryPointButton.$isAnimationViewVisible + .dropFirst() + .sink { [weak self] isAnimationViewVisible in + if isAnimationViewVisible { + self?.stopAnimations(trackerAnimations: false, shieldAnimations: true) + } else { + self?.updatePrivacyEntryPointIcon() + } + } + } + } // swiftlint:enable type_body_length diff --git a/DuckDuckGo/Navigation Bar/View/AddressBarViewController.swift b/DuckDuckGo/Navigation Bar/View/AddressBarViewController.swift index 5ca824ae06..5260743554 100644 --- a/DuckDuckGo/Navigation Bar/View/AddressBarViewController.swift +++ b/DuckDuckGo/Navigation Bar/View/AddressBarViewController.swift @@ -19,6 +19,7 @@ import Cocoa import os.log import Combine +import Lottie // swiftlint:disable type_body_length final class AddressBarViewController: NSViewController { @@ -375,7 +376,7 @@ extension AddressBarViewController { let point = self.view.convert(event.locationInWindow, from: nil) let view = self.view.hitTest(point) - if view is NSButton { + if view?.shouldShowArrowCursor == true { NSCursor.arrow.set() } else { NSCursor.iBeam.set() @@ -417,7 +418,7 @@ extension AddressBarViewController { if let point = self.view.mouseLocationInsideBounds(event.locationInWindow) { guard self.view.window?.firstResponder !== addressBarTextField.currentEditor(), - !(self.view.hitTest(point) is NSButton) + self.view.hitTest(point)?.shouldShowArrowCursor == false else { return event } // bookmark button visibility is usually determined by hover state, but we def need to hide it right now @@ -470,3 +471,11 @@ extension AddressBarViewController: AddressBarTextFieldDelegate { } } + +fileprivate extension NSView { + + var shouldShowArrowCursor: Bool { + self is NSButton || self is AnimationView + } + +} diff --git a/DuckDuckGo/Navigation Bar/View/Animations/dark-flame-mouse-over.json b/DuckDuckGo/Navigation Bar/View/Animations/dark-flame-mouse-over.json new file mode 100644 index 0000000000..8c17781926 --- /dev/null +++ b/DuckDuckGo/Navigation Bar/View/Animations/dark-flame-mouse-over.json @@ -0,0 +1 @@ +{"v":"5.7.6","fr":60,"ip":60,"op":91,"w":56,"h":56,"nm":"_flame","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"spark R 5","parent":6,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[49.853,53.045,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[-119.048,119.048,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-6.719,13.75]],"o":[[0,0],[6.773,-13.861]],"v":[[-7.5,0.312],[-8.406,-25.125]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":0,"k":10,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":69.5,"s":[0]},{"t":84.5,"s":[317]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.870588235294,0.345098039216,0.2,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":69.5,"op":87,"st":47,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"spark L 5","parent":6,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[46.508,52.379,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[119.048,119.048,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-6.719,13.75]],"o":[[0,0],[6.773,-13.861]],"v":[[-7.5,0.312],[-8.406,-25.125]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":0,"k":10,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":64,"s":[0]},{"t":79,"s":[317]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.870588235294,0.345098039216,0.2,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":64,"op":80,"st":41.5,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"spark R 4","parent":6,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[49.853,53.045,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[-119.048,119.048,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-6.719,13.75]],"o":[[0,0],[6.773,-13.861]],"v":[[-7.5,0.312],[-8.406,-25.125]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":0,"k":10,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":9.5,"s":[0]},{"t":24.5,"s":[317]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.870588235294,0.345098039216,0.2,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":9.5,"op":27,"st":-13,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"spark L 4","parent":6,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[46.508,52.379,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[119.048,119.048,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-6.719,13.75]],"o":[[0,0],[6.773,-13.861]],"v":[[-7.5,0.312],[-8.406,-25.125]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":0,"k":10,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":4,"s":[0]},{"t":19,"s":[317]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.870588235294,0.345098039216,0.2,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":4,"op":20,"st":-18.5,"bm":0},{"ddd":0,"ind":6,"ty":3,"nm":"_CTRL","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[29.934,23.502,0],"ix":2,"l":2},"a":{"a":0,"k":[50,50,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":-90,"s":[100,100,100]},{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.32,0.32,0.32],"y":[0.94,0.94,0]},"t":-85,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,-5.978]},"t":-70,"s":[125,125,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":-60,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":15,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":30,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":60,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":75,"s":[110,110,100]},{"t":90,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"ip":0,"op":17495,"st":-270,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"inner 2","parent":6,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[48.409,60.381,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[7.272,3.56],"ix":2},"p":{"a":0,"k":[0,-1],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.978431373835,0.828431382775,0.37843137607,1],"ix":4,"x":"var $bm_rt;\n$bm_rt = content('inner').content('Fill 1').color;"},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0.043,9.771],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[6.062,-3.375],[0,0],[-1.188,2.375],[0.812,4.438],[0,0],[-0.188,1.938]],"o":[[0,0],[-3.625,-2.25],[1.188,-2.375],[6.312,5.25],[1.062,-0.188],[1.562,1.438]],"v":[[2.562,9.562],[-3.188,9.375],[-5.625,1.125],[-0.375,-9.562],[1.625,3.875],[4.375,-0.25]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":13,"s":[{"i":[[6.062,-3.375],[0,0],[-1.188,2.375],[0.812,4.438],[0,0],[-0.188,1.938]],"o":[[0,0],[-3.625,-2.25],[1.188,-2.375],[6.312,5.25],[1.062,-0.188],[1.562,1.438]],"v":[[2.562,9.562],[-3.188,9.375],[-5.625,1.125],[-3.114,-10.476],[1.625,2.962],[4.375,-0.25]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":18,"s":[{"i":[[6.062,-3.375],[0,0],[-1.188,2.375],[0.812,4.438],[0,0],[-0.188,1.938]],"o":[[0,0],[-3.625,-2.25],[1.188,-2.375],[6.312,5.25],[1.062,-0.188],[1.562,1.438]],"v":[[2.562,9.562],[-3.188,9.375],[-5.625,1.125],[-2.641,-10.696],[3.461,1.122],[6.211,-3.921]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":30,"s":[{"i":[[6.062,-3.375],[0,0],[-1.188,2.375],[0.812,4.438],[0,0],[-0.188,1.938]],"o":[[0,0],[-3.625,-2.25],[1.188,-2.375],[6.312,5.25],[1.062,-0.188],[1.562,1.438]],"v":[[2.562,9.562],[-3.188,9.375],[-5.625,1.125],[-0.375,-9.562],[1.625,3.875],[4.375,-0.25]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":60,"s":[{"i":[[6.062,-3.375],[0,0],[-1.188,2.375],[0.812,4.438],[0,0],[-0.188,1.938]],"o":[[0,0],[-3.625,-2.25],[1.188,-2.375],[6.312,5.25],[1.062,-0.188],[1.562,1.438]],"v":[[2.562,9.562],[-3.188,9.375],[-5.625,1.125],[-0.375,-9.562],[1.625,3.875],[4.375,-0.25]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":73,"s":[{"i":[[6.062,-3.375],[0,0],[-1.188,2.375],[0.812,4.438],[0,0],[-0.188,1.938]],"o":[[0,0],[-3.625,-2.25],[1.188,-2.375],[6.312,5.25],[1.062,-0.188],[1.562,1.438]],"v":[[2.562,9.562],[-3.188,9.375],[-5.625,1.125],[-3.114,-10.476],[1.625,2.962],[4.375,-0.25]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":78,"s":[{"i":[[6.062,-3.375],[0,0],[-1.188,2.375],[0.812,4.438],[0,0],[-0.188,1.938]],"o":[[0,0],[-3.625,-2.25],[1.188,-2.375],[6.312,5.25],[1.062,-0.188],[1.562,1.438]],"v":[[2.562,9.562],[-3.188,9.375],[-5.625,1.125],[-2.641,-10.696],[3.461,1.122],[6.211,-3.921]],"c":true}]},{"t":90,"s":[{"i":[[6.062,-3.375],[0,0],[-1.188,2.375],[0.812,4.438],[0,0],[-0.188,1.938]],"o":[[0,0],[-3.625,-2.25],[1.188,-2.375],[6.312,5.25],[1.062,-0.188],[1.562,1.438]],"v":[[2.562,9.562],[-3.188,9.375],[-5.625,1.125],[-0.375,-9.562],[1.625,3.875],[4.375,-0.25]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.913725495338,0.913725495338,0.913725495338,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"inner","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":17495,"st":-270,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"outer 2","parent":6,"tt":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[48.469,54.744,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[-3.662,6.61],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-8.155,1.631],[-1.611,-1.22]],"v":[[-9.281,-5.326],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[12.281,-5.488],[7.217,0.807],[4.556,-15.131],[-6.999,-0.212]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[1.525,6.617],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-8.155,1.631],[-1.611,-1.22]],"v":[[-12.074,-5.326],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[15.075,-7.35],[7.217,0.807],[3.269,-17.705],[-6.999,-0.212]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":15,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[3.294,5.742],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-1.024,6.651],[-1.611,-1.22]],"v":[[-10.19,-6.235],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[12.281,-5.488],[7.217,0.807],[2.73,-18.783],[-6.999,-0.212]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":20,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[2.433,6.28],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-8.155,1.631],[-1.611,-1.22]],"v":[[-7.419,-9.05],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[11.35,-6.419],[7.217,0.807],[3.699,-16.845],[-6.999,-0.212]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":30,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[-3.662,6.61],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-8.155,1.631],[-1.611,-1.22]],"v":[[-9.281,-5.326],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[12.281,-5.488],[7.217,0.807],[4.556,-15.131],[-6.999,-0.212]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":60,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[-3.662,6.61],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-8.155,1.631],[-1.611,-1.22]],"v":[[-9.281,-5.326],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[12.281,-5.488],[7.217,0.807],[4.556,-15.131],[-6.999,-0.212]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":70,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[1.525,6.617],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-8.155,1.631],[-1.611,-1.22]],"v":[[-12.074,-5.326],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[15.075,-7.35],[7.217,0.807],[3.269,-17.705],[-6.999,-0.212]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":75,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[3.294,5.742],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-1.024,6.651],[-1.611,-1.22]],"v":[[-10.19,-6.235],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[12.281,-5.488],[7.217,0.807],[2.73,-18.783],[-6.999,-0.212]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":80,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[2.433,6.28],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-8.155,1.631],[-1.611,-1.22]],"v":[[-7.419,-9.05],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[11.35,-6.419],[7.217,0.807],[3.699,-16.845],[-6.999,-0.212]],"c":true}]},{"t":90,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[-3.662,6.61],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-8.155,1.631],[-1.611,-1.22]],"v":[[-9.281,-5.326],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[12.281,-5.488],[7.217,0.807],[4.556,-15.131],[-6.999,-0.212]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":1,"s":[0.20000000298,0.20000000298,0.20000000298,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":5,"s":[0.870588243008,0.345098048449,0.20000000298,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":59,"s":[0.870588243008,0.345098048449,0.20000000298,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":60,"s":[0.811764717102,0.811764717102,0.811764717102,1]},{"t":65,"s":[0.870588243008,0.345098048449,0.20000000298,1]}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"outer","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":17495,"st":-270,"bm":0}],"markers":[{"tm":0,"cm":"flicker-stay\r","dr":30},{"tm":60,"cm":"dark-flicker-stay","dr":30}]} \ No newline at end of file diff --git a/DuckDuckGo/Navigation Bar/View/Animations/dark-shield-dot-mouse-over.json b/DuckDuckGo/Navigation Bar/View/Animations/dark-shield-dot-mouse-over.json new file mode 100644 index 0000000000..d636cd82e8 --- /dev/null +++ b/DuckDuckGo/Navigation Bar/View/Animations/dark-shield-dot-mouse-over.json @@ -0,0 +1 @@ +{"v":"5.7.6","fr":60,"ip":90,"op":121,"w":60,"h":60,"nm":"_shield-dot - 32px","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"dot","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":3,"s":[46,18,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.6,"y":1},"o":{"x":0.32,"y":0.94},"t":8,"s":[46,20.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":22,"s":[46,15.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":30,"s":[46,18,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.64,"y":0.801},"o":{"x":0.167,"y":0.167},"t":93,"s":[46,18,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.679,"y":0.935},"o":{"x":0.341,"y":0.067},"t":107,"s":[49.639,14.861,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.684,"y":1},"o":{"x":0.348,"y":0.114},"t":115,"s":[43.907,20.093,0],"to":[0,0,0],"ti":[0,0,0]},{"t":120,"s":[46,18,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.32,0.32,0.32],"y":[0.94,0.94,0]},"t":93,"s":[100,100,100]},{"i":{"x":[0.68,0.68,0.68],"y":[0.06,0.06,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":107,"s":[115,115,100]},{"i":{"x":[0.58,0.58,0.58],"y":[1,1,1]},"o":{"x":[0.42,0.42,0.42],"y":[0,0,0]},"t":115,"s":[85,85,100]},{"t":120,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[12,12],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.933333337307,0.06274510175,0.145098045468,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"dot","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":17765,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shield Hole","sr":1,"ks":{"o":{"a":0,"k":80,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[29.816,29.95,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.6,"y":1},"o":{"x":0.17,"y":1},"t":5,"s":[29.816,32.45,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":19,"s":[29.816,27.45,0],"to":[0,0,0],"ti":[0,0,0]},{"t":30,"s":[29.816,29.95,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":90,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":105,"s":[110,110,100]},{"t":120,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.823,-0.952],[-1.012,-0.456],[0,-0.176],[-0.164,-0.718],[0.1,0.035],[1.553,1.524],[0,0],[-0.036,0.007],[-2.05,3.12],[0,0],[-0.424,3.921],[-0.855,-0.031],[1.637,-2.457],[3.955,-1.978],[0.152,-0.015],[0,0],[1.106,0.519],[0,0],[0.138,0.069],[2.512,3.821],[-0.1,7.594],[-0.845,0.705],[0,0],[-1.063,-0.133],[0,0],[-1.303,0.342],[-1.383,1.383],[-1.121,0]],"o":[[1.112,1.106],[-0.009,0.174],[0,0.767],[-0.102,-0.032],[-1.672,-0.56],[0,0],[0.035,-0.01],[3.941,-1.974],[0,0],[1.375,-2.062],[0.788,0.233],[-0.461,4.133],[-2.512,3.821],[-0.138,0.069],[0,0],[-1.106,0.519],[0,0],[-0.152,-0.015],[-3.955,-1.978],[-2.403,-3.607],[0.003,-1.113],[0,0],[0.815,-0.652],[0,0],[1.944,0.278],[1.263,-0.428],[0.742,-0.742],[0.988,0]],"v":[[3.059,-14.749],[6.197,-12.474],[6.184,-11.95],[6.434,-9.718],[6.132,-9.818],[1.39,-12.883],[1.39,13.1],[1.497,13.074],[10.596,6.314],[10.6,6.307],[13.345,-2.359],[15.816,-1.957],[12.683,7.69],[2.399,15.418],[1.96,15.544],[1.912,15.56],[-1.631,15.56],[-1.68,15.544],[-2.119,15.418],[-12.402,7.69],[-15.81,-8.509],[-14.46,-11.26],[-14.441,-11.276],[-11.405,-12.04],[-11.383,-12.037],[-6.619,-12.198],[-2.744,-14.784],[0.14,-15.95]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[1.677,-0.559],[0.025,-0.007],[2.232,0.318],[0.188,-0.145],[0,-0.28],[0,0],[-1.994,-2.991],[0,0],[-3.941,-1.974],[-0.035,-0.01]],"o":[[-1.557,1.527],[-0.024,0.008],[-1.686,0.449],[-0.525,-0.063],[-0.343,0.29],[0,0],[-0.099,7.4],[0,0],[2.05,3.12],[0.036,0.007],[0,0]],"v":[[-1.11,-12.884],[-5.864,-9.814],[-5.938,-9.792],[-11.724,-9.561],[-12.871,-9.33],[-13.31,-8.5],[-13.31,-8.483],[-10.32,6.307],[-10.315,6.314],[-1.217,13.074],[-1.11,13.1]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shield Hole","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":17765,"st":0,"bm":0}],"markers":[{"tm":0,"cm":"bounce","dr":60},{"tm":90,"cm":"expand","dr":30}]} \ No newline at end of file diff --git a/DuckDuckGo/Navigation Bar/View/dark-shield-dot.json b/DuckDuckGo/Navigation Bar/View/Animations/dark-shield-dot.json similarity index 100% rename from DuckDuckGo/Navigation Bar/View/dark-shield-dot.json rename to DuckDuckGo/Navigation Bar/View/Animations/dark-shield-dot.json diff --git a/DuckDuckGo/Navigation Bar/View/Animations/dark-shield-mouse-over.json b/DuckDuckGo/Navigation Bar/View/Animations/dark-shield-mouse-over.json new file mode 100644 index 0000000000..514eb7d99a --- /dev/null +++ b/DuckDuckGo/Navigation Bar/View/Animations/dark-shield-mouse-over.json @@ -0,0 +1 @@ +{"v":"5.7.6","fr":60,"ip":180,"op":211,"w":60,"h":60,"nm":"_shield - 32px","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"Burst (line)","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":25,"s":[100]},{"t":30,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[30,30,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.125,-14.625],[-0.125,-28.125]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.129411764706,0.752941176471,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":5,"s":[0]},{"t":30,"s":[85]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":5,"s":[35]},{"t":30,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"rp","c":{"a":0,"k":6,"ix":1},"o":{"a":0,"k":0,"ix":2},"m":1,"ix":3,"tr":{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":60,"ix":4},"so":{"a":0,"k":100,"ix":5},"eo":{"a":0,"k":100,"ix":6},"nm":"Transform"},"nm":"Repeater 1","mn":"ADBE Vector Filter - Repeater","hd":false}],"ip":5,"op":31,"st":5,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Line","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0.044,-0.95,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-15],[0,15]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.850980401039,0.850980401039,0.850980401039,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":17765,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Duckfoot (Stroke)","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[29.956,30,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":15,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":30,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":90,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":105,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":120,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":180,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":195,"s":[106,106,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":210,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":225,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":240,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":255,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":270,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":285,"s":[110,110,100]},{"t":300,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.988,0],[0.742,-0.742],[1.263,-0.428],[1.944,0.278],[0,0],[0,0],[0.815,-0.652],[0,0],[0,0],[0.003,-1.113],[-2.403,-3.607],[-3.955,-1.978],[-0.152,-0.015],[0,0],[-1.106,0.519],[0,0],[-0.138,0.069],[-2.512,3.821],[0.1,7.695],[0.961,0.641],[1.12,-0.14],[0,0],[0,0],[1.143,0.408],[0,0],[0,0],[1.382,1.375]],"o":[[-1.121,0],[-1.383,1.383],[-1.303,0.342],[0,0],[0,0],[-1.063,-0.133],[0,0],[0,0],[-0.845,0.705],[-0.1,7.594],[2.512,3.821],[0.138,0.069],[0,0],[1.106,0.519],[0,0],[0.152,-0.015],[3.955,-1.978],[2.403,-3.606],[-0.003,-1.094],[-0.83,-0.553],[0,0],[0,0],[-2.088,0.285],[0,0],[0,0],[-1.265,-0.422],[-0.823,-0.952]],"v":[[0,-15.95],[-2.884,-14.784],[-6.759,-12.198],[-11.523,-12.037],[-11.523,-12.038],[-11.545,-12.04],[-14.581,-11.276],[-14.581,-11.276],[-14.6,-11.26],[-15.95,-8.509],[-12.542,7.69],[-2.259,15.418],[-1.82,15.544],[-1.772,15.56],[1.772,15.56],[1.82,15.544],[2.259,15.418],[12.542,7.69],[15.95,-8.509],[14.493,-11.24],[11.545,-11.94],[11.545,-11.94],[11.531,-11.939],[6.82,-12.177],[6.821,-12.177],[6.795,-12.186],[2.919,-14.749]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-1.603,1.603],[-0.479,0],[-0.173,-0.208],[-0.027,-0.027],[-1.72,-0.576],[-2.302,0.313],[-0.369,-0.246],[0,-0.302],[0,0],[0,0],[1.995,-2.993],[0,0],[3.941,-1.974],[0.05,-0.017],[0,0],[0.053,-0.026],[0.448,0.224],[0.056,0.019],[0,0],[0.052,0.01],[2.05,3.12],[0,0],[0,0],[-0.099,7.4],[0,0],[0,0],[-0.343,0.29],[-0.525,-0.063],[-1.686,0.449],[-0.024,0.008]],"o":[[0.258,-0.258],[0.596,0],[0.024,0.029],[1.6,1.6],[1.652,0.587],[0.477,-0.058],[0.236,0.157],[0,0],[0,0],[0.099,7.498],[0,0],[-2.05,3.12],[-0.052,0.01],[0,0],[-0.056,0.019],[-0.448,0.224],[-0.053,-0.026],[0,0],[-0.05,-0.017],[-3.941,-1.974],[0,0],[0,0],[-1.994,-2.991],[0,0],[0,0],[0,-0.28],[0.188,-0.145],[2.232,0.318],[0.025,-0.007],[1.725,-0.575]],"v":[[-1.116,-13.016],[0,-13.45],[1.04,-13.1],[1.116,-13.016],[5.992,-9.818],[11.861,-9.46],[13.107,-9.16],[13.45,-8.5],[13.45,-8.5],[13.45,-8.484],[10.46,6.307],[10.455,6.314],[1.357,13.074],[1.205,13.114],[0.905,13.214],[0.741,13.282],[-0.741,13.282],[-0.905,13.214],[-1.205,13.114],[-1.357,13.074],[-10.455,6.314],[-10.455,6.314],[-10.46,6.307],[-13.45,-8.483],[-13.45,-8.483],[-13.45,-8.5],[-13.011,-9.33],[-11.865,-9.561],[-6.078,-9.792],[-6.005,-9.814]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980401039,0.850980401039,0.850980401039,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Duckfoot (Stroke)","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":17765,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"_duckfoot mask","parent":4,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.121,0],[-0.823,-0.952],[-1.265,-0.422],[0,0],[0,0],[-2.088,0.285],[0,0],[0,0],[-0.83,-0.553],[-0.003,-1.094],[2.403,-3.606],[3.955,-1.978],[0.152,-0.015],[0,0],[1.106,0.519],[0,0],[0.138,0.069],[2.512,3.821],[-0.1,7.594],[-0.845,0.705],[0,0],[0,0],[-1.063,-0.133],[0,0],[0,0],[-1.303,0.342],[-1.383,1.383]],"o":[[0.988,0],[1.382,1.375],[0,0],[0,0],[1.143,0.408],[0,0],[0,0],[1.12,-0.14],[0.961,0.641],[0.1,7.695],[-2.512,3.821],[-0.138,0.069],[0,0],[-1.106,0.519],[0,0],[-0.152,-0.015],[-3.955,-1.978],[-2.403,-3.607],[0.003,-1.113],[0,0],[0,0],[0.815,-0.652],[0,0],[0,0],[1.944,0.278],[1.263,-0.428],[0.742,-0.742]],"v":[[0,-15.95],[2.919,-14.749],[6.795,-12.186],[6.821,-12.177],[6.82,-12.177],[11.531,-11.939],[11.545,-11.94],[11.545,-11.94],[14.493,-11.24],[15.95,-8.509],[12.542,7.69],[2.259,15.418],[1.82,15.544],[1.772,15.56],[-1.772,15.56],[-1.82,15.544],[-2.259,15.418],[-12.542,7.69],[-15.95,-8.509],[-14.6,-11.26],[-14.581,-11.276],[-14.581,-11.276],[-11.545,-12.04],[-11.523,-12.038],[-11.523,-12.037],[-6.759,-12.198],[-2.884,-14.784]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-1.603,1.603],[-0.479,0],[-0.173,-0.208],[-0.027,-0.027],[-1.72,-0.576],[-2.302,0.313],[-0.369,-0.246],[0,-0.302],[0,0],[0,0],[1.995,-2.993],[0,0],[3.941,-1.974],[0.05,-0.017],[0,0],[0.053,-0.026],[0.448,0.224],[0.056,0.019],[0,0],[0.052,0.01],[2.05,3.12],[0,0],[0,0],[-0.099,7.4],[0,0],[0,0],[-0.343,0.29],[-0.525,-0.063],[-1.686,0.449],[-0.024,0.008]],"o":[[0.258,-0.258],[0.596,0],[0.024,0.029],[1.6,1.6],[1.652,0.587],[0.477,-0.058],[0.236,0.157],[0,0],[0,0],[0.099,7.498],[0,0],[-2.05,3.12],[-0.052,0.01],[0,0],[-0.056,0.019],[-0.448,0.224],[-0.053,-0.026],[0,0],[-0.05,-0.017],[-3.941,-1.974],[0,0],[0,0],[-1.994,-2.991],[0,0],[0,0],[0,-0.28],[0.188,-0.145],[2.232,0.318],[0.025,-0.007],[1.725,-0.575]],"v":[[-1.116,-13.016],[0,-13.45],[1.04,-13.1],[1.116,-13.016],[5.992,-9.818],[11.861,-9.46],[13.107,-9.16],[13.45,-8.5],[13.45,-8.5],[13.45,-8.484],[10.46,6.307],[10.455,6.314],[1.357,13.074],[1.205,13.114],[0.905,13.214],[0.741,13.282],[-0.741,13.282],[-0.905,13.214],[-1.205,13.114],[-1.357,13.074],[-10.455,6.314],[-10.455,6.314],[-10.46,6.307],[-13.45,-8.483],[-13.45,-8.483],[-13.45,-8.5],[-13.011,-9.33],[-11.865,-9.561],[-6.078,-9.792],[-6.005,-9.814]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":90,"s":[0.878431372549,0.878431372549,0.878431372549,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":100,"s":[0.800000011921,0.800000011921,0.800000011921,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":140,"s":[0.800000011921,0.800000011921,0.800000011921,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":150,"s":[0.878431372549,0.878431372549,0.878431372549,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":180,"s":[0.878431372549,0.878431372549,0.878431372549,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":190,"s":[0.800000011921,0.800000011921,0.800000011921,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":230,"s":[0.800000011921,0.800000011921,0.800000011921,1]},{"t":240,"s":[0.878431372549,0.878431372549,0.878431372549,1]}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Duckfoot (Stroke)","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":90,"op":17765,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"glimmer","tt":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":275,"s":[6.906,27.156,0],"to":[9.229,0,0],"ti":[-9.229,0,0]},{"t":295,"s":[62.281,27.156,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-4.344,-5.344,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Duckfoot (Stroke)').transform.scale;"}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0.75]],"o":[[0,0],[0,-0.75]],"v":[[-24.299,11.458],[7.625,-20.75]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.129411764706,0.752941176471,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0.75]],"o":[[0,0],[0,-0.75]],"v":[[-20.861,14.895],[11.062,-17.312]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.129411764706,0.752941176471,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5,"x":"var $bm_rt;\n$bm_rt = content('Shape 1').content('Stroke 1').strokeWidth;"},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[1.5,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 2","np":3,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":275,"op":301,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Duckfoot (Solid)","parent":4,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":90,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":91,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":179,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":180,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":181,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":210,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":225,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":226,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":254,"s":[100]},{"t":255,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.121,0],[-0.823,-0.952],[-1.265,-0.422],[0,0],[0,0],[-2.088,0.285],[0,0],[0,0],[-0.83,-0.553],[-0.003,-1.094],[2.403,-3.606],[3.955,-1.978],[0.152,-0.015],[0,0],[1.106,0.519],[0,0],[0.138,0.069],[2.512,3.821],[-0.1,7.594],[-0.845,0.705],[0,0],[0,0],[-1.063,-0.133],[0,0],[0,0],[-1.303,0.342],[-1.383,1.383]],"o":[[0.988,0],[1.382,1.375],[0,0],[0,0],[1.143,0.408],[0,0],[0,0],[1.12,-0.14],[0.961,0.641],[0.1,7.695],[-2.512,3.821],[-0.138,0.069],[0,0],[-1.106,0.519],[0,0],[-0.152,-0.015],[-3.955,-1.978],[-2.403,-3.607],[0.003,-1.113],[0,0],[0,0],[0.815,-0.652],[0,0],[0,0],[1.944,0.278],[1.263,-0.428],[0.742,-0.742]],"v":[[0,-15.95],[2.919,-14.749],[6.795,-12.186],[6.821,-12.177],[6.82,-12.177],[11.531,-11.939],[11.545,-11.94],[11.545,-11.94],[14.493,-11.24],[15.95,-8.509],[12.542,7.69],[2.259,15.418],[1.82,15.544],[1.772,15.56],[-1.772,15.56],[-1.82,15.544],[-2.259,15.418],[-12.542,7.69],[-15.95,-8.509],[-14.6,-11.26],[-14.581,-11.276],[-14.581,-11.276],[-11.545,-12.04],[-11.523,-12.038],[-11.523,-12.037],[-6.759,-12.198],[-2.884,-14.784]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-1.603,1.603],[-0.479,0],[-0.173,-0.208],[-0.027,-0.027],[-1.72,-0.576],[-2.302,0.313],[-0.369,-0.246],[0,-0.302],[0,0],[0,0],[1.995,-2.993],[0,0],[3.941,-1.974],[0.05,-0.017],[0,0],[0.053,-0.026],[0.448,0.224],[0.056,0.019],[0,0],[0.052,0.01],[2.05,3.12],[0,0],[0,0],[-0.099,7.4],[0,0],[0,0],[-0.343,0.29],[-0.525,-0.063],[-1.686,0.449],[-0.024,0.008]],"o":[[0.258,-0.258],[0.596,0],[0.024,0.029],[1.6,1.6],[1.652,0.587],[0.477,-0.058],[0.236,0.157],[0,0],[0,0],[0.099,7.498],[0,0],[-2.05,3.12],[-0.052,0.01],[0,0],[-0.056,0.019],[-0.448,0.224],[-0.053,-0.026],[0,0],[-0.05,-0.017],[-3.941,-1.974],[0,0],[0,0],[-1.994,-2.991],[0,0],[0,0],[0,-0.28],[0.188,-0.145],[2.232,0.318],[0.025,-0.007],[1.725,-0.575]],"v":[[-1.116,-13.016],[0,-13.45],[1.04,-13.1],[1.116,-13.016],[5.992,-9.818],[11.861,-9.46],[13.107,-9.16],[13.45,-8.5],[13.45,-8.5],[13.45,-8.484],[10.46,6.307],[10.455,6.314],[1.357,13.074],[1.205,13.114],[0.905,13.214],[0.741,13.282],[-0.741,13.282],[-0.905,13.214],[-1.205,13.114],[-1.357,13.074],[-10.455,6.314],[-10.455,6.314],[-10.46,6.307],[-13.45,-8.483],[-13.45,-8.483],[-13.45,-8.5],[-13.011,-9.33],[-11.865,-9.561],[-6.078,-9.792],[-6.005,-9.814]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823705,0.247058823705,0.247058823705,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Duckfoot (Stroke)","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":90,"op":256,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Outline Forcefield 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[30,30,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[150,150,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.5,1.5],[-0.8,0],[-0.5,-0.6],[-1.5,-0.5],[-2.2,0.3],[-0.6,-0.4],[0,-0.7],[2.2,-3.3],[4,-2],[0,0],[0,0],[0.8,0.4],[0,0],[0,0],[2.3,3.5],[-0.1,7.5],[-0.6,0.5],[-0.8,-0.1],[-1.5,0.4]],"o":[[0.5,-0.5],[0.8,0],[1.5,1.5],[1.4,0.5],[0.8,-0.1],[0.6,0.4],[0.1,7.6],[-2.3,3.5],[0,0],[0,0],[-0.8,0.4],[0,0],[0,0],[-4,-2],[-2.2,-3.3],[0,-0.7],[0.5,-0.4],[2.1,0.3],[1.5,-0.5]],"v":[[-2,-13.9],[0,-14.7],[2,-13.9],[6.4,-11],[11.7,-10.7],[13.8,-10.2],[14.7,-8.5],[11.5,7],[1.7,14.3],[1.6,14.3],[1.3,14.4],[-1.3,14.4],[-1.6,14.3],[-1.7,14.3],[-11.5,7],[-14.7,-8.5],[-13.8,-10.3],[-11.7,-10.8],[-6.4,-11]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.129411771894,0.752941191196,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.7,"ix":5},"lc":1,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Vector","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":460,"s":[0]},{"t":480,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":450,"s":[0]},{"t":470,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":450,"op":541,"st":450,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"Outline Forcefield 1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":350,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":360,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":389,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":390,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":419,"s":[100]},{"t":420,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[30,30,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":330,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":345,"s":[150,150,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":389,"s":[150,150,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":390,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":400,"s":[150,150,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":410,"s":[150,150,100]},{"t":420,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.5,1.5],[-0.8,0],[-0.5,-0.6],[-1.5,-0.5],[-2.2,0.3],[-0.6,-0.4],[0,-0.7],[2.2,-3.3],[4,-2],[0,0],[0,0],[0.8,0.4],[0,0],[0,0],[2.3,3.5],[-0.1,7.5],[-0.6,0.5],[-0.8,-0.1],[-1.5,0.4]],"o":[[0.5,-0.5],[0.8,0],[1.5,1.5],[1.4,0.5],[0.8,-0.1],[0.6,0.4],[0.1,7.6],[-2.3,3.5],[0,0],[0,0],[-0.8,0.4],[0,0],[0,0],[-4,-2],[-2.2,-3.3],[0,-0.7],[0.5,-0.4],[2.1,0.3],[1.5,-0.5]],"v":[[-2,-13.9],[0,-14.7],[2,-13.9],[6.4,-11],[11.7,-10.7],[13.8,-10.2],[14.7,-8.5],[11.5,7],[1.7,14.3],[1.6,14.3],[1.3,14.4],[-1.3,14.4],[-1.6,14.3],[-1.7,14.3],[-11.5,7],[-14.7,-8.5],[-13.8,-10.3],[-11.7,-10.8],[-6.4,-11]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.129411771894,0.752941191196,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":330,"s":[2.5]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":345,"s":[2]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":389,"s":[2]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":390,"s":[2.5]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":400,"s":[2]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":410,"s":[2]},{"t":420,"s":[2.5]}],"ix":5},"lc":1,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Vector","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":330,"op":421,"st":330,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Glow","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":90,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":100,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":180,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":187,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":210,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":225,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":226,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":250,"s":[100]},{"t":255,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[30,30,0],"ix":2,"l":2},"a":{"a":0,"k":[-23.458,7.667,0],"ix":1,"l":2},"s":{"a":0,"k":[200,200,100],"ix":6,"l":2,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Forcefield').transform.scale;"}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[24,24],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.129,0.753,0,0.5,0.129,0.753,0,1,0.129,0.753,0,0,1,0.065,0.5,0.13,0],"ix":9}},"s":{"a":0,"k":[0,0],"ix":5},"e":{"a":0,"k":[100,0],"ix":6},"t":2,"h":{"a":0,"k":0,"ix":7},"a":{"a":0,"k":0,"ix":8},"nm":"Gradient Fill_1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-23.458,7.667],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":90,"op":256,"st":-30,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"Forcefield","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":170,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":180,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":187,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":210,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":225,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":226,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":250,"s":[100]},{"t":255,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[30,30,0],"ix":2,"l":2},"a":{"a":0,"k":[-23.458,7.667,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":180,"s":[200,200,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":195,"s":[210,210,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":210,"s":[200,200,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":225,"s":[100,100,100]},{"t":250,"s":[200,200,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[24,24],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.129411764706,0.752941176471,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.25,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-23.458,7.667],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":165,"s":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":170,"s":[100]},{"t":180,"s":[0],"h":1}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":90,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":110,"s":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":170,"s":[100]},{"t":180,"s":[100],"h":1}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":90,"op":256,"st":-30,"bm":0}],"markers":[{"tm":0,"cm":"burst","dr":30},{"tm":90,"cm":"forcefield-clock","dr":30},{"tm":180,"cm":"forcefield-on","dr":30},{"tm":225,"cm":"forcefield-grow","dr":30},{"tm":270,"cm":"glimmer","dr":30},{"tm":330,"cm":"outline-ff-1","dr":30},{"tm":390,"cm":"outline-ff-2","dr":30},{"tm":450,"cm":"outline-ff-3","dr":30}]} \ No newline at end of file diff --git a/DuckDuckGo/Navigation Bar/View/dark-shield.json b/DuckDuckGo/Navigation Bar/View/Animations/dark-shield.json similarity index 100% rename from DuckDuckGo/Navigation Bar/View/dark-shield.json rename to DuckDuckGo/Navigation Bar/View/Animations/dark-shield.json diff --git a/DuckDuckGo/Navigation Bar/View/dark-trackers-1.json b/DuckDuckGo/Navigation Bar/View/Animations/dark-trackers-1.json similarity index 100% rename from DuckDuckGo/Navigation Bar/View/dark-trackers-1.json rename to DuckDuckGo/Navigation Bar/View/Animations/dark-trackers-1.json diff --git a/DuckDuckGo/Navigation Bar/View/dark-trackers-2.json b/DuckDuckGo/Navigation Bar/View/Animations/dark-trackers-2.json similarity index 100% rename from DuckDuckGo/Navigation Bar/View/dark-trackers-2.json rename to DuckDuckGo/Navigation Bar/View/Animations/dark-trackers-2.json diff --git a/DuckDuckGo/Navigation Bar/View/dark-trackers-3.json b/DuckDuckGo/Navigation Bar/View/Animations/dark-trackers-3.json similarity index 100% rename from DuckDuckGo/Navigation Bar/View/dark-trackers-3.json rename to DuckDuckGo/Navigation Bar/View/Animations/dark-trackers-3.json diff --git a/DuckDuckGo/Navigation Bar/View/Animations/flame-mouse-over.json b/DuckDuckGo/Navigation Bar/View/Animations/flame-mouse-over.json new file mode 100644 index 0000000000..b180ad962f --- /dev/null +++ b/DuckDuckGo/Navigation Bar/View/Animations/flame-mouse-over.json @@ -0,0 +1 @@ +{"v":"5.7.6","fr":60,"ip":0,"op":31,"w":56,"h":56,"nm":"_flame","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"spark R 4","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[49.853,53.045,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[-119.048,119.048,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-6.719,13.75]],"o":[[0,0],[6.773,-13.861]],"v":[[-7.5,0.312],[-8.406,-25.125]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":0,"k":10,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":9.5,"s":[0]},{"t":24.5,"s":[317]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.870588235294,0.345098039216,0.2,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":9.5,"op":27,"st":-13,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"spark L 4","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[46.508,52.379,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[119.048,119.048,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-6.719,13.75]],"o":[[0,0],[6.773,-13.861]],"v":[[-7.5,0.312],[-8.406,-25.125]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":0,"k":10,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":4,"s":[0]},{"t":19,"s":[317]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.870588235294,0.345098039216,0.2,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":4,"op":20,"st":-18.5,"bm":0},{"ddd":0,"ind":3,"ty":3,"nm":"_CTRL","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[29.934,23.502,0],"ix":2,"l":2},"a":{"a":0,"k":[50,50,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":-90,"s":[100,100,100]},{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.32,0.32,0.32],"y":[0.94,0.94,0]},"t":-85,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,-5.978]},"t":-70,"s":[125,125,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":-60,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":15,"s":[110,110,100]},{"t":30,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"ip":0,"op":17495,"st":-270,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"inner 2","parent":3,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[48.409,60.381,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[7.272,3.56],"ix":2},"p":{"a":0,"k":[0,-1],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.978431373835,0.828431382775,0.37843137607,1],"ix":4,"x":"var $bm_rt;\n$bm_rt = content('inner').content('Fill 1').color;"},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0.043,9.771],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[6.062,-3.375],[0,0],[-1.188,2.375],[0.812,4.438],[0,0],[-0.188,1.938]],"o":[[0,0],[-3.625,-2.25],[1.188,-2.375],[6.312,5.25],[1.062,-0.188],[1.562,1.438]],"v":[[2.562,9.562],[-3.188,9.375],[-5.625,1.125],[-0.375,-9.562],[1.625,3.875],[4.375,-0.25]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":13,"s":[{"i":[[6.062,-3.375],[0,0],[-1.188,2.375],[0.812,4.438],[0,0],[-0.188,1.938]],"o":[[0,0],[-3.625,-2.25],[1.188,-2.375],[6.312,5.25],[1.062,-0.188],[1.562,1.438]],"v":[[2.562,9.562],[-3.188,9.375],[-5.625,1.125],[-3.114,-10.476],[1.625,2.962],[4.375,-0.25]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":18,"s":[{"i":[[6.062,-3.375],[0,0],[-1.188,2.375],[0.812,4.438],[0,0],[-0.188,1.938]],"o":[[0,0],[-3.625,-2.25],[1.188,-2.375],[6.312,5.25],[1.062,-0.188],[1.562,1.438]],"v":[[2.562,9.562],[-3.188,9.375],[-5.625,1.125],[-2.641,-10.696],[3.461,1.122],[6.211,-3.921]],"c":true}]},{"t":30,"s":[{"i":[[6.062,-3.375],[0,0],[-1.188,2.375],[0.812,4.438],[0,0],[-0.188,1.938]],"o":[[0,0],[-3.625,-2.25],[1.188,-2.375],[6.312,5.25],[1.062,-0.188],[1.562,1.438]],"v":[[2.562,9.562],[-3.188,9.375],[-5.625,1.125],[-0.375,-9.562],[1.625,3.875],[4.375,-0.25]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.913725495338,0.913725495338,0.913725495338,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"inner","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":17495,"st":-270,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"outer 2","parent":3,"tt":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[48.469,54.744,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[-3.662,6.61],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-8.155,1.631],[-1.611,-1.22]],"v":[[-9.281,-5.326],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[12.281,-5.488],[7.217,0.807],[4.556,-15.131],[-6.999,-0.212]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[1.525,6.617],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-8.155,1.631],[-1.611,-1.22]],"v":[[-12.074,-5.326],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[15.075,-7.35],[7.217,0.807],[3.269,-17.705],[-6.999,-0.212]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":15,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[3.294,5.742],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-1.024,6.651],[-1.611,-1.22]],"v":[[-10.19,-6.235],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[12.281,-5.488],[7.217,0.807],[2.73,-18.783],[-6.999,-0.212]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":20,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[2.433,6.28],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-8.155,1.631],[-1.611,-1.22]],"v":[[-7.419,-9.05],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[11.35,-6.419],[7.217,0.807],[3.699,-16.845],[-6.999,-0.212]],"c":true}]},{"t":30,"s":[{"i":[[0,1.696],[-13.094,-6.213],[0,0],[-1.868,4.371],[-2.343,5.387],[0.605,-2.973],[-3.662,6.61],[-1.321,-5.562]],"o":[[-2.904,2.721],[0,0],[2.349,-0.597],[2.446,-6.855],[-2.636,0.781],[0,-7.239],[-8.155,1.631],[-1.611,-1.22]],"v":[[-9.281,-5.326],[-3.24,14.982],[2.467,15.131],[10.613,8.429],[12.281,-5.488],[7.217,0.807],[4.556,-15.131],[-6.999,-0.212]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":1,"s":[0.20000000298,0.20000000298,0.20000000298,1]},{"t":5,"s":[0.870588243008,0.345098048449,0.20000000298,1]}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"outer","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":17495,"st":-270,"bm":0}],"markers":[{"tm":0,"cm":"flicker5-color","dr":30}]} \ No newline at end of file diff --git a/DuckDuckGo/Navigation Bar/View/Animations/shield-dot-mouse-over.json b/DuckDuckGo/Navigation Bar/View/Animations/shield-dot-mouse-over.json new file mode 100644 index 0000000000..4ce99d83a6 --- /dev/null +++ b/DuckDuckGo/Navigation Bar/View/Animations/shield-dot-mouse-over.json @@ -0,0 +1 @@ +{"v":"5.7.6","fr":60,"ip":90,"op":121,"w":60,"h":60,"nm":"_shield-dot - 32px","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"dot","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":3,"s":[46,18,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.6,"y":1},"o":{"x":0.32,"y":0.94},"t":8,"s":[46,20.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":22,"s":[46,15.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":30,"s":[46,18,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.64,"y":0.801},"o":{"x":0.167,"y":0.167},"t":93,"s":[46,18,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.679,"y":0.935},"o":{"x":0.341,"y":0.067},"t":107,"s":[49.639,14.861,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.684,"y":1},"o":{"x":0.348,"y":0.114},"t":115,"s":[43.907,20.093,0],"to":[0,0,0],"ti":[0,0,0]},{"t":120,"s":[46,18,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.32,0.32,0.32],"y":[0.94,0.94,0]},"t":93,"s":[100,100,100]},{"i":{"x":[0.68,0.68,0.68],"y":[0.06,0.06,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":107,"s":[115,115,100]},{"i":{"x":[0.58,0.58,0.58],"y":[1,1,1]},"o":{"x":[0.42,0.42,0.42],"y":[0,0,0]},"t":115,"s":[85,85,100]},{"t":120,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[12,12],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.933333337307,0.06274510175,0.145098045468,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"dot","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":17765,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shield Hole","sr":1,"ks":{"o":{"a":0,"k":80,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[29.816,29.95,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.6,"y":1},"o":{"x":0.17,"y":1},"t":5,"s":[29.816,32.45,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":19,"s":[29.816,27.45,0],"to":[0,0,0],"ti":[0,0,0]},{"t":30,"s":[29.816,29.95,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":90,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":105,"s":[110,110,100]},{"t":120,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.823,-0.952],[-1.012,-0.456],[0,-0.176],[-0.164,-0.718],[0.1,0.035],[1.553,1.524],[0,0],[-0.036,0.007],[-2.05,3.12],[0,0],[-0.424,3.921],[-0.855,-0.031],[1.637,-2.457],[3.955,-1.978],[0.152,-0.015],[0,0],[1.106,0.519],[0,0],[0.138,0.069],[2.512,3.821],[-0.1,7.594],[-0.845,0.705],[0,0],[-1.063,-0.133],[0,0],[-1.303,0.342],[-1.383,1.383],[-1.121,0]],"o":[[1.112,1.106],[-0.009,0.174],[0,0.767],[-0.102,-0.032],[-1.672,-0.56],[0,0],[0.035,-0.01],[3.941,-1.974],[0,0],[1.375,-2.062],[0.788,0.233],[-0.461,4.133],[-2.512,3.821],[-0.138,0.069],[0,0],[-1.106,0.519],[0,0],[-0.152,-0.015],[-3.955,-1.978],[-2.403,-3.607],[0.003,-1.113],[0,0],[0.815,-0.652],[0,0],[1.944,0.278],[1.263,-0.428],[0.742,-0.742],[0.988,0]],"v":[[3.059,-14.749],[6.197,-12.474],[6.184,-11.95],[6.434,-9.718],[6.132,-9.818],[1.39,-12.883],[1.39,13.1],[1.497,13.074],[10.596,6.314],[10.6,6.307],[13.345,-2.359],[15.816,-1.957],[12.683,7.69],[2.399,15.418],[1.96,15.544],[1.912,15.56],[-1.631,15.56],[-1.68,15.544],[-2.119,15.418],[-12.402,7.69],[-15.81,-8.509],[-14.46,-11.26],[-14.441,-11.276],[-11.405,-12.04],[-11.383,-12.037],[-6.619,-12.198],[-2.744,-14.784],[0.14,-15.95]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[1.677,-0.559],[0.025,-0.007],[2.232,0.318],[0.188,-0.145],[0,-0.28],[0,0],[-1.994,-2.991],[0,0],[-3.941,-1.974],[-0.035,-0.01]],"o":[[-1.557,1.527],[-0.024,0.008],[-1.686,0.449],[-0.525,-0.063],[-0.343,0.29],[0,0],[-0.099,7.4],[0,0],[2.05,3.12],[0.036,0.007],[0,0]],"v":[[-1.11,-12.884],[-5.864,-9.814],[-5.938,-9.792],[-11.724,-9.561],[-12.871,-9.33],[-13.31,-8.5],[-13.31,-8.483],[-10.32,6.307],[-10.315,6.314],[-1.217,13.074],[-1.11,13.1]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shield Hole","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":17765,"st":0,"bm":0}],"markers":[{"tm":0,"cm":"bounce","dr":60},{"tm":90,"cm":"expand","dr":30}]} \ No newline at end of file diff --git a/DuckDuckGo/Navigation Bar/View/shield-dot.json b/DuckDuckGo/Navigation Bar/View/Animations/shield-dot.json similarity index 100% rename from DuckDuckGo/Navigation Bar/View/shield-dot.json rename to DuckDuckGo/Navigation Bar/View/Animations/shield-dot.json diff --git a/DuckDuckGo/Navigation Bar/View/Animations/shield-mouse-over.json b/DuckDuckGo/Navigation Bar/View/Animations/shield-mouse-over.json new file mode 100644 index 0000000000..a37928df21 --- /dev/null +++ b/DuckDuckGo/Navigation Bar/View/Animations/shield-mouse-over.json @@ -0,0 +1 @@ +{"v":"5.7.6","fr":60,"ip":180,"op":211,"w":60,"h":60,"nm":"_shield - 32px","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"Burst (line)","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":25,"s":[100]},{"t":30,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[30,30,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.125,-14.625],[-0.125,-28.125]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.129411764706,0.752941176471,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":5,"s":[0]},{"t":30,"s":[85]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":5,"s":[35]},{"t":30,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"rp","c":{"a":0,"k":6,"ix":1},"o":{"a":0,"k":0,"ix":2},"m":1,"ix":3,"tr":{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":60,"ix":4},"so":{"a":0,"k":100,"ix":5},"eo":{"a":0,"k":100,"ix":6},"nm":"Transform"},"nm":"Repeater 1","mn":"ADBE Vector Filter - Repeater","hd":false}],"ip":5,"op":31,"st":5,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Line","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0.044,-0.95,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-15],[0,15]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.2,0.2,0.2,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":17765,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Duckfoot (Stroke)","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[29.956,30,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":15,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":30,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":90,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":105,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":120,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":180,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":195,"s":[106,106,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":210,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":225,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":240,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":255,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":270,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":285,"s":[110,110,100]},{"t":300,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.988,0],[0.742,-0.742],[1.263,-0.428],[1.944,0.278],[0,0],[0,0],[0.815,-0.652],[0,0],[0,0],[0.003,-1.113],[-2.403,-3.607],[-3.955,-1.978],[-0.152,-0.015],[0,0],[-1.106,0.519],[0,0],[-0.138,0.069],[-2.512,3.821],[0.1,7.695],[0.961,0.641],[1.12,-0.14],[0,0],[0,0],[1.143,0.408],[0,0],[0,0],[1.382,1.375]],"o":[[-1.121,0],[-1.383,1.383],[-1.303,0.342],[0,0],[0,0],[-1.063,-0.133],[0,0],[0,0],[-0.845,0.705],[-0.1,7.594],[2.512,3.821],[0.138,0.069],[0,0],[1.106,0.519],[0,0],[0.152,-0.015],[3.955,-1.978],[2.403,-3.606],[-0.003,-1.094],[-0.83,-0.553],[0,0],[0,0],[-2.088,0.285],[0,0],[0,0],[-1.265,-0.422],[-0.823,-0.952]],"v":[[0,-15.95],[-2.884,-14.784],[-6.759,-12.198],[-11.523,-12.037],[-11.523,-12.038],[-11.545,-12.04],[-14.581,-11.276],[-14.581,-11.276],[-14.6,-11.26],[-15.95,-8.509],[-12.542,7.69],[-2.259,15.418],[-1.82,15.544],[-1.772,15.56],[1.772,15.56],[1.82,15.544],[2.259,15.418],[12.542,7.69],[15.95,-8.509],[14.493,-11.24],[11.545,-11.94],[11.545,-11.94],[11.531,-11.939],[6.82,-12.177],[6.821,-12.177],[6.795,-12.186],[2.919,-14.749]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-1.603,1.603],[-0.479,0],[-0.173,-0.208],[-0.027,-0.027],[-1.72,-0.576],[-2.302,0.313],[-0.369,-0.246],[0,-0.302],[0,0],[0,0],[1.995,-2.993],[0,0],[3.941,-1.974],[0.05,-0.017],[0,0],[0.053,-0.026],[0.448,0.224],[0.056,0.019],[0,0],[0.052,0.01],[2.05,3.12],[0,0],[0,0],[-0.099,7.4],[0,0],[0,0],[-0.343,0.29],[-0.525,-0.063],[-1.686,0.449],[-0.024,0.008]],"o":[[0.258,-0.258],[0.596,0],[0.024,0.029],[1.6,1.6],[1.652,0.587],[0.477,-0.058],[0.236,0.157],[0,0],[0,0],[0.099,7.498],[0,0],[-2.05,3.12],[-0.052,0.01],[0,0],[-0.056,0.019],[-0.448,0.224],[-0.053,-0.026],[0,0],[-0.05,-0.017],[-3.941,-1.974],[0,0],[0,0],[-1.994,-2.991],[0,0],[0,0],[0,-0.28],[0.188,-0.145],[2.232,0.318],[0.025,-0.007],[1.725,-0.575]],"v":[[-1.116,-13.016],[0,-13.45],[1.04,-13.1],[1.116,-13.016],[5.992,-9.818],[11.861,-9.46],[13.107,-9.16],[13.45,-8.5],[13.45,-8.5],[13.45,-8.484],[10.46,6.307],[10.455,6.314],[1.357,13.074],[1.205,13.114],[0.905,13.214],[0.741,13.282],[-0.741,13.282],[-0.905,13.214],[-1.205,13.114],[-1.357,13.074],[-10.455,6.314],[-10.455,6.314],[-10.46,6.307],[-13.45,-8.483],[-13.45,-8.483],[-13.45,-8.5],[-13.011,-9.33],[-11.865,-9.561],[-6.078,-9.792],[-6.005,-9.814]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.2,0.2,0.2,1],"ix":4,"x":"var $bm_rt;\n$bm_rt = content('Duckfoot (Stroke)').content('Fill 1').color;"},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Duckfoot (Stroke)","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":17765,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"_duckfoot mask","parent":4,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.121,0],[-0.823,-0.952],[-1.265,-0.422],[0,0],[0,0],[-2.088,0.285],[0,0],[0,0],[-0.83,-0.553],[-0.003,-1.094],[2.403,-3.606],[3.955,-1.978],[0.152,-0.015],[0,0],[1.106,0.519],[0,0],[0.138,0.069],[2.512,3.821],[-0.1,7.594],[-0.845,0.705],[0,0],[0,0],[-1.063,-0.133],[0,0],[0,0],[-1.303,0.342],[-1.383,1.383]],"o":[[0.988,0],[1.382,1.375],[0,0],[0,0],[1.143,0.408],[0,0],[0,0],[1.12,-0.14],[0.961,0.641],[0.1,7.695],[-2.512,3.821],[-0.138,0.069],[0,0],[-1.106,0.519],[0,0],[-0.152,-0.015],[-3.955,-1.978],[-2.403,-3.607],[0.003,-1.113],[0,0],[0,0],[0.815,-0.652],[0,0],[0,0],[1.944,0.278],[1.263,-0.428],[0.742,-0.742]],"v":[[0,-15.95],[2.919,-14.749],[6.795,-12.186],[6.821,-12.177],[6.82,-12.177],[11.531,-11.939],[11.545,-11.94],[11.545,-11.94],[14.493,-11.24],[15.95,-8.509],[12.542,7.69],[2.259,15.418],[1.82,15.544],[1.772,15.56],[-1.772,15.56],[-1.82,15.544],[-2.259,15.418],[-12.542,7.69],[-15.95,-8.509],[-14.6,-11.26],[-14.581,-11.276],[-14.581,-11.276],[-11.545,-12.04],[-11.523,-12.038],[-11.523,-12.037],[-6.759,-12.198],[-2.884,-14.784]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-1.603,1.603],[-0.479,0],[-0.173,-0.208],[-0.027,-0.027],[-1.72,-0.576],[-2.302,0.313],[-0.369,-0.246],[0,-0.302],[0,0],[0,0],[1.995,-2.993],[0,0],[3.941,-1.974],[0.05,-0.017],[0,0],[0.053,-0.026],[0.448,0.224],[0.056,0.019],[0,0],[0.052,0.01],[2.05,3.12],[0,0],[0,0],[-0.099,7.4],[0,0],[0,0],[-0.343,0.29],[-0.525,-0.063],[-1.686,0.449],[-0.024,0.008]],"o":[[0.258,-0.258],[0.596,0],[0.024,0.029],[1.6,1.6],[1.652,0.587],[0.477,-0.058],[0.236,0.157],[0,0],[0,0],[0.099,7.498],[0,0],[-2.05,3.12],[-0.052,0.01],[0,0],[-0.056,0.019],[-0.448,0.224],[-0.053,-0.026],[0,0],[-0.05,-0.017],[-3.941,-1.974],[0,0],[0,0],[-1.994,-2.991],[0,0],[0,0],[0,-0.28],[0.188,-0.145],[2.232,0.318],[0.025,-0.007],[1.725,-0.575]],"v":[[-1.116,-13.016],[0,-13.45],[1.04,-13.1],[1.116,-13.016],[5.992,-9.818],[11.861,-9.46],[13.107,-9.16],[13.45,-8.5],[13.45,-8.5],[13.45,-8.484],[10.46,6.307],[10.455,6.314],[1.357,13.074],[1.205,13.114],[0.905,13.214],[0.741,13.282],[-0.741,13.282],[-0.905,13.214],[-1.205,13.114],[-1.357,13.074],[-10.455,6.314],[-10.455,6.314],[-10.46,6.307],[-13.45,-8.483],[-13.45,-8.483],[-13.45,-8.5],[-13.011,-9.33],[-11.865,-9.561],[-6.078,-9.792],[-6.005,-9.814]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":90,"s":[0.878431372549,0.878431372549,0.878431372549,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":100,"s":[0.800000011921,0.800000011921,0.800000011921,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":140,"s":[0.800000011921,0.800000011921,0.800000011921,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":150,"s":[0.878431372549,0.878431372549,0.878431372549,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":180,"s":[0.878431372549,0.878431372549,0.878431372549,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":190,"s":[0.800000011921,0.800000011921,0.800000011921,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":230,"s":[0.800000011921,0.800000011921,0.800000011921,1]},{"t":240,"s":[0.878431372549,0.878431372549,0.878431372549,1]}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Duckfoot (Stroke)","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":90,"op":17765,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"glimmer","tt":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":275,"s":[6.906,27.156,0],"to":[9.229,0,0],"ti":[-9.229,0,0]},{"t":295,"s":[62.281,27.156,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-4.344,-5.344,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Duckfoot (Stroke)').transform.scale;"}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0.75]],"o":[[0,0],[0,-0.75]],"v":[[-24.299,11.458],[7.625,-20.75]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.129411764706,0.752941176471,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0.75]],"o":[[0,0],[0,-0.75]],"v":[[-20.861,14.895],[11.062,-17.312]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.129411764706,0.752941176471,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5,"x":"var $bm_rt;\n$bm_rt = content('Shape 1').content('Stroke 1').strokeWidth;"},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[1.5,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 2","np":3,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":275,"op":301,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Duckfoot (Solid)","parent":4,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":90,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":91,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":179,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":180,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":181,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":210,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":225,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":226,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":254,"s":[100]},{"t":255,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.121,0],[-0.823,-0.952],[-1.265,-0.422],[0,0],[0,0],[-2.088,0.285],[0,0],[0,0],[-0.83,-0.553],[-0.003,-1.094],[2.403,-3.606],[3.955,-1.978],[0.152,-0.015],[0,0],[1.106,0.519],[0,0],[0.138,0.069],[2.512,3.821],[-0.1,7.594],[-0.845,0.705],[0,0],[0,0],[-1.063,-0.133],[0,0],[0,0],[-1.303,0.342],[-1.383,1.383]],"o":[[0.988,0],[1.382,1.375],[0,0],[0,0],[1.143,0.408],[0,0],[0,0],[1.12,-0.14],[0.961,0.641],[0.1,7.695],[-2.512,3.821],[-0.138,0.069],[0,0],[-1.106,0.519],[0,0],[-0.152,-0.015],[-3.955,-1.978],[-2.403,-3.607],[0.003,-1.113],[0,0],[0,0],[0.815,-0.652],[0,0],[0,0],[1.944,0.278],[1.263,-0.428],[0.742,-0.742]],"v":[[0,-15.95],[2.919,-14.749],[6.795,-12.186],[6.821,-12.177],[6.82,-12.177],[11.531,-11.939],[11.545,-11.94],[11.545,-11.94],[14.493,-11.24],[15.95,-8.509],[12.542,7.69],[2.259,15.418],[1.82,15.544],[1.772,15.56],[-1.772,15.56],[-1.82,15.544],[-2.259,15.418],[-12.542,7.69],[-15.95,-8.509],[-14.6,-11.26],[-14.581,-11.276],[-14.581,-11.276],[-11.545,-12.04],[-11.523,-12.038],[-11.523,-12.037],[-6.759,-12.198],[-2.884,-14.784]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-1.603,1.603],[-0.479,0],[-0.173,-0.208],[-0.027,-0.027],[-1.72,-0.576],[-2.302,0.313],[-0.369,-0.246],[0,-0.302],[0,0],[0,0],[1.995,-2.993],[0,0],[3.941,-1.974],[0.05,-0.017],[0,0],[0.053,-0.026],[0.448,0.224],[0.056,0.019],[0,0],[0.052,0.01],[2.05,3.12],[0,0],[0,0],[-0.099,7.4],[0,0],[0,0],[-0.343,0.29],[-0.525,-0.063],[-1.686,0.449],[-0.024,0.008]],"o":[[0.258,-0.258],[0.596,0],[0.024,0.029],[1.6,1.6],[1.652,0.587],[0.477,-0.058],[0.236,0.157],[0,0],[0,0],[0.099,7.498],[0,0],[-2.05,3.12],[-0.052,0.01],[0,0],[-0.056,0.019],[-0.448,0.224],[-0.053,-0.026],[0,0],[-0.05,-0.017],[-3.941,-1.974],[0,0],[0,0],[-1.994,-2.991],[0,0],[0,0],[0,-0.28],[0.188,-0.145],[2.232,0.318],[0.025,-0.007],[1.725,-0.575]],"v":[[-1.116,-13.016],[0,-13.45],[1.04,-13.1],[1.116,-13.016],[5.992,-9.818],[11.861,-9.46],[13.107,-9.16],[13.45,-8.5],[13.45,-8.5],[13.45,-8.484],[10.46,6.307],[10.455,6.314],[1.357,13.074],[1.205,13.114],[0.905,13.214],[0.741,13.282],[-0.741,13.282],[-0.905,13.214],[-1.205,13.114],[-1.357,13.074],[-10.455,6.314],[-10.455,6.314],[-10.46,6.307],[-13.45,-8.483],[-13.45,-8.483],[-13.45,-8.5],[-13.011,-9.33],[-11.865,-9.561],[-6.078,-9.792],[-6.005,-9.814]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980401039,0.850980401039,0.850980401039,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Duckfoot (Stroke)","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":90,"op":256,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Outline Forcefield 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[30,30,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[150,150,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.5,1.5],[-0.8,0],[-0.5,-0.6],[-1.5,-0.5],[-2.2,0.3],[-0.6,-0.4],[0,-0.7],[2.2,-3.3],[4,-2],[0,0],[0,0],[0.8,0.4],[0,0],[0,0],[2.3,3.5],[-0.1,7.5],[-0.6,0.5],[-0.8,-0.1],[-1.5,0.4]],"o":[[0.5,-0.5],[0.8,0],[1.5,1.5],[1.4,0.5],[0.8,-0.1],[0.6,0.4],[0.1,7.6],[-2.3,3.5],[0,0],[0,0],[-0.8,0.4],[0,0],[0,0],[-4,-2],[-2.2,-3.3],[0,-0.7],[0.5,-0.4],[2.1,0.3],[1.5,-0.5]],"v":[[-2,-13.9],[0,-14.7],[2,-13.9],[6.4,-11],[11.7,-10.7],[13.8,-10.2],[14.7,-8.5],[11.5,7],[1.7,14.3],[1.6,14.3],[1.3,14.4],[-1.3,14.4],[-1.6,14.3],[-1.7,14.3],[-11.5,7],[-14.7,-8.5],[-13.8,-10.3],[-11.7,-10.8],[-6.4,-11]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.129411771894,0.752941191196,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.7,"ix":5},"lc":1,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Vector","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":460,"s":[0]},{"t":480,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":450,"s":[0]},{"t":470,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":450,"op":541,"st":450,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"Outline Forcefield 1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":350,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":360,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":389,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":390,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":419,"s":[100]},{"t":420,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[30,30,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":330,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":345,"s":[150,150,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":389,"s":[150,150,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":390,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":400,"s":[150,150,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":410,"s":[150,150,100]},{"t":420,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.5,1.5],[-0.8,0],[-0.5,-0.6],[-1.5,-0.5],[-2.2,0.3],[-0.6,-0.4],[0,-0.7],[2.2,-3.3],[4,-2],[0,0],[0,0],[0.8,0.4],[0,0],[0,0],[2.3,3.5],[-0.1,7.5],[-0.6,0.5],[-0.8,-0.1],[-1.5,0.4]],"o":[[0.5,-0.5],[0.8,0],[1.5,1.5],[1.4,0.5],[0.8,-0.1],[0.6,0.4],[0.1,7.6],[-2.3,3.5],[0,0],[0,0],[-0.8,0.4],[0,0],[0,0],[-4,-2],[-2.2,-3.3],[0,-0.7],[0.5,-0.4],[2.1,0.3],[1.5,-0.5]],"v":[[-2,-13.9],[0,-14.7],[2,-13.9],[6.4,-11],[11.7,-10.7],[13.8,-10.2],[14.7,-8.5],[11.5,7],[1.7,14.3],[1.6,14.3],[1.3,14.4],[-1.3,14.4],[-1.6,14.3],[-1.7,14.3],[-11.5,7],[-14.7,-8.5],[-13.8,-10.3],[-11.7,-10.8],[-6.4,-11]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.129411771894,0.752941191196,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":330,"s":[2.5]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":345,"s":[2]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":389,"s":[2]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":390,"s":[2.5]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":400,"s":[2]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":410,"s":[2]},{"t":420,"s":[2.5]}],"ix":5},"lc":1,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Vector","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":330,"op":421,"st":330,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Glow","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":90,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":100,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":180,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":187,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":210,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":225,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":226,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":250,"s":[100]},{"t":255,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[30,30,0],"ix":2,"l":2},"a":{"a":0,"k":[-23.458,7.667,0],"ix":1,"l":2},"s":{"a":0,"k":[200,200,100],"ix":6,"l":2,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Forcefield').transform.scale;"}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[24,24],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.129,0.753,0,0.5,0.129,0.753,0,1,0.129,0.753,0,0,1,0.065,0.5,0.13,0],"ix":9}},"s":{"a":0,"k":[0,0],"ix":5},"e":{"a":0,"k":[100,0],"ix":6},"t":2,"h":{"a":0,"k":0,"ix":7},"a":{"a":0,"k":0,"ix":8},"nm":"Gradient Fill_1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-23.458,7.667],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":90,"op":256,"st":-30,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"Forcefield","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":170,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":180,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":187,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":210,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":225,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":226,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":250,"s":[100]},{"t":255,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[30,30,0],"ix":2,"l":2},"a":{"a":0,"k":[-23.458,7.667,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":180,"s":[200,200,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":195,"s":[210,210,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":210,"s":[200,200,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":225,"s":[100,100,100]},{"t":250,"s":[200,200,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[24,24],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.129411764706,0.752941176471,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.25,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-23.458,7.667],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":165,"s":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":170,"s":[100]},{"t":180,"s":[0],"h":1}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":90,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":110,"s":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":170,"s":[100]},{"t":180,"s":[100],"h":1}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":90,"op":256,"st":-30,"bm":0}],"markers":[{"tm":0,"cm":"burst","dr":30},{"tm":90,"cm":"forcefield-clock","dr":30},{"tm":180,"cm":"forcefield-on","dr":30},{"tm":225,"cm":"forcefield-grow","dr":30},{"tm":270,"cm":"glimmer","dr":30},{"tm":330,"cm":"outline-ff-1","dr":30},{"tm":390,"cm":"outline-ff-2","dr":30},{"tm":450,"cm":"outline-ff-3","dr":30}]} \ No newline at end of file diff --git a/DuckDuckGo/Navigation Bar/View/shield.json b/DuckDuckGo/Navigation Bar/View/Animations/shield.json similarity index 100% rename from DuckDuckGo/Navigation Bar/View/shield.json rename to DuckDuckGo/Navigation Bar/View/Animations/shield.json diff --git a/DuckDuckGo/Navigation Bar/View/trackers-1.json b/DuckDuckGo/Navigation Bar/View/Animations/trackers-1.json similarity index 100% rename from DuckDuckGo/Navigation Bar/View/trackers-1.json rename to DuckDuckGo/Navigation Bar/View/Animations/trackers-1.json diff --git a/DuckDuckGo/Navigation Bar/View/trackers-2.json b/DuckDuckGo/Navigation Bar/View/Animations/trackers-2.json similarity index 100% rename from DuckDuckGo/Navigation Bar/View/trackers-2.json rename to DuckDuckGo/Navigation Bar/View/Animations/trackers-2.json diff --git a/DuckDuckGo/Navigation Bar/View/trackers-3.json b/DuckDuckGo/Navigation Bar/View/Animations/trackers-3.json similarity index 100% rename from DuckDuckGo/Navigation Bar/View/trackers-3.json rename to DuckDuckGo/Navigation Bar/View/Animations/trackers-3.json diff --git a/DuckDuckGo/Navigation Bar/View/NavigationBar.storyboard b/DuckDuckGo/Navigation Bar/View/NavigationBar.storyboard index d47b4504c2..6be652498c 100644 --- a/DuckDuckGo/Navigation Bar/View/NavigationBar.storyboard +++ b/DuckDuckGo/Navigation Bar/View/NavigationBar.storyboard @@ -574,7 +574,7 @@ -