-
Notifications
You must be signed in to change notification settings - Fork 425
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.
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
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 d7c5acf
Add a root view to choose which netp view to show
graeme c8b01ed
Create empty invite view
graeme 7f5ced2
Show root and therefore invite view from settings
graeme e1f20e8
Add invite lock assets
graeme 886a979
Implement initial invite view
graeme 076e0cb
Add convenience init for redemption coordinator
graeme cef1497
Copy over some useful invite code from macOS
graeme 219b29b
Remove invite entry from Status View
graeme 6456bbf
Add some mocks and test helpers
graeme 3c45169
Write tests + complete invite presentation logic
graeme eef4e9a
Add success view
graeme 6914b2a
Replace delegation with completion handler
graeme 27b3f09
Show an alert on error
graeme 77c9c6f
Move ClearTextField out of Autofill
graeme 6115e7d
Disable submit on empty string
graeme f3a81dc
Add submit button text
graeme 0286d01
and the text
graeme 598ab51
General tidy up
graeme c2c8f59
Pop 'n' push the root view on get started
graeme 18dbdeb
Move mocks to BSK
graeme 023f758
Make image correct size
graeme f000125
Reduce padding below message text
graeme 196350f
Create NetPRootViewController for dark styling
graeme e5fbf53
Fix invite view dark text
graeme 2429087
Remove unused colors
graeme e3c3b34
Add a nav title
graeme 72c9596
Disable failing invite code error test
graeme 4187e37
Disable user interaction on making network request
graeme fd3b43c
Fix typo in invite image name
graeme b532439
NetP invite code screen PR 1 (#1881)
graeme 0d2dc8c
Merge remote-tracking branch 'origin/develop' into graeme/netp-invite…
graeme 210a435
Point to updated BSK release
graeme b8a6492
Merge remote-tracking branch 'origin/develop' into graeme/netp-invite…
graeme File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add invite lock assets
- Loading branch information
commit e1f20e8d084a92490c943df1f3abd2fac1a2bd57
There are no files selected for viewing
12 changes: 12 additions & 0 deletions
12
DuckDuckGo/Assets.xcassets/IntiveLockSuccess.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "Intive-Lock-Success-96.pdf", | ||
"idiom" : "universal" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+6.53 KB
DuckDuckGo/Assets.xcassets/IntiveLockSuccess.imageset/Intive-Lock-Success-96.pdf
Binary file not shown.
12 changes: 12 additions & 0 deletions
12
DuckDuckGo/Assets.xcassets/InviteLock.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "Invite-Lock-96.pdf", | ||
"idiom" : "universal" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file not shown.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should "Intive" be "Invite"? This typo is present apparently in several file names, but I'm adding a single note here to avoid overcluttering the PR with comments.