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

NetP Invite code screen PR 2 #1883

Merged
merged 34 commits into from
Aug 3, 2023
Merged

NetP Invite code screen PR 2 #1883

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
617961b
Add convenience init for token store
graeme Jul 25, 2023
d7c5acf
Add a root view to choose which netp view to show
graeme Jul 25, 2023
c8b01ed
Create empty invite view
graeme Jul 26, 2023
7f5ced2
Show root and therefore invite view from settings
graeme Jul 26, 2023
e1f20e8
Add invite lock assets
graeme Jul 25, 2023
886a979
Implement initial invite view
graeme Jul 26, 2023
076e0cb
Add convenience init for redemption coordinator
graeme Jul 27, 2023
cef1497
Copy over some useful invite code from macOS
graeme Jul 27, 2023
219b29b
Remove invite entry from Status View
graeme Jul 28, 2023
6456bbf
Add some mocks and test helpers
graeme Jul 28, 2023
3c45169
Write tests + complete invite presentation logic
graeme Jul 28, 2023
eef4e9a
Add success view
graeme Jul 28, 2023
6914b2a
Replace delegation with completion handler
graeme Jul 28, 2023
27b3f09
Show an alert on error
graeme Jul 28, 2023
77c9c6f
Move ClearTextField out of Autofill
graeme Jul 28, 2023
6115e7d
Disable submit on empty string
graeme Jul 28, 2023
f3a81dc
Add submit button text
graeme Jul 28, 2023
0286d01
and the text
graeme Jul 28, 2023
598ab51
General tidy up
graeme Jul 28, 2023
c2c8f59
Pop 'n' push the root view on get started
graeme Jul 28, 2023
18dbdeb
Move mocks to BSK
graeme Jul 28, 2023
023f758
Make image correct size
graeme Jul 29, 2023
f000125
Reduce padding below message text
graeme Jul 31, 2023
196350f
Create NetPRootViewController for dark styling
graeme Jul 31, 2023
e5fbf53
Fix invite view dark text
graeme Jul 31, 2023
2429087
Remove unused colors
graeme Jul 31, 2023
e3c3b34
Add a nav title
graeme Jul 31, 2023
72c9596
Disable failing invite code error test
graeme Jul 31, 2023
4187e37
Disable user interaction on making network request
graeme Aug 2, 2023
fd3b43c
Fix typo in invite image name
graeme Aug 2, 2023
b532439
NetP invite code screen PR 1 (#1881)
graeme Aug 3, 2023
0d2dc8c
Merge remote-tracking branch 'origin/develop' into graeme/netp-invite…
graeme Aug 3, 2023
210a435
Point to updated BSK release
graeme Aug 3, 2023
b8a6492
Merge remote-tracking branch 'origin/develop' into graeme/netp-invite…
graeme Aug 3, 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
Prev Previous commit
Next Next commit
Point to updated BSK release
  • Loading branch information
@graeme
graeme committed Aug 3, 2023
commit 210a43539cc237c388caffa717e04a07e16497b1
4 changes: 2 additions & 2 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8355,8 +8355,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
requirement = {
branch = "graeme/network-protection-test-utils";
kind = branch;
kind = exactVersion;
version = 71.3.0;
};
};
C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
Expand Down
10 changes: 5 additions & 5 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 @@ -14,9 +14,9 @@
"package": "BrowserServicesKit",
"repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit",
"state": {
"branch": "graeme/network-protection-test-utils",
"revision": "439536018d0b5f5f04177c01b38d010c527d8318",
"version": null
"branch": null,
"revision": "005949a099121192f55b4b5d33ed5d7ce4a12934",
"version": "71.3.0"
}
},
{
Expand All @@ -33,8 +33,8 @@
"repositoryURL": "https://github.com/duckduckgo/content-scope-scripts",
"state": {
"branch": null,
"revision": "0cfcedb9c8aefa52c7f3a36a2b3793a2c44de764",
"version": "4.22.5"
"revision": "a4f35ad23ac4a0eb9b36b94f1f2aa0f0ebf2855d",
"version": "4.30.0"
}
},
{
Expand Down