From 875bc233043498a9e91c558b69e088c46630de09 Mon Sep 17 00:00:00 2001 From: ding_chengjie Date: Wed, 2 Nov 2022 20:02:14 +0800 Subject: [PATCH 1/2] add NOTICE & delete keyword ets,update version Signed-off-by: ding_chengjie --- CHANGELOG.md | 5 ++++ NOTICE | 26 +++++++++++++++++++ README.md | 16 ++++++------ build-profile.json5 | 4 +-- entry/package.json | 26 +++++++++---------- .../main/ets/pages/index_adapter_animator.ets | 4 +-- .../main/ets/pages/index_item_animator.ets | 4 +-- entry/src/main/module.json5 | 1 - entry/src/ohosTest/module.json5 | 1 - package.json | 6 ++--- .../.gitignore | 0 .../build-profile.json5 | 0 .../hvigorfile.js | 0 .../index.ets | 0 recyclerview_animators/package.json | 23 ++++++++++++++++ .../src/main/ets/components/RecyclerView.ets | 0 .../AlphaInAnimationAdapter.ets | 2 +- .../ScaleInAnimationAdapter.ets | 2 +- .../SlideInBottomAnimationAdapter.ets | 2 +- .../SlideInLeftAnimationAdapter.ets | 2 +- .../SlideInRightAnimationAdapter.ets | 2 +- .../itemAnimator/FadeInAnimator.ets | 2 +- .../itemAnimator/FadeInDownAnimator.ets | 2 +- .../itemAnimator/FadeInLeftAnimator.ets | 2 +- .../itemAnimator/FadeInRightAnimator.ets | 2 +- .../itemAnimator/FadeInUpAnimator.ets | 2 +- .../itemAnimator/LandingAnimator.ets | 2 +- .../itemAnimator/OvershootInLeftAnimator.ets | 2 +- .../itemAnimator/OvershootInRightAnimator.ets | 2 +- .../itemAnimator/ScaleInAnimator.ets | 2 +- .../itemAnimator/ScaleInBottomAnimator.ets | 2 +- .../itemAnimator/ScaleInLeftAnimator.ets | 2 +- .../itemAnimator/ScaleInRightAnimator.ets | 2 +- .../itemAnimator/ScaleInTopAnimator.ets | 2 +- .../itemAnimator/SlideInDownAnimator.ets | 2 +- .../itemAnimator/SlideInLeftAnimator.ets | 2 +- .../itemAnimator/SlideInRightAnimator.ets | 2 +- .../itemAnimator/SlideInUpAnimator.ets | 2 +- .../src/main/module.json5 | 5 ++-- .../main/resources/base/element/string.json | 0 recyclerview_animators_ets/package.json | 23 ---------------- 41 files changed, 108 insertions(+), 80 deletions(-) create mode 100644 NOTICE rename {recyclerview_animators_ets => recyclerview_animators}/.gitignore (100%) rename {recyclerview_animators_ets => recyclerview_animators}/build-profile.json5 (100%) rename {recyclerview_animators_ets => recyclerview_animators}/hvigorfile.js (100%) rename {recyclerview_animators_ets => recyclerview_animators}/index.ets (100%) create mode 100644 recyclerview_animators/package.json rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/RecyclerView.ets (100%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/adapterAnimator/AlphaInAnimationAdapter.ets (98%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/adapterAnimator/ScaleInAnimationAdapter.ets (98%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/adapterAnimator/SlideInBottomAnimationAdapter.ets (98%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/adapterAnimator/SlideInLeftAnimationAdapter.ets (98%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/adapterAnimator/SlideInRightAnimationAdapter.ets (98%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/FadeInAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/FadeInDownAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/FadeInLeftAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/FadeInRightAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/FadeInUpAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/LandingAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/OvershootInLeftAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/OvershootInRightAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/ScaleInAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/ScaleInBottomAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/ScaleInLeftAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/ScaleInRightAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/ScaleInTopAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/SlideInDownAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/SlideInLeftAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/SlideInRightAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/ets/components/itemAnimator/SlideInUpAnimator.ets (99%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/module.json5 (60%) rename {recyclerview_animators_ets => recyclerview_animators}/src/main/resources/base/element/string.json (100%) delete mode 100644 recyclerview_animators_ets/package.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 836cbcd..f4c5d45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## v1.1.3 + +1. 名称由recyclerview-animators-ets修改recyclerview-animators。 +2. 旧的包@ohos/recyclerview-animators-ets已不维护，请使用新包@ohos/recyclerview-animators + ## v1.0.2 - api8升级到api9 diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..7b2c55c --- /dev/null +++ b/NOTICE @@ -0,0 +1,26 @@ +OPEN SOURCE SOFTWARE NOTICE + +Please note we provide an open source software notice for the third party open source software along with this software and/or this software component (in the following just “this SOFTWARE”). The open source software licenses are granted by the respective right holders. + +Warranty Disclaimer +THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. + +Copyright Notice and License Texts + +---------------------------------------------------------------------- +Software: RecyclerView Animators 4.0.2 + +Copyright notice: +Copyright 2020 Daichi Furiya / Wasabeef + +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. \ No newline at end of file diff --git a/README.md b/README.md index f9441da..f06c293 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# recyclerview_animators_ets +# recyclerview_animators ## 简介 > 带有添加删除动画效果以及整体动画效果的list组件库 @@ -7,7 +7,7 @@ ## 下载安装 ```shell -npm install @ohos/recyclerview-animators-ets --save +npm install @ohos/recyclerview-animators --save ``` OpenHarmony npm环境配置等更多内容，请参考 [如何安装OpenHarmony npm包](https://gitee.com/openharmony-tpc/docs/blob/master/OpenHarmony_npm_usage.md) 。 @@ -15,7 +15,7 @@ OpenHarmony npm环境配置等更多内容，请参考 [如何安装OpenHarmony 1. 引入组件库 ``` -import { RecyclerView } from "@ohos/recyclerview-animators-ets" +import { RecyclerView } from "@ohos/recyclerview-animators" ``` 2. 在代码中使用 @@ -23,7 +23,7 @@ import { RecyclerView } from "@ohos/recyclerview-animators-ets" @State controller: RecyclerView.Controller = new RecyclerView.Controller() private listDatas = ["A","B","C"] -private aboutToAppear() { +aboutToAppear() { this.controller.setAdapterAnimation(RecyclerView.AdapterAnimationType.AlphaIn) // 设置列表整体效果类型 this.controller.setFirstOnly(false) // 设置是否在item重复出现时显示动画效果 this.controller.setDuration(500) // 设置动画时长 @@ -68,9 +68,9 @@ build() { ## 目录结构 ```` -|---- recyclerview_animators_ets +|---- recyclerview_animators | |---- entry # 示例代码文件夹 -| |---- recyclerview_animators_ets # 库文件夹 +| |---- recyclerview_animators # 库文件夹 | |----src |----main |----ets @@ -83,7 +83,7 @@ build() { ```` ## 贡献代码 -使用过程中发现任何问题都可以提 [Issue](https://gitee.com/openharmony-sig/recyclerview-animators-ets/issues) 给我们，当然，我们也非常欢迎你给我们发 [PR](https://gitee.com/openharmony-sig/recyclerview-animators-ets/pulls) 。 +使用过程中发现任何问题都可以提 [Issue](https://gitee.com/openharmony-sig/recyclerview-animators/issues) 给我们，当然，我们也非常欢迎你给我们发 [PR](https://gitee.com/openharmony-sig/recyclerview-animators/pulls) 。 ## 开源协议 -本项目基于 [Apache License 2.0](https://gitee.com/openharmony-sig/recyclerview-animators-ets/blob/master/LICENSE) ，请自由地享受和参与开源。 +本项目基于 [Apache License 2.0](https://gitee.com/openharmony-sig/recyclerview-animators/blob/master/LICENSE) ，请自由地享受和参与开源。 diff --git a/build-profile.json5 b/build-profile.json5 index 523ffea..bb53cf8 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -26,8 +26,8 @@ ] }, { - "name": "recyclerview_animators_ets", - "srcPath": "./recyclerview_animators_ets" + "name": "recyclerview_animators", + "srcPath": "./recyclerview_animators" } ] } \ No newline at end of file diff --git a/entry/package.json b/entry/package.json index ec944c8..a13a080 100644 --- a/entry/package.json +++ b/entry/package.json @@ -1,16 +1,16 @@ { - "license": "Apache-2.0", - "devDependencies": {}, - "name": "entry", - "ohos": { - "org": "huawei", - "directoryLevel": "module", - "buildTool": "hvigor" + "license":"Apache-2.0", + "devDependencies":{}, + "name":"entry", + "ohos":{ + "org":"huawei", + "directoryLevel":"module", + "buildTool":"hvigor" }, - "description": "example description", - "repository": {}, - "version": "1.0.2", - "dependencies": { - "@ohos/recyclerview-animators-ets": "file:../recyclerview_animators_ets" + "description":"example description", + "repository":{}, + "version":"1.1.3", + "dependencies":{ + "@ohos/recyclerview-animators":"file:../recyclerview_animators" } -} +} \ No newline at end of file diff --git a/entry/src/main/ets/pages/index_adapter_animator.ets b/entry/src/main/ets/pages/index_adapter_animator.ets index 7615491..e66d21d 100644 --- a/entry/src/main/ets/pages/index_adapter_animator.ets +++ b/entry/src/main/ets/pages/index_adapter_animator.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import { RecyclerView } from "@ohos/recyclerview-animators-ets" +import { RecyclerView } from "@ohos/recyclerview-animators" @Entry @Component @@ -35,7 +35,7 @@ struct Index_adapter_animator { @State controller: RecyclerView.Controller = new RecyclerView.Controller() @State selectIndex: number = 0 - private aboutToAppear() { + aboutToAppear() { this.controller.setAdapterAnimation(RecyclerView.AdapterAnimationType.AlphaIn) this.controller.setFirstOnly(false) this.controller.setDuration(500) diff --git a/entry/src/main/ets/pages/index_item_animator.ets b/entry/src/main/ets/pages/index_item_animator.ets index 0468ceb..676c261 100644 --- a/entry/src/main/ets/pages/index_item_animator.ets +++ b/entry/src/main/ets/pages/index_item_animator.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import { RecyclerView } from "@ohos/recyclerview-animators-ets" +import { RecyclerView } from "@ohos/recyclerview-animators" import router from '@system.router'; @Entry @@ -47,7 +47,7 @@ struct Index_item_animator { @State controller: RecyclerView.Controller = new RecyclerView.Controller() @State selectIndex: number = 0 - private aboutToAppear() { + aboutToAppear() { this.controller.setItemAnimation(RecyclerView.ItemAnimationType.FadeIn) this.controller.setDuration(500) } diff --git a/entry/src/main/module.json5 b/entry/src/main/module.json5 index 953e471..35faec6 100644 --- a/entry/src/main/module.json5 +++ b/entry/src/main/module.json5 @@ -12,7 +12,6 @@ "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", - "uiSyntax": "ets", "abilities": [ { "name": "MainAbility", diff --git a/entry/src/ohosTest/module.json5 b/entry/src/ohosTest/module.json5 index 4cf8a1f..d4d6e20 100644 --- a/entry/src/ohosTest/module.json5 +++ b/entry/src/ohosTest/module.json5 @@ -12,7 +12,6 @@ "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:test_pages", - "uiSyntax": "ets", "abilities": [ { "name": "TestAbility", diff --git a/package.json b/package.json index bd069b9..9638e9f 100644 --- a/package.json +++ b/package.json @@ -9,11 +9,11 @@ }, "description": "example description", "repository": {}, - "version": "1.0.2", + "version": "1.1.3", "dependencies": { + "@ohos/hypium": "1.0.1", "@ohos/hvigor-ohos-plugin": "1.1.6", "hypium": "^1.0.0", - "@ohos/hvigor": "1.1.6", - "@ohos/hypium": "1.0.1" + "@ohos/hvigor": "1.1.6" } } diff --git a/recyclerview_animators_ets/.gitignore b/recyclerview_animators/.gitignore similarity index 100% rename from recyclerview_animators_ets/.gitignore rename to recyclerview_animators/.gitignore diff --git a/recyclerview_animators_ets/build-profile.json5 b/recyclerview_animators/build-profile.json5 similarity index 100% rename from recyclerview_animators_ets/build-profile.json5 rename to recyclerview_animators/build-profile.json5 diff --git a/recyclerview_animators_ets/hvigorfile.js b/recyclerview_animators/hvigorfile.js similarity index 100% rename from recyclerview_animators_ets/hvigorfile.js rename to recyclerview_animators/hvigorfile.js diff --git a/recyclerview_animators_ets/index.ets b/recyclerview_animators/index.ets similarity index 100% rename from recyclerview_animators_ets/index.ets rename to recyclerview_animators/index.ets diff --git a/recyclerview_animators/package.json b/recyclerview_animators/package.json new file mode 100644 index 0000000..9ea34bd --- /dev/null +++ b/recyclerview_animators/package.json @@ -0,0 +1,23 @@ +{ + "types":"", + "keywords":[ + "UI", + "Animation" + ], + "author":"hihope", + "description":"RecyclerView Animators is an Ohos library that allows developers to easily create RecyclerView with animations.", + "ohos":{ + "org":"opensource" + }, + "main":"index.ets", + "repository":"https://gitee.com/openharmony-sig/recyclerview-animators", + "version":"1.1.3", + "tags":[ + "UI", + "Animation" + ], + "dependencies":{}, + "license":"Apache-2.0", + "devDependencies":{}, + "name":"@ohos/recyclerview-animators" +} \ No newline at end of file diff --git a/recyclerview_animators_ets/src/main/ets/components/RecyclerView.ets b/recyclerview_animators/src/main/ets/components/RecyclerView.ets similarity index 100% rename from recyclerview_animators_ets/src/main/ets/components/RecyclerView.ets rename to recyclerview_animators/src/main/ets/components/RecyclerView.ets diff --git a/recyclerview_animators_ets/src/main/ets/components/adapterAnimator/AlphaInAnimationAdapter.ets b/recyclerview_animators/src/main/ets/components/adapterAnimator/AlphaInAnimationAdapter.ets similarity index 98% rename from recyclerview_animators_ets/src/main/ets/components/adapterAnimator/AlphaInAnimationAdapter.ets rename to recyclerview_animators/src/main/ets/components/adapterAnimator/AlphaInAnimationAdapter.ets index b378c56..40fe0e1 100644 --- a/recyclerview_animators_ets/src/main/ets/components/adapterAnimator/AlphaInAnimationAdapter.ets +++ b/recyclerview_animators/src/main/ets/components/adapterAnimator/AlphaInAnimationAdapter.ets @@ -25,7 +25,7 @@ export struct AlphaInAnimationAdapter { @State private start: number = 0 @State private end: number = 0 - private aboutToAppear() { + aboutToAppear() { this.array.forEach(item => { let temp = { alpha: 0, diff --git a/recyclerview_animators_ets/src/main/ets/components/adapterAnimator/ScaleInAnimationAdapter.ets b/recyclerview_animators/src/main/ets/components/adapterAnimator/ScaleInAnimationAdapter.ets similarity index 98% rename from recyclerview_animators_ets/src/main/ets/components/adapterAnimator/ScaleInAnimationAdapter.ets rename to recyclerview_animators/src/main/ets/components/adapterAnimator/ScaleInAnimationAdapter.ets index 174e82d..4703abd 100644 --- a/recyclerview_animators_ets/src/main/ets/components/adapterAnimator/ScaleInAnimationAdapter.ets +++ b/recyclerview_animators/src/main/ets/components/adapterAnimator/ScaleInAnimationAdapter.ets @@ -25,7 +25,7 @@ export struct ScaleInAnimationAdapter { @State private start: number = 0 @State private end: number = 0 - private aboutToAppear() { + aboutToAppear() { this.array.forEach(item => { let temp = { landing: 0, diff --git a/recyclerview_animators_ets/src/main/ets/components/adapterAnimator/SlideInBottomAnimationAdapter.ets b/recyclerview_animators/src/main/ets/components/adapterAnimator/SlideInBottomAnimationAdapter.ets similarity index 98% rename from recyclerview_animators_ets/src/main/ets/components/adapterAnimator/SlideInBottomAnimationAdapter.ets rename to recyclerview_animators/src/main/ets/components/adapterAnimator/SlideInBottomAnimationAdapter.ets index abb12c1..8797b3b 100644 --- a/recyclerview_animators_ets/src/main/ets/components/adapterAnimator/SlideInBottomAnimationAdapter.ets +++ b/recyclerview_animators/src/main/ets/components/adapterAnimator/SlideInBottomAnimationAdapter.ets @@ -25,7 +25,7 @@ export struct SlideInBottomAnimationAdapter { @State private start: number = 0 @State private end: number = 0 - private aboutToAppear() { + aboutToAppear() { this.array.forEach(item => { let temp = { y: '100%', diff --git a/recyclerview_animators_ets/src/main/ets/components/adapterAnimator/SlideInLeftAnimationAdapter.ets b/recyclerview_animators/src/main/ets/components/adapterAnimator/SlideInLeftAnimationAdapter.ets similarity index 98% rename from recyclerview_animators_ets/src/main/ets/components/adapterAnimator/SlideInLeftAnimationAdapter.ets rename to recyclerview_animators/src/main/ets/components/adapterAnimator/SlideInLeftAnimationAdapter.ets index 90126f3..9be62e4 100644 --- a/recyclerview_animators_ets/src/main/ets/components/adapterAnimator/SlideInLeftAnimationAdapter.ets +++ b/recyclerview_animators/src/main/ets/components/adapterAnimator/SlideInLeftAnimationAdapter.ets @@ -25,7 +25,7 @@ export struct SlideInLeftAnimationAdapter { @State private start: number = 0 @State private end: number = 0 - private aboutToAppear() { + aboutToAppear() { this.array.forEach(item => { let temp = { x: '-100%', diff --git a/recyclerview_animators_ets/src/main/ets/components/adapterAnimator/SlideInRightAnimationAdapter.ets b/recyclerview_animators/src/main/ets/components/adapterAnimator/SlideInRightAnimationAdapter.ets similarity index 98% rename from recyclerview_animators_ets/src/main/ets/components/adapterAnimator/SlideInRightAnimationAdapter.ets rename to recyclerview_animators/src/main/ets/components/adapterAnimator/SlideInRightAnimationAdapter.ets index 62edf2b..eeeb208 100644 --- a/recyclerview_animators_ets/src/main/ets/components/adapterAnimator/SlideInRightAnimationAdapter.ets +++ b/recyclerview_animators/src/main/ets/components/adapterAnimator/SlideInRightAnimationAdapter.ets @@ -25,7 +25,7 @@ export struct SlideInRightAnimationAdapter { @State private start: number = 0 @State private end: number = 0 - private aboutToAppear() { + aboutToAppear() { this.array.forEach(item => { let temp = { x: '100%', diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/FadeInAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/FadeInAnimator.ets index 01f5667..7796c9f 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/FadeInAnimator.ets @@ -28,7 +28,7 @@ export struct FadeInAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInDownAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/FadeInDownAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInDownAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/FadeInDownAnimator.ets index c51f4d2..5d74d63 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInDownAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/FadeInDownAnimator.ets @@ -29,7 +29,7 @@ export struct FadeInDownAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInLeftAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/FadeInLeftAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInLeftAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/FadeInLeftAnimator.ets index 640a108..b051613 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInLeftAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/FadeInLeftAnimator.ets @@ -29,7 +29,7 @@ export struct FadeInLeftAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInRightAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/FadeInRightAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInRightAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/FadeInRightAnimator.ets index b213b57..12f6221 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInRightAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/FadeInRightAnimator.ets @@ -29,7 +29,7 @@ export struct FadeInRightAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInUpAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/FadeInUpAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInUpAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/FadeInUpAnimator.ets index 40e3cef..b800b0f 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/FadeInUpAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/FadeInUpAnimator.ets @@ -29,7 +29,7 @@ export struct FadeInUpAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/LandingAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/LandingAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/LandingAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/LandingAnimator.ets index d11a6a4..6f2f8cb 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/LandingAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/LandingAnimator.ets @@ -29,7 +29,7 @@ export struct LandingAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/OvershootInLeftAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/OvershootInLeftAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/OvershootInLeftAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/OvershootInLeftAnimator.ets index 6249b00..13a26bd 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/OvershootInLeftAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/OvershootInLeftAnimator.ets @@ -30,7 +30,7 @@ export struct OvershootInLeftAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/OvershootInRightAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/OvershootInRightAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/OvershootInRightAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/OvershootInRightAnimator.ets index c9b8d8c..bb48bf9 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/OvershootInRightAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/OvershootInRightAnimator.ets @@ -30,7 +30,7 @@ export struct OvershootInRightAnimator { @State private x: string = '0%' @State private y: string = '0%' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInAnimator.ets index 43d70de..0f9696b 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInAnimator.ets @@ -29,7 +29,7 @@ export struct ScaleInAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInBottomAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInBottomAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInBottomAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInBottomAnimator.ets index ed14ffb..67088e0 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInBottomAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInBottomAnimator.ets @@ -29,7 +29,7 @@ export struct ScaleInBottomAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInLeftAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInLeftAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInLeftAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInLeftAnimator.ets index 992caae..54c4285 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInLeftAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInLeftAnimator.ets @@ -29,7 +29,7 @@ export struct ScaleInLeftAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInRightAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInRightAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInRightAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInRightAnimator.ets index 7a8d6ae..cff9d0b 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInRightAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInRightAnimator.ets @@ -29,7 +29,7 @@ export struct ScaleInRightAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInTopAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInTopAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInTopAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInTopAnimator.ets index 79a3c45..91f3bba 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/ScaleInTopAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/ScaleInTopAnimator.ets @@ -29,7 +29,7 @@ export struct ScaleInTopAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/SlideInDownAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/SlideInDownAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/SlideInDownAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/SlideInDownAnimator.ets index 6b4ced4..0adb319 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/SlideInDownAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/SlideInDownAnimator.ets @@ -30,7 +30,7 @@ export struct SlideInDownAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/SlideInLeftAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/SlideInLeftAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/SlideInLeftAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/SlideInLeftAnimator.ets index 1c70d79..d83ed0d 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/SlideInLeftAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/SlideInLeftAnimator.ets @@ -30,7 +30,7 @@ export struct SlideInLeftAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/SlideInRightAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/SlideInRightAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/SlideInRightAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/SlideInRightAnimator.ets index e32f08f..f63a98c 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/SlideInRightAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/SlideInRightAnimator.ets @@ -30,7 +30,7 @@ export struct SlideInRightAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/SlideInUpAnimator.ets b/recyclerview_animators/src/main/ets/components/itemAnimator/SlideInUpAnimator.ets similarity index 99% rename from recyclerview_animators_ets/src/main/ets/components/itemAnimator/SlideInUpAnimator.ets rename to recyclerview_animators/src/main/ets/components/itemAnimator/SlideInUpAnimator.ets index 3131106..665aa76 100644 --- a/recyclerview_animators_ets/src/main/ets/components/itemAnimator/SlideInUpAnimator.ets +++ b/recyclerview_animators/src/main/ets/components/itemAnimator/SlideInUpAnimator.ets @@ -30,7 +30,7 @@ export struct SlideInUpAnimator { columnsNum: number = 1 private colNumStr: string = '' - private aboutToAppear() { + aboutToAppear() { this.controller.addValueCallback = this.addValue.bind(this) this.controller.deleteValueCallback = this.deleteValue.bind(this) diff --git a/recyclerview_animators_ets/src/main/module.json5 b/recyclerview_animators/src/main/module.json5 similarity index 60% rename from recyclerview_animators_ets/src/main/module.json5 rename to recyclerview_animators/src/main/module.json5 index a06f87e..b5092a7 100644 --- a/recyclerview_animators_ets/src/main/module.json5 +++ b/recyclerview_animators/src/main/module.json5 @@ -1,11 +1,10 @@ { "module": { - "name": "recyclerview_animators_ets", + "name": "recyclerview_animators", "type": "har", "deviceTypes": [ "default", "tablet" ], - "uiSyntax": "ets" } -} +} \ No newline at end of file diff --git a/recyclerview_animators_ets/src/main/resources/base/element/string.json b/recyclerview_animators/src/main/resources/base/element/string.json similarity index 100% rename from recyclerview_animators_ets/src/main/resources/base/element/string.json rename to recyclerview_animators/src/main/resources/base/element/string.json diff --git a/recyclerview_animators_ets/package.json b/recyclerview_animators_ets/package.json deleted file mode 100644 index 5b61278..0000000 --- a/recyclerview_animators_ets/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "types": "", - "keywords": [ - "Recyclerview", - "OpenHarmony" - ], - "author": "hihope", - "description": "RecyclerView Animators is an Ohos library that allows developers to easily create RecyclerView with animations.", - "ohos": { - "org": "opensource" - }, - "main": "index.ets", - "repository": "https://gitee.com/openharmony-sig/recyclerview-animators-ets", - "version": "1.0.2", - "tags": [ - "Recyclerview", - "OpenHarmony" - ], - "dependencies": {}, - "license": "Apache-2.0", - "devDependencies": {}, - "name": "@ohos/recyclerview-animators-ets" -} -- Gitee From b99dbd2982ef7177f17dda6a3a4bc9f85f2ae8f1 Mon Sep 17 00:00:00 2001 From: ding_chengjie Date: Thu, 3 Nov 2022 11:20:44 +0800 Subject: [PATCH 2/2] modify version Signed-off-by: ding_chengjie --- AppScope/app.json5 | 2 +- CHANGELOG.md | 2 +- entry/package.json | 2 +- package.json | 2 +- recyclerview_animators/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/AppScope/app.json5 b/AppScope/app.json5 index 1da7825..31e70b7 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -3,7 +3,7 @@ "bundleName": "jp.wasabeef.example.recyclerview", "vendor": "example", "versionCode": 1000000, - "versionName": "1.0.2", + "versionName": "1.1.0", "icon": "$media:app_icon", "label": "$string:app_name", "distributedNotificationEnabled": true diff --git a/CHANGELOG.md b/CHANGELOG.md index f4c5d45..6b20ce5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## v1.1.3 +## v1.1.0 1. 名称由recyclerview-animators-ets修改recyclerview-animators。 2. 旧的包@ohos/recyclerview-animators-ets已不维护，请使用新包@ohos/recyclerview-animators diff --git a/entry/package.json b/entry/package.json index a13a080..36bca6f 100644 --- a/entry/package.json +++ b/entry/package.json @@ -9,7 +9,7 @@ }, "description":"example description", "repository":{}, - "version":"1.1.3", + "version":"1.1.0", "dependencies":{ "@ohos/recyclerview-animators":"file:../recyclerview_animators" } diff --git a/package.json b/package.json index 9638e9f..537cde7 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "description": "example description", "repository": {}, - "version": "1.1.3", + "version": "1.1.0", "dependencies": { "@ohos/hypium": "1.0.1", "@ohos/hvigor-ohos-plugin": "1.1.6", diff --git a/recyclerview_animators/package.json b/recyclerview_animators/package.json index 9ea34bd..4b9f44d 100644 --- a/recyclerview_animators/package.json +++ b/recyclerview_animators/package.json @@ -11,7 +11,7 @@ }, "main":"index.ets", "repository":"https://gitee.com/openharmony-sig/recyclerview-animators", - "version":"1.1.3", + "version":"1.1.0", "tags":[ "UI", "Animation" -- Gitee