Skip to content

Commit

Permalink
updates for {N} 6.0!
Browse files Browse the repository at this point in the history
  • Loading branch information
rdlauer committed Aug 9, 2019
1 parent b467d85 commit e0565a5
Show file tree
Hide file tree
Showing 173 changed files with 7,410 additions and 7,256 deletions.
Empty file modified .gitattributes
100644 → 100755
Empty file.
3 changes: 2 additions & 1 deletion .gitignore
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ npm-debug.log
app/keys.*
hooks/
app/**/google-services.json
app/**/GoogleService-Info.plist
app/**/GoogleService-Info.plist
.DS_Store
Empty file modified README.md
100644 → 100755
Empty file.
Empty file modified app/App_Resources/Android/app.gradle
100644 → 100755
Empty file.
Empty file modified app/App_Resources/Android/src/main/AndroidManifest.xml
100644 → 100755
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/App_Resources/Android/src/main/res/drawable-hdpi/menu.png
100644 → 100755
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.
Empty file modified app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/App_Resources/Android/src/main/res/drawable-ldpi/menu.png
100644 → 100755
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.
Empty file modified app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/App_Resources/Android/src/main/res/drawable-mdpi/menu.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/App_Resources/Android/src/main/res/drawable-xhdpi/menu.png
100644 → 100755
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.
Empty file modified app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/App_Resources/Android/src/main/res/drawable-xxhdpi/menu.png
100644 → 100755
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/App_Resources/Android/src/main/res/values-v21/colors.xml
100644 → 100755
Empty file.
Empty file modified app/App_Resources/Android/src/main/res/values-v21/styles.xml
100644 → 100755
Empty file.
Empty file modified app/App_Resources/Android/src/main/res/values/colors.xml
100644 → 100755
Empty file.
Empty file modified app/App_Resources/Android/src/main/res/values/strings.xml
100644 → 100755
Empty file.
Empty file modified app/App_Resources/Android/src/main/res/values/styles.xml
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
},
{
"filename": "ship.arreferenceimage"
},
{
"filename": "thatconference.arreferenceimage"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images": [
{
"idiom": "universal",
"filename": "tc.jpg"
}
],
"info": {
"version": 1,
"author": "xcode"
},
"properties": {
"width": 4
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Empty file modified app/App_Resources/iOS/Assets.xcassets/Contents.json
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified app/App_Resources/iOS/Info.plist
100644 → 100755
Empty file.
Empty file modified app/App_Resources/iOS/LaunchScreen.storyboard
100644 → 100755
Empty file.
420 changes: 420 additions & 0 deletions app/App_Resources/iOS/Models.scnassets/Campfire/campfire_v2.dae

Large diffs are not rendered by default.

Empty file modified app/App_Resources/iOS/build.xcconfig
100644 → 100755
Empty file.
Empty file modified app/App_Resources/iOS/navigation/menu.png
100644 → 100755
Empty file modified app/App_Resources/iOS/navigation/[email protected]
100644 → 100755
Empty file modified app/App_Resources/iOS/navigation/[email protected]
100644 → 100755
Empty file modified app/_app-common.scss
100644 → 100755
Empty file.
Empty file modified app/_app-variables.scss
100644 → 100755
Empty file.
Empty file modified app/app-root/_app-root-common.scss
100644 → 100755
Empty file.
Empty file modified app/app-root/app-root-view-model.ts
100644 → 100755
Empty file.
1 change: 0 additions & 1 deletion app/app-root/app-root.android.css

This file was deleted.

Empty file modified app/app-root/app-root.android.scss
100644 → 100755
Empty file.
1 change: 0 additions & 1 deletion app/app-root/app-root.ios.css

This file was deleted.

Empty file modified app/app-root/app-root.ios.scss
100644 → 100755
Empty file.
Empty file modified app/app-root/app-root.ts
100644 → 100755
Empty file.
Empty file modified app/app-root/app-root.xml
100644 → 100755
Empty file.
1 change: 0 additions & 1 deletion app/app.android.css

This file was deleted.

Empty file modified app/app.android.scss
100644 → 100755
Empty file.
1 change: 0 additions & 1 deletion app/app.ios.css

This file was deleted.

Empty file modified app/app.ios.scss
100644 → 100755
Empty file.
Empty file modified app/app.ts
100644 → 100755
Empty file.
53 changes: 24 additions & 29 deletions app/ar/ar-page.ts
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,7 @@ export function trackingFaceDetected(args: ARTrackingFaceEventData): void {
}
}

export function trackingImageDetected(
args: ARTrackingImageDetectedEventData
): void {
export function trackingImageDetected(args: ARTrackingImageDetectedEventData): void {
console.log('Tracked image detected (name).. ' + args.imageName);

if (args.imageName === 'nativescripting') {
Expand Down Expand Up @@ -207,7 +205,8 @@ export function trackingImageDetected(
args.imageName === 'nativescript nl' ||
args.imageName === 'nativescripting alt' ||
args.imageName === 'hertogjan' ||
args.imageName === 'latrappe'
args.imageName === 'latrappe' ||
args.imageName === 'thatconference'
) {
console.log('Adding box');
args.imageTrackingActions
Expand All @@ -222,19 +221,13 @@ export function trackingImageDetected(
materials: [
{
diffuse: {
contents:
'Assets.scnassets/Materials/tnsgranite/tnsgranite-diffuse.png',
contents: 'Assets.scnassets/Materials/tnsgranite/tnsgranite-diffuse.png',
wrapMode: 'ClampToBorder'
}
}
],
onTap: (interaction: ARNodeInteraction) => {
console.log(
'box tapped: ' +
interaction.node.id +
' at ' +
interaction.touchPosition
);
console.log('box tapped: ' + interaction.node.id + ' at ' + interaction.touchPosition);
// let's rotate the box 5 degrees to the right
interaction.node.rotateBy({
x: 0,
Expand All @@ -243,12 +236,7 @@ export function trackingImageDetected(
});
},
onLongPress: (interaction: ARNodeInteraction) => {
console.log(
'box longpressed: ' +
interaction.node.id +
' at ' +
interaction.touchPosition
);
console.log('box longpressed: ' + interaction.node.id + ' at ' + interaction.touchPosition);
// let's rotate the box 5 degrees to the left
interaction.node.rotateBy({
x: 0,
Expand All @@ -269,25 +257,34 @@ export function planeTapped(args: ARPlaneTappedEventData): void {
console.log('Plane tapped @ x coordinate: ' + args.position.x);

args.object.addModel({
name: 'Models.scnassets/Car.dae',
name: 'Models.scnassets/Ball.dae',
//name: 'Models.scnassets/Campfire/campfire_v2.dae',
position: {
x: 0,
y: 0,
z: -0.5
x: args.position.x,
y: args.position.y,
z: args.position.z - 0.5
},
rotation: {
x: 0,
y: 180, // face towards camera
y: 0, // 180 = face towards camera
z: 0
},
scale: 0.1,
scale: 0.5,
mass: 0,
onTap: (interaction: ARNodeInteraction) => {
console.log('tapped model id: ' + interaction.node.id);
console.log('tapped model position: ' + interaction.node.position);
console.log('tapped model: ' + JSON.stringify(interaction.node));
interaction.node.rotateBy({
x: args.position.x,
y: args.position.y,
z: args.position.z - 5
});
},
onLongPress: (interaction: ARNodeInteraction) =>
console.log('model longpressed: ' + interaction.node.id)
onLongPress: (interaction: ARNodeInteraction) => {
console.log('model longpressed: ' + interaction.node.id);
interaction.node.remove();
}
});

/*
Expand Down Expand Up @@ -332,7 +329,5 @@ export function planeTapped(args: ARPlaneTappedEventData): void {
}

export function sceneTapped(args: ARSceneTappedEventData): void {
console.log(
`Scene tapped @ x / y coordinate: ${args.position.x} / ${args.position.y}`
);
console.log(`Scene tapped @ x / y coordinate: ${args.position.x} / ${args.position.y}`);
}
2 changes: 1 addition & 1 deletion app/ar/ar-page.xml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
trackingFaceDetected="trackingFaceDetected"
debugLevel="FEATURE_POINTS"
planeMaterial="{{ planeMaterial }}"
planeOpacity="0.25"
planeOpacity="0.50"
detectPlanes="true"
showStatistics="true"
arLoaded="arLoaded"
Expand Down
Empty file modified app/ar/ar-view-model.ts
100644 → 100755
Empty file.
Empty file modified app/audiovideo/audiovideo-page.ts
100644 → 100755
Empty file.
Empty file modified app/audiovideo/audiovideo-page.xml
100644 → 100755
Empty file.
Empty file modified app/audiovideo/audiovideo-view-model.ts
100644 → 100755
Empty file.
Empty file modified app/bundle-config.ts
100644 → 100755
Empty file.
Empty file modified app/calendar/calendar-page.ts
100644 → 100755
Empty file.
Empty file modified app/calendar/calendar-page.xml
100644 → 100755
Empty file.
Empty file modified app/calendar/calendar-view-model.ts
100644 → 100755
Empty file.
Empty file modified app/cardlist/cardlist-page.ts
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion app/cardlist/cardlist-page.xml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
class="page"
navigatingTo="onNavigatingTo"
xmlns="http://schemas.nativescript.org/tns.xsd"
xmlns:Card="nativescript-cardview">
xmlns:Card="@nstudio/nativescript-cardview">

<ActionBar class="action-bar">
<NavigationButton icon="res://menu"
Expand Down
Empty file modified app/cardlist/cardlist-view-model.ts
100644 → 100755
Empty file.
Empty file modified app/cards/cards-page.ts
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion app/cards/cards-page.xml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
class="page"
navigatingTo="onNavigatingTo"
xmlns="http://schemas.nativescript.org/tns.xsd"
xmlns:Card="nativescript-cardview">
xmlns:Card="@nstudio/nativescript-cardview">

<ActionBar class="action-bar">
<NavigationButton icon="res://menu"
Expand Down
Empty file modified app/cards/cards-view-model.ts
100644 → 100755
Empty file.
Empty file modified app/carousel/carousel-page.ts
100644 → 100755
Empty file.
Empty file modified app/carousel/carousel-page.xml
100644 → 100755
Empty file.
Empty file modified app/carousel/carousel-view-model.ts
100644 → 100755
Empty file.
Empty file modified app/charts/charts-page.ts
100644 → 100755
Empty file.
Empty file modified app/charts/charts-page.xml
100644 → 100755
Empty file.
Empty file modified app/charts/charts-view-model.ts
100644 → 100755
Empty file.
Empty file modified app/fonts/FontAwesome.ttf
100644 → 100755
Empty file.
Empty file modified app/home/home-page.ts
100644 → 100755
Empty file.
Empty file modified app/home/home-page.xml
100644 → 100755
Empty file.
Empty file modified app/home/home-view-model.ts
100644 → 100755
Empty file.
Empty file modified app/images/badge-climber.png
100644 → 100755
Empty file modified app/images/badge-punctual.png
100644 → 100755
Empty file modified app/images/badge-reliable.png
100644 → 100755
Empty file modified app/images/plum-white.png
100644 → 100755
Empty file modified app/images/plum.png
100644 → 100755
Empty file modified app/images/star-empty.png
100644 → 100755
Empty file modified app/images/star-full.png
100644 → 100755
Empty file modified app/lists/detail-page.ts
100644 → 100755
Empty file.
Empty file modified app/lists/detail-page.xml
100644 → 100755
Empty file.
Empty file modified app/lists/lists-page.ts
100644 → 100755
Empty file.
Empty file modified app/lists/lists-page.xml
100644 → 100755
Empty file.
Empty file modified app/lists/lists-view-model.ts
100644 → 100755
Empty file.
Empty file modified app/lists/people.json
100644 → 100755
Empty file.
Empty file modified app/login/login-page.ts
100644 → 100755
Empty file.
Empty file modified app/login/login-page.xml
100644 → 100755
Empty file.
Empty file modified app/login/login-view-model.ts
100644 → 100755
Empty file.
Empty file modified app/maps/maps-page.ts
100644 → 100755
Empty file.
Empty file modified app/maps/maps-page.xml
100644 → 100755
Empty file.
Empty file modified app/maps/maps-view-model.ts
100644 → 100755
Empty file.
Empty file modified app/modal/modal-page.ts
100644 → 100755
Empty file.
Empty file modified app/modal/modal-page.xml
100644 → 100755
Empty file.
Empty file modified app/notes/notes-page.ts
100644 → 100755
Empty file.
Empty file modified app/notes/notes-page.xml
100644 → 100755
Empty file.
Empty file modified app/notes/notes-view-model.ts
100644 → 100755
Empty file.
Empty file modified app/notes/notes.json
100644 → 100755
Empty file.
Empty file modified app/observable-property-decorator.ts
100644 → 100755
Empty file.
Empty file modified app/package.json
100644 → 100755
Empty file.
Empty file modified app/profile/profile-page.ts
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion app/profile/profile-page.xml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
class="page"
navigatingTo="onNavigatingTo"
xmlns="http://schemas.nativescript.org/tns.xsd"
xmlns:CheckBox="nativescript-checkbox">
xmlns:CheckBox="@nstudio/nativescript-checkbox">

<ActionBar class="action-bar">
<NavigationButton icon="res://menu"
Expand Down
Empty file modified app/profile/profile-view-model.ts
100644 → 100755
Empty file.
Empty file modified app/settings/settings-page.ts
100644 → 100755
Empty file.
Empty file modified app/settings/settings-page.xml
100644 → 100755
Empty file.
Empty file modified app/settings/settings-view-model.ts
100644 → 100755
Empty file.
Empty file modified app/settings/settings.json
100644 → 100755
Empty file.
Empty file modified app/shared/observable-property-decorator.ts
100644 → 100755
Empty file.
Empty file modified app/shared/selected-page-service.ts
100644 → 100755
Empty file.
Empty file modified app/sign-up/sign-up-page.ts
100644 → 100755
Empty file.
Empty file modified app/sign-up/sign-up-page.xml
100644 → 100755
Empty file.
Empty file modified app/sign-up/sign-up-view-model.ts
100644 → 100755
Empty file.
1 change: 1 addition & 0 deletions nsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Loading

0 comments on commit e0565a5

Please sign in to comment.