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

Jump to bottom

New fundraising banner and in-app webview donation page #4649

Merged
merged 32 commits into from
Oct 9, 2023
Merged

New fundraising banner and in-app webview donation page #4649

merged 32 commits into from
Oct 9, 2023

Conversation

mazevedofs
Copy link
Collaborator

Phabricator: https://phabricator.wikimedia.org/T333108 & https://phabricator.wikimedia.org/T346823

Notes

Test Steps

  1. Run the experimental app, open it once, background it, and then open it again
  2. Set your region to the Netherlands - I was hard-coding "NL" on all methods that verify the country code
  3. Add Dutch to your languages
  4. Test closing using the "X" button or the "already donated" button (the last one) - it should not show the modal again
  5. Delete the app, reinstall, repeat step 1
  6. Select maybe later. Check if the reminder toast shows.
  7. Visit the article again. it should not show the modal.
  8. Change the date on your phone to tomorrow. Visit the article, it should show the modal.
  9. Reinstall and uninstall, repeat step 1. This time, donate.
  10. Verify that the back to article button shows on the bottom of the Thank you page.
  11. Close the web view and verify that the thank you toast shows

mazevedofs and others added 15 commits September 29, 2023 15:44
@mazevedofs
Add bottom view and button to SinglePageWebViewController when in tha…
f5e606b 
…nk you page after donating
@mazevedofs
Open webview in app
b206a57
@mazevedofs
Web view bottom view adjustments
c28973d
@mazevedofs
Setup bottom view on web view
a0a6d13
@mazevedofs
Pop view controller instead of dismiss
074a43a
@mazevedofs
WMF Framework/URL+Extensions.swift
aa0edeb
@tonisevener @mazevedofs
Fix thank you button on thank you page
98a1725
@mazevedofs
Add new fundraising panel class
2dc1efb
@mazevedofs
Add new fundraisu=ing panel
d3ec0ee 
- Adds new FundraisingAnnouncementPanelViewController, a suclass of ScrollableEducationPanelViewController
- Add new wmf_showFundraisingAnnouncement(...) method, called on showNewDonateExperienceCampaignModal when a campain is available for the user
- Updates the ScrollableEducationPanelViewController claas and view, to customize the new panel
@mazevedofs
Determine if maybe later should be displayed
7650181
@mazevedofs
Revert test code
0784004
@mazevedofs
Merge branch 'apple-pay-4' of https://github.com/wikimedia/wikipedia-ios
c644dc3 
 into new-fundraising-banner
@mazevedofs
Adjust close button layout
f54834c
@mazevedofs
Add modals after reminder or donation
c65ce72
@mazevedofs
Remove unused prop
556bfc5
@mazevedofs mazevedofs added the Dependent PR PR is dependent on another PR - merge dependent PR first and update branch before merging label Oct 3, 2023
tonisevener
tonisevener requested changes Oct 4, 2023
View reviewed changes
Copy link
Collaborator

@tonisevener tonisevener left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Looking great. This first round is a code-only review, I'll test it tomorrow and will let you know if I find anything else. Mainly just small naming tweaks and moving bits of code around.

...a/Sources/WKData/Data Controllers/Donor Experience/WKFundraisingCampaignDataController.swift Outdated Show resolved Hide resolved
WMF Framework/URL+Extensions.swift Outdated Show resolved Hide resolved
Wikipedia/Code/ArticleViewController+Announcements.swift Outdated Show resolved Hide resolved
Wikipedia/Code/ArticleViewController+Announcements.swift Outdated Show resolved Hide resolved
Wikipedia/Code/UIViewController+DonateHelpers.swift Outdated Show resolved Hide resolved
Wikipedia/Code/FundraisingAnnouncementPanel.swift Outdated Show resolved Hide resolved
Wikipedia/Code/ScrollableEducationPanelViewController.swift Outdated Show resolved Hide resolved
Wikipedia/Code/SinglePageWebViewController.swift Outdated Show resolved Hide resolved
Wikipedia/Code/SinglePageWebViewController.swift Outdated Show resolved Hide resolved
Wikipedia/Code/SinglePageWebViewController.swift Show resolved Hide resolved
Base automatically changed from apple-pay-4 to main October 4, 2023 20:00
tonisevener and others added 7 commits October 4, 2023 15:09
@tonisevener
Do not mark maybe later as permanently hidden
4aab463
@mazevedofs
Merge branch 'main' of https://github.com/wikimedia/wikipedia-ios int…
6308848 
…o new-fundraising-banner
@mazevedofs
PR Feedback
d4f3fd8 
This commit addresses sevral bits of PR feedback

- Deletes URL+Extensions, amd moves the content of the file to URL+LinkParsing
- Moves methods related to annoucemntes out of the UIViewController+DonateHelpers class into the announcemets extension
- Adds a buttonStyle enum to the ScrollableEducationPanelViewController
- And other smaller adjustments
@mazevedofs
Merge branch 'new-fundraising-banner' of https://github.com/wikimedia…
140f3ea 
…/wikipedia-ios into new-fundraising-banner
@mazevedofs
Fix string
7ad800b
@mazevedofs
Design review UI adjustments
5942bdd
@mazevedofs
Add separator to ScrollableEducationPanelView
04f4dbb
tonisevener and others added 6 commits October 5, 2023 18:25
@tonisevener
Fix bug with payment method alert presentation and dismissal
61436c8
@tonisevener
Fix settings Wikipedia spelling
4f71526
@tonisevener
Fix maybe later date bug
0d0bfdb 
- Seems to more reliably appear the next day if we persist date as next day at midnight
@tonisevener
Fix a couple of campaign modal bugs
9443f0e 
- Allow close button to permanently hide campaign modal
- secondaryTapHandler was called for "I already donated" on last day of the campaign, so extra handling for that case
@tonisevener
Push footer link to Safari so that we don't automatically dismiss the…
68ca57e 
… campaign modal upon push
@mazevedofs
Theme button properly
a4b1861
@tonisevener tonisevener mentioned this pull request Oct 6, 2023
Merged
@tonisevener tonisevener removed the Dependent PR PR is dependent on another PR - merge dependent PR first and update branch before merging label Oct 6, 2023
@tonisevener tonisevener merged commit fcfe87a into main Oct 9, 2023
2 checks passed
@tonisevener tonisevener deleted the new-fundraising-banner branch October 9, 2023 16:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tonisevener tonisevener tonisevener approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
2 participants
@mazevedofs @tonisevener