Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Rearrange directory structure
Browse files Browse the repository at this point in the history
HexGL and SysApp demos are removed in this repo.
  • Loading branch information
zliang7 committed Jan 10, 2015
1 parent 3534c8b commit db37e15
Show file tree
Hide file tree
Showing 167 changed files with 393 additions and 3,192 deletions.
17 changes: 7 additions & 10 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
[submodule "src/hexgl/HexGL"]
path = src/hexgl/HexGL
url = [email protected]:hmin/HexGL.git
[submodule "src/third-party/swifty-json"]
path = src/third-party/swifty-json
[submodule "third-party/swift-json"]
path = third-party/swift-json
url = [email protected]:dankogai/swift-json.git
[submodule "src/cordova-plugin-demos/CordovaPluginFileDemo/CordovaPluginFileDemo/www/sample-file"]
path = src/cordova-plugin-demos/CordovaPluginFileDemo/CordovaPluginFileDemo/www/sample-file
url = [email protected]:Icenium/sample-file.git
[submodule "src/third-party/cordova-ios"]
path = src/third-party/cordova-ios
[submodule "third-party/cordova-ios"]
path = third-party/cordova-ios
url = [email protected]:apache/cordova-ios.git
[submodule "third-party/Icenium/sample-file"]
path = third-party/Icenium/sample-file
url = [email protected]:Icenium/sample-file.git
Original file line number Diff line number Diff line change
Expand Up @@ -7,54 +7,49 @@
objects = {

/* Begin PBXBuildFile section */
ABD577841A1B0DE700E47402 /* CrosswalkLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABD577831A1B0DE700E47402 /* CrosswalkLite.framework */; };
ABD577851A1B0DE700E47402 /* CrosswalkLite.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ABD577831A1B0DE700E47402 /* CrosswalkLite.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
ABD577871A1B0DED00E47402 /* SysAppsExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABD577861A1B0DED00E47402 /* SysAppsExtension.framework */; };
ABD577881A1B0DED00E47402 /* SysAppsExtension.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ABD577861A1B0DED00E47402 /* SysAppsExtension.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
ABE516AA1A00ADDE0025A92E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABE516A21A00ADDE0025A92E /* AppDelegate.swift */; };
ABE516AB1A00ADDE0025A92E /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = ABE516A41A00ADDE0025A92E /* LaunchScreen.xib */; };
ABE516AC1A00ADDE0025A92E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ABE516A61A00ADDE0025A92E /* Main.storyboard */; };
ABE516AD1A00ADDE0025A92E /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ABE516A81A00ADDE0025A92E /* Images.xcassets */; };
ABE516AE1A00ADDE0025A92E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABE516A91A00ADDE0025A92E /* ViewController.swift */; };
ABE516B01A00AE090025A92E /* www in Resources */ = {isa = PBXBuildFile; fileRef = ABE516AF1A00AE090025A92E /* www */; };
ABE516B41A00AEE60025A92E /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = ABE516B31A00AEE60025A92E /* Info.plist */; };
EE0E490B1A5C72DB002D95B8 /* XWalkView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE0E49091A5C72DB002D95B8 /* XWalkView.framework */; };
EE0E490C1A5C72DB002D95B8 /* XWalkView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EE0E49091A5C72DB002D95B8 /* XWalkView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
AB603BC419EA5CBF00DECF78 /* Embed Frameworks */ = {
EE0E490F1A5C72DB002D95B8 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
ABD577881A1B0DED00E47402 /* SysAppsExtension.framework in Embed Frameworks */,
ABD577851A1B0DE700E47402 /* CrosswalkLite.framework in Embed Frameworks */,
EE0E490C1A5C72DB002D95B8 /* XWalkView.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
AB603B9819EA58CB00DECF78 /* SysApps.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SysApps.app; sourceTree = BUILT_PRODUCTS_DIR; };
ABD577831A1B0DE700E47402 /* CrosswalkLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = CrosswalkLite.framework; path = "/Users/jonathan/projects/crosswalk-ios/xcode/Build/Products/Debug-iphoneos/CrosswalkLite.framework"; sourceTree = "<absolute>"; };
ABD577861A1B0DED00E47402 /* SysAppsExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = SysAppsExtension.framework; path = "/Users/jonathan/projects/crosswalk-ios/xcode/Build/Products/Debug-iphoneos/SysAppsExtension.framework"; sourceTree = "<absolute>"; };
ABE516A21A00ADDE0025A92E /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = ../src/sysapps/app/AppDelegate.swift; sourceTree = "<group>"; };
AB603B9819EA58CB00DECF78 /* AppShell.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AppShell.app; sourceTree = BUILT_PRODUCTS_DIR; };
ABD577831A1B0DE700E47402 /* XWalkView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = XWalkView.framework; path = "Build/Products/Debug-iphoneos/XWalkView.framework"; sourceTree = "<group>"; };
ABE516A21A00ADDE0025A92E /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = AppShell/AppDelegate.swift; sourceTree = SOURCE_ROOT; };
ABE516A51A00ADDE0025A92E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = LaunchScreen.xib; sourceTree = "<group>"; };
ABE516A71A00ADDE0025A92E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Main.storyboard; sourceTree = "<group>"; };
ABE516A81A00ADDE0025A92E /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ../src/sysapps/app/Images.xcassets; sourceTree = "<group>"; };
ABE516A91A00ADDE0025A92E /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewController.swift; path = ../src/sysapps/app/ViewController.swift; sourceTree = "<group>"; };
ABE516AF1A00AE090025A92E /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; name = www; path = ../src/sysapps/www; sourceTree = "<group>"; };
ABE516B31A00AEE60025A92E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../src/sysapps/app/Info.plist; sourceTree = SOURCE_ROOT; };
ABE516A81A00ADDE0025A92E /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = AppShell/Images.xcassets; sourceTree = SOURCE_ROOT; };
ABE516A91A00ADDE0025A92E /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewController.swift; path = AppShell/ViewController.swift; sourceTree = "<group>"; };
ABE516B31A00AEE60025A92E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = AppShell/Info.plist; sourceTree = SOURCE_ROOT; };
EE0E49091A5C72DB002D95B8 /* XWalkView.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XWalkView.framework; path = "Build/Products/Debug-iphonesimulator/XWalkView.framework"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
AB603B9519EA58CB00DECF78 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
ABD577871A1B0DED00E47402 /* SysAppsExtension.framework in Frameworks */,
ABD577841A1B0DE700E47402 /* CrosswalkLite.framework in Frameworks */,
EE0E490B1A5C72DB002D95B8 /* XWalkView.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -64,7 +59,7 @@
AB603B8F19EA58CB00DECF78 = {
isa = PBXGroup;
children = (
ABE516AF1A00AE090025A92E /* www */,
EE0E49091A5C72DB002D95B8 /* XWalkView.framework */,
ABE516A21A00ADDE0025A92E /* AppDelegate.swift */,
ABE516A41A00ADDE0025A92E /* LaunchScreen.xib */,
ABE516A61A00ADDE0025A92E /* Main.storyboard */,
Expand All @@ -79,7 +74,7 @@
AB603B9919EA58CB00DECF78 /* Products */ = {
isa = PBXGroup;
children = (
AB603B9819EA58CB00DECF78 /* SysApps.app */,
AB603B9819EA58CB00DECF78 /* AppShell.app */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -90,37 +85,35 @@
ABE516B31A00AEE60025A92E /* Info.plist */,
);
name = "Supporting Files";
path = "/Users/jonathan/projects/crosswalk-ios/xcode/SysApps";
sourceTree = "<absolute>";
sourceTree = "<group>";
};
AB603BC519EA5CD700DECF78 /* Frameworks */ = {
isa = PBXGroup;
children = (
ABD577861A1B0DED00E47402 /* SysAppsExtension.framework */,
ABD577831A1B0DE700E47402 /* CrosswalkLite.framework */,
ABD577831A1B0DE700E47402 /* XWalkView.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
AB603B9719EA58CB00DECF78 /* SysApps */ = {
AB603B9719EA58CB00DECF78 /* AppShell */ = {
isa = PBXNativeTarget;
buildConfigurationList = AB603BB719EA58CC00DECF78 /* Build configuration list for PBXNativeTarget "SysApps" */;
buildConfigurationList = AB603BB719EA58CC00DECF78 /* Build configuration list for PBXNativeTarget "AppShell" */;
buildPhases = (
AB603B9419EA58CB00DECF78 /* Sources */,
AB603B9519EA58CB00DECF78 /* Frameworks */,
AB603B9619EA58CB00DECF78 /* Resources */,
AB603BC419EA5CBF00DECF78 /* Embed Frameworks */,
EE0E490F1A5C72DB002D95B8 /* Embed Frameworks */,
);
buildRules = (
);
dependencies = (
);
name = SysApps;
productName = SysApps;
productReference = AB603B9819EA58CB00DECF78 /* SysApps.app */;
name = AppShell;
productName = AppShell;
productReference = AB603B9819EA58CB00DECF78 /* AppShell.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand All @@ -137,7 +130,7 @@
};
};
};
buildConfigurationList = AB603B9319EA58CB00DECF78 /* Build configuration list for PBXProject "SysApps" */;
buildConfigurationList = AB603B9319EA58CB00DECF78 /* Build configuration list for PBXProject "AppShell" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
Expand All @@ -150,7 +143,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
AB603B9719EA58CB00DECF78 /* SysApps */,
AB603B9719EA58CB00DECF78 /* AppShell */,
);
};
/* End PBXProject section */
Expand All @@ -164,7 +157,6 @@
ABE516AD1A00ADDE0025A92E /* Images.xcassets in Resources */,
ABE516AB1A00ADDE0025A92E /* LaunchScreen.xib in Resources */,
ABE516B41A00AEE60025A92E /* Info.plist in Resources */,
ABE516B01A00AE090025A92E /* www in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -189,7 +181,7 @@
ABE516A51A00ADDE0025A92E /* Base */,
);
name = LaunchScreen.xib;
path = ../src/sysapps/app/Base.lproj;
path = AppShell/Base.lproj;
sourceTree = "<group>";
};
ABE516A61A00ADDE0025A92E /* Main.storyboard */ = {
Expand All @@ -198,7 +190,7 @@
ABE516A71A00ADDE0025A92E /* Base */,
);
name = Main.storyboard;
path = ../src/sysapps/app/Base.lproj;
path = AppShell/Base.lproj;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
Expand Down Expand Up @@ -290,8 +282,9 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Build/Products/Debug-iphoneos",
"$(PROJECT_DIR)/Build/Products/Debug-iphonesimulator",
);
INFOPLIST_FILE = "$(SRCROOT)/../src/sysapps/app/Info.plist";
INFOPLIST_FILE = "AppShell/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand All @@ -304,8 +297,9 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Build/Products/Debug-iphoneos",
"$(PROJECT_DIR)/Build/Products/Debug-iphonesimulator",
);
INFOPLIST_FILE = "$(SRCROOT)/../src/sysapps/app/Info.plist";
INFOPLIST_FILE = "AppShell/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand All @@ -314,7 +308,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
AB603B9319EA58CB00DECF78 /* Build configuration list for PBXProject "SysApps" */ = {
AB603B9319EA58CB00DECF78 /* Build configuration list for PBXProject "AppShell" */ = {
isa = XCConfigurationList;
buildConfigurations = (
AB603BB519EA58CC00DECF78 /* Debug */,
Expand All @@ -323,7 +317,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
AB603BB719EA58CC00DECF78 /* Build configuration list for PBXNativeTarget "SysApps" */ = {
AB603BB719EA58CC00DECF78 /* Build configuration list for PBXNativeTarget "AppShell" */ = {
isa = XCConfigurationList;
buildConfigurations = (
AB603BB819EA58CC00DECF78 /* Debug */,
Expand Down

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

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14B17" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
Expand All @@ -11,13 +11,13 @@
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2014 Crosswalk. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2015 Intel Corporation. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<rect key="frame" x="20" y="439" width="441" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="HexGLApp" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AppShell" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
Expand Down
File renamed without changes.
43 changes: 43 additions & 0 deletions AppShell/AppShell/ViewController.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// Copyright (c) 2014 Intel Corporation. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import UIKit
import WebKit
import XWalkView

class ViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()

var start_url = "index.html"
var xwalk_extensions = ["Extension.load"]
if let plistPath = NSBundle.mainBundle().pathForResource("manifest", ofType: "plist") {
if let manifest = NSDictionary(contentsOfFile: plistPath) {
start_url = manifest["start_url"] as? String ?? start_url
xwalk_extensions = manifest["xwalk_extensions"] as? [String] ?? xwalk_extensions
}
}

let webview = WKWebView(frame: view.frame, configuration: WKWebViewConfiguration())
webview.scrollView.bounces = false
view.addSubview(webview)

for name in xwalk_extensions {
if let ext: AnyObject = XWalkExtensionFactory.createExtension(name) {
webview.loadExtension(ext, namespace: name)
}
}

if let path = NSBundle.mainBundle().pathForResource(
start_url.lastPathComponent.stringByDeletingPathExtension,
ofType: start_url.pathExtension,
inDirectory: "www/" + start_url.stringByDeletingLastPathComponent) {
webview.loadRequest(NSURLRequest(URL: NSURL.fileURLWithPath(path)!));
}
}

override func prefersStatusBarHidden() -> Bool {
return true
}
}
Loading

0 comments on commit db37e15

Please sign in to comment.