fix ios padding

Author: PeterStaev

demo/app/main-page.xml

@@ -1,6 +1,6 @@
 <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"
+    <gv:GridView items="{{ items }}"  verticalSpacing="5" horizontalSpacing="5" colWidth="100" rowHeight="75" style="padding: 5;"
                  itemTap="gridViewItemTap" itemLoading="gridViewItemLoading" loadMoreItems="gridViewLoadMoreItems">
       <gv:GridView.itemTemplate>
         <GridLayout backgroundColor="#33ffff">

demo/package.json

@@ -2,19 +2,19 @@
   "nativescript": {
     "id": "net.tangrainc.gridviewsample",
     "tns-ios": {
-      "version": "2.4.0"
+      "version": "2.5.0"
     },
     "tns-android": {
-      "version": "2.4.1"
+      "version": "2.5.0"
     }
   },
   "scripts": {
-    "android": "npm uninstall nativescript-grid-view && tns deploy android",
-    "ios": "npm uninstall nativescript-grid-view && tns deploy ios"
+    "android": "npm uninstall nativescript-grid-view && tns run android",
+    "ios": "npm uninstall nativescript-grid-view && tns run ios --emulator"
   },
   "dependencies": {
-    "tns-core-modules": "2.4.4",
-    "nativescript-grid-view": "file:../bin/dist"
+    "nativescript-grid-view": "file:../bin/dist",
+    "tns-core-modules": "^2.5.0"
   },
   "devDependencies": {
     "babel-traverse": "6.21.0",
@@ -24,4 +24,4 @@
     "nativescript-dev-typescript": "0.3.5",
     "typescript": "2.1.4"
   }
-}
+}

grid-view.ios.ts

@@ -217,89 +217,19 @@ export class GridView extends common.GridView {
 
 //#region Styling
 export class GridViewStyler implements style.Styler {
-    private static setSectionInset(gridView: GridView, padding: common.Padding) {
-        let flowLayout = <UICollectionViewFlowLayout>gridView.ios.collectionViewLayout;
-        let currentInset = flowLayout.sectionInset;
-
-        flowLayout.sectionInset = {
-            top: padding.top !== undefined ? padding.top : currentInset.top,
-            right: padding.right !== undefined ? padding.right : currentInset.right,
-            bottom: padding.bottom !== undefined ? padding.bottom : currentInset.bottom,
-            left: padding.left !== undefined ? padding.left : currentInset.left
-        };
-    }
-
-    //#region Padding Top Property
-    private static setPaddingTop(gridView: GridView, newValue: number) {
-        GridViewStyler.setSectionInset(gridView, { top: newValue });
+    private static setNativePaddingsProperty(view: GridView, newValue: any) {
+        (<UICollectionViewFlowLayout>view.ios.collectionViewLayout).sectionInset =
+            UIEdgeInsetsFromString(`{${newValue.top},${newValue.left},${newValue.bottom},${newValue.right}}`);
     }
-    private static resetPaddingTop(gridView: GridView, nativeValue: number) {
-        GridViewStyler.setPaddingTop(gridView, nativeValue);
-    }
-    private static getNativePaddingTopValue(gridView: GridView): any {
-        return (<UICollectionViewFlowLayout>gridView.ios.collectionViewLayout).sectionInset.top;
-    }
-    //#endregion
 
-    //#region Padding Right Property
-    private static setPaddingRight(gridView: GridView, newValue: number) {
-        GridViewStyler.setSectionInset(gridView, { right: newValue });
-    }
-    private static resetPaddingRight(gridView: GridView, nativeValue: number) {
-        GridViewStyler.setPaddingRight(gridView, nativeValue);
-    }
-    private static getNativePaddingRightValue(gridView: GridView): any {
-        return (<UICollectionViewFlowLayout>gridView.ios.collectionViewLayout).sectionInset.right;
-    }
-    //#endregion
-
-    //#region Padding Bottom Property
-    private static setPaddingBottom(gridView: GridView, newValue: number) {
-        GridViewStyler.setSectionInset(gridView, { bottom: newValue });
-    }
-    private static resetPaddingBottom(gridView: GridView, nativeValue: number) {
-        GridViewStyler.setPaddingBottom(gridView, nativeValue);
-    }
-    private static getNativePaddingBottomValue(gridView: GridView): any {
-        return (<UICollectionViewFlowLayout>gridView.ios.collectionViewLayout).sectionInset.bottom;
+    private static resetNativePaddingsProperty(view: GridView, nativeValue: any) {
+        (<UICollectionViewFlowLayout>view.ios.collectionViewLayout).sectionInset = UIEdgeInsetsFromString("{0,0,0,0}");
     }
-    //#endregion
-
-    //#region Padding Left Property
-    private static setPaddingLeft(gridView: GridView, newValue: number) {
-        GridViewStyler.setSectionInset(gridView, { left: newValue });
-    }
-    private static resetPaddingLeft(gridView: GridView, nativeValue: number) {
-        GridViewStyler.setPaddingLeft(gridView, nativeValue);
-    }
-    private static getNativePaddingLeftValue(gridView: GridView): any {
-        return (<UICollectionViewFlowLayout>gridView.ios.collectionViewLayout).sectionInset.left;
-    }
-    //#endregion
 
     public static registerHandlers() {
-        style.registerHandler(style.paddingTopProperty,
-            new style.StylePropertyChangedHandler(GridViewStyler.setPaddingTop,
-                GridViewStyler.resetPaddingTop,
-                GridViewStyler.getNativePaddingTopValue),
-            "GridView");
-
-        style.registerHandler(style.paddingRightProperty,
-            new style.StylePropertyChangedHandler(GridViewStyler.setPaddingRight,
-                GridViewStyler.resetPaddingRight,
-                GridViewStyler.getNativePaddingRightValue),
-            "GridView");
-
-        style.registerHandler(style.paddingBottomProperty,
-            new style.StylePropertyChangedHandler(GridViewStyler.setPaddingBottom,
-                GridViewStyler.resetPaddingBottom,
-                GridViewStyler.getNativePaddingBottomValue),
-            "GridView");
-
-        style.registerHandler(style.paddingLeftProperty,
-            new style.StylePropertyChangedHandler(GridViewStyler.setPaddingLeft,
-                GridViewStyler.resetPaddingLeft,
-                GridViewStyler.getNativePaddingLeftValue),
+        style.registerHandler(style.nativePaddingsProperty,
+            new style.StylePropertyChangedHandler(GridViewStyler.setNativePaddingsProperty,
+                GridViewStyler.resetNativePaddingsProperty),
             "GridView");
     }
 

package.json

@@ -1,13 +1,13 @@
 {
   "name": "nativescript-grid-view",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "A NativeScript GridView widget.",
   "main": "grid-view",
   "typings": "grid-view.d.ts",
   "nativescript": {
     "platforms": {
-      "ios": "2.3.0",
-      "android": "2.3.0"
+      "ios": "2.5.0",
+      "android": "2.5.0"
     }
   },
 
@@ -28,8 +28,8 @@
   "devDependencies": {
     "typescript": "2.1.4",
     "tslint": "4.2.0",
-    "tns-core-modules-declarations": "2.3.1",
-    "tns-platform-declarations": "2.3.0",
+    "tns-core-modules-declarations": "2.5.0",
+    "tns-platform-declarations": "2.5.2",
 
     "grunt": "0.4.5",
     "grunt-tslint": "4.0.0",

references.d.ts

@@ -7,5 +7,5 @@
 /// <reference path="node_modules/tns-core-modules-declarations/tns-core-modules.d.ts" />
 /// <reference path="node_modules/tns-core-modules-declarations/lib.dom.d.ts" />
 
-/// <reference path="node_modules/tns-platform-declarations/tns-core-modules/android17.d.ts" />
-/// <reference path="node_modules/tns-platform-declarations/tns-core-modules/ios/ios.d.ts" />
+/// <reference path="node_modules/tns-platform-declarations/android/android17.d.ts" />
+/// <reference path="node_modules/tns-platform-declarations/ios/ios.d.ts" />