-
Notifications
You must be signed in to change notification settings - Fork 920
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
Update Settings: Update Ppro Purchasing and Setting items #5385
Merged
mikescamell
merged 15 commits into
develop
from
feature/mike/update-settings/update-ppro-purchasing-and-settings-item
Dec 13, 2024
Merged
Update Settings: Update Ppro Purchasing and Setting items #5385
mikescamell
merged 15 commits into
develop
from
feature/mike/update-settings/update-ppro-purchasing-and-settings-item
Dec 13, 2024
Conversation
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
Removing public properties and defaulting to off if no status provided I'm also allowing the setting of leading icon as I anticipate needing to change it in future for the VPN settings we need this to update the icon for the VPN Statues
being consistent with other settings
we'll duplicate and reuse the existing view where appropriate
copy paste, nothing has changed
no need for an alert now
The designs have the trailing icon at 16dpx16dp and we currently only allow the trailing icon to be 24dpx24dp. We can utilise the setup for leadingIconSize and allow setting of the trailing icon size. We'll use this for the expired state in the next commit
We show only the settings item out of all our views here in the new expired state. VPN, PIR and ITR are handled in their own view
we can ditch the old dedicated waiting container, in the new world we show the settings item with "activating"
Ideally I would have not added another view, but I noticed when trying to use a TwoLineListItem with just a title this was not centered, and I was concerned that I may impact the rest of the app if I changed it so the title was centered vertically if the secondary text was gone
mikescamell
force-pushed
the
feature/mike/update-settings/update-ppro-purchasing-and-settings-item
branch
from
December 12, 2024 19:03
32c2ea7
to
d79cc8e
Compare
Will need to be translated later
malmstein
approved these changes
Dec 13, 2024
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.
Nice work, works as expected @mikescamell !
mikescamell
deleted the
feature/mike/update-settings/update-ppro-purchasing-and-settings-item
branch
December 13, 2024 15:16
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Task/Issue URL: https://app.asana.com/0/1207908166761516/1208966262488270/f
Description
Initial changes to start moving Ppro settings to new Settings world. This PR focuses specifically on the Purchasing state as well as the Subscription Setting item state, as these are part of the same plugin.
Designs
Steps to test this PR
Prerequisite: Enable
newSettings
feature togglePrerequisite: Apply the patch in the Asana task
Also remember VPN, PIR, and ITR are not changed in this PR
Not purchased
ProSettingViewModel
to_viewState.emit(viewState.value.copy(status = EXPIRED, region = SubscriptionRegion.US))
Purchased
ProSettingViewModel
to_viewState.emit(viewState.value.copy(status = AUTO_RENEWABLE, region = SubscriptionRegion.US))
Activating (Waiting)
ProSettingViewModel
to_viewState.emit(viewState.value.copy(status = WAITING, region = SubscriptionRegion.US))
Expired
ProSettingViewModel
to_viewState.emit(viewState.value.copy(status = EXPIRED, region = SubscriptionRegion.US))