Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Project notes:
- Swift tools version: 6.2
- Main app bundle ID: `com.rxlab.RxCode`
- App-level dependencies: SwiftTerm and Sparkle
- Package dependencies: ViewInspector, Textual, and MarkdownUI
- Package dependencies: ViewInspector

## Repository Layout

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 56;
objectVersion = 60;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -100,7 +100,7 @@
);
mainGroup = 111111111111111111111401;
packageReferences = (
111111111111111111111302 /* XCLocalSwiftPackageReference "../../" */,
111111111111111111111302 /* XCLocalSwiftPackageReference "../.." */,
);
productRefGroup = 111111111111111111111403 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -256,6 +256,9 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
ENABLE_APP_SANDBOX = YES;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
Expand All @@ -270,7 +273,8 @@
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.rxlab.MessageListSimulatorApp;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
REGISTER_APP_GROUPS = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SUPPORTS_MACCATALYST = NO;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down Expand Up @@ -300,7 +304,7 @@
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.rxlab.MessageListSimulatorApp;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SUPPORTS_MACCATALYST = NO;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down Expand Up @@ -333,7 +337,7 @@
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
111111111111111111111302 /* XCLocalSwiftPackageReference "../../" */ = {
111111111111111111111302 /* XCLocalSwiftPackageReference "../.." */ = {
isa = XCLocalSwiftPackageReference;
relativePath = ../..;
};
Expand All @@ -342,7 +346,7 @@
/* Begin XCSwiftPackageProductDependency section */
111111111111111111111301 /* MessageList */ = {
isa = XCSwiftPackageProductDependency;
package = 111111111111111111111302 /* XCLocalSwiftPackageReference "../../" */;
package = 111111111111111111111302 /* XCLocalSwiftPackageReference "../.." */;
productName = MessageList;
};
/* End XCSwiftPackageProductDependency section */
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ private struct MessageListManualTestView: View {
.padding(.horizontal, 16)
.padding(.vertical, 6)
}
#if os(iOS)
.background(Color(uiColor: .systemBackground))
#else
.background(Color(nsColor: .windowBackgroundColor))
#endif
}
}

Expand Down Expand Up @@ -73,7 +77,11 @@ private struct MessageListManualTestView: View {
.foregroundStyle(.secondary)
}
.padding(12)
#if os(iOS)
.background(Color(uiColor: .secondarySystemBackground))
#else
.background(Color(nsColor: .controlBackgroundColor))
#endif
}

private func appendUserMessage() {
Expand Down Expand Up @@ -143,7 +151,11 @@ private struct DemoMessageRow: View {
.padding(.vertical, 9)
.background {
RoundedRectangle(cornerRadius: 8)
#if os(iOS)
.fill(message.isUserMessage ? Color.accentColor : Color(uiColor: .secondarySystemBackground))
#else
.fill(message.isUserMessage ? Color.accentColor : Color(nsColor: .controlBackgroundColor))
#endif
}
.accessibilityIdentifier("message-\(message.text)")

Expand Down
56 changes: 1 addition & 55 deletions Packages/Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 11 additions & 4 deletions Packages/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ let package = Package(
.library(name: "MessageList", targets: ["MessageList"]),
.library(name: "RxCodeCore", targets: ["RxCodeCore"]),
.library(name: "RxCodeChatKit", targets: ["RxCodeChatKit"]),
.library(name: "RxCodeMarkdown", targets: ["RxCodeMarkdown"]),
.library(name: "RxCodeSync", targets: ["RxCodeSync"]),
.library(name: "DiffView", targets: ["DiffView"]),
],
dependencies: [
.package(url: "https://github.com/nalexn/ViewInspector", from: "0.10.0"),
.package(url: "https://github.com/gonzalezreal/textual", from: "0.3.1"),
.package(url: "https://github.com/gonzalezreal/swift-markdown-ui", from: "2.4.1"),
],
targets: [
.target(
Expand All @@ -29,14 +28,17 @@ let package = Package(
name: "RxCodeCore",
path: "Sources/RxCodeCore"
),
.target(
name: "RxCodeMarkdown",
path: "Sources/RxCodeMarkdown"
),
.target(
name: "RxCodeChatKit",
dependencies: [
"DiffView",
"MessageList",
"RxCodeCore",
.product(name: "Textual", package: "textual"),
.product(name: "MarkdownUI", package: "swift-markdown-ui"),
"RxCodeMarkdown",
],
path: "Sources/RxCodeChatKit",
resources: [
Expand Down Expand Up @@ -86,6 +88,11 @@ let package = Package(
],
path: "Tests/RxCodeChatKitTests"
),
.testTarget(
name: "RxCodeMarkdownTests",
dependencies: ["RxCodeMarkdown"],
path: "Tests/RxCodeMarkdownTests"
),
.testTarget(
name: "RxCodeSyncTests",
dependencies: ["RxCodeSync"],
Expand Down
Loading
Loading