From c76e1aa880cdeb0433fb59e53d49cf06cad9d3a4 Mon Sep 17 00:00:00 2001
From: Brad Martin <bradwaynemartin@gmail.com>
Date: Mon, 23 Apr 2018 12:11:44 -0500
Subject: [PATCH] clean up

---
 .gitignore                  |  2 +-
 .prettierrc                 |  8 ++++----
 .vscode/settings.json       |  9 +++++++++
 CONTRIBUTING.md             | 29 -----------------------------
 README.md                   | 18 +++++-------------
 demo/app/main-page.xml      | 19 +++++++++----------
 demo/package.json           |  2 +-
 src/.npmignore              | 13 ++++++++++++-
 src/cardview-common.ts      | 29 ++++++++++-------------------
 src/cardview.android.ts     |  6 +++---
 src/cardview.ios.ts         | 10 +++++-----
 src/index.d.ts              |  2 +-
 src/package.json            | 18 ++++++++----------
 src/scripts/build-native.js | 24 ++++++++++++++++++++++++
 src/tsconfig.json           |  2 +-
 15 files changed, 93 insertions(+), 98 deletions(-)
 create mode 100644 .vscode/settings.json
 delete mode 100644 CONTRIBUTING.md
 create mode 100644 src/scripts/build-native.js

diff --git a/.gitignore b/.gitignore
index b18baaf..4897ff6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.js
+!src/scripts/*.js
 *.js.map
 *.log
 *.d.ts
@@ -10,6 +11,5 @@ demo/platforms
 demo/node_modules
 demo/.vscode
 node_modules
-.vscode/
 *.DS_Store
 package-lock.json
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
index d4df647..2cee17d 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,5 +1,5 @@
 {
-    "singleQuote": true,
-    "semi": true,
-    "printWidth": 120
-}
\ No newline at end of file
+  "singleQuote": true,
+  "semi": true,
+  "printWidth": 120
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..1a4522d
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,9 @@
+{
+    "files.watcherExclude": {
+        "**/.git/objects/**": true,
+        "**/.git/subtree-cache/**": true,
+        "**/platforms/**": true,
+        "**/hooks/**": true,
+        "**/node_modules/**": true
+    }
+}
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index eb3c858..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,29 +0,0 @@
-## Developing
-
-### Setup
-
-```
-npm install typescript -g
-npm install
-npm run build  // you will see TypeScript warnings; you can ignore them
-cd demo
-npm install
-tns platform add android
-tns platform add ios
-
-tns run android
-// or...
-tns run ios
-```
-
-## Submitting Pull Requests
-
-**Please follow these basic steps to simplify pull request reviews - if you don't you'll probably just be asked to anyway.**
-
-* Please rebase your branch against the current master
-* Make reference to possible [issues](https://github.com/bradmartin/nativescript-cardview/issues) on PR comment
-
-## Submitting bug reports
-
-* Please detail the affected platform and version
-* Please be sure to state which version of node, npm, and NativeScript you're using
\ No newline at end of file
diff --git a/README.md b/README.md
index 44ba102..6255812 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,8 @@ Be sure to run a new build after adding plugins to avoid any issues. Here is a p
 
 ### Usage
 
+_iOS note: Setting a background-color will help if you do not see the card on the page._
+
 ## Plain NativeScript
 
 <span style="color:red">IMPORTANT: </span>_Make sure you include `xmlns:Card="nativescript-cardview"` on the Page element_
@@ -85,12 +87,12 @@ Be sure to run a new build after adding plugins to avoid any issues. Here is a p
 }
 ```
 
-## Angular NativeScript
+## NativeScript + Angular
 
-```TS
+```typescript
 import { registerElement } from 'nativescript-angular/element-registry';
 import { CardView } from 'nativescript-cardview';
-registerElement("CardView", () => CardView);
+registerElement('CardView', () => CardView);
 ```
 
 ```html
@@ -168,10 +170,6 @@ shadowRadius = 1;
 | --------------------------------------- | --------------------------------------- |
 | ![Sample1](images/sample_card1_ios.png) | ![Sample2](images/sample_card3_ios.png) |
 
-#### Contributing
-
-[Please follow here](https://github.com/bradmartin/nativescript-cardview/blob/master/CONTRIBUTING.md)
-
 #### Contributors
 
 | [<img alt="bradmartin" src="https://avatars3.githubusercontent.com/u/6006148?v=3&s=117" width="117">](https://github.com/bradmartin) | [<img alt="NathanWalker" src="https://avatars1.githubusercontent.com/u/457187?v=3&s=117" width="117">](https://github.com/NathanWalker) | [<img alt="manijak" src="https://avatars3.githubusercontent.com/u/3605066?v=3&s=117" width="117">](https://github.com/manijak) | [<img alt="NathanaelA" src="https://avatars0.githubusercontent.com/u/850871?v=3&s=117" width="117">](https://github.com/NathanaelA) | [<img alt="EddyVerbruggen" src="https://avatars2.githubusercontent.com/u/1426370?v=3&s=117" width="117">](https://github.com/EddyVerbruggen) | [<img alt="sis0k0" src="https://avatars1.githubusercontent.com/u/7893485?v=3&s=117" width="117">](https://github.com/sis0k0) |
@@ -181,9 +179,3 @@ shadowRadius = 1;
 | [<img alt="vladimirnani" src="https://avatars0.githubusercontent.com/u/3397077?v=3&s=117" width="117">](https://github.com/vladimirnani) | [<img alt="DickSmith" src="https://avatars0.githubusercontent.com/u/6675511?v=3&s=117" width="117">](https://github.com/DickSmith) |
 | :--------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------: |
 |                                             [vladimirnani](https://github.com/vladimirnani)                                              |                                             [DickSmith](https://github.com/DickSmith)                                              |
-
-## [nStudio, LLC](http://nstudio.io)
-
-[![nStudio](./images/nstudio-banner.png 'nStudio')](http://nStudio.io)
-
-Do you need assistance on your project or plugin? Contact the nStudio team anytime at <mailto:team@nstudio.io> to get up to speed with the best practices in mobile and web app development.
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
index 170209e..725d8fa 100644
--- a/demo/app/main-page.xml
+++ b/demo/app/main-page.xml
@@ -1,16 +1,15 @@
-<page xmlns="http://schemas.nativescript.org/tns.xsd" 
-      xmlns:Card="nativescript-cardview" 
-      loaded="pageLoaded">
-      
+<page 
+    xmlns="http://schemas.nativescript.org/tns.xsd" 
+    xmlns:Card="nativescript-cardview" loaded="pageLoaded">
     <action-bar title="CardView" backgroundColor="#009688" color="#fff" />
     <scroll-view>
         <stack-layout>
-            <Card:CardView class="blackCard" radius="10" loaded="cardLoaded" elevation="20" margin="10" id="batCard">
-                <grid-layout rows="200, auto, auto" columns="auto, auto, *">
-                    <image src="~/images/batman.jpg" stretch="aspectFill" margin="10" colSpan="3" row="0" />
-                    <label text="Batman wants to be friends?" class="info" textWrap="true" row="1" colSpan="3" />
-                    <button text="DECLINE" tap="{{ goAway }}" class="blue" row="2" col="0" />
-                    <button text="ACCEPT" class="blue" row="2" col="1" />
+            <Card:CardView margin="5" loaded="{{ cardLoaded }}" id="batCard" class="whiteCard">
+                <grid-layout rows="200, auto, auto" columns="*, *">
+                    <image src="~/images/batman.jpg" stretch="aspectFill" margin="10" colSpan="2" row="0" />
+                    <label text="Batman wants to be friends?" class="info" textWrap="true" row="1" colSpan="2" />
+                    <button text="Decline" tap="{{ goAway }}" class="blue" row="2" col="0" />
+                    <button text="Accept" tap="{{ goAway }}" class="blue" row="2" col="1" />
                 </grid-layout>
             </Card:CardView>
             <grid-layout rows="*" columns="*, *">
diff --git a/demo/package.json b/demo/package.json
index 1af766e..9e65c66 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -2,7 +2,7 @@
   "nativescript": {
     "id": "org.nativescript.demo",
     "tns-android": {
-      "version": "4.0.0"
+      "version": "4.0.1"
     },
     "tns-ios": {
       "version": "4.0.1"
diff --git a/src/.npmignore b/src/.npmignore
index b7596fc..392d630 100644
--- a/src/.npmignore
+++ b/src/.npmignore
@@ -3,6 +3,8 @@
 .vs/
 demo/
 screenshots/
+node_modules/
+scripts/
 images/
 .sln
 *.sln
@@ -13,4 +15,13 @@ README.md
 !index.d.ts
 *.map
 tsconfig.json
-*.log
\ No newline at end of file
+*.log
+
+*.map
+*.ts
+!*.d.ts
+tsconfig.json
+platforms/android/*
+!platforms/android/include.gradle
+!platforms/android/*.aar
+!platforms/android/*.jar
\ No newline at end of file
diff --git a/src/cardview-common.ts b/src/cardview-common.ts
index 2bc4958..016b617 100644
--- a/src/cardview-common.ts
+++ b/src/cardview-common.ts
@@ -1,15 +1,6 @@
-import { Color } from "tns-core-modules/color";
-import { ContentView } from "tns-core-modules/ui/content-view";
-import {
-  backgroundColorProperty,
-  backgroundInternalProperty,
-  Property
-} from "tns-core-modules/ui/core/view";
-
-export {
-  backgroundColorProperty,
-  backgroundInternalProperty
-} from "tns-core-modules/ui/core/view";
+import { Color } from 'tns-core-modules/color';
+import { ContentView, Property } from 'tns-core-modules/ui/content-view';
+export { backgroundColorProperty, backgroundInternalProperty } from 'tns-core-modules/ui/core/view';
 
 /**
  * Contains the CardView class, which represents a card view component.
@@ -62,43 +53,43 @@ export class CardViewCommon extends ContentView {
 }
 
 export const radiusProperty = new Property<CardViewCommon, number>({
-  name: "radius",
+  name: 'radius',
   valueConverter: value => +value
 });
 radiusProperty.register(CardViewCommon);
 
 export const elevationProperty = new Property<CardViewCommon, number>({
-  name: "elevation",
+  name: 'elevation',
   valueConverter: value => +value
 });
 elevationProperty.register(CardViewCommon);
 
 export const shadowRadiusProperty = new Property<CardViewCommon, number>({
-  name: "shadowRadius",
+  name: 'shadowRadius',
   valueConverter: value => +value
 });
 shadowRadiusProperty.register(CardViewCommon);
 
 export const shadowOffsetWidthProperty = new Property<CardViewCommon, number>({
-  name: "shadowOffsetWidth",
+  name: 'shadowOffsetWidth',
   valueConverter: value => +value
 });
 shadowOffsetWidthProperty.register(CardViewCommon);
 
 export const shadowOffsetHeightProperty = new Property<CardViewCommon, number>({
-  name: "shadowOffsetHeight",
+  name: 'shadowOffsetHeight',
   valueConverter: value => +value
 });
 shadowOffsetHeightProperty.register(CardViewCommon);
 
 export const shadowColorProperty = new Property<CardViewCommon, Color>({
-  name: "shadowColor",
+  name: 'shadowColor',
   valueConverter: value => new Color(value)
 });
 shadowColorProperty.register(CardViewCommon);
 
 export const shadowOpacityProperty = new Property<CardViewCommon, number>({
-  name: "shadowOpacity",
+  name: 'shadowOpacity',
   valueConverter: value => +value
 });
 shadowOpacityProperty.register(CardViewCommon);
diff --git a/src/cardview.android.ts b/src/cardview.android.ts
index b125b6f..788eb53 100644
--- a/src/cardview.android.ts
+++ b/src/cardview.android.ts
@@ -1,3 +1,5 @@
+/// <reference path="./node_modules/tns-platform-declarations/android.d.ts" />
+
 import { Color } from 'tns-core-modules/color';
 import {
   backgroundColorProperty,
@@ -7,8 +9,6 @@ import {
   radiusProperty
 } from './cardview-common';
 
-declare var android: any;
-
 export class CardView extends CardViewCommon {
   private _androidViewId: number;
   public nativeView;
@@ -26,7 +26,7 @@ export class CardView extends CardViewCommon {
   }
 
   public createNativeView() {
-    return new android.support.v7.widget.CardView(this._context);
+    return new (android.support.v7.widget as any).CardView(this._context);
   }
 
   public initNativeView() {
diff --git a/src/cardview.ios.ts b/src/cardview.ios.ts
index 6b6d937..89da8a1 100644
--- a/src/cardview.ios.ts
+++ b/src/cardview.ios.ts
@@ -1,3 +1,5 @@
+/// <reference path="./node_modules/tns-platform-declarations/ios.d.ts" />
+
 import { Color } from 'tns-core-modules/color';
 import { screen } from 'tns-core-modules/platform';
 import {
@@ -12,15 +14,13 @@ import {
   shadowRadiusProperty
 } from './cardview-common';
 
-declare var UIView: any, CGRectMake: any, CGSizeMake: any;
-
 export class CardView extends CardViewCommon {
-  public nativeView;
+  public nativeView: UIView;
 
   constructor() {
     super();
-    let width = screen.mainScreen.widthDIPs - 20;
-    this.nativeView = new UIView(CGRectMake(10, 30, width, 0));
+    const width = screen.mainScreen.widthDIPs - 20;
+    this.nativeView = new UIView({ frame: CGRectMake(10, 30, width, 0) });
     this.nativeView.layer.masksToBounds = false;
     this.shadowColor = 'black';
     this.radius = 1;
diff --git a/src/index.d.ts b/src/index.d.ts
index a72d870..bba4eeb 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -1,4 +1,4 @@
-import { ContentView } from "ui/content-view";
+import { ContentView } from 'tns-core-modules/ui/content-view';
 
 /**
  * Contains the CardView class, which represents a card view component.
diff --git a/src/package.json b/src/package.json
index 7ddeaa3..ce21130 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-cardview",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "A NativeScript plugin for Material Design CardView component.",
   "main": "cardview",
   "typings": "index.d.ts",
@@ -12,7 +12,8 @@
   },
   "scripts": {
     "tsc": "tsc -skipLibCheck",
-    "build": "npm i && tsc",
+    "build": "npm i && tsc && npm run build.native",
+    "build.native": "node scripts/build-native.js",
     "postclone": "npm i && node scripts/postclone.js && cd ../demo && npm i && cd ../src && npm run plugin.link",
     "test.android":
       "npm i && npm run tsc && npm run tslint && cd ../demo && tns build android && tns test android --justlaunch",
@@ -27,7 +28,7 @@
     "clean":
       "cd ../demo && rimraf hooks node_modules platforms && cd ../src && rimraf node_modules && npm run plugin.link",
     "ci.tslint": "npm i && tslint '**/*.ts' --config '../tslint.json' --exclude '**/node_modules/**'",
-    "prepare": "node scripts/prepare.js"
+    "prepack": "npm run build.native"
   },
   "lint-staged": {
     "*.ts": ["prettier --write", "git add"]
@@ -86,14 +87,11 @@
   "homepage": "https://github.com/bradmartin/nativescript-cardview",
   "readme": "README.md",
   "readmeFilename": "README.md",
-  "peerDependencies": {
-    "tns-core-modules": "^3.3.0"
-  },
   "devDependencies": {
-    "husky": "^0.13.4",
-    "lint-staged": "^3.6.1",
-    "prettier": "^1.12.0",
-    "tns-core-modules": "^3.4.0",
+    "husky": "^0.14.3",
+    "lint-staged": "^7.0.4",
+    "prettier": "^1.12.1",
+    "tns-core-modules": "^4.0.0",
     "tns-platform-declarations": "~3.4.0",
     "typescript": "2.6.2",
     "prompt": "^1.0.0",
diff --git a/src/scripts/build-native.js b/src/scripts/build-native.js
new file mode 100644
index 0000000..07a470f
--- /dev/null
+++ b/src/scripts/build-native.js
@@ -0,0 +1,24 @@
+const { exec } = require('child_process');
+const semver = require('semver');
+
+exec('tns --version', (err, stdout, stderr) => {
+  if (err) {
+    // node couldn't execute the command
+    console.log(`tns --version err: ${err}`);
+    return;
+  }
+
+  const tnsVersion = semver.major(stdout);
+
+  // execute 'tns plugin build' for {N} version > 4. This command builds .aar in platforms/android folder.
+  if (tnsVersion >= 4) {
+    console.log(`executing 'tns plugin build'`);
+    exec('tns plugin build', (err, stdout, stderr) => {
+      if (err) {
+        // node couldn't execute the command
+        console.log(`${err}`);
+        return;
+      }
+    });
+  }
+});
diff --git a/src/tsconfig.json b/src/tsconfig.json
index a608474..fc064c1 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -18,7 +18,7 @@
     "lib": ["es6", "dom"],
     "baseUrl": ".",
     "paths": {
-      "*": ["./node_modules/tns-core-modules/*", "./node_modules/*"]
+      "*": ["./node_modules/tns-core-modules/*", "./node_modules/*", "demo/node_modules", "platforms"]
     }
   },
   "files": ["cardview-common.ts", "cardview.android.ts", "cardview.ios.ts"],