javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed utils.android

Browse Source
This commit is contained in:
Hristo Hristov
2016-12-20 14:07:24 +02:00
parent 2e2296cbea
commit c6290e2ce3
2 changed files with 63 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tns-core-modules/utils/utils-common.ts
View File

@@ -58,17 +58,17 @@ export function convertString(value: any): any {
export module layout {
var MODE_SHIFT = 30;
var MODE_MASK = 0x3 << MODE_SHIFT;
const MODE_SHIFT = 30;
const MODE_MASK = 0x3 << MODE_SHIFT;
export var UNSPECIFIED = 0 << MODE_SHIFT;
export var EXACTLY = 1 << MODE_SHIFT;
export var AT_MOST = 2 << MODE_SHIFT;
export const UNSPECIFIED = 0 << MODE_SHIFT;
export const EXACTLY = 1 << MODE_SHIFT;
export const AT_MOST = 2 << MODE_SHIFT;
export var MEASURED_HEIGHT_STATE_SHIFT = 0x00000010; /* 16 */
export var MEASURED_STATE_TOO_SMALL = 0x01000000;
export var MEASURED_STATE_MASK = 0xff000000;
export var MEASURED_SIZE_MASK = 0x00ffffff;
export const MEASURED_HEIGHT_STATE_SHIFT = 0x00000010; /* 16 */
export const MEASURED_STATE_TOO_SMALL = 0x01000000;
export const MEASURED_STATE_MASK = 0xff000000;
export const MEASURED_SIZE_MASK = 0x00ffffff;
export function getMode(mode: number): string {
switch (mode) {

56
tns-core-modules/utils/utils.android.ts
View File

@@ -1,8 +1,60 @@
import { enabled as traceEnabled, write as traceWrite, categories as traceCategories,
messageType as traceMessageType, notifyEvent as traceNotifyEvent, isCategorySet } from "trace";
import {
enabled as traceEnabled, write as traceWrite, categories as traceCategories,
messageType as traceMessageType, notifyEvent as traceNotifyEvent, isCategorySet
} from "trace";
export * from "./utils-common";
export module layout {
let density = -1;
let metrics: android.util.DisplayMetrics;
// cache the MeasureSpec constants here, to prevent extensive marshaling calls to and from Java
// TODO: While this boosts the performance it is error-prone in case Google changes these constants
const MODE_SHIFT = 30;
const MODE_MASK = 0x3 << MODE_SHIFT;
let sdkVersion = -1;
let useOldMeasureSpec = false;
export function makeMeasureSpec(size: number, mode: number): number {
if (sdkVersion === -1) {
// check whether the old layout is needed
sdkVersion = ad.getApplicationContext().getApplicationInfo().targetSdkVersion;
useOldMeasureSpec = sdkVersion <= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;
}
if (useOldMeasureSpec) {
return size + mode;
}
return (size & ~MODE_MASK) | (mode & MODE_MASK);
}
export function getDisplayMetrics(): android.util.DisplayMetrics {
if (!metrics) {
metrics = ad.getApplicationContext().getResources().getDisplayMetrics();
}
return metrics;
}
export function getDisplayDensity(): number {
if (density === -1) {
density = getDisplayMetrics().density;
}
return density;
}
export function toDevicePixels(value: number): number {
return value * getDisplayDensity();
}
export function toDeviceIndependentPixels(value: number): number {
return value / getDisplayDensity();
}
}
// We are using "ad" here to avoid namespace collision with the global android object
export module ad {
let nativeApp: android.app.Application;