Merge

Author: Lukas Narusevicius

.travis.yml

@@ -19,7 +19,7 @@ matrix:
     - stage: "Lint"
       language: node_js
       os: linux
-      node_js: "8"
+      node_js: "10"
       script: cd src && npm run ci.tslint && cd ../demo && npm run ci.tslint && cd ../demo-angular && npm run ci.tslint
     - stage: "WebPack and Build"
       os: osx
@@ -28,7 +28,7 @@ matrix:
         - Type="VanillaJS"
       osx_image: xcode10.0
       language: node_js
-      node_js: "8"
+      node_js: "10"
       jdk: oraclejdk8
       before_script: pod repo update
       script:
@@ -42,7 +42,7 @@ matrix:
         - Type="VueJS"
       osx_image: xcode10.0
       language: node_js
-      node_js: "8"
+      node_js: "10"
       jdk: oraclejdk8
       before_script: pod repo update
       script:
@@ -56,7 +56,7 @@ matrix:
         - Type="Angular"
       osx_image: xcode10.0
       language: node_js
-      node_js: "8"
+      node_js: "10"
       jdk: oraclejdk8
       before_script: pod repo update
       script:
@@ -65,54 +65,61 @@ matrix:
         - npm i && tns build ios --bundle --env.uglify --env.aot
     - language: android
       os: linux
+      dist: trusty
       env:
         - WebpackAndroid="28"
         - Type="VanillaJS"
       jdk: oraclejdk8
-      before_install: nvm install 8
+      before_install: nvm install 10
       script:
         - cd src && npm run build
         - cd ../demo && npm i && tns build android --bundle --env.uglify --env.snapshot --copy-to "./outputs/app-debug.apk"
         - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE/$ANDROID_PACKAGE_JS?overwrite=true --data-binary @$ANDROID_PACKAGE_FOLDER_JS/app-debug.apk"
     - language: android
       os: linux
+      dist: trusty
       env:
         - WebpackAndroid="28"
         - Type="VueJS"
       jdk: oraclejdk8
-      before_install: nvm install 8
+      before_install: nvm install 10
       script:
         - cd src && npm run build
         - cd ../demo-vue && npm i && tns build android --bundle --env.uglify --copy-to "./outputs/app-debug.apk"
         - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE/$ANDROID_PACKAGE_VUE?overwrite=true --data-binary @$ANDROID_PACKAGE_FOLDER_VUE/app-debug.apk"
     - language: android
       os: linux
+      dist: trusty
       env:
         - WebpackAndroid="28"
         - Type="Angular"
       jdk: oraclejdk8
-      before_install: nvm install 8
+      before_install: nvm install 10
       script:
         - cd src && npm run build
         - cd ../publish && sh pack.sh
         - cd ../demo-angular && tns plugin add ../publish/package/*.tgz
         - npm i && tns build android --bundle --env.uglify --env.snapshot --env.aot
     - language: android
+      os: linux
+      dist: trusty
       env:
         - BuildAndroid="28"
         - Type="VanillaJS"
-      os: linux
+
       jdk: oraclejdk8
-      before_install: nvm install 8.11.4
+      before_install: nvm install 10
       script:
         - cd demo && npm run ci.android.build
     - language: android
+      os: linux
+      dist: trusty
       env:
         - BuildAndroid="28"
         - Type="Angular"
-      os: linux
+
       jdk: oraclejdk8
-      before_install: nvm install 8.11.4
+      before_install: nvm install 10
       script:
         - cd demo-angular && npm run ci.android.build
     - os: osx
@@ -122,7 +129,7 @@ matrix:
         - Type="VanillaJS"
       osx_image: xcode10.0
       language: node_js
-      node_js: "8"
+      node_js: "10"
       jdk: oraclejdk8
       before_script: pod repo update
       script:
@@ -134,7 +141,7 @@ matrix:
         - Type="Angular"
       osx_image: xcode10.0
       language: node_js
-      node_js: "8"
+      node_js: "10"
       jdk: oraclejdk8
       before_script: pod repo update
       script:
@@ -145,7 +152,7 @@ matrix:
         - Type="VanillaJS"
       language: node_js
       os: linux
-      node_js: "8"
+      node_js: "10"
       script:
         - npm i -g appium
         - cd demo && npm i
@@ -156,7 +163,7 @@ matrix:
         - Type="VueJS"
       language: node_js
       os: linux
-      node_js: "8"
+      node_js: "10"
       script:
         - npm i -g appium
         - cd demo-vue && npm i
@@ -166,7 +173,7 @@ matrix:
         - iOS="12.0"
         - Type="VanillaJS"
       language: node_js
-      node_js: "8"
+      node_js: "10"
       script:
         - npm i -g appium
         - cd demo && npm i
@@ -176,7 +183,7 @@ matrix:
         - iOS="12.0"
         - Type="VueJS"
       language: node_js
-      node_js: "8"
+      node_js: "10"
       script:
         - npm i -g appium
         - cd demo-vue && npm i
@@ -195,6 +202,6 @@ before_install:
   - sudo pip install six
 
 install:
-  - npm install -g nativescript
+  - echo no | npm install -g nativescript
   - tns usage-reporting disable
   - tns error-reporting disable

README.md

@@ -348,11 +348,17 @@ If the Messenger app is not installed, the Send button will be hidden. Be sure t
 
 ### Show Share Dialog Programmatically
 
-**Note** The share dialog will try fallback to browse page sharing if user doesn't have Facebook installed (only for linkContent)
+**Note** The share dialog will try fallback to browse page sharing if user doesn't have Facebook installed (only for linkContent) 
 
 ```TypeScript
 showShareDialog(this.linkContent);
 showMessageDialog(this.linkContent);
+showShareDialog(this.linkContent, (error:Error, result:ShareCallbackResult) => {
+    if(!error){
+        console.log(result.android); // com.facebook.share.Sharer.Result
+        console.log(result.ios); // (NSDictionary * ) The results from the sharer. This may be nil or empty.
+    }
+});
 ```
 
 ### Hide Custom Button If Can't share
@@ -558,6 +564,12 @@ If the Messenger app is not installed, the Send button will be hidden. Be sure t
 ```TypeScript
 showShareDialog(this.linkContent);
 showMessageDialog(this.linkContent);
+showShareDialog(this.linkContent, (error:Error, result:ShareCallbackResult) => {
+    if(!error){
+        console.log(result.android); // com.facebook.share.Sharer.Result
+        console.log(result.ios); // (NSDictionary * ) The results from the sharer. This may be nil or empty.
+    }
+});
 ```
 
 ### Hide Custom Button If Can't share

demo-angular/app/app.module.ts

@@ -2,16 +2,14 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptModule } from "nativescript-angular/nativescript.module";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
 import { AppComponent } from "./app.component";
-import { LoginModule } from "./pages/login/login.module";
-import { HomeModule } from "./pages/home/home.module";
 import { NativeScriptFacebookModule } from "nativescript-facebook/angular";
 import * as application from 'tns-core-modules/application';
 import { routes } from "./app.routing";
 import { NavigationService } from "./services/navigation.service";
-import { init, initAnalytics, LoginBehavior } from "nativescript-facebook";
+import { init, initAnalytics } from "nativescript-facebook";
 
 application.on(application.launchEvent, function (args) {
-    init("1771472059772879", LoginBehavior.LoginBehaviorWeb);
+    init("1771472059772879");
     initAnalytics();
 });
 

demo-angular/app/package.json

@@ -3,7 +3,5 @@
     "v8Flags": "--expose_gc",
     "requireModules": ["nativescript-facebook"]
   },
-  "main": "main.js",
-  "name": "tns-template-hello-world-ng",
-  "version": "2.5.0"
+  "main": "main.js"
 }

demo-angular/app/pages/login/login.component.ts

@@ -99,7 +99,13 @@ export class LoginComponent {
     }
 
     onShareDialog() {
-        Facebook.showShareDialog(this.linkContent);
+        Facebook.showShareDialog(this.linkContent, (error, result) => {
+            if (error) {
+                console.error(error);
+                return;
+            }
+            alert('Successfully shared');
+        });
     }
 
     onShareDialogPhotos() {

demo-angular/package.json

@@ -4,27 +4,27 @@
   "nativescript": {
     "id": "org.nativescript.demoangular",
     "tns-ios": {
-      "version": "5.1.0"
+      "version": "5.4.0"
     },
     "tns-android": {
-      "version": "5.1.0"
+      "version": "5.4.0"
     }
   },
   "dependencies": {
-    "@angular/common": "~7.1.0",
-    "@angular/compiler": "~7.1.0",
-    "@angular/core": "~7.1.0",
-    "@angular/forms": "~7.1.0",
-    "@angular/http": "~7.1.0",
-    "@angular/platform-browser": "~7.1.0",
-    "@angular/platform-browser-dynamic": "~7.1.0",
-    "@angular/router": "~7.1.0",
-    "nativescript-angular": "~7.1.0",
+    "@angular/common": "~7.2.0",
+    "@angular/compiler": "~7.2.0",
+    "@angular/core": "~7.2.0",
+    "@angular/forms": "~7.2.0",
+    "@angular/http": "~7.2.0",
+    "@angular/platform-browser": "~7.2.0",
+    "@angular/platform-browser-dynamic": "~7.2.0",
+    "@angular/router": "~7.2.0",
+    "nativescript-angular": "~7.2.0",
     "nativescript-facebook": "../src",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "^0.3.4",
     "rxjs": "^6.3.3",
-    "tns-core-modules": "^5.1.0",
+    "tns-core-modules": "^5.0.0",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
@@ -33,8 +33,8 @@
     "karma-jasmine": "^1.0.2",
     "karma-nativescript-launcher": "^0.4.0",
     "nativescript-css-loader": "~0.26.0",
-    "nativescript-dev-typescript": "~0.7.0",
-    "nativescript-dev-webpack": "~0.18.0",
+    "nativescript-dev-typescript": "~0.9.0",
+    "nativescript-dev-webpack": "~0.22.0",
     "tslint": "~5.11.0"
   },
   "scripts": {

demo-vue/app/app.js

@@ -5,13 +5,15 @@ import Login from "./components/Login";
 import {
     init,
     initAnalytics,
-    LoginBehavior
 } from 'nativescript-facebook';
 
+import FacebookPlugin from "nativescript-facebook/vue";
+Vue.use(FacebookPlugin);
+
 Vue.config.silent = true;
 
 application.on(application.launchEvent, function (args) {
-    init("1771472059772879", LoginBehavior.LoginBehaviorWeb);
+    init("1771472059772879");    
     initAnalytics();
 });
 

demo-vue/app/components/Login.vue

@@ -125,7 +125,13 @@
                 });
             },
             onShareDialog: function() {
-                showShareDialog(this.linkContent);
+                showShareDialog(this.linkContent, (error, result) => {
+                  if (error) {
+                    console.error(error);
+                    return;
+                  }
+                  alert('Successfully shared');
+                });
             },
             onShareDialogPhotos: function() {
                 showShareDialog(this.photosContent);

demo-vue/e2e/config/appium.capabilities.json

@@ -18,13 +18,7 @@
     "platformVersion": "7.0",
     "deviceName": "Android GoogleAPI Emulator",
     "appiumVersion": "1.9.1",
-    "noReset": true,
-    "lt": 60000,
-    "newCommandTimeout": 720,
-    "appium-version": "1.9.1",
-    "fullReset": false,
-    "idleTimeout": 120,
-    "automationName": "Appium"
+    "noReset": true
   },
   "android25": {
     "platformName": "Android",

demo-vue/e2e/config/mocha.opts

@@ -1,3 +1,5 @@
 --timeout 800000
 --recursive e2e
+--reporter mocha-multi 
+--reporter-options mochawesome=-,mocha-junit-reporter=test-results.xml
 --exit