Skip to content

Commit 574e51d

Browse files
thecoolwinterthecoolwinter
committed
Merge branch 'main' into pr/2058
2 parents f94131a + bcd5f11 commit 574e51d

File tree

54 files changed

+1153
-1314
lines changed

Some content is hidden

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

54 files changed

+1153
-1314
lines changed

‎.all-contributorsrc‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -813,6 +813,33 @@
813813
"contributions": [
814814
"code"
815815
]
816+
},
817+
{
818+
"login": "Syrux64",
819+
"name": "Surya",
820+
"avatar_url": "https://avatars.githubusercontent.com/u/118998822?v=4",
821+
"profile": "https://github.com/Syrux64",
822+
"contributions": [
823+
"code"
824+
]
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+
]
816843
}
817844
],
818845
"contributorsPerLine": 7,

‎CodeEdit.xcodeproj/project.pbxproj‎

Lines changed: 46 additions & 2 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 */; };
@@ -173,13 +175,15 @@
173175
6C0617D62BDB4432008C9C42 /* LogStream in Frameworks */,
174176
6CC17B4F2C432AE000834E2C /* CodeEditSourceEditor in Frameworks */,
175177
30CB64912C16CA8100CC8A9E /* LanguageServerProtocol in Frameworks */,
178+
5E4485612DF600D9008BBE69 /* AboutWindow in Frameworks */,
176179
6C4E37FC2C73E00700AEE7B5 /* SwiftTerm in Frameworks */,
177180
6C6BD6F429CD142C00235D17 /* CollectionConcurrencyKit in Frameworks */,
178181
6C85BB442C210EFD00EB5DEF /* SwiftUIIntrospect in Frameworks */,
179182
6CB446402B6DFF3A00539ED0 /* CodeEditSourceEditor in Frameworks */,
180183
6C73A6D32D4F1E550012D95C /* CodeEditSourceEditor in Frameworks */,
181184
2816F594280CF50500DD548B /* CodeEditSymbols in Frameworks */,
182185
30CB64942C16CA9100CC8A9E /* LanguageClient in Frameworks */,
186+
5EACE6222DF4BF08005E08B8 /* WelcomeWindow in Frameworks */,
183187
6C6BD6F829CD14D100235D17 /* CodeEditKit in Frameworks */,
184188
6C0824A12C5C0C9700A0751E /* SwiftTerm in Frameworks */,
185189
6C81916B29B41DD300B75C92 /* DequeModule in Frameworks */,
@@ -317,6 +321,8 @@
317321
6CB94D022CA1205100E8651C /* AsyncAlgorithms */,
318322
6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */,
319323
6C73A6D22D4F1E550012D95C /* CodeEditSourceEditor */,
324+
5EACE6212DF4BF08005E08B8 /* WelcomeWindow */,
325+
5E4485602DF600D9008BBE69 /* AboutWindow */,
320326
);
321327
productName = CodeEdit;
322328
productReference = B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */;
@@ -377,7 +383,7 @@
377383
attributes = {
378384
BuildIndependentTargetsInParallel = 1;
379385
LastSwiftUpdateCheck = 1330;
380-
LastUpgradeCheck = 1620;
386+
LastUpgradeCheck = 1640;
381387
TargetAttributes = {
382388
2BE487EB28245162003F3F64 = {
383389
CreatedOnToolsVersion = 13.3.1;
@@ -420,6 +426,8 @@
420426
6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
421427
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
422428
6CF368562DBBD274006A77FD /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
429+
5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */,
430+
5E44855F2DF600D9008BBE69 /* XCRemoteSwiftPackageReference "AboutWindow" */,
423431
);
424432
preferredProjectObjectVersion = 55;
425433
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
@@ -666,6 +674,7 @@
666674
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
667675
PRODUCT_NAME = "$(TARGET_NAME)";
668676
PROVISIONING_PROFILE_SPECIFIER = "";
677+
REGISTER_APP_GROUPS = YES;
669678
RUN_DOCUMENTATION_COMPILER = NO;
670679
SWIFT_EMIT_LOC_STRINGS = YES;
671680
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -757,6 +766,7 @@
757766
MARKETING_VERSION = 1.0;
758767
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
759768
PRODUCT_NAME = "$(TARGET_NAME)";
769+
REGISTER_APP_GROUPS = YES;
760770
SKIP_INSTALL = YES;
761771
SWIFT_EMIT_LOC_STRINGS = YES;
762772
SWIFT_VERSION = 5.0;
@@ -861,6 +871,7 @@
861871
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
862872
PRODUCT_NAME = "$(TARGET_NAME)";
863873
PROVISIONING_PROFILE_SPECIFIER = "";
874+
REGISTER_APP_GROUPS = YES;
864875
RUN_DOCUMENTATION_COMPILER = NO;
865876
SWIFT_EMIT_LOC_STRINGS = YES;
866877
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -952,6 +963,7 @@
952963
MARKETING_VERSION = 1.0;
953964
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
954965
PRODUCT_NAME = "$(TARGET_NAME)";
966+
REGISTER_APP_GROUPS = YES;
955967
SKIP_INSTALL = YES;
956968
SWIFT_EMIT_LOC_STRINGS = YES;
957969
SWIFT_VERSION = 5.0;
@@ -986,6 +998,7 @@
986998
MARKETING_VERSION = 1.0;
987999
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
9881000
PRODUCT_NAME = "$(TARGET_NAME)";
1001+
REGISTER_APP_GROUPS = YES;
9891002
SKIP_INSTALL = YES;
9901003
SWIFT_EMIT_LOC_STRINGS = YES;
9911004
SWIFT_VERSION = 5.0;
@@ -1020,6 +1033,7 @@
10201033
MARKETING_VERSION = 1.0;
10211034
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
10221035
PRODUCT_NAME = "$(TARGET_NAME)";
1036+
REGISTER_APP_GROUPS = YES;
10231037
SKIP_INSTALL = YES;
10241038
SWIFT_EMIT_LOC_STRINGS = YES;
10251039
SWIFT_VERSION = 5.0;
@@ -1126,6 +1140,7 @@
11261140
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
11271141
PRODUCT_NAME = "$(TARGET_NAME)";
11281142
PROVISIONING_PROFILE_SPECIFIER = "";
1143+
REGISTER_APP_GROUPS = YES;
11291144
RUN_DOCUMENTATION_COMPILER = NO;
11301145
SWIFT_EMIT_LOC_STRINGS = YES;
11311146
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1217,6 +1232,7 @@
12171232
MARKETING_VERSION = 1.0;
12181233
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
12191234
PRODUCT_NAME = "$(TARGET_NAME)";
1235+
REGISTER_APP_GROUPS = YES;
12201236
SKIP_INSTALL = YES;
12211237
SWIFT_EMIT_LOC_STRINGS = YES;
12221238
SWIFT_VERSION = 5.0;
@@ -1392,6 +1408,7 @@
13921408
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
13931409
PRODUCT_NAME = "$(TARGET_NAME)";
13941410
PROVISIONING_PROFILE_SPECIFIER = "";
1411+
REGISTER_APP_GROUPS = YES;
13951412
RUN_DOCUMENTATION_COMPILER = NO;
13961413
SWIFT_EMIT_LOC_STRINGS = YES;
13971414
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1432,6 +1449,7 @@
14321449
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
14331450
PRODUCT_NAME = "$(TARGET_NAME)";
14341451
PROVISIONING_PROFILE_SPECIFIER = "";
1452+
REGISTER_APP_GROUPS = YES;
14351453
RUN_DOCUMENTATION_COMPILER = NO;
14361454
SWIFT_EMIT_LOC_STRINGS = YES;
14371455
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1681,6 +1699,22 @@
16811699
version = 2.3.0;
16821700
};
16831701
};
1702+
5E44855F2DF600D9008BBE69 /* XCRemoteSwiftPackageReference "AboutWindow" */ = {
1703+
isa = XCRemoteSwiftPackageReference;
1704+
repositoryURL = "https://github.com/CodeEditApp/AboutWindow";
1705+
requirement = {
1706+
kind = upToNextMajorVersion;
1707+
minimumVersion = 1.0.0;
1708+
};
1709+
};
1710+
5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */ = {
1711+
isa = XCRemoteSwiftPackageReference;
1712+
repositoryURL = "https://github.com/CodeEditApp/WelcomeWindow";
1713+
requirement = {
1714+
kind = upToNextMajorVersion;
1715+
minimumVersion = 1.0.0;
1716+
};
1717+
};
16841718
6C0617D42BDB4432008C9C42 /* XCRemoteSwiftPackageReference "LogStream" */ = {
16851719
isa = XCRemoteSwiftPackageReference;
16861720
repositoryURL = "https://github.com/Wouter01/LogStream";
@@ -1750,7 +1784,7 @@
17501784
repositoryURL = "https://github.com/CodeEditApp/CodeEditSourceEditor";
17511785
requirement = {
17521786
kind = exactVersion;
1753-
version = 0.13.2;
1787+
version = 0.14.0;
17541788
};
17551789
};
17561790
/* End XCRemoteSwiftPackageReference section */
@@ -1781,6 +1815,16 @@
17811815
package = 58F2EB1C292FB954004A9BDE /* XCRemoteSwiftPackageReference "Sparkle" */;
17821816
productName = Sparkle;
17831817
};
1818+
5E4485602DF600D9008BBE69 /* AboutWindow */ = {
1819+
isa = XCSwiftPackageProductDependency;
1820+
package = 5E44855F2DF600D9008BBE69 /* XCRemoteSwiftPackageReference "AboutWindow" */;
1821+
productName = AboutWindow;
1822+
};
1823+
5EACE6212DF4BF08005E08B8 /* WelcomeWindow */ = {
1824+
isa = XCSwiftPackageProductDependency;
1825+
package = 5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */;
1826+
productName = WelcomeWindow;
1827+
};
17841828
6C0617D52BDB4432008C9C42 /* LogStream */ = {
17851829
isa = XCSwiftPackageProductDependency;
17861830
package = 6C0617D42BDB4432008C9C42 /* XCRemoteSwiftPackageReference "LogStream" */;

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

Lines changed: 25 additions & 7 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)