Merge branch 'core3'

Author: PeterStaev

.gitignore

@@ -52,5 +52,6 @@ obj
 !gruntfile.js
 node_modules
 *.tmp.*
-platforms
-demo/lib
+demo/platforms
+demo/lib
+!webpack.*.js

.vscode/tasks.json

@@ -11,7 +11,10 @@
 			"taskName": "build",
 			"args": [], 
 			"isBuildCommand": true, 
-			"problemMatcher": ["$tsc"]
+			"problemMatcher": ["$tsc", {
+                "base": "$tslint5",
+                "fileLocation": "relative"
+            }]
 		}	
 	]
 }

README.md

@@ -4,7 +4,7 @@
 [![npm downloads](https://img.shields.io/npm/dt/nativescript-grid-view.svg)](https://www.npmjs.com/package/nativescript-grid-view)
 [![npm](https://img.shields.io/npm/v/nativescript-grid-view.svg)](https://www.npmjs.com/package/nativescript-grid-view)
 
-A NativeScript GridView widget. The GridView displays data in separate cells, each cell representing one data item. For iOS wraps up [UICollectionView](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UICollectionView_class/) and for Android wraps up [GridView](http://developer.android.com/guide/topics/ui/layout/gridview.html)
+A NativeScript GridView widget. The GridView displays data in separate cells, each cell representing one data item. For iOS wraps up [UICollectionView](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UICollectionView_class/) and for Android wraps up [RecyclerView](https://developer.android.com/reference/android/support/v7/widget/RecyclerView.html)
 
 ## Screenshot
 ![Screenshot of Android](https://raw.githubusercontent.com/PeterStaev/NativeScript-Grid-View/master/docs/screenshot.png)
@@ -55,43 +55,23 @@ String value used when hooking to itemTapEvent event.
 * **loadMoreItemsEvent** - *String*  
 String value used when hooking to itemTapEvent event.
 
-* **itemsProperty** - *[Property](http://docs.nativescript.org/ApiReference/ui/core/dependency-observable/Property.html)*  
-Represents the observable property backing the items property of each GridView instance.
-
-* **itemTemplateProperty** - *[Property](http://docs.nativescript.org/ApiReference/ui/core/dependency-observable/Property.html)*  
-Represents the item template property of each GridView instance.
-
-* **colWidthProperty** - *[Property](http://docs.nativescript.org/ApiReference/ui/core/dependency-observable/Property.html)*  
-Represents the column width property for each column in the GridView instance.
-
-* **rowHeightProperty** - *[Property](http://docs.nativescript.org/ApiReference/ui/core/dependency-observable/Property.html)*  
-Represents the row height property for each row in the GridView instance.
- 
-* **verticalSpacingProperty** - *[Property](http://docs.nativescript.org/ApiReference/ui/core/dependency-observable/Property.html)*  
-Represents the vertical spacing property between each item in the GridView instance. 
-
-* **horizontalSpacingProperty** - *[Property](http://docs.nativescript.org/ApiReference/ui/core/dependency-observable/Property.html)*  
-Represents the horizontal spacing property between each item in the GridView instance.   
-Note that this is the minimum space to be left horizontally between items. It might grow depending on screen and item size. 
-
-
 ### Instance Properties
 * **ios** - *[UICollectionView](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UICollectionView_class/)*  
 Gets the native iOS view that represents the user interface for this component. Valid only when running on iOS.
 
-* **android** - *[android.widget.GridView](http://developer.android.com/guide/topics/ui/layout/gridview.html)*  
+* **android** - *[android.support.v7.widget.RecyclerView](https://developer.android.com/reference/android/support/v7/widget/RecyclerView.html)*  
 Gets the native android widget that represents the user interface for this component. Valid only when running on Android OS.
 
-* **items** - *Object*  
+* **items** - *Array | ItemsSource*  
 Gets or sets the items collection of the GridView. The items property can be set to an array or an object defining length and getItem(index) method.
 
 * **itemTemplate** - *String*  
 Gets or sets the item template of the GridView.
 
-* **rowHeight** - *Number*  
+* **rowHeight** - *PercentLength*  
 Gets or sets the height for every row in the GridView.
 
-* **colWidth** - *Number*  
+* **colWidth** - *PercentLength*  
 Gets or sets the width for every column in the GridView.
 
 ### Instance Methods
@@ -103,10 +83,9 @@ Forces the GridView to reload all its items.
 <!-- test-page.xml -->
 <Page xmlns="http://schemas.nativescript.org/tns.xsd" xmlns:gv="nativescript-grid-view" loaded="pageLoaded">
   <GridLayout>
-    <gv:GridView items="{{ items }}"  verticalSpacing="5" horizontalSpacing="5" colWidth="100" rowHeight="75" padding="5"
-                 itemTap="gridViewItemTap" itemLoading="gridViewItemLoading" loadMoreItems="gridViewLoadMoreItems">
+    <gv:GridView items="{{ items }}" colWidth="24%" rowHeight="15%" padding="5" itemTap="gridViewItemTap" itemLoading="gridViewItemLoading" loadMoreItems="gridViewLoadMoreItems">
       <gv:GridView.itemTemplate>
-        <GridLayout backgroundColor="#33ffff">
+        <GridLayout backgroundColor="#33ffff" style="margin: 5">
           <Label text="{{ value }}" verticalAlignment="center"/>
         </GridLayout>
       </gv:GridView.itemTemplate>
@@ -117,41 +96,61 @@ Forces the GridView to reload all its items.
 
 ```TypeScript
 // test-page.ts
-/// <reference path="../node_modules/nativescript-grid-view/grid-view.d.ts" />
-import observable = require("data/observable");
-import observableArray = require("data/observable-array");
-import pages = require("ui/page");
-import gridView = require("nativescript-grid-view");
+import { EventData, Observable } from "data/observable";
+import { ObservableArray } from "data/observable-array";
+import { Page } from "ui/page";
 
-var viewModel: observable.Observable;
+import { GridItemEventData } from "nativescript-grid-view";
 
-export function pageLoaded(args: observable.EventData) 
-{
-    var page = <pages.Page>args.object;
-    var items = new observableArray.ObservableArray();
+let viewModel: Observable;
 
-    for (var loop = 0; loop < 200; loop++)
-    {
+export function pageLoaded(args: EventData) {
+    const page = args.object as Page;
+    const items = new ObservableArray();
+
+    for (let loop = 0; loop < 200; loop++) {
         items.push({ value: "test " + loop.toString() });
     }
-    viewModel = new observable.Observable();
+    viewModel = new Observable();
     viewModel.set("items", items);
 
     page.bindingContext = viewModel;
 }
 
-export function gridViewItemTap(args: gridView.GridItemEventData)
-{
+export function gridViewItemTap(args: GridItemEventData) {
     console.log("tap index " + args.index.toString());
 }
 
-export function gridViewItemLoading(args: gridView.GridItemEventData)
-{
-    console.log("item loading " + args.index.toString())
+export function gridViewItemLoading(args: GridItemEventData) {
+    console.log("item loading " + args.index.toString());
 }
 
-export function gridViewLoadMoreItems(args: observable.EventData)
-{
+export function gridViewLoadMoreItems(args: EventData) {
     console.log("load more items");
 }
 ```
+
+## Working with Webpack+Uglify
+In case you are uing webpack and also are minifying/uglifying your code, there are some specific names that should be excluded from the uglification for the widget to work properly. The GridView widget exports those and you need to add them to the mangle exclude option of the uglifyjs plugin in the `webpack.common.js` file:
+```js
+var gridViewMangleExcludes = require("nativescript-grid-view/uglify-mangle-excludes").default;
+//......
+module.exports = function (platform, destinationApp) {
+    //......
+    if (process.env.npm_config_uglify) {
+        plugins.push(new webpack.LoaderOptionsPlugin({
+            minimize: true
+        }));
+
+        //Work around an Android issue by setting compress = false
+        var compress = platform !== "android";
+        plugins.push(new webpack.optimize.UglifyJsPlugin({
+            mangle: {
+                except: nsWebpack.uglifyMangleExcludes.concat(gridViewMangleExcludes),
+            },
+            compress: compress,
+        }));
+    }
+   //......
+}
+```

demo/.vscode/launch.json

@@ -0,0 +1,41 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch on iOS",
+            "type": "nativescript",
+            "request": "launch",
+            "platform": "ios",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "watch": true
+        },
+        {
+            "name": "Attach on iOS",
+            "type": "nativescript",
+            "request": "attach",
+            "platform": "ios",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "watch": false
+        },
+        {
+            "name": "Launch on Android",
+            "type": "nativescript",
+            "request": "launch",
+            "platform": "android",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "watch": true
+        },
+        {
+            "name": "Attach on Android",
+            "type": "nativescript",
+            "request": "attach",
+            "platform": "android",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "watch": false
+        }
+    ]
+}

demo/app/App_Resources/Android/AndroidManifest.xml

@@ -22,16 +22,18 @@
 		android:name="com.tns.NativeScriptApplication"
 		android:allowBackup="true"
 		android:icon="@drawable/icon"
-		android:label="@string/app_name"
-		android:theme="@style/AppTheme" >
+		android:label="GridView"
+		android:theme="@style/AppTheme">
+
 		<activity
 			android:name="com.tns.NativeScriptActivity"
-			android:label="@string/title_activity_kimera"
-			android:configChanges="keyboardHidden|orientation|screenSize">
+			android:configChanges="keyboardHidden|orientation|screenSize"
+			android:theme="@style/LaunchScreenTheme">
 
-				<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
+			<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
 
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 		</activity>

demo/app/App_Resources/Android/app.gradle

@@ -0,0 +1,16 @@
+// Add your native dependencies here:
+
+// Uncomment to add recyclerview-v7 dependency
+//dependencies {
+//	compile 'com.android.support:recyclerview-v7:+'
+//}
+
+android {  
+  defaultConfig {  
+    generatedDensities = []
+    applicationId = "com.tangrainc.gridviewsample"  
+  }  
+  aaptOptions {  
+    additionalParameters "--no-version-vectors"  
+  }  
+}