nativescript-material-core - npm Package Compare versions

Comparing version 2.1.6 to 2.1.7

android/utils.d.ts

@@ -1,11 +0,22 @@
-export declare function getPRESSED_STATE_SET(): void;
-export declare function getHOVERED_FOCUSED_STATE_SET(): void;
-export declare function getFOCUSED_STATE_SET(): void;
-export declare function getHOVERED_STATE_SET(): void;
-export declare function getSELECTED_PRESSED_STATE_SET(): void;
-export declare function getSELECTED_HOVERED_FOCUSED_STATE_SET(): void;
-export declare function getSELECTED_FOCUSED_STATE_SET(): void;
-export declare function getSELECTED_HOVERED_STATE_SET(): void;
-export declare function getSELECTED_STATE_SET(): void;
+export declare const state: {
+    readonly selected: number;
+    readonly hovered: number;
+    readonly focused: number;
+    readonly enabled: number;
+    readonly pressed: number;
+    readonly window_focused: number;
+    readonly checked: number;
+};
+export declare const stateSets: {
+    readonly PRESSED_STATE_SET: number[];
+    readonly HOVERED_FOCUSED_STATE_SET: number[];
+    readonly FOCUSED_STATE_SET: number[];
+    readonly HOVERED_STATE_SET: number[];
+    readonly SELECTED_PRESSED_STATE_SET: native.Array<number>;
+    readonly SELECTED_HOVERED_FOCUSED_STATE_SET: number[];
+    readonly SELECTED_FOCUSED_STATE_SET: number[];
+    readonly SELECTED_HOVERED_STATE_SET: number[];
+    readonly SELECTED_STATE_SET: number[];
+};
 export declare function getRippleColorStateList(color: number): globalAndroid.content.res.ColorStateList;
 export declare function getEnabledColorStateList(color: number, variant: string): globalAndroid.content.res.ColorStateList;

android/utils.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var color_1 = require("tns-core-modules/color/color");
-var PRESSED_STATE_SET;
-var HOVERED_FOCUSED_STATE_SET;
-var FOCUSED_STATE_SET;
-var HOVERED_STATE_SET;
-var SELECTED_PRESSED_STATE_SET;
-var SELECTED_HOVERED_FOCUSED_STATE_SET;
-var SELECTED_FOCUSED_STATE_SET;
-var SELECTED_HOVERED_STATE_SET;
-var SELECTED_STATE_SET;
-function getPRESSED_STATE_SET() {
-    if (!PRESSED_STATE_SET) {
-        PRESSED_STATE_SET = [android.R.attr.state_pressed];
+exports.state = {
+    get selected() {
+        return 16842913;
+    },
+    get hovered() {
+        return 16843623;
+    },
+    get focused() {
+        return 16842908;
+    },
+    get enabled() {
+        return 16842910;
+    },
+    get pressed() {
+        return 16842919;
+    },
+    get window_focused() {
+        return 16842909;
+    },
+    get checked() {
+        return 16842912;
     }
-}
-exports.getPRESSED_STATE_SET = getPRESSED_STATE_SET;
-function getHOVERED_FOCUSED_STATE_SET() {
-    if (!HOVERED_FOCUSED_STATE_SET) {
-        HOVERED_FOCUSED_STATE_SET = [android.R.attr.state_hovered, android.R.attr.state_focused];
+};
+exports.stateSets = {
+    get PRESSED_STATE_SET() {
+        if (!this._PRESSED_STATE_SET) {
+            this._PRESSED_STATE_SET = [exports.state.pressed];
+        }
+        return this._PRESSED_STATE_SET;
+    },
+    get HOVERED_FOCUSED_STATE_SET() {
+        if (!this._HOVERED_FOCUSED_STATE_SET) {
+            this._HOVERED_FOCUSED_STATE_SET = [exports.state.hovered, exports.state.focused];
+        }
+        return this._PRESSED_STATE_SET;
+    },
+    get FOCUSED_STATE_SET() {
+        if (!this._FOCUSED_STATE_SET) {
+            this._FOCUSED_STATE_SET = [exports.state.focused];
+        }
+        return this._FOCUSED_STATE_SET;
+    },
+    get HOVERED_STATE_SET() {
+        if (!this._HOVERED_STATE_SET) {
+            this._HOVERED_STATE_SET = [exports.state.hovered];
+        }
+        return this._HOVERED_STATE_SET;
+    },
+    get SELECTED_PRESSED_STATE_SET() {
+        if (!this._SELECTED_PRESSED_STATE_SET) {
+            this._SELECTED_PRESSED_STATE_SET = Array.create('int', 2);
+            this._SELECTED_PRESSED_STATE_SET[0] = exports.state.enabled;
+            this._SELECTED_PRESSED_STATE_SET[1] = exports.state.pressed;
+        }
+        return this._SELECTED_PRESSED_STATE_SET;
+    },
+    get SELECTED_HOVERED_FOCUSED_STATE_SET() {
+        if (!this._SELECTED_HOVERED_FOCUSED_STATE_SET) {
+            this._SELECTED_HOVERED_FOCUSED_STATE_SET = [exports.state.selected, exports.state.hovered, exports.state.focused];
+        }
+        return this._SELECTED_HOVERED_FOCUSED_STATE_SET;
+    },
+    get SELECTED_FOCUSED_STATE_SET() {
+        if (!this._SELECTED_FOCUSED_STATE_SET) {
+            this._SELECTED_FOCUSED_STATE_SET = [exports.state.selected, exports.state.focused];
+        }
+        return this._SELECTED_FOCUSED_STATE_SET;
+    },
+    get SELECTED_HOVERED_STATE_SET() {
+        if (!this._SELECTED_HOVERED_STATE_SET) {
+            this._SELECTED_HOVERED_STATE_SET = [exports.state.selected, exports.state.hovered];
+        }
+        return this._SELECTED_HOVERED_STATE_SET;
+    },
+    get SELECTED_STATE_SET() {
+        if (!this._SELECTED_STATE_SET) {
+            this._SELECTED_STATE_SET = [exports.state.selected];
+        }
+        return this._SELECTED_STATE_SET;
     }
-}
-exports.getHOVERED_FOCUSED_STATE_SET = getHOVERED_FOCUSED_STATE_SET;
-function getFOCUSED_STATE_SET() {
-    if (!FOCUSED_STATE_SET) {
-        FOCUSED_STATE_SET = [android.R.attr.state_focused];
-    }
-}
-exports.getFOCUSED_STATE_SET = getFOCUSED_STATE_SET;
-function getHOVERED_STATE_SET() {
-    if (!HOVERED_STATE_SET) {
-        HOVERED_STATE_SET = [android.R.attr.state_hovered];
-    }
-}
-exports.getHOVERED_STATE_SET = getHOVERED_STATE_SET;
-function getSELECTED_PRESSED_STATE_SET() {
-    if (!SELECTED_PRESSED_STATE_SET) {
-        SELECTED_PRESSED_STATE_SET = [android.R.attr.state_selected, android.R.attr.state_pressed];
-    }
-}
-exports.getSELECTED_PRESSED_STATE_SET = getSELECTED_PRESSED_STATE_SET;
-function getSELECTED_HOVERED_FOCUSED_STATE_SET() {
-    if (!SELECTED_HOVERED_FOCUSED_STATE_SET) {
-        SELECTED_HOVERED_FOCUSED_STATE_SET = [android.R.attr.state_selected, android.R.attr.state_hovered, android.R.attr.state_focused];
-    }
-}
-exports.getSELECTED_HOVERED_FOCUSED_STATE_SET = getSELECTED_HOVERED_FOCUSED_STATE_SET;
-function getSELECTED_FOCUSED_STATE_SET() {
-    if (!SELECTED_FOCUSED_STATE_SET) {
-        SELECTED_FOCUSED_STATE_SET = [android.R.attr.state_selected, android.R.attr.state_focused];
-    }
-}
-exports.getSELECTED_FOCUSED_STATE_SET = getSELECTED_FOCUSED_STATE_SET;
-function getSELECTED_HOVERED_STATE_SET() {
-    if (!SELECTED_HOVERED_STATE_SET) {
-        SELECTED_HOVERED_STATE_SET = [android.R.attr.state_selected, android.R.attr.state_hovered];
-    }
-}
-exports.getSELECTED_HOVERED_STATE_SET = getSELECTED_HOVERED_STATE_SET;
-function getSELECTED_STATE_SET() {
-    if (!SELECTED_STATE_SET) {
-        SELECTED_STATE_SET = [android.R.attr.state_selected];
-    }
-}
-exports.getSELECTED_STATE_SET = getSELECTED_STATE_SET;
+};
 function getRippleColorStateList(color) {
     var states = Array.create('[I', 2);
-    var SELECTED_PRESSED_STATE_SET = Array.create('int', 2);
-    SELECTED_PRESSED_STATE_SET[0] = android.R.attr.state_enabled;
-    SELECTED_PRESSED_STATE_SET[1] = android.R.attr.state_pressed;
-    states[0] = SELECTED_PRESSED_STATE_SET;
+    states[0] = exports.stateSets.SELECTED_PRESSED_STATE_SET;
     states[1] = Array.create('int', 0);
@@ -83,3 +98,3 @@ var colors = Array.create('int', 2);
     states[0] = Array.create('int', 1);
-    states[0][0] = -android.R.attr.state_enabled;
+    states[0][0] = -exports.state.enabled;
     states[1] = android.util.StateSet.NOTHING;
@@ -86,0 +101,0 @@ var colors = Array.create('int', 2);

material.android.js

@@ -7,2 +7,3 @@ "use strict";
 var utils_1 = require("tns-core-modules/utils/utils");
+var utils_2 = require("./android/utils");
 var Themer = (function () {
@@ -50,8 +51,8 @@ function Themer() {
         initDone = true;
-        BACKGROUND_DEFAULT_STATE_1 = [android.R.attr.state_window_focused, android.R.attr.state_enabled];
-        BACKGROUND_DEFAULT_STATE_2 = [android.R.attr.state_enabled];
-        BACKGROUND_SELECTED_STATE = [android.R.attr.state_window_focused, android.R.attr.state_enabled, android.R.attr.state_pressed];
-        BACKGROUND_CHECKED_STATE = [android.R.attr.state_window_focused, android.R.attr.state_enabled, android.R.attr.state_checked];
-        BACKGROUND_FOCUSED_STATE = [android.R.attr.state_focused, android.R.attr.state_window_focused, android.R.attr.state_enabled];
-        BACKGROUND_DISABLED_STATE = [-android.R.attr.state_enabled];
+        BACKGROUND_DEFAULT_STATE_1 = [utils_2.state.window_focused, utils_2.state.enabled];
+        BACKGROUND_DEFAULT_STATE_2 = [utils_2.state.enabled];
+        BACKGROUND_SELECTED_STATE = [utils_2.state.window_focused, utils_2.state.enabled, utils_2.state.pressed];
+        BACKGROUND_CHECKED_STATE = [utils_2.state.window_focused, utils_2.state.enabled, utils_2.state.checked];
+        BACKGROUND_FOCUSED_STATE = [utils_2.state.focused, utils_2.state.window_focused, utils_2.state.enabled];
+        BACKGROUND_DISABLED_STATE = [-utils_2.state.enabled];
     }
@@ -133,3 +134,3 @@ }
         rippleShape.getPaint().setColor(rippleColor);
-        rippleDrawable.addState([android.R.attr.state_pressed], rippleShape);
+        rippleDrawable.addState([utils_2.state.pressed], rippleShape);
     }
@@ -136,0 +137,0 @@ rippleDrawable.rippleShape = rippleShape;

package.json

 {
     "name": "nativescript-material-core",
-    "version": "2.1.6",
+    "version": "2.1.7",
     "description": "Material Core component",
@@ -33,3 +33,3 @@ "main": "./material",
     "readmeFilename": "README.md",
-    "gitHead": "1c7b316e1592b322388c16f632c58c1cd8358b01"
+    "gitHead": "125cbd29bb5b0ad41f312b63cdc2a8f9090c6621"
 }

No alert changes

Improved metrics

Total package byte prevSize

99974

increased by0.04%

Lines of code

650

increased by4.33%

No dependency changes