Skip to content

Commit bcb328e

Browse files
MarcoEidingerMarcoEidinger
committed
1.4.0
1 parent 3770641 commit bcb328e

File tree

7 files changed

+192
-99
lines changed

7 files changed

+192
-99
lines changed

‎CHANGELOG.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
# [1.4.0](https://github.com/MarcoEidinger/SwiftPlantUML-Xcode-Extension/releases/tag/1.4.0)
2+
3+
## Features
4+
5+
- [X] Able to merge extensions into main type.
6+
7+
<img width="1000" alt="merged_extensions" src="https://user-images.githubusercontent.com/4176826/211223667-f886efbc-d557-4f41-8c76-40d5cbcf1aef.png">
8+
9+
- [X] Able to choose a theme
10+
11+
<img width="1090" alt="theme_sketchy_outline" src="https://user-images.githubusercontent.com/4176826/211223672-750c0a67-d1ae-4e20-80a1-0f02190c8c76.png">
12+
13+
## Improvements
14+
15+
- [X] Show Nested Types
16+
17+
<img width="1060" alt="nestedTypes" src="https://user-images.githubusercontent.com/4176826/211223671-595e771c-740e-4da6-ba92-fc6f9e72321b.png">
18+
- [X] Several Bug Fixes
19+
20+
## Internal Dependencies
21+
22+
uses [[email protected]](https://github.com/MarcoEidinger/SwiftPlantUML/releases/tag/0.7.0)
23+
124
# [1.3.0](https://github.com/MarcoEidinger/SwiftPlantUML-Xcode-Extension/releases/tag/1.3.0)
225

326
## Features

‎SwiftPlantUMLApp.xcodeproj/project.pbxproj‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
1919C9C8296B48EA00804361 /* SwiftPlantUMLFramework in Frameworks */ = {isa = PBXBuildFile; productRef = 1919C9C7296B48EA00804361 /* SwiftPlantUMLFramework */; };
11+
1919C9CA296B48FC00804361 /* SwiftPlantUMLFramework in Frameworks */ = {isa = PBXBuildFile; productRef = 1919C9C9296B48FC00804361 /* SwiftPlantUMLFramework */; };
1012
8A1EFEF42735DEC000BD6F69 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A1EFEF32735DEC000BD6F69 /* Utils.swift */; };
1113
8A30356F279BA55700042D19 /* PreferencesCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A30356E279BA55700042D19 /* PreferencesCommand.swift */; };
1214
8A319170261911B900540446 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A31916F261911B900540446 /* AppDelegate.swift */; };
@@ -22,7 +24,6 @@
2224
8A73D8EA25CAE9AA008DDEA3 /* GenDiagramInBrowser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A73D8E925CAE9AA008DDEA3 /* GenDiagramInBrowser.swift */; };
2325
8A73D8EF25CAE9AA008DDEA3 /* SourceEditorExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 8A73D8E025CAE9AA008DDEA3 /* SourceEditorExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
2426
8A73D90525CAE9DD008DDEA3 /* XPCService.xpc in Embed XPC Services */ = {isa = PBXBuildFile; fileRef = 8A73D8FA25CAE9DD008DDEA3 /* XPCService.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
25-
8A73D90F25CAEA3A008DDEA3 /* SwiftPlantUMLFramework in Frameworks */ = {isa = PBXBuildFile; productRef = 8A73D90E25CAEA3A008DDEA3 /* SwiftPlantUMLFramework */; };
2627
8A73D91425CAEA78008DDEA3 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A73D91325CAEA78008DDEA3 /* main.swift */; };
2728
8A73D91925CAEA8F008DDEA3 /* XPCServiceProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A73D91825CAEA8F008DDEA3 /* XPCServiceProtocol.swift */; };
2829
8A73D91E25CAEA9E008DDEA3 /* XPCService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A73D91D25CAEA9E008DDEA3 /* XPCService.swift */; };
@@ -140,6 +141,7 @@
140141
isa = PBXFrameworksBuildPhase;
141142
buildActionMask = 2147483647;
142143
files = (
144+
1919C9C8296B48EA00804361 /* SwiftPlantUMLFramework in Frameworks */,
143145
);
144146
runOnlyForDeploymentPostprocessing = 0;
145147
};
@@ -156,7 +158,7 @@
156158
isa = PBXFrameworksBuildPhase;
157159
buildActionMask = 2147483647;
158160
files = (
159-
8A73D90F25CAEA3A008DDEA3 /* SwiftPlantUMLFramework in Frameworks */,
161+
1919C9CA296B48FC00804361 /* SwiftPlantUMLFramework in Frameworks */,
160162
);
161163
runOnlyForDeploymentPostprocessing = 0;
162164
};
@@ -272,6 +274,9 @@
272274
8A73D90425CAE9DD008DDEA3 /* PBXTargetDependency */,
273275
);
274276
name = SwiftPlantUMLApp;
277+
packageProductDependencies = (
278+
1919C9C7296B48EA00804361 /* SwiftPlantUMLFramework */,
279+
);
275280
productName = SwiftPlantUMLApp;
276281
productReference = 8A73D8C825CAE974008DDEA3 /* SwiftPlantUMLApp.app */;
277282
productType = "com.apple.product-type.application";
@@ -292,6 +297,8 @@
292297
8A73D92625CAEB2B008DDEA3 /* PBXTargetDependency */,
293298
);
294299
name = SourceEditorExtension;
300+
packageProductDependencies = (
301+
);
295302
productName = SourceEditorExtension;
296303
productReference = 8A73D8E025CAE9AA008DDEA3 /* SourceEditorExtension.appex */;
297304
productType = "com.apple.product-type.xcode-extension";
@@ -310,7 +317,7 @@
310317
);
311318
name = XPCService;
312319
packageProductDependencies = (
313-
8A73D90E25CAEA3A008DDEA3 /* SwiftPlantUMLFramework */,
320+
1919C9C9296B48FC00804361 /* SwiftPlantUMLFramework */,
314321
);
315322
productName = XPCService;
316323
productReference = 8A73D8FA25CAE9DD008DDEA3 /* XPCService.xpc */;
@@ -347,7 +354,7 @@
347354
);
348355
mainGroup = 8A73D8BF25CAE974008DDEA3;
349356
packageReferences = (
350-
8A73D90D25CAEA3A008DDEA3 /* XCRemoteSwiftPackageReference "SwiftPlantUML" */,
357+
1919C9C6296B48EA00804361 /* XCRemoteSwiftPackageReference "SwiftPlantUML" */,
351358
);
352359
productRefGroup = 8A73D8C925CAE974008DDEA3 /* Products */;
353360
projectDirPath = "";
@@ -582,7 +589,7 @@
582589
CODE_SIGN_IDENTITY = "Apple Development";
583590
CODE_SIGN_STYLE = Automatic;
584591
COMBINE_HIDPI_IMAGES = YES;
585-
CURRENT_PROJECT_VERSION = 5;
592+
CURRENT_PROJECT_VERSION = 2;
586593
DEVELOPMENT_ASSET_PATHS = "\"SwiftPlantUMLApp/Preview Content\"";
587594
DEVELOPMENT_TEAM = 6V66CC3AN6;
588595
ENABLE_HARDENED_RUNTIME = YES;
@@ -593,7 +600,7 @@
593600
"@executable_path/../Frameworks",
594601
);
595602
MACOSX_DEPLOYMENT_TARGET = 10.15;
596-
MARKETING_VERSION = 1.3.0;
603+
MARKETING_VERSION = 1.4.0;
597604
PRODUCT_BUNDLE_IDENTIFIER = us.eidinger.SwiftPlantUML;
598605
PRODUCT_NAME = "$(TARGET_NAME)";
599606
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -611,7 +618,7 @@
611618
CODE_SIGN_IDENTITY = "Apple Development";
612619
CODE_SIGN_STYLE = Automatic;
613620
COMBINE_HIDPI_IMAGES = YES;
614-
CURRENT_PROJECT_VERSION = 5;
621+
CURRENT_PROJECT_VERSION = 2;
615622
DEVELOPMENT_ASSET_PATHS = "\"SwiftPlantUMLApp/Preview Content\"";
616623
DEVELOPMENT_TEAM = 6V66CC3AN6;
617624
ENABLE_HARDENED_RUNTIME = YES;
@@ -622,7 +629,7 @@
622629
"@executable_path/../Frameworks",
623630
);
624631
MACOSX_DEPLOYMENT_TARGET = 10.15;
625-
MARKETING_VERSION = 1.3.0;
632+
MARKETING_VERSION = 1.4.0;
626633
PRODUCT_BUNDLE_IDENTIFIER = us.eidinger.SwiftPlantUML;
627634
PRODUCT_NAME = "$(TARGET_NAME)";
628635
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -637,7 +644,7 @@
637644
CODE_SIGN_IDENTITY = "Apple Development";
638645
CODE_SIGN_STYLE = Automatic;
639646
COMBINE_HIDPI_IMAGES = YES;
640-
CURRENT_PROJECT_VERSION = 5;
647+
CURRENT_PROJECT_VERSION = 2;
641648
DEVELOPMENT_TEAM = 6V66CC3AN6;
642649
ENABLE_HARDENED_RUNTIME = YES;
643650
INFOPLIST_FILE = SourceEditorExtension/Info.plist;
@@ -646,7 +653,7 @@
646653
"@executable_path/../Frameworks",
647654
"@executable_path/../../../../Frameworks",
648655
);
649-
MARKETING_VERSION = 1.3.0;
656+
MARKETING_VERSION = 1.4.0;
650657
PRODUCT_BUNDLE_IDENTIFIER = us.eidinger.SwiftPlantUMLSourceEditorExtension;
651658
PRODUCT_NAME = "$(TARGET_NAME)";
652659
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -662,7 +669,7 @@
662669
CODE_SIGN_IDENTITY = "Apple Development";
663670
CODE_SIGN_STYLE = Automatic;
664671
COMBINE_HIDPI_IMAGES = YES;
665-
CURRENT_PROJECT_VERSION = 5;
672+
CURRENT_PROJECT_VERSION = 2;
666673
DEVELOPMENT_TEAM = 6V66CC3AN6;
667674
ENABLE_HARDENED_RUNTIME = YES;
668675
INFOPLIST_FILE = SourceEditorExtension/Info.plist;
@@ -671,7 +678,7 @@
671678
"@executable_path/../Frameworks",
672679
"@executable_path/../../../../Frameworks",
673680
);
674-
MARKETING_VERSION = 1.3.0;
681+
MARKETING_VERSION = 1.4.0;
675682
PRODUCT_BUNDLE_IDENTIFIER = us.eidinger.SwiftPlantUMLSourceEditorExtension;
676683
PRODUCT_NAME = "$(TARGET_NAME)";
677684
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -688,7 +695,7 @@
688695
CODE_SIGN_IDENTITY = "Apple Development";
689696
CODE_SIGN_STYLE = Automatic;
690697
COMBINE_HIDPI_IMAGES = YES;
691-
CURRENT_PROJECT_VERSION = 5;
698+
CURRENT_PROJECT_VERSION = 2;
692699
DEVELOPMENT_TEAM = 6V66CC3AN6;
693700
ENABLE_HARDENED_RUNTIME = YES;
694701
INFOPLIST_FILE = XPCService/Info.plist;
@@ -697,7 +704,7 @@
697704
"@executable_path/../Frameworks",
698705
"@loader_path/../Frameworks",
699706
);
700-
MARKETING_VERSION = 1.3.0;
707+
MARKETING_VERSION = 1.4.0;
701708
PRODUCT_BUNDLE_IDENTIFIER = us.eidinger.SwiftPlantUMLXPCService;
702709
PRODUCT_NAME = "$(TARGET_NAME)";
703710
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -715,7 +722,7 @@
715722
CODE_SIGN_IDENTITY = "Apple Development";
716723
CODE_SIGN_STYLE = Automatic;
717724
COMBINE_HIDPI_IMAGES = YES;
718-
CURRENT_PROJECT_VERSION = 5;
725+
CURRENT_PROJECT_VERSION = 2;
719726
DEVELOPMENT_TEAM = 6V66CC3AN6;
720727
ENABLE_HARDENED_RUNTIME = YES;
721728
INFOPLIST_FILE = XPCService/Info.plist;
@@ -724,7 +731,7 @@
724731
"@executable_path/../Frameworks",
725732
"@loader_path/../Frameworks",
726733
);
727-
MARKETING_VERSION = 1.3.0;
734+
MARKETING_VERSION = 1.4.0;
728735
PRODUCT_BUNDLE_IDENTIFIER = us.eidinger.SwiftPlantUMLXPCService;
729736
PRODUCT_NAME = "$(TARGET_NAME)";
730737
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -775,20 +782,25 @@
775782
/* End XCConfigurationList section */
776783

777784
/* Begin XCRemoteSwiftPackageReference section */
778-
8A73D90D25CAEA3A008DDEA3 /* XCRemoteSwiftPackageReference "SwiftPlantUML" */ = {
785+
1919C9C6296B48EA00804361 /* XCRemoteSwiftPackageReference "SwiftPlantUML" */ = {
779786
isa = XCRemoteSwiftPackageReference;
780-
repositoryURL = "https://github.com/MarcoEidinger/SwiftPlantUML";
787+
repositoryURL = "https://github.com/MarcoEidinger/SwiftPlantUML.git";
781788
requirement = {
782789
kind = upToNextMinorVersion;
783-
minimumVersion = 0.6.0;
790+
minimumVersion = 0.7.0;
784791
};
785792
};
786793
/* End XCRemoteSwiftPackageReference section */
787794

788795
/* Begin XCSwiftPackageProductDependency section */
789-
8A73D90E25CAEA3A008DDEA3 /* SwiftPlantUMLFramework */ = {
796+
1919C9C7296B48EA00804361 /* SwiftPlantUMLFramework */ = {
797+
isa = XCSwiftPackageProductDependency;
798+
package = 1919C9C6296B48EA00804361 /* XCRemoteSwiftPackageReference "SwiftPlantUML" */;
799+
productName = SwiftPlantUMLFramework;
800+
};
801+
1919C9C9296B48FC00804361 /* SwiftPlantUMLFramework */ = {
790802
isa = XCSwiftPackageProductDependency;
791-
package = 8A73D90D25CAEA3A008DDEA3 /* XCRemoteSwiftPackageReference "SwiftPlantUML" */;
803+
package = 1919C9C6296B48EA00804361 /* XCRemoteSwiftPackageReference "SwiftPlantUML" */;
792804
productName = SwiftPlantUMLFramework;
793805
};
794806
/* End XCSwiftPackageProductDependency section */

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

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

‎SwiftPlantUMLApp/SettingsView.swift‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
import Foundation
22
import SwiftUI
3+
import SwiftPlantUMLFramework
4+
5+
extension Theme {
6+
public static var chooseable: [String] {
7+
var values: [String] = []
8+
values.append("")
9+
values.append(contentsOf: Theme.preferred.map { $0.rawValue })
10+
return values
11+
}
12+
}
313

414
struct SettingsView: View {
515
@EnvironmentObject private var mainState: ContentViewModel
@@ -60,8 +70,26 @@ struct SettingsView: View {
6070
}
6171
if selectedConfigurationScope == .others {
6272
VStack(alignment: .leading) {
73+
HStack {
74+
Spacer(minLength: 19)
75+
Picker("Theme", selection: $mainState.settings.theme) {
76+
ForEach(Theme.chooseable, id: \.self) {
77+
Text($0)
78+
}
79+
}
80+
Spacer(minLength: 150)
81+
}
82+
HStack {
83+
Spacer(minLength: 19)
84+
Picker("Show extensions", selection: $mainState.settings.showExtensionsValue) {
85+
Text(ExtensionVisualization.all.rawValue).tag(ExtensionVisualization.all.rawValue)
86+
Text(ExtensionVisualization.merged.rawValue).tag(ExtensionVisualization.merged.rawValue)
87+
Text(ExtensionVisualization.none.rawValue).tag(ExtensionVisualization.none.rawValue)
88+
}
89+
Spacer(minLength: 150)
90+
}
6391
Toggle("Show generics", isOn: $mainState.settings.showGenerics)
64-
Toggle("Show extensions", isOn: $mainState.settings.showExtensions)
92+
Toggle("Show nested types", isOn: $mainState.settings.showNestedTypes)
6593
}
6694
}
6795
}

0 commit comments

Comments
 (0)