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.

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

fix(ui): dark mode buttons + color #700

Merged
merged 2 commits into from
May 4, 2023

Conversation

cyndichin
Copy link
Contributor

@cyndichin cyndichin commented May 3, 2023

Summary

Button color should be the same as light mode and teal2 color in dark mode should be adjusted.

References

IN-1393

Implementation Details

As part of this work:

  • Updated teal2 dark mode to use #9AE2DE
  • Added corner radius of 13 to buttons
  • Change dark mode buttons to use light mode colors
  • Small fix on capitalizing Pocket in Strings

Test Steps

Verify that dark mode buttons are now same color as light mode buttons

PR Checklist:

  • N / A Added Unit / UI tests
  • Self Review (review, clean up, documentation, run tests)
  • Basic Self QA

Screenshots

iPad iPhone
Simulator Screenshot - iPad Pro (12 9-inch) (6th generation) - 2023-05-04 at 11 33 25 Simulator Screenshot - iPhone 13 mini - 2023-05-04 at 11 35 24
Simulator Screenshot - iPad Pro (12 9-inch) (6th generation) - 2023-05-04 at 11 47 41 Simulator Screenshot - iPhone 13 mini - 2023-05-04 at 11 44 56

@pocket-ci
Copy link
Contributor

pocket-ci commented May 3, 2023

Messages
📖 No SwiftLint violations! 🎉
📖 Project coverage: 77.17%
📖 Checking XCode Environment Variables
📖 Edited 5 files
📖 Created 0 files

PocketKit: Coverage: 77.7

File Coverage
ActionsPrimaryButtonStyle.swift 100.0%
ArticleComponentUnavailableView.swift 86.08%

Generated by 🚫 Danger Swift against 639249a

@cyndichin cyndichin force-pushed the fix/IN-1393_dark-mode-designs-button branch 2 times, most recently from 981382b to 9ac6b3b Compare May 4, 2023 15:25
@cyndichin cyndichin force-pushed the fix/IN-1393_dark-mode-designs-button branch from 9ac6b3b to 639249a Compare May 4, 2023 15:28
@cyndichin cyndichin changed the title fix(ui): dark mode buttons + links fix(ui): dark mode buttons + color May 4, 2023
@@ -3,7 +3,7 @@ import SwiftUI
struct ActionsPrimaryButtonStyle: ButtonStyle {
func makeBody(configuration: Configuration) -> some View {
configuration.label
.background(configuration.isPressed ? Color(.ui.teal1) : Color(.ui.teal2))
.background(configuration.isPressed ? Color(UIColor(.ui.teal1).resolvedColor(with: UITraitCollection(userInterfaceStyle: .light))) : Color(UIColor(.ui.teal2).resolvedColor(with: UITraitCollection(userInterfaceStyle: .light))))
Copy link
Contributor Author

@cyndichin cyndichin May 4, 2023

Choose a reason for hiding this comment

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

we should probably consolidate this style and PocketButtonStyle, but need to discuss with Tais on this as they are different sized buttons. out of scope for this ticket

@cyndichin cyndichin marked this pull request as ready for review May 4, 2023 15:44
@cyndichin cyndichin requested a review from a team as a code owner May 4, 2023 15:44
@cyndichin cyndichin requested review from dskuza and nzeltzer and removed request for a team May 4, 2023 15:44
@cyndichin cyndichin merged commit 358bd55 into develop May 4, 2023
@cyndichin cyndichin deleted the fix/IN-1393_dark-mode-designs-button branch May 4, 2023 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants