changes made

This commit is contained in:
Kevin G Christiano 2020-05-27 10:11:09 -04:00
parent 3bedd7b29c
commit 494b3f3535
6 changed files with 52 additions and 3 deletions

View File

@ -2,12 +2,12 @@
<Workspace
version = "1.0">
<FileRef
location = "group:mvm_core_ui/MVMCoreUI.xcodeproj">
location = "group:JSONCreator_iOS/JSONCreator.xcodeproj">
</FileRef>
<FileRef
location = "group:mvm_core/MVMCore/MVMCore.xcodeproj">
</FileRef>
<FileRef
location = "group:JSONCreator_iOS/JSONCreator.xcodeproj">
location = "group:mvm_core_ui/MVMCoreUI.xcodeproj">
</FileRef>
</Workspace>

View File

@ -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 = "<group>"; };
0A5DD26023E0831500B3B076 /* AtomicAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtomicAPI.swift; sourceTree = "<group>"; };
0AA7BDD1230DA06D00EED90B /* MolecularModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MolecularModel.swift; sourceTree = "<group>"; };
0ADD8081231055F500A5E643 /* ObjectParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectParser.swift; sourceTree = "<group>"; };
@ -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;
};

View File

@ -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() {

View File

@ -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)

View File

@ -20,6 +20,11 @@
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>

View File

@ -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"
}
}