Skip to content

Commit bb6915e

Browse files
thecoolwinterthecoolwinter
committed
Merge branch 'main' into feat/invisible-config
2 parents c38a42d + 6619d16 commit bb6915e

43 files changed

Lines changed: 736 additions & 1231 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.all-contributorsrc‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,6 +822,24 @@
822822
"contributions": [
823823
"code"
824824
]
825+
},
826+
{
827+
"login": "georgetchelidze",
828+
"name": "George Tchelidze",
829+
"avatar_url": "https://avatars.githubusercontent.com/u/96194129?v=4",
830+
"profile": "https://github.com/georgetchelidze",
831+
"contributions": [
832+
"code"
833+
]
834+
},
835+
{
836+
"login": "zhrispineda",
837+
"name": "Chris Pineda",
838+
"avatar_url": "https://avatars.githubusercontent.com/u/148818634?v=4",
839+
"profile": "http://zhr.is",
840+
"contributions": [
841+
"code"
842+
]
825843
}
826844
],
827845
"contributorsPerLine": 7,

‎CodeEdit.xcodeproj/project.pbxproj‎

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
583E529C29361BAB001AB554 /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 583E529B29361BAB001AB554 /* SnapshotTesting */; };
1717
58F2EB03292FB2B0004A9BDE /* Documentation.docc in Sources */ = {isa = PBXBuildFile; fileRef = 58F2EACE292FB2B0004A9BDE /* Documentation.docc */; };
1818
58F2EB1E292FB954004A9BDE /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 58F2EB1D292FB954004A9BDE /* Sparkle */; };
19+
5E4485612DF600D9008BBE69 /* AboutWindow in Frameworks */ = {isa = PBXBuildFile; productRef = 5E4485602DF600D9008BBE69 /* AboutWindow */; };
20+
5EACE6222DF4BF08005E08B8 /* WelcomeWindow in Frameworks */ = {isa = PBXBuildFile; productRef = 5EACE6212DF4BF08005E08B8 /* WelcomeWindow */; };
1921
6C0617D62BDB4432008C9C42 /* LogStream in Frameworks */ = {isa = PBXBuildFile; productRef = 6C0617D52BDB4432008C9C42 /* LogStream */; };
2022
6C0824A12C5C0C9700A0751E /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6C0824A02C5C0C9700A0751E /* SwiftTerm */; };
2123
6C147C4529A329350089B630 /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = 6C147C4429A329350089B630 /* OrderedCollections */; };
@@ -174,13 +176,15 @@
174176
6C0617D62BDB4432008C9C42 /* LogStream in Frameworks */,
175177
6CC17B4F2C432AE000834E2C /* CodeEditSourceEditor in Frameworks */,
176178
30CB64912C16CA8100CC8A9E /* LanguageServerProtocol in Frameworks */,
179+
5E4485612DF600D9008BBE69 /* AboutWindow in Frameworks */,
177180
6C4E37FC2C73E00700AEE7B5 /* SwiftTerm in Frameworks */,
178181
6C6BD6F429CD142C00235D17 /* CollectionConcurrencyKit in Frameworks */,
179182
6C85BB442C210EFD00EB5DEF /* SwiftUIIntrospect in Frameworks */,
180183
6CB446402B6DFF3A00539ED0 /* CodeEditSourceEditor in Frameworks */,
181184
6C73A6D32D4F1E550012D95C /* CodeEditSourceEditor in Frameworks */,
182185
2816F594280CF50500DD548B /* CodeEditSymbols in Frameworks */,
183186
30CB64942C16CA9100CC8A9E /* LanguageClient in Frameworks */,
187+
5EACE6222DF4BF08005E08B8 /* WelcomeWindow in Frameworks */,
184188
6C6BD6F829CD14D100235D17 /* CodeEditKit in Frameworks */,
185189
6C0824A12C5C0C9700A0751E /* SwiftTerm in Frameworks */,
186190
6C81916B29B41DD300B75C92 /* DequeModule in Frameworks */,
@@ -319,7 +323,8 @@
319323
6CB94D022CA1205100E8651C /* AsyncAlgorithms */,
320324
6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */,
321325
6C73A6D22D4F1E550012D95C /* CodeEditSourceEditor */,
322-
6C50EF3A2DFC83E4007FE626 /* CodeEditSourceEditor */,
326+
5EACE6212DF4BF08005E08B8 /* WelcomeWindow */,
327+
5E4485602DF600D9008BBE69 /* AboutWindow */,
323328
);
324329
productName = CodeEdit;
325330
productReference = B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */;
@@ -380,7 +385,7 @@
380385
attributes = {
381386
BuildIndependentTargetsInParallel = 1;
382387
LastSwiftUpdateCheck = 1330;
383-
LastUpgradeCheck = 1620;
388+
LastUpgradeCheck = 1640;
384389
TargetAttributes = {
385390
2BE487EB28245162003F3F64 = {
386391
CreatedOnToolsVersion = 13.3.1;
@@ -422,7 +427,9 @@
422427
303E88462C276FD600EEA8D9 /* XCRemoteSwiftPackageReference "LanguageServerProtocol" */,
423428
6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
424429
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
425-
6C50EF392DFC83E4007FE626 /* XCLocalSwiftPackageReference "../CodeEditSourceEditor" */,
430+
6CF368562DBBD274006A77FD /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
431+
5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */,
432+
5E44855F2DF600D9008BBE69 /* XCRemoteSwiftPackageReference "AboutWindow" */,
426433
);
427434
preferredProjectObjectVersion = 55;
428435
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
@@ -669,6 +676,7 @@
669676
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
670677
PRODUCT_NAME = "$(TARGET_NAME)";
671678
PROVISIONING_PROFILE_SPECIFIER = "";
679+
REGISTER_APP_GROUPS = YES;
672680
RUN_DOCUMENTATION_COMPILER = NO;
673681
SWIFT_EMIT_LOC_STRINGS = YES;
674682
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -760,6 +768,7 @@
760768
MARKETING_VERSION = 1.0;
761769
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
762770
PRODUCT_NAME = "$(TARGET_NAME)";
771+
REGISTER_APP_GROUPS = YES;
763772
SKIP_INSTALL = YES;
764773
SWIFT_EMIT_LOC_STRINGS = YES;
765774
SWIFT_VERSION = 5.0;
@@ -864,6 +873,7 @@
864873
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
865874
PRODUCT_NAME = "$(TARGET_NAME)";
866875
PROVISIONING_PROFILE_SPECIFIER = "";
876+
REGISTER_APP_GROUPS = YES;
867877
RUN_DOCUMENTATION_COMPILER = NO;
868878
SWIFT_EMIT_LOC_STRINGS = YES;
869879
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -955,6 +965,7 @@
955965
MARKETING_VERSION = 1.0;
956966
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
957967
PRODUCT_NAME = "$(TARGET_NAME)";
968+
REGISTER_APP_GROUPS = YES;
958969
SKIP_INSTALL = YES;
959970
SWIFT_EMIT_LOC_STRINGS = YES;
960971
SWIFT_VERSION = 5.0;
@@ -989,6 +1000,7 @@
9891000
MARKETING_VERSION = 1.0;
9901001
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
9911002
PRODUCT_NAME = "$(TARGET_NAME)";
1003+
REGISTER_APP_GROUPS = YES;
9921004
SKIP_INSTALL = YES;
9931005
SWIFT_EMIT_LOC_STRINGS = YES;
9941006
SWIFT_VERSION = 5.0;
@@ -1023,6 +1035,7 @@
10231035
MARKETING_VERSION = 1.0;
10241036
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
10251037
PRODUCT_NAME = "$(TARGET_NAME)";
1038+
REGISTER_APP_GROUPS = YES;
10261039
SKIP_INSTALL = YES;
10271040
SWIFT_EMIT_LOC_STRINGS = YES;
10281041
SWIFT_VERSION = 5.0;
@@ -1129,6 +1142,7 @@
11291142
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
11301143
PRODUCT_NAME = "$(TARGET_NAME)";
11311144
PROVISIONING_PROFILE_SPECIFIER = "";
1145+
REGISTER_APP_GROUPS = YES;
11321146
RUN_DOCUMENTATION_COMPILER = NO;
11331147
SWIFT_EMIT_LOC_STRINGS = YES;
11341148
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1220,6 +1234,7 @@
12201234
MARKETING_VERSION = 1.0;
12211235
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
12221236
PRODUCT_NAME = "$(TARGET_NAME)";
1237+
REGISTER_APP_GROUPS = YES;
12231238
SKIP_INSTALL = YES;
12241239
SWIFT_EMIT_LOC_STRINGS = YES;
12251240
SWIFT_VERSION = 5.0;
@@ -1395,6 +1410,7 @@
13951410
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
13961411
PRODUCT_NAME = "$(TARGET_NAME)";
13971412
PROVISIONING_PROFILE_SPECIFIER = "";
1413+
REGISTER_APP_GROUPS = YES;
13981414
RUN_DOCUMENTATION_COMPILER = NO;
13991415
SWIFT_EMIT_LOC_STRINGS = YES;
14001416
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1435,6 +1451,7 @@
14351451
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
14361452
PRODUCT_NAME = "$(TARGET_NAME)";
14371453
PROVISIONING_PROFILE_SPECIFIER = "";
1454+
REGISTER_APP_GROUPS = YES;
14381455
RUN_DOCUMENTATION_COMPILER = NO;
14391456
SWIFT_EMIT_LOC_STRINGS = YES;
14401457
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1691,6 +1708,22 @@
16911708
version = 2.3.0;
16921709
};
16931710
};
1711+
5E44855F2DF600D9008BBE69 /* XCRemoteSwiftPackageReference "AboutWindow" */ = {
1712+
isa = XCRemoteSwiftPackageReference;
1713+
repositoryURL = "https://github.com/CodeEditApp/AboutWindow";
1714+
requirement = {
1715+
kind = upToNextMajorVersion;
1716+
minimumVersion = 1.0.0;
1717+
};
1718+
};
1719+
5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */ = {
1720+
isa = XCRemoteSwiftPackageReference;
1721+
repositoryURL = "https://github.com/CodeEditApp/WelcomeWindow";
1722+
requirement = {
1723+
kind = upToNextMajorVersion;
1724+
minimumVersion = 1.0.0;
1725+
};
1726+
};
16941727
6C0617D42BDB4432008C9C42 /* XCRemoteSwiftPackageReference "LogStream" */ = {
16951728
isa = XCRemoteSwiftPackageReference;
16961729
repositoryURL = "https://github.com/Wouter01/LogStream";
@@ -1783,6 +1816,16 @@
17831816
package = 58F2EB1C292FB954004A9BDE /* XCRemoteSwiftPackageReference "Sparkle" */;
17841817
productName = Sparkle;
17851818
};
1819+
5E4485602DF600D9008BBE69 /* AboutWindow */ = {
1820+
isa = XCSwiftPackageProductDependency;
1821+
package = 5E44855F2DF600D9008BBE69 /* XCRemoteSwiftPackageReference "AboutWindow" */;
1822+
productName = AboutWindow;
1823+
};
1824+
5EACE6212DF4BF08005E08B8 /* WelcomeWindow */ = {
1825+
isa = XCSwiftPackageProductDependency;
1826+
package = 5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */;
1827+
productName = WelcomeWindow;
1828+
};
17861829
6C0617D52BDB4432008C9C42 /* LogStream */ = {
17871830
isa = XCSwiftPackageProductDependency;
17881831
package = 6C0617D42BDB4432008C9C42 /* XCRemoteSwiftPackageReference "LogStream" */;

‎CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 36 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CodeEdit.xcodeproj/xcshareddata/xcschemes/CodeEdit.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1620"
3+
LastUpgradeVersion = "1640"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CodeEdit/CodeEditApp.swift‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
//
77

88
import SwiftUI
9+
import WelcomeWindow
10+
import AboutWindow
911

1012
@main
1113
struct CodeEditApp: App {
@@ -27,11 +29,32 @@ struct CodeEditApp: App {
2729

2830
var body: some Scene {
2931
Group {
30-
WelcomeWindow()
32+
WelcomeWindow(
33+
subtitleView: { WelcomeSubtitleView() },
34+
actions: { dismissWindow in
35+
NewFileButton(dismissWindow: dismissWindow)
36+
GitCloneButton(dismissWindow: dismissWindow)
37+
OpenFileOrFolderButton(dismissWindow: dismissWindow)
38+
},
39+
onDrop: { url, dismissWindow in
40+
Task { CodeEditDocumentController.shared.openDocument(at: url, onCompletion: { dismissWindow() }) }
41+
}
42+
)
3143

3244
ExtensionManagerWindow()
3345

34-
AboutWindow()
46+
AboutWindow(
47+
subtitleView: { AboutSubtitleView() },
48+
actions: {
49+
AboutButton(title: "Contributors", destination: {
50+
ContributorsView()
51+
})
52+
AboutButton(title: "Acknowledgements", destination: {
53+
AcknowledgementsView()
54+
})
55+
},
56+
footer: { AboutFooterView() }
57+
)
3558

3659
SettingsWindow()
3760
.commands {

‎CodeEdit/Features/About/AboutFooterView.swift‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//
2+
// AboutFooterView.swift
3+
// CodeEdit
4+
//
5+
// Created by Giorgi Tchelidze on 08.06.25.
6+
//
7+
8+
import SwiftUI
9+
import AboutWindow
10+
11+
struct AboutFooterView: View {
12+
var body: some View {
13+
FooterView(
14+
primaryView: {
15+
Link(destination: URL(string: "https://github.com/CodeEditApp/CodeEdit/blob/main/LICENSE.md")!) {
16+
Text("MIT License")
17+
.underline()
18+
}
19+
},
20+
secondaryView: {
21+
Text(Bundle.copyrightString ?? "")
22+
}
23+
)
24+
}
25+
}

0 commit comments

Comments
 (0)