@triniwiz/nativescript-masonkit 1.0.0-alpha.2 → 1.0.0-alpha.22

package/index.d.ts

@@ -1,16 +1,21 @@
 import { CoreTypes } from '@nativescript/core';
 
-import { TSCViewBase } from './common';
+import { TextBase, ViewBase } from './common';
+import { LengthPercentage } from '@nativescript/core/css/parser';
 
-export type Length = CoreTypes.dip | CoreTypes.LengthDipUnit | CoreTypes.LengthPxUnit;
+export type Length = CoreTypes.dip | CoreTypes.LengthDipUnit | CoreTypes.LengthPxUnit | CoreTypes.LengthPercentUnit | `${number}px` | `${number}%` | `${number}dip`;
 
-export type LengthAuto = CoreTypes.dip | CoreTypes.LengthDipUnit | CoreTypes.LengthPxUnit | 'auto';
+export type LengthAuto = CoreTypes.dip | CoreTypes.LengthDipUnit | CoreTypes.LengthPxUnit | CoreTypes.LengthPercentUnit | 'auto' | `${number}px` | `${number}%` | `${number}dip`;
 
 export type SizeLength = { width: LengthType; height: LengthType };
 
 export type Position = 'absolute' | 'relative';
 
-export type Display = 'none' | 'flex' | 'grid';
+export type Display = 'none' | 'flex' | 'grid' | 'block' | 'inline' | 'inline-block' | 'inline-flex' | 'inline-grid';
+
+export type BoxSizing = 'border-box' | 'content-box';
+
+export type Overflow = 'visible' | 'hidden' | 'scroll';
 
 export type FlexWrap = 'no-wrap' | 'wrap' | 'wrap-reverse';
 
@@ -32,28 +37,168 @@ export type JustifySelf = AlignSelf;
 
 export type JustifyContent = AlignContent;
 
-export type GridAutoFlow = 'row' | 'column' | 'row-dense' | 'column-dense';
-
-export { applyMixins } from './helpers';
-
-export class TSCView extends TSCViewBase {}
-
-export class Grid extends TSCView {}
+export type GridAutoFlow = 'row' | 'column' | 'row dense' | 'column dense' | 'dense';
+
+export class View extends ViewBase {
+  boxSizing: BoxSizing;
+  display: Display;
+  position: Position;
+  flexDirection: FlexDirection;
+  flexWrap: FlexWrap;
+  flex: string | 'auto' | 'none' | number | 'initial';
+  flexFlow: string;
+  width: LengthAuto;
+  height: LengthAuto;
+  maxWidth: LengthAuto;
+  maxHeight: LengthAuto;
+  left: Length;
+  right: Length;
+  top: Length;
+  bottom: Length;
+  gridGap: Gap;
+  gap: Gap;
+  rowGap: Length;
+  columnGap: Length;
+  aspectRatio: number;
+  flexBasis: Length;
+  alignItems: AlignItems;
+  alignSelf: AlignSelf;
+  alignContent: AlignContent;
+  justifyItems: JustifyItems;
+  justifySelf: JustifySelf;
+  justifyContent: JustifyContent;
+  gridAutoRows: string;
+  gridAutoColumns: string;
+  gridAutoFlow: GridAutoFlow;
+  gridRowGap: Gap;
+  gridColumnGap: Gap;
+  gridArea: string;
+  gridColumn: string;
+  gridColumnStart: string;
+  gridColumnEnd: string;
+  gridRow: string;
+  gridRowStart: string;
+  gridRowEnd: string;
+  gridTemplateRows: string;
+  gridTemplateColumns: string;
+  overflow: Overflow;
+  overflowX: Overflow;
+  overflowY: Overflow;
+  scrollBarWidth: number | CoreTypes.LengthType;
+}
 
-export class Flex extends TSCView {}
+export class Text extends TextBase {
+  display: Display;
+  position: Position;
+  flexDirection: FlexDirection;
+  flexWrap: FlexWrap;
+  flex: string | 'auto' | 'none' | number | 'initial';
+  flexFlow: string;
+  width: LengthAuto;
+  height: LengthAuto;
+  maxWidth: LengthAuto;
+  maxHeight: LengthAuto;
+  left: Length;
+  right: Length;
+  top: Length;
+  bottom: Length;
+  gridGap: Gap;
+  gap: Gap;
+  rowGap: Length;
+  columnGap: Length;
+  aspectRatio: number;
+  flexBasis: Length;
+  alignItems: AlignItems;
+  alignSelf: AlignSelf;
+  alignContent: AlignContent;
+  justifyItems: JustifyItems;
+  justifySelf: JustifySelf;
+  justifyContent: JustifyContent;
+  gridAutoRows: string;
+  gridAutoColumns: string;
+  gridAutoFlow: GridAutoFlow;
+  gridRowGap: Gap;
+  gridColumnGap: Gap;
+  gridArea: string;
+  gridColumn: string;
+  gridColumnStart: string;
+  gridColumnEnd: string;
+  gridRow: string;
+  gridRowStart: string;
+  gridRowEnd: string;
+  gridTemplateRows: string;
+  gridTemplateColumns: string;
+  overflow: Overflow;
+  overflowX: Overflow;
+  overflowY: Overflow;
+  scrollBarWidth: number | CoreTypes.LengthType;
+}
 
-export class Container extends TSCView {}
+export class Img extends ViewBase {
+  src: string;
+  display: Display;
+  position: Position;
+  flexDirection: FlexDirection;
+  flexWrap: FlexWrap;
+  flex: string | 'auto' | 'none' | number | 'initial';
+  flexFlow: string;
+  minWidth: LengthAuto;
+  minHeight: LengthAuto;
+  width: LengthAuto;
+  height: LengthAuto;
+  maxWidth: LengthAuto;
+  maxHeight: LengthAuto;
+  left: Length;
+  right: Length;
+  top: Length;
+  bottom: Length;
+  gridGap: Gap;
+  gap: Gap;
+  rowGap: Length;
+  columnGap: Length;
+  aspectRatio: number;
+  flexBasis: Length;
+  alignItems: AlignItems;
+  alignSelf: AlignSelf;
+  alignContent: AlignContent;
+  justifyItems: JustifyItems;
+  justifySelf: JustifySelf;
+  justifyContent: JustifyContent;
+  gridAutoRows: string;
+  gridAutoColumns: string;
+  gridAutoFlow: GridAutoFlow;
+  gridRowGap: Gap;
+  gridColumnGap: Gap;
+  gridArea: string;
+  gridColumn: string;
+  gridColumnStart: string;
+  gridColumnEnd: string;
+  gridRow: string;
+  gridRowStart: string;
+  gridRowEnd: string;
+  gridTemplateRows: string;
+  gridTemplateColumns: string;
+  overflow: Overflow;
+  overflowX: Overflow;
+  overflowY: Overflow;
+  scrollBarWidth: Length;
+}
 
 declare module '@nativescript/core/ui/styling/style' {
   interface Style {
+    boxSizing: BoxSizing;
     display: Display;
     position: Position;
     flexDirection: FlexDirection;
     flexWrap: FlexWrap;
-    width: Length;
-    height: Length;
-    maxWidth: Length;
-    maxHeight: Length;
+    flex: string | 'auto' | 'none' | number | 'initial';
+    flexFlow: string;
+    minWidth: LengthAuto;
+    minHeight: LengthAuto;
+    width: LengthAuto;
+    height: LengthAuto;
+    maxWidth: LengthAuto;
+    maxHeight: LengthAuto;
     left: Length;
     right: Length;
     top: Length;
@@ -63,6 +208,7 @@ declare module '@nativescript/core/ui/styling/style' {
     rowGap: Length;
     columnGap: Length;
     aspectRatio: number;
+    flexBasis: LengthPercentage | string | number;
     alignItems: AlignItems;
     alignSelf: AlignSelf;
     alignContent: AlignContent;
@@ -83,5 +229,9 @@ declare module '@nativescript/core/ui/styling/style' {
     gridRowEnd: string;
     gridTemplateRows: string;
     gridTemplateColumns: string;
+    overflow: Overflow;
+    overflowX: Overflow;
+    overflowY: Overflow;
+    scrollBarWidth: Length;
   }
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@triniwiz/nativescript-masonkit",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.22",
   "description": "Web Inspired Layout",
   "main": "index",
   "typings": "index.d.ts",
   "nativescript": {
     "platforms": {
-      "ios": "6.0.0",
-      "android": "6.0.0"
+      "ios": "8.0.0",
+      "android": "8.0.0"
     }
   },
   "repository": {
@@ -33,4 +33,4 @@
   "readmeFilename": "README.md",
   "bootstrapper": "@nativescript/plugin-seed",
   "types": "./index.d.d.ts"
-}
+}

package/platforms/android/include.gradle

@@ -1 +1,22 @@
-dependencies {implementation 'com.google.code.gson:gson:2.10'}
+dependencies {
+  implementation 'com.google.code.gson:gson:2.10'
+  implementation 'com.github.bumptech.glide:glide:4.14.2'
+  annotationProcessor 'com.github.bumptech.glide:compiler:4.14.2'
+}
+
+android {
+  defaultConfig {
+    multiDexEnabled true
+  }      
+      packagingOptions {
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/x86/libc++_shared.so'
+
+         pickFirst 'lib/armeabi-v7a/libNativeScript.so'
+        pickFirst 'lib/arm64-v8a/libNativeScript.so'
+        pickFirst 'lib/x86_64/libNativeScript.so'
+        pickFirst 'lib/x86/libNativeScript.so'
+      }          
+}

package/platforms/ios/Mason.xcframework/Info.plist

@@ -5,35 +5,39 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>Mason.framework/Mason</string>
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>Mason.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>Mason.framework/Mason</string>
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>Mason.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>