getting ready to pub 1.0 (ios support)

Author: Bradley Martin

.gitignore

@@ -1,10 +1,13 @@
 .vs
 .vs/
+.vscode/
 *.js
 *.map
 demo/platforms
 demo/node_modules
 demo/hooks
 demo/tsconfig.json
+hooks/
+node_modules/
 .DS_Store
 *.gitattributes

README.md

@@ -5,7 +5,11 @@
 NativeScript plugin to provide a way to capture any drawing (signatures are a common use case) from the device.
 You can use this component to capture really anything you want that can be drawn on the screen. Go crazy with it!!!
 
-## WARNING - iOS is in development and should be available soon. ANDROID ONLY for now.
+## Samples
+
+Android |  iOS 
+-------- | ---------
+![Sample1](screens/androidDrawing.gif) | ![Sample2](screens/iosDrawing.gif)
 
 #### Native Libraries: 
 Android | iOS
@@ -74,10 +78,4 @@ Attribute to specify the pen (stroke) width to use.
 ## Methods 
 **getDrawing()** - Promise *(returns image if successful)*
 
-**clearDrawing()** - clears the drawing from the DrawingPad view.
-
-## Sample Screenshots
-
-Sample 1 |  Sample 2 
--------- | ---------
-![Sample1](screens/sample1.png) | ![Sample2](screens/sample2.png)
+**clearDrawing()** - clears the drawing from the DrawingPad view.

demo/app/main-page.js

@@ -15,7 +15,7 @@ function pageLoaded(args) {
         window.setStatusBarColor(new color.Color("#0288D1").android);
     }
 }
-exports.pageLoaded = pageLoaded;
+exports.pageLoaded = pageLoaded; 
 
 
 

demo/app/main-page.xml

@@ -3,16 +3,17 @@
     <ScrollView>
         <StackLayout>
 
-            <DrawingPad:DrawingPad 
-            backgroundColor="black" 
+            <DrawingPad:DrawingPad
+            backgroundColor="#222"
             margin="10" height="400" 
             id="drawingPad" 
             penColor="#ff4081" penWidth="3" />
 
             <StackLayout orientation="horizontal">
                 <Button text="Get Drawing" tap="getMyDrawing" />
-                <button text="Clear Drawing" tap="clearMyDrawing" />
+                <Button text="Clear Drawing" tap="clearMyDrawing" />
             </StackLayout>
+            
         </StackLayout>
     </ScrollView>
 </Page>

drawingpad.android.ts

@@ -1,5 +1,4 @@
 import common = require("./drawingpad-common");
-import definition = require("nativescript-drawingpad");
 import { Color } from "color";
 
 global.moduleMerge(common, exports);
@@ -9,11 +8,11 @@ declare var com: any;
 export class DrawingPad extends common.DrawingPad {
     private _android: com.github.gcacace.signaturepad.views.SignaturePad;
 
-    get android(): com.github.gcacace.signaturepad.views.SignaturePad {
+    get android() {
         return this._android;
     }
 
-    get _nativeView(): com.github.gcacace.signaturepad.views.SignaturePad {
+    get _nativeView() {
         return this._android;
     }
 

drawingpad.ios.ts

@@ -7,13 +7,13 @@ global.moduleMerge(common, exports);
 declare var SignatureView: any, CGRectMake: any;
 
 export class DrawingPad extends common.DrawingPad {
-    private _ios: SignatureView;
+    private _ios: any = SignatureView;
 
-    get ios(): SignatureView {
+    get ios(): any {
         return this._ios;
     }
 
-    get _nativeView(): SignatureView {
+    get _nativeView(): any {
         return this._ios;
     }
 
@@ -27,33 +27,32 @@ export class DrawingPad extends common.DrawingPad {
         super.onLoaded();
 
         try {
-            this._ios = SignatureView.alloc().initWithFrame(CGRectMake(0, 0, 100, 100));
-
             if (this.penColor) {
-                this._ios.foregroundLineColor = new Color(this.penColor).ios;
-                this._ios.backgroundLineColor = new Color(this.penColor).ios;
+                let value = this.penColor;
+                this._ios.setLineColor(new Color(value).ios);
             }
 
             if (this.penWidth) {
-                this._ios.foregroundLineWidth = this.penWidth;
-                this._ios.backgroundLineWidth = this.penWidth;
+                let value = this.penWidth;
+                this._ios.setLineWidth(value);
             }
 
         } catch (ex) {
             console.log(ex);
-        }
-
-        // if (isNaN(this.width) || isNaN(this.height)) {
-        //     this.requestLayout();
-        // }
+        }      
 
     }
 
-    public getDrawing():Promise<any> {
+    public getDrawing(): Promise<any> {
         return new Promise((resolve, reject) => {
             try {
-                let data = this._ios.signatureData();
-                resolve(data);
+                let isSigned = this._ios.isSigned();
+                if (isSigned === true) {
+                    let data = this._ios.signatureImage();
+                    resolve(data);
+                } else {
+                    reject("DrawingPad is empty.");
+                }
             } catch (err) {
                 reject(err);
             }
@@ -62,7 +61,7 @@ export class DrawingPad extends common.DrawingPad {
 
     public clearDrawing(): any {
         try {
-            this._ios.UILongPressGestureRecognizer();
+            this._ios.clear();
         } catch (err) {
             console.log("Error clearing the DrawingPad: " + err);
         }

screens/iosDrawing.gif

@@ -12,5 +12,9 @@
         "drawingpad.ios.ts",
         "drawingpad-common.ts"
     ],
-    "compileOnSave": false
+    "compileOnSave": false,
+    "exclude": [
+        "node_modules",
+        "platforms"
+    ]
 }