diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2016-04-07 16:39:12 -0400 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2016-04-16 13:20:12 -0700 |
commit | 96d3ccb0225ec784e6620b1a0f865bb9e466db41 (patch) | |
tree | 36ff35d301524405b3be4aee2b1502fc40230563 /platform/ios/benchmark | |
parent | 2fcfc2a939df12e7abf75a9e5659a82728b805f2 (diff) | |
download | qtlocation-mapboxgl-96d3ccb0225ec784e6620b1a0f865bb9e466db41.tar.gz |
[ios] Added Xcode project for iosapp, ios-bench; workspace for ios-tests
ios.xcodeproj is an ordinary Xcode project with ordinary Xcode targets for iosapp and ios-bench, all contained in an ordinary Xcode workspace that happens to also reference the gyp-generated platform.xcodeproj. The iosapp target links to and embeds Mapbox.framework, which is a product of the gyp-generated platform.xcodeproj. ios-tests.xcodeproj is also in the workspace, enabling simultaneous debugging of KIF tests, the SDK, and core code.
Moved storyboards into Base.lproj and image assets into an asset catalog. Removed iOS 6 assets from the iosapp asset catalog. Moved the original ios-bench application icon SVG into a non-project location.
Removed app/Settings.bundle, which is identical to framework/Settings.bundle.
Removed a broken reference to an unused header from the ios-tests project.
Diffstat (limited to 'platform/ios/benchmark')
28 files changed, 126 insertions, 7 deletions
diff --git a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000..73f0fa2497 --- /dev/null +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-Small@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-Small@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-1.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-2.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-Small.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-3.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-4.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "iTunesArtwork.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "iTunesArtwork@2x.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +}
\ No newline at end of file diff --git a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-1.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-1.png Binary files differnew file mode 100644 index 0000000000..8133332fe2 --- /dev/null +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-1.png diff --git a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-2.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-2.png Binary files differnew file mode 100644 index 0000000000..9b7db0607a --- /dev/null +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-2.png diff --git a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-3.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-3.png Binary files differnew file mode 100644 index 0000000000..8f61a8ec03 --- /dev/null +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-3.png diff --git a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-4.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-4.png Binary files differnew file mode 100644 index 0000000000..783467e2ab --- /dev/null +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-4.png diff --git a/platform/ios/benchmark/img/Icon-40.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40.png Binary files differindex 2425133189..2425133189 100644 --- a/platform/ios/benchmark/img/Icon-40.png +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40.png diff --git a/platform/ios/benchmark/img/Icon-40@2x.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png Binary files differindex b827b1e5a1..b827b1e5a1 100644 --- a/platform/ios/benchmark/img/Icon-40@2x.png +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png diff --git a/platform/ios/benchmark/img/Icon-40@3x.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png Binary files differindex 89c7119ac6..89c7119ac6 100644 --- a/platform/ios/benchmark/img/Icon-40@3x.png +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png diff --git a/platform/ios/benchmark/img/Icon-76.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76.png Binary files differindex 0ed2a26730..0ed2a26730 100644 --- a/platform/ios/benchmark/img/Icon-76.png +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76.png diff --git a/platform/ios/benchmark/img/Icon-76@2x.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png Binary files differindex 311a1658a8..311a1658a8 100644 --- a/platform/ios/benchmark/img/Icon-76@2x.png +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png diff --git a/platform/ios/benchmark/img/Icon-Small.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small.png Binary files differindex 630d7c04c6..630d7c04c6 100644 --- a/platform/ios/benchmark/img/Icon-Small.png +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small.png diff --git a/platform/ios/benchmark/img/Icon-Small@2x.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png Binary files differindex c0ee89211a..c0ee89211a 100644 --- a/platform/ios/benchmark/img/Icon-Small@2x.png +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png diff --git a/platform/ios/benchmark/img/Icon-Small@3x.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png Binary files differindex 436a8b404c..436a8b404c 100644 --- a/platform/ios/benchmark/img/Icon-Small@3x.png +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png diff --git a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon.png Binary files differnew file mode 100644 index 0000000000..2c9ecb48cb --- /dev/null +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon.png diff --git a/platform/ios/benchmark/img/iTunesArtwork.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork.png Binary files differindex f87c8734b5..f87c8734b5 100644 --- a/platform/ios/benchmark/img/iTunesArtwork.png +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork.png diff --git a/platform/ios/benchmark/img/iTunesArtwork@2x.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png Binary files differindex 8d456a126f..8d456a126f 100644 --- a/platform/ios/benchmark/img/iTunesArtwork@2x.png +++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png diff --git a/platform/ios/benchmark/Base.lproj/LaunchScreen.storyboard b/platform/ios/benchmark/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000000..323bd43177 --- /dev/null +++ b/platform/ios/benchmark/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM"> + <dependencies> + <deployment identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> + </dependencies> + <scenes> + <!--View Controller--> + <scene sceneID="EHf-IW-A2E"> + <objects> + <viewController id="01J-lp-oVM" sceneMemberID="viewController"> + <layoutGuides> + <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/> + <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/> + </layoutGuides> + <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3"> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> + </view> + </viewController> + <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/> + </objects> + <point key="canvasLocation" x="53" y="375"/> + </scene> + </scenes> +</document> diff --git a/platform/ios/benchmark/app-info.plist b/platform/ios/benchmark/Info.plist index 9d0aad09e1..22ea46152b 100644 --- a/platform/ios/benchmark/app-info.plist +++ b/platform/ios/benchmark/Info.plist @@ -29,7 +29,7 @@ <key>UIApplicationExitsOnSuspend</key> <true/> <key>UILaunchStoryboardName</key> - <string>Default</string> + <string>LaunchScreen</string> <key>UIRequiredDeviceCapabilities</key> <array> <string>armv7</string> diff --git a/platform/ios/benchmark/img/Icon-60.png b/platform/ios/benchmark/img/Icon-60.png Binary files differdeleted file mode 100644 index 409fad814a..0000000000 --- a/platform/ios/benchmark/img/Icon-60.png +++ /dev/null diff --git a/platform/ios/benchmark/img/Icon-60@2x.png b/platform/ios/benchmark/img/Icon-60@2x.png Binary files differdeleted file mode 100644 index 89c7119ac6..0000000000 --- a/platform/ios/benchmark/img/Icon-60@2x.png +++ /dev/null diff --git a/platform/ios/benchmark/img/Icon-60@3x.png b/platform/ios/benchmark/img/Icon-60@3x.png Binary files differdeleted file mode 100644 index 158bcfe27e..0000000000 --- a/platform/ios/benchmark/img/Icon-60@3x.png +++ /dev/null diff --git a/platform/ios/benchmark/img/Icon-72.png b/platform/ios/benchmark/img/Icon-72.png Binary files differdeleted file mode 100644 index eecd90b5eb..0000000000 --- a/platform/ios/benchmark/img/Icon-72.png +++ /dev/null diff --git a/platform/ios/benchmark/img/Icon-72@2x.png b/platform/ios/benchmark/img/Icon-72@2x.png Binary files differdeleted file mode 100644 index ca28d1fa05..0000000000 --- a/platform/ios/benchmark/img/Icon-72@2x.png +++ /dev/null diff --git a/platform/ios/benchmark/img/Icon-Small-50.png b/platform/ios/benchmark/img/Icon-Small-50.png Binary files differdeleted file mode 100644 index a071034743..0000000000 --- a/platform/ios/benchmark/img/Icon-Small-50.png +++ /dev/null diff --git a/platform/ios/benchmark/img/Icon-Small-50@2x.png b/platform/ios/benchmark/img/Icon-Small-50@2x.png Binary files differdeleted file mode 100644 index 5d7c76d5e2..0000000000 --- a/platform/ios/benchmark/img/Icon-Small-50@2x.png +++ /dev/null diff --git a/platform/ios/benchmark/img/Icon.png b/platform/ios/benchmark/img/Icon.png Binary files differdeleted file mode 100644 index 7af0c68a38..0000000000 --- a/platform/ios/benchmark/img/Icon.png +++ /dev/null diff --git a/platform/ios/benchmark/img/Icon.svg b/platform/ios/benchmark/img/Icon.svg deleted file mode 100644 index 28df6f600d..0000000000 --- a/platform/ios/benchmark/img/Icon.svg +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg width="100%" height="100%" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-miterlimit:1.41421;"> - <image x="0" y="0" width="15px" height="15px" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAQ0lEQVQokcXP2wkAIAxD0Sidvqu5jhTxVXdIPsz/4ZLi3hLkKgsBwOjsX3zBcztKeSvllQKeSlnCQ8GhfA5cHvfk8QNc8hvDN5gIKwAAAABJRU5ErkJggg=="/> - <path id="path7143" d="M9.48355,2.89095C8.18827,3.22425 6.67888,4.56018 5.90484,6.38831L4.93731,6.63727C4.23814,6.81719 3.97174,7.44212 3.83781,8.06502L3.65856,8.89868L5.40366,8.44963L7.68238,9.79563L8.13143,11.5407L8.77503,10.9814C9.25592,10.5634 9.67465,10.0284 9.49474,9.32928L9.24577,8.36174C10.4732,6.80143 10.9147,4.8347 10.5814,3.53941L10.3567,2.66627L9.48355,2.89095ZM8.40657,5.10044C8.73798,5.01516 9.08086,5.2177 9.16614,5.54911C9.25142,5.88052 9.04888,6.2234 8.71747,6.30868C8.38606,6.39396 8.04318,6.19142 7.9579,5.86001C7.87262,5.5286 8.07516,5.18572 8.40657,5.10044L8.40657,5.10044ZM5.41251,9.7356L5.18818,10.1154C4.86414,10.664 4.97269,11.7811 4.97269,11.7811C4.97269,11.7811 5.9677,11.3976 6.32753,10.7884L6.55187,10.4086L5.41251,9.7356Z" style="fill:white;fill-rule:nonzero;stroke-width:0.62px;stroke:white;"/> -</svg> diff --git a/platform/ios/benchmark/img/Icon@2x.png b/platform/ios/benchmark/img/Icon@2x.png Binary files differdeleted file mode 100644 index ff5ea0c073..0000000000 --- a/platform/ios/benchmark/img/Icon@2x.png +++ /dev/null |