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

Daniel/subscriptions/3.manage subscription #2336

Merged
merged 163 commits into from
Jan 17, 2024
Merged

Daniel/subscriptions/3.manage subscription #2336

merged 163 commits into from
Jan 17, 2024

Conversation

afterxleep
Copy link
Collaborator

@afterxleep afterxleep commented Jan 12, 2024 •
edited
Loading

Task/Issue URL: https://app.asana.com/0/72649045549333/1205054784245717/f

Description:

  • Implement Subscription Management View
  • Adds labels to the transaction progress box and reduces the opacity of the background view.

Steps to test this PR:

  1. Purchase a Subscription
  2. Observe that the Progress Dialog now tells you the current Status "Purchasing Subscription or Completing Purchase"
  3. Go to Settings -> Manage Subscription
  4. Tap Change Plan or Billing and observe you're taken to the iOS subscription management page
  5. Tap Remove From this device and confirm
  6. Try to purchase the subscription again. It should be found and adequately restored
  7. Observe that during Restore, the progress dialog says "Restoring subscription."
Internal references:

Software Engineering Expectations
Technical Design Template

@afterxleep
General View, Sync, Logins, Appeareance first implementation
7422774
@afterxleep
Extract Model and State to separate classes
f85324f
@afterxleep
Improve separation of concerns/responsibilities
2060dc1
@afterxleep
Use LazyViews
317ca72
@afterxleep
Removed unnecesary viewcontrollers
4a8946a
@afterxleep
Application Lock
a63bb5a
@afterxleep
Present legacy views from the Root Navigation Controller
1779ecc
@afterxleep
State Management Updates
67436be
@afterxleep
Email Protection and other links
2cc396e
@afterxleep
State initialization
2102043
@afterxleep
Added Required Cells
81d0502
@afterxleep
Dismiss legacy ViewControllers and update settings
8a64f7b
@afterxleep
Network Protection Status
38f07c0
@afterxleep
Remaining views and cleanup
50f5731
@afterxleep
Fix Debug Menu
dd5ae07
@afterxleep
Move Font settings out of viewModel
3fa4ee9
@afterxleep
Fix presentation for login
18f4d2a
@afterxleep
Cell design
7f61c51
@afterxleep
Renamed Type
b79586e
@afterxleep
Dismiss the view
99d8be2
@afterxleep
UI Cleanup
a85d5e8
@afterxleep
Add Required Strings to UserText
c84b756
@afterxleep
Move all strings to UserText
067d0d9
@afterxleep
Merge branch 'main' into daniel/settings-swiftui
eab0239 
# Conflicts:
#	DuckDuckGo/AddressBarPositionSettingsViewController.swift
#	DuckDuckGo/MainViewController+Segues.swift
#	DuckDuckGo/UserText.swift
@afterxleep
Updated Strings
897d021
@afterxleep
Fixed Remaining Strings
eab5c1d
@afterxleep
Localization Files
a6cc6df
@afterxleep
Remove SettingsViewController
7f43367
@afterxleep
Update layout priority for Text accesory
92e0afd
@afterxleep
Merge branch 'main' into daniel/settings-swiftui
2f7c31b
@afterxleep afterxleep requested a review from miasma13 January 12, 2024 17:16
miasma13
miasma13 approved these changes Jan 16, 2024
View reviewed changes
Copy link
Contributor

@miasma13 miasma13 left a comment

Choose a reason for hiding this comment

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

Couple of minor comments and some subtasks left on https://app.asana.com/0/1203936086921904/1206337715257645/f

DuckDuckGo/PrivacyPro/Views/PurchaseInProgressView.swift Outdated Show resolved Hide resolved
DuckDuckGo/SettingsViewModel.swift Outdated Show resolved Hide resolved
DuckDuckGo/PrivacyPro/Views/SubscriptionFlowView.swift Outdated Show resolved Hide resolved
DuckDuckGo/PrivacyPro/Views/SubscriptionSettingsView.swift Outdated Show resolved Hide resolved
@afterxleep
Merge branch 'main' into daniel/subscriptions/3.manage-subscription
30cb84c 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo/PrivacyPro/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
#	DuckDuckGo/PrivacyPro/ViewModel/SubscriptionFlowViewModel.swift
#	DuckDuckGo/PrivacyPro/Views/SubscriptionFlowView.swift
#	DuckDuckGo/SettingsPrivacyProView.swift
#	DuckDuckGo/SettingsViewModel.swift
#	DuckDuckGo/UserText.swift
#	DuckDuckGo/en.lproj/Localizable.strings
@afterxleep
Added Strings
e189439
@afterxleep
Removing print statements from relevant iOS files
8f0f00f
@afterxleep
Remove unwanted TODO comments
2151ec6
@afterxleep
Update preloader
cb35a1a
@afterxleep
Update progress dialog to be Dynamically sized
3e0a77e
@afterxleep
Localize missing strings
95afe7d
@afterxleep
Adding Missing Localization
18b2fae
@afterxleep
Updated variable naming
7875fee
@afterxleep
Merge branch 'main' into daniel/subscriptions/3.manage-subscription
f88f230 
# Conflicts:
#	DuckDuckGo/en.lproj/Localizable.strings
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 16, 2024 •
edited
Loading

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS against 8d5806b

@afterxleep
Copy link
Collaborator Author

@miasma13 Fixed all suggestions in Asana, and added link to load subscriptions via Storekit2. Thanks for the feedback

@afterxleep afterxleep merged commit eb1dae7 into main Jan 17, 2024
10 checks passed
@afterxleep afterxleep deleted the daniel/subscriptions/3.manage-subscription branch January 17, 2024 01:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miasma13 miasma13 miasma13 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@afterxleep @miasma13 @samsymons @bwaresiak @jaceklyp @loremattei @ayoy