Skip to content

Refactor Sample App and Logging #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 27, 2025
Merged

Refactor Sample App and Logging #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5ae0733
Refactor sample app to split views
jkmassel Oct 23, 2025
9ecd147
Raise logger messages up to the app level
jkmassel Oct 23, 2025
8bc0040
Address logging suggestions
jkmassel Oct 24, 2025
f3534e8
Address suggestions
jkmassel Oct 24, 2025
909e259
Revert port change
jkmassel Oct 24, 2025
873f5c3
fix linter issues
jkmassel Oct 24, 2025
de178f4
Fix module issue
jkmassel Oct 24, 2025
8a53ad7
Remove LogLevel comparison
jkmassel Oct 27, 2025
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
27 changes: 27 additions & 0 deletions Package.resolved
View file
Open in desktop

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

54 changes: 30 additions & 24 deletions ios/Demo-iOS/Gutenberg.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,41 @@
archiveVersion = 1;
classes = {
};
objectVersion = 56;
objectVersion = 70;
objects = {

/* Begin PBXBuildFile section */
0C4F59A22BEFF4980028BD96 /* AddSiteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C4F59A32BEFF4980028BD96 /* AddSiteView.swift */; };
0C4F59A42BEFF4980028BD96 /* AuthenticationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C4F59A52BEFF4980028BD96 /* AuthenticationManager.swift */; };
0C4F59A62BEFF4980028BD96 /* ConfigurationItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C4F59A72BEFF4980028BD96 /* ConfigurationItem.swift */; };
0C4F59A82BEFF4980028BD96 /* ConfigurationStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C4F59A92BEFF4980028BD96 /* ConfigurationStorage.swift */; };
0CE8E78B2C339B0600B9DC67 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0CE8E7842C339B0600B9DC67 /* Assets.xcassets */; };
0CE8E78C2C339B0600B9DC67 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE8E7852C339B0600B9DC67 /* ContentView.swift */; };
0CE8E78D2C339B0600B9DC67 /* EditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE8E7862C339B0600B9DC67 /* EditorView.swift */; };
0CE8E78E2C339B0600B9DC67 /* GutenbergApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE8E7872C339B0600B9DC67 /* GutenbergApp.swift */; };
0CE8E78F2C339B0600B9DC67 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0CE8E7892C339B0600B9DC67 /* Preview Assets.xcassets */; };
0CF6E04C2BEFF60E00EDEE8A /* GutenbergKit in Frameworks */ = {isa = PBXBuildFile; productRef = 0CF6E04B2BEFF60E00EDEE8A /* GutenbergKit */; };
246852562EAABB7800ED1F09 /* WordPressAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 0C4F59A12BEFF4980028BD96 /* WordPressAPI */; };
2468526B2EAACCA100ED1F09 /* AuthenticationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 246852682EAACCA100ED1F09 /* AuthenticationManager.swift */; };
2468526C2EAACCA100ED1F09 /* ConfigurationStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 246852692EAACCA100ED1F09 /* ConfigurationStorage.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0C4F598B2BEFF4970028BD96 /* Gutenberg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Gutenberg.app; sourceTree = BUILT_PRODUCTS_DIR; };
0C4F59A32BEFF4980028BD96 /* AddSiteView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddSiteView.swift; sourceTree = "<group>"; };
0C4F59A52BEFF4980028BD96 /* AuthenticationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationManager.swift; sourceTree = "<group>"; };
0C4F59A72BEFF4980028BD96 /* ConfigurationItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigurationItem.swift; sourceTree = "<group>"; };
0C4F59A92BEFF4980028BD96 /* ConfigurationStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigurationStorage.swift; sourceTree = "<group>"; };
0CE8E7842C339B0600B9DC67 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
0CE8E7852C339B0600B9DC67 /* ContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
0CE8E7862C339B0600B9DC67 /* EditorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorView.swift; sourceTree = "<group>"; };
0CE8E7872C339B0600B9DC67 /* GutenbergApp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GutenbergApp.swift; sourceTree = "<group>"; };
0CE8E7892C339B0600B9DC67 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
0CE8E7922C339B1B00B9DC67 /* GutenbergKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = GutenbergKit; path = ../..; sourceTree = "<group>"; };
246852682EAACCA100ED1F09 /* AuthenticationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationManager.swift; sourceTree = "<group>"; };
246852692EAACCA100ED1F09 /* ConfigurationStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigurationStorage.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
2468525B2EAAC62B00ED1F09 /* Views */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Views; sourceTree = "<group>"; };
/* End PBXFileSystemSynchronizedRootGroup section */

/* Begin PBXFrameworksBuildPhase section */
0C4F59882BEFF4970028BD96 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
246852562EAABB7800ED1F09 /* WordPressAPI in Frameworks */,
0CF6E04C2BEFF60E00EDEE8A /* GutenbergKit in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -76,12 +76,9 @@
0CE8E7882C339B0600B9DC67 /* Sources */ = {
isa = PBXGroup;
children = (
0C4F59A32BEFF4980028BD96 /* AddSiteView.swift */,
0C4F59A52BEFF4980028BD96 /* AuthenticationManager.swift */,
2468526A2EAACCA100ED1F09 /* Services */,
2468525B2EAAC62B00ED1F09 /* Views */,
0C4F59A72BEFF4980028BD96 /* ConfigurationItem.swift */,
0C4F59A92BEFF4980028BD96 /* ConfigurationStorage.swift */,
0CE8E7852C339B0600B9DC67 /* ContentView.swift */,
0CE8E7862C339B0600B9DC67 /* EditorView.swift */,
0CE8E7872C339B0600B9DC67 /* GutenbergApp.swift */,
);
path = Sources;
Expand All @@ -102,6 +99,15 @@
name = Frameworks;
sourceTree = "<group>";
};
2468526A2EAACCA100ED1F09 /* Services */ = {
isa = PBXGroup;
children = (
246852682EAACCA100ED1F09 /* AuthenticationManager.swift */,
246852692EAACCA100ED1F09 /* ConfigurationStorage.swift */,
);
path = Services;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -117,6 +123,9 @@
);
dependencies = (
);
fileSystemSynchronizedGroups = (
2468525B2EAAC62B00ED1F09 /* Views */,
);
name = Gutenberg;
packageProductDependencies = (
0CF6E04B2BEFF60E00EDEE8A /* GutenbergKit */,
Expand All @@ -134,7 +143,7 @@
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1510;
LastUpgradeCheck = 1510;
LastUpgradeCheck = 2600;
TargetAttributes = {
0C4F598A2BEFF4970028BD96 = {
CreatedOnToolsVersion = 15.1;
Expand Down Expand Up @@ -179,13 +188,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
0C4F59A22BEFF4980028BD96 /* AddSiteView.swift in Sources */,
0C4F59A42BEFF4980028BD96 /* AuthenticationManager.swift in Sources */,
0C4F59A62BEFF4980028BD96 /* ConfigurationItem.swift in Sources */,
0C4F59A82BEFF4980028BD96 /* ConfigurationStorage.swift in Sources */,
0CE8E78E2C339B0600B9DC67 /* GutenbergApp.swift in Sources */,
0CE8E78C2C339B0600B9DC67 /* ContentView.swift in Sources */,
0CE8E78D2C339B0600B9DC67 /* EditorView.swift in Sources */,
2468526B2EAACCA100ED1F09 /* AuthenticationManager.swift in Sources */,
2468526C2EAACCA100ED1F09 /* ConfigurationStorage.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -250,6 +256,7 @@
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
Expand Down Expand Up @@ -306,6 +313,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_COMPILATION_MODE = wholemodule;
VALIDATE_PRODUCT = YES;
};
Expand All @@ -325,7 +333,6 @@
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_CFBundleURLTypes = "$(INFOPLIST_KEY_CFBundleURLTypes)";
"INFOPLIST_KEY_CFBundleURLTypes[0]" = "{ CFBundleURLSchemes = (gutenbergkit); }";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
Expand Down Expand Up @@ -359,7 +366,6 @@
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_CFBundleURLTypes = "$(INFOPLIST_KEY_CFBundleURLTypes)";
"INFOPLIST_KEY_CFBundleURLTypes[0]" = "{ CFBundleURLSchemes = (gutenbergkit); }";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
Expand Down
2 changes: 1 addition & 1 deletion ios/Demo-iOS/Gutenberg.xcodeproj/xcshareddata/xcschemes/Gutenberg.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1540"
LastUpgradeVersion = "2600"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 2 additions & 2 deletions ios/Demo-iOS/Sources/ConfigurationItem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation

/// Represents a configuration item for the editor
enum ConfigurationItem: Codable, Identifiable {
enum ConfigurationItem: Codable, Identifiable, Equatable {
case bundledEditor
case remoteEditor(RemoteEditorConfiguration)

Expand All @@ -25,7 +25,7 @@ enum ConfigurationItem: Codable, Identifiable {
}

/// Configuration for a remote editor
struct RemoteEditorConfiguration: Codable, Identifiable {
struct RemoteEditorConfiguration: Codable, Identifiable, Equatable {
let id: String
let name: String
let siteUrl: String
Expand Down
171 changes: 0 additions & 171 deletions ios/Demo-iOS/Sources/ContentView.swift
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion ios/Demo-iOS/Sources/GutenbergApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ struct GutenbergApp: App {
var body: some Scene {
WindowGroup {
NavigationStack {
ContentView()
AppRootView()
}
}
.environmentObject(ConfigurationStorage())
.environmentObject(AuthenticationManager())
}
}
0 ...o-iOS/Sources/AuthenticationManager.swift → ...rces/Services/AuthenticationManager.swift
View file
Open in desktop
File renamed without changes.
Loading