Skip to content

Commit c02df56

Browse files
superhighfivessuperhighfives
authored
1.2.0 (#161)
1 parent 2a9677b commit c02df56

File tree

16 files changed

+400
-29
lines changed

16 files changed

+400
-29
lines changed

‎Pika.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@
124124
EAF100C725C731AD006E1EC3 /* SplashTouchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF100C625C731AD006E1EC3 /* SplashTouchBar.swift */; };
125125
EAF100CA25C75218006E1EC3 /* PikaTouchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF100C325C59EB3006E1EC3 /* PikaTouchBar.swift */; };
126126
EAF100CD25C785C4006E1EC3 /* TouchBarVisual.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF100CC25C785C4006E1EC3 /* TouchBarVisual.swift */; };
127+
F8ABAC5A2EAAD0DF008CD152 /* ColorPickOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8ABAC592EAAD0DF008CD152 /* ColorPickOverlay.swift */; };
128+
F8ABAC5B2EAAD0DF008CD152 /* ColorPickOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8ABAC592EAAD0DF008CD152 /* ColorPickOverlay.swift */; };
129+
F8ABAC5D2EAAD0F0008CD152 /* ColorPickOverlayWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8ABAC5C2EAAD0F0008CD152 /* ColorPickOverlayWindow.swift */; };
130+
F8ABAC5E2EAAD0F0008CD152 /* ColorPickOverlayWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8ABAC5C2EAAD0F0008CD152 /* ColorPickOverlayWindow.swift */; };
127131
/* End PBXBuildFile section */
128132

129133
/* Begin PBXFileReference section */
@@ -202,6 +206,8 @@
202206
EAF100C325C59EB3006E1EC3 /* PikaTouchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PikaTouchBar.swift; sourceTree = "<group>"; };
203207
EAF100C625C731AD006E1EC3 /* SplashTouchBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SplashTouchBar.swift; sourceTree = "<group>"; };
204208
EAF100CC25C785C4006E1EC3 /* TouchBarVisual.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TouchBarVisual.swift; sourceTree = "<group>"; };
209+
F8ABAC592EAAD0DF008CD152 /* ColorPickOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorPickOverlay.swift; sourceTree = "<group>"; };
210+
F8ABAC5C2EAAD0F0008CD152 /* ColorPickOverlayWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorPickOverlayWindow.swift; sourceTree = "<group>"; };
205211
/* End PBXFileReference section */
206212

207213
/* Begin PBXFrameworksBuildPhase section */
@@ -335,6 +341,7 @@
335341
isa = PBXGroup;
336342
children = (
337343
EA7B199B25FBA0E600E06D9D /* ClosestVector.swift */,
344+
F8ABAC5C2EAAD0F0008CD152 /* ColorPickOverlayWindow.swift */,
338345
EACA8A44260501210064035C /* Exporter.swift */,
339346
EAD0B6F1259CF29300FA2F67 /* Eyedroppers.swift */,
340347
EA7B199525FBA08100E06D9D /* LoadColors.swift */,
@@ -353,6 +360,7 @@
353360
EAD0B6F5259CF29300FA2F67 /* AppVersion.swift */,
354361
22903B0228294F49004BB9F0 /* ColorExampleRow.swift */,
355362
EA635DE025B4FC580014D91A /* ColorPickers.swift */,
363+
F8ABAC592EAAD0DF008CD152 /* ColorPickOverlay.swift */,
356364
EABAEADF284D50D1000716AE /* ComplianceButtons.swift */,
357365
EA801284259F8F480026D5D9 /* ComplianceToggle.swift */,
358366
EA424C7C25CDEF98009056A9 /* ComplianceToggleGroup.swift */,
@@ -622,6 +630,7 @@
622630
EA635DF125B5A6D80014D91A /* Toast.swift in Sources */,
623631
EAD0B71C259D151400FA2F67 /* NavigationMenu.swift in Sources */,
624632
22FE80B325BA0F820063759E /* KeyboardShortcutItem.swift in Sources */,
633+
F8ABAC5A2EAAD0DF008CD152 /* ColorPickOverlay.swift in Sources */,
625634
EAD0B6F8259CF29300FA2F67 /* AboutView.swift in Sources */,
626635
C49A11482DB394F500EE7E80 /* APCACompliance.swift in Sources */,
627636
EAA8AE1925B8EC070049299B /* KeyboardShortcutKey.swift in Sources */,
@@ -632,6 +641,7 @@
632641
EAD0B718259D146200FA2F67 /* EyedropperButtonStyle.swift in Sources */,
633642
EA635DC925B3B2650014D91A /* Cula.swift in Sources */,
634643
EAEBF64725E878A5002999D1 /* CircleButtonStyle.swift in Sources */,
644+
F8ABAC5D2EAAD0F0008CD152 /* ColorPickOverlayWindow.swift in Sources */,
635645
EA635DE125B4FC580014D91A /* ColorPickers.swift in Sources */,
636646
EACA8A45260501210064035C /* Exporter.swift in Sources */,
637647
221600F925A62E5B00B8B7D9 /* IconImage.swift in Sources */,
@@ -661,6 +671,7 @@
661671
EAE23DAF2D032A38005BB270 /* OverflowContentViewModifier.swift in Sources */,
662672
EAE23DB02D032A38005BB270 /* KeyboardShortcutGrid.swift in Sources */,
663673
EAE2EBA32D03C40000FA9BC9 /* LatestAppStoreVersion+ShouldUpdate.swift in Sources */,
674+
F8ABAC5E2EAAD0F0008CD152 /* ColorPickOverlayWindow.swift in Sources */,
664675
EAE23DB12D032A38005BB270 /* AppModeToggleGroup.swift in Sources */,
665676
EAE23DB22D032A38005BB270 /* Visualisation.swift in Sources */,
666677
EAE23DB32D032A38005BB270 /* ContentView.swift in Sources */,
@@ -682,6 +693,7 @@
682693
EAE23DC42D032A38005BB270 /* KeyboardShortcutItem.swift in Sources */,
683694
EAE23DC52D032A38005BB270 /* AboutView.swift in Sources */,
684695
EAE23DC62D032A38005BB270 /* KeyboardShortcutKey.swift in Sources */,
696+
F8ABAC5B2EAAD0DF008CD152 /* ColorPickOverlay.swift in Sources */,
685697
EAE23DC72D032A38005BB270 /* EyedropperButton.swift in Sources */,
686698
EAE23DC82D032A38005BB270 /* MetalShader.metal in Sources */,
687699
EAE2EB9F2D03C3DE00FA9BC9 /* LookUpAPI.swift in Sources */,
@@ -864,7 +876,7 @@
864876
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
865877
CODE_SIGN_STYLE = Automatic;
866878
COMBINE_HIDPI_IMAGES = YES;
867-
CURRENT_PROJECT_VERSION = 54;
879+
CURRENT_PROJECT_VERSION = 59;
868880
DEAD_CODE_STRIPPING = YES;
869881
DEVELOPMENT_ASSET_PATHS = "\"Pika/Preview Content\"";
870882
DEVELOPMENT_TEAM = TGHU37N6EX;
@@ -878,7 +890,7 @@
878890
"@executable_path/../Frameworks",
879891
);
880892
MACOSX_DEPLOYMENT_TARGET = 14.0;
881-
MARKETING_VERSION = "1.1.0-beta1";
893+
MARKETING_VERSION = 1.2.0;
882894
PRODUCT_BUNDLE_IDENTIFIER = com.superhighfives.Pika;
883895
PRODUCT_NAME = Pika;
884896
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG TARGET_SPARKLE";
@@ -895,7 +907,7 @@
895907
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
896908
CODE_SIGN_STYLE = Automatic;
897909
COMBINE_HIDPI_IMAGES = YES;
898-
CURRENT_PROJECT_VERSION = 54;
910+
CURRENT_PROJECT_VERSION = 59;
899911
DEAD_CODE_STRIPPING = YES;
900912
DEVELOPMENT_ASSET_PATHS = "\"Pika/Preview Content\"";
901913
DEVELOPMENT_TEAM = TGHU37N6EX;
@@ -909,7 +921,7 @@
909921
"@executable_path/../Frameworks",
910922
);
911923
MACOSX_DEPLOYMENT_TARGET = 14.0;
912-
MARKETING_VERSION = "1.1.0-beta1";
924+
MARKETING_VERSION = 1.2.0;
913925
PRODUCT_BUNDLE_IDENTIFIER = com.superhighfives.Pika;
914926
PRODUCT_NAME = Pika;
915927
SWIFT_ACTIVE_COMPILATION_CONDITIONS = TARGET_SPARKLE;
@@ -927,7 +939,7 @@
927939
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
928940
CODE_SIGN_STYLE = Automatic;
929941
COMBINE_HIDPI_IMAGES = YES;
930-
CURRENT_PROJECT_VERSION = 55;
942+
CURRENT_PROJECT_VERSION = 60;
931943
DEAD_CODE_STRIPPING = YES;
932944
DEVELOPMENT_ASSET_PATHS = "\"Pika/Preview Content\"";
933945
DEVELOPMENT_TEAM = TGHU37N6EX;
@@ -941,7 +953,7 @@
941953
"@executable_path/../Frameworks",
942954
);
943955
MACOSX_DEPLOYMENT_TARGET = 14.0;
944-
MARKETING_VERSION = 1.1.0;
956+
MARKETING_VERSION = 1.2.0;
945957
PRODUCT_BUNDLE_IDENTIFIER = com.superhighfives.Pika;
946958
PRODUCT_NAME = Pika;
947959
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG TARGET_MAS";
@@ -959,7 +971,7 @@
959971
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
960972
CODE_SIGN_STYLE = Automatic;
961973
COMBINE_HIDPI_IMAGES = YES;
962-
CURRENT_PROJECT_VERSION = 55;
974+
CURRENT_PROJECT_VERSION = 60;
963975
DEAD_CODE_STRIPPING = YES;
964976
DEVELOPMENT_ASSET_PATHS = "\"Pika/Preview Content\"";
965977
DEVELOPMENT_TEAM = TGHU37N6EX;
@@ -973,7 +985,7 @@
973985
"@executable_path/../Frameworks",
974986
);
975987
MACOSX_DEPLOYMENT_TARGET = 14.0;
976-
MARKETING_VERSION = 1.1.0;
988+
MARKETING_VERSION = 1.2.0;
977989
PRODUCT_BUNDLE_IDENTIFIER = com.superhighfives.Pika;
978990
PRODUCT_NAME = Pika;
979991
SWIFT_ACTIVE_COMPILATION_CONDITIONS = TARGET_MAS;

‎Pika/Assets/de.lproj/Localizable.strings‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,4 +323,10 @@
323323
"menu.issue" = "Feedback melden";
324324

325325
/* Quit */
326-
"menu.quit" = "Beenden";
326+
"menu.quit" = "Beenden";
327+
328+
/* Show color overlay after picking */
329+
"preferences.overlay.show" = "Farbüberlagerung nach Auswahl anzeigen";
330+
331+
/* Duration: */
332+
"preferences.overlay.duration" = "Dauer";

‎Pika/Assets/en.lproj/Localizable.strings‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,4 +323,10 @@
323323
"menu.issue" = "Report feedback";
324324

325325
/* Quit */
326-
"menu.quit" = "Quit";
326+
"menu.quit" = "Quit";
327+
328+
/* Show color overlay after picking */
329+
"preferences.overlay.show" = "Show color overlay after picking";
330+
331+
/* Duration: */
332+
"preferences.overlay.duration" = "Duration";

‎Pika/Assets/es.lproj/Localizable.strings‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,4 +323,10 @@
323323
"menu.issue" = "Reportar comentarios";
324324

325325
/* Quit */
326-
"menu.quit" = "Salir";
326+
"menu.quit" = "Salir";
327+
328+
/* Show color overlay after picking */
329+
"preferences.overlay.show" = "Mostrar superposición de color después de elegir";
330+
331+
/* Duration: */
332+
"preferences.overlay.duration" = "Duración";

‎Pika/Assets/fr.lproj/Localizable.strings‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,4 +323,10 @@
323323
"menu.issue" = "Signaler des commentaires";
324324

325325
/* Quit */
326-
"menu.quit" = "Quitter";
326+
"menu.quit" = "Quitter";
327+
328+
/* Show color overlay after picking */
329+
"preferences.overlay.show" = "Afficher la superposition de couleur après la sélection";
330+
331+
/* Duration: */
332+
"preferences.overlay.duration" = "Durée";

‎Pika/Assets/zh-Hans.lproj/Localizable.strings‎

284 Bytes
Binary file not shown.

‎Pika/Assets/zh-Hant.lproj/Localizable.strings‎

284 Bytes
Binary file not shown.

‎Pika/Constants/Constants.swift‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,13 @@ enum PikaText {
257257
"preferences.hotkey.description",
258258
comment: "Set a global hotkey shortcut to invoke Pika"
259259
)
260+
261+
// Color Overlay
262+
static let textShowColorOverlay = NSLocalizedString(
263+
"preferences.overlay.show",
264+
comment: "Show color overlay after picking"
265+
)
266+
static let textDuration = NSLocalizedString("preferences.overlay.duration", comment: "Duration:")
260267
}
261268

262269
// swiftlint:enable trailing_comma

‎Pika/Constants/Defaults.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,6 @@ extension Defaults.Keys {
6363
static let appFloating = Key<Bool>("appFloating", default: true)
6464
static let alwaysShowOnLaunch = Key<Bool>("alwaysShowOnLaunch", default: false)
6565
static let contrastStandard = Key<ContrastStandard>("contrastStandard", default: .wcag)
66+
static let showColorOverlay = Key<Bool>("showColorOverlay", default: true)
67+
static let colorOverlayDuration = Key<Double>("colorOverlayDuration", default: 2.0)
6668
}

‎Pika/Styles/AppearanceButtonStyle.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ struct AppearanceButtonStyle: ButtonStyle {
1919
colors: colorScheme == .dark
2020
? [
2121
darkBaseColor.opacity(0.5),
22-
darkBaseColor.opacity(0),
22+
darkBaseColor.opacity(0)
2323
]
2424
: [
2525
lightBaseColor.opacity(0.9),
@@ -39,7 +39,7 @@ struct AppearanceButtonStyle: ButtonStyle {
3939
colors: colorScheme == .dark
4040
? [
4141
darkBaseColor.opacity(0),
42-
darkBaseColor.opacity(0.5),
42+
darkBaseColor.opacity(0.5)
4343
]
4444
: [
4545
lightBaseColor.opacity(0),
@@ -130,7 +130,7 @@ struct StyledContentView<Content: View>: View {
130130
colors: colorScheme == .dark
131131
? [
132132
darkBaseColor.opacity(0.5),
133-
darkBaseColor.opacity(0),
133+
darkBaseColor.opacity(0)
134134
]
135135
: [
136136
lightBaseColor.opacity(0.9),
@@ -150,7 +150,7 @@ struct StyledContentView<Content: View>: View {
150150
colors: colorScheme == .dark
151151
? [
152152
darkBaseColor.opacity(0),
153-
darkBaseColor.opacity(0.5),
153+
darkBaseColor.opacity(0.5)
154154
]
155155
: [
156156
lightBaseColor.opacity(0),

0 commit comments

Comments
 (0)