@compass-framework/core 1.2.66 → 1.2.68

package/@types/animation/Animation.d.ts

@@ -1,5 +1,5 @@
 import { InterfaceTemplate } from "@compass-framework/library";
-import { Rect } from '../canvas/Rect';
+import { Rect } from '../graphics/Rect';
 import { Transformation } from './Transformation';
 import { Interpolator } from './Interpolator';
 import { AttributeSet } from "../content/AttributeSet";

package/@types/animation/Transformation.d.ts

@@ -1,4 +1,4 @@
-import { Matrix } from '../canvas/Matrix';
+import { Matrix } from '../graphics/Matrix';
 import { Context } from "../content/Context";
 
 /**

package/@types/app/ApplicationCreatorConfig.d.ts

@@ -1,4 +1,4 @@
-import { RendererBackend } from "../canvas/RendererBackend";
+import { RendererBackend } from "../graphics/RendererBackend";
 import { CanvaskitPlatformHostConfig } from "../host/backend/CanvaskitPlatformHostConfig";
 import { WebPlatformHostConfig } from "../host/backend/WebPlatformHostConfig";
 import { NodePlatformHostConfig } from "../host/backend/NodePlatformHostConfig";

package/@types/content/AttributeSet.d.ts

@@ -1,8 +1,8 @@
 import { CharSequence, Influence, Nullable } from "@compass-framework/library";
 import { Resources } from "./Resources";
-import { PictureDrawable } from "../drawable/PictureDrawable";
-import { Drawable } from "../drawable/Drawable";
-import { ColorDrawable } from "../drawable/ColorDrawable";
+import { PictureDrawable } from "../graphics/drawable/PictureDrawable";
+import { Drawable } from "../graphics/drawable/Drawable";
+import { ColorDrawable } from "../graphics/drawable/ColorDrawable";
 
 /**
  * 属性集合，从资源或布局中按名称读取类型化属性值。

package/@types/content/AttributeSetBuilder.ts

@@ -0,0 +1,9 @@
+import { Context } from "./Context";
+import { AttributeSet } from "./AttributeSet";
+
+export declare class AttributeSetBuilder {
+  public static from(context: Context): AttributeSetBuilder;
+
+  public build(): AttributeSet;
+  public build(attribute: Record<string, string>): AttributeSet;
+}

package/@types/content/Context.d.ts

@@ -2,7 +2,7 @@ import { Class } from "@compass-framework/library";
 import { Environment } from "../evaluate/Environment";
 import { Resources } from "./Resources";
 import { MouseCursor } from "../display/MouseCursor";
-import { RendererBackend } from "../canvas/RendererBackend";
+import { RendererBackend } from "../graphics/RendererBackend";
 import { WindowManager } from "../window/WindowManager";
 import { SurfaceProvider } from "../display/SurfaceProvider";
 import { ViewFactoryRegistry } from "./ViewFactoryRegistry";

package/@types/content/ContextWrapper.d.ts

@@ -1,7 +1,7 @@
 import { Context } from "./Context";
 import { Environment } from "../evaluate/Environment";
 import { MouseCursor } from "../display/MouseCursor";
-import { RendererBackend } from "../canvas/RendererBackend";
+import { RendererBackend } from "../graphics/RendererBackend";
 import { Resources } from "./Resources";
 import { SurfaceProvider } from "../display/SurfaceProvider";
 import { ViewFactoryRegistry } from "./ViewFactoryRegistry";

package/@types/content/Resources.d.ts

@@ -1,7 +1,7 @@
 import { CharSequence, RefValue, XML } from "@compass-framework/library";
-import { Drawable } from "../drawable/Drawable";
+import { Drawable } from "../graphics/drawable/Drawable";
 import { DisplayMetrics } from "./DisplayMetrics";
-import { ColorDrawable } from "../drawable/ColorDrawable";
+import { ColorDrawable } from "../graphics/drawable/ColorDrawable";
 import { AttributeSet } from "./AttributeSet";
 import { Configuration } from "./Configuration";
 

package/@types/display/SurfaceProvider.d.ts

@@ -1,6 +1,6 @@
 import { InterfaceTemplate } from "@compass-framework/library";
 import { Context } from "../content/Context";
-import { Surface } from "../canvas/Surface";
+import { Surface } from "../graphics/Surface";
 
 /**
  * Surface 提供者，按设备尺寸创建绘制表面。

package/@types/{drawable → graphics/drawable}/ColorDrawable.d.ts

@@ -1,6 +1,6 @@
 import { Drawable } from "./Drawable";
-import { Canvas } from "../canvas/Canvas";
-import { Context } from "../content/Context";
+import { Canvas } from "../Canvas";
+import { Context } from "../../content/Context";
 
 /**
  * 纯色 Drawable，用单一颜色填充自身边界。

package/@types/{drawable → graphics/drawable}/CornersDrawable.d.ts

@@ -1,6 +1,6 @@
 import { Drawable } from "./Drawable";
-import { Canvas } from "../canvas/Canvas";
-import { Context } from "../content/Context";
+import { Canvas } from "../Canvas";
+import { Context } from "../../content/Context";
 
 /**
  * 圆角矩形 Drawable，支持填充色与描边。

package/@types/{drawable → graphics/drawable}/Drawable.d.ts

@@ -1,11 +1,11 @@
 import { InterfaceTemplate, Runnable } from "@compass-framework/library";
-import { Resources } from "../content/Resources";
-import { Canvas } from "../canvas/Canvas";
-import { Outline } from "../view/Outline";
-import { Rect } from "../canvas/Rect";
-import { Configuration } from "../content/Configuration";
-import { Context } from "../content/Context";
-import { DisplayMetrics } from "../content/DisplayMetrics";
+import { Resources } from "../../content/Resources";
+import { Canvas } from "../Canvas";
+import { Outline } from "../../view/Outline";
+import { Rect } from "../Rect";
+import { Configuration } from "../../content/Configuration";
+import { Context } from "../../content/Context";
+import { DisplayMetrics } from "../../content/DisplayMetrics";
 
 /**
  * 可绘制对象的基类，封装边界、透明度与绘制回调。

package/@types/{drawable → graphics/drawable}/ImageDrawable.ts

@@ -1,7 +1,7 @@
 import { Drawable } from "./Drawable";
-import { Image } from "../widget/Image";
-import { Canvas } from "../canvas/Canvas";
-import { Context } from "../content/Context";
+import { Image } from "../../widget/Image";
+import { Canvas } from "../Canvas";
+import { Context } from "../../content/Context";
 
 /**
  * 图像 Drawable，将 Image 按重力对齐绘制到边界内。

package/@types/{drawable → graphics/drawable}/LayerDrawable.d.ts

@@ -1,8 +1,8 @@
 import { Implements, Runnable } from "@compass-framework/library";
 import { Drawable } from "./Drawable";
-import { Canvas } from "../canvas/Canvas";
-import { Resources } from "../content/Resources";
-import { Context } from "../content/Context";
+import { Canvas } from "../Canvas";
+import { Resources } from "../../content/Resources";
+import { Context } from "../../content/Context";
 
 /**
  * 图层 Drawable，按顺序叠加绘制多个子 Drawable。

package/@types/{drawable → graphics/drawable}/LinearGradientDrawable.d.ts

@@ -1,4 +1,4 @@
-import { Canvas } from "../canvas/Canvas";
+import { Canvas } from "../Canvas";
 
 /**
  * 线性渐变 Drawable，按角度或方向填充渐变色。

package/@types/{drawable → graphics/drawable}/PictureDrawable.d.ts

@@ -1,9 +1,9 @@
 import { Consumer, Implements } from "@compass-framework/library";
-import { Paint } from "../canvas/Paint";
+import { Paint } from "../Paint";
 import { ImageDrawable } from "./ImageDrawable";
-import { Picture } from "../canvas/Picture";
-import { ImageView } from "../widget/ImageView";
-import { Context } from "../content/Context";
+import { Picture } from "../Picture";
+import { ImageView } from "../../widget/ImageView";
+import { Context } from "../../content/Context";
 
 /**
  * 基于 Picture 的图像 Drawable，支持加载状态通知。

package/@types/imm/InputConnection.ts

@@ -1,5 +1,5 @@
 import { CharSequence } from "@compass-framework/library";
-import { Rect } from "../canvas/Rect";
+import { Rect } from "../graphics/Rect";
 import { KeyEvent } from "../event/KeyEvent";
 
 export interface InputConnection {

package/@types/view/Gravity.d.ts

@@ -1,4 +1,4 @@
-import { Rect } from "../canvas/Rect";
+import { Rect } from "../graphics/Rect";
 
 /**
  * 重力对齐常量与布局定位工具。

package/@types/view/Outline.d.ts

@@ -1,4 +1,4 @@
-import { Rect } from "../canvas/Rect";
+import { Rect } from "../graphics/Rect";
 import { Context } from "../content/Context";
 
 /**

package/@types/view/View.d.ts

@@ -7,18 +7,18 @@ import {
 import { ViewOverlay } from "./ViewOverlay";
 import { Context } from "../content/Context";
 import { Configuration } from "../content/Configuration";
-import { Rect } from "../canvas/Rect";
+import { Rect } from "../graphics/Rect";
 import { AttributeSet } from "../content/AttributeSet";
-import { Canvas } from "../canvas/Canvas";
+import { Canvas } from "../graphics/Canvas";
 import { Transformation } from "../animation/Transformation";
 import { KeyEvent } from "../event/KeyEvent";
-import { Drawable } from "../drawable/Drawable";
+import { Drawable } from "../graphics/drawable/Drawable";
 import { Outline } from "./Outline";
 import { ViewTreeObserver } from "./ViewTreeObserver";
 import { ViewGroup } from "./ViewGroup";
 import { Animation } from "../animation/Animation";
 import { MotionEvent } from "../event/MotionEvent";
-import { Matrix } from "../canvas/Matrix";
+import { Matrix } from "../graphics/Matrix";
 import { Resources } from "../content/Resources";
 import { ViewParent } from "./ViewParent";
 import { ViewOutlineProvider } from "./ViewOutlineProvider";

package/@types/view/ViewGroupOverlay.d.ts

@@ -1,5 +1,5 @@
 import { ViewOverlay } from "./ViewOverlay";
-import { Drawable } from "../drawable/Drawable";
+import { Drawable } from "../graphics/drawable/Drawable";
 import { View } from "./View";
 
 /**

package/@types/view/ViewOverlay.d.ts

@@ -1,4 +1,4 @@
-import { Drawable } from "../drawable/Drawable";
+import { Drawable } from "../graphics/drawable/Drawable";
 import { ViewGroup } from "./ViewGroup";
 
 /**

package/index.d.ts

@@ -26,6 +26,7 @@ export * from "./@types/content/BaseAdapter";
 export * from "./@types/content/Theme";
 export * from "./@types/content/ArrayAdapter";
 export * from "./@types/content/AttributeSet";
+export * from "./@types/content/AttributeSetBuilder";
 export * from "./@types/content/Configuration";
 export * from "./@types/content/Context";
 export * from "./@types/content/PixelFormat";
@@ -35,25 +36,25 @@ export * from "./@types/content/ServiceRegister";
 export * from "./@types/content/LayoutInflater";
 export * from "./@types/content/ViewFactoryRegistry";
 
-export * from "./@types/canvas/BlendMode";
-export * from "./@types/canvas/Canvas";
-export * from "./@types/canvas/Color";
-export * from "./@types/canvas/ColorFilter";
-export * from "./@types/canvas/CornerPathEffect";
-export * from "./@types/canvas/ImageFilter";
-export * from "./@types/canvas/LinearGradient";
-export * from "./@types/canvas/Paint";
-export * from "./@types/canvas/Path";
-export * from "./@types/canvas/Rect";
-export * from "./@types/canvas/Matrix";
-export * from "./@types/canvas/RendererBackend";
-export * from "./@types/canvas/PathEffect";
-export * from "./@types/canvas/Picture";
-export * from "./@types/canvas/Shader";
-export * from "./@types/canvas/Shadow";
-export * from "./@types/canvas/Surface";
-export * from "./@types/canvas/Typeface";
-export * from "./@types/canvas/TypefaceFactory";
+export * from "./@types/graphics/BlendMode";
+export * from "./@types/graphics/Canvas";
+export * from "./@types/graphics/Color";
+export * from "./@types/graphics/ColorFilter";
+export * from "./@types/graphics/CornerPathEffect";
+export * from "./@types/graphics/ImageFilter";
+export * from "./@types/graphics/LinearGradient";
+export * from "./@types/graphics/Paint";
+export * from "./@types/graphics/Path";
+export * from "./@types/graphics/Rect";
+export * from "./@types/graphics/Matrix";
+export * from "./@types/graphics/RendererBackend";
+export * from "./@types/graphics/PathEffect";
+export * from "./@types/graphics/Picture";
+export * from "./@types/graphics/Shader";
+export * from "./@types/graphics/Shadow";
+export * from "./@types/graphics/Surface";
+export * from "./@types/graphics/Typeface";
+export * from "./@types/graphics/TypefaceFactory";
 
 export * from "./@types/animation/AccelerateDecelerateInterpolator";
 export * from "./@types/animation/AccelerateInterpolator";
@@ -88,13 +89,13 @@ export * from "./@types/animator/ValueAnimator";
 export * from "./@types/animator/Animator";
 export * from "./@types/animator/PropertyValuesHolder";
 
-export * from "./@types/drawable/CornersDrawable";
-export * from "./@types/drawable/Drawable";
-export * from "./@types/drawable/ImageDrawable";
-export * from "./@types/drawable/LayerDrawable";
-export * from "./@types/drawable/LinearGradientDrawable";
-export * from "./@types/drawable/PictureDrawable";
-export * from "./@types/drawable/ColorDrawable";
+export * from "./@types/graphics/drawable/CornersDrawable";
+export * from "./@types/graphics/drawable/Drawable";
+export * from "./@types/graphics/drawable/ImageDrawable";
+export * from "./@types/graphics/drawable/LayerDrawable";
+export * from "./@types/graphics/drawable/LinearGradientDrawable";
+export * from "./@types/graphics/drawable/PictureDrawable";
+export * from "./@types/graphics/drawable/ColorDrawable";
 
 export * from "./@types/evaluate/Resolver";
 export * from "./@types/evaluate/Environment";

package/package.json

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