Skip to content

Commit

Permalink
Fixed missing update bug
Browse files Browse the repository at this point in the history
  • Loading branch information
superhighfives committed Jun 5, 2022
1 parent eea98b5 commit 300da1a
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 28 deletions.
4 changes: 4 additions & 0 deletions Pika.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
EA8124C1259E307D00033F0B /* Footer.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA8124C0259E307D00033F0B /* Footer.swift */; };
EAA8AE1925B8EC070049299B /* KeyboardShortcutKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA8AE1825B8EC070049299B /* KeyboardShortcutKey.swift */; };
EAA8AE1C25B8F03B0049299B /* KeyboardShortcutGrid.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA8AE1B25B8F03B0049299B /* KeyboardShortcutGrid.swift */; };
EABAEAE0284D50D1000716AE /* ComplianceButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = EABAEADF284D50D1000716AE /* ComplianceButtons.swift */; };
EACA8A45260501210064035C /* Exporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EACA8A44260501210064035C /* Exporter.swift */; };
EAD0B6CC259CED1C00FA2F67 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAD0B6CB259CED1C00FA2F67 /* AppDelegate.swift */; };
EAD0B6D0259CED1D00FA2F67 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EAD0B6CF259CED1D00FA2F67 /* Assets.xcassets */; };
Expand Down Expand Up @@ -97,6 +98,7 @@
EA8124C0259E307D00033F0B /* Footer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Footer.swift; sourceTree = "<group>"; };
EAA8AE1825B8EC070049299B /* KeyboardShortcutKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShortcutKey.swift; sourceTree = "<group>"; };
EAA8AE1B25B8F03B0049299B /* KeyboardShortcutGrid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShortcutGrid.swift; sourceTree = "<group>"; };
EABAEADF284D50D1000716AE /* ComplianceButtons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComplianceButtons.swift; sourceTree = "<group>"; };
EACA8A44260501210064035C /* Exporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Exporter.swift; sourceTree = "<group>"; };
EAD0B6C8259CED1C00FA2F67 /* Pika.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Pika.app; sourceTree = BUILT_PRODUCTS_DIR; };
EAD0B6CB259CED1C00FA2F67 /* AppDelegate.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; tabWidth = 4; };
Expand Down Expand Up @@ -271,6 +273,7 @@
226FD60F25A940F90021A67F /* VisualEffect.swift */,
EA0C524F25AA729300AFF716 /* Visualisation.swift */,
22903B0228294F49004BB9F0 /* ColorExampleRow.swift */,
EABAEADF284D50D1000716AE /* ComplianceButtons.swift */,
);
path = Views;
sourceTree = "<group>";
Expand Down Expand Up @@ -431,6 +434,7 @@
EAD0B6F7259CF29300FA2F67 /* Eyedroppers.swift in Sources */,
EA0C526025AB5A2B00AFF716 /* NavigationMenuItems.swift in Sources */,
EA0C526425AB5D1700AFF716 /* PikaWindow.swift in Sources */,
EABAEAE0284D50D1000716AE /* ComplianceButtons.swift in Sources */,
EAF100CD25C785C4006E1EC3 /* TouchBarVisual.swift in Sources */,
EA801285259F8F480026D5D9 /* ComplianceToggle.swift in Sources */,
221600FD25A636D600B8B7D9 /* ConditionalModifier.swift in Sources */,
Expand Down
49 changes: 49 additions & 0 deletions Pika/Views/ComplianceButtons.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import Defaults
import SwiftUI

struct ComplianceButtons: View {
@Default(.combineCompliance) var combineCompliance
var width: CGFloat
@ObservedObject var foreground: Eyedropper
@ObservedObject var background: Eyedropper

var body: some View {
let colorWCAGCompliance = foreground.color.toWCAGCompliance(
with: background.color
)

Button(action: {
combineCompliance = false
}, label: {
ComplianceToggleGroup(colorWCAGCompliance: colorWCAGCompliance, theme: .weight)
.padding(20.0)
.frame(maxWidth: width, maxHeight: .infinity, alignment: .leading)
})
.buttonStyle(AppearanceButtonStyle(
title: PikaText.textAppearanceWeightTitle,
description: PikaText.textAppearanceWeightDescription,
selected: combineCompliance == false
))

Button(action: {
combineCompliance = true
}, label: {
ComplianceToggleGroup(colorWCAGCompliance: colorWCAGCompliance, theme: .contrast)
.padding(20.0)
.frame(maxWidth: width, maxHeight: .infinity, alignment: .leading)
})
.buttonStyle(AppearanceButtonStyle(
title: PikaText.textAppearanceContrastTitle,
description: PikaText.textAppearanceContrastDescription,
selected: combineCompliance == true
))
}
}

struct ComplianceButtons_Previews: PreviewProvider {
static var previews: some View {
let foreground = Eyedropper(type: .foreground, color: PikaConstants.initialColors.randomElement()!)
let background = Eyedropper(type: .background, color: NSColor.black)
ComplianceButtons(width: 200, foreground: foreground, background: background)
}
}
32 changes: 4 additions & 28 deletions Pika/Views/PreferencesView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ struct PreferencesView: View {
@Default(.hideMenuBarIcon) var hideMenuBarIcon
@Default(.hideColorNames) var hideColorNames
@Default(.betaUpdates) var betaUpdates
@Default(.combineCompliance) var combineCompliance
@Default(.hidePikaWhilePicking) var hidePikaWhilePicking
@Default(.copyColorOnPick) var copyColorOnPick
@Default(.copyFormat) var copyFormat
Expand Down Expand Up @@ -108,34 +107,11 @@ struct PreferencesView: View {
let horizontalUnit = width / 2

HStack(spacing: 20.0) {
let colorWCAGCompliance = eyedroppers.foreground.color.toWCAGCompliance(
with: eyedroppers.background.color
ComplianceButtons(
width: horizontalUnit - 10,
foreground: eyedroppers.foreground,
background: eyedroppers.background
)
Button(action: {
combineCompliance = false
}, label: {
ComplianceToggleGroup(colorWCAGCompliance: colorWCAGCompliance, theme: .weight)
.padding(20.0)
.frame(maxWidth: horizontalUnit - 10, maxHeight: .infinity, alignment: .leading)
})
.buttonStyle(AppearanceButtonStyle(
title: PikaText.textAppearanceWeightTitle,
description: PikaText.textAppearanceWeightDescription,
selected: combineCompliance == false
))

Button(action: {
combineCompliance = true
}, label: {
ComplianceToggleGroup(colorWCAGCompliance: colorWCAGCompliance, theme: .contrast)
.padding(20.0)
.frame(maxWidth: horizontalUnit - 10, maxHeight: .infinity, alignment: .leading)
})
.buttonStyle(AppearanceButtonStyle(
title: PikaText.textAppearanceContrastTitle,
description: PikaText.textAppearanceContrastDescription,
selected: combineCompliance == true
))
}
.frame(maxWidth: width)
}
Expand Down

0 comments on commit 300da1a

Please sign in to comment.