Skip to content

Commit 0fff998

Browse files
L1cardoL1cardo
committed
fix am error that app icon can not change to dark mode
1 parent 7ae6acd commit 0fff998

31 files changed

+79
-26
lines changed

‎ClockBar.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,15 +392,15 @@
392392
CODE_SIGN_IDENTITY = "-";
393393
CODE_SIGN_STYLE = Automatic;
394394
COMBINE_HIDPI_IMAGES = YES;
395-
CURRENT_PROJECT_VERSION = 20200213;
395+
CURRENT_PROJECT_VERSION = 20200308;
396396
DEVELOPMENT_TEAM = 2U23P5CPX2;
397397
ENABLE_HARDENED_RUNTIME = NO;
398398
INFOPLIST_FILE = "ClockBar/Supporting Files/Info.plist";
399399
LD_RUNPATH_SEARCH_PATHS = (
400400
"$(inherited)",
401401
"@executable_path/../Frameworks",
402402
);
403-
MARKETING_VERSION = 1.2.1;
403+
MARKETING_VERSION = 1.2.2;
404404
PRODUCT_BUNDLE_IDENTIFIER = cn.licardo.ClockBar;
405405
PRODUCT_NAME = "$(TARGET_NAME)";
406406
SWIFT_OBJC_BRIDGING_HEADER = "ClockBar/TouchBar/ClockBar-Bridging-Header.h";
@@ -424,15 +424,15 @@
424424
CODE_SIGN_IDENTITY = "-";
425425
CODE_SIGN_STYLE = Automatic;
426426
COMBINE_HIDPI_IMAGES = YES;
427-
CURRENT_PROJECT_VERSION = 20200213;
427+
CURRENT_PROJECT_VERSION = 20200308;
428428
DEVELOPMENT_TEAM = 2U23P5CPX2;
429429
ENABLE_HARDENED_RUNTIME = NO;
430430
INFOPLIST_FILE = "ClockBar/Supporting Files/Info.plist";
431431
LD_RUNPATH_SEARCH_PATHS = (
432432
"$(inherited)",
433433
"@executable_path/../Frameworks",
434434
);
435-
MARKETING_VERSION = 1.2.1;
435+
MARKETING_VERSION = 1.2.2;
436436
PRODUCT_BUNDLE_IDENTIFIER = cn.licardo.ClockBar;
437437
PRODUCT_NAME = "$(TARGET_NAME)";
438438
SWIFT_OBJC_BRIDGING_HEADER = "ClockBar/TouchBar/ClockBar-Bridging-Header.h";

‎ClockBar.xcworkspace/xcuserdata/licardo.xcuserdatad/UserInterfaceState.xcuserstate‎

817 Bytes
Binary file not shown.

‎ClockBar/AppDelegate.swift‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,16 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTextFieldDelegate {
209209

210210
}
211211

212+
class LinkButton: NSButton {
213+
required init?(coder: NSCoder) {
214+
super.init(coder: coder)
215+
}
216+
217+
override func resetCursorRects() {
218+
addCursorRect(self.bounds, cursor: .pointingHand)
219+
}
220+
}
221+
212222
extension Defaults.Keys {
213223
static let time1 = Key<String>("time1", default: "h:mm")
214224
static let time2 = Key<String>("time2", default: "HH:mm")

‎ClockBar/Base.lproj/MainMenu.xib‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@
527527
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
528528
</textFieldCell>
529529
</textField>
530-
<button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="bXZ-6z-dcv">
530+
<button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="bXZ-6z-dcv" customClass="LinkButton" customModule="ClockBar" customModuleProvider="target">
531531
<rect key="frame" x="77" y="0.0" width="168" height="16"/>
532532
<buttonCell key="cell" type="bevel" title="https://github.com/L1cardo" bezelStyle="regularSquare" alignment="center" inset="2" id="UjD-k2-kOc">
533533
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -559,7 +559,7 @@
559559
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
560560
</textFieldCell>
561561
</textField>
562-
<button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="gEu-Cx-ZRg">
562+
<button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="gEu-Cx-ZRg" customClass="LinkButton" customModule="ClockBar" customModuleProvider="target">
563563
<rect key="frame" x="101" y="0.0" width="107" height="16"/>
564564
<buttonCell key="cell" type="bevel" title="https://licardo.cn" bezelStyle="regularSquare" alignment="center" inset="2" id="XL3-F4-gbC">
565565
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -591,7 +591,7 @@
591591
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
592592
</textFieldCell>
593593
</textField>
594-
<button verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="lrc-vr-xtp">
594+
<button verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="lrc-vr-xtp" customClass="LinkButton" customModule="ClockBar" customModuleProvider="target">
595595
<rect key="frame" x="77" y="0.0" width="99" height="16"/>
596596
<buttonCell key="cell" type="bevel" title="@AlbertAbdilim" bezelStyle="regularSquare" alignment="center" inset="2" id="czA-Ls-52c">
597597
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -623,7 +623,7 @@
623623
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
624624
</textFieldCell>
625625
</textField>
626-
<button verticalHuggingPriority="750" tag="41" translatesAutoresizingMaskIntoConstraints="NO" id="XOH-BC-TW7" userLabel="Paypal">
626+
<button verticalHuggingPriority="750" tag="41" translatesAutoresizingMaskIntoConstraints="NO" id="XOH-BC-TW7" userLabel="Paypal" customClass="LinkButton" customModule="ClockBar" customModuleProvider="target">
627627
<rect key="frame" x="78" y="0.0" width="44" height="16"/>
628628
<buttonCell key="cell" type="bevel" title="Paypal" bezelStyle="regularSquare" alignment="center" inset="2" id="0lI-iQ-jGI">
629629
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -634,7 +634,7 @@
634634
<action selector="didClickURL:" target="Voe-Tx-rLC" id="SS8-Bs-649"/>
635635
</connections>
636636
</button>
637-
<button verticalHuggingPriority="750" tag="42" translatesAutoresizingMaskIntoConstraints="NO" id="Jnx-xR-jf8">
637+
<button verticalHuggingPriority="750" tag="42" translatesAutoresizingMaskIntoConstraints="NO" id="Jnx-xR-jf8" customClass="LinkButton" customModule="ClockBar" customModuleProvider="target">
638638
<rect key="frame" x="130" y="0.0" width="41" height="16"/>
639639
<buttonCell key="cell" type="bevel" title="Alipay" bezelStyle="regularSquare" alignment="center" inset="2" id="fUc-G3-jsV">
640640
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -645,7 +645,7 @@
645645
<action selector="didClickURL:" target="Voe-Tx-rLC" id="Tq8-6w-jJM"/>
646646
</connections>
647647
</button>
648-
<button verticalHuggingPriority="750" tag="43" translatesAutoresizingMaskIntoConstraints="NO" id="Q65-bw-pC8">
648+
<button verticalHuggingPriority="750" tag="43" translatesAutoresizingMaskIntoConstraints="NO" id="Q65-bw-pC8" customClass="LinkButton" customModule="ClockBar" customModuleProvider="target">
649649
<rect key="frame" x="179" y="0.0" width="52" height="16"/>
650650
<buttonCell key="cell" type="bevel" title="WeChat" bezelStyle="regularSquare" alignment="center" inset="2" id="oHH-7Y-vLn">
651651
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -681,7 +681,7 @@
681681
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
682682
</textFieldCell>
683683
</textField>
684-
<button verticalHuggingPriority="750" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="RC5-sg-Rd6">
684+
<button verticalHuggingPriority="750" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="RC5-sg-Rd6" customClass="LinkButton" customModule="ClockBar" customModuleProvider="target">
685685
<rect key="frame" x="67" y="0.0" width="172" height="16"/>
686686
<buttonCell key="cell" type="bevel" title="[email protected]" bezelStyle="regularSquare" alignment="center" inset="2" id="1S2-TX-DeL">
687687
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

‎ClockBar/Supporting Files/Assets.xcassets/AppIcon.appiconset/mac-128x128.png‎

-89 Bytes
Loading

‎ClockBar/Supporting Files/Assets.xcassets/AppIcon.appiconset/[email protected]‎

490 Bytes
Loading

‎ClockBar/Supporting Files/Assets.xcassets/AppIcon.appiconset/mac-16x16.png‎

-15 Bytes
Loading

‎ClockBar/Supporting Files/Assets.xcassets/AppIcon.appiconset/[email protected]‎

-38 Bytes
Loading

‎ClockBar/Supporting Files/Assets.xcassets/AppIcon.appiconset/mac-256x256.png‎

490 Bytes
Loading

‎ClockBar/Supporting Files/Assets.xcassets/AppIcon.appiconset/[email protected]‎

1.31 KB
Loading

0 commit comments

Comments
 (0)