diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index e15895de9e93397d1331fb177a32bfcc2d579261..cfe2c27c3acd59d0ddeefaf4f2c97dd220869426 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -158,6 +158,22 @@ build arkui.abc: - arkoala-arkts/arkui/build/arkui.abc expire_in: 1 day +build modules.abc: + stage: build-ets + interruptible: true + extends: + - .linux-vm-shell-task + needs: + - build ui2abc-all M3 + - annotate all + script: + - npm run build:modules --prefix arkoala-arkts + - ls -l arkoala-arkts/modules/global.resource/build/src/resource.abc + artifacts: + paths: + - arkoala-arkts/modules/global.resource/build/src/resource.abc + expire_in: 1 day + build arkoala.abc: stage: build-ets interruptible: true @@ -169,10 +185,12 @@ build arkoala.abc: - build incremental.abc - build interop.abc - build arkui.abc + - build modules.abc before_script: - ls -l incremental/runtime/build/incremental.abc - ls -l interop/build/interop.abc - ls -l arkoala-arkts/arkui/build/arkui.abc + - ls -l arkoala-arkts/modules/global.resource/build/src/resource.abc script: - npm run link --prefix arkoala-arkts - ls -l arkoala-arkts/build/bootPandaFiles/arkoala.abc diff --git a/arkoala-arkts/arkui/generated/component/actionSheet.ets b/arkoala-arkts/arkui/generated/component/actionSheet.ets index 7473c4b7b70136516867d3c1a85c80d03a3f22a7..5cad3ec5f317c349d322648b3fc575cb112158e1 100644 --- a/arkoala-arkts/arkui/generated/component/actionSheet.ets +++ b/arkoala-arkts/arkui/generated/component/actionSheet.ets @@ -23,7 +23,7 @@ import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { VoidCallback, ResourceStr, ResourceColor, Dimension, BorderRadiuses, LocalizedBorderRadiuses, EdgeWidths, LocalizedEdgeWidths, EdgeColors, LocalizedEdgeColors, EdgeStyles } from "./units" import { DialogButtonStyle, Color, BorderStyle } from "./enums" import { DialogAlignment } from "./alertDialog" diff --git a/arkoala-arkts/arkui/generated/component/alertDialog.ets b/arkoala-arkts/arkui/generated/component/alertDialog.ets index f22d3886d5e087b95d077825bac67ca071b6d3dd..d3f7121985fc0c4c787788717b348af04b3c597b 100644 --- a/arkoala-arkts/arkui/generated/component/alertDialog.ets +++ b/arkoala-arkts/arkui/generated/component/alertDialog.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { DialogButtonStyle, Color, WordBreak, BorderStyle } from "./enums" import { ResourceStr, ResourceColor, VoidCallback, Offset, Dimension, BorderRadiuses, LocalizedBorderRadiuses, EdgeWidths, LocalizedEdgeWidths, EdgeColors, LocalizedEdgeColors, EdgeStyles } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { DismissDialogAction } from "./actionSheet" import { Rectangle, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, TransitionEffect, ShadowOptions, ShadowStyle, HoverModeAreaType } from "./common" import { LevelMode, ImmersiveMode, LevelOrder } from "./../framework/ohos.promptAction" diff --git a/arkoala-arkts/arkui/generated/component/alphabetIndexer.ets b/arkoala-arkts/arkui/generated/component/alphabetIndexer.ets index 0ed3658ff1d9fb99b6e0379b8926d3fddd461c72..00e236b540085e633e07612fb5815194591bcb72 100644 --- a/arkoala-arkts/arkui/generated/component/alphabetIndexer.ets +++ b/arkoala-arkts/arkui/generated/component/alphabetIndexer.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { Font_serializer, Position_serializer, ResourceColor, Font, Position, Length } from "./units" import { Bindable_Number_serializer, ArkCommonMethodPeer, CommonMethod, Bindable, BlurStyle, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { int32, int64, float32, unsafeCast } from "@koalaui/common" @@ -25,6 +25,7 @@ import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { Color } from "./enums" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/badge.ets b/arkoala-arkts/arkui/generated/component/badge.ets index db9bb52e8c5fdc01e1e7b1ceaabb6708f515c84f..42b190c963dc9402e025ac71218e924f33abecef 100644 --- a/arkoala-arkts/arkui/generated/component/badge.ets +++ b/arkoala-arkts/arkui/generated/component/badge.ets @@ -29,9 +29,10 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceColor, ResourceStr, Length, Position, Position_serializer } from "./units" import { Color, FontWeight } from "./enums" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" +import { Resource_serializer } from "./../framework/resource" export class ArkBadgePeer extends ArkCommonMethodPeer { protected constructor(peerPtr: KPointer, id: int32, name: string = "", flags: int32 = 0) { super(peerPtr, id, name, flags) diff --git a/arkoala-arkts/arkui/generated/component/blank.ets b/arkoala-arkts/arkui/generated/component/blank.ets index f673eeddb52c13305ff41bcf4f4153f7241374fa..b2c597b47ff6f7ae9e2136c5b23bceb240d3df28 100644 --- a/arkoala-arkts/arkui/generated/component/blank.ets +++ b/arkoala-arkts/arkui/generated/component/blank.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32 } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" @@ -25,6 +25,7 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { ResourceColor } from "./units" import { Color } from "./enums" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/button.ets b/arkoala-arkts/arkui/generated/component/button.ets index ad37b0e4659853f8a87c9c72185a50ba5c061c49..6db1f9ea7d312ecb7a8957ac3abe09e73f976569 100644 --- a/arkoala-arkts/arkui/generated/component/button.ets +++ b/arkoala-arkts/arkui/generated/component/button.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" @@ -25,6 +25,7 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, CommonConfiguration, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { ResourceColor, Length, ResourceStr, Font, Font_serializer } from "./units" import { Color, FontWeight, FontStyle, TextOverflow, TextHeightAdaptivePolicy } from "./enums" +import { Resource } from "global.resource" import { ContentModifier, AttributeModifier, hookButtonContentModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/calendarPicker.ets b/arkoala-arkts/arkui/generated/component/calendarPicker.ets index ec68b9b5f9c10d657506257d03352d94fef46e64..29c36f706683bd5fcf4e606b162d1751d88eff44 100644 --- a/arkoala-arkts/arkui/generated/component/calendarPicker.ets +++ b/arkoala-arkts/arkui/generated/component/calendarPicker.ets @@ -25,13 +25,14 @@ import { Offset_serializer, Offset, Length, VoidCallback, ResourceColor } from " import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Color } from "./enums" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" +import { Resource_serializer } from "./../framework/resource" export class CalendarPickerDialogInternal { public static fromPtr(ptr: KPointer): CalendarPickerDialog { return new CalendarPickerDialog(ptr) diff --git a/arkoala-arkts/arkui/generated/component/checkbox.ets b/arkoala-arkts/arkui/generated/component/checkbox.ets index a031205435f73a60eaeb2d5c4d72bb228d9d5a5b..dacb6c03a9915d124765b5b102623422ecbdd467 100644 --- a/arkoala-arkts/arkui/generated/component/checkbox.ets +++ b/arkoala-arkts/arkui/generated/component/checkbox.ets @@ -18,13 +18,14 @@ import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { Bindable_Boolean_serializer, ArkCommonMethodPeer, CommonMethod, Bindable, CommonConfiguration, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { MarkStyle_serializer, ResourceColor, MarkStyle } from "./units" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { Color, CheckBoxShape } from "./enums" +import { Resource } from "global.resource" import { ContentModifier, AttributeModifier, hookCheckBoxContentModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/checkboxgroup.ets b/arkoala-arkts/arkui/generated/component/checkboxgroup.ets index 83a7a068137cdfcd0e7f260269fe6a25c787cf6a..d5831042b63d32b7f289ad84c8ef99c80dd4300f 100644 --- a/arkoala-arkts/arkui/generated/component/checkboxgroup.ets +++ b/arkoala-arkts/arkui/generated/component/checkboxgroup.ets @@ -18,13 +18,14 @@ import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { Bindable_Boolean_serializer, ArkCommonMethodPeer, CommonMethod, Bindable, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { MarkStyle_serializer, ResourceColor, MarkStyle } from "./units" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { Color, CheckBoxShape } from "./enums" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/column.ets b/arkoala-arkts/arkui/generated/component/column.ets index d349c95856951aa3827369402428275e8f0f4200..5ba159c643eae0a3f47137e27b68964edf727eb5 100644 --- a/arkoala-arkts/arkui/generated/component/column.ets +++ b/arkoala-arkts/arkui/generated/component/column.ets @@ -28,9 +28,10 @@ import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" +import { Resource_serializer } from "./../framework/resource" export class ArkColumnPeer extends ArkCommonMethodPeer { protected constructor(peerPtr: KPointer, id: int32, name: string = "", flags: int32 = 0) { super(peerPtr, id, name, flags) diff --git a/arkoala-arkts/arkui/generated/component/columnSplit.ets b/arkoala-arkts/arkui/generated/component/columnSplit.ets index 48c7e2952dda8d61233f2ecaa72d233b600ee4d1..09ea9be366bcd6d980be9c14781a7ba7746004a3 100644 --- a/arkoala-arkts/arkui/generated/component/columnSplit.ets +++ b/arkoala-arkts/arkui/generated/component/columnSplit.ets @@ -28,9 +28,10 @@ import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Dimension } from "./units" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" +import { Resource_serializer } from "./../framework/resource" export class ArkColumnSplitPeer extends ArkCommonMethodPeer { protected constructor(peerPtr: KPointer, id: int32, name: string = "", flags: int32 = 0) { super(peerPtr, id, name, flags) diff --git a/arkoala-arkts/arkui/generated/component/common.ets b/arkoala-arkts/arkui/generated/component/common.ets index 7e47a16f8282e22ffe467605c40c40a5efe38de4..6d571770f3c853cdd3ddcf6d8bbc7a0da996a16c 100644 --- a/arkoala-arkts/arkui/generated/component/common.ets +++ b/arkoala-arkts/arkui/generated/component/common.ets @@ -25,7 +25,8 @@ import { DrawContext, DrawContextInternal, LengthMetrics_serializer, LengthMetri import { KeyType, KeySource, Color, HitTestMode, ImageSize, Alignment, BorderStyle, ColoringStrategy, HoverEffect, Visibility, ItemAlign, Direction, ObscuredReasons, RenderFit, FocusDrawLevel, ImageRepeat, Axis, ResponseType, FunctionKey, ModifierKey, InteractionHand, GradientDirection, SharedTransitionEffectType, ArrowPointPosition, Placement, LineCapStyle, LineJoinStyle, BarState, CrownSensitivity, EdgeEffect, TransitionType, TextDecorationType, TextDecorationStyle, PlayMode, HorizontalAlign, VerticalAlign, FontWeight, FontStyle, TouchType, CrownAction, ClickEffectLevel, NestedScrollMode, PixelRoundCalcPolicy, ScrollSource, IlluminatedType, AccessibilityHoverType, AxisAction, AxisModel, MouseButton, MouseAction } from "./enums" import { IntentionCode } from "./../framework/ohos.multimodalInput.intentionCode" import { Position_serializer, DirectionalEdgesT_serializer, Position, DirectionalEdgesT, ConstraintSizeOptions_serializer, ConstraintSizeOptions, ResourceColor, SizeOptions, SizeOptions_serializer, ChainWeightOptions_serializer, Padding_serializer, LocalizedPadding_serializer, BorderOptions_serializer, EdgeStyles_serializer, EdgeWidths_serializer, LocalizedEdgeWidths_serializer, EdgeColors_serializer, LocalizedEdgeColors_serializer, BorderRadiuses_serializer, LocalizedBorderRadiuses_serializer, OutlineOptions_serializer, EdgeOutlineStyles_serializer, EdgeOutlineWidths_serializer, OutlineRadiuses_serializer, Edges_serializer, LocalizedEdges_serializer, LocalizedPosition_serializer, AccessibilityOptions_serializer, Length, ChainWeightOptions, Padding, LocalizedPadding, BorderOptions, EdgeStyles, EdgeWidths, LocalizedEdgeWidths, EdgeColors, LocalizedEdgeColors, BorderRadiuses, LocalizedBorderRadiuses, OutlineOptions, EdgeOutlineStyles, Dimension, EdgeOutlineWidths, OutlineRadiuses, VoidCallback, Area, Edges, LocalizedEdges, LocalizedPosition, ResourceStr, AccessibilityOptions, Bias, Font, Bias_serializer, Area_serializer, Font_serializer } from "./units" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { TextRange_serializer, TextRange } from "./textCommon" import { ResizableOptions_serializer, ResizableOptions } from "./image" import { uiEffect_VisualEffect_serializer, uiEffect_Filter_serializer, uiEffect_BrightnessBlender_serializer, uiEffect } from "./../framework/ohos.graphics.uiEffect" diff --git a/arkoala-arkts/arkui/generated/component/customDialogController.ets b/arkoala-arkts/arkui/generated/component/customDialogController.ets index b9daf3800b0df0ceea4a76b710e98b200c99c6ab..5ee078ad2e8ff2e86f53918a119085649e107cd3 100644 --- a/arkoala-arkts/arkui/generated/component/customDialogController.ets +++ b/arkoala-arkts/arkui/generated/component/customDialogController.ets @@ -28,10 +28,11 @@ import { ExtendableComponent, ExtendableComponent_serializer } from "./extendabl import { DialogAlignment } from "./alertDialog" import { Offset, ResourceColor, Dimension, BorderRadiuses, EdgeWidths, EdgeColors, EdgeStyles, Offset_serializer, BorderRadiuses_serializer, EdgeWidths_serializer, EdgeColors_serializer, EdgeStyles_serializer } from "./units" import { Color, BorderStyle } from "./enums" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { Rectangle, AnimateParam, ShadowOptions, ShadowStyle, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, KeyboardAvoidMode, HoverModeAreaType, Rectangle_serializer, AnimateParam_serializer, ShadowOptions_serializer, BackgroundBlurStyleOptions_serializer, BackgroundEffectOptions_serializer } from "./common" import { LengthMetrics, LengthMetrics_serializer } from "./../framework/arkui.Graphics" import { LevelMode, ImmersiveMode, LevelOrder, LevelOrder_serializer } from "./../framework/ohos.promptAction" +import { Resource_serializer } from "./../framework/resource" export class CustomDialogControllerInternal { public static fromPtr(ptr: KPointer): CustomDialogController { return new CustomDialogController(false, ptr) diff --git a/arkoala-arkts/arkui/generated/component/dataPanel.ets b/arkoala-arkts/arkui/generated/component/dataPanel.ets index 3ed0503ae493491406f2d45aeb258b94ae2893d9..1012a94315d91be350248e6ba618436148e9092f 100644 --- a/arkoala-arkts/arkui/generated/component/dataPanel.ets +++ b/arkoala-arkts/arkui/generated/component/dataPanel.ets @@ -20,12 +20,13 @@ import { SerializerBase, DeserializerBase, Finalizable, runtimeType, RuntimeType import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkCommonMethodPeer, CommonMethod, MultiShadowOptions, CommonConfiguration, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { ResourceColor, Length } from "./units" import { Color } from "./enums" +import { Resource } from "global.resource" import { ContentModifier, AttributeModifier, hookDataPanelContentModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" diff --git a/arkoala-arkts/arkui/generated/component/datePicker.ets b/arkoala-arkts/arkui/generated/component/datePicker.ets index d1d85d27415317d07bece67dc72f456eadeab1b1..78816706c9220d97d755a74a10c965e4eeab169f 100644 --- a/arkoala-arkts/arkui/generated/component/datePicker.ets +++ b/arkoala-arkts/arkui/generated/component/datePicker.ets @@ -29,7 +29,7 @@ import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceColor, Offset, VoidCallback } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { DialogAlignment } from "./alertDialog" import { intl } from "./../framework/ohos.intl" import { NodeAttach, remember } from "@koalaui/runtime" diff --git a/arkoala-arkts/arkui/generated/component/divider.ets b/arkoala-arkts/arkui/generated/component/divider.ets index 6e62dfee7cb1c21704d4bb9358ca57aba8dbe12d..d2d0e594429d740bd5204d8a652e75bf2690a3bd 100644 --- a/arkoala-arkts/arkui/generated/component/divider.ets +++ b/arkoala-arkts/arkui/generated/component/divider.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32 } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" @@ -25,6 +25,7 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { ResourceColor } from "./units" import { Color, LineCapStyle } from "./enums" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/gauge.ets b/arkoala-arkts/arkui/generated/component/gauge.ets index 5fa41c4ac1c2a65cf5c992ac097416b5e5cbc24e..18dfe1a352700b2932f4ae35103347cc5d08e616 100644 --- a/arkoala-arkts/arkui/generated/component/gauge.ets +++ b/arkoala-arkts/arkui/generated/component/gauge.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { LinearGradient_serializer, LinearGradient } from "./dataPanel" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" @@ -26,6 +26,7 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, MultiShadowOptions, CommonConfiguration, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { ResourceColor, Length, ResourceStr, Dimension } from "./units" import { Color } from "./enums" +import { Resource } from "global.resource" import { CustomBuilder } from "./builder" import { ContentModifier, AttributeModifier, hookGaugeContentModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" diff --git a/arkoala-arkts/arkui/generated/component/grid.ets b/arkoala-arkts/arkui/generated/component/grid.ets index c8e74ee4809035b6aeccfeb84ea434b183635e9a..b7c746872ae24e5ea744b8007f0b7362dd65108a 100644 --- a/arkoala-arkts/arkui/generated/component/grid.ets +++ b/arkoala-arkts/arkui/generated/component/grid.ets @@ -18,13 +18,14 @@ import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { Scroller_serializer, OnScrollFrameBeginCallback, Scroller } from "./scroll" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkScrollableCommonMethodPeer, ScrollableCommonMethod, OnItemDragStartCallback, ItemDragInfo, OnWillScrollCallback, OnScrollCallback, CommonMethod, ArkScrollableCommonMethodComponent, ArkScrollableCommonMethodStyle, ArkCommonMethodComponent, ArkCommonMethodStyle, ScrollableCommonMethodModifier, CommonMethodModifier } from "./common" import { Length } from "./units" +import { Resource } from "global.resource" import { ScrollState } from "./list" import { ScrollSource } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" diff --git a/arkoala-arkts/arkui/generated/component/gridRow.ets b/arkoala-arkts/arkui/generated/component/gridRow.ets index 9ec7e8039023758b72b79ff14ed9bf33da0a72de..360248873b74a4feb97fd7a7d031affa4e70768d 100644 --- a/arkoala-arkts/arkui/generated/component/gridRow.ets +++ b/arkoala-arkts/arkui/generated/component/gridRow.ets @@ -29,9 +29,10 @@ import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Length } from "./units" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" +import { Resource_serializer } from "./../framework/resource" export class ArkGridRowPeer extends ArkCommonMethodPeer { protected constructor(peerPtr: KPointer, id: int32, name: string = "", flags: int32 = 0) { super(peerPtr, id, name, flags) diff --git a/arkoala-arkts/arkui/generated/component/hyperlink.ets b/arkoala-arkts/arkui/generated/component/hyperlink.ets index b02e675da4159e6a611108129142d5ba3fef1be4..d94316e7cb38fbdaf0231c32c59733307109500f 100644 --- a/arkoala-arkts/arkui/generated/component/hyperlink.ets +++ b/arkoala-arkts/arkui/generated/component/hyperlink.ets @@ -17,13 +17,14 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32 } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { Color } from "./enums" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/idlize.ets b/arkoala-arkts/arkui/generated/component/idlize.ets index e6f2215801d6cd7ece30c5f21d9e78559fb28709..2d31f438cebbc82624479624703191a705744847 100644 --- a/arkoala-arkts/arkui/generated/component/idlize.ets +++ b/arkoala-arkts/arkui/generated/component/idlize.ets @@ -21,8 +21,9 @@ import { AnimateParam_serializer, TranslateOptions_serializer, AnimateParam, Tra import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { SizeOptions_serializer, Length, SizeOptions, Position_serializer, Position, ResourceColor, ResourceStr, ConstraintSizeOptions } from "./units" +import { Resource } from "global.resource" import { Color } from "./enums" import { ContentModifier, UICommonBase, AttributeModifier, AttributeUpdater } from "#handwritten" import { ButtonConfiguration } from "./button" diff --git a/arkoala-arkts/arkui/generated/component/image.ets b/arkoala-arkts/arkui/generated/component/image.ets index 5a2a6aa2f94d3b9a35e30481dc4ca2c446fe8211..58e1e02d86321be9e101ab91207fd692c8f50a82 100644 --- a/arkoala-arkts/arkui/generated/component/image.ets +++ b/arkoala-arkts/arkui/generated/component/image.ets @@ -21,7 +21,7 @@ import { Finalizable, runtimeType, RuntimeType, SerializerBase, toPeerPtr, KPoin import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" import { image_PixelMap_serializer, image } from "./../framework/ohos.multimedia.image" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { DrawableDescriptor_serializer, DrawableDescriptor } from "./../framework/ohos.arkui.drawableDescriptor" import { ImageAIOptions_serializer, ImageAnalyzerConfig_serializer, ImageAnalyzerConfig, ImageAIOptions } from "./imageCommon" import { ColorMetrics_serializer, ColorMetrics } from "./../framework/arkui.Graphics" @@ -31,6 +31,7 @@ import { drawing_ColorFilter_serializer, drawing, drawing_Lattice_serializer } f import { PointLightStyle_serializer, ArkCommonMethodPeer, CommonMethod, PointLightStyle, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" +import { Resource } from "global.resource" import { Color, ImageFit, ImageRepeat, CopyOptions } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" diff --git a/arkoala-arkts/arkui/generated/component/imageAnimator.ets b/arkoala-arkts/arkui/generated/component/imageAnimator.ets index 764517e1a8b4b4c3d995eaa5f6e888410bf7822e..eab0fbe9922623b76dd8e665c9d0ae351a2621fd 100644 --- a/arkoala-arkts/arkui/generated/component/imageAnimator.ets +++ b/arkoala-arkts/arkui/generated/component/imageAnimator.ets @@ -28,10 +28,11 @@ import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { image, image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" +import { Resource_serializer } from "./../framework/resource" export class ArkImageAnimatorPeer extends ArkCommonMethodPeer { protected constructor(peerPtr: KPointer, id: int32, name: string = "", flags: int32 = 0) { super(peerPtr, id, name, flags) diff --git a/arkoala-arkts/arkui/generated/component/imageSpan.ets b/arkoala-arkts/arkui/generated/component/imageSpan.ets index b05bce931ae7c81b5cb9df8cc9e4d52918e884be..5bbb3eca05951c3ba669dfeb6040d298367c4e96 100644 --- a/arkoala-arkts/arkui/generated/component/imageSpan.ets +++ b/arkoala-arkts/arkui/generated/component/imageSpan.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { image_PixelMap_serializer, image } from "./../framework/ohos.multimedia.image" import { ColorFilter_serializer, ColorFilter, ResourceStr } from "./units" import { drawing_ColorFilter_serializer, drawing } from "./../framework/ohos.graphics.drawing" @@ -30,6 +30,7 @@ import { ImageSpanAlignment, ImageFit } from "./enums" import { ImageErrorCallback, ImageError } from "./image" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" +import { Resource } from "global.resource" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" diff --git a/arkoala-arkts/arkui/generated/component/line.ets b/arkoala-arkts/arkui/generated/component/line.ets index 1106ae5390ee9c3cf30f5827061fd178220369d6..e756dad92308689151c1fec697cc4126c9344d89 100644 --- a/arkoala-arkts/arkui/generated/component/line.ets +++ b/arkoala-arkts/arkui/generated/component/line.ets @@ -17,13 +17,14 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonShapeMethodPeer, CommonShapeMethod, CommonMethod, ArkCommonShapeMethodComponent, ArkCommonShapeMethodStyle, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonShapeMethodModifier, CommonMethodModifier } from "./common" import { Length } from "./units" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/list.ets b/arkoala-arkts/arkui/generated/component/list.ets index a5228e37369984716ea12ab8d132cbb89f877f9c..65eff11a72226a9f75530b54d654176878237bf0 100644 --- a/arkoala-arkts/arkui/generated/component/list.ets +++ b/arkoala-arkts/arkui/generated/component/list.ets @@ -19,7 +19,7 @@ import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr, Finalizable } from "@koalaui/interop" import { ChildrenMainSize_serializer, ArkScrollableCommonMethodPeer, ScrollableCommonMethod, ChildrenMainSize, OnItemDragStartCallback, ItemDragInfo, OnWillScrollCallback, OnScrollCallback, CommonMethod, ArkScrollableCommonMethodComponent, ArkScrollableCommonMethodStyle, ArkCommonMethodComponent, ArkCommonMethodStyle, ScrollableCommonMethodModifier, CommonMethodModifier, RectResult_serializer, RectResult } from "./common" import { LengthConstrain_serializer, LengthConstrain, Dimension, Length, ResourceColor } from "./units" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" @@ -27,6 +27,7 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { Axis, ScrollSource, Color } from "./enums" import { OnScrollFrameBeginCallback, Scroller, Scroller_serializer, ScrollerInternal, ScrollAlign } from "./scroll" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" +import { Resource } from "global.resource" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" diff --git a/arkoala-arkts/arkui/generated/component/listItem.ets b/arkoala-arkts/arkui/generated/component/listItem.ets index ea8f657676004f42ba0197968bce05b1caece70b..353b8b455f64d86fbc23b4bd0a5c1e2f119436cc 100644 --- a/arkoala-arkts/arkui/generated/component/listItem.ets +++ b/arkoala-arkts/arkui/generated/component/listItem.ets @@ -30,9 +30,10 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CustomBuilder } from "./builder" import { ComponentContent, ComponentContent_serializer } from "./../framework/arkui.ComponentContent" import { Length } from "./units" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" +import { Resource_serializer } from "./../framework/resource" export class ArkListItemPeer extends ArkCommonMethodPeer { protected constructor(peerPtr: KPointer, id: int32, name: string = "", flags: int32 = 0) { super(peerPtr, id, name, flags) diff --git a/arkoala-arkts/arkui/generated/component/loadingProgress.ets b/arkoala-arkts/arkui/generated/component/loadingProgress.ets index 5e29d8c5c30ca1b6221d281f55f593152092c02a..252752664c6ac46fa077ae31e21bf105fd028864 100644 --- a/arkoala-arkts/arkui/generated/component/loadingProgress.ets +++ b/arkoala-arkts/arkui/generated/component/loadingProgress.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" @@ -25,6 +25,7 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, CommonConfiguration, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { ResourceColor } from "./units" import { Color } from "./enums" +import { Resource } from "global.resource" import { ContentModifier, AttributeModifier, hookLoadingProgressContentModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/marquee.ets b/arkoala-arkts/arkui/generated/component/marquee.ets index f4fc4b44b5233165c1f1a9867b7539b16773332c..1b89a1fcdf472f1c519ea72177194db820517334 100644 --- a/arkoala-arkts/arkui/generated/component/marquee.ets +++ b/arkoala-arkts/arkui/generated/component/marquee.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" @@ -25,6 +25,7 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { ResourceColor, Length } from "./units" import { Color, FontWeight, MarqueeUpdateStrategy } from "./enums" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/mediaCachedImage.ets b/arkoala-arkts/arkui/generated/component/mediaCachedImage.ets index 0f0855a3c26cde09e09c9276372abddf60806410..7831db8729caa9e7d256138dc8d161f26a46a137 100644 --- a/arkoala-arkts/arkui/generated/component/mediaCachedImage.ets +++ b/arkoala-arkts/arkui/generated/component/mediaCachedImage.ets @@ -18,7 +18,7 @@ import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { image_PixelMap_serializer, image } from "./../framework/ohos.multimedia.image" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { DrawableDescriptor_serializer, DrawableDescriptor } from "./../framework/ohos.arkui.drawableDescriptor" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" @@ -28,6 +28,7 @@ import { ArkImagePeer, ImageAttribute, ArkImageComponent, ArkImageStyle, ImageMo import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { ResourceStr } from "./units" +import { Resource } from "global.resource" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" diff --git a/arkoala-arkts/arkui/generated/component/menu.ets b/arkoala-arkts/arkui/generated/component/menu.ets index b037cbc4964c09ab485e5688b6e3ed934e3974f9..1d8d056f03a3e6aa8ba15c1d32f9d46d9e8a4e9e 100644 --- a/arkoala-arkts/arkui/generated/component/menu.ets +++ b/arkoala-arkts/arkui/generated/component/menu.ets @@ -18,13 +18,14 @@ import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer } from "@koalaui/interop" import { Font_serializer, BorderRadiuses_serializer, DividerStyleOptions_serializer, Font, ResourceColor, Dimension, BorderRadiuses, DividerStyleOptions } from "./units" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32 } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { Color } from "./enums" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/menuItem.ets b/arkoala-arkts/arkui/generated/component/menuItem.ets index ddafc7fc51a49b625b7cd306d4297fca24344e04..16ee9affda51630388d53082e38e437dafd52f76 100644 --- a/arkoala-arkts/arkui/generated/component/menuItem.ets +++ b/arkoala-arkts/arkui/generated/component/menuItem.ets @@ -18,13 +18,14 @@ import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { Bindable_Boolean_serializer, ArkCommonMethodPeer, CommonMethod, Bindable, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { SymbolGlyphModifier_serializer, SymbolGlyphModifier } from "./../framework/arkui.SymbolGlyphModifier" import { Font_serializer, ResourceStr, Font, ResourceColor } from "./units" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" +import { Resource } from "global.resource" import { Color } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CustomBuilder } from "./builder" diff --git a/arkoala-arkts/arkui/generated/component/menuItemGroup.ets b/arkoala-arkts/arkui/generated/component/menuItemGroup.ets index d412f80593360d4a567d41fb9b93ad0c853abd45..45007c6683a633afed3e7c06f74e7c9c3aa7d2cd 100644 --- a/arkoala-arkts/arkui/generated/component/menuItemGroup.ets +++ b/arkoala-arkts/arkui/generated/component/menuItemGroup.ets @@ -28,10 +28,11 @@ import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceStr } from "./units" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { CustomBuilder } from "./builder" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" +import { Resource_serializer } from "./../framework/resource" export class ArkMenuItemGroupPeer extends ArkCommonMethodPeer { protected constructor(peerPtr: KPointer, id: int32, name: string = "", flags: int32 = 0) { super(peerPtr, id, name, flags) diff --git a/arkoala-arkts/arkui/generated/component/navDestination.ets b/arkoala-arkts/arkui/generated/component/navDestination.ets index 1d1ca22b70c26e623d0d0ae812180f7a1db7070d..d2fc219117429a3636fbc37ded4959a8e2fe7b76 100644 --- a/arkoala-arkts/arkui/generated/component/navDestination.ets +++ b/arkoala-arkts/arkui/generated/component/navDestination.ets @@ -21,7 +21,7 @@ import { NavPathInfo, NavPathInfoInternal, NavPathStack, NavPathStackInternal, N import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { image_PixelMap_serializer, image } from "./../framework/ohos.multimedia.image" import { SymbolGlyphModifier_serializer, SymbolGlyphModifier } from "./../framework/arkui.SymbolGlyphModifier" import { window_SystemBarStyle_serializer, window } from "./../framework/ohos.window" @@ -30,6 +30,7 @@ import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkCommonMethodPeer, CommonMethod, LayoutSafeAreaType, LayoutSafeAreaEdge, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { ResourceStr, Length, ResourceColor } from "./units" +import { Resource } from "global.resource" import { CustomBuilder } from "./builder" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { TitleHeight, Color } from "./enums" diff --git a/arkoala-arkts/arkui/generated/component/navigation.ets b/arkoala-arkts/arkui/generated/component/navigation.ets index b469e60078f8991afaa9961d4fb185bc3e52730d..e84e39f2b0b93a6de25a28977806085a47a34f88 100644 --- a/arkoala-arkts/arkui/generated/component/navigation.ets +++ b/arkoala-arkts/arkui/generated/component/navigation.ets @@ -21,13 +21,14 @@ import { VoidCallback, Length, Dimension, ResourceStr, ResourceColor } from "./u import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { Bindable_Arkui_Component_Units_Length_serializer, ArkCommonMethodPeer, CommonMethod, Bindable, LayoutSafeAreaType, LayoutSafeAreaEdge, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier, BackgroundBlurStyleOptions_serializer, BackgroundEffectOptions_serializer } from "./common" import { image_PixelMap_serializer, image } from "./../framework/ohos.multimedia.image" import { SymbolGlyphModifier_serializer, SymbolGlyphModifier } from "./../framework/arkui.SymbolGlyphModifier" import { window_SystemBarStyle_serializer, window } from "./../framework/ohos.window" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" +import { Resource } from "global.resource" import { CustomBuilder, PageMapBuilder } from "./builder" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { TitleHeight, Color } from "./enums" diff --git a/arkoala-arkts/arkui/generated/component/particle.ets b/arkoala-arkts/arkui/generated/component/particle.ets index 95419c762f2f180d71cc0f723ac5763d6cb8ad95..bb30d7c65f7366815837d3d6aa613fe31baa425a 100644 --- a/arkoala-arkts/arkui/generated/component/particle.ets +++ b/arkoala-arkts/arkui/generated/component/particle.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { VP, Dimension, ResourceStr, ResourceColor } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { ImageFit, Color } from "./enums" import { curves } from "./../framework/ohos.curves" import { Vector2T, LengthMetrics } from "./../framework/arkui.Graphics" diff --git a/arkoala-arkts/arkui/generated/component/patternLock.ets b/arkoala-arkts/arkui/generated/component/patternLock.ets index 8b4ee21cbe820f20b33fa219d1770018fa982abe..445c266f281e0a42c679fef58bc98207d382c622 100644 --- a/arkoala-arkts/arkui/generated/component/patternLock.ets +++ b/arkoala-arkts/arkui/generated/component/patternLock.ets @@ -20,11 +20,12 @@ import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { Finalizable, runtimeType, RuntimeType, SerializerBase, toPeerPtr, KPointer, MaterializedBase, NativeBuffer, DeserializerBase, nullptr, KInt, KBoolean, KStringPtr, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { Length, ResourceColor } from "./units" +import { Resource } from "global.resource" import { Color } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" diff --git a/arkoala-arkts/arkui/generated/component/polygon.ets b/arkoala-arkts/arkui/generated/component/polygon.ets index 49aa97cdf1079501c47dedb8eaaf870820f30cd3..e676816fad23db5a49987b5307923d78a54cdd56 100644 --- a/arkoala-arkts/arkui/generated/component/polygon.ets +++ b/arkoala-arkts/arkui/generated/component/polygon.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" @@ -25,6 +25,7 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonShapeMethodPeer, CommonShapeMethod, CommonMethod, ArkCommonShapeMethodComponent, ArkCommonShapeMethodStyle, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonShapeMethodModifier, CommonMethodModifier } from "./common" import { ShapePoint } from "./line" import { Length } from "./units" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/polyline.ets b/arkoala-arkts/arkui/generated/component/polyline.ets index 9ce26dd35f0b2911610e1c37263417c6971d6afa..336551f1c4dbc020fe9e0a733dd10365bdde8b52 100644 --- a/arkoala-arkts/arkui/generated/component/polyline.ets +++ b/arkoala-arkts/arkui/generated/component/polyline.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" @@ -25,6 +25,7 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonShapeMethodPeer, CommonShapeMethod, CommonMethod, ArkCommonShapeMethodComponent, ArkCommonShapeMethodStyle, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonShapeMethodModifier, CommonMethodModifier } from "./common" import { ShapePoint } from "./line" import { Length } from "./units" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/progress.ets b/arkoala-arkts/arkui/generated/component/progress.ets index b81a61d87d61fecdd0f0c589e044da2e15e75630..1e2c82f951b717fe1e968e40378c074abfc04a01 100644 --- a/arkoala-arkts/arkui/generated/component/progress.ets +++ b/arkoala-arkts/arkui/generated/component/progress.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { LinearGradient_serializer, LinearGradient } from "./dataPanel" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" @@ -26,6 +26,7 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, CommonConfiguration, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { ResourceColor, Length, PX, VP, LPX, Font, Font_serializer } from "./units" import { Color } from "./enums" +import { Resource } from "global.resource" import { ContentModifier, AttributeModifier, hookProgressContentModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/qrcode.ets b/arkoala-arkts/arkui/generated/component/qrcode.ets index f486f2a069c5a3112ef3e92df9ae95366ce54c24..7c07bfa8aedaa6ace3e36fcfa5f8ab9a6d25594e 100644 --- a/arkoala-arkts/arkui/generated/component/qrcode.ets +++ b/arkoala-arkts/arkui/generated/component/qrcode.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32 } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" @@ -25,6 +25,7 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { ResourceColor, ResourceStr } from "./units" import { Color } from "./enums" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/radio.ets b/arkoala-arkts/arkui/generated/component/radio.ets index fa1dfa56c7fff2bf5f3a34a0eb3147cde38dedf6..fdefff7d5cdfdc529d71be67b77e03e8df99ef89 100644 --- a/arkoala-arkts/arkui/generated/component/radio.ets +++ b/arkoala-arkts/arkui/generated/component/radio.ets @@ -30,9 +30,10 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CustomBuilder } from "./builder" import { ResourceColor } from "./units" import { Color } from "./enums" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" +import { Resource_serializer } from "./../framework/resource" export class ArkRadioPeer extends ArkCommonMethodPeer { protected constructor(peerPtr: KPointer, id: int32, name: string = "", flags: int32 = 0) { super(peerPtr, id, name, flags) diff --git a/arkoala-arkts/arkui/generated/component/rating.ets b/arkoala-arkts/arkui/generated/component/rating.ets index ce13236de97be83f0613bdff706a33532ab142e9..27719e090d8a907b1d42c2942d9b84ed458dc5ea 100644 --- a/arkoala-arkts/arkui/generated/component/rating.ets +++ b/arkoala-arkts/arkui/generated/component/rating.ets @@ -28,9 +28,10 @@ import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceStr } from "./units" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" +import { Resource_serializer } from "./../framework/resource" export class ArkRatingPeer extends ArkCommonMethodPeer { protected constructor(peerPtr: KPointer, id: int32, name: string = "", flags: int32 = 0) { super(peerPtr, id, name, flags) diff --git a/arkoala-arkts/arkui/generated/component/rect.ets b/arkoala-arkts/arkui/generated/component/rect.ets index d12517d6889b427659894d593968836efea9be13..41dc09014410962b9a6c9eb39c41e085259c57ba 100644 --- a/arkoala-arkts/arkui/generated/component/rect.ets +++ b/arkoala-arkts/arkui/generated/component/rect.ets @@ -28,9 +28,10 @@ import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Length } from "./units" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" +import { Resource_serializer } from "./../framework/resource" export class ArkRectPeer extends ArkCommonShapeMethodPeer { protected constructor(peerPtr: KPointer, id: int32, name: string = "", flags: int32 = 0) { super(peerPtr, id, name, flags) diff --git a/arkoala-arkts/arkui/generated/component/refresh.ets b/arkoala-arkts/arkui/generated/component/refresh.ets index ffa669a6cfd381fbcfd132baef064ba52ff693f9..39a7726ae5f133b47be4e4af23cf66e89136f036 100644 --- a/arkoala-arkts/arkui/generated/component/refresh.ets +++ b/arkoala-arkts/arkui/generated/component/refresh.ets @@ -28,11 +28,12 @@ import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceStr } from "./units" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { CustomBuilder } from "./builder" import { ComponentContent, ComponentContent_serializer } from "./../framework/arkui.ComponentContent" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" +import { Resource_serializer } from "./../framework/resource" export class ArkRefreshPeer extends ArkCommonMethodPeer { protected constructor(peerPtr: KPointer, id: int32, name: string = "", flags: int32 = 0) { super(peerPtr, id, name, flags) diff --git a/arkoala-arkts/arkui/generated/component/relativeContainer.ets b/arkoala-arkts/arkui/generated/component/relativeContainer.ets index 914ab4a5a9c39340889cd8fc3d1d789556a61840..852d6585396c9cfceea611a85a0831c2c9d28972 100644 --- a/arkoala-arkts/arkui/generated/component/relativeContainer.ets +++ b/arkoala-arkts/arkui/generated/component/relativeContainer.ets @@ -28,10 +28,11 @@ import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Dimension } from "./units" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { Axis } from "./enums" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" +import { Resource_serializer } from "./../framework/resource" export class ArkRelativeContainerPeer extends ArkCommonMethodPeer { protected constructor(peerPtr: KPointer, id: int32, name: string = "", flags: int32 = 0) { super(peerPtr, id, name, flags) diff --git a/arkoala-arkts/arkui/generated/component/richEditor.ets b/arkoala-arkts/arkui/generated/component/richEditor.ets index 46275d2a2276a9f586dc08bfb66eaa3a3bd82f0f..dffcf545236a432710088d5c6ee1d052b14d7703 100644 --- a/arkoala-arkts/arkui/generated/component/richEditor.ets +++ b/arkoala-arkts/arkui/generated/component/richEditor.ets @@ -22,11 +22,12 @@ import { PreviewText_serializer, TextEditControllerEx, TextEditControllerExInter import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { VoidCallback, ResourceColor, ResourceStr, Font, Length, Dimension, Padding, BorderRadiuses, Font_serializer, Padding_serializer, BorderRadiuses_serializer } from "./units" import { CopyOptions, Color, BarState, ResponseType, FontStyle, FontWeight, TextAlign, WordBreak, LineBreakStrategy, ImageSpanAlignment, ImageFit } from "./enums" +import { Resource } from "global.resource" import { EnterKeyType, SubmitEvent } from "./textInput" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CustomBuilder } from "./builder" diff --git a/arkoala-arkts/arkui/generated/component/scroll.ets b/arkoala-arkts/arkui/generated/component/scroll.ets index ce03f963d6d796325e142af4d13b9d0422393c54..f179e49a802a8c6d58e176246f3e655b7a591c78 100644 --- a/arkoala-arkts/arkui/generated/component/scroll.ets +++ b/arkoala-arkts/arkui/generated/component/scroll.ets @@ -17,10 +17,11 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, Finalizable, runtimeType, RuntimeType, toPeerPtr, KPointer, MaterializedBase, NativeBuffer, nullptr, KInt, KBoolean, KStringPtr, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { RectResult_serializer, RectResult, NestedScrollOptions_serializer, EdgeEffectOptions_serializer, ArkScrollableCommonMethodPeer, ScrollableCommonMethod, NestedScrollOptions, CommonMethod, EdgeEffectOptions, ArkScrollableCommonMethodComponent, ArkScrollableCommonMethodStyle, ArkCommonMethodComponent, ArkCommonMethodStyle, ScrollableCommonMethodModifier, CommonMethodModifier } from "./common" import { Edge, ScrollSource, BarState, Color, EdgeEffect } from "./enums" import { Length, VoidCallback, Dimension } from "./units" +import { Resource } from "global.resource" import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/search.ets b/arkoala-arkts/arkui/generated/component/search.ets index 8ae7a9cac6301f39c9eecefaa1bd581b5f877d3a..dee53873f1592cc2d398b65ad2477810ed434cc3 100644 --- a/arkoala-arkts/arkui/generated/component/search.ets +++ b/arkoala-arkts/arkui/generated/component/search.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr, Finalizable } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { SymbolGlyphModifier_serializer, SymbolGlyphModifier } from "./../framework/arkui.SymbolGlyphModifier" import { CaretStyle_serializer, EditMenuOptions_serializer, CaretStyle, EditableTextOnChangeCallback, PreviewText, TextChangeOptions, InsertValue, DeleteValue, EditMenuOptions, AutoCapitalizationMode, EditableTextChangeValue, KeyboardAppearance } from "./textCommon" import { Font_serializer, ResourceColor, Dimension, Font, ResourceStr, Length } from "./units" @@ -28,6 +28,7 @@ import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { Color, CopyOptions, TextAlign } from "./enums" +import { Resource } from "global.resource" import { EnterKeyType, SubmitEvent, OnTextSelectionChangeCallback, OnContentScrollCallback, OnPasteCallback } from "./textInput" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CustomBuilder } from "./builder" diff --git a/arkoala-arkts/arkui/generated/component/securityComponent.ets b/arkoala-arkts/arkui/generated/component/securityComponent.ets index 58db5200e1ca1fc08060aec43270d9a1baff305d..18aff206338f3358b883fcc6d3154c55a1343beb 100644 --- a/arkoala-arkts/arkui/generated/component/securityComponent.ets +++ b/arkoala-arkts/arkui/generated/component/securityComponent.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Dimension, Position, Edges, LocalizedEdges, ResourceColor, Padding, Length, SizeOptions, ConstraintSizeOptions } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { FontStyle, FontWeight, Color, BorderStyle } from "./enums" export enum SecurityComponentLayoutDirection { HORIZONTAL = 0, diff --git a/arkoala-arkts/arkui/generated/component/select.ets b/arkoala-arkts/arkui/generated/component/select.ets index 2aed71ef24c83d75a4a31107909b06b65e029bda..d9c405949726d6214b881b48d737b858ac458f1d 100644 --- a/arkoala-arkts/arkui/generated/component/select.ets +++ b/arkoala-arkts/arkui/generated/component/select.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { Bindable_Number_serializer, Bindable_Global_Resource_Resource_serializer, Bindable_String_serializer, ArkCommonMethodPeer, CommonMethod, Bindable, BlurStyle, CommonConfiguration, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { Font_serializer, DividerStyleOptions_serializer, Offset_serializer, ResourceStr, Font, ResourceColor, Length, Dimension, DividerStyleOptions, Offset, EdgeOutlineWidths, EdgeColors, EdgeOutlineWidths_serializer, EdgeColors_serializer } from "./units" import { DividerOptions_serializer, DividerOptions } from "./textPicker" @@ -27,6 +27,7 @@ import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" +import { Resource } from "global.resource" import { Color, OptionWidthMode } from "./enums" import { ControlSize } from "./button" import { ContentModifier, AttributeModifier, hookSelectContentModifier, UICommonBase, AttributeUpdater } from "#handwritten" diff --git a/arkoala-arkts/arkui/generated/component/shape.ets b/arkoala-arkts/arkui/generated/component/shape.ets index 9927facea6484df1c7c55bb59972a7a6a03e609c..a9863d090d69be08b2bfd67fa047aa874cdc9f85 100644 --- a/arkoala-arkts/arkui/generated/component/shape.ets +++ b/arkoala-arkts/arkui/generated/component/shape.ets @@ -18,7 +18,7 @@ import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { image_PixelMap_serializer, image } from "./../framework/ohos.multimedia.image" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" @@ -26,6 +26,7 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { ResourceColor, Length } from "./units" import { Color, LineCapStyle, LineJoinStyle } from "./enums" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/sidebar.ets b/arkoala-arkts/arkui/generated/component/sidebar.ets index f1c54a185a4f38ccca7eb2eb20d86c2976407373..3d229602beed9d9dffee01f66d8e3753f44e3125 100644 --- a/arkoala-arkts/arkui/generated/component/sidebar.ets +++ b/arkoala-arkts/arkui/generated/component/sidebar.ets @@ -18,12 +18,13 @@ import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { Bindable_Boolean_serializer, Bindable_Number_serializer, DividerStyle_serializer, ArkCommonMethodPeer, CommonMethod, Bindable, DividerStyle, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { Length, Dimension } from "./units" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/slider.ets b/arkoala-arkts/arkui/generated/component/slider.ets index 467e9d4a7016b656e15643eeb0fdeb59824578f5..210ac7fb5738978a389c7c9d93859787d0815a50 100644 --- a/arkoala-arkts/arkui/generated/component/slider.ets +++ b/arkoala-arkts/arkui/generated/component/slider.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { LinearGradient_serializer, LinearGradient } from "./dataPanel" import { SizeOptions_serializer, ResourceColor, Length, Dimension, SizeOptions, ResourceStr } from "./units" import { int32, int64, float32, unsafeCast } from "@koalaui/common" @@ -26,6 +26,7 @@ import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, Bindable, CommonConfiguration, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier, Bindable_Number_serializer } from "./common" import { Color, CrownSensitivity, Axis } from "./enums" +import { Resource } from "global.resource" import { ContentModifier, AttributeModifier, hookSliderContentModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/component/span.ets b/arkoala-arkts/arkui/generated/component/span.ets index d04f3ca2cef3c2d2371b3d88a9296952016d3e28..21d254f2193f1068e3d5a02198282fecbe62458a 100644 --- a/arkoala-arkts/arkui/generated/component/span.ets +++ b/arkoala-arkts/arkui/generated/component/span.ets @@ -25,10 +25,11 @@ import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, ShadowOptions_serializer, ShadowOptions, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { Font_serializer, Font, ResourceColor, Length, Dimension, BorderRadiuses, BorderRadiuses_serializer } from "./units" import { DecorationStyleInterface_serializer, DecorationStyleInterface } from "./styledString" import { Color, FontStyle, FontWeight, TextCase } from "./enums" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" diff --git a/arkoala-arkts/arkui/generated/component/styledString.ets b/arkoala-arkts/arkui/generated/component/styledString.ets index 846ec1c49919825fe3034f89fefb3f0edab8c820..d1a825ab097cd14e482b4c15bb17ef9efbe6f5da 100644 --- a/arkoala-arkts/arkui/generated/component/styledString.ets +++ b/arkoala-arkts/arkui/generated/component/styledString.ets @@ -22,9 +22,10 @@ import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" import { LengthMetrics, LengthMetricsInternal, DrawContext, DrawContextInternal, LengthMetrics_serializer } from "./../framework/arkui.Graphics" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { TextDecorationType, Color, TextDecorationStyle, ImageSpanAlignment, ImageFit, TextAlign, TextOverflow, WordBreak, FontStyle, FontWeight } from "./enums" import { ResourceColor, SizeOptions_serializer, ColorFilter_serializer, SizeOptions, ColorFilter, ColorFilterInternal, ResourceStr, Padding, BorderRadiuses, Padding_serializer, BorderRadiuses_serializer } from "./units" +import { Resource } from "global.resource" import { drawing_ColorFilter_serializer, drawing } from "./../framework/ohos.graphics.drawing" import { image, image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" import { LeadingMarginPlaceholder_serializer, LeadingMarginPlaceholder } from "./richEditor" diff --git a/arkoala-arkts/arkui/generated/component/swiper.ets b/arkoala-arkts/arkui/generated/component/swiper.ets index 7cda80787beead5ee2e8023a9a5446a9e4de10f6..17acbdb1f1db581405749d22ec287cc4fad9c5e0 100644 --- a/arkoala-arkts/arkui/generated/component/swiper.ets +++ b/arkoala-arkts/arkui/generated/component/swiper.ets @@ -24,11 +24,12 @@ import { VoidCallback, Length, ResourceColor, VP, Font, Font_serializer } from " import { Bindable_Number_serializer, ArkCommonMethodPeer, CommonMethod, Bindable, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { IndicatorComponentController_serializer, IndicatorComponentController } from "./indicatorcomponent" import { curves_ICurve_serializer, curves } from "./../framework/ohos.curves" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { EdgeEffect, PageFlipMode, Color } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" +import { Resource } from "global.resource" import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" diff --git a/arkoala-arkts/arkui/generated/component/symbolSpan.ets b/arkoala-arkts/arkui/generated/component/symbolSpan.ets index 7e1d1c2f7e83970b913851e269a4053f88604054..7ccdcc4989fa578a8c1ec3c36fae56a313570afe 100644 --- a/arkoala-arkts/arkui/generated/component/symbolSpan.ets +++ b/arkoala-arkts/arkui/generated/component/symbolSpan.ets @@ -17,12 +17,13 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32 } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" +import { Resource } from "global.resource" import { ResourceColor } from "./units" import { Color, FontWeight } from "./enums" import { SymbolEffectStrategy, SymbolRenderingStrategy } from "./symbolglyph" diff --git a/arkoala-arkts/arkui/generated/component/symbolglyph.ets b/arkoala-arkts/arkui/generated/component/symbolglyph.ets index ebf4357946d2388c374c9a4b747bf1d5d5aebdae..bf2d4e7247b0d865d697eb200040c3f425738fde 100644 --- a/arkoala-arkts/arkui/generated/component/symbolglyph.ets +++ b/arkoala-arkts/arkui/generated/component/symbolglyph.ets @@ -20,10 +20,11 @@ import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { Finalizable, runtimeType, RuntimeType, SerializerBase, toPeerPtr, KPointer, MaterializedBase, NativeBuffer, DeserializerBase, nullptr, KInt, KBoolean, KStringPtr, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" +import { Resource } from "global.resource" import { ResourceColor } from "./units" import { Color, FontWeight } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" diff --git a/arkoala-arkts/arkui/generated/component/tabContent.ets b/arkoala-arkts/arkui/generated/component/tabContent.ets index ea091d680580e857f7d2b889fdc211667ff3dcd3..4f63e5ee88c8a49c740bff41e80041985316bd7d 100644 --- a/arkoala-arkts/arkui/generated/component/tabContent.ets +++ b/arkoala-arkts/arkui/generated/component/tabContent.ets @@ -22,10 +22,11 @@ import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" import { ComponentContent_serializer, ComponentContent } from "./../framework/arkui.ComponentContent" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" +import { Resource } from "global.resource" import { CustomBuilder } from "./builder" import { VoidCallback, ResourceColor, Length, ResourceStr, Font, Padding, Dimension, LocalizedPadding, Font_serializer, Padding_serializer, LocalizedPadding_serializer } from "./units" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" diff --git a/arkoala-arkts/arkui/generated/component/tabs.ets b/arkoala-arkts/arkui/generated/component/tabs.ets index ee180da93bfb6f24dc5df388623a7c6c6581daff..00a1415277f93f74f4fe1a450c8fd5892521dca3 100644 --- a/arkoala-arkts/arkui/generated/component/tabs.ets +++ b/arkoala-arkts/arkui/generated/component/tabs.ets @@ -21,10 +21,11 @@ import { Finalizable, runtimeType, RuntimeType, SerializerBase, toPeerPtr, KPoin import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" import { TranslateOptions_serializer, TranslateOptions, DividerStyle_serializer, BackgroundEffectOptions_serializer, BackgroundBlurStyleOptions_serializer, ArkCommonMethodPeer, CommonMethod, DividerStyle, BlurStyle, BackgroundEffectOptions, BackgroundBlurStyleOptions, BlurStyleOptions, BlurStyleActivePolicy, Bindable, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier, Bindable_Number_serializer } from "./common" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { Length, ResourceColor, Dimension } from "./units" +import { Resource } from "global.resource" import { EdgeEffect, Color, PageFlipMode } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" diff --git a/arkoala-arkts/arkui/generated/component/text.ets b/arkoala-arkts/arkui/generated/component/text.ets index fa130ffb0c3c1ecc45a52da2ed38bd0ccf0270ab..a9a2e18d937593692fdbc31d6227ceaed28cdc37 100644 --- a/arkoala-arkts/arkui/generated/component/text.ets +++ b/arkoala-arkts/arkui/generated/component/text.ets @@ -22,7 +22,7 @@ import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { Finalizable, runtimeType, RuntimeType, SerializerBase, toPeerPtr, KPointer, MaterializedBase, NativeBuffer, DeserializerBase, nullptr, KInt, KBoolean, KStringPtr, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { LengthMetrics_serializer, LengthMetrics } from "./../framework/arkui.Graphics" import { ShadowOptions_serializer, ArkCommonMethodPeer, CommonMethod, ShadowOptions, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { Font_serializer, ResourceColor, Length, Font, VoidCallback } from "./units" @@ -30,6 +30,7 @@ import { SelectionMenuOptions_serializer, SelectionMenuOptions, MenuOnAppearCall import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { Color, FontStyle, TextAlign, TextCase, CopyOptions, TextHeightAdaptivePolicy, WordBreak, LineBreakStrategy, EllipsisMode, TextSelectableMode, FontWeight, TextOverflow } from "./enums" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CustomBuilder } from "./builder" import { CallbackKind } from "./../framework/peers/CallbackKind" diff --git a/arkoala-arkts/arkui/generated/component/textArea.ets b/arkoala-arkts/arkui/generated/component/textArea.ets index 35d07a0dd9f0a7b72cd58be6fc2e69c5844b5d54..6e83455c442b99ee93ef0b3fbf432598b55296f4 100644 --- a/arkoala-arkts/arkui/generated/component/textArea.ets +++ b/arkoala-arkts/arkui/generated/component/textArea.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr, Finalizable } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { Font_serializer, ResourceColor, Font, Length, ResourceStr, Dimension } from "./units" import { CaretStyle_serializer, EditMenuOptions_serializer, CaretStyle, EditableTextOnChangeCallback, PreviewText, TextChangeOptions, InsertValue, DeleteValue, EditMenuOptions, AutoCapitalizationMode, EditableTextChangeValue, KeyboardAppearance } from "./textCommon" import { TextDecorationOptions_serializer, InputCounterOptions_serializer, ArkCommonMethodPeer, CommonMethod, TextDecorationOptions, InputCounterOptions, Bindable, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier, Bindable_Arkui_Component_Units_ResourceStr_serializer, Bindable_Global_Resource_Resource_serializer, Bindable_String_serializer, SelectionOptions_serializer, TextContentControllerBase, TextContentControllerBaseInternal, SelectionOptions } from "./common" @@ -28,6 +28,7 @@ import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { Color, TextAlign, FontStyle, FontWeight, TextOverflow, CopyOptions, TextContentStyle, BarState, TextHeightAdaptivePolicy, WordBreak, LineBreakStrategy, EllipsisMode } from "./enums" +import { Resource } from "global.resource" import { EnterKeyType, SubmitEvent, ContentType } from "./textInput" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CustomBuilder } from "./builder" diff --git a/arkoala-arkts/arkui/generated/component/textClock.ets b/arkoala-arkts/arkui/generated/component/textClock.ets index a850c964d2270a578361194dfea84865f47b6e4e..bfbebe4180f615240f6ba27ed7c1674b580a99dd 100644 --- a/arkoala-arkts/arkui/generated/component/textClock.ets +++ b/arkoala-arkts/arkui/generated/component/textClock.ets @@ -20,12 +20,13 @@ import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { Finalizable, runtimeType, RuntimeType, SerializerBase, toPeerPtr, KPointer, MaterializedBase, NativeBuffer, DeserializerBase, nullptr, KInt, KBoolean, KStringPtr, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { ShadowOptions_serializer, ArkCommonMethodPeer, CommonMethod, ShadowOptions, CommonConfiguration, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { intl_DateTimeOptions_serializer, intl } from "./../framework/ohos.intl" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ResourceStr, ResourceColor, Length } from "./units" +import { Resource } from "global.resource" import { Color, FontStyle, FontWeight } from "./enums" import { ContentModifier, AttributeModifier, hookTextClockContentModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" diff --git a/arkoala-arkts/arkui/generated/component/textCommon.ets b/arkoala-arkts/arkui/generated/component/textCommon.ets index 3abb73d8c33f173d80088d30c1a65ce4b1d1590a..191b1ea451e5a81efba2c334b846df6fe2f93a3c 100644 --- a/arkoala-arkts/arkui/generated/component/textCommon.ets +++ b/arkoala-arkts/arkui/generated/component/textCommon.ets @@ -22,8 +22,9 @@ import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" import { StyledString, StyledStringInternal, MutableStyledString, MutableStyledStringInternal, DecorationStyleInterface, StyledString_serializer, DecorationStyleInterface_serializer } from "./styledString" import { SelectionOptions_serializer, SelectionOptions } from "./common" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { ResourceStr, ResourceColor, Length } from "./units" +import { Resource } from "global.resource" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Color, TextDecorationType, TextDecorationStyle } from "./enums" diff --git a/arkoala-arkts/arkui/generated/component/textInput.ets b/arkoala-arkts/arkui/generated/component/textInput.ets index ee47c28a58f06f816d77067452fd9229a991e6ad..9ebb2b6abae7cce144941ec1cfc231193e84432e 100644 --- a/arkoala-arkts/arkui/generated/component/textInput.ets +++ b/arkoala-arkts/arkui/generated/component/textInput.ets @@ -20,7 +20,7 @@ import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { Finalizable, runtimeType, RuntimeType, SerializerBase, toPeerPtr, KPointer, MaterializedBase, NativeBuffer, DeserializerBase, nullptr, KInt, KBoolean, KStringPtr, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { Font_serializer, ResourceColor, Dimension, Font, Length, ResourceStr } from "./units" import { CaretStyle_serializer, EditMenuOptions_serializer, EditableTextOnChangeCallback, PreviewText, TextChangeOptions, CaretStyle, InsertValue, DeleteValue, EditMenuOptions, AutoCapitalizationMode, EditableTextChangeValue, KeyboardAppearance } from "./textCommon" import { CancelButtonOptions_serializer, CancelButtonSymbolOptions_serializer, CancelButtonOptions, CancelButtonSymbolOptions } from "./search" @@ -29,6 +29,7 @@ import { KeyboardOptions_serializer, PasteEvent, KeyboardOptions } from "./richE import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { Color, TextOverflow, FontStyle, FontWeight, CopyOptions, TextAlign, TextContentStyle, BarState, WordBreak, LineBreakStrategy, TextHeightAdaptivePolicy, EllipsisMode } from "./enums" +import { Resource } from "global.resource" import { CustomBuilder } from "./builder" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" diff --git a/arkoala-arkts/arkui/generated/component/textPicker.ets b/arkoala-arkts/arkui/generated/component/textPicker.ets index d885a91e47969a161ef2e1f0675fc633cc6d26f9..5121f0db26f9a3714de9e95377ba5634a0d813cf 100644 --- a/arkoala-arkts/arkui/generated/component/textPicker.ets +++ b/arkoala-arkts/arkui/generated/component/textPicker.ets @@ -21,10 +21,11 @@ import { Finalizable, runtimeType, RuntimeType, SerializerBase, toPeerPtr, KPoin import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" import { PickerTextStyle_serializer, ArkCommonMethodPeer, CommonMethod, PickerTextStyle, Bindable, PickerDialogButtonStyle, Rectangle, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, ShadowOptions, ShadowStyle, HoverModeAreaType, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier, Bindable_Arkui_Component_Units_ResourceStr_serializer, Bindable_Array_Arkui_Component_Units_ResourceStr_serializer, Bindable_Number_serializer, Bindable_Array_Number_serializer, PickerDialogButtonStyle_serializer, Rectangle_serializer, BackgroundBlurStyleOptions_serializer, BackgroundEffectOptions_serializer, ShadowOptions_serializer } from "./common" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { Dimension, ResourceStr, ResourceColor, Offset, Font_serializer, Font, Offset_serializer } from "./units" +import { Resource } from "global.resource" import { CrownSensitivity, Color, TextOverflow } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" diff --git a/arkoala-arkts/arkui/generated/component/textTimer.ets b/arkoala-arkts/arkui/generated/component/textTimer.ets index 1fae68a3c69757251b814f6435aa5879ad7bde2f..44ac3da50ac769415c2cf7e7d9a50785f6b82214 100644 --- a/arkoala-arkts/arkui/generated/component/textTimer.ets +++ b/arkoala-arkts/arkui/generated/component/textTimer.ets @@ -20,12 +20,13 @@ import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { Finalizable, runtimeType, RuntimeType, SerializerBase, toPeerPtr, KPointer, MaterializedBase, NativeBuffer, DeserializerBase, nullptr, KInt, KBoolean, KStringPtr, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { ShadowOptions_serializer, ArkCommonMethodPeer, CommonMethod, ShadowOptions, CommonConfiguration, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ResourceColor, Length, ResourceStr } from "./units" import { Color, FontStyle, FontWeight } from "./enums" +import { Resource } from "global.resource" import { ContentModifier, AttributeModifier, hookTextTimerContentModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" diff --git a/arkoala-arkts/arkui/generated/component/timePicker.ets b/arkoala-arkts/arkui/generated/component/timePicker.ets index da3635b0aa7cdff5dfb0ca4b0aa04a1eb14f121c..d855bde8a21872ed9ac158070d9d8452da9edbe2 100644 --- a/arkoala-arkts/arkui/generated/component/timePicker.ets +++ b/arkoala-arkts/arkui/generated/component/timePicker.ets @@ -31,7 +31,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { DialogAlignment } from "./alertDialog" import { Offset, ResourceColor } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" export class TimePickerDialogInternal { diff --git a/arkoala-arkts/arkui/generated/component/toggle.ets b/arkoala-arkts/arkui/generated/component/toggle.ets index 619b82b69a492806f4413b8115348a13efac3b68..08eca280a4618e4fb7f3666bfddde680a53c4f5f 100644 --- a/arkoala-arkts/arkui/generated/component/toggle.ets +++ b/arkoala-arkts/arkui/generated/component/toggle.ets @@ -17,7 +17,7 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, nullptr, KPointer, KInt, KBoolean, KStringPtr, runtimeType, RuntimeType, MaterializedBase, toPeerPtr, NativeBuffer, CallbackResource, InteropNativeModule, Tags, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" @@ -26,6 +26,7 @@ import { ArkCommonMethodPeer, CommonMethod, CommonConfiguration, Bindable, ArkCo import { ContentModifier, AttributeModifier, hookToggleContentModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { ResourceColor } from "./units" import { Color } from "./enums" +import { Resource } from "global.resource" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" diff --git a/arkoala-arkts/arkui/generated/component/units.ets b/arkoala-arkts/arkui/generated/component/units.ets index 82561bce23f2c7d0709f9a520ff4261a8b38fd0c..66e525545b5e3f75f902061b74418cd3e05f91de 100644 --- a/arkoala-arkts/arkui/generated/component/units.ets +++ b/arkoala-arkts/arkui/generated/component/units.ets @@ -22,10 +22,11 @@ import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { LengthMetrics, LengthMetricsUnit, ColorMetrics, LengthMetrics_serializer } from "./../framework/arkui.Graphics" import { Color, BorderStyle, FontWeight, FontStyle, DividerMode } from "./enums" import { OutlineStyle } from "./common" +import { Resource_serializer } from "./../framework/resource" export class ColorFilterInternal { public static fromPtr(ptr: KPointer): ColorFilter { return new ColorFilter(false, ptr) @@ -57,7 +58,7 @@ export class ColorFilter implements MaterializedBase { return ArkUIGeneratedNativeModule._ColorFilter_getFinalizer() } } -export { Resource } from "./../framework/resource" +export { Resource } from "global.resource" export type Length = string | number | Resource; export type PX = string; export type VP = string | number; diff --git a/arkoala-arkts/arkui/generated/component/video.ets b/arkoala-arkts/arkui/generated/component/video.ets index e55da69026ef61a1208de592f40a0141dd50f390..eae0e32e3d3fc7a43a6385eb1ec76b8969a5cdf9 100644 --- a/arkoala-arkts/arkui/generated/component/video.ets +++ b/arkoala-arkts/arkui/generated/component/video.ets @@ -31,10 +31,11 @@ import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" import { CallbackKind } from "./../framework/peers/CallbackKind" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource, Resource_serializer } from "./../framework/resource" +import { Resource } from "global.resource" import { image, image_PixelMap_serializer } from "./../framework/ohos.multimedia.image" import { NodeAttach, remember } from "@koalaui/runtime" import { AttributeUpdaterFlag } from "./../framework/AttributeUpdater" +import { Resource_serializer } from "./../framework/resource" export class VideoControllerInternal { public static fromPtr(ptr: KPointer): VideoController { return new VideoController(ptr) diff --git a/arkoala-arkts/arkui/generated/component/waterFlow.ets b/arkoala-arkts/arkui/generated/component/waterFlow.ets index e55b33eca96a02f5593e1a98367cd75dddc252cf..07e2c60e108035891926332106fd4f5c33f3a64a 100644 --- a/arkoala-arkts/arkui/generated/component/waterFlow.ets +++ b/arkoala-arkts/arkui/generated/component/waterFlow.ets @@ -21,10 +21,11 @@ import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" import { ConstraintSizeOptions_serializer, ConstraintSizeOptions, Length, Dimension, Padding, Padding_serializer } from "./units" -import { Resource_serializer, Resource } from "./../framework/resource" +import { Resource_serializer } from "./../framework/resource" import { ComponentBase } from "./../ComponentBase" import { PeerNode } from "./../PeerNode" import { ArkScrollableCommonMethodPeer, ScrollableCommonMethod, OnWillScrollCallback, OnScrollCallback, CommonMethod, ArkScrollableCommonMethodComponent, ArkScrollableCommonMethodStyle, ArkCommonMethodComponent, ArkCommonMethodStyle, ScrollableCommonMethodModifier, CommonMethodModifier } from "./common" +import { Resource } from "global.resource" import { FlexDirection, ScrollSource } from "./enums" import { OnScrollFrameBeginCallback, Scroller, Scroller_serializer } from "./scroll" import { ScrollState } from "./list" diff --git a/arkoala-arkts/arkui/generated/component/windowScene.ets b/arkoala-arkts/arkui/generated/component/windowScene.ets index 45200c110722062260e03a6906c627469caa8f77..aac7385f080a2ac697aa40b0fb409261bd62e6cc 100644 --- a/arkoala-arkts/arkui/generated/component/windowScene.ets +++ b/arkoala-arkts/arkui/generated/component/windowScene.ets @@ -24,7 +24,7 @@ import { PeerNode } from "./../PeerNode" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" import { ArkCommonMethodPeer, CommonMethod, ArkCommonMethodComponent, ArkCommonMethodStyle, CommonMethodModifier } from "./common" import { AttributeModifier, UICommonBase, AttributeUpdater } from "#handwritten" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CallbackKind } from "./../framework/peers/CallbackKind" import { CallbackTransformer } from "./../CallbackTransformer" import { memo, memo_stable } from "@koalaui/runtime/annotations" diff --git a/arkoala-arkts/arkui/generated/framework/GlobalScope.ets b/arkoala-arkts/arkui/generated/framework/GlobalScope.ets index 1cbe0e17db5a7df9be5544d1c2adc381d4bb311b..9bc677a6d7888eedf032e87a365cac3a0b2100ca 100644 --- a/arkoala-arkts/arkui/generated/framework/GlobalScope.ets +++ b/arkoala-arkts/arkui/generated/framework/GlobalScope.ets @@ -18,13 +18,14 @@ import { Edges_serializer, BorderRadiuses_serializer, Edges, Dimension, BorderRadiuses, Length } from "./../component/units" import { SerializerBase, DeserializerBase, NativeBuffer, Finalizable, runtimeType, RuntimeType, MaterializedBase, KPointer, toPeerPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./resource" +import { Resource_serializer } from "./resource" import { AnimateParam_serializer, AnimateParam, FinishCallbackType, ExpectedFrameRateRange } from "./../component/common" import { ComponentInfo_serializer, ComponentInfo, Offset_componentutils, TranslateResult, ScaleResult, RotateResult, Matrix4Result } from "./../component/idlize" import { uiEffect_BrightnessBlenderParam_serializer, uiEffect_BrightnessBlender_serializer, uiEffect } from "./ohos.graphics.uiEffect" import { text_FontDescriptor_serializer, text } from "./ohos.graphics.text" import { font_UIFontConfig_serializer, font } from "./ohos.font" import { ArkUIGeneratedNativeModule, TypeChecker } from "#components" +import { Resource } from "global.resource" import { BorderStyle, PlayMode } from "./../component/enums" import { curves } from "./ohos.curves" import { Size } from "./arkui.Graphics" diff --git a/arkoala-arkts/arkui/generated/framework/arkts/type_check.ets b/arkoala-arkts/arkui/generated/framework/arkts/type_check.ets index 7ce7071d7d4ec043495ab457a177e0f435c6b851..329d2a45652c46d89cbcc3d5a3b599fc8cb04da1 100644 --- a/arkoala-arkts/arkui/generated/framework/arkts/type_check.ets +++ b/arkoala-arkts/arkui/generated/framework/arkts/type_check.ets @@ -31,7 +31,7 @@ import { BarStyle, LaunchMode, NavBarPosition, NavigationMode, NavigationOperati import { BaseContext } from "./../application.BaseContext" import { BaseShape, BuilderNodeOps, BuilderNodeOptions, CommonShape, Offset_componentutils, PerfMonitorActionType, PerfMonitorSourceType, RotateResult, ScaleResult, Scene, TranslateResult, WorkerEventListener, Event, DoubleAnimationParam, Callback_Extender_OnProgress, Callback_Extender_OnFinish, ErrorEvent, MessageEvents, PostMessageOptions, SnapshotOptions, WorkerOptions, ComponentInfo, Matrix4Result, RestrictedWorker, RestrictedWorker_onexit_Callback, RestrictedWorker_onerror_Callback, RestrictedWorker_onmessage_Callback } from "./../../component/idlize" import { Length, SizeOptions, Position, ResourceColor, ColorFilter, ConstraintSizeOptions, ResourceStr, VoidCallback, AccessibilityOptions, Bias, ChainWeightOptions, DirectionalEdgesT, EdgeOutlineStyles, EdgeStyles, VP, DividerStyleOptions, EdgeColors, LengthConstrain, Dimension, LocalizedBorderRadiuses, LocalizedEdgeColors, LocalizedEdges, LocalizedEdgeWidths, LocalizedPadding, LocalizedPosition, Offset, BorderRadiuses, EdgeOutlineWidths, Edges, EdgeWidths, Font, PX, LPX, MarkStyle, OutlineRadiuses, Padding, Area, BorderOptions, OutlineOptions } from "./../../component/units" -import { Resource } from "./../resource" +import { Resource } from "global.resource" import { BreakpointsReference, GridRowDirection, BreakPoints, GridRowColumnOption, GridRowSizeOption, GutterOption, GridRowOptions } from "./../../component/gridRow" import { ButtonRole, ButtonStyleMode, ButtonType, ControlSize, ButtonConfiguration, ButtonTriggerClickCallback, ButtonOptions, ButtonLabelStyle } from "./../../component/button" import { CalendarAlign, CalendarPickerDialog, CalendarDialogOptions, CalendarOptions } from "./../../component/calendarPicker" diff --git a/arkoala-arkts/arkui/generated/framework/arkui.Graphics.ets b/arkoala-arkts/arkui/generated/framework/arkui.Graphics.ets index 450bac98f3a872f91ce7507c0bf57c4383780a69..b955722675cb85c59a171e32a5a9a62fba5c962d 100644 --- a/arkoala-arkts/arkui/generated/framework/arkui.Graphics.ets +++ b/arkoala-arkts/arkui/generated/framework/arkui.Graphics.ets @@ -17,9 +17,10 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, Finalizable, runtimeType, RuntimeType, toPeerPtr, KPointer, MaterializedBase, NativeBuffer, KInt, KBoolean, KStringPtr, CallbackResource, InteropNativeModule, Tags, nullptr, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./resource" +import { Resource_serializer } from "./resource" import { ResourceColor, Edges, BorderRadiuses } from "./../component/units" import { Color, BorderStyle } from "./../component/enums" +import { Resource } from "global.resource" import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/framework/ohos.arkui.observer.ets b/arkoala-arkts/arkui/generated/framework/ohos.arkui.observer.ets index b96e42c9db035178ef288eb9e93974d979e14bdc..d53b9c535cfdce0abdc7f768fb61e6903cea3be9 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.arkui.observer.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.arkui.observer.ets @@ -21,11 +21,12 @@ import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { CallbackTransformer } from "./../CallbackTransformer" import { NavPathStack_serializer, NavPathStack, NavigationOperation, NavBar } from "./../component/navigation" -import { Resource_serializer, Resource } from "./resource" +import { Resource_serializer } from "./resource" import { ResourceStr } from "./../component/units" import { UIContext, UIContextInternal } from "./ohos.arkui.UIContext" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" +import { Resource } from "global.resource" export class uiObserver_DensityInfo_serializer { public static write(buffer: SerializerBase, value: uiObserver.DensityInfo): void { let valueSerializer : SerializerBase = buffer diff --git a/arkoala-arkts/arkui/generated/framework/ohos.arkui.shape.ets b/arkoala-arkts/arkui/generated/framework/ohos.arkui.shape.ets index f499df052a38c998e3e3971b27d1f61cfe23e80b..8fefea19de2254e478c71130ed1474be8cc853fa 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.arkui.shape.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.arkui.shape.ets @@ -18,8 +18,9 @@ import { SerializerBase, DeserializerBase, Finalizable, runtimeType, RuntimeType, toPeerPtr, KPointer, MaterializedBase, NativeBuffer, KInt, KBoolean, KStringPtr, CallbackResource, InteropNativeModule, Tags, nullptr, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { Position_serializer, SizeOptions_serializer, Position, ResourceColor, Length, SizeOptions } from "./../component/units" -import { Resource_serializer, Resource } from "./resource" +import { Resource_serializer } from "./resource" import { Color } from "./../component/enums" +import { Resource } from "global.resource" import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" import { CallbackTransformer } from "./../CallbackTransformer" diff --git a/arkoala-arkts/arkui/generated/framework/ohos.arkui.theme.ets b/arkoala-arkts/arkui/generated/framework/ohos.arkui.theme.ets index f76a242c3749db3ad232720428135f87c750cf5f..b2537b10fe5ed17808eb9bf7cfc7dd642bde71c9 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.arkui.theme.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.arkui.theme.ets @@ -24,7 +24,8 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceColor } from "./../component/units" import { Color } from "./../component/enums" -import { Resource, Resource_serializer } from "./resource" +import { Resource } from "global.resource" +import { Resource_serializer } from "./resource" export class ThemeControlInternal { public static fromPtr(ptr: KPointer): ThemeControl { return new ThemeControl(ptr) diff --git a/arkoala-arkts/arkui/generated/framework/ohos.font.ets b/arkoala-arkts/arkui/generated/framework/ohos.font.ets index 12c1cd2abb8b27b1f01da1e3246ba2e98ac03ead..f377064db06ba4b381111e3b8b5f1e950582d19b 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.font.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.font.ets @@ -20,9 +20,10 @@ import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr, SerializerBase, DeserializerBase, CallbackResource, InteropNativeModule, MaterializedBase, Tags, RuntimeType, runtimeType, toPeerPtr, nullptr, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource, Resource_serializer } from "./resource" +import { Resource } from "global.resource" import { TypeChecker } from "#components" import { CallbackTransformer } from "./../CallbackTransformer" +import { Resource_serializer } from "./resource" import { GlobalScope } from "./GlobalScope" export interface FontOptions { familyName: string | Resource; diff --git a/arkoala-arkts/arkui/generated/framework/ohos.graphics.text.ets b/arkoala-arkts/arkui/generated/framework/ohos.graphics.text.ets index 29fd2e9e6339163739fec50c58b9662b7bc16cdd..0ca9c1263e6ca31a79a2a0cd23900abfa269e3b5 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.graphics.text.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.graphics.text.ets @@ -22,7 +22,8 @@ import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { CallbackTransformer } from "./../CallbackTransformer" import { common2D_Color_serializer, common2D, common2D_Rect_serializer, common2D_Point_serializer } from "./ohos.graphics.common2D" import { drawing_FontMetrics_serializer, drawing } from "./ohos.graphics.drawing" -import { Resource_serializer, Resource } from "./resource" +import { Resource_serializer } from "./resource" +import { Resource } from "global.resource" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { GlobalScope } from "./GlobalScope" diff --git a/arkoala-arkts/arkui/generated/framework/ohos.measure.ets b/arkoala-arkts/arkui/generated/framework/ohos.measure.ets index 25bd367ca6faf01028ffe6e4cf429b0eec9945e8..ac6a98ea54f3d3a1cd6448abe0e6e8aff0617a92 100644 --- a/arkoala-arkts/arkui/generated/framework/ohos.measure.ets +++ b/arkoala-arkts/arkui/generated/framework/ohos.measure.ets @@ -20,9 +20,10 @@ import { int32, int64, float32, unsafeCast } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr, SerializerBase, DeserializerBase, CallbackResource, InteropNativeModule, MaterializedBase, Tags, RuntimeType, runtimeType, toPeerPtr, nullptr, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource, Resource_serializer } from "./resource" +import { Resource } from "global.resource" import { FontStyle, FontWeight, TextOverflow, TextCase } from "./../component/enums" import { text } from "./ohos.graphics.text" +import { Resource_serializer } from "./resource" import { TypeChecker } from "#components" import { CallbackTransformer } from "./../CallbackTransformer" export interface MeasureOptions { diff --git a/arkoala-arkts/arkui/generated/framework/peers/CallbackDeserializeCall.ets b/arkoala-arkts/arkui/generated/framework/peers/CallbackDeserializeCall.ets index 13210f849c85d7312ed1e49a3bea68729285ace3..dc624e8926b4bf254580f23463ab87b35a14b30d 100644 --- a/arkoala-arkts/arkui/generated/framework/peers/CallbackDeserializeCall.ets +++ b/arkoala-arkts/arkui/generated/framework/peers/CallbackDeserializeCall.ets @@ -37,7 +37,7 @@ import { Scene_serializer, ErrorEvent_serializer, MessageEvents_serializer, Call import { TabContentAnimatedTransition_serializer, TabContentTransitionProxy_serializer, TabsAnimationEvent_serializer, TabContentAnimatedTransition, TabContentTransitionProxy, OnTabsAnimationEndCallback, TabsAnimationEvent, OnTabsAnimationStartCallback, OnTabsContentWillChangeCallback, OnTabsGestureSwipeCallback, TabsCustomContentTransitionCallback } from "./../../component/tabs" import { SurfaceRect_serializer, SurfaceRect, OnNativeLoadCallback } from "./../../component/xcomponent" import { SwiperContentTransitionProxy_serializer, SwiperContentWillScrollResult_serializer, SwiperAnimationEvent_serializer, SwiperContentTransitionProxy, ContentDidScrollCallback, ContentWillScrollCallback, SwiperContentWillScrollResult, OnSwiperAnimationEndCallback, SwiperAnimationEvent, OnSwiperAnimationStartCallback, OnSwiperGestureSwipeCallback } from "./../../component/swiper" -import { Resource_serializer, Resource } from "./../resource" +import { Resource_serializer } from "./../resource" import { TextPickerResult_serializer, TextPickerResult, OnTextPickerChangeCallback, TextPickerEnterSelectedAreaCallback, TextPickerScrollStopCallback } from "./../../component/textPicker" import { TimePickerResult_serializer, TimePickerResult, OnTimePickerChangeCallback } from "./../../component/timePicker" import { UIExtensionProxy_serializer, UIExtensionProxy } from "./../../component/uiExtensionComponent" @@ -72,6 +72,7 @@ import { MarqueeState } from "./../../component/text" import { CustomBuilder, PageMapBuilder } from "./../../component/builder" import { RefreshStatus } from "./../../component/refresh" import { SwipeActionState } from "./../../component/listItem" +import { Resource } from "global.resource" import { Context_getGroupDir_Callback } from "./../ohos.app.ability.common" import { GetItemMainSizeByIndex } from "./../../component/waterFlow" import { OnAlphabetIndexerPopupSelectCallback, OnAlphabetIndexerRequestPopupDataCallback, OnAlphabetIndexerSelectCallback } from "./../../component/alphabetIndexer" diff --git a/arkoala-arkts/arkui/generated/framework/resource.ets b/arkoala-arkts/arkui/generated/framework/resource.ets index f42f52320c408488e8c2a711926f34a9df485dea..9da2228c1ef7aeab94fe44c84d973a3c333a6273 100644 --- a/arkoala-arkts/arkui/generated/framework/resource.ets +++ b/arkoala-arkts/arkui/generated/framework/resource.ets @@ -16,19 +16,11 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! +import { Resource } from "global.resource" +import { SerializerBase, DeserializerBase, CallbackResource, InteropNativeModule, MaterializedBase, Tags, RuntimeType, runtimeType, toPeerPtr, nullptr, KPointer, NativeBuffer, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" import { int32, int64, float32, unsafeCast } from "@koalaui/common" -import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr, SerializerBase, DeserializerBase, CallbackResource, InteropNativeModule, MaterializedBase, Tags, RuntimeType, runtimeType, toPeerPtr, nullptr, KSerializerBuffer, KUint8ArrayPtr } from "@koalaui/interop" -import { memo, memo_stable } from "@koalaui/runtime/annotations" -import { ComponentBuilder } from "@koalaui/builderLambda" import { TypeChecker } from "#components" import { CallbackTransformer } from "./../CallbackTransformer" -export interface Resource { - bundleName: string; - moduleName: string; - id: int64; - params?: Array; - type?: int32; -} export class Resource_serializer { public static write(buffer: SerializerBase, value: Resource): void { let valueSerializer : SerializerBase = buffer diff --git a/arkoala-arkts/arkui/generated/framework/textFieldOps.ets b/arkoala-arkts/arkui/generated/framework/textFieldOps.ets index aa820413e1933ebe79a46973992753cb3ab2efc9..5d884277a90fa0d1b58a62f3c28bc6b7b85c6777 100644 --- a/arkoala-arkts/arkui/generated/framework/textFieldOps.ets +++ b/arkoala-arkts/arkui/generated/framework/textFieldOps.ets @@ -17,9 +17,10 @@ // WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! import { SerializerBase, DeserializerBase, Finalizable, runtimeType, RuntimeType, toPeerPtr, KPointer, MaterializedBase, NativeBuffer, KInt, KBoolean, KStringPtr } from "@koalaui/interop" -import { Resource_serializer, Resource } from "./resource" +import { Resource_serializer } from "./resource" import { LayoutPolicy_serializer, LayoutPolicy, LayoutPolicyInternal } from "./../component/common" import { Padding_serializer, LocalizedPadding_serializer, BorderOptions_serializer, EdgeWidths_serializer, LocalizedEdgeWidths_serializer, EdgeColors_serializer, LocalizedEdgeColors_serializer, EdgeStyles_serializer, BorderRadiuses_serializer, LocalizedBorderRadiuses_serializer, ResourceStr, Length, Padding, LocalizedPadding, BorderOptions, EdgeWidths, LocalizedEdgeWidths, ResourceColor, EdgeColors, LocalizedEdgeColors, EdgeStyles, BorderRadiuses, LocalizedBorderRadiuses } from "./../component/units" +import { Resource } from "global.resource" import { Color, BorderStyle } from "./../component/enums" import { TypeChecker, ArkUIGeneratedNativeModule } from "#components" import { unsafeCast, int32, int64, float32 } from "@koalaui/common" diff --git a/arkoala-arkts/arkui/sdk/component/actionSheet.ets b/arkoala-arkts/arkui/sdk/component/actionSheet.ets index 35c9c44c26baef3af7e616a50a954b0515366809..4d3b8565660e1e9b56a655d50a1544881dab2551 100644 --- a/arkoala-arkts/arkui/sdk/component/actionSheet.ets +++ b/arkoala-arkts/arkui/sdk/component/actionSheet.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { VoidCallback, ResourceStr, ResourceColor, Dimension, BorderRadiuses, LocalizedBorderRadiuses, EdgeWidths, LocalizedEdgeWidths, EdgeColors, LocalizedEdgeColors, EdgeStyles } from "./units" import { DismissReason, Rectangle, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, TransitionEffect, ShadowOptions, ShadowStyle, HoverModeAreaType } from "./common" import { DialogButtonStyle, Color, BorderStyle } from "./enums" diff --git a/arkoala-arkts/arkui/sdk/component/alertDialog.ets b/arkoala-arkts/arkui/sdk/component/alertDialog.ets index 733f3cc6ce5e3a4bd86d7e01eba995222455e89c..f7c4cbf3efa4eaa1cb3bb0ded2a5236c3c18a9e0 100644 --- a/arkoala-arkts/arkui/sdk/component/alertDialog.ets +++ b/arkoala-arkts/arkui/sdk/component/alertDialog.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { DialogButtonStyle, Color, WordBreak, BorderStyle } from "./enums" import { ResourceStr, ResourceColor, VoidCallback, Offset, Dimension, BorderRadiuses, LocalizedBorderRadiuses, EdgeWidths, LocalizedEdgeWidths, EdgeColors, LocalizedEdgeColors, EdgeStyles } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { DismissDialogAction } from "./actionSheet" import { Rectangle, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, TransitionEffect, ShadowOptions, ShadowStyle, HoverModeAreaType } from "./common" import { LevelMode, ImmersiveMode, LevelOrder } from "./../framework/ohos.promptAction" diff --git a/arkoala-arkts/arkui/sdk/component/alphabetIndexer.ets b/arkoala-arkts/arkui/sdk/component/alphabetIndexer.ets index e60414d2b9471fd014fafd8b40203f190f5a1f56..46b8fef7b6be8d6dfa0a7c0fffeb491a9f07a0f5 100644 --- a/arkoala-arkts/arkui/sdk/component/alphabetIndexer.ets +++ b/arkoala-arkts/arkui/sdk/component/alphabetIndexer.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { Bindable, CommonMethod, BlurStyle, ArkCommonMethodStyle } from "./common" import { ResourceColor, Font, Position, Length } from "./units" import { Color } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export enum IndexerAlign { LEFT = 0, diff --git a/arkoala-arkts/arkui/sdk/component/badge.ets b/arkoala-arkts/arkui/sdk/component/badge.ets index a405f8e9e0b62346908aac4cda253687758ea2b6..2f696b94b48c44556ef9992d8bd486bb3efaac65 100644 --- a/arkoala-arkts/arkui/sdk/component/badge.ets +++ b/arkoala-arkts/arkui/sdk/component/badge.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceColor, ResourceStr, Length, Position } from "./units" import { Color, FontWeight } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export enum BadgePosition { diff --git a/arkoala-arkts/arkui/sdk/component/blank.ets b/arkoala-arkts/arkui/sdk/component/blank.ets index 41d7b21f614ed80f7b90f51d9c5c04a1833d2c5a..0614190db8eeed4b09a9d1f98a0ae4600a220918 100644 --- a/arkoala-arkts/arkui/sdk/component/blank.ets +++ b/arkoala-arkts/arkui/sdk/component/blank.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { ResourceColor } from "./units" import { Color } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export interface BlankAttribute extends CommonMethod { color(value: ResourceColor | undefined): this { diff --git a/arkoala-arkts/arkui/sdk/component/button.ets b/arkoala-arkts/arkui/sdk/component/button.ets index a8fa4f1f1d2cce1df03582ea08719f7ce27ea4fb..527c6e22a126987cb26e5e59841fcc9d12ff9842 100644 --- a/arkoala-arkts/arkui/sdk/component/button.ets +++ b/arkoala-arkts/arkui/sdk/component/button.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonConfiguration, CommonMethod, ArkCommonMethodStyle } from "./common" import { TextOverflow, TextHeightAdaptivePolicy, Color, FontWeight, FontStyle } from "./enums" import { ResourceStr, Font, ResourceColor, Length } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { ContentModifier, AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export enum ButtonType { CAPSULE = 0, diff --git a/arkoala-arkts/arkui/sdk/component/calendarPicker.ets b/arkoala-arkts/arkui/sdk/component/calendarPicker.ets index 3069fc2f838348e0d6828155a279b566bd582a9a..fac9f7dc0c13524645366ddc9b3272e74700430c 100644 --- a/arkoala-arkts/arkui/sdk/component/calendarPicker.ets +++ b/arkoala-arkts/arkui/sdk/component/calendarPicker.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { DateRange, CommonMethod, PickerTextStyle, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, PickerDialogButtonStyle, ShadowOptions, ShadowStyle, HoverModeAreaType, ArkCommonMethodStyle } from "./common" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" import { Offset, VoidCallback, ResourceColor } from "./units" diff --git a/arkoala-arkts/arkui/sdk/component/checkbox.ets b/arkoala-arkts/arkui/sdk/component/checkbox.ets index 2e039670276fcf5310f78084b2d07e978059c909..e4d073195769ac24a4ba57b9681e8bb44c6ad129 100644 --- a/arkoala-arkts/arkui/sdk/component/checkbox.ets +++ b/arkoala-arkts/arkui/sdk/component/checkbox.ets @@ -24,7 +24,7 @@ import { CustomBuilder } from "./builder" import { CommonConfiguration, CommonMethod, Bindable, ArkCommonMethodStyle } from "./common" import { ResourceColor, MarkStyle } from "./units" import { Color, CheckBoxShape } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { ContentModifier, AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export declare interface CheckboxOptions { name?: string; diff --git a/arkoala-arkts/arkui/sdk/component/checkboxgroup.ets b/arkoala-arkts/arkui/sdk/component/checkboxgroup.ets index 5602c109bdf5e265121ab40fcf64cd8a40e13049..cd0db41ffee6765d7875ce33bcd94a34510d2d13 100644 --- a/arkoala-arkts/arkui/sdk/component/checkboxgroup.ets +++ b/arkoala-arkts/arkui/sdk/component/checkboxgroup.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonMethod, Bindable, ArkCommonMethodStyle } from "./common" import { ResourceColor, MarkStyle } from "./units" import { Color, CheckBoxShape } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export enum SelectStatus { ALL = 0, diff --git a/arkoala-arkts/arkui/sdk/component/column.ets b/arkoala-arkts/arkui/sdk/component/column.ets index 88ed91401818aeea7834dab02a8e42d9d4fb427c..43683abcc163c773ec7c052bb17e2346391144a4 100644 --- a/arkoala-arkts/arkui/sdk/component/column.ets +++ b/arkoala-arkts/arkui/sdk/component/column.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CommonMethod, PointLightStyle, ArkCommonMethodStyle } from "./common" import { HorizontalAlign, FlexAlign } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" diff --git a/arkoala-arkts/arkui/sdk/component/columnSplit.ets b/arkoala-arkts/arkui/sdk/component/columnSplit.ets index f534ec95b102f1e188fc948a184f4c710256590b..147877512a8ee417766ff035ca041689500c8331 100644 --- a/arkoala-arkts/arkui/sdk/component/columnSplit.ets +++ b/arkoala-arkts/arkui/sdk/component/columnSplit.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Dimension } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export declare interface ColumnSplitDividerStyle { diff --git a/arkoala-arkts/arkui/sdk/component/common.ets b/arkoala-arkts/arkui/sdk/component/common.ets index 3227e705d684cf0591b91e090940c774e983f963..7326a03678cd37409380e5d461e251de770bb7d8 100644 --- a/arkoala-arkts/arkui/sdk/component/common.ets +++ b/arkoala-arkts/arkui/sdk/component/common.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { TransitionType, TextDecorationType, Color, TextDecorationStyle, PlayMode, SharedTransitionEffectType, GradientDirection, HorizontalAlign, VerticalAlign, FontWeight, FontStyle, ColoringStrategy, InteractionHand, MouseButton, MouseAction, AccessibilityHoverType, TouchType, AxisAction, KeyType, KeySource, AxisModel, CrownAction, BorderStyle, Placement, ArrowPointPosition, ClickEffectLevel, NestedScrollMode, ImageRepeat, Alignment, HitTestMode, ImageSize, HoverEffect, Visibility, ItemAlign, Direction, ObscuredReasons, RenderFit, FocusDrawLevel, Axis, ResponseType, FunctionKey, ModifierKey, LineCapStyle, LineJoinStyle, PixelRoundCalcPolicy, BarState, CrownSensitivity, EdgeEffect, ScrollSource, IlluminatedType } from "./enums" import { Position, ConstraintSizeOptions, ResourceColor, Length, Bias, Area, Font, BorderRadiuses, EdgeWidths, LocalizedEdgeWidths, SizeOptions, VoidCallback, ResourceStr, Dimension, EdgeColors, LocalizedEdgeColors, EdgeStyles, LocalizedBorderRadiuses, Padding, EdgeOutlineWidths, ChainWeightOptions, LocalizedPadding, BorderOptions, OutlineOptions, EdgeOutlineStyles, OutlineRadiuses, Edges, LocalizedEdges, LocalizedPosition, AccessibilityOptions, DirectionalEdgesT } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { Context } from "./../framework/application.Context" import { curves } from "./../framework/ohos.curves" import { DrawContext, LengthMetrics } from "./../framework/arkui.Graphics" diff --git a/arkoala-arkts/arkui/sdk/component/customDialogController.ets b/arkoala-arkts/arkui/sdk/component/customDialogController.ets index 0527c039242cdad85c30b3d84bedfd09bdb7d968..e533def85c4356c386bda8bca05a5491d4ce55a4 100644 --- a/arkoala-arkts/arkui/sdk/component/customDialogController.ets +++ b/arkoala-arkts/arkui/sdk/component/customDialogController.ets @@ -26,7 +26,7 @@ import { ExtendableComponent } from "./extendableComponent" import { DialogAlignment } from "./alertDialog" import { Offset, ResourceColor, Dimension, BorderRadiuses, EdgeWidths, EdgeColors, EdgeStyles } from "./units" import { Color, BorderStyle } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { Rectangle, AnimateParam, ShadowOptions, ShadowStyle, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, KeyboardAvoidMode, HoverModeAreaType } from "./common" import { LengthMetrics } from "./../framework/arkui.Graphics" import { LevelMode, ImmersiveMode, LevelOrder } from "./../framework/ohos.promptAction" diff --git a/arkoala-arkts/arkui/sdk/component/dataPanel.ets b/arkoala-arkts/arkui/sdk/component/dataPanel.ets index 1fe2ef934d4605eebcb91f706740ca296de3b738..3fa7bb203b55132c8091f3dc5e89772e0a5f818a 100644 --- a/arkoala-arkts/arkui/sdk/component/dataPanel.ets +++ b/arkoala-arkts/arkui/sdk/component/dataPanel.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceColor, Length } from "./units" import { Color } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { MultiShadowOptions, CommonConfiguration, CommonMethod, ArkCommonMethodStyle } from "./common" import { ContentModifier, AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export enum DataPanelType { diff --git a/arkoala-arkts/arkui/sdk/component/datePicker.ets b/arkoala-arkts/arkui/sdk/component/datePicker.ets index 4c0a80a0a7ac9b0146dc4eb39d6441f2ee81122d..21dd8fec274a1f3a70c659252d57b13e7c10aab7 100644 --- a/arkoala-arkts/arkui/sdk/component/datePicker.ets +++ b/arkoala-arkts/arkui/sdk/component/datePicker.ets @@ -24,7 +24,7 @@ import { Bindable, CommonMethod, PickerTextStyle, PickerDialogButtonStyle, Recta import { CrownSensitivity, Color } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" import { ResourceColor, Offset, VoidCallback } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { DialogAlignment } from "./alertDialog" import { intl } from "./../framework/ohos.intl" export declare interface DatePickerResult { diff --git a/arkoala-arkts/arkui/sdk/component/divider.ets b/arkoala-arkts/arkui/sdk/component/divider.ets index 5f14da962eaab53e18481a608ddc9cb93ed04850..b022c4a0c9817ff0b2e32b2e64c133543ccf7b13 100644 --- a/arkoala-arkts/arkui/sdk/component/divider.ets +++ b/arkoala-arkts/arkui/sdk/component/divider.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { ResourceColor } from "./units" import { Color, LineCapStyle } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export interface DividerAttribute extends CommonMethod { vertical(value: boolean | undefined): this { diff --git a/arkoala-arkts/arkui/sdk/component/gauge.ets b/arkoala-arkts/arkui/sdk/component/gauge.ets index 1868c640d402a0b32796a5335d45384904e71a7f..12d239ae98f76708639de1f574b044d170969be9 100644 --- a/arkoala-arkts/arkui/sdk/component/gauge.ets +++ b/arkoala-arkts/arkui/sdk/component/gauge.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { MultiShadowOptions, CommonConfiguration, CommonMethod, ArkCommonMethodStyle } from "./common" import { ResourceStr, Dimension, ResourceColor, Length } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { Color } from "./enums" import { LinearGradient } from "./dataPanel" import { CustomBuilder } from "./builder" diff --git a/arkoala-arkts/arkui/sdk/component/grid.ets b/arkoala-arkts/arkui/sdk/component/grid.ets index 419c6e10112a082e97ac26a578d4d0e4e0671c86..fbb1d0cec068875ef4b17ee1442c0d939ce369a4 100644 --- a/arkoala-arkts/arkui/sdk/component/grid.ets +++ b/arkoala-arkts/arkui/sdk/component/grid.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ItemDragInfo, ScrollableCommonMethod, OnItemDragStartCallback, OnWillScrollCallback, OnScrollCallback, CommonMethod, ArkScrollableCommonMethodStyle, ArkCommonMethodStyle } from "./common" import { Length } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { OnScrollFrameBeginCallback, Scroller } from "./scroll" import { ScrollState } from "./list" import { ScrollSource } from "./enums" diff --git a/arkoala-arkts/arkui/sdk/component/gridRow.ets b/arkoala-arkts/arkui/sdk/component/gridRow.ets index b5e8602bd59b764bec07bf789f0c9c63f2516d12..88849bbe8f2dbf2694a7a7fcec00d48ec80893ab 100644 --- a/arkoala-arkts/arkui/sdk/component/gridRow.ets +++ b/arkoala-arkts/arkui/sdk/component/gridRow.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Length } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { ItemAlign } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" diff --git a/arkoala-arkts/arkui/sdk/component/hyperlink.ets b/arkoala-arkts/arkui/sdk/component/hyperlink.ets index cbbcd75a9469a42696049144beb977a5bd53cfae..148d7378e5f85e4d6f97c98d0acc17bf83d9a83d 100644 --- a/arkoala-arkts/arkui/sdk/component/hyperlink.ets +++ b/arkoala-arkts/arkui/sdk/component/hyperlink.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { Color } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export interface HyperlinkAttribute extends CommonMethod { color(value: Color | number | string | Resource | undefined): this { diff --git a/arkoala-arkts/arkui/sdk/component/idlize.ets b/arkoala-arkts/arkui/sdk/component/idlize.ets index 2553cc78e1f061ee306f4abdc25aaa2d18bb496d..632cc177aed2dc974e7fc3e91dc904c49852df29 100644 --- a/arkoala-arkts/arkui/sdk/component/idlize.ets +++ b/arkoala-arkts/arkui/sdk/component/idlize.ets @@ -36,10 +36,10 @@ import { SliderConfiguration } from "./slider" import { TextClockConfiguration } from "./textClock" import { TextTimerConfiguration } from "./textTimer" import { ToggleConfiguration } from "./toggle" -import { ContentModifier, UICommonBase, AttributeModifier, AttributeUpdater } from "./../handwritten" +import { ContentModifier, AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" import { CustomDialogController } from "./customDialogController" import { CustomBuilder } from "./builder" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { ResourceStr, ResourceColor, Position, Length, SizeOptions, ConstraintSizeOptions } from "./units" import { Color } from "./enums" import { image } from "./../framework/ohos.multimedia.image" diff --git a/arkoala-arkts/arkui/sdk/component/image.ets b/arkoala-arkts/arkui/sdk/component/image.ets index fd3725134cd84503f301a09e1b626507eda908c8..21a5d2a09b0441cb52aec8910e033ea1d4652e27 100644 --- a/arkoala-arkts/arkui/sdk/component/image.ets +++ b/arkoala-arkts/arkui/sdk/component/image.ets @@ -24,7 +24,7 @@ import { drawing } from "./../framework/ohos.graphics.drawing" import { image } from "./../framework/ohos.multimedia.image" import { matrix4 } from "./../framework/ohos.matrix4" import { CommonMethod, PointLightStyle, ArkCommonMethodStyle } from "./common" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { ResourceColor, ColorFilter, EdgeWidths, ResourceStr } from "./units" import { Color, ImageFit, ImageRepeat, CopyOptions } from "./enums" import { ColorMetrics } from "./../framework/arkui.Graphics" diff --git a/arkoala-arkts/arkui/sdk/component/imageAnimator.ets b/arkoala-arkts/arkui/sdk/component/imageAnimator.ets index a8339cb7cb3227e9f5a3aea813125f72498baaba..fd4f208a52ff8c7ccae9061ed42e46aed416990f 100644 --- a/arkoala-arkts/arkui/sdk/component/imageAnimator.ets +++ b/arkoala-arkts/arkui/sdk/component/imageAnimator.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { image } from "./../framework/ohos.multimedia.image" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { AnimationStatus, FillMode } from "./enums" diff --git a/arkoala-arkts/arkui/sdk/component/imageSpan.ets b/arkoala-arkts/arkui/sdk/component/imageSpan.ets index 491fbeb25e0aa4e000e609a0b0147e4b6543d4f5..e15c170d86cb7e75be71e7b1775c74d648081269 100644 --- a/arkoala-arkts/arkui/sdk/component/imageSpan.ets +++ b/arkoala-arkts/arkui/sdk/component/imageSpan.ets @@ -28,7 +28,7 @@ import { ImageErrorCallback, ImageError } from "./image" import { image } from "./../framework/ohos.multimedia.image" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" import { CommonMethod, ArkCommonMethodStyle } from "./common" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" export interface ImageSpanAttribute extends BaseSpan { verticalAlign(value: ImageSpanAlignment | undefined): this { throw new Error("Unimplemented method verticalAlign") diff --git a/arkoala-arkts/arkui/sdk/component/line.ets b/arkoala-arkts/arkui/sdk/component/line.ets index 7df45d371ea2f45031520e89e5266bcf97ae075e..3f88cc7dfeada767aeacd80c5174afe8fe18e5fe 100644 --- a/arkoala-arkts/arkui/sdk/component/line.ets +++ b/arkoala-arkts/arkui/sdk/component/line.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Length } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CommonShapeMethod, CommonMethod, ArkCommonShapeMethodStyle, ArkCommonMethodStyle } from "./common" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export type ShapePoint = [ diff --git a/arkoala-arkts/arkui/sdk/component/list.ets b/arkoala-arkts/arkui/sdk/component/list.ets index 5c6fe547190d3b37aa5c93aad1b0f3e62a0d2a02..3128efd04d1cc33647de3a3fdbf918e45f8e146c 100644 --- a/arkoala-arkts/arkui/sdk/component/list.ets +++ b/arkoala-arkts/arkui/sdk/component/list.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Length, ResourceColor, LengthConstrain, Dimension } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { Scroller, ScrollAlign, OnScrollFrameBeginCallback } from "./scroll" import { RectResult, ItemDragInfo, ScrollableCommonMethod, ChildrenMainSize, OnItemDragStartCallback, OnWillScrollCallback, OnScrollCallback, CommonMethod, ArkScrollableCommonMethodStyle, ArkCommonMethodStyle } from "./common" import { Color, Axis, ScrollSource } from "./enums" diff --git a/arkoala-arkts/arkui/sdk/component/listItem.ets b/arkoala-arkts/arkui/sdk/component/listItem.ets index 493754f469f74aa3a1e4893600c1058c1a7a41a0..e2e524e72213e07c8beaa94cde24162bd2ac1eea 100644 --- a/arkoala-arkts/arkui/sdk/component/listItem.ets +++ b/arkoala-arkts/arkui/sdk/component/listItem.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CustomBuilder } from "./builder" import { ComponentContent } from "./../framework/arkui.ComponentContent" import { Length } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CommonMethod, Bindable, ArkCommonMethodStyle } from "./common" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export enum SwipeEdgeEffect { diff --git a/arkoala-arkts/arkui/sdk/component/loadingProgress.ets b/arkoala-arkts/arkui/sdk/component/loadingProgress.ets index 9e8baa5ba39aa1d16c169143ca2c018c53c0011a..d7d4bab85de727c802ab4f74522b9c4816a08bac 100644 --- a/arkoala-arkts/arkui/sdk/component/loadingProgress.ets +++ b/arkoala-arkts/arkui/sdk/component/loadingProgress.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonMethod, CommonConfiguration, ArkCommonMethodStyle } from "./common" import { ResourceColor } from "./units" import { Color } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { ContentModifier, AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export enum LoadingProgressStyle { DEFAULT = 0, diff --git a/arkoala-arkts/arkui/sdk/component/marquee.ets b/arkoala-arkts/arkui/sdk/component/marquee.ets index bb0eebed2e390fae49b9ed0f8b6553b27456f9d6..d1f61a9c2f43a960b1585800fc7544ed15c2c94e 100644 --- a/arkoala-arkts/arkui/sdk/component/marquee.ets +++ b/arkoala-arkts/arkui/sdk/component/marquee.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { ResourceColor, Length } from "./units" import { Color, FontWeight, MarqueeUpdateStrategy } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export declare interface MarqueeOptions { start: boolean; diff --git a/arkoala-arkts/arkui/sdk/component/mediaCachedImage.ets b/arkoala-arkts/arkui/sdk/component/mediaCachedImage.ets index e0c25106ada3a77306591aa2bdc8e2ace9bd44d1..5cfd390b6b40c1b2e42a629dd3246d1741778f18 100644 --- a/arkoala-arkts/arkui/sdk/component/mediaCachedImage.ets +++ b/arkoala-arkts/arkui/sdk/component/mediaCachedImage.ets @@ -25,7 +25,7 @@ import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwrit import { CommonMethod, ArkCommonMethodStyle } from "./common" import { image } from "./../framework/ohos.multimedia.image" import { ResourceStr } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { DrawableDescriptor } from "./../framework/ohos.arkui.drawableDescriptor" export declare interface ASTCResource { sources: Array; diff --git a/arkoala-arkts/arkui/sdk/component/menu.ets b/arkoala-arkts/arkui/sdk/component/menu.ets index 1386533f073d99ad0bfad64fa95cb945f8c8228d..e5ddb2a3dba16d9dab96a6ffe873c55bcd98cd36 100644 --- a/arkoala-arkts/arkui/sdk/component/menu.ets +++ b/arkoala-arkts/arkui/sdk/component/menu.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { Font, ResourceColor, Dimension, BorderRadiuses, DividerStyleOptions } from "./units" import { Color } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export enum SubMenuExpandingMode { SIDE_EXPAND = 0, diff --git a/arkoala-arkts/arkui/sdk/component/menuItem.ets b/arkoala-arkts/arkui/sdk/component/menuItem.ets index c157a5a8cf473d10eb427d5cb28a6918d93bf136..fa77381d0b5e0c421f13f36486fb9c08d58f90c3 100644 --- a/arkoala-arkts/arkui/sdk/component/menuItem.ets +++ b/arkoala-arkts/arkui/sdk/component/menuItem.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceStr, Font, ResourceColor } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { SymbolGlyphModifier } from "./../framework/arkui.SymbolGlyphModifier" import { CustomBuilder } from "./builder" import { CommonMethod, Bindable, ArkCommonMethodStyle } from "./common" diff --git a/arkoala-arkts/arkui/sdk/component/menuItemGroup.ets b/arkoala-arkts/arkui/sdk/component/menuItemGroup.ets index d26e0de204eec9b0a3fb9f3f640571a612807cf5..bcf122ba3eb9e0dd8829b7d611a587226a1f18ac 100644 --- a/arkoala-arkts/arkui/sdk/component/menuItemGroup.ets +++ b/arkoala-arkts/arkui/sdk/component/menuItemGroup.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceStr } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CustomBuilder } from "./builder" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" diff --git a/arkoala-arkts/arkui/sdk/component/navDestination.ets b/arkoala-arkts/arkui/sdk/component/navDestination.ets index c1887c932bd2ff7a10fba81c00fde89e9fed4978..f670d58426f4e9061cd84ed4a3f8a1707a389912 100644 --- a/arkoala-arkts/arkui/sdk/component/navDestination.ets +++ b/arkoala-arkts/arkui/sdk/component/navDestination.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CustomBuilder } from "./builder" import { TitleHeight } from "./enums" import { Length, ResourceStr } from "./units" diff --git a/arkoala-arkts/arkui/sdk/component/navigation.ets b/arkoala-arkts/arkui/sdk/component/navigation.ets index b096e7850bfabd3696f501dafa901ad90d3a22bb..9d0f8e87dc04d3e813b12813a1145d4ae421f6f2 100644 --- a/arkoala-arkts/arkui/sdk/component/navigation.ets +++ b/arkoala-arkts/arkui/sdk/component/navigation.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { window } from "./../framework/ohos.window" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CustomBuilder, PageMapBuilder } from "./builder" import { TitleHeight, Color } from "./enums" import { Length, ResourceStr, ResourceColor, Dimension, VoidCallback } from "./units" diff --git a/arkoala-arkts/arkui/sdk/component/particle.ets b/arkoala-arkts/arkui/sdk/component/particle.ets index 22302491e7874da32010b952f4cc70e0ededd471..b71da299a7ee85ad11ad5ed981b57bfee7846afb 100644 --- a/arkoala-arkts/arkui/sdk/component/particle.ets +++ b/arkoala-arkts/arkui/sdk/component/particle.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { VP, Dimension, ResourceStr, ResourceColor } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { ImageFit, Color } from "./enums" import { curves } from "./../framework/ohos.curves" import { Vector2T, LengthMetrics } from "./../framework/arkui.Graphics" diff --git a/arkoala-arkts/arkui/sdk/component/patternLock.ets b/arkoala-arkts/arkui/sdk/component/patternLock.ets index 6f3d4fb4a86eb2d8a66e116aad552813380d7547..2d1b00dc35cd0db96c9b2a6fac89e498c217262a 100644 --- a/arkoala-arkts/arkui/sdk/component/patternLock.ets +++ b/arkoala-arkts/arkui/sdk/component/patternLock.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceColor, Length } from "./units" import { Color } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { LengthMetrics } from "./../framework/arkui.Graphics" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" diff --git a/arkoala-arkts/arkui/sdk/component/polygon.ets b/arkoala-arkts/arkui/sdk/component/polygon.ets index 9444afdad4b574bad3a70f98431638df4e2863d7..0891432a5539294ed8fd9cdf80a707c4592d50f1 100644 --- a/arkoala-arkts/arkui/sdk/component/polygon.ets +++ b/arkoala-arkts/arkui/sdk/component/polygon.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonShapeMethod, CommonMethod, ArkCommonShapeMethodStyle, ArkCommonMethodStyle } from "./common" import { ShapePoint } from "./line" import { Length } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export declare interface PolygonOptions { } diff --git a/arkoala-arkts/arkui/sdk/component/polyline.ets b/arkoala-arkts/arkui/sdk/component/polyline.ets index 228dd0d522ddfbeeb5a705d7ef125de219357ebb..fbafb7275e8897945bff96b9c2374c09db195195 100644 --- a/arkoala-arkts/arkui/sdk/component/polyline.ets +++ b/arkoala-arkts/arkui/sdk/component/polyline.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonShapeMethod, CommonMethod, ArkCommonShapeMethodStyle, ArkCommonMethodStyle } from "./common" import { ShapePoint } from "./line" import { Length } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export declare interface PolylineOptions { } diff --git a/arkoala-arkts/arkui/sdk/component/progress.ets b/arkoala-arkts/arkui/sdk/component/progress.ets index 41c4f9c9bd7b1a9423015c54945b5c88e248b6ab..3d8fd1258632a8dd91df9c6747436a66817b3c4f 100644 --- a/arkoala-arkts/arkui/sdk/component/progress.ets +++ b/arkoala-arkts/arkui/sdk/component/progress.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Length, PX, VP, LPX, ResourceColor, Font } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { Color } from "./enums" import { LengthMetrics } from "./../framework/arkui.Graphics" import { CommonMethod, CommonConfiguration, ArkCommonMethodStyle } from "./common" diff --git a/arkoala-arkts/arkui/sdk/component/qrcode.ets b/arkoala-arkts/arkui/sdk/component/qrcode.ets index 9b4f495d9f3349e05b0aab8513b7300da926c990..20a3795a4d9b2de2da145bd32b4a19982641793c 100644 --- a/arkoala-arkts/arkui/sdk/component/qrcode.ets +++ b/arkoala-arkts/arkui/sdk/component/qrcode.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { ResourceColor, ResourceStr } from "./units" import { Color } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export interface QRCodeAttribute extends CommonMethod { color(value: ResourceColor | undefined): this { diff --git a/arkoala-arkts/arkui/sdk/component/radio.ets b/arkoala-arkts/arkui/sdk/component/radio.ets index e26cb7bc67fd4c6fb5d96c450d2b80680e8e3b18..1ffc670632bb14f54e2ecd517b48da1ac18809ad 100644 --- a/arkoala-arkts/arkui/sdk/component/radio.ets +++ b/arkoala-arkts/arkui/sdk/component/radio.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CustomBuilder } from "./builder" import { ResourceColor } from "./units" import { Color } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CommonMethod, Bindable, CommonConfiguration, ArkCommonMethodStyle } from "./common" import { ContentModifier, AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export enum RadioIndicatorType { diff --git a/arkoala-arkts/arkui/sdk/component/rating.ets b/arkoala-arkts/arkui/sdk/component/rating.ets index 130dad449a8e27993b98a79e5613e14bb09bb02c..18d9d3016f6fbb9bc7a2750436e15a426883aba9 100644 --- a/arkoala-arkts/arkui/sdk/component/rating.ets +++ b/arkoala-arkts/arkui/sdk/component/rating.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Bindable, CommonConfiguration, CommonMethod, ArkCommonMethodStyle } from "./common" import { ResourceStr } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { ContentModifier, AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export declare interface RatingOptions { rating: number | Bindable | undefined; diff --git a/arkoala-arkts/arkui/sdk/component/rect.ets b/arkoala-arkts/arkui/sdk/component/rect.ets index 32b7da586c61e57768e69ce7b5d58499d005d23d..20386cd0f0836e530fb30e6269c38d2b709c798e 100644 --- a/arkoala-arkts/arkui/sdk/component/rect.ets +++ b/arkoala-arkts/arkui/sdk/component/rect.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Length } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CommonShapeMethod, CommonMethod, ArkCommonShapeMethodStyle, ArkCommonMethodStyle } from "./common" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export type RadiusItem = [ diff --git a/arkoala-arkts/arkui/sdk/component/refresh.ets b/arkoala-arkts/arkui/sdk/component/refresh.ets index 33efcf5af741a1045dabb9f5497018cd9d70e646..30e8e1fbf143da16be10c193c9d1af1ad658a8c0 100644 --- a/arkoala-arkts/arkui/sdk/component/refresh.ets +++ b/arkoala-arkts/arkui/sdk/component/refresh.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Bindable, CommonMethod, ArkCommonMethodStyle } from "./common" import { ResourceStr } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CustomBuilder } from "./builder" import { ComponentContent } from "./../framework/arkui.ComponentContent" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" diff --git a/arkoala-arkts/arkui/sdk/component/relativeContainer.ets b/arkoala-arkts/arkui/sdk/component/relativeContainer.ets index acac3ed3f8f944641c0c1f4c971ec140f7d30df6..e23fedc129a6d54045757964a6812b40cbad3e30 100644 --- a/arkoala-arkts/arkui/sdk/component/relativeContainer.ets +++ b/arkoala-arkts/arkui/sdk/component/relativeContainer.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Dimension } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { Axis } from "./enums" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" diff --git a/arkoala-arkts/arkui/sdk/component/richEditor.ets b/arkoala-arkts/arkui/sdk/component/richEditor.ets index 15b451238b87c2ea90ae819499a694cbdb3abb23..d453e53136036585c3e270c2f3cf763305616348 100644 --- a/arkoala-arkts/arkui/sdk/component/richEditor.ets +++ b/arkoala-arkts/arkui/sdk/component/richEditor.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceColor, Length, ResourceStr, Dimension, VoidCallback, Padding, BorderRadiuses, Font } from "./units" import { Color, FontStyle, FontWeight, TextAlign, WordBreak, LineBreakStrategy, ImageSpanAlignment, ImageFit, CopyOptions, BarState, ResponseType } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { DecorationStyleInterface, StyledString, MutableStyledString } from "./styledString" import { ShadowOptions, ClickEvent, HoverEvent, HapticFeedbackMode, SelectionOptions, RectResult, CommonMethod, ArkCommonMethodStyle } from "./common" import { TextBackgroundStyle } from "./span" diff --git a/arkoala-arkts/arkui/sdk/component/scroll.ets b/arkoala-arkts/arkui/sdk/component/scroll.ets index bc68d94b740c11e274414122cfac7cfa5b2e8c26..4dab6ff5e3477329dcebffd499a1f459425c2483 100644 --- a/arkoala-arkts/arkui/sdk/component/scroll.ets +++ b/arkoala-arkts/arkui/sdk/component/scroll.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { LengthMetrics } from "./../framework/arkui.Graphics" import { curves } from "./../framework/ohos.curves" import { Dimension, Length, VoidCallback } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { Edge, ScrollSource, BarState, Color, EdgeEffect } from "./enums" import { RectResult, ScrollableCommonMethod, NestedScrollOptions, CommonMethod, EdgeEffectOptions, ArkScrollableCommonMethodStyle, ArkCommonMethodStyle } from "./common" import { ScrollSnapAlign, ScrollState } from "./list" diff --git a/arkoala-arkts/arkui/sdk/component/search.ets b/arkoala-arkts/arkui/sdk/component/search.ets index 399cad2d29670ae6fc1600d48f669ecca4e72a88..4a8350a563ad162fadce4cbd17fbd1d50569eaaa 100644 --- a/arkoala-arkts/arkui/sdk/component/search.ets +++ b/arkoala-arkts/arkui/sdk/component/search.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { TextContentControllerBase, SelectionOptions, Bindable, CommonMethod, TextDecorationOptions, ArkCommonMethodStyle } from "./common" import { ResourceStr, Length, ResourceColor, Dimension, Font } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { Color, CopyOptions, TextAlign } from "./enums" import { SymbolGlyphModifier } from "./../framework/arkui.SymbolGlyphModifier" import { SubmitEvent, EnterKeyType, OnTextSelectionChangeCallback, OnContentScrollCallback, OnPasteCallback } from "./textInput" diff --git a/arkoala-arkts/arkui/sdk/component/securityComponent.ets b/arkoala-arkts/arkui/sdk/component/securityComponent.ets index fbbcd9d9b4ddfb9fe6a75e8d7d5a9acfe2d5c745..7ce0a448615b9ad659d5e17f2e92ffab22792cd6 100644 --- a/arkoala-arkts/arkui/sdk/component/securityComponent.ets +++ b/arkoala-arkts/arkui/sdk/component/securityComponent.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Dimension, Position, Edges, LocalizedEdges, ResourceColor, Padding, Length, SizeOptions, ConstraintSizeOptions } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { FontStyle, FontWeight, Color, BorderStyle } from "./enums" export enum SecurityComponentLayoutDirection { HORIZONTAL = 0, diff --git a/arkoala-arkts/arkui/sdk/component/select.ets b/arkoala-arkts/arkui/sdk/component/select.ets index 67c015f46190be188af7b204fe426c14b2bed6c7..e151c8b6c0440bf346f4d029d8cb330b90772f75 100644 --- a/arkoala-arkts/arkui/sdk/component/select.ets +++ b/arkoala-arkts/arkui/sdk/component/select.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceStr, Dimension, EdgeOutlineWidths, ResourceColor, EdgeColors, Font, Length, DividerStyleOptions, Offset } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { SymbolGlyphModifier } from "./../framework/arkui.SymbolGlyphModifier" import { Color, OptionWidthMode } from "./enums" import { CommonMethod, Bindable, BlurStyle, CommonConfiguration, ArkCommonMethodStyle } from "./common" diff --git a/arkoala-arkts/arkui/sdk/component/shape.ets b/arkoala-arkts/arkui/sdk/component/shape.ets index ba6de691a85136030e2919031a82e84d7bf70618..89ce4ad1e2e3e5bbff0b13c1e35b8cf4b3110dfe 100644 --- a/arkoala-arkts/arkui/sdk/component/shape.ets +++ b/arkoala-arkts/arkui/sdk/component/shape.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Length, ResourceColor } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CommonMethod, ArkCommonMethodStyle } from "./common" import { Color, LineCapStyle, LineJoinStyle } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" diff --git a/arkoala-arkts/arkui/sdk/component/sidebar.ets b/arkoala-arkts/arkui/sdk/component/sidebar.ets index ff3c1a817f8940b75956991c9b7906a2b3663406..ee68436a8c7d8a528f4b2c4448d3bd8afe972894 100644 --- a/arkoala-arkts/arkui/sdk/component/sidebar.ets +++ b/arkoala-arkts/arkui/sdk/component/sidebar.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { image } from "./../framework/ohos.multimedia.image" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CommonMethod, Bindable, DividerStyle, ArkCommonMethodStyle } from "./common" import { Length, Dimension } from "./units" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" diff --git a/arkoala-arkts/arkui/sdk/component/slider.ets b/arkoala-arkts/arkui/sdk/component/slider.ets index d7d780247953c2bde6bf6c74f18e77d817035206..1f2b9bce6c7a706f08d41ddf757cb1d7466fde07 100644 --- a/arkoala-arkts/arkui/sdk/component/slider.ets +++ b/arkoala-arkts/arkui/sdk/component/slider.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { Bindable, CommonConfiguration, CommonMethod, ArkCommonMethodStyle } from "./common" import { Axis, Color, CrownSensitivity } from "./enums" import { ResourceStr, ResourceColor, Length, Dimension, SizeOptions } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { LinearGradient } from "./dataPanel" import { ContentModifier, AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export enum SliderStyle { diff --git a/arkoala-arkts/arkui/sdk/component/span.ets b/arkoala-arkts/arkui/sdk/component/span.ets index d76ed532f1195c102a710a8377b84e7be1564cf5..0e9b7137ae4bcb7ec941262d260424ceda3fc78e 100644 --- a/arkoala-arkts/arkui/sdk/component/span.ets +++ b/arkoala-arkts/arkui/sdk/component/span.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceColor, Dimension, BorderRadiuses, Font, Length } from "./units" import { Color, FontStyle, FontWeight, TextCase } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CommonMethod, ShadowOptions, ArkCommonMethodStyle } from "./common" import { LengthMetrics } from "./../framework/arkui.Graphics" import { DecorationStyleInterface } from "./styledString" diff --git a/arkoala-arkts/arkui/sdk/component/styledString.ets b/arkoala-arkts/arkui/sdk/component/styledString.ets index 4114f3557c37b6d500d1b27c854b1adafbb2328d..da6226541a9eff2c771a188a7c3fbc0271382624 100644 --- a/arkoala-arkts/arkui/sdk/component/styledString.ets +++ b/arkoala-arkts/arkui/sdk/component/styledString.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceColor, ResourceStr, SizeOptions, ColorFilter, Padding, BorderRadiuses } from "./units" import { Color, FontStyle, FontWeight, TextDecorationType, TextDecorationStyle, TextAlign, TextOverflow, WordBreak, ImageSpanAlignment, ImageFit } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { LengthMetrics, DrawContext } from "./../framework/arkui.Graphics" import { ShadowOptions, ClickEvent } from "./common" import { TextBackgroundStyle } from "./span" diff --git a/arkoala-arkts/arkui/sdk/component/swiper.ets b/arkoala-arkts/arkui/sdk/component/swiper.ets index 666cec0d2b3743ca6f00237db3d85dbb0065322f..77062a074788ed92a870149da33b5857f25307d8 100644 --- a/arkoala-arkts/arkui/sdk/component/swiper.ets +++ b/arkoala-arkts/arkui/sdk/component/swiper.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { VoidCallback, Length, ResourceColor, VP, Font } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { LengthMetrics } from "./../framework/arkui.Graphics" import { Color, EdgeEffect, PageFlipMode } from "./enums" import { CommonMethod, Bindable, ArkCommonMethodStyle } from "./common" diff --git a/arkoala-arkts/arkui/sdk/component/symbolSpan.ets b/arkoala-arkts/arkui/sdk/component/symbolSpan.ets index bfc4da791bb2cb935bff95f54e19889f24768b1b..9313bec5f6efd246a11d42d65d1a513dffbbce2e 100644 --- a/arkoala-arkts/arkui/sdk/component/symbolSpan.ets +++ b/arkoala-arkts/arkui/sdk/component/symbolSpan.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonMethod, ArkCommonMethodStyle } from "./common" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { ResourceColor } from "./units" import { Color, FontWeight } from "./enums" import { SymbolEffectStrategy, SymbolRenderingStrategy } from "./symbolglyph" diff --git a/arkoala-arkts/arkui/sdk/component/symbolglyph.ets b/arkoala-arkts/arkui/sdk/component/symbolglyph.ets index 890f2870e9aa592b8c8e39b98d1b473a06adcddf..f6e78301c515ef914754e8d9b53fe82640594cc2 100644 --- a/arkoala-arkts/arkui/sdk/component/symbolglyph.ets +++ b/arkoala-arkts/arkui/sdk/component/symbolglyph.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonMethod, ArkCommonMethodStyle } from "./common" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { ResourceColor } from "./units" import { Color, FontWeight } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" diff --git a/arkoala-arkts/arkui/sdk/component/tabContent.ets b/arkoala-arkts/arkui/sdk/component/tabContent.ets index f1546c33c39ed8c0643a3703e32f1a57bf220bf7..138a483dcae39392354740b4b53c99b0f4097266 100644 --- a/arkoala-arkts/arkui/sdk/component/tabContent.ets +++ b/arkoala-arkts/arkui/sdk/component/tabContent.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceColor, Length, ResourceStr, Font, Padding, Dimension, LocalizedPadding, VoidCallback } from "./units" import { Color, TextOverflow, TextHeightAdaptivePolicy, VerticalAlign } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { SymbolGlyphModifier } from "./../framework/arkui.SymbolGlyphModifier" import { ComponentContent } from "./../framework/arkui.ComponentContent" import { CommonMethod, ArkCommonMethodStyle } from "./common" diff --git a/arkoala-arkts/arkui/sdk/component/tabs.ets b/arkoala-arkts/arkui/sdk/component/tabs.ets index 6046f5ba9eac8f99d2633c150950fc71e2ac8896..9f990a272ab86886be142db39e411253d24f77d0 100644 --- a/arkoala-arkts/arkui/sdk/component/tabs.ets +++ b/arkoala-arkts/arkui/sdk/component/tabs.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { TranslateOptions, Bindable, CommonMethod, DividerStyle, BlurStyle, BackgroundEffectOptions, BackgroundBlurStyleOptions, ArkCommonMethodStyle } from "./common" import { Dimension, Length, ResourceColor } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { EdgeEffect, Color, PageFlipMode } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export enum BarMode { diff --git a/arkoala-arkts/arkui/sdk/component/text.ets b/arkoala-arkts/arkui/sdk/component/text.ets index 46d72fbaa37c7aa26a345fb2e306af7edadc75d4..9ac53bcd16f0af5a41906aaaa9fc62798fba870f 100644 --- a/arkoala-arkts/arkui/sdk/component/text.ets +++ b/arkoala-arkts/arkui/sdk/component/text.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { TextOverflow, Color, FontStyle, TextAlign, TextCase, CopyOptions, TextHeightAdaptivePolicy, WordBreak, LineBreakStrategy, EllipsisMode, TextSelectableMode, FontWeight } from "./enums" import { CommonMethod, ShadowOptions, ArkCommonMethodStyle } from "./common" import { ResourceColor, Length, Font } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { LengthMetrics } from "./../framework/arkui.Graphics" import { DecorationStyleInterface, StyledString } from "./styledString" import { TextDataDetectorConfig, EditMenuOptions, FontSettingOptions, LayoutManager } from "./textCommon" diff --git a/arkoala-arkts/arkui/sdk/component/textArea.ets b/arkoala-arkts/arkui/sdk/component/textArea.ets index 34645f24095ebd9b8efd0d9ca44f9bd84ec26666..dcd10989669ce137cde7487c72cffec4fd75e6b0 100644 --- a/arkoala-arkts/arkui/sdk/component/textArea.ets +++ b/arkoala-arkts/arkui/sdk/component/textArea.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { TextContentControllerBase, SelectionOptions, Bindable, CommonMethod, TextDecorationOptions, InputCounterOptions, ArkCommonMethodStyle } from "./common" import { ResourceStr, ResourceColor, Font, Length, Dimension } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { EnterKeyType, SubmitEvent, ContentType } from "./textInput" import { PasteEvent, KeyboardOptions } from "./richEditor" import { InsertValue, DeleteValue, EditableTextChangeValue, CaretStyle, EditableTextOnChangeCallback, PreviewText, TextChangeOptions, EditMenuOptions, AutoCapitalizationMode, KeyboardAppearance } from "./textCommon" diff --git a/arkoala-arkts/arkui/sdk/component/textClock.ets b/arkoala-arkts/arkui/sdk/component/textClock.ets index 5b5c3d2dee8576ed72ac0a4f1fa4488834706828..e78f029cdc3a00059a28fb4c50616a68f17c0933 100644 --- a/arkoala-arkts/arkui/sdk/component/textClock.ets +++ b/arkoala-arkts/arkui/sdk/component/textClock.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonConfiguration, CommonMethod, ShadowOptions, ArkCommonMethodStyle } from "./common" import { ResourceStr, ResourceColor, Length } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { Color, FontStyle, FontWeight } from "./enums" import { ContentModifier, AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" import { intl } from "./../framework/ohos.intl" diff --git a/arkoala-arkts/arkui/sdk/component/textCommon.ets b/arkoala-arkts/arkui/sdk/component/textCommon.ets index f56421f157e6a7bf0233a94ae4032b67b1e5702d..bf08f0cc822a2b1bec739d9e297b15f050d652fd 100644 --- a/arkoala-arkts/arkui/sdk/component/textCommon.ets +++ b/arkoala-arkts/arkui/sdk/component/textCommon.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceColor, Length, ResourceStr } from "./units" import { Color, TextDecorationType, TextDecorationStyle } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { DecorationStyleInterface, StyledString, MutableStyledString } from "./styledString" import { SelectionOptions } from "./common" export enum TextDataDetectorType { diff --git a/arkoala-arkts/arkui/sdk/component/textInput.ets b/arkoala-arkts/arkui/sdk/component/textInput.ets index ca4a4606fb6a95a2a8629d3ae79d1f5f49c6d2c8..49ce3d4d22dcce2cc5a0baede7ccfad2357d002a 100644 --- a/arkoala-arkts/arkui/sdk/component/textInput.ets +++ b/arkoala-arkts/arkui/sdk/component/textInput.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceColor, ResourceStr, Dimension, Font, Length } from "./units" import { Color, TextOverflow, FontStyle, FontWeight, CopyOptions, TextAlign, TextContentStyle, BarState, WordBreak, LineBreakStrategy, TextHeightAdaptivePolicy, EllipsisMode } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { TextContentControllerBase, SelectionOptions, Bindable, CommonMethod, TextDecorationOptions, InputCounterOptions, ArkCommonMethodStyle } from "./common" import { PasteEvent, KeyboardOptions } from "./richEditor" import { InsertValue, DeleteValue, EditableTextChangeValue, EditableTextOnChangeCallback, PreviewText, TextChangeOptions, CaretStyle, EditMenuOptions, AutoCapitalizationMode, KeyboardAppearance } from "./textCommon" diff --git a/arkoala-arkts/arkui/sdk/component/textPicker.ets b/arkoala-arkts/arkui/sdk/component/textPicker.ets index 84e888a1e34c7cce7ca5157df2fc4a01fccbcf76..c0365e2bbc43961888487b27c3ea53845f1f6fd2 100644 --- a/arkoala-arkts/arkui/sdk/component/textPicker.ets +++ b/arkoala-arkts/arkui/sdk/component/textPicker.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { ResourceStr, Dimension, ResourceColor, Offset } from "./units" import { Bindable, PickerTextStyle, CommonMethod, PickerDialogButtonStyle, Rectangle, BlurStyle, BackgroundBlurStyleOptions, BackgroundEffectOptions, ShadowOptions, ShadowStyle, HoverModeAreaType, ArkCommonMethodStyle } from "./common" import { LengthMetrics } from "./../framework/arkui.Graphics" diff --git a/arkoala-arkts/arkui/sdk/component/textTimer.ets b/arkoala-arkts/arkui/sdk/component/textTimer.ets index c9f93d4cdda9cbab681458a7c51c6ca6c2292f6d..e42a334f39ae76798cbd2736cd38fb31b8bf5703 100644 --- a/arkoala-arkts/arkui/sdk/component/textTimer.ets +++ b/arkoala-arkts/arkui/sdk/component/textTimer.ets @@ -23,7 +23,7 @@ import { ComponentBuilder } from "@koalaui/builderLambda" import { CommonConfiguration, CommonMethod, ShadowOptions, ArkCommonMethodStyle } from "./common" import { ResourceColor, Length, ResourceStr } from "./units" import { Color, FontStyle, FontWeight } from "./enums" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { ContentModifier, AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" export declare class TextTimerController { constructor() diff --git a/arkoala-arkts/arkui/sdk/component/timePicker.ets b/arkoala-arkts/arkui/sdk/component/timePicker.ets index 7aa88ee6a5055550b14794a0ad437c78972ec083..23d3a1e07f42574a99f7a45beaa72f42b0ee917a 100644 --- a/arkoala-arkts/arkui/sdk/component/timePicker.ets +++ b/arkoala-arkts/arkui/sdk/component/timePicker.ets @@ -26,7 +26,7 @@ import { CrownSensitivity, Color } from "./enums" import { AttributeModifier, UICommonBase, AttributeUpdater } from "./../handwritten" import { DialogAlignment } from "./alertDialog" import { Offset, ResourceColor } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" export declare interface TimePickerResult { hour: number; minute: number; diff --git a/arkoala-arkts/arkui/sdk/component/toggle.ets b/arkoala-arkts/arkui/sdk/component/toggle.ets index a15d75562349a38ea6b2951f46060c16c980c694..20399cb701647355c0a1bfcb5b9cf0a1a14a7f98 100644 --- a/arkoala-arkts/arkui/sdk/component/toggle.ets +++ b/arkoala-arkts/arkui/sdk/component/toggle.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { ResourceColor } from "./units" import { Color } from "./enums" import { CommonConfiguration, Bindable, CommonMethod, ArkCommonMethodStyle } from "./common" diff --git a/arkoala-arkts/arkui/sdk/component/units.ets b/arkoala-arkts/arkui/sdk/component/units.ets index 9a04e6491bf0686ee4d131d592c6c1f61fa6e606..5281aa63d38f01574ad229cf93d1608de7552974 100644 --- a/arkoala-arkts/arkui/sdk/component/units.ets +++ b/arkoala-arkts/arkui/sdk/component/units.ets @@ -20,11 +20,11 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { LengthMetrics, LengthMetricsUnit, ColorMetrics } from "./../framework/arkui.Graphics" import { Color, BorderStyle, FontWeight, FontStyle, DividerMode } from "./enums" import { OutlineStyle } from "./common" -export { Resource } from "./../framework/resource" +export { Resource } from "global.resource" export type Length = string | number | Resource; export type PX = string; export type VP = string | number; diff --git a/arkoala-arkts/arkui/sdk/component/video.ets b/arkoala-arkts/arkui/sdk/component/video.ets index 3c23f5e16818fa1a7cd58a0242aaf64595edb3bc..6902fb09831e637042dc95c7348383df4e655dc8 100644 --- a/arkoala-arkts/arkui/sdk/component/video.ets +++ b/arkoala-arkts/arkui/sdk/component/video.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { image } from "./../framework/ohos.multimedia.image" import { ImageAIOptions, ImageAnalyzerConfig } from "./imageCommon" import { CommonMethod, ArkCommonMethodStyle } from "./common" diff --git a/arkoala-arkts/arkui/sdk/component/waterFlow.ets b/arkoala-arkts/arkui/sdk/component/waterFlow.ets index e2c2cf847246c9e4a411f3897edd424fae8c70c3..8c2437a5c88bde910f0b5cc01c04cc959c1ca89a 100644 --- a/arkoala-arkts/arkui/sdk/component/waterFlow.ets +++ b/arkoala-arkts/arkui/sdk/component/waterFlow.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer, KStringPtr } from "@koalaui/int import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Dimension, Padding, ConstraintSizeOptions, Length } from "./units" -import { Resource } from "./../framework/resource" +import { Resource } from "global.resource" import { CustomBuilder } from "./builder" import { ComponentContent } from "./../framework/arkui.ComponentContent" import { Scroller, OnScrollFrameBeginCallback } from "./scroll" diff --git a/arkoala-arkts/arkui/sdk/framework/arkui.Graphics.ets b/arkoala-arkts/arkui/sdk/framework/arkui.Graphics.ets index 8b1797e1e74890124faac6cf12efb84388d501eb..95d127575ae969d053de8e8025255b6f1ddef043 100644 --- a/arkoala-arkts/arkui/sdk/framework/arkui.Graphics.ets +++ b/arkoala-arkts/arkui/sdk/framework/arkui.Graphics.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { drawing } from "./ohos.graphics.drawing" -import { Resource } from "./resource" +import { Resource } from "global.resource" import { ResourceColor } from "./../component/units" import { Color } from "./../component/enums" import { common2D } from "./ohos.graphics.common2D" diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.arkui.observer.ets b/arkoala-arkts/arkui/sdk/framework/ohos.arkui.observer.ets index 704490140ed2135689bcc2699f96302297b5e10f..5818a9675f1b3a36da4b5aa84210a89cd7d1be57 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.arkui.observer.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.arkui.observer.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceStr } from "./../component/units" -import { Resource } from "./resource" +import { Resource } from "global.resource" import { NavPathStack, NavBar, NavigationOperation } from "./../component/navigation" import { UIContext } from "./ohos.arkui.UIContext" export declare namespace uiObserver { diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.arkui.shape.ets b/arkoala-arkts/arkui/sdk/framework/ohos.arkui.shape.ets index e29759216afddd3ec34890b223b91b6014cfc298..b263b1d0e07c8c12fe9e73e82a18c94d2e500e3b 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.arkui.shape.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.arkui.shape.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { Position, ResourceColor, Length, SizeOptions } from "./../component/units" import { Color } from "./../component/enums" -import { Resource } from "./resource" +import { Resource } from "global.resource" export declare class CircleShape { constructor(options: ShapeSize | undefined) offset(offset: Position): CircleShape diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.arkui.theme.ets b/arkoala-arkts/arkui/sdk/framework/ohos.arkui.theme.ets index ccff4e3575e578c54b86974a5d45e3dfe8ba1eea..f505fb3511e8c1044de085b28eea2d80b63cfd7d 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.arkui.theme.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.arkui.theme.ets @@ -22,7 +22,7 @@ import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceColor } from "./../component/units" import { Color } from "./../component/enums" -import { Resource } from "./resource" +import { Resource } from "global.resource" export declare interface Theme { colors: Colors; } diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.font.ets b/arkoala-arkts/arkui/sdk/framework/ohos.font.ets index 13f77fe9742dafde0fec2c7c183f4be98ff26d6b..f80d3c8ff0ccad45751419367053860d320008e0 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.font.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.font.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource } from "./resource" +import { Resource } from "global.resource" export declare interface FontOptions { familyName: string | Resource; familySrc: string | Resource; diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.graphics.text.ets b/arkoala-arkts/arkui/sdk/framework/ohos.graphics.text.ets index 82cd7da50b1ffe0e2229ce7a03b928525a89f9ff..9580d4fab9ad37e46859864ec3e837574eadea7d 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.graphics.text.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.graphics.text.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { common2D } from "./ohos.graphics.common2D" -import { Resource } from "./resource" +import { Resource } from "global.resource" import { drawing } from "./ohos.graphics.drawing" export declare namespace text { export enum TextAlign { diff --git a/arkoala-arkts/arkui/sdk/framework/ohos.measure.ets b/arkoala-arkts/arkui/sdk/framework/ohos.measure.ets index f0567067c748283fd63ff74a0a68346a7bf967fa..5c4d7abf80ff4929fb5793fb8d052812eb349bd6 100644 --- a/arkoala-arkts/arkui/sdk/framework/ohos.measure.ets +++ b/arkoala-arkts/arkui/sdk/framework/ohos.measure.ets @@ -20,7 +20,7 @@ import { int32, int64, float32 } from "@koalaui/common" import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" -import { Resource } from "./resource" +import { Resource } from "global.resource" import { FontStyle, FontWeight, TextOverflow, TextCase } from "./../component/enums" import { text } from "./ohos.graphics.text" export declare interface MeasureOptions { diff --git a/arkoala-arkts/arkui/sdk/framework/textFieldOps.ets b/arkoala-arkts/arkui/sdk/framework/textFieldOps.ets index ee4a3b08c83837bc10b4e699cb7d636c3403f6f9..428ad728a2eb49a8681fc86410fac8dbefd1cce8 100644 --- a/arkoala-arkts/arkui/sdk/framework/textFieldOps.ets +++ b/arkoala-arkts/arkui/sdk/framework/textFieldOps.ets @@ -21,7 +21,7 @@ import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" import { memo, memo_stable } from "@koalaui/runtime/annotations" import { ComponentBuilder } from "@koalaui/builderLambda" import { ResourceStr, Length, Padding, LocalizedPadding, BorderOptions, EdgeWidths, LocalizedEdgeWidths, ResourceColor, EdgeColors, LocalizedEdgeColors, EdgeStyles, BorderRadiuses, LocalizedBorderRadiuses } from "./../component/units" -import { Resource } from "./resource" +import { Resource } from "global.resource" import { LayoutPolicy } from "./../component/common" import { Color, BorderStyle } from "./../component/enums" export type TextFieldValueCallback = (value: ResourceStr) => void; diff --git a/arkoala-arkts/arkui/sdk/handwritten/resources.ets b/arkoala-arkts/arkui/sdk/handwritten/resources.ets index 4bc194a5575053247ebd9b5102defa99d1c2e869..42a95e7f53bd3ab68aaef794226bacc97ff88448 100644 --- a/arkoala-arkts/arkui/sdk/handwritten/resources.ets +++ b/arkoala-arkts/arkui/sdk/handwritten/resources.ets @@ -14,11 +14,11 @@ */ package arkui.resources; -import { Resource } from "../framework/resource"; +import { Resource } from "global.resource"; export function _r(bundleName: string, moduleName: string, name: string): Resource { throw new Error("stub") } export function _rawfile(bundleName: string, moduleName: string, name: string): Resource { throw new Error("stub") -} \ No newline at end of file +} diff --git a/arkoala-arkts/arkui/sdk/framework/resource.ets b/arkoala-arkts/arkui/src/extractors.ts similarity index 50% rename from arkoala-arkts/arkui/sdk/framework/resource.ets rename to arkoala-arkts/arkui/src/extractors.ts index 89d253273e24f1cb3e171529ed25d783340b91e4..4d1a3c5eacdb3e2e8026e64354280786e54e7f37 100644 --- a/arkoala-arkts/arkui/sdk/framework/resource.ets +++ b/arkoala-arkts/arkui/src/extractors.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024-2025 Huawei Device Co., Ltd. + * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,17 +13,6 @@ * limitations under the License. */ - -// WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION! - -import { int32, int64, float32 } from "@koalaui/common" -import { KInt, KPointer, KBoolean, NativeBuffer } from "@koalaui/interop" -import { memo, memo_stable } from "@koalaui/runtime/annotations" -import { ComponentBuilder } from "@koalaui/builderLambda" -export declare interface Resource { - bundleName: string; - moduleName: string; - id: int64; - params?: Array; - type?: int32; +export namespace extractors { } + diff --git a/arkoala-arkts/arkui/src/resources.ets b/arkoala-arkts/arkui/src/resources.ets index 7639c3243b5cd39eaa76e0cb3b56bac011307279..2f68ff2e4dca724d21725327341f6254788691a8 100644 --- a/arkoala-arkts/arkui/src/resources.ets +++ b/arkoala-arkts/arkui/src/resources.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Resource } from "#generated"; +import { Resource } from "global.resource"; import { int32, int64 } from "@koalaui/common"; import { SerializerBase } from "@koalaui/interop"; import { ArkUIGeneratedNativeModule } from "#components"; @@ -85,4 +85,4 @@ export function _rawfile(bundleName: string, moduleName: string, name: string): "bundleName": bundleName, "moduleName": moduleName } as Resource -} \ No newline at end of file +} diff --git a/arkoala-arkts/arkui/ui2abcconfig.json b/arkoala-arkts/arkui/ui2abcconfig.json index 25f76fbe60942529e7af7fa7c51d3379367bd016..33553ca30ba386d01bca878cf16bba4d8a35256d 100644 --- a/arkoala-arkts/arkui/ui2abcconfig.json +++ b/arkoala-arkts/arkui/ui2abcconfig.json @@ -9,6 +9,7 @@ "#handwritten": ["./"], "#stateMgmtTool": ["./stateManagement/tools/arkts"], "arkui.ani": ["./ani/arkts/ArkUIAniModule"], + "global.resource": ["../../modules/global.resource/src/resource"], "@ohos.arkui.stateManagement": ["./stateManagement"], "@koalaui/interop": ["../../../interop/src/arkts"], "@koalaui/common": ["../../../incremental/common/src"], diff --git a/arkoala-arkts/cats/user/ui2abcconfig.json b/arkoala-arkts/cats/user/ui2abcconfig.json index da8498f349ab25509b9c5bdfd805e1028a822b6b..7f3ea1b8545c8895dae47257c826e603984051d3 100644 --- a/arkoala-arkts/cats/user/ui2abcconfig.json +++ b/arkoala-arkts/cats/user/ui2abcconfig.json @@ -6,6 +6,7 @@ "paths": { "arkui": ["../../arkui/sdk/"], "@ohos.arkui.component": ["../../arkui/@ohos.arkui.component"], + "global.resource": ["../../modules/global.resource/src/resource"], "@ohos.arkui.stateManagement": ["../../arkui/@ohos.arkui.stateManagement"], "@ohos.arkui.inspector": ["../../arkui/@ohos.arkui.inspector"], "@ohos.arkui.theme": ["../../arkui/@ohos.arkui.theme"], diff --git a/arkoala-arkts/modules/global.resource/arktsconfig.json b/arkoala-arkts/modules/global.resource/arktsconfig.json new file mode 100644 index 0000000000000000000000000000000000000000..4c98f46d1240b6fbacfbef071fba26001c62d3d9 --- /dev/null +++ b/arkoala-arkts/modules/global.resource/arktsconfig.json @@ -0,0 +1,11 @@ +{ + "compilerOptions": { + "package": "global", + "baseUrl": "./src", + "outDir": "build", + "paths": { + } + }, + "include": ["./src/*.ets"] +} + diff --git a/arkoala-arkts/modules/global.resource/src/index.ets b/arkoala-arkts/modules/global.resource/src/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..210ed6c60bef1f91d0f94bb3e67365e4f92d558e --- /dev/null +++ b/arkoala-arkts/modules/global.resource/src/index.ets @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * @file + * @kit ArkUI + */ + +export * from "./resource" + diff --git a/arkoala-arkts/modules/global.resource/src/resource.ets b/arkoala-arkts/modules/global.resource/src/resource.ets new file mode 100644 index 0000000000000000000000000000000000000000..2ae1c35919568653700d6feb4d5f40463edaad47 --- /dev/null +++ b/arkoala-arkts/modules/global.resource/src/resource.ets @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * @file + * @kit ArkUI + */ + +export interface Resource { + + bundleName: string; + moduleName: string; + id: long; + params?: Array; + type?: int; +} + diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json index 3d9610d2a09a44805d21f2066f285cbb04787a5a..587fc549f2cac12e07102beaf4ed103885c0653e 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -130,8 +130,9 @@ "previewer:list-remote": "node scripts/previewer-cli.mjs list-remote", "previewer:set-active": "node scripts/previewer-cli.mjs set-active", - "link": "mkdir -p build/bootPandaFiles && ../incremental/tools/panda/arkts/arklink --output build/bootPandaFiles/arkoala.abc -- ../incremental/runtime/build/incremental.abc ../interop/build/interop.abc ./arkui/build/arkui.abc", - "build": "npm run build --prefix ../incremental && npm run build --prefix ../interop && npm run build --prefix arkui && npm run link" + "link": "mkdir -p build/bootPandaFiles && ../incremental/tools/panda/arkts/arklink --output build/bootPandaFiles/arkoala.abc -- ../incremental/runtime/build/incremental.abc ../interop/build/interop.abc ./arkui/build/arkui.abc ./modules/global.resource/build/src/resource.abc", + "build:modules": "../incremental/tools/panda/arkts/arktsc --arktsconfig ./modules/global.resource/arktsconfig.json", + "build": "npm run build --prefix ../incremental && npm run build --prefix ../interop && npm run build --prefix arkui && npm run build:modules && npm run link" } } diff --git a/arkoala-arkts/shopping/user/ui2abcconfig.json b/arkoala-arkts/shopping/user/ui2abcconfig.json index 3f7dfa40401cad6ac28d4b3f183348306786eb27..08bd915abe010d5ced65236bee605fbfd204190e 100644 --- a/arkoala-arkts/shopping/user/ui2abcconfig.json +++ b/arkoala-arkts/shopping/user/ui2abcconfig.json @@ -6,6 +6,7 @@ "paths": { "arkui": ["../../arkui/sdk/"], "@ohos.arkui.component": ["../../arkui/@ohos.arkui.component"], + "global.resource": ["../../modules/global.resource/src/resource"], "@ohos.arkui.stateManagement": ["../../arkui/@ohos.arkui.stateManagement"], "@ohos.arkui.inspector": ["../../arkui/@ohos.arkui.inspector"], "@ohos.arkui.theme": ["../../arkui/@ohos.arkui.theme"], diff --git a/arkoala-arkts/tools/peer-generator/config-arkui.json b/arkoala-arkts/tools/peer-generator/config-arkui.json new file mode 100644 index 0000000000000000000000000000000000000000..e99f04d5deca64d909fb2b192cf2414a3fd11a00 --- /dev/null +++ b/arkoala-arkts/tools/peer-generator/config-arkui.json @@ -0,0 +1,42 @@ +{ + "moduleName": "arkui", + "modules": { + "global.resource": { + "name": "global.resource", + "external": true, + "packages": ["global.resource"] + }, + "arkui": { + "name": "arkui", + "packages": [ + "api.internal.component.ets", + "application", + "arkui", + "arkui.component", + "arkui.stateManagement.decorators", + "ohos.app.ability", + "ohos.arkui", + "ohos.base", + "ohos.curves", + "ohos.data", + "ohos.font", + "ohos.graphics", + "ohos.intl", + "ohos.matrix4", + "ohos.measure", + "ohos.multimodalInput", + "ohos.promptAction", + "ohos.window", + "ohos.multimedia.image", + "idlize.stdlib", + "idlize.internal" + ] + } + }, + "libraryNameMapping": { + "global.resource": { + "TS": "global.resource", + "ArkTS": "global.resource" + } + } +} diff --git a/arkoala-arkts/tools/peer-generator/package.json b/arkoala-arkts/tools/peer-generator/package.json index 440a1781be97c2c3ec7b91e1a7b0ace5971f1851..3212a1a6ea14671504fa96047e9b4b030ea24f39 100644 --- a/arkoala-arkts/tools/peer-generator/package.json +++ b/arkoala-arkts/tools/peer-generator/package.json @@ -15,7 +15,7 @@ "clean:arkts": "rimraf ../../arkui/sdk/framework ../../arkui/sdk/component && rimraf ../../arkui/generated", "clean:all": "npm run clean:ts && npm run clean:arkts", "generate:ts": "npm run clean:ts && cd ../../../../ && npm run compile --prefix ./runner && node ./runner m3 sdk-patched-arkts external --language ts", - "generate:arkts": "npm run clean:arkts && cd ../../../../ && npm run compile --prefix ./runner && node ./runner m3 sdk-patched-arkts external --language arkts", + "generate:arkts": "npm run clean:arkts && cd ../../../../ && npm run compile --prefix ./runner && node ./runner m3 sdk-patched-arkts external --language arkts --options-file external/arkoala-arkts/tools/peer-generator/config-arkui.json", "generate:all": "npm run generate:ts && npm run generate:arkts" }, "dependencies": { diff --git a/arkoala-arkts/trivial/user/ui2abcconfig.json b/arkoala-arkts/trivial/user/ui2abcconfig.json index 3f7dfa40401cad6ac28d4b3f183348306786eb27..789f49a002b10148c8498152a40d549940de107c 100644 --- a/arkoala-arkts/trivial/user/ui2abcconfig.json +++ b/arkoala-arkts/trivial/user/ui2abcconfig.json @@ -6,6 +6,8 @@ "paths": { "arkui": ["../../arkui/sdk/"], "@ohos.arkui.component": ["../../arkui/@ohos.arkui.component"], + "global": ["../../modules/global.resource/src"], + "global.resource": ["../../modules/global.resource/src/resource"], "@ohos.arkui.stateManagement": ["../../arkui/@ohos.arkui.stateManagement"], "@ohos.arkui.inspector": ["../../arkui/@ohos.arkui.inspector"], "@ohos.arkui.theme": ["../../arkui/@ohos.arkui.theme"], diff --git a/ets-tests/golden-test-ui2abcconfig.json b/ets-tests/golden-test-ui2abcconfig.json index ea2481f1ee95abfa775f77e662cdf82bc5b9435a..94e58d885f10ffc53d1a9f9b92c0d2dbf050d6c7 100644 --- a/ets-tests/golden-test-ui2abcconfig.json +++ b/ets-tests/golden-test-ui2abcconfig.json @@ -6,6 +6,7 @@ "paths": { "arkui": ["../arkoala-arkts/arkui/sdk/"], "@ohos.arkui.component": ["../arkoala-arkts/arkui/@ohos.arkui.component"], + "global.resource": ["../arkoala-arkts/modules/global.resource/src/resource"], "@ohos.arkui.stateManagement": ["../arkoala-arkts/arkui/@ohos.arkui.stateManagement"], "@ohos.arkui.inspector": ["../arkoala-arkts/arkui/@ohos.arkui.inspector"], "@ohos.arkui.theme": ["../arkoala-arkts/arkui/@ohos.arkui.theme"], diff --git a/ets-tests/ui2abcconfig.json b/ets-tests/ui2abcconfig.json index 99d2c6b6ab69a87138a2fcf6d56b592421f35a5d..2b1258d26f23825e70f0fd9066898710732c0207 100644 --- a/ets-tests/ui2abcconfig.json +++ b/ets-tests/ui2abcconfig.json @@ -6,6 +6,7 @@ "paths": { "arkui": ["../arkoala-arkts/arkui/sdk/"], "@ohos.arkui.component": ["../arkoala-arkts/arkui/@ohos.arkui.component"], + "global.resource": ["../arkoala-arkts/modules/global.resource/src/resource"], "@ohos.arkui.stateManagement": ["../arkoala-arkts/arkui/@ohos.arkui.stateManagement"], "@ohos.arkui.inspector": ["../arkoala-arkts/arkui/@ohos.arkui.inspector"], "@ohos.arkui.theme": ["../arkoala-arkts/arkui/@ohos.arkui.theme"],