-
Notifications
You must be signed in to change notification settings - Fork 460
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into tint-support
# Conflicts: # Demo/NUIDemo.xcworkspace/xcshareddata/NUIDemo.xccheckout # NUI/Core/Renderers/NUINavigationBarRenderer.m # NUI/Core/Renderers/NUITabBarRenderer.m # NUI/Core/Renderers/NUITextViewRenderer.m # README.md
- Loading branch information
Showing
370 changed files
with
2,994 additions
and
13,909 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,26 @@ | ||
| .DS_Store | ||
| # OS X | ||
| .DS_Store | ||
|
|
||
| # Xcode | ||
| build/ | ||
| *.pbxuser | ||
| !default.pbxuser | ||
| *.mode1v3 | ||
| !default.mode1v3 | ||
| *.mode2v3 | ||
| !default.mode2v3 | ||
| *.perspectivev3 | ||
| !default.perspectivev3 | ||
| xcuserdata | ||
| *.xccheckout | ||
| profile | ||
| *.moved-aside | ||
| DerivedData | ||
| *.hmap | ||
| *.ipa | ||
|
|
||
| # Bundler | ||
| .bundle | ||
|
|
||
| Carthage | ||
| Pods/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,41 @@ | ||
| language: objective-c | ||
| matrix: | ||
| include: | ||
| - osx_image: xcode6.1 | ||
| env: DEVICE="iPhone Retina (4-inch)" VERSION=7.0.3 | ||
| - osx_image: xcode6.1 | ||
| env: DEVICE="iPhone Retina (4-inch)" VERSION=7.1 | ||
| - osx_image: xcode6.1 | ||
| env: DEVICE="iPhone Retina (4-inch)" VERSION=8.1 | ||
| - osx_image: xcode7 | ||
| env: DEVICE="iPhone Retina (4-inch)" VERSION=8.1 | ||
| - osx_image: xcode7 | ||
| env: DEVICE="iPhone Retina (4-inch)" VERSION=8.2 | ||
| - osx_image: xcode7 | ||
| env: DEVICE="iPhone Retina (4-inch)" VERSION=8.3 | ||
| - osx_image: xcode7 | ||
| env: DEVICE="iPhone Retina (4-inch)" VERSION=8.4 | ||
| - osx_image: xcode7 | ||
| env: DEVICE="iPhone Retina (4-inch)" VERSION=9.0 | ||
| - osx_image: xcode7.1 | ||
| env: DEVICE="iPhone 4s" VERSION=9.1 | ||
| - osx_image: xcode7.1 | ||
| env: DEVICE="iPhone 5s" VERSION=9.1 | ||
| - osx_image: xcode7.1 | ||
| env: DEVICE="iPhone 6s" VERSION=9.1 | ||
| - osx_image: xcode7.1 | ||
| env: DEVICE="iPhone 6s Plus" VERSION=9.1 | ||
| - osx_image: xcode7.1 | ||
| env: DEVICE="iPad 2" VERSION=9.1 | ||
| - osx_image: xcode7.1 | ||
| env: DEVICE="iPad Retina" VERSION=9.1 | ||
| - osx_image: xcode7.1 | ||
| env: DEVICE="iPad Air 2" VERSION=9.1 | ||
| - osx_image: xcode7.1 | ||
| env: DEVICE="iPad Pro" VERSION=9.1 | ||
| before_install: | ||
| - export LANG=en_US.UTF-8 | ||
| - gem install xcpretty --no-rdoc --no-ri --no-document --quiet | ||
| - cd Demo && pod install | ||
| script: "xcodebuild -workspace NUIDemo.xcworkspace -scheme NUITests -destination 'platform=iOS Simulator,name=iPhone Retina (4-inch),OS=7.1' clean test | xcpretty -c && exit ${PIPESTATUS[0]}" | ||
| before_script: | ||
| - bundle exec pod install --project-directory=Demo | ||
| script: | ||
| - xctool -sdk iphonesimulator -workspace Demo/NUIDemo.xcworkspace -scheme NUITests -destination "platform=iOS Simulator,name=$DEVICE,OS=$VERSION" clean test |
Large diffs are not rendered by default.
Oops, something went wrong.
103 changes: 103 additions & 0 deletions
103
Demo/NUIDemo/Images.xcassets/AppIcon.appiconset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "idiom" : "iphone", | ||
| "size" : "29x29", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "size" : "29x29", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "size" : "29x29", | ||
| "scale" : "3x" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "size" : "40x40", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "size" : "40x40", | ||
| "scale" : "3x" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "size" : "57x57", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "size" : "57x57", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "size" : "60x60", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "iphone", | ||
| "size" : "60x60", | ||
| "scale" : "3x" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "size" : "29x29", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "size" : "29x29", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "size" : "40x40", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "size" : "40x40", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "size" : "50x50", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "size" : "50x50", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "size" : "72x72", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "size" : "72x72", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "size" : "76x76", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "ipad", | ||
| "size" : "76x76", | ||
| "scale" : "2x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "version" : 1, | ||
| "author" : "xcode" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "info" : { | ||
| "version" : 1, | ||
| "author" : "xcode" | ||
| } | ||
| } |
158 changes: 158 additions & 0 deletions
158
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "extent" : "full-screen", | ||
| "idiom" : "iphone", | ||
| "subtype" : "736h", | ||
| "filename" : "[email protected]", | ||
| "minimum-system-version" : "8.0", | ||
| "orientation" : "portrait", | ||
| "scale" : "3x" | ||
| }, | ||
| { | ||
| "extent" : "full-screen", | ||
| "idiom" : "iphone", | ||
| "subtype" : "736h", | ||
| "filename" : "[email protected]", | ||
| "minimum-system-version" : "8.0", | ||
| "orientation" : "landscape", | ||
| "scale" : "3x" | ||
| }, | ||
| { | ||
| "extent" : "full-screen", | ||
| "idiom" : "iphone", | ||
| "subtype" : "667h", | ||
| "filename" : "[email protected]", | ||
| "minimum-system-version" : "8.0", | ||
| "orientation" : "portrait", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "orientation" : "portrait", | ||
| "idiom" : "iphone", | ||
| "filename" : "[email protected]", | ||
| "extent" : "full-screen", | ||
| "minimum-system-version" : "7.0", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "extent" : "full-screen", | ||
| "idiom" : "iphone", | ||
| "subtype" : "retina4", | ||
| "filename" : "[email protected]", | ||
| "minimum-system-version" : "7.0", | ||
| "orientation" : "portrait", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "orientation" : "portrait", | ||
| "idiom" : "ipad", | ||
| "filename" : "Default-Portrait-1.png", | ||
| "extent" : "full-screen", | ||
| "minimum-system-version" : "7.0", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "orientation" : "landscape", | ||
| "idiom" : "ipad", | ||
| "filename" : "Default-Landscape.png", | ||
| "extent" : "full-screen", | ||
| "minimum-system-version" : "7.0", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "orientation" : "portrait", | ||
| "idiom" : "ipad", | ||
| "filename" : "[email protected]", | ||
| "extent" : "full-screen", | ||
| "minimum-system-version" : "7.0", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "orientation" : "landscape", | ||
| "idiom" : "ipad", | ||
| "filename" : "[email protected]", | ||
| "extent" : "full-screen", | ||
| "minimum-system-version" : "7.0", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "orientation" : "portrait", | ||
| "idiom" : "iphone", | ||
| "filename" : "Default.png", | ||
| "extent" : "full-screen", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "orientation" : "portrait", | ||
| "idiom" : "iphone", | ||
| "filename" : "[email protected]", | ||
| "extent" : "full-screen", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "orientation" : "portrait", | ||
| "idiom" : "iphone", | ||
| "filename" : "[email protected]", | ||
| "extent" : "full-screen", | ||
| "subtype" : "retina4", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "orientation" : "portrait", | ||
| "idiom" : "ipad", | ||
| "extent" : "to-status-bar", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "orientation" : "portrait", | ||
| "idiom" : "ipad", | ||
| "filename" : "Default-Portrait.png", | ||
| "extent" : "full-screen", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "orientation" : "landscape", | ||
| "idiom" : "ipad", | ||
| "extent" : "to-status-bar", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "orientation" : "landscape", | ||
| "idiom" : "ipad", | ||
| "filename" : "Default-Landscape-1.png", | ||
| "extent" : "full-screen", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "orientation" : "portrait", | ||
| "idiom" : "ipad", | ||
| "extent" : "to-status-bar", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "orientation" : "portrait", | ||
| "idiom" : "ipad", | ||
| "filename" : "[email protected]", | ||
| "extent" : "full-screen", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "orientation" : "landscape", | ||
| "idiom" : "ipad", | ||
| "extent" : "to-status-bar", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "orientation" : "landscape", | ||
| "idiom" : "ipad", | ||
| "filename" : "[email protected]", | ||
| "extent" : "full-screen", | ||
| "scale" : "2x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "version" : 1, | ||
| "author" : "xcode" | ||
| } | ||
| } |
Binary file added
BIN
+417 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+417 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+451 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+423 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/Default-Landscape-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+661 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+423 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/Default-Landscape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+710 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+710 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+423 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/Default-Portrait-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+664 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+423 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/Default-Portrait.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+710 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+710 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+403 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+403 Bytes
Demo/NUIDemo/Images.xcassets/LaunchImage.launchimage/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.