From 494b3f353571f3e21aee328cd977c7d434061ef8 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 27 May 2020 10:11:09 -0400 Subject: [PATCH] changes made --- .../contents.xcworkspacedata | 4 +- .../JSONCreator.xcodeproj/project.pbxproj | 4 ++ JSONCreator_iOS/JSONCreator/AppDelegate.swift | 2 +- .../JSONCreator/DetailViewController.swift | 2 + JSONCreator_iOS/JSONCreator/Info.plist | 5 +++ JSONCreator_iOS/launchApp.json | 38 +++++++++++++++++++ 6 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 JSONCreator_iOS/launchApp.json diff --git a/JSONCreator.xcworkspace/contents.xcworkspacedata b/JSONCreator.xcworkspace/contents.xcworkspacedata index 8a88220..54b9cee 100644 --- a/JSONCreator.xcworkspace/contents.xcworkspacedata +++ b/JSONCreator.xcworkspace/contents.xcworkspacedata @@ -2,12 +2,12 @@ + location = "group:JSONCreator_iOS/JSONCreator.xcodeproj"> + location = "group:mvm_core_ui/MVMCoreUI.xcodeproj"> diff --git a/JSONCreator_iOS/JSONCreator.xcodeproj/project.pbxproj b/JSONCreator_iOS/JSONCreator.xcodeproj/project.pbxproj index 25622fa..6003265 100644 --- a/JSONCreator_iOS/JSONCreator.xcodeproj/project.pbxproj +++ b/JSONCreator_iOS/JSONCreator.xcodeproj/project.pbxproj @@ -21,6 +21,7 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 0A3D35082453831500AB2DCD /* launchApp.json in Resources */ = {isa = PBXBuildFile; fileRef = 0A3D35072453831500AB2DCD /* launchApp.json */; }; 0A5DD26123E0831500B3B076 /* AtomicAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A5DD26023E0831500B3B076 /* AtomicAPI.swift */; }; 0AA7BDD2230DA06D00EED90B /* MolecularModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AA7BDD1230DA06D00EED90B /* MolecularModel.swift */; }; 0ADD8082231055F500A5E643 /* ObjectParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ADD8081231055F500A5E643 /* ObjectParser.swift */; }; @@ -58,6 +59,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 0A3D35072453831500AB2DCD /* launchApp.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = launchApp.json; sourceTree = ""; }; 0A5DD26023E0831500B3B076 /* AtomicAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtomicAPI.swift; sourceTree = ""; }; 0AA7BDD1230DA06D00EED90B /* MolecularModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MolecularModel.swift; sourceTree = ""; }; 0ADD8081231055F500A5E643 /* ObjectParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectParser.swift; sourceTree = ""; }; @@ -111,6 +113,7 @@ D2B1E3E622F4A68F0065F95C = { isa = PBXGroup; children = ( + 0A3D35072453831500AB2DCD /* launchApp.json */, D2B1E3F122F4A68F0065F95C /* JSONCreator */, D2B1E3F022F4A68F0065F95C /* Products */, D2B1E42A22F9D0D90065F95C /* Frameworks */, @@ -223,6 +226,7 @@ D2B1E3FC22F4A6930065F95C /* Assets.xcassets in Resources */, D2B1E40A22F4C9F00065F95C /* JSON in Resources */, D2B1E3FA22F4A68F0065F95C /* Main.storyboard in Resources */, + 0A3D35082453831500AB2DCD /* launchApp.json in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/JSONCreator_iOS/JSONCreator/AppDelegate.swift b/JSONCreator_iOS/JSONCreator/AppDelegate.swift index ad088a6..e032499 100644 --- a/JSONCreator_iOS/JSONCreator/AppDelegate.swift +++ b/JSONCreator_iOS/JSONCreator/AppDelegate.swift @@ -78,7 +78,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele func splitViewController(_ splitViewController: UISplitViewController, collapseSecondary secondaryViewController:UIViewController, onto primaryViewController:UIViewController) -> Bool { //guard let secondaryAsNavController = secondaryViewController as? UINavigationController else { return false } //guard let _ = secondaryAsNavController.topViewController as? DetailViewController else { return false } - return true + return false } @objc func showEditor() { diff --git a/JSONCreator_iOS/JSONCreator/DetailViewController.swift b/JSONCreator_iOS/JSONCreator/DetailViewController.swift index ab592ca..ac3e2bd 100644 --- a/JSONCreator_iOS/JSONCreator/DetailViewController.swift +++ b/JSONCreator_iOS/JSONCreator/DetailViewController.swift @@ -117,6 +117,8 @@ class DetailViewController: UIViewController { @objc func play() { + // TODO: If toggle is on, save JSON to userdefaults. If off, clear + do { if let data = textView.text.data(using: .utf8), let jsonObject = try JSONSerialization.jsonObject(with: data, options: []) as? [AnyHashable: Any] { let page = jsonObject.optionalDictionaryForKey(KeyPage) diff --git a/JSONCreator_iOS/JSONCreator/Info.plist b/JSONCreator_iOS/JSONCreator/Info.plist index 879dddf..eccf5c3 100644 --- a/JSONCreator_iOS/JSONCreator/Info.plist +++ b/JSONCreator_iOS/JSONCreator/Info.plist @@ -20,6 +20,11 @@ 1 LSRequiresIPhoneOS + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/JSONCreator_iOS/launchApp.json b/JSONCreator_iOS/launchApp.json new file mode 100644 index 0000000..f20bfa9 --- /dev/null +++ b/JSONCreator_iOS/launchApp.json @@ -0,0 +1,38 @@ +{ + "Page": { + "pageType": "test", + "molecules": [ + { + "moleculeName": "listItem", + "molecule": { + "moleculeName": "textView", + "borderWidth": 1, + "height": 200, + "text": "asdasdasdasdasdasdasdasdasda", + "borderColor": "#000000", + "placeholder": "Enter text here.", + "textColor": "#FF0000" + } + } + ], + "header": { + "moleculeName": "header", + "molecule": { + "moleculeName": "stack", + "molecules": [ + { + "molecule": { + "moleculeName": "headlineBody", + "headline": { + "moleculeName": "label", + "text": "TextView Test" + } + } + } + ] + } + }, + "template": "list", + "screenHeading": "Testing Carousel" + } +}