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

Improve text field input #27

Closed
wants to merge 9 commits into from
Closed

Improve text field input #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2430f97
Add ColorChecker class. Add colorInputs ObservedObject for color stri…
W1W1-M Aug 17, 2022
2d1aafb
Delete ColorChecker class & ObservedObject. Delete SF symbol for colo…
W1W1-M Aug 18, 2022
59b5e48
Add ColorInputView. Setup ColorInputView for hex color inputs. Add co…
W1W1-M Aug 18, 2022
dbf5bed
Move hsl logic to ColorInputView. Delete hexColorView & hslColorView.…
W1W1-M Aug 19, 2022
99f45b2
Isolate textColor logic
W1W1-M Aug 19, 2022
26509e5
Update inputColorType to ColorFormat type. Delete colorType enum.
W1W1-M Aug 19, 2022
1cf5e65
Move colorKeyboardShortcut to ColorFormat extension. Delete inputColo…
W1W1-M Aug 19, 2022
32d5826
Move rgb & lch logic to ColorInputView. Delete rgbColorView & lchColo…
W1W1-M Aug 19, 2022
98eef57
Move isPreventingUpdate bool & color strings to AppState as @Publishe…
W1W1-M Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions Color Picker/AppState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import Sentry

@MainActor
final class AppState: ObservableObject {
// MARK: - Properties

static let shared = AppState()

var cancellables = Set<AnyCancellable>()
Expand Down Expand Up @@ -128,6 +130,14 @@ final class AppState: ObservableObject {
}
}

@Published var hexColor = ""
@Published var hslColor = ""
@Published var rgbColor = ""
@Published var lchColor = ""
@Published var isPreventingUpdate = false
Copy link
Owner

Choose a reason for hiding this comment

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

Why are these moved to AppState? AppState is for state that is required globally. This state is only needed for picker screen. I think you can just pass updateColorsFromPanel to the ColorPickerScreen view.


// MARK: - Methods

init() {
setUpConfig()

Expand Down Expand Up @@ -224,4 +234,40 @@ final class AppState: ObservableObject {
func handleAppReopen() {
handleMenuBarIcon()
}

// TODO: Find a better way to handle this.
func updateColorsFromPanel(
excludeHex: Bool = false,
excludeHSL: Bool = false,
excludeRGB: Bool = false,
excludeLCH: Bool = false,
preventUpdate: Bool = false,
color: NSColor
) {
if preventUpdate {
isPreventingUpdate = true
}

if !excludeHex {
hexColor = color.hexColorString
}

if !excludeHSL {
hslColor = color.hslColorString
}

if !excludeRGB {
rgbColor = color.rgbColorString
}

if !excludeLCH {
lchColor = color.lchColorString
}

if preventUpdate {
DispatchQueue.main.async {
self.isPreventingUpdate = false
}
}
}
}
Loading