diff --git a/.gitignore b/.gitignore index 279bb0b08..dbbd6a8a3 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,8 @@ tscommand*.tmp.txt # Other *.js +# https://github.com/NativeScript/nativescript-dev-webpack/issues/932 +!tns-core-modules/xml/xml.js !tests/hooks/**/*.* !gruntfile.js !js-libs/**/*.* diff --git a/.vscode/launch.json b/.vscode/launch.json index cec715adc..38041cb91 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,4 +1,7 @@ { + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ { @@ -6,7 +9,12 @@ "request": "launch", "name": "Unit Tests", "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha", - "args": [ "--timeout", "999999", "--opts", "unit-tests/mocha.opts" ], + "args": [ + "--timeout", + "999999", + "--opts", + "unit-tests/mocha.opts" + ], "internalConsoleOptions": "openOnSessionStart", "preLaunchTask": "tsc-unit-tests" }, @@ -19,6 +27,20 @@ "sourceMaps": true, "watch": true }, + // { + // "name": "Test on iOS", + // "type": "nativescript", + // "request": "launch", + // "platform": "ios", + // "appRoot": "${workspaceRoot}", + // "sourceMaps": true, + // "watch": false, + // "stopOnEntry": true, + // "launchTests": true, + // "tnsArgs": [ + // "--justlaunch" + // ] + // }, { "name": "Attach on iOS", "type": "nativescript", @@ -37,6 +59,30 @@ "sourceMaps": true, "watch": true }, + { + "name": "Debug tests on Android", + "type": "nativescript", + "request": "launch", + "platform": "android", + "appRoot": "${workspaceRoot}/tests", + "sourceMaps": true, + "stopOnEntry": true, + "watch": true, + }, + // { + // "name": "Test on Android", + // "type": "nativescript", + // "request": "launch", + // "platform": "android", + // "appRoot": "${workspaceRoot}", + // "sourceMaps": true, + // "watch": false, + // "stopOnEntry": true, + // "launchTests": true, + // "tnsArgs": [ + // "--justlaunch" + // ] + // }, { "name": "Attach on Android", "type": "nativescript", @@ -47,4 +93,4 @@ "watch": false } ] -} \ No newline at end of file +} diff --git a/CHANGELOG.md b/CHANGELOG.md index aaa838386..922edf6ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [5.4.3](https://github.com/NativeScript/NativeScript/compare/5.4.2...5.4.3) (2019-06-21) + + +### Bug Fixes + +* clear the `resolvedPage` when entry is being cleared, change the passed `View` to be a weak reference ([#7327](https://github.com/NativeScript/NativeScript/issues/7327)) ([dfe7621](https://github.com/NativeScript/NativeScript/commit/dfe7621)) + + + ## [5.4.2](https://github.com/NativeScript/NativeScript/compare/5.4.1...5.4.2) (2019-06-06) diff --git a/DevelopmentWorkflow.md b/DevelopmentWorkflow.md index 9ae5adf61..b54e0e8da 100644 --- a/DevelopmentWorkflow.md +++ b/DevelopmentWorkflow.md @@ -42,12 +42,7 @@ Install devDependencies: npm install ``` -Run `setup` script. This will [`npm link`](https://docs.npmjs.com/cli/link) the `tns-core-modules` and `tns-core-modules-declarations` dependencies inside the `tests` and `apps` projects. - -```bash -npm run setup -``` - + ## Running Unit Tests -The test app is an ordinary NativeScript app that logs the test results as it go. -After the [initial setup](#initial-setup) you can run the tests with: - -```bash -# Make sure TypeScript is transpiled -tsc - -# Run the tests app -tns run ios --path tests -tns run android --path tests +``` +cd ./tests +tns run android| ios ``` ## Running the Test App diff --git a/WritingUnitTests.md b/WritingUnitTests.md index a6945bc1c..38fa35ca4 100644 --- a/WritingUnitTests.md +++ b/WritingUnitTests.md @@ -59,7 +59,7 @@ A test will fail if assert is not satisfied or if an error is thrown during exec There is a large set of asserting functions available in the [`tests/app/TKUnit.ts`](tests/app/TKUnit.ts) module. We recommend using those in your tests. ```typescript -import * as TKUnit from "../TKUnit"; +import * as TKUnit from "../tk-unit"; export function testSomethingWorksFast() { let arr = [1, 2, 3]; diff --git a/apps/app/App_Resources/Android/app.gradle b/apps/app/App_Resources/Android/app.gradle index 3a25fb4f7..bb4842141 100644 --- a/apps/app/App_Resources/Android/app.gradle +++ b/apps/app/App_Resources/Android/app.gradle @@ -2,16 +2,19 @@ // Uncomment to add recyclerview-v7 dependency //dependencies { -// compile 'com.android.support:recyclerview-v7:+' +// implementation 'com.android.support:recyclerview-v7:+' //} -android { - defaultConfig { +// If you want to add something to be applied before applying plugins' include.gradle files +// e.g. project.ext.googlePlayServicesVersion = "15.0.1" +// create a file named before-plugins.gradle in the current directory and place it there + +android { + defaultConfig { + minSdkVersion 17 generatedDensities = [] - applicationId = "org.nativescript.apps" - } - aaptOptions { - additionalParameters "--no-version-vectors" - } -} -project.ext.useAndroidX=true \ No newline at end of file + } + aaptOptions { + additionalParameters "--no-version-vectors" + } +} diff --git a/apps/app/App_Resources/Android/drawable-ldpi/icon.png b/apps/app/App_Resources/Android/drawable-ldpi/icon.png deleted file mode 100644 index ddfc17a71..000000000 Binary files a/apps/app/App_Resources/Android/drawable-ldpi/icon.png and /dev/null differ diff --git a/apps/app/App_Resources/Android/drawable-mdpi/icon.png b/apps/app/App_Resources/Android/drawable-mdpi/icon.png deleted file mode 100644 index 486e41091..000000000 Binary files a/apps/app/App_Resources/Android/drawable-mdpi/icon.png and /dev/null differ diff --git a/apps/app/App_Resources/Android/src/main/AndroidManifest.xml b/apps/app/App_Resources/Android/src/main/AndroidManifest.xml new file mode 100644 index 000000000..1bd6826c3 --- /dev/null +++ b/apps/app/App_Resources/Android/src/main/AndroidManifest.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png b/apps/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png new file mode 100644 index 000000000..eb381c258 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png b/apps/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png new file mode 100644 index 000000000..9cde84cd5 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png b/apps/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png new file mode 100644 index 000000000..5218f4c90 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png b/apps/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png new file mode 100644 index 000000000..748b2adf5 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png b/apps/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png new file mode 100644 index 000000000..4d6a674b3 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png b/apps/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png new file mode 100644 index 000000000..b9e102a76 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png differ diff --git a/apps/app/App_Resources/Android/drawable-mdpi/add_to_fav.png b/apps/app/App_Resources/Android/src/main/res/drawable-mdpi/add_to_fav.png similarity index 100% rename from apps/app/App_Resources/Android/drawable-mdpi/add_to_fav.png rename to apps/app/App_Resources/Android/src/main/res/drawable-mdpi/add_to_fav.png diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png b/apps/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png new file mode 100644 index 000000000..efeaf2907 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png b/apps/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png new file mode 100644 index 000000000..92ccc85a6 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png b/apps/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png new file mode 100644 index 000000000..626338766 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png differ diff --git a/apps/app/App_Resources/Android/drawable-nodpi/i18x32.png b/apps/app/App_Resources/Android/src/main/res/drawable-nodpi/i18x32.png similarity index 100% rename from apps/app/App_Resources/Android/drawable-nodpi/i18x32.png rename to apps/app/App_Resources/Android/src/main/res/drawable-nodpi/i18x32.png diff --git a/apps/app/App_Resources/Android/drawable-nodpi/i32x18.png b/apps/app/App_Resources/Android/src/main/res/drawable-nodpi/i32x18.png similarity index 100% rename from apps/app/App_Resources/Android/drawable-nodpi/i32x18.png rename to apps/app/App_Resources/Android/src/main/res/drawable-nodpi/i32x18.png diff --git a/apps/app/App_Resources/Android/drawable-nodpi/i32x32.png b/apps/app/App_Resources/Android/src/main/res/drawable-nodpi/i32x32.png similarity index 100% rename from apps/app/App_Resources/Android/drawable-nodpi/i32x32.png rename to apps/app/App_Resources/Android/src/main/res/drawable-nodpi/i32x32.png diff --git a/apps/app/App_Resources/Android/drawable-hdpi/icon.png b/apps/app/App_Resources/Android/src/main/res/drawable-nodpi/icon.png similarity index 100% rename from apps/app/App_Resources/Android/drawable-hdpi/icon.png rename to apps/app/App_Resources/Android/src/main/res/drawable-nodpi/icon.png diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml b/apps/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml new file mode 100644 index 000000000..ada77f92c --- /dev/null +++ b/apps/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/apps/app/App_Resources/Android/drawable-nodpi/splashscreen.9.png b/apps/app/App_Resources/Android/src/main/res/drawable-nodpi/splashscreen.9.png similarity index 100% rename from apps/app/App_Resources/Android/drawable-nodpi/splashscreen.9.png rename to apps/app/App_Resources/Android/src/main/res/drawable-nodpi/splashscreen.9.png diff --git a/apps/app/App_Resources/Android/drawable-nodpi/testlogo.jpg b/apps/app/App_Resources/Android/src/main/res/drawable-nodpi/testlogo.jpg similarity index 100% rename from apps/app/App_Resources/Android/drawable-nodpi/testlogo.jpg rename to apps/app/App_Resources/Android/src/main/res/drawable-nodpi/testlogo.jpg diff --git a/apps/app/App_Resources/Android/drawable-nodpi/tile.png b/apps/app/App_Resources/Android/src/main/res/drawable-nodpi/tile.png similarity index 100% rename from apps/app/App_Resources/Android/drawable-nodpi/tile.png rename to apps/app/App_Resources/Android/src/main/res/drawable-nodpi/tile.png diff --git a/apps/app/App_Resources/Android/drawable-nodpi/up.png b/apps/app/App_Resources/Android/src/main/res/drawable-nodpi/up.png similarity index 100% rename from apps/app/App_Resources/Android/drawable-nodpi/up.png rename to apps/app/App_Resources/Android/src/main/res/drawable-nodpi/up.png diff --git a/apps/app/App_Resources/Android/drawable-nodpi/upccw.png b/apps/app/App_Resources/Android/src/main/res/drawable-nodpi/upccw.png similarity index 100% rename from apps/app/App_Resources/Android/drawable-nodpi/upccw.png rename to apps/app/App_Resources/Android/src/main/res/drawable-nodpi/upccw.png diff --git a/apps/app/App_Resources/Android/drawable-nodpi/upcw.png b/apps/app/App_Resources/Android/src/main/res/drawable-nodpi/upcw.png similarity index 100% rename from apps/app/App_Resources/Android/drawable-nodpi/upcw.png rename to apps/app/App_Resources/Android/src/main/res/drawable-nodpi/upcw.png diff --git a/apps/app/App_Resources/Android/drawable-nodpi/upflip.png b/apps/app/App_Resources/Android/src/main/res/drawable-nodpi/upflip.png similarity index 100% rename from apps/app/App_Resources/Android/drawable-nodpi/upflip.png rename to apps/app/App_Resources/Android/src/main/res/drawable-nodpi/upflip.png diff --git a/apps/app/App_Resources/Android/drawable-xhdpi/add_to_fav.png b/apps/app/App_Resources/Android/src/main/res/drawable-xhdpi/add_to_fav.png similarity index 100% rename from apps/app/App_Resources/Android/drawable-xhdpi/add_to_fav.png rename to apps/app/App_Resources/Android/src/main/res/drawable-xhdpi/add_to_fav.png diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png b/apps/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png new file mode 100644 index 000000000..612bbd072 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png b/apps/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png new file mode 100644 index 000000000..8bcde6277 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png b/apps/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png new file mode 100644 index 000000000..ad8ee2f4b Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png differ diff --git a/apps/app/App_Resources/Android/drawable-xxhdpi/add_to_fav.png b/apps/app/App_Resources/Android/src/main/res/drawable-xxhdpi/add_to_fav.png similarity index 100% rename from apps/app/App_Resources/Android/drawable-xxhdpi/add_to_fav.png rename to apps/app/App_Resources/Android/src/main/res/drawable-xxhdpi/add_to_fav.png diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png b/apps/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png new file mode 100644 index 000000000..0fa88e235 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png b/apps/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png new file mode 100644 index 000000000..9d81c85dc Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png b/apps/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png new file mode 100644 index 000000000..668327832 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png b/apps/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png new file mode 100644 index 000000000..c650f6438 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png b/apps/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png new file mode 100644 index 000000000..9a34d0d43 Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png b/apps/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png new file mode 100644 index 000000000..fa6331c8d Binary files /dev/null and b/apps/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png differ diff --git a/apps/app/App_Resources/Android/src/main/res/values-v21/colors.xml b/apps/app/App_Resources/Android/src/main/res/values-v21/colors.xml new file mode 100644 index 000000000..a64641a9d --- /dev/null +++ b/apps/app/App_Resources/Android/src/main/res/values-v21/colors.xml @@ -0,0 +1,4 @@ + + + #3d5afe + \ No newline at end of file diff --git a/apps/app/App_Resources/Android/src/main/res/values-v21/styles.xml b/apps/app/App_Resources/Android/src/main/res/values-v21/styles.xml new file mode 100644 index 000000000..dac8727c8 --- /dev/null +++ b/apps/app/App_Resources/Android/src/main/res/values-v21/styles.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/app/App_Resources/Android/src/main/res/values/colors.xml b/apps/app/App_Resources/Android/src/main/res/values/colors.xml new file mode 100644 index 000000000..74ad8829c --- /dev/null +++ b/apps/app/App_Resources/Android/src/main/res/values/colors.xml @@ -0,0 +1,7 @@ + + + #F5F5F5 + #757575 + #33B5E5 + #272734 + \ No newline at end of file diff --git a/apps/app/App_Resources/Android/src/main/res/values/styles.xml b/apps/app/App_Resources/Android/src/main/res/values/styles.xml new file mode 100644 index 000000000..c793e6d4c --- /dev/null +++ b/apps/app/App_Resources/Android/src/main/res/values/styles.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json index 5f5359340..1a8b0e645 100644 --- a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "icon-20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "icon-20@3x.png", + "scale" : "3x" + }, { "size" : "29x29", "idiom" : "iphone", @@ -30,18 +42,6 @@ "filename" : "icon-40@3x.png", "scale" : "3x" }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "icon-57.png", - "scale" : "1x" - }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "icon-57@2x.png", - "scale" : "2x" - }, { "size" : "60x60", "idiom" : "iphone", @@ -54,6 +54,18 @@ "filename" : "icon-60@3x.png", "scale" : "3x" }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "icon-20.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "icon-20@2x.png", + "scale" : "2x" + }, { "size" : "29x29", "idiom" : "ipad", @@ -78,30 +90,6 @@ "filename" : "icon-40@2x.png", "scale" : "2x" }, - { - "size" : "50x50", - "idiom" : "ipad", - "filename" : "icon-50.png", - "scale" : "1x" - }, - { - "size" : "50x50", - "idiom" : "ipad", - "filename" : "icon-50@2x.png", - "scale" : "2x" - }, - { - "size" : "72x72", - "idiom" : "ipad", - "filename" : "icon-72.png", - "scale" : "1x" - }, - { - "size" : "72x72", - "idiom" : "ipad", - "filename" : "icon-72@2x.png", - "scale" : "2x" - }, { "size" : "76x76", "idiom" : "ipad", @@ -119,6 +107,12 @@ "idiom" : "ipad", "filename" : "icon-83.5@2x.png", "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "icon-1024.png", + "scale" : "1x" } ], "info" : { diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png new file mode 100644 index 000000000..a1d7eb479 Binary files /dev/null and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20.png new file mode 100644 index 000000000..5797bdef4 Binary files /dev/null and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png new file mode 100644 index 000000000..a0bc5691b Binary files /dev/null and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png new file mode 100644 index 000000000..851ac65fb Binary files /dev/null and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png index 9e15af09d..bb9b9e86d 100644 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png index 7b9e55537..ec609dcf3 100644 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png index 76f61ec1f..a97180800 100644 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png index 15b06db11..214800ee6 100644 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png index 585065f94..8554b88a8 100644 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png index a450c421d..a22626bae 100644 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50.png deleted file mode 100644 index 4a62478f9..000000000 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50.png and /dev/null differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50@2x.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50@2x.png deleted file mode 100644 index 01ff7c16c..000000000 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50@2x.png and /dev/null differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57.png deleted file mode 100644 index beea81999..000000000 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57.png and /dev/null differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57@2x.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57@2x.png deleted file mode 100644 index c3dc7b035..000000000 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57@2x.png and /dev/null differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png index 457b6d94c..a22626bae 100644 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png index fa5a6ac86..492c9c8e8 100644 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72.png deleted file mode 100644 index 556bdd688..000000000 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72.png and /dev/null differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png deleted file mode 100644 index 4f69cb25b..000000000 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png and /dev/null differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png index 94abcf70d..9208113cf 100644 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png index 2e71dd3a0..24415e5a3 100644 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png index 4abc9ec50..b3ef1bf0c 100644 Binary files a/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png and b/apps/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json index 11bfcf55c..bb3b4a5f6 100644 --- a/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json +++ b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json @@ -1,5 +1,41 @@ { "images" : [ + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "2688h", + "filename" : "Default-Portrait-XS-Max.png", + "minimum-system-version" : "12.0", + "orientation" : "portrait", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "2688h", + "filename" : "Default-Landscape-XS-Max.png", + "minimum-system-version" : "12.0", + "orientation" : "landscape", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "1792h", + "filename" : "Default-Portrait-XR.png", + "minimum-system-version" : "12.0", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "1792h", + "filename" : "Default-Landscape-XR.png", + "minimum-system-version" : "12.0", + "orientation" : "landscape", + "scale" : "2x" + }, { "extent" : "full-screen", "idiom" : "iphone", @@ -10,12 +46,12 @@ "scale" : "3x" }, { - "orientation" : "landscape", - "idiom" : "iphone", "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "2436h", "filename" : "Default-Landscape-X.png", "minimum-system-version" : "11.0", - "subtype" : "2436h", + "orientation" : "landscape", "scale" : "3x" }, { diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-XR.png b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-XR.png new file mode 100644 index 000000000..686fda12d Binary files /dev/null and b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-XR.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-XS-Max.png b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-XS-Max.png new file mode 100644 index 000000000..415e9c861 Binary files /dev/null and b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-XS-Max.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait-XR.png b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait-XR.png new file mode 100644 index 000000000..b66a4f2d5 Binary files /dev/null and b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait-XR.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait-XS-Max.png b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait-XS-Max.png new file mode 100644 index 000000000..e34463dd1 Binary files /dev/null and b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait-XS-Max.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json index 4f4e9c506..ab5edd0ca 100644 --- a/apps/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json +++ b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json @@ -12,6 +12,7 @@ }, { "idiom" : "universal", + "filename" : "LaunchScreen-AspectFill@3x.png", "scale" : "3x" } ], diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@3x.png b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@3x.png new file mode 100644 index 000000000..a954cc8f4 Binary files /dev/null and b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@3x.png differ diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json index 23c0ffd7a..444d7152d 100644 --- a/apps/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json +++ b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json @@ -12,6 +12,7 @@ }, { "idiom" : "universal", + "filename" : "LaunchScreen-Center@3x.png", "scale" : "3x" } ], diff --git a/apps/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@3x.png b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@3x.png new file mode 100644 index 000000000..b2973b025 Binary files /dev/null and b/apps/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@3x.png differ diff --git a/apps/app/App_Resources/iOS/Info.plist b/apps/app/App_Resources/iOS/Info.plist index 383801fef..ea3e3ea23 100644 --- a/apps/app/App_Resources/iOS/Info.plist +++ b/apps/app/App_Resources/iOS/Info.plist @@ -43,10 +43,5 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - diff --git a/apps/app/App_Resources/iOS/LaunchScreen.storyboard b/apps/app/App_Resources/iOS/LaunchScreen.storyboard index 2ad9471e1..c4e5a3f39 100644 --- a/apps/app/App_Resources/iOS/LaunchScreen.storyboard +++ b/apps/app/App_Resources/iOS/LaunchScreen.storyboard @@ -1,8 +1,12 @@ - - + + + + + - + + @@ -14,36 +18,36 @@ - + - + - + - + - + + - + + - + - - - + - + diff --git a/apps/app/App_Resources/iOS/build.xcconfig b/apps/app/App_Resources/iOS/build.xcconfig index 056205556..9d738435d 100644 --- a/apps/app/App_Resources/iOS/build.xcconfig +++ b/apps/app/App_Resources/iOS/build.xcconfig @@ -1,5 +1,7 @@ // You can add custom settings here // for example you can uncomment the following line to force distribution code signing // CODE_SIGN_IDENTITY = iPhone Distribution +// To build for device with XCode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html +// DEVELOPMENT_TEAM = YOUR_TEAM_ID; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; diff --git a/apps/app/app.css b/apps/app/app.css new file mode 100644 index 000000000..1ff4cdc5a --- /dev/null +++ b/apps/app/app.css @@ -0,0 +1 @@ +/* Just here to avoid startup warnings */ diff --git a/apps/app/cuteness.io/app.ts b/apps/app/cuteness.io/app.ts deleted file mode 100644 index 94deae337..000000000 --- a/apps/app/cuteness.io/app.ts +++ /dev/null @@ -1,4 +0,0 @@ -import * as application from "tns-core-modules/application"; - -// Start the application -application.start({ moduleName: "cuteness.io/main-page" }); \ No newline at end of file diff --git a/apps/app/perf-app/app-root.xml b/apps/app/perf-app/app-root.xml new file mode 100644 index 000000000..297f7a921 --- /dev/null +++ b/apps/app/perf-app/app-root.xml @@ -0,0 +1 @@ + diff --git a/apps/app/perf-app/app.ts b/apps/app/perf-app/app.ts index b3250bf2d..32b7e7fa8 100644 --- a/apps/app/perf-app/app.ts +++ b/apps/app/perf-app/app.ts @@ -1,3 +1,3 @@ import * as application from "tns-core-modules/application"; -application.start({ moduleName: "perf-app/main-page" }); +application.run({ moduleName: "perf-app/app-root" }); diff --git a/apps/app/perf-app/main-page.ts b/apps/app/perf-app/main-page.ts index 02e329997..0c75aeaa8 100644 --- a/apps/app/perf-app/main-page.ts +++ b/apps/app/perf-app/main-page.ts @@ -9,7 +9,7 @@ import * as frame from "tns-core-modules/ui/frame"; export function pageLoaded(args: EventData) { let page = args.object; - let view = require("ui/core/view"); + let view = require("tns-core-modules/ui/core/view"); let wrapLayout = view.getViewById(page, "wrapLayoutWithExamples"); diff --git a/apps/app/perf-app/main-page.xml b/apps/app/perf-app/main-page.xml index 33306f0d0..79cc23991 100644 --- a/apps/app/perf-app/main-page.xml +++ b/apps/app/perf-app/main-page.xml @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/apps/app/ui-tests-app/action-bar/background-css.css b/apps/app/ui-tests-app/action-bar/background-css.css deleted file mode 100644 index adba23489..000000000 --- a/apps/app/ui-tests-app/action-bar/background-css.css +++ /dev/null @@ -1,3 +0,0 @@ -.action { - background-color: red; -} \ No newline at end of file diff --git a/apps/app/ui-tests-app/action-bar/background-css.ts b/apps/app/ui-tests-app/action-bar/background-css.ts deleted file mode 100644 index 1ce73c5b0..000000000 --- a/apps/app/ui-tests-app/action-bar/background-css.ts +++ /dev/null @@ -1,5 +0,0 @@ -import * as frame from "tns-core-modules/ui/frame"; - -export function navigate(args) { - frame.topmost().navigate("ui-tests-app/action-bar/clean"); -} diff --git a/apps/app/ui-tests-app/action-bar/background.ts b/apps/app/ui-tests-app/action-bar/background.ts deleted file mode 100644 index 1ce73c5b0..000000000 --- a/apps/app/ui-tests-app/action-bar/background.ts +++ /dev/null @@ -1,5 +0,0 @@ -import * as frame from "tns-core-modules/ui/frame"; - -export function navigate(args) { - frame.topmost().navigate("ui-tests-app/action-bar/clean"); -} diff --git a/apps/app/ui-tests-app/action-bar/color.ts b/apps/app/ui-tests-app/action-bar/color.ts deleted file mode 100644 index 1ce73c5b0..000000000 --- a/apps/app/ui-tests-app/action-bar/color.ts +++ /dev/null @@ -1,5 +0,0 @@ -import * as frame from "tns-core-modules/ui/frame"; - -export function navigate(args) { - frame.topmost().navigate("ui-tests-app/action-bar/clean"); -} diff --git a/apps/app/ui-tests-app/action-bar/system-icons.ts b/apps/app/ui-tests-app/action-bar/system-icons.ts deleted file mode 100644 index 1ce73c5b0..000000000 --- a/apps/app/ui-tests-app/action-bar/system-icons.ts +++ /dev/null @@ -1,5 +0,0 @@ -import * as frame from "tns-core-modules/ui/frame"; - -export function navigate(args) { - frame.topmost().navigate("ui-tests-app/action-bar/clean"); -} diff --git a/apps/app/ui-tests-app/action-bar/transparent-bg-css.ts b/apps/app/ui-tests-app/action-bar/transparent-bg-css.ts deleted file mode 100644 index c8fb3335c..000000000 --- a/apps/app/ui-tests-app/action-bar/transparent-bg-css.ts +++ /dev/null @@ -1,5 +0,0 @@ -import frame = require("tns-core-modules/ui/frame"); - -export function navigate(args) { - frame.topmost().navigate("ui-tests-app/action-bar/clean"); -} diff --git a/apps/app/ui-tests-app/app-root.xml b/apps/app/ui-tests-app/app-root.xml deleted file mode 100644 index 2ac627182..000000000 --- a/apps/app/ui-tests-app/app-root.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/app/ui-tests-app/bottom-navigation/bottom-navigation.ts b/apps/app/ui-tests-app/bottom-navigation/bottom-navigation.ts deleted file mode 100644 index 85a232b6b..000000000 --- a/apps/app/ui-tests-app/bottom-navigation/bottom-navigation.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { EventData } from "tns-core-modules/data/observable"; -import { SubMainPageViewModel } from "../sub-main-page-view-model"; -import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout"; -import { Page } from "tns-core-modules/ui/page"; -import { BottomNavigation } from "tns-core-modules/ui/bottom-navigation"; - -export function goToFirst(args: EventData) { - const page = (args.object).page; - const bottomNav = page.getViewById("bottomNav"); - - bottomNav.selectedIndex = 0; -} - -export function goToSecond(args: EventData) { - const page = (args.object).page; - const bottomNav = page.getViewById("bottomNav"); - - bottomNav.selectedIndex = 1; -} diff --git a/apps/app/ui-tests-app/bottom-navigation/color.xml b/apps/app/ui-tests-app/bottom-navigation/color.xml deleted file mode 100644 index b174dcfba..000000000 --- a/apps/app/ui-tests-app/bottom-navigation/color.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/apps/app/ui-tests-app/bottom-navigation/icon-change.ts b/apps/app/ui-tests-app/bottom-navigation/icon-change.ts deleted file mode 100644 index 5301c28e9..000000000 --- a/apps/app/ui-tests-app/bottom-navigation/icon-change.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { BottomNavigation, SelectedIndexChangedEventData } from "tns-core-modules/ui/bottom-navigation"; - -export function onSelectedIndexChanged(args: SelectedIndexChangedEventData) { - const bottomNav = args.object as BottomNavigation; - - const newItem = bottomNav.tabStrip.items[args.newIndex]; - if (newItem) { - newItem.iconSource = "res://icon"; - } - - const oldItem = bottomNav.tabStrip.items[args.oldIndex]; - if (oldItem) { - oldItem.iconSource = "res://testlogo"; - } -} diff --git a/apps/app/ui-tests-app/bottom-navigation/icon-title-placement.xml b/apps/app/ui-tests-app/bottom-navigation/icon-title-placement.xml deleted file mode 100644 index 36b74e3f0..000000000 --- a/apps/app/ui-tests-app/bottom-navigation/icon-title-placement.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/apps/app/ui-tests-app/button/background.xml b/apps/app/ui-tests-app/button/background.xml deleted file mode 100644 index 7783eefeb..000000000 --- a/apps/app/ui-tests-app/button/background.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - diff --git a/tests/app/app/mainPage.xml b/tests/app/app/mainPage.xml deleted file mode 100644 index 7cead486d..000000000 --- a/tests/app/app/mainPage.xml +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/tests/app/app/package.json b/tests/app/app/package.json deleted file mode 100644 index 780cb595f..000000000 --- a/tests/app/app/package.json +++ /dev/null @@ -1,2 +0,0 @@ -{ "name" : "testsapp", - "main" : "app.js" } diff --git a/tests/app/app/pageNavigation.ts b/tests/app/app/pageNavigation.ts deleted file mode 100644 index 66b3bd4b2..000000000 --- a/tests/app/app/pageNavigation.ts +++ /dev/null @@ -1,27 +0,0 @@ -import * as frame from "tns-core-modules/ui/frame"; -import * as pages from "tns-core-modules/ui/page"; -import * as buttonModule from "tns-core-modules/ui/button"; -import * as tabViewModule from "tns-core-modules/ui/tab-view"; - -export function createPage() { - var tab = new tabViewModule.TabView(); - tab.items = []; - for (var i = 0; i < 10; i++) { - - var button = new buttonModule.Button(); - button.text = "Test"; - button.on(buttonModule.Button.tapEvent, function () { - var topFrame = frame.topmost(); - topFrame.goBack(); - }); - - let item = new tabViewModule.TabViewItem(); - item.title = "Tab " + i; - item.view = button; - tab.items.push(item); - } - var page = new pages.Page(); - page.content = tab; - return page; -} -//export var Page = new pages.Page(); diff --git a/tests/app/app/style_props.ts b/tests/app/app/style_props.ts deleted file mode 100644 index df3179561..000000000 --- a/tests/app/app/style_props.ts +++ /dev/null @@ -1,102 +0,0 @@ -import * as buttonModule from "tns-core-modules/ui/button"; -import * as pages from "tns-core-modules/ui/page"; -import * as stackLayoutDef from "tns-core-modules/ui/layouts/stack-layout"; - -// import {isAndroid} from "platform"; -// import * as style from "ui/styling/style"; -// import {PropertyMetadata, PropertyMetadataSettings} from "ui/core/dependency-observable"; -// import * as view from "ui/core/view"; - -// on Android we explicitly set propertySettings to None because android will invalidate its layout (skip unnecessary native call). -// let AffectsLayout = isAndroid ? PropertyMetadataSettings.None : PropertyMetadataSettings.AffectsLayout; - -// export var fontFamilyProperty = new styleProperty.Property("fontFamily", "font-family", new PropertyMetadata(undefined, AffectsLayout)); - -// export class MyTextViewStyler implements style.Styler { -// public static setFontFamilyProperty(view: view.View, newValue: any) { -// if (view.android) { -// (view.android).setTypeface(android.graphics.Typeface.create(newValue, android.graphics.Typeface.NORMAL)); -// } -// else if (view.ios) { -// var fontSize = (view._nativeView).titleLabel.font.pointSize; -// (view._nativeView).titleLabel.font = UIFont.fontWithNameSize(newValue, fontSize); -// } -// } - -// public static resetFontFamilyProperty(view: view.View, nativeValue: any) { -// if (view.android) { -// (view.android).setTypeface(android.graphics.Typeface.create(nativeValue, android.graphics.Typeface.NORMAL)); -// } -// else if (view.ios) { -// var fontSize = (view._nativeView).titleLabel.font.pointSize; -// (view._nativeView).titleLabel.font = UIFont.fontWithNameSize(nativeValue, fontSize); -// } -// } - -// public static getNativeFontFamilyValue = function (view: view.View): any { -// if (view.android) { -// return (view.android).getTypeface(); -// } -// else if (view.ios) { -// return (view._nativeView).titleLabel.font.fontName; -// } -// return null; -// } - -// public static registerHandlers() { -// style.registerHandler(fontFamilyProperty, new style.StylePropertyChangedHandler( -// MyTextViewStyler.setFontFamilyProperty, -// MyTextViewStyler.resetFontFamilyProperty, -// MyTextViewStyler.getNativeFontFamilyValue), "MyButton"); -// } -// } - -//export class MyStyle extends styles.Style { -// get fontFamily(): string { -// return this._getValue(fontFamilyProperty); -// } -// set fontFamily(value: string) { -// this._setValue(fontFamilyProperty, value, observable.ValueSource.Local); -// } -//} - -//Object.defineProperty(styles.Style.prototype, "fontFamily", { -// get: function () { -// return this._getValue(fontFamilyProperty); -// }, -// set: function (value) { -// this._setValue(fontFamilyProperty, value, observable.ValueSource.Local); -// }, -// enumerable: true, -// configurable: true -//}); - -export class MyButton extends buttonModule.Button { - -} - -// MyTextViewStyler.registerHandlers(); - -export function createPage() { - var stackLayout = new stackLayoutDef.StackLayout(); - - var btn = new MyButton(); - btn.text = "Alabala"; - btn.id = "btn"; - - var btn1 = new MyButton(); - btn1.text = "Alabala"; - btn1.id = "btn1"; - - var btn2 = new buttonModule.Button(); - btn2.text = "Alabala"; - - stackLayout.addChild(btn); - stackLayout.addChild(btn1); - stackLayout.addChild(btn2); - - var page = new pages.Page(); - page.css = "#btn {font-family: Courier New} #btn1 {font-family: Times New Roman} #btn2 {color: yellow}"; - page.content = stackLayout; - return page; -} diff --git a/tests/app/app/testPage.ts b/tests/app/app/testPage.ts deleted file mode 100644 index 0e3e68183..000000000 --- a/tests/app/app/testPage.ts +++ /dev/null @@ -1,5 +0,0 @@ -import * as frame from "tns-core-modules/ui/frame"; - -export function buttonTap(args) { - frame.topmost().goBack(); -} diff --git a/tests/app/app/testPage.xml b/tests/app/app/testPage.xml deleted file mode 100644 index bfde57363..000000000 --- a/tests/app/app/testPage.xml +++ /dev/null @@ -1,3 +0,0 @@ - -