From bfe83df88f9e65bf0721ce8656c0d90d3db6ebad Mon Sep 17 00:00:00 2001 From: yalixie Date: Tue, 29 Jul 2025 14:51:30 +0300 Subject: [PATCH 1/7] Generate imports for Resource --- .../arkui/generated/framework/resource.ets | 12 +----- .../arkui/sdk/handwritten/resources.ets | 5 +-- .../resource.ets => src/extractors.ts} | 17 ++------ arkoala-arkts/arkui/src/resources.ets | 2 +- arkoala-arkts/arkui/ui2abcconfig.json | 1 + .../modules/global.resource/arktsconfig.json | 11 +++++ .../modules/global.resource/src/index.ets | 21 ++++++++++ .../modules/global.resource/src/resource.ets | 28 +++++++++++++ arkoala-arkts/package.json | 5 ++- .../tools/peer-generator/config-arkui.json | 42 +++++++++++++++++++ .../tools/peer-generator/package.json | 2 +- arkoala-arkts/trivial/user/ui2abcconfig.json | 2 + ets-tests/ui2abcconfig.json | 1 + 13 files changed, 118 insertions(+), 31 deletions(-) rename arkoala-arkts/arkui/{sdk/framework/resource.ets => src/extractors.ts} (50%) create mode 100644 arkoala-arkts/modules/global.resource/arktsconfig.json create mode 100644 arkoala-arkts/modules/global.resource/src/index.ets create mode 100644 arkoala-arkts/modules/global.resource/src/resource.ets create mode 100644 arkoala-arkts/tools/peer-generator/config-arkui.json diff --git a/arkoala-arkts/arkui/generated/framework/resource.ets b/arkoala-arkts/arkui/generated/framework/resource.ets index f42f52320..9da2228c1 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/sdk/handwritten/resources.ets b/arkoala-arkts/arkui/sdk/handwritten/resources.ets index 4bc194a55..41d19d8d7 100644 --- a/arkoala-arkts/arkui/sdk/handwritten/resources.ets +++ b/arkoala-arkts/arkui/sdk/handwritten/resources.ets @@ -13,12 +13,11 @@ * limitations under the License. */ -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 89d253273..4d1a3c5ea 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 7639c3243..493e35512 100644 --- a/arkoala-arkts/arkui/src/resources.ets +++ b/arkoala-arkts/arkui/src/resources.ets @@ -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 25f76fbe6..33553ca30 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/modules/global.resource/arktsconfig.json b/arkoala-arkts/modules/global.resource/arktsconfig.json new file mode 100644 index 000000000..4c98f46d1 --- /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 000000000..210ed6c60 --- /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 000000000..2ae1c3591 --- /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 3d9610d2a..2760ea0cf 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", + "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 modules && npm run link" } } 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 000000000..e99f04d5d --- /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 440a1781b..3212a1a6e 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 3f7dfa404..789f49a00 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/ui2abcconfig.json b/ets-tests/ui2abcconfig.json index 99d2c6b6a..2b1258d26 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"], -- Gitee From af4843a0e1ec2d197c6b3d039f09fa5fb4503e4f Mon Sep 17 00:00:00 2001 From: yalixie Date: Tue, 5 Aug 2025 19:30:00 +0300 Subject: [PATCH 2/7] Import Resource from global.resource --- arkoala-arkts/arkui/generated/component/actionSheet.ets | 2 +- arkoala-arkts/arkui/generated/component/alertDialog.ets | 2 +- arkoala-arkts/arkui/generated/component/alphabetIndexer.ets | 3 ++- arkoala-arkts/arkui/generated/component/badge.ets | 3 ++- arkoala-arkts/arkui/generated/component/blank.ets | 3 ++- arkoala-arkts/arkui/generated/component/button.ets | 3 ++- arkoala-arkts/arkui/generated/component/calendarPicker.ets | 3 ++- arkoala-arkts/arkui/generated/component/checkbox.ets | 3 ++- arkoala-arkts/arkui/generated/component/checkboxgroup.ets | 3 ++- arkoala-arkts/arkui/generated/component/column.ets | 3 ++- arkoala-arkts/arkui/generated/component/columnSplit.ets | 3 ++- arkoala-arkts/arkui/generated/component/common.ets | 3 ++- .../arkui/generated/component/customDialogController.ets | 3 ++- arkoala-arkts/arkui/generated/component/dataPanel.ets | 3 ++- arkoala-arkts/arkui/generated/component/datePicker.ets | 2 +- arkoala-arkts/arkui/generated/component/divider.ets | 3 ++- arkoala-arkts/arkui/generated/component/gauge.ets | 3 ++- arkoala-arkts/arkui/generated/component/grid.ets | 3 ++- arkoala-arkts/arkui/generated/component/gridRow.ets | 3 ++- arkoala-arkts/arkui/generated/component/hyperlink.ets | 3 ++- arkoala-arkts/arkui/generated/component/idlize.ets | 3 ++- arkoala-arkts/arkui/generated/component/image.ets | 3 ++- arkoala-arkts/arkui/generated/component/imageAnimator.ets | 3 ++- arkoala-arkts/arkui/generated/component/imageSpan.ets | 3 ++- arkoala-arkts/arkui/generated/component/line.ets | 3 ++- arkoala-arkts/arkui/generated/component/list.ets | 3 ++- arkoala-arkts/arkui/generated/component/listItem.ets | 3 ++- arkoala-arkts/arkui/generated/component/loadingProgress.ets | 3 ++- arkoala-arkts/arkui/generated/component/marquee.ets | 3 ++- arkoala-arkts/arkui/generated/component/mediaCachedImage.ets | 3 ++- arkoala-arkts/arkui/generated/component/menu.ets | 3 ++- arkoala-arkts/arkui/generated/component/menuItem.ets | 3 ++- arkoala-arkts/arkui/generated/component/menuItemGroup.ets | 3 ++- arkoala-arkts/arkui/generated/component/navDestination.ets | 3 ++- arkoala-arkts/arkui/generated/component/navigation.ets | 3 ++- arkoala-arkts/arkui/generated/component/particle.ets | 2 +- arkoala-arkts/arkui/generated/component/patternLock.ets | 3 ++- arkoala-arkts/arkui/generated/component/polygon.ets | 3 ++- arkoala-arkts/arkui/generated/component/polyline.ets | 3 ++- arkoala-arkts/arkui/generated/component/progress.ets | 3 ++- arkoala-arkts/arkui/generated/component/qrcode.ets | 3 ++- arkoala-arkts/arkui/generated/component/radio.ets | 3 ++- arkoala-arkts/arkui/generated/component/rating.ets | 3 ++- arkoala-arkts/arkui/generated/component/rect.ets | 3 ++- arkoala-arkts/arkui/generated/component/refresh.ets | 3 ++- .../arkui/generated/component/relativeContainer.ets | 3 ++- arkoala-arkts/arkui/generated/component/richEditor.ets | 3 ++- arkoala-arkts/arkui/generated/component/scroll.ets | 3 ++- arkoala-arkts/arkui/generated/component/search.ets | 3 ++- .../arkui/generated/component/securityComponent.ets | 2 +- arkoala-arkts/arkui/generated/component/select.ets | 3 ++- arkoala-arkts/arkui/generated/component/shape.ets | 3 ++- arkoala-arkts/arkui/generated/component/sidebar.ets | 3 ++- arkoala-arkts/arkui/generated/component/slider.ets | 3 ++- arkoala-arkts/arkui/generated/component/span.ets | 3 ++- arkoala-arkts/arkui/generated/component/styledString.ets | 3 ++- arkoala-arkts/arkui/generated/component/swiper.ets | 3 ++- arkoala-arkts/arkui/generated/component/symbolSpan.ets | 3 ++- arkoala-arkts/arkui/generated/component/symbolglyph.ets | 3 ++- arkoala-arkts/arkui/generated/component/tabContent.ets | 3 ++- arkoala-arkts/arkui/generated/component/tabs.ets | 3 ++- arkoala-arkts/arkui/generated/component/text.ets | 3 ++- arkoala-arkts/arkui/generated/component/textArea.ets | 3 ++- arkoala-arkts/arkui/generated/component/textClock.ets | 3 ++- arkoala-arkts/arkui/generated/component/textCommon.ets | 3 ++- arkoala-arkts/arkui/generated/component/textInput.ets | 3 ++- arkoala-arkts/arkui/generated/component/textPicker.ets | 3 ++- arkoala-arkts/arkui/generated/component/textTimer.ets | 3 ++- arkoala-arkts/arkui/generated/component/timePicker.ets | 2 +- arkoala-arkts/arkui/generated/component/toggle.ets | 3 ++- arkoala-arkts/arkui/generated/component/units.ets | 5 +++-- arkoala-arkts/arkui/generated/component/video.ets | 3 ++- arkoala-arkts/arkui/generated/component/waterFlow.ets | 3 ++- arkoala-arkts/arkui/generated/component/windowScene.ets | 2 +- arkoala-arkts/arkui/generated/framework/GlobalScope.ets | 3 ++- arkoala-arkts/arkui/generated/framework/arkts/type_check.ets | 2 +- arkoala-arkts/arkui/generated/framework/arkui.Graphics.ets | 3 ++- .../arkui/generated/framework/ohos.arkui.observer.ets | 3 ++- arkoala-arkts/arkui/generated/framework/ohos.arkui.shape.ets | 3 ++- arkoala-arkts/arkui/generated/framework/ohos.arkui.theme.ets | 3 ++- arkoala-arkts/arkui/generated/framework/ohos.font.ets | 3 ++- .../arkui/generated/framework/ohos.graphics.text.ets | 3 ++- arkoala-arkts/arkui/generated/framework/ohos.measure.ets | 3 ++- .../generated/framework/peers/CallbackDeserializeCall.ets | 3 ++- arkoala-arkts/arkui/generated/framework/textFieldOps.ets | 3 ++- arkoala-arkts/arkui/sdk/component/actionSheet.ets | 2 +- arkoala-arkts/arkui/sdk/component/alertDialog.ets | 2 +- arkoala-arkts/arkui/sdk/component/alphabetIndexer.ets | 2 +- arkoala-arkts/arkui/sdk/component/badge.ets | 2 +- arkoala-arkts/arkui/sdk/component/blank.ets | 2 +- arkoala-arkts/arkui/sdk/component/button.ets | 2 +- arkoala-arkts/arkui/sdk/component/calendarPicker.ets | 2 +- arkoala-arkts/arkui/sdk/component/checkbox.ets | 2 +- arkoala-arkts/arkui/sdk/component/checkboxgroup.ets | 2 +- arkoala-arkts/arkui/sdk/component/column.ets | 2 +- arkoala-arkts/arkui/sdk/component/columnSplit.ets | 2 +- arkoala-arkts/arkui/sdk/component/common.ets | 2 +- arkoala-arkts/arkui/sdk/component/customDialogController.ets | 2 +- arkoala-arkts/arkui/sdk/component/dataPanel.ets | 2 +- arkoala-arkts/arkui/sdk/component/datePicker.ets | 2 +- arkoala-arkts/arkui/sdk/component/divider.ets | 2 +- arkoala-arkts/arkui/sdk/component/gauge.ets | 2 +- arkoala-arkts/arkui/sdk/component/grid.ets | 2 +- arkoala-arkts/arkui/sdk/component/gridRow.ets | 2 +- arkoala-arkts/arkui/sdk/component/hyperlink.ets | 2 +- arkoala-arkts/arkui/sdk/component/idlize.ets | 4 ++-- arkoala-arkts/arkui/sdk/component/image.ets | 2 +- arkoala-arkts/arkui/sdk/component/imageAnimator.ets | 2 +- arkoala-arkts/arkui/sdk/component/imageSpan.ets | 2 +- arkoala-arkts/arkui/sdk/component/line.ets | 2 +- arkoala-arkts/arkui/sdk/component/list.ets | 2 +- arkoala-arkts/arkui/sdk/component/listItem.ets | 2 +- arkoala-arkts/arkui/sdk/component/loadingProgress.ets | 2 +- arkoala-arkts/arkui/sdk/component/marquee.ets | 2 +- arkoala-arkts/arkui/sdk/component/mediaCachedImage.ets | 2 +- arkoala-arkts/arkui/sdk/component/menu.ets | 2 +- arkoala-arkts/arkui/sdk/component/menuItem.ets | 2 +- arkoala-arkts/arkui/sdk/component/menuItemGroup.ets | 2 +- arkoala-arkts/arkui/sdk/component/navDestination.ets | 2 +- arkoala-arkts/arkui/sdk/component/navigation.ets | 2 +- arkoala-arkts/arkui/sdk/component/particle.ets | 2 +- arkoala-arkts/arkui/sdk/component/patternLock.ets | 2 +- arkoala-arkts/arkui/sdk/component/polygon.ets | 2 +- arkoala-arkts/arkui/sdk/component/polyline.ets | 2 +- arkoala-arkts/arkui/sdk/component/progress.ets | 2 +- arkoala-arkts/arkui/sdk/component/qrcode.ets | 2 +- arkoala-arkts/arkui/sdk/component/radio.ets | 2 +- arkoala-arkts/arkui/sdk/component/rating.ets | 2 +- arkoala-arkts/arkui/sdk/component/rect.ets | 2 +- arkoala-arkts/arkui/sdk/component/refresh.ets | 2 +- arkoala-arkts/arkui/sdk/component/relativeContainer.ets | 2 +- arkoala-arkts/arkui/sdk/component/richEditor.ets | 2 +- arkoala-arkts/arkui/sdk/component/scroll.ets | 2 +- arkoala-arkts/arkui/sdk/component/search.ets | 2 +- arkoala-arkts/arkui/sdk/component/securityComponent.ets | 2 +- arkoala-arkts/arkui/sdk/component/select.ets | 2 +- arkoala-arkts/arkui/sdk/component/shape.ets | 2 +- arkoala-arkts/arkui/sdk/component/sidebar.ets | 2 +- arkoala-arkts/arkui/sdk/component/slider.ets | 2 +- arkoala-arkts/arkui/sdk/component/span.ets | 2 +- arkoala-arkts/arkui/sdk/component/styledString.ets | 2 +- arkoala-arkts/arkui/sdk/component/swiper.ets | 2 +- arkoala-arkts/arkui/sdk/component/symbolSpan.ets | 2 +- arkoala-arkts/arkui/sdk/component/symbolglyph.ets | 2 +- arkoala-arkts/arkui/sdk/component/tabContent.ets | 2 +- arkoala-arkts/arkui/sdk/component/tabs.ets | 2 +- arkoala-arkts/arkui/sdk/component/text.ets | 2 +- arkoala-arkts/arkui/sdk/component/textArea.ets | 2 +- arkoala-arkts/arkui/sdk/component/textClock.ets | 2 +- arkoala-arkts/arkui/sdk/component/textCommon.ets | 2 +- arkoala-arkts/arkui/sdk/component/textInput.ets | 2 +- arkoala-arkts/arkui/sdk/component/textPicker.ets | 2 +- arkoala-arkts/arkui/sdk/component/textTimer.ets | 2 +- arkoala-arkts/arkui/sdk/component/timePicker.ets | 2 +- arkoala-arkts/arkui/sdk/component/toggle.ets | 2 +- arkoala-arkts/arkui/sdk/component/units.ets | 4 ++-- arkoala-arkts/arkui/sdk/component/video.ets | 2 +- arkoala-arkts/arkui/sdk/component/waterFlow.ets | 2 +- arkoala-arkts/arkui/sdk/framework/arkui.Graphics.ets | 2 +- arkoala-arkts/arkui/sdk/framework/ohos.arkui.observer.ets | 2 +- arkoala-arkts/arkui/sdk/framework/ohos.arkui.shape.ets | 2 +- arkoala-arkts/arkui/sdk/framework/ohos.arkui.theme.ets | 2 +- arkoala-arkts/arkui/sdk/framework/ohos.font.ets | 2 +- arkoala-arkts/arkui/sdk/framework/ohos.graphics.text.ets | 2 +- arkoala-arkts/arkui/sdk/framework/ohos.measure.ets | 2 +- arkoala-arkts/arkui/sdk/framework/textFieldOps.ets | 2 +- arkoala-arkts/arkui/src/resources.ets | 2 +- 167 files changed, 247 insertions(+), 170 deletions(-) diff --git a/arkoala-arkts/arkui/generated/component/actionSheet.ets b/arkoala-arkts/arkui/generated/component/actionSheet.ets index 7473c4b7b..5cad3ec5f 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 f22d3886d..d3f712198 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 0ed3658ff..00e236b54 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 db9bb52e8..42b190c96 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 f673eeddb..b2c597b47 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 ad37b0e46..6db1f9ea7 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 ec68b9b5f..29c36f706 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 a03120543..dacb6c03a 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 83a7a0681..d5831042b 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 d349c9585..5ba159c64 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 48c7e2952..09ea9be36 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 7e47a16f8..6d571770f 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 b9daf3800..5ee078ad2 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 3ed0503ae..1012a9431 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 d1d85d274..78816706c 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 6e62dfee7..d2d0e5944 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 5fa41c4ac..18dfe1a35 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 c8e74ee48..b7c746872 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 9ec7e8039..360248873 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 b02e675da..d94316e7c 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 e6f221580..2d31f438c 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 5a2a6aa2f..58e1e02d8 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 764517e1a..eab0fbe99 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 b05bce931..5bbb3eca0 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 1106ae539..e756dad92 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 a5228e373..65eff11a7 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 ea8f65767..353b8b455 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 5e29d8c5c..252752664 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 f4fc4b44b..1b89a1fcd 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 0f0855a3c..7831db872 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 b037cbc49..1d8d056f0 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 ddafc7fc5..16ee9affd 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 d412f8059..45007c668 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 1d1ca22b7..d2fc21911 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 b469e6007..e84e39f2b 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 95419c762..bb30d7c65 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 8b4ee21cb..445c266f2 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 49aa97cdf..e676816fa 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 9ce26dd35..336551f1c 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 b81a61d87..1e2c82f95 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 f486f2a06..7c07bfa8a 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 fa1dfa56c..fdefff7d5 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 ce13236de..27719e090 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 d12517d68..41dc09014 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 ffa669a6c..39a7726ae 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 914ab4a5a..852d65853 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 46275d2a2..dffcf5452 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 ce03f963d..f179e49a8 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 8ae7a9cac..dee53873f 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 58db5200e..18aff2063 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 2aed71ef2..d9c405949 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 9927facea..a9863d090 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 f1c54a185..3d229602b 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 467e9d4a7..210ac7fb5 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 d04f3ca2c..21d254f21 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 846ec1c49..d1a825ab0 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 7cda80787..17acbdb1f 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 7e1d1c2f7..7ccdcc498 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 ebf435794..bf2d4e724 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 ea091d680..4f63e5ee8 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 ee180da93..00a141527 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 fa130ffb0..a9a2e18d9 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 35d07a0dd..6e83455c4 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 a850c964d..bfbebe418 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 3abb73d8c..191b1ea45 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 ee47c28a5..9ebb2b6ab 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 d885a91e4..5121f0db2 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 1fae68a3c..44ac3da50 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 da3635b0a..d855bde8a 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 619b82b69..08eca280a 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 82561bce2..66e525545 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 e55da6902..eae0e32e3 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 e55b33eca..07e2c60e1 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 45200c110..aac7385f0 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 1cbe0e17d..9bc677a6d 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 7ce7071d7..329d2a456 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 450bac98f..b95572267 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 b96e42c9d..d53b9c535 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 f499df052..8fefea19d 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 f76a242c3..b2537b10f 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 12c1cd2ab..f377064db 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 29fd2e9e6..0ca9c1263 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 25bd367ca..ac6a98ea5 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 13210f849..dc624e892 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/textFieldOps.ets b/arkoala-arkts/arkui/generated/framework/textFieldOps.ets index aa820413e..5d884277a 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 35c9c44c2..4d3b85656 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 733f3cc6c..f7c4cbf3e 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 e60414d2b..46b8fef7b 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 a405f8e9e..2f696b94b 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 41d7b21f6..0614190db 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 a8fa4f1f1..527c6e22a 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 3069fc2f8..fac9f7dc0 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 2e0396702..e4d073195 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 5602c109b..cd0db41ff 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 88ed91401..43683abcc 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 f534ec95b..147877512 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 3227e705d..7326a0367 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 0527c0392..e533def85 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 1fe2ef934..3fa7bb203 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 4c0a80a0a..21dd8fec2 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 5f14da962..b022c4a0c 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 1868c640d..12d239ae9 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 419c6e101..fbb1d0cec 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 b5e8602bd..88849bbe8 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 cbbcd75a9..148d7378e 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 2553cc78e..632cc177a 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 fd3725134..21a5d2a09 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 a8339cb7c..fd4f208a5 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 491fbeb25..e15c170d8 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 7df45d371..3f88cc7df 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 5c6fe5471..3128efd04 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 493754f46..e2e524e72 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 9e8baa5ba..d7d4bab85 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 bb0eebed2..d1f61a9c2 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 e0c25106a..5cfd390b6 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 1386533f0..e5ddb2a3d 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 c157a5a8c..fa77381d0 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 d26e0de20..bcf122ba3 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 c1887c932..f670d5842 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 b096e7850..9d0f8e87d 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 22302491e..b71da299a 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 6f3d4fb4a..2d1b00dc3 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 9444afdad..0891432a5 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 228dd0d52..fbafb7275 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 41c4f9c9b..3d8fd1258 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 9b4f495d9..20a3795a4 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 e26cb7bc6..1ffc67063 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 130dad449..18d9d3016 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 32b7da586..20386cd0f 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 33efcf5af..30e8e1fbf 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 acac3ed3f..e23fedc12 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 15b451238..d453e5313 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 bc68d94b7..4dab6ff5e 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 399cad2d2..4a8350a56 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 fbbcd9d9b..7ce0a4486 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 67c015f46..e151c8b6c 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 ba6de691a..89ce4ad1e 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 ff3c1a817..ee68436a8 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 d7d780247..1f2b9bce6 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 d76ed532f..0e9b7137a 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 4114f3557..da6226541 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 666cec0d2..77062a074 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 bfc4da791..9313bec5f 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 890f2870e..f6e78301c 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 f1546c33c..138a483dc 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 6046f5ba9..9f990a272 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 46d72fbaa..9ac53bcd1 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 34645f240..dcd109896 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 5b5c3d2de..e78f029cd 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 f56421f15..bf08f0cc8 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 ca4a4606f..49ce3d4d2 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 84e888a1e..c0365e2bb 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 c9f93d4cd..e42a334f3 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 7aa88ee6a..23d3a1e07 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 a15d75562..20399cb70 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 9a04e6491..5281aa63d 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 3c23f5e16..6902fb098 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 e2c2cf847..8c2437a5c 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 8b1797e1e..95d127575 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 704490140..5818a9675 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 e29759216..b263b1d0e 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 ccff4e357..f505fb351 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 13f77fe97..f80d3c8ff 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 82cd7da50..9580d4fab 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 f0567067c..5c4d7abf8 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 ee4a3b08c..428ad728a 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/src/resources.ets b/arkoala-arkts/arkui/src/resources.ets index 493e35512..2f68ff2e4 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"; -- Gitee From 7406f1783b711d0c034bdc430e22bfe9ade81320 Mon Sep 17 00:00:00 2001 From: yalixie Date: Tue, 5 Aug 2025 19:47:22 +0300 Subject: [PATCH 3/7] Return package back --- arkoala-arkts/arkui/sdk/handwritten/resources.ets | 1 + 1 file changed, 1 insertion(+) diff --git a/arkoala-arkts/arkui/sdk/handwritten/resources.ets b/arkoala-arkts/arkui/sdk/handwritten/resources.ets index 41d19d8d7..42a95e7f5 100644 --- a/arkoala-arkts/arkui/sdk/handwritten/resources.ets +++ b/arkoala-arkts/arkui/sdk/handwritten/resources.ets @@ -13,6 +13,7 @@ * limitations under the License. */ +package arkui.resources; import { Resource } from "global.resource"; export function _r(bundleName: string, moduleName: string, name: string): Resource { -- Gitee From 909ef42c63b9c879680fc577191a0bc6437f34d3 Mon Sep 17 00:00:00 2001 From: yalixie Date: Tue, 5 Aug 2025 20:10:31 +0300 Subject: [PATCH 4/7] Add global.resource path to shopping ui2abcconfig --- arkoala-arkts/shopping/user/ui2abcconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/arkoala-arkts/shopping/user/ui2abcconfig.json b/arkoala-arkts/shopping/user/ui2abcconfig.json index 3f7dfa404..08bd915ab 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"], -- Gitee From 344ba2de89618b277b7269126b833d6f9f0de5b0 Mon Sep 17 00:00:00 2001 From: yalixie Date: Wed, 6 Aug 2025 12:00:31 +0300 Subject: [PATCH 5/7] Add global.resource to cats ui2abcconfig --- arkoala-arkts/cats/user/ui2abcconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/arkoala-arkts/cats/user/ui2abcconfig.json b/arkoala-arkts/cats/user/ui2abcconfig.json index da8498f34..7f3ea1b85 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"], -- Gitee From 865ba4e1224c9f012d41fbb890886ac39876a99d Mon Sep 17 00:00:00 2001 From: yalixie Date: Wed, 6 Aug 2025 12:10:47 +0300 Subject: [PATCH 6/7] Add modules.abc task ti gitlab ci --- arkoala-arkts/.gitlab-ci.yml | 18 ++++++++++++++++++ arkoala-arkts/package.json | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index e15895de9..cfe2c27c3 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/package.json b/arkoala-arkts/package.json index 2760ea0cf..587fc549f 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -131,8 +131,8 @@ "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 ./modules/global.resource/build/src/resource.abc", - "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 modules && npm run link" + "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" } } -- Gitee From 16bf3b621ff5da771cf8aecd718852575579a0bb Mon Sep 17 00:00:00 2001 From: yalixie Date: Wed, 6 Aug 2025 13:38:26 +0300 Subject: [PATCH 7/7] Add global.resource to ets-tests golden-test-ui2abcconfig --- ets-tests/golden-test-ui2abcconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ets-tests/golden-test-ui2abcconfig.json b/ets-tests/golden-test-ui2abcconfig.json index ea2481f1e..94e58d885 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"], -- Gitee