Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

address bar position #2072

Merged
merged 76 commits into from
Oct 16, 2023
Merged

address bar position #2072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
13128a1
add address bar position settings
brindy Oct 4, 2023
0260907
fix rounding and row manipulation errors
brindy Oct 4, 2023
05318a6
Merge branch 'develop' into brindy/address-bar-position
brindy Oct 4, 2023
92b8257
show full site setting
brindy Oct 4, 2023
d3deaaa
wire up setting, disconnect from authentication toggle
brindy Oct 4, 2023
8565c49
don't show address bar position setting on ipad
brindy Oct 4, 2023
977469d
handle changing between top and bottom
brindy Oct 4, 2023
b84b5d0
remove print
brindy Oct 4, 2023
d084d76
make sure home row still works
brindy Oct 4, 2023
571a4dc
add animation on close
brindy Oct 4, 2023
d02019b
apply background and arrow to suggestions
brindy Oct 5, 2023
9a45614
make it easier to reason about colors by putting design system colors…
brindy Oct 5, 2023
3847cdb
update separators when in bottom mode
brindy Oct 5, 2023
6ad723e
adjust constraints for the webview
brindy Oct 5, 2023
0e12bd5
tidy up
brindy Oct 5, 2023
7b65c44
offset the menu when in landscape
brindy Oct 5, 2023
42eb690
Merge branch 'develop' into brindy/address-bar-position
brindy Oct 5, 2023
26e3aa4
fix omnibar layout issue
brindy Oct 5, 2023
deed0fd
swift lint
brindy Oct 6, 2023
ed845ad
fix toast position
brindy Oct 6, 2023
c6e63c5
dax onboarding fixes
brindy Oct 6, 2023
69daa4d
use position to determine address bar location
brindy Oct 6, 2023
a9698f5
use bar location for autocomplete
brindy Oct 6, 2023
90c3859
center no suggestions
brindy Oct 6, 2023
8a29a24
clean up
brindy Oct 6, 2023
8b3a2ea
use position to determine address bar location
brindy Oct 6, 2023
4a1b6fe
wee fix
brindy Oct 6, 2023
70e33b6
move address bar to top when in landscape
brindy Oct 6, 2023
6ad29af
set background color of status bg
brindy Oct 6, 2023
5f78946
autocomplete styling
brindy Oct 6, 2023
45176c3
fix tests
brindy Oct 7, 2023
0223f8b
Merge branch 'develop' into brindy/address-bar-position
brindy Oct 7, 2023
17a9ef5
fix show full address
brindy Oct 9, 2023
03215a5
Merge branch 'develop' into brindy/address-bar-position
brindy Oct 9, 2023
85a2d1b
some design / bug fixes
brindy Oct 9, 2023
e80e15b
Merge branch 'develop' into brindy/address-bar-position
brindy Oct 9, 2023
6db2f7e
revert toast change
brindy Oct 9, 2023
7e472c7
remove animation for position of navigation bar
brindy Oct 9, 2023
f09e23a
disable toolbar separator hiding for now
brindy Oct 9, 2023
845fbfa
pixels
brindy Oct 9, 2023
2d968c0
update share asset
brindy Oct 9, 2023
59fce71
remove show full site address
brindy Oct 9, 2023
22feade
point at change to design resources kit
brindy Oct 9, 2023
0e55367
correctly restore separator on toolbar
brindy Oct 9, 2023
9a85175
more carefully disable autoresizing
brindy Oct 10, 2023
688c2ec
Merge branch 'brindy/fix-ui-glitch-on-add-pass' into brindy/address-b…
brindy Oct 10, 2023
cc49364
use background not base and fix ipad theme changing
brindy Oct 10, 2023
7428d12
Merge branch 'develop' into brindy/address-bar-position
brindy Oct 10, 2023
bc39498
animate address bar
brindy Oct 10, 2023
fd963cc
nicer animation for bottom bar, some code tidy up
brindy Oct 10, 2023
af62d7b
update animation file
brindy Oct 10, 2023
015786d
Merge branch 'develop' into brindy/address-bar-position
brindy Oct 10, 2023
7d85de3
fix tests
brindy Oct 10, 2023
cda7fcd
don't animate sub views
brindy Oct 10, 2023
eba4487
make sure cells are the right colour
brindy Oct 11, 2023
c1406e9
fix animation glitch
brindy Oct 11, 2023
3d4c546
remove overlay frame inset as doesn't seem needed now
brindy Oct 11, 2023
f8ed300
Merge branch 'develop' into brindy/address-bar-position
brindy Oct 11, 2023
8e0b56b
set cell colours and fix top panel thing
brindy Oct 11, 2023
58b749d
remove print statement
brindy Oct 11, 2023
641ef76
fix inset for favorites overlay
brindy Oct 11, 2023
a2c42a3
fix cell colours on ipad
brindy Oct 12, 2023
1297d59
only use setting for determining position
brindy Oct 12, 2023
e7ced15
remove whitespace
brindy Oct 12, 2023
c516ef3
update dax dialog to match figma
brindy Oct 12, 2023
3b2ba64
swiftlint
brindy Oct 12, 2023
2e3c83e
swiftlint
brindy Oct 12, 2023
4cb4342
point to DRK commit ref
brindy Oct 12, 2023
b01cd58
action message position appropriate to the page that created it
brindy Oct 13, 2023
bb2a82a
swiftlint
brindy Oct 13, 2023
aaace19
use main view when creating blank snapshot
brindy Oct 13, 2023
de6bf60
swiftlint
brindy Oct 13, 2023
3a469ae
force omnibar to never animate its components on state change
brindy Oct 13, 2023
b029da0
localise position labels
brindy Oct 13, 2023
776fa1c
fix typo
brindy Oct 13, 2023
e757bce
update DRK to 2.0.0
brindy Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Core/PixelEvent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,9 @@ extension Pixel {

case autofillJSPixelFired(_ pixel: AutofillUserScript.JSPixel)

case navigationbarPositionBottom
case navigationBarPositionTop

case secureVaultInitError
case secureVaultError

Expand Down Expand Up @@ -576,7 +579,10 @@ extension Pixel.Event {

case .autocompleteSelectedLocal: return "m_au_l"
case .autocompleteSelectedRemote: return "m_au_r"


case .navigationbarPositionBottom: return "m_seturlbar_bottom"
case .navigationBarPositionTop: return "m_seturlbar_top"

case .feedbackPositive: return "mfbs_positive_submit"
case .feedbackNegativePrefix(category: let category): return "mfbs_negative_\(category)"

Expand Down
3 changes: 3 additions & 0 deletions Core/UserDefaultsPropertyWrapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ public struct UserDefaultsWrapper<T> {
case syncEnvironment = "com.duckduckgo.ios.sync-environment"

case networkProtectionDebugOptionAlwaysOnDisabled = "com.duckduckgo.network-protection.always-on.disabled"

case addressBarPosition = "com.duckduckgo.ios.addressbarposition"
case showFullSiteAddress = "com.duckduckgo.ios.showfullsiteaddress"
}

private let key: Key
Expand Down
24 changes: 14 additions & 10 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@
853273B624FFE0BB00E3C778 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8512EA4E24ED30D20073EE19 /* WidgetKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
8536A1C8209AF2410050739E /* MockVariantManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8536A1C7209AF2410050739E /* MockVariantManager.swift */; };
8536A1CA209AF6490050739E /* HomeRowReminderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8536A1C9209AF6480050739E /* HomeRowReminderTests.swift */; };
8536A1FD2ACF114B003AC5BA /* Theme+DesignSystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8536A1FC2ACF114B003AC5BA /* Theme+DesignSystem.swift */; };
85371D242121B9D500920548 /* new_tab.json in Resources */ = {isa = PBXBuildFile; fileRef = 85371D232121B9D400920548 /* new_tab.json */; };
85372447220DD103009D09CD /* UIKeyCommandExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85372446220DD103009D09CD /* UIKeyCommandExtension.swift */; };
85374D3821AC419800FF5A1E /* NavigationSearchHomeViewSectionRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85374D3721AC419800FF5A1E /* NavigationSearchHomeViewSectionRenderer.swift */; };
Expand Down Expand Up @@ -405,6 +406,7 @@
85514FFD2372DA0100DBC528 /* ios13-home-row.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 85514FFC2372DA0000DBC528 /* ios13-home-row.mp4 */; };
8551912724746EDC0010FDD0 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8551912624746EDC0010FDD0 /* SnapshotHelper.swift */; };
85582E0029D7409700E9AE35 /* SyncSettingsViewController+PDFRendering.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85582DFF29D7409700E9AE35 /* SyncSettingsViewController+PDFRendering.swift */; };
855D45D32ACD7DD1008F7AC6 /* AddressBarPositionSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 855D45D22ACD7DD1008F7AC6 /* AddressBarPositionSettingsViewController.swift */; };
855D914D2063EF6A00C4B448 /* TabSwitcherTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 855D914C2063EF6A00C4B448 /* TabSwitcherTransition.swift */; };
8563A03C1F9288D600F04442 /* BrowserChromeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8563A03B1F9288D600F04442 /* BrowserChromeManager.swift */; };
8565A34B1FC8D96B00239327 /* LaunchTabNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8565A34A1FC8D96B00239327 /* LaunchTabNotification.swift */; };
Expand Down Expand Up @@ -501,7 +503,6 @@
981CA7EA2617797500E119D5 /* MainViewController+AddFavoriteFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 981CA7E92617797500E119D5 /* MainViewController+AddFavoriteFlow.swift */; };
981FED692201FE69008488D7 /* AutoClearSettingsScreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 981FED682201FE69008488D7 /* AutoClearSettingsScreenTests.swift */; };
981FED6E22025151008488D7 /* BlankSnapshotViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 981FED6C22025151008488D7 /* BlankSnapshotViewController.swift */; };
981FED712202519C008488D7 /* BlankSnapshot.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 981FED702202519C008488D7 /* BlankSnapshot.storyboard */; };
981FED7422046017008488D7 /* AutoClearTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 981FED7322046017008488D7 /* AutoClearTests.swift */; };
981FED76220464EF008488D7 /* AutoClearSettingsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 981FED75220464EF008488D7 /* AutoClearSettingsModel.swift */; };
9820EAF522613CD30089094D /* WebProgressWorker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9820EAF422613CD30089094D /* WebProgressWorker.swift */; };
Expand Down Expand Up @@ -693,8 +694,8 @@
C17B59592A03AAD30055F2D1 /* PasswordGenerationPromptViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17B59562A03AAD30055F2D1 /* PasswordGenerationPromptViewModel.swift */; };
C17B595A2A03AAD30055F2D1 /* PasswordGenerationPromptViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17B59572A03AAD30055F2D1 /* PasswordGenerationPromptViewController.swift */; };
C17B595B2A03AAD30055F2D1 /* PasswordGenerationPromptView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17B59582A03AAD30055F2D1 /* PasswordGenerationPromptView.swift */; };
C18ED43C2AB8364400BF3805 /* FileTextPreviewDebugViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C18ED43B2AB8364400BF3805 /* FileTextPreviewDebugViewController.swift */; };
C18ED43A2AB6F77600BF3805 /* AutofillSettingsEnableFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C18ED4392AB6F77600BF3805 /* AutofillSettingsEnableFooterView.swift */; };
C18ED43C2AB8364400BF3805 /* FileTextPreviewDebugViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C18ED43B2AB8364400BF3805 /* FileTextPreviewDebugViewController.swift */; };
C1963863283794A000298D4D /* BookmarksCachingSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1963862283794A000298D4D /* BookmarksCachingSearch.swift */; };
C1B0F6422AB08BE9001EAF05 /* MockPrivacyConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1B0F6412AB08BE9001EAF05 /* MockPrivacyConfiguration.swift */; };
C1B7B51C28941E980098FD6A /* HomeMessageViewModelBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1B7B51B28941E980098FD6A /* HomeMessageViewModelBuilder.swift */; };
Expand Down Expand Up @@ -1376,6 +1377,7 @@
853273B124FF114700E3C778 /* DeepLinks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeepLinks.swift; sourceTree = "<group>"; };
8536A1C7209AF2410050739E /* MockVariantManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockVariantManager.swift; sourceTree = "<group>"; };
8536A1C9209AF6480050739E /* HomeRowReminderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeRowReminderTests.swift; sourceTree = "<group>"; };
8536A1FC2ACF114B003AC5BA /* Theme+DesignSystem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Theme+DesignSystem.swift"; sourceTree = "<group>"; };
85371D232121B9D400920548 /* new_tab.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = new_tab.json; sourceTree = "<group>"; };
85372446220DD103009D09CD /* UIKeyCommandExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIKeyCommandExtension.swift; sourceTree = "<group>"; };
85374D3721AC419800FF5A1E /* NavigationSearchHomeViewSectionRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationSearchHomeViewSectionRenderer.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1409,6 +1411,7 @@
85519124247468580010FDD0 /* TrackerRadarIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackerRadarIntegrationTests.swift; sourceTree = "<group>"; };
8551912624746EDC0010FDD0 /* SnapshotHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SnapshotHelper.swift; path = fastlane/SnapshotHelper.swift; sourceTree = SOURCE_ROOT; };
85582DFF29D7409700E9AE35 /* SyncSettingsViewController+PDFRendering.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SyncSettingsViewController+PDFRendering.swift"; sourceTree = "<group>"; };
855D45D22ACD7DD1008F7AC6 /* AddressBarPositionSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressBarPositionSettingsViewController.swift; sourceTree = "<group>"; };
855D914C2063EF6A00C4B448 /* TabSwitcherTransition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabSwitcherTransition.swift; sourceTree = "<group>"; };
8563A03B1F9288D600F04442 /* BrowserChromeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowserChromeManager.swift; sourceTree = "<group>"; };
8565A34A1FC8D96B00239327 /* LaunchTabNotification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchTabNotification.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1544,7 +1547,6 @@
981DCA992521EFAB00CD4C18 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Localizable.strings; sourceTree = "<group>"; };
981FED682201FE69008488D7 /* AutoClearSettingsScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoClearSettingsScreenTests.swift; sourceTree = "<group>"; };
981FED6C22025151008488D7 /* BlankSnapshotViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlankSnapshotViewController.swift; sourceTree = "<group>"; };
981FED702202519C008488D7 /* BlankSnapshot.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = BlankSnapshot.storyboard; sourceTree = "<group>"; };
981FED7322046017008488D7 /* AutoClearTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoClearTests.swift; sourceTree = "<group>"; };
981FED75220464EF008488D7 /* AutoClearSettingsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoClearSettingsModel.swift; sourceTree = "<group>"; };
9820A5D522B1C0B20024E37C /* DDG Trace.tracetemplate */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = "DDG Trace.tracetemplate"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2265,8 +2267,8 @@
C17B59562A03AAD30055F2D1 /* PasswordGenerationPromptViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordGenerationPromptViewModel.swift; sourceTree = "<group>"; };
C17B59572A03AAD30055F2D1 /* PasswordGenerationPromptViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordGenerationPromptViewController.swift; sourceTree = "<group>"; };
C17B59582A03AAD30055F2D1 /* PasswordGenerationPromptView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordGenerationPromptView.swift; sourceTree = "<group>"; };
C18ED43B2AB8364400BF3805 /* FileTextPreviewDebugViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileTextPreviewDebugViewController.swift; sourceTree = "<group>"; };
C18ED4392AB6F77600BF3805 /* AutofillSettingsEnableFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillSettingsEnableFooterView.swift; sourceTree = "<group>"; };
C18ED43B2AB8364400BF3805 /* FileTextPreviewDebugViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileTextPreviewDebugViewController.swift; sourceTree = "<group>"; };
C1963862283794A000298D4D /* BookmarksCachingSearch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarksCachingSearch.swift; sourceTree = "<group>"; };
C1B0F6412AB08BE9001EAF05 /* MockPrivacyConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockPrivacyConfiguration.swift; sourceTree = "<group>"; };
C1B7B51B28941E980098FD6A /* HomeMessageViewModelBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeMessageViewModelBuilder.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3684,19 +3686,20 @@
isa = PBXGroup;
children = (
F1CDD3F11F16911700BE0581 /* AboutViewController.swift */,
1E865AEF272042DB001C74F3 /* TextSizeSettingsViewController.swift */,
855D45D22ACD7DD1008F7AC6 /* AddressBarPositionSettingsViewController.swift */,
AA3D854623D9E88E00788410 /* AppIconSettingsCell.swift */,
AA3D854423D9942200788410 /* AppIconSettingsViewController.swift */,
98F0FC1F21FF18E700CE77AB /* AutoClearSettingsViewController.swift */,
1EE7C298294227EC0026C8CB /* AutoconsentSettingsViewController.swift */,
02C57C4A2514FEFB009E5129 /* DoNotSellSettingsViewController.swift */,
F456B3B425810BB900B79B90 /* FireButtonAnimationSettingsViewController.swift */,
85449EF423FDA02800512AAF /* KeyboardSettingsViewController.swift */,
8540BD5523D9E9C20057FDD2 /* PreserveLoginsSettingsViewController.swift */,
F176699D1E40BC86003D3222 /* Settings.storyboard */,
F1AB2B411E3F7D5C00868554 /* SettingsViewController.swift */,
1E865AEF272042DB001C74F3 /* TextSizeSettingsViewController.swift */,
9881439B23326DC200573F7C /* ThemeSettingsViewController.swift */,
8531A08D1F9950E6000484F0 /* UnprotectedSitesViewController.swift */,
02C57C4A2514FEFB009E5129 /* DoNotSellSettingsViewController.swift */,
1EE7C298294227EC0026C8CB /* AutoconsentSettingsViewController.swift */,
);
name = UI;
sourceTree = "<group>";
Expand Down Expand Up @@ -4067,6 +4070,7 @@
98DA6EC92181E41F00E65433 /* ThemeManager.swift */,
98F3A1D9217B37200011A0D4 /* LightTheme.swift */,
98F3A1DB217B373E0011A0D4 /* DarkTheme.swift */,
8536A1FC2ACF114B003AC5BA /* Theme+DesignSystem.swift */,
);
name = Themes;
sourceTree = "<group>";
Expand Down Expand Up @@ -4933,7 +4937,6 @@
children = (
984147B624F0264B00362052 /* Authentication.storyboard */,
F1AE54E71F0425FC00D9A700 /* AuthenticationViewController.swift */,
981FED702202519C008488D7 /* BlankSnapshot.storyboard */,
981FED6C22025151008488D7 /* BlankSnapshotViewController.swift */,
F1CA3C3A1F045B65005FADB3 /* Authenticator.swift */,
F1CA3C361F045878005FADB3 /* PrivacyStore.swift */,
Expand Down Expand Up @@ -5709,7 +5712,6 @@
1E16260B296845120004127F /* cookie-banner-illustration-animated.json in Resources */,
AA4D6AD323DE4D27007E8790 /* [email protected] in Resources */,
AA4D6AA123DE4CC4007E8790 /* [email protected] in Resources */,
981FED712202519C008488D7 /* BlankSnapshot.storyboard in Resources */,
984147A824F0259000362052 /* Onboarding.storyboard in Resources */,
AA4D6AF723DF0312007E8790 /* [email protected] in Resources */,
AA4D6AE923DE4D33007E8790 /* [email protected] in Resources */,
Expand Down Expand Up @@ -6166,6 +6168,7 @@
F4147354283BF834004AA7A5 /* AutofillContentScopeFeatureToggles.swift in Sources */,
986DA94A24884B18004A7E39 /* WebViewTransition.swift in Sources */,
31B524572715BB23002225AB /* WebJSAlert.swift in Sources */,
8536A1FD2ACF114B003AC5BA /* Theme+DesignSystem.swift in Sources */,
F114C55B1E66EB020018F95F /* NibLoading.swift in Sources */,
C10CB5F32A1A5BDF0048E503 /* AutofillViews.swift in Sources */,
982E5630222C3D5B008D861B /* FeedbackPickerViewController.swift in Sources */,
Expand Down Expand Up @@ -6388,6 +6391,7 @@
027F48782A4B663C001A1C6C /* AppTPFAQView.swift in Sources */,
02A4EACA29B0F464009BE006 /* AppTPToggleViewModel.swift in Sources */,
4B6484EE27FD1E350050A7A1 /* WindowsBrowserWaitlistDebugViewController.swift in Sources */,
855D45D32ACD7DD1008F7AC6 /* AddressBarPositionSettingsViewController.swift in Sources */,
F1D796EE1E7AF2EB0019D451 /* UIViewControllerExtension.swift in Sources */,
1EE411F12857C3640003FE64 /* TrackerAnimationImageProvider.swift in Sources */,
1E7A711C2934EEBC00B7EA19 /* OmniBarNotification.swift in Sources */,
Expand Down Expand Up @@ -8978,7 +8982,7 @@
repositoryURL = "https://github.com/duckduckgo/DesignResourcesKit";
requirement = {
kind = exactVersion;
version = 1.1.1;
version = 2.0.0;
};
};
F486D2EF25069482002D07D7 /* XCRemoteSwiftPackageReference "Kingfisher" */ = {
Expand Down
6 changes: 3 additions & 3 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"repositoryURL": "https://github.com/duckduckgo/DesignResourcesKit",
"state": {
"branch": null,
"revision": "5de78d59358ff60651b2cf9322c74a2297927b4e",
"version": "1.1.1"
"revision": "d7ea2561ec7624c224f52e1c9b349075ddf1c782",
"version": "2.0.0"
}
},
{
Expand Down Expand Up @@ -156,7 +156,7 @@
},
{
"package": "TrackerRadarKit",
"repositoryURL": "https://github.com/duckduckgo/TrackerRadarKit.git",
"repositoryURL": "https://github.com/duckduckgo/TrackerRadarKit",
"state": {
"branch": null,
"revision": "4684440d03304e7638a2c8086895367e90987463",
Expand Down
Loading