Skip to content

Commit 82ac22d

Browse files
tw93tw93
committedJun 19, 2022
🎨 初始效果
1 parent 964fc97 commit 82ac22d

15 files changed

+271
-232
lines changed
 

‎Common/Shared/Business/NoteContainer.swift

-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@ public enum NoteContainer: Int {
22
case none = 0x01
33
case textBundle = 0x02
44
case textBundleV2 = 0x03
5-
case encryptedTextPack = 0x04
65

76
static func withExt(rawValue: String) -> NoteContainer {
87
switch rawValue {
98
case "textbundle": return .textBundleV2
10-
case "etp": return .encryptedTextPack
119
default: return .none
1210
}
1311
}
@@ -16,7 +14,6 @@ public enum NoteContainer: Int {
1614
switch self {
1715
case .textBundle: return "com.apple.package"
1816
case .textBundleV2: return "com.apple.package"
19-
case .encryptedTextPack: return "es.fsnot.etp.package"
2017
case .none: return ""
2118
}
2219
}
@@ -25,7 +22,6 @@ public enum NoteContainer: Int {
2522
switch self {
2623
case .textBundle: return 0x02
2724
case .textBundleV2: return 0x03
28-
case .encryptedTextPack: return 0x04
2925
case .none: return 0x01
3026
}
3127
}

‎Mac/AppDelegate.swift

+11-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,17 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
6363
guard let mainWC = storyboard.instantiateController(withIdentifier: "MainWindowController") as? MainWindowController else {
6464
fatalError("Error getting main window controller")
6565
}
66-
67-
mainWindowController = mainWC
66+
67+
//
68+
// if UserDefaultsManagement.isFirstLaunch {
69+
// let size = NSSize(width: 1200, height: 640)
70+
// mainWC.window?.minSize = size
71+
// mainWC.window?.center()
72+
// UserDefaultsManagement.isFirstLaunch = false
73+
// }
74+
6875
mainWC.window?.makeKeyAndOrderFront(nil)
76+
mainWindowController = mainWC
6977
}
7078

7179
func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
@@ -166,7 +174,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
166174
@IBAction func openMiaoYan(_ sender: Any) {
167175
NSWorkspace.shared.open(URL(string: "https://miaoyan.vercel.app")!)
168176
}
169-
177+
170178
@IBAction func openCats(_ sender: Any) {
171179
NSWorkspace.shared.open(URL(string: "https://miaoyan.vercel.app/cats.html")!)
172180
}

‎Mac/Base.lproj/Main.storyboard

+25-16
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ CA
531531
<menuItem title="JetBrains Mono" id="gHy-s3-JDh">
532532
<modifierMask key="keyEquivalentModifierMask"/>
533533
</menuItem>
534-
<menuItem title="Menlo" id="Ob7-cD-LzC">
534+
<menuItem title="Georgia" id="IUe-Hi-7b6">
535535
<modifierMask key="keyEquivalentModifierMask"/>
536536
</menuItem>
537537
<menuItem title="Avenir Next" id="a6S-Gr-Ch8">
@@ -560,13 +560,19 @@ CA
560560
<menuItem title="LXGW WenKai Lite" state="on" id="Lx0-fl-9t0">
561561
<modifierMask key="keyEquivalentModifierMask"/>
562562
</menuItem>
563-
<menuItem title="Yuanti SC" id="Pfn-ye-9Vy">
563+
<menuItem title="Heti Hei" id="PV7-CS-tpO">
564564
<modifierMask key="keyEquivalentModifierMask"/>
565565
</menuItem>
566-
<menuItem title="Avenir Next" id="0yO-nw-meF">
566+
<menuItem title="Heti Song" id="0yO-nw-meF">
567567
<modifierMask key="keyEquivalentModifierMask"/>
568568
</menuItem>
569-
<menuItem title="Helvetica Neue" id="lRS-vK-MWg">
569+
<menuItem title="Georgia" id="uW5-RQ-wqF">
570+
<modifierMask key="keyEquivalentModifierMask"/>
571+
</menuItem>
572+
<menuItem title="Avenir Next" id="j7g-D4-pKi">
573+
<modifierMask key="keyEquivalentModifierMask"/>
574+
</menuItem>
575+
<menuItem title="Helvetica Neue" id="ne1-PN-WcW">
570576
<modifierMask key="keyEquivalentModifierMask"/>
571577
</menuItem>
572578
</items>
@@ -589,7 +595,10 @@ CA
589595
<menuItem title="LXGW WenKai Lite" state="on" id="QwH-At-JGa">
590596
<modifierMask key="keyEquivalentModifierMask"/>
591597
</menuItem>
592-
<menuItem title="Avenir Next" id="Bwp-Pv-g0O">
598+
<menuItem title="Georgia" id="Bwp-Pv-g0O">
599+
<modifierMask key="keyEquivalentModifierMask"/>
600+
</menuItem>
601+
<menuItem title="Avenir Next" id="ek3-JP-viq">
593602
<modifierMask key="keyEquivalentModifierMask"/>
594603
</menuItem>
595604
<menuItem title="Helvetica Neue" id="0cu-dn-9sf">
@@ -637,15 +646,15 @@ CA
637646
</textField>
638647
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AY8-g1-9tW">
639648
<rect key="frame" x="31" y="103" width="55" height="25"/>
640-
<popUpButtonCell key="cell" type="push" title="12" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="CIa-Sz-unx" id="JPv-4n-4vL">
649+
<popUpButtonCell key="cell" type="push" title="15" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="xoA-rd-vlO" id="JPv-4n-4vL">
641650
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
642651
<font key="font" metaFont="menu"/>
643652
<menu key="menu" id="n5Y-iD-qYl">
644653
<items>
645-
<menuItem title="12" state="on" id="CIa-Sz-unx"/>
654+
<menuItem title="12" id="CIa-Sz-unx"/>
646655
<menuItem title="13" id="Q3T-TQ-ewQ"/>
647656
<menuItem title="14" id="MAe-d2-ol1"/>
648-
<menuItem title="15" id="xoA-rd-vlO"/>
657+
<menuItem title="15" state="on" id="xoA-rd-vlO"/>
649658
<menuItem title="16" id="c1S-aB-edm"/>
650659
<menuItem title="17" id="lPX-8x-F9a"/>
651660
<menuItem title="18" id="J0P-Qc-LaU"/>
@@ -660,16 +669,16 @@ CA
660669
</popUpButton>
661670
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hU4-gw-1Hb">
662671
<rect key="frame" x="157" y="103" width="55" height="25"/>
663-
<popUpButtonCell key="cell" type="push" title="12" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="vYJ-nZ-Rkv" id="bL4-tX-2xd">
672+
<popUpButtonCell key="cell" type="push" title="16" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="DTe-57-Kqf" id="bL4-tX-2xd">
664673
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
665674
<font key="font" metaFont="menu"/>
666675
<menu key="menu" id="xrE-0h-GOl">
667676
<items>
668-
<menuItem title="12" state="on" id="vYJ-nZ-Rkv"/>
677+
<menuItem title="12" id="vYJ-nZ-Rkv"/>
669678
<menuItem title="13" id="2Uz-7H-8jH"/>
670679
<menuItem title="14" id="Wju-FE-YsQ"/>
671680
<menuItem title="15" id="IF0-dQ-WWn"/>
672-
<menuItem title="16" id="DTe-57-Kqf"/>
681+
<menuItem title="16" state="on" id="DTe-57-Kqf"/>
673682
<menuItem title="17" id="i29-ed-qEr"/>
674683
<menuItem title="18" id="Z7j-si-A12"/>
675684
<menuItem title="19" id="g4e-PC-JbI"/>
@@ -1034,7 +1043,7 @@ CA
10341043
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
10351044
<subviews>
10361045
<textField identifier="cellName" autoresizesSubviews="NO" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UvD-jB-7Ok" customClass="NameTextField" customModule="MiaoYan" customModuleProvider="target">
1037-
<rect key="frame" x="4" y="22" width="200" height="17"/>
1046+
<rect key="frame" x="10" y="105" width="182" height="17"/>
10381047
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" state="on" alignment="left" title="Name" usesSingleLineMode="YES" id="y7T-Rc-etT">
10391048
<font key="font" metaFont="system" size="14"/>
10401049
<color key="textColor" name="mainText"/>
@@ -1045,7 +1054,7 @@ CA
10451054
</connections>
10461055
</textField>
10471056
<textField identifier="cellDate" autoresizesSubviews="NO" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="abw-Lq-K7d">
1048-
<rect key="frame" x="4" y="10" width="42" height="14"/>
1057+
<rect key="frame" x="4" y="7" width="42" height="14"/>
10491058
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="2/23/11" id="9w3-fa-di3">
10501059
<font key="font" metaFont="smallSystem"/>
10511060
<color key="textColor" red="0.65995385362694303" green="0.1371187799261683" blue="0.15795969262071341" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1056,7 +1065,7 @@ CA
10561065
</textFieldCell>
10571066
</textField>
10581067
<imageView identifier="pin" hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="9h5-Ob-Nej">
1059-
<rect key="frame" x="52" y="10" width="12" height="12"/>
1068+
<rect key="frame" x="52" y="7" width="12" height="12"/>
10601069
<constraints>
10611070
<constraint firstAttribute="height" constant="12" id="QQS-Ef-avR"/>
10621071
<constraint firstAttribute="width" constant="12" id="hpI-x0-6Kw"/>
@@ -1065,10 +1074,10 @@ CA
10651074
</imageView>
10661075
</subviews>
10671076
<constraints>
1068-
<constraint firstItem="UvD-jB-7Ok" firstAttribute="top" secondItem="8qL-z4-nzh" secondAttribute="top" constant="9" id="AtV-FX-Ffi"/>
1077+
<constraint firstItem="UvD-jB-7Ok" firstAttribute="top" secondItem="8qL-z4-nzh" secondAttribute="top" constant="11" id="AtV-FX-Ffi"/>
10691078
<constraint firstItem="9h5-Ob-Nej" firstAttribute="leading" secondItem="abw-Lq-K7d" secondAttribute="trailing" constant="8" id="F5A-5T-FXC"/>
10701079
<constraint firstItem="UvD-jB-7Ok" firstAttribute="leading" secondItem="8qL-z4-nzh" secondAttribute="leading" constant="6" id="eyU-qZ-ACw"/>
1071-
<constraint firstItem="abw-Lq-K7d" firstAttribute="top" secondItem="UvD-jB-7Ok" secondAttribute="bottom" constant="-2" id="hKA-pJ-rpa"/>
1080+
<constraint firstAttribute="bottom" secondItem="abw-Lq-K7d" secondAttribute="bottom" constant="7" id="hKA-pJ-rpa"/>
10721081
<constraint firstItem="9h5-Ob-Nej" firstAttribute="centerY" secondItem="abw-Lq-K7d" secondAttribute="centerY" constant="1.5" id="jki-SD-fdc"/>
10731082
<constraint firstItem="UvD-jB-7Ok" firstAttribute="left" secondItem="abw-Lq-K7d" secondAttribute="left" id="ngR-5z-x5I"/>
10741083
<constraint firstAttribute="trailing" secondItem="UvD-jB-7Ok" secondAttribute="trailing" id="vb9-2V-r5G"/>

‎Mac/Business/Note.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public class Note: NSObject {
109109
}
110110

111111
if modifiedAt != modifiedLocalAt {
112-
if container != .encryptedTextPack, let attributedString = getContent() {
112+
if let attributedString = getContent() {
113113
content = NSMutableAttributedString(attributedString: attributedString)
114114
}
115115
loadModifiedLocalAt()
@@ -120,7 +120,7 @@ public class Note: NSObject {
120120
}
121121

122122
public func forceReload() {
123-
if container != .encryptedTextPack, let attributedString = getContent() {
123+
if let attributedString = getContent() {
124124
content = NSMutableAttributedString(attributedString: attributedString)
125125
}
126126
}
@@ -362,7 +362,7 @@ public class Note: NSObject {
362362
}
363363

364364
func getContent() -> NSAttributedString? {
365-
guard container != .encryptedTextPack, let url = getContentFileURL() else { return nil }
365+
guard let url = getContentFileURL() else { return nil }
366366

367367
do {
368368
let options = getDocOptions()

‎Mac/Helpers/FileSystemEventManager.swift

-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ class FileSystemEventManager {
169169
}
170170

171171
private func reloadNote(note: Note) {
172-
guard note.container != .encryptedTextPack else { return }
173172
guard let fsContent = note.getContent() else { return }
174173

175174
let memoryContent = note.content.attributedSubstring(from: NSRange(0..<note.content.length))

‎Mac/Helpers/SandboxBookmark.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class SandboxBookmark {
1515

1616
func bookmarkPath() -> String {
1717
var url = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
18-
url = url.appendingPathComponent("Bookmarks.dict")
18+
url = url.appendingPathComponent(".Bookmarks.dict")
1919

2020
return url.path
2121
}

‎Mac/Helpers/Typography.swift

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// MiaoYan
44
//
55
// Created by Tw93 on 2022/6/16.
6-
// Copyright © 2022 Oleksandr Glushchenko. All rights reserved.
76
//
87

98
import Foundation

0 commit comments

Comments
 (0)