@compass-framework/core 1.2.21 → 1.2.23

package/@types/Configuration.d.ts

@@ -1,10 +1,10 @@
-import { DensityMetrics } from "./DensityMetrics";
 import { Theme } from "./Theme";
+import { DisplayMetrics } from "./DisplayMetrics";
 
 export declare class Configuration {
   constructor(config: Configuration);
 
   getTheme(): Theme;
 
-  getDensityMetrics(): DensityMetrics;
+  getDisplayMetrics(): DisplayMetrics;
 }

package/@types/CornersDrawable.d.ts

@@ -2,19 +2,8 @@ import { Drawable } from "./Drawable";
 import { Canvas } from "./Canvas";
 import { Resources } from "./Resources";
 
-export declare interface CornersInfo {
-  leftTopRadius?: number,
-  leftBottomRadius?: number,
-  rightTopRadius?: number,
-  rightBottomRadius?: number,
-  radius?: number,
-  borderStrokeColor?: number,
-  backgroundColor?: number,
-  borderStrokeWidth?: number
-}
-
 export declare class CornersDrawable extends Drawable {
-  public constructor(info: CornersInfo, resources?: Resources);
+  public constructor(info: CornersDrawable.CornersInfo, resources?: Resources);
 
   public draw(canvas: Canvas): void;
 
@@ -46,3 +35,16 @@ export declare class CornersDrawable extends Drawable {
 
   public setRightBottomRadius(radius: number): void;
 }
+
+export namespace CornersDrawable {
+  export interface CornersInfo {
+    leftTopRadius?: number,
+    leftBottomRadius?: number,
+    rightTopRadius?: number,
+    rightBottomRadius?: number,
+    radius?: number,
+    borderStrokeColor?: number,
+    backgroundColor?: number,
+    borderStrokeWidth?: number
+  }
+}

package/@types/DisplayMetrics.d.ts

@@ -1,7 +1,13 @@
-import { DensityMetrics } from "./DensityMetrics";
+export class DisplayMetrics {
+  public dp2px(dp: number): number;
+
+  public px2dp(px: number): number;
+
+  public set(dm: DisplayMetrics): void;
 
-export class DisplayMetrics extends DensityMetrics {
   public getWidth(): number;
 
   public getHeight(): number;
+
+  public getDensity(): number;
 }

package/@types/Drawable.d.ts

@@ -4,7 +4,7 @@ import { Canvas } from "./Canvas";
 import { Configuration } from "./Configuration";
 import { Outline } from "./Outline";
 import { Resources } from "./Resources";
-import { DensityMetrics } from "./DensityMetrics";
+import { DisplayMetrics } from "./DisplayMetrics";
 
 export declare abstract class Drawable {
   protected constructor();
@@ -39,7 +39,7 @@ export declare abstract class Drawable {
 
   public getIntrinsicHeight():number;
 
-  public getDensityMetrics(): DensityMetrics;
+  public getDisplayMetrics(): DisplayMetrics;
 
   public setBounds(bounds: Rect): void;
   public setBounds(left: number, top: number, right: number, bottom: number): void;

package/@types/PopupWindow.d.ts

@@ -44,12 +44,16 @@ export declare class PopupWindow implements IWindow {
 
   public getContentView(): View;
 
+  public getOnTouchListener(): View.OnTouchListener;
+
   public getWindowContext(): WindowContext;
 
   public getResources(): Resources;
 
   public getLayoutParams(): WindowManager.LayoutParams;
 
+  public setOnTouchListener(l: View.OnTouchListener): void;
+
   public setContentXML(xml: XML): void;
 
   public setOutsideTouchable(touchable: boolean):void;

package/@types/View.d.ts

@@ -7,7 +7,6 @@ import {
 import { ViewOverlay } from "./ViewOverlay";
 import { Context } from "./Context";
 import { Configuration } from "./Configuration";
-import { DensityMetrics } from "./DensityMetrics";
 import { Rect } from "./Rect";
 import { AttributeSet } from "./AttributeSet";
 import { Canvas } from "./Canvas";
@@ -23,6 +22,7 @@ import { Matrix } from "./Matrix";
 import { Resources } from "./Resources";
 import { ViewParent } from "./ViewParent";
 import { ViewOutlineProvider } from "./ViewOutlineProvider";
+import { DisplayMetrics } from "./DisplayMetrics";
 
 export declare class View implements Drawable.Callback {
   public static resolveSize(size: number, measureSpec: number): number;
@@ -123,7 +123,7 @@ export declare class View implements Drawable.Callback {
 
   public getY(): number;
 
-  public getDensityMetrics(): DensityMetrics;
+  public getDisplayMetrics(): DisplayMetrics;
 
   public getScrollX(): number;
 

package/@types/ViewGroup.d.ts

@@ -4,7 +4,7 @@ import { AttributeSet } from "./AttributeSet";
 import { Configuration } from "./Configuration";
 import { ViewParent } from "./ViewParent";
 import { MotionEvent } from "./MotionEvent";
-import { DensityMetrics } from "./DensityMetrics";
+import { DisplayMetrics } from "./DisplayMetrics";
 
 @Implements(ViewParent)
 export declare abstract class ViewGroup extends View implements ViewParent {
@@ -66,7 +66,7 @@ export declare namespace ViewGroup {
 
     public onDensityMetricsChanged(newConfig: Configuration): void;
 
-    public getDensityMetrics(): DensityMetrics;
+    public getDisplayMetrics(): DisplayMetrics;
 
     public getWidth(): number;
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@compass-framework/core",
-	"version": "1.2.21",
+	"version": "1.2.23",
 	"description": "@compass-framework/core public api",
 	"types": "./index.d.ts",
 	"main": "./index.js",

package/@types/DensityMetrics.d.ts

@@ -1,11 +0,0 @@
-export declare class DensityMetrics {
-  public constructor(density?: number);
-
-  public dp2px(dp: number): number;
-
-  public px2dp(px: number): number;
-
-  public set(dm: DensityMetrics): void;
-
-  public getDensity(): number;
-}