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

Update Legacy AutoLogoutModal Theme #4428

Merged
merged 3 commits into from
Sep 4, 2023
Merged

Update Legacy AutoLogoutModal Theme #4428

merged 3 commits into from
Sep 4, 2023

Conversation

Jon-edge
Copy link
Collaborator

@Jon-edge Jon-edge commented Sep 1, 2023 •
edited
Loading

iOS:
image

Android:
image

CHANGELOG

  • changed: Update UI theme for Settings AutoLogoutModal

Dependencies

none

Requirements

If you have made any visual changes to the GUI. Make sure you have:

  • Tested on iOS device
  • Tested on Android device
  • Tested on small-screen device (iPod Touch)
  • Tested on large-screen device (tablet)

@swansontec
Copy link
Contributor

swansontec commented Sep 1, 2023 •
edited
Loading

After merging this, the following files are unused:

src/components/legacy/AirshipModal.tsx
src/components/legacy/Buttons/SecondaryButton.ui.tsx
src/components/legacy/Buttons/TertiaryButton.ui.tsx
src/components/legacy/ContentArea.tsx
src/components/legacy/IconCircle.tsx
src/components/legacy/LadderLayout.tsx

Congratulations! You are the hero who finally broke us out of theme v1! Go ahead and delete these old files.

Edit: I just went ahead and did it.

swansontec
swansontec requested changes Sep 1, 2023
View reviewed changes
src/components/modals/AutoLogoutModal.tsx Outdated
const { autoLogoutTimeInSeconds, bridge } = props
const theme = useTheme()
const styles = getStyles(theme)
const textColor = theme.pickerTextDark
Copy link
Contributor

Choose a reason for hiding this comment

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

Would it make sense to delete pickerTextDark and pickerTextLight from the theme, and then just use normal theme.primaryText for this? Or, at the very least, just merge the two into a single pickerText entry?

@Jon-edge
Copy link
Collaborator Author

Jon-edge commented Sep 1, 2023 •
edited
Loading

Can't really change much visually about the picker for Android. We could probably benefit from a common component instead of trying to massage the native UI further....

swansontec
swansontec approved these changes Sep 1, 2023
View reviewed changes
Copy link
Contributor

@swansontec swansontec left a comment

Choose a reason for hiding this comment

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

This is great now!

@swansontec swansontec merged commit e52d3a6 into develop Sep 4, 2023
2 checks passed
@swansontec swansontec deleted the jon/auto-logout-ui2 branch September 4, 2023 22:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@swansontec swansontec swansontec 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.
2 participants
@Jon-edge @swansontec