Skip to content

Commit 21f9172

Browse files
stanzhaistanzhai
committed
update project, support m1
1 parent f0125cf commit 21f9172

12 files changed

Lines changed: 110 additions & 67 deletions

File tree

‎GoldenPassport.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@
388388
isa = PBXProject;
389389
attributes = {
390390
LastSwiftUpdateCheck = 0820;
391-
LastUpgradeCheck = 0820;
391+
LastUpgradeCheck = 1340;
392392
ORGANIZATIONNAME = StanZhai;
393393
TargetAttributes = {
394394
F61B6B851E6135B600C3E272 = {
@@ -565,15 +565,24 @@
565565
CLANG_CXX_LIBRARY = "libc++";
566566
CLANG_ENABLE_MODULES = YES;
567567
CLANG_ENABLE_OBJC_ARC = YES;
568+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
568569
CLANG_WARN_BOOL_CONVERSION = YES;
570+
CLANG_WARN_COMMA = YES;
569571
CLANG_WARN_CONSTANT_CONVERSION = YES;
572+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
570573
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
571574
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
572575
CLANG_WARN_EMPTY_BODY = YES;
573576
CLANG_WARN_ENUM_CONVERSION = YES;
574577
CLANG_WARN_INFINITE_RECURSION = YES;
575578
CLANG_WARN_INT_CONVERSION = YES;
579+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
580+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
581+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
576582
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
583+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
584+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
585+
CLANG_WARN_STRICT_PROTOTYPES = YES;
577586
CLANG_WARN_SUSPICIOUS_MOVE = YES;
578587
CLANG_WARN_UNREACHABLE_CODE = YES;
579588
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -616,15 +625,24 @@
616625
CLANG_CXX_LIBRARY = "libc++";
617626
CLANG_ENABLE_MODULES = YES;
618627
CLANG_ENABLE_OBJC_ARC = YES;
628+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
619629
CLANG_WARN_BOOL_CONVERSION = YES;
630+
CLANG_WARN_COMMA = YES;
620631
CLANG_WARN_CONSTANT_CONVERSION = YES;
632+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
621633
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
622634
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
623635
CLANG_WARN_EMPTY_BODY = YES;
624636
CLANG_WARN_ENUM_CONVERSION = YES;
625637
CLANG_WARN_INFINITE_RECURSION = YES;
626638
CLANG_WARN_INT_CONVERSION = YES;
639+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
640+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
641+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
627642
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
643+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
644+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
645+
CLANG_WARN_STRICT_PROTOTYPES = YES;
628646
CLANG_WARN_SUSPICIOUS_MOVE = YES;
629647
CLANG_WARN_UNREACHABLE_CODE = YES;
630648
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -657,10 +675,12 @@
657675
CLANG_ENABLE_MODULES = YES;
658676
CLANG_ENABLE_OBJC_ARC = NO;
659677
CLANG_ENABLE_OBJC_WEAK = YES;
678+
CODE_SIGN_IDENTITY = "-";
660679
COMBINE_HIDPI_IMAGES = YES;
661680
INFOPLIST_FILE = GoldenPassport/Info.plist;
662681
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
663682
MACOSX_DEPLOYMENT_TARGET = 10.11;
683+
MARKETING_VERSION = v0.1.7;
664684
PRODUCT_BUNDLE_IDENTIFIER = site.stanzhai.GoldenPassport;
665685
PRODUCT_NAME = "$(TARGET_NAME)";
666686
SWIFT_OBJC_BRIDGING_HEADER = "GoldenPassport/GoldenPassport-Bridging-Header.h";
@@ -677,10 +697,12 @@
677697
CLANG_ENABLE_MODULES = YES;
678698
CLANG_ENABLE_OBJC_ARC = NO;
679699
CLANG_ENABLE_OBJC_WEAK = YES;
700+
CODE_SIGN_IDENTITY = "-";
680701
COMBINE_HIDPI_IMAGES = YES;
681702
INFOPLIST_FILE = GoldenPassport/Info.plist;
682703
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
683704
MACOSX_DEPLOYMENT_TARGET = 10.11;
705+
MARKETING_VERSION = v0.1.7;
684706
PRODUCT_BUNDLE_IDENTIFIER = site.stanzhai.GoldenPassport;
685707
PRODUCT_NAME = "$(TARGET_NAME)";
686708
SWIFT_OBJC_BRIDGING_HEADER = "GoldenPassport/GoldenPassport-Bridging-Header.h";

‎GoldenPassport.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎GoldenPassport/AddVerifyKeyWindow.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ class AddVerifyKeyWindow: NSWindowController, NSWindowDelegate {
2020
override func windowDidLoad() {
2121
super.windowDidLoad()
2222
self.window?.isOpaque = false
23-
self.window?.titlebarAppearsTransparent = true
23+
//self.window?.titlebarAppearsTransparent = true
2424
//self.window?.styleMask = [window!.styleMask, .fullSizeContentView]
2525
let color = NSColor(calibratedRed: 0.0, green: 0.0, blue: 0.0, alpha: 0.75)
26-
self.window?.backgroundColor = color
26+
//self.window?.backgroundColor = color
2727
self.window?.isMovableByWindowBackground = true
2828
self.window?.center()
2929
}

‎GoldenPassport/AddVerifyKeyWindow.xib‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
4+
<deployment identifier="macosx"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
56
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
67
</dependencies>
78
<objects>
@@ -14,21 +15,25 @@
1415
</customObject>
1516
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
1617
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
17-
<window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" animationBehavior="default" id="QvC-M9-y7g">
18+
<window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
1819
<windowStyleMask key="styleMask" titled="YES" closable="YES"/>
1920
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
2021
<rect key="contentRect" x="196" y="240" width="480" height="229"/>
21-
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
22+
<rect key="screenRect" x="0.0" y="0.0" width="1536" height="935"/>
2223
<view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
2324
<rect key="frame" x="0.0" y="0.0" width="480" height="229"/>
2425
<autoresizingMask key="autoresizingMask"/>
2526
<subviews>
26-
<textField verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cdw-Ps-qXC">
27+
<visualEffectView fixedFrame="YES" blendingMode="behindWindow" material="appearanceBased" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="B6N-Pt-sEO">
28+
<rect key="frame" x="-5" y="-29" width="485" height="258"/>
29+
<autoresizingMask key="autoresizingMask"/>
30+
</visualEffectView>
31+
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cdw-Ps-qXC">
2732
<rect key="frame" x="20" y="128" width="440" height="64"/>
2833
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
2934
<textFieldCell key="cell" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="otpauth://totp/user@host?secret=...&amp;issuer=..." drawsBackground="YES" id="KET-hm-MMu">
3035
<font key="font" metaFont="system"/>
31-
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
36+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
3237
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
3338
</textFieldCell>
3439
</textField>
@@ -37,36 +42,36 @@
3742
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
3843
<buttonCell key="cell" type="push" title="从二维码中识别..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="R5h-qh-tEq">
3944
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
40-
<font key="font" size="13" name=".PingFangSC-Regular"/>
45+
<font key="font" metaFont="system"/>
4146
</buttonCell>
4247
<connections>
4348
<action selector="selectPicClicked:" target="-2" id="FZo-Yp-VRe"/>
4449
</connections>
4550
</button>
46-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HrY-yp-DMn">
51+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HrY-yp-DMn">
4752
<rect key="frame" x="20" y="205" width="105" height="17"/>
4853
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
4954
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="OTPAuth URL：" id="GeJ-no-5a2">
50-
<font key="font" size="13" name=".PingFangSC-Regular"/>
51-
<color key="textColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
55+
<font key="font" metaFont="system"/>
56+
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
5257
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
5358
</textFieldCell>
5459
</textField>
55-
<textField verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R7m-vm-E4W">
60+
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="R7m-vm-E4W">
5661
<rect key="frame" x="65" y="96" width="395" height="22"/>
5762
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
5863
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="可选：为此验证码添加特定标识，便于识别" drawsBackground="YES" id="ETR-af-hzH">
5964
<font key="font" metaFont="system"/>
60-
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
65+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
6166
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
6267
</textFieldCell>
6368
</textField>
64-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Akl-uF-b8X">
69+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Akl-uF-b8X">
6570
<rect key="frame" x="18" y="98" width="44" height="17"/>
6671
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
6772
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="标识：" id="sc4-HC-qit">
68-
<font key="font" size="13" name=".PingFangSC-Regular"/>
69-
<color key="textColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
73+
<font key="font" metaFont="system"/>
74+
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
7075
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
7176
</textFieldCell>
7277
</textField>
@@ -75,7 +80,7 @@
7580
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
7681
<buttonCell key="cell" type="push" title="添加" bezelStyle="rounded" alignment="center" refusesFirstResponder="YES" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="QAX-48-MKl">
7782
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
78-
<font key="font" size="13" name=".PingFangSC-Regular"/>
83+
<font key="font" metaFont="system"/>
7984
<string key="keyEquivalent" base64-UTF8="YES">
8085
DQ
8186
</string>

‎GoldenPassport/Base.lproj/MainMenu.xib‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
66
</dependencies>
77
<objects>
88
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">

‎GoldenPassport/DataManager.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ final class DataManager {
3333
saveData(authDataFile, data: authData)
3434
}
3535

36-
func allAuthCode() -> [String: String] {
37-
var result: [String: String] = [:]
36+
func allAuthCode() -> [(key: String, value: String)] {
37+
var result: [(key: String, value: String)] = []
3838
for d in authData {
3939
let url = d.value
4040
let otpData = OTPAuthURLParser(url)!
@@ -46,7 +46,7 @@ final class DataManager {
4646
period: TOTPGenerator.defaultPeriod())
4747
let code = gen?.generateOTP(for: Date())
4848

49-
result[d.key] = code
49+
result.append((key: d.key, value: code ?? "<get code failed>"))
5050
}
5151
return result
5252
}

0 commit comments

Comments
 (0)