Merge pull request #5 from Merott/upgrade-ns

Upgrade NativeScript and AndroidPdfViewer

Author: Merott

AndroidPdfViewer.d.ts

@@ -1,4 +1,4 @@
-/// <reference path="./node_modules/tns-platform-declarations/android17.d.ts" />
+/// <reference path="./node_modules/tns-platform-declarations/tns-core-modules/android17.d.ts" />
 
 declare module com.github.barteksc.pdfviewer {
   export class PDFView extends android.view.SurfaceView {
@@ -21,6 +21,5 @@ declare class Configurator {
   pages(...pageNumbers: number[]): this;
   enableDoubletap(enable: boolean): this;
   enableSwipe(enable: boolean): this;
-  showMinimap(show: boolean): this;
-  swipeVertical(swipe: boolean): this;
+  swipeHorizontal(horizontal: boolean): this;
 }

README.md

@@ -42,13 +42,6 @@ tns platform add ios
 tns run ios
 
 # Android
-tns platform add android@2.2.0-next-2016-08-02-918
-tns run android  # try again if you get error "more than one library ..."
-```
-
-## Why the dependency on `android@next` platform
-
-I've been getting all kinds of different issues trying to run this plugin with
-the latest released version of `tns-core-modules` and `tns-android` runtime, and
-the issues don't appear to exist in the current pre-release versions. Therefore
-for the time being I've set the dependencies to pre-release versions.
+tns platform add android
+tns run android
+```

demo/app/package.json

@@ -3,16 +3,16 @@
   "main": "app.js",
   "private": true,
   "dependencies": {
-    "nativescript-dev-typescript": "^0.3.0",
-		"tns-core-modules": "^2.1.0"
+    "nativescript-dev-typescript": "0.3.2",
+    "tns-core-modules": "2.2.1"
   },
-	"devDependencies": {
-		"babel-traverse": "6.7.6",
-		"babel-types": "6.7.7",
-		"babylon": "6.7.0",
-		"filewalker": "0.1.2",
-		"lazy": "1.0.11",
-		"nativescript-dev-typescript": "^0.3.2",
-		"typescript": "^1.8.10"
-	}
+  "devDependencies": {
+    "babel-traverse": "6.13.0",
+    "babel-types": "6.13.0",
+    "babylon": "6.9.0",
+    "filewalker": "0.1.3",
+    "lazy": "1.0.11",
+    "nativescript-dev-typescript": "0.3.2",
+    "typescript": "^1.8.10"
+  }
 }

demo/package.json

@@ -2,24 +2,30 @@
   "nativescript": {
     "id": "com.merott.NativeScriptPDFViewDemo",
     "tns-ios": {
-      "version": "2.1.1"
+      "version": "2.2.1"
     },
     "tns-android": {
-      "version": "2.2.0-next-2016-08-02-918"
+      "version": "2.2.0"
     }
   },
   "private": true,
   "dependencies": {
-    "nativescript-pdf-view": "1.0.1",
-    "tns-core-modules": "2.2.0-2016-08-07-3885"
+    "nativescript-pdf-view": "latest",
+    "tns-core-modules": "2.2.1"
   },
   "devDependencies": {
-    "babel-traverse": "6.7.6",
-    "babel-types": "6.7.7",
-    "babylon": "6.7.0",
-    "filewalker": "0.1.2",
+    "babel-traverse": "6.13.0",
+    "babel-types": "6.13.0",
+    "babylon": "6.9.0",
+    "filewalker": "0.1.3",
     "lazy": "1.0.11",
     "nativescript-dev-typescript": "^0.3.2",
     "typescript": "^1.8.10"
+  },
+  "scripts": {
+    "reinstall:ios": "tns platform remove ios && tns platform add ios && tns plugin add ..",
+    "reinstall:android": "tns platform remove android && tns platform add android && tns plugin add ..",
+    "android": "tns run android",
+    "ios": "tns run ios"
   }
 }

package.json

@@ -4,12 +4,13 @@
   "main": "src/plugin.js",
   "nativescript": {
     "platforms": {
-      "android": "2.2.0-next-2016-08-02-918",
-      "ios": "2.1.1"
+      "android": "2.2.0",
+      "ios": "2.2.1"
     }
   },
   "scripts": {
     "build": "tsc",
+    "build:watch": "tsc --watch",
     "demo.ios": "npm run preparedemo && cd demo && tns emulate ios",
     "demo.android": "npm run preparedemo && cd demo && tns run android",
     "preparedemo": "npm run build && cd demo && tns plugin remove nativescript-pdf-view && tns plugin add .. && tns install",
@@ -48,9 +49,9 @@
     "@semantic-release/condition-codeship": "1.1.0",
     "@semantic-release/release-notes-generator": "2.0.0",
     "semantic-release": "4.3.5",
-    "tns-core-modules": "2.2.0-2016-08-07-3885",
-    "tns-platform-declarations": "2.0.0",
-    "tslint": "3.13.0",
+    "tns-core-modules": "2.2.1",
+    "tns-platform-declarations": "2.2.0",
+    "tslint": "3.14.0",
     "typescript": "1.8.10"
   }
 }

platforms/android/include.gradle

@@ -7,5 +7,5 @@ android {
 }
 
 dependencies {
-    compile 'com.github.barteksc:android-pdf-viewer:1.1.2'
+    compile 'com.github.barteksc:android-pdf-viewer:2.0.1'
 }

src/plugin.android.ts

@@ -36,10 +36,6 @@ export class PDFView extends common.PDFView {
 
     this.android
       .fromUri(uri)
-      .enableSwipe(true)
-      .enableDoubletap(true)
-      .swipeVertical(true)
-      .showMinimap(false)
       .load();
   }
 

src/plugin.ios.ts

@@ -37,7 +37,7 @@ export class PDFView extends common.PDFView {
   }
 
   private init() {
-    this.ios = new UIWebView(CGRectInfinite);
+    this.ios = new UIWebView(UIScreen.mainScreen().bounds);
 
     this.ios.autoresizingMask =
       UIViewAutoresizing.UIViewAutoresizingFlexibleWidth |

tsconfig.json

@@ -7,8 +7,8 @@
     "sourceMap": true
   },
   "files": [
-    "./node_modules/tns-platform-declarations/android17.d.ts",
-    "./node_modules/tns-platform-declarations/ios.d.ts",
+    "./node_modules/tns-platform-declarations/tns-core-modules/android17.d.ts",
+    "./node_modules/tns-platform-declarations/tns-core-modules/ios.d.ts",
     "./node_modules/tns-core-modules/tns-core-modules.d.ts",
     "src/plugin.common.ts",
     "src/plugin.android.ts",