diff --git a/README.md b/README.md index b07b02a554bfc83bfed9aad86a63b80d93b226dc..f6b0512f7b5037642852486f951e4588741ed596 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,13 @@ We provide a series of app samples to help you quickly get familiar with the API - ETSUI - [`eTSBuildCommonView:`Building a Common View (eTS)](https://gitee.com/harmonyos/harmonyos_app_samples/tree/master/ETSUI/eTSBuildCommonView) - [`eTSDefiningPageLayoutAndConnection:`Defining Page Layout and Connection (eTS)](https://gitee.com/harmonyos/harmonyos_app_samples/tree/master/ETSUI/eTSDefiningPageLayoutAndConnection) +<<<<<<< HEAD + - [`eTSDrawingAndAnimation:`Drawing and Animation (eTS)](https://gitee.com/harmonyos/harmonyos_app_samples/tree/master/ETSUI/eTSDrawingAndAnimation) + - [`ColorFilterSample:`Setting picture color (ArkTS)](https://gitee.com/hundred_miles_long_sky/samples/tree/master/ETSUI/ColorFilterSample) +======= - [`eTSDrawingAndAnimation:`Drawing and Animation (eTS)](https://gitee.com/harmonyos/harmonyos_app_samples/tree/master/ETSUI/eTSDrawingAndAnimation) - [`BorderImageSample:`Component Image Dynamic Border (ArkTS)](https://gitee.com/harmonyos/samples/tree/master/ETSUI/BorderImageSample) +>>>>>>> 16f351c182d33f86a9fe3da359b4968be796bc96 - JAVAUI - [`Animation:`Animation (Java)](https://gitee.com/harmonyos/harmonyos_app_samples/tree/master/JAVAUI/Animation) - [`CommonLayout:`Common Layouts (Java)](https://gitee.com/harmonyos/harmonyos_app_samples/tree/master/JAVAUI/CommonLayout) diff --git a/README_zh.md b/README_zh.md index 20d2ebb9988fb032c596ed8d6dcbff47cf1053d3..836f01907e3f670049ff0c1bfca000ae440efedd 100644 --- a/README_zh.md +++ b/README_zh.md @@ -21,9 +21,10 @@ - [`TicTacToeGame:`井字过三关(Java)(API5)](CompleteApps/TicTacToeGame) - ETSUI - [`eTSBuildCommonView:`创建简单视图(ArkTS)(API7)](ETSUI/eTSBuildCommonView) - - [`eTSDefiningPageLayoutAndConnection:`页面布局和连接(ArkTS)(API7)](ETSUI/eTSDefiningPageLayoutAndConnection) - - [`eTSDrawingAndAnimation:`绘图和动画(ArkTS)(API7)](ETSUI/eTSDrawingAndAnimation) + - [`eTSDefiningPageLayoutAndConnection:`页面布局和连接(ArkTS)(API7)](ETSUI/eTSDefiningPageLayoutAndConnection) + - [`eTSDrawingAndAnimation:`绘图和动画(ArkTS)(API7)](ETSUI/eTSDrawingAndAnimation) - [`BorderImageSample:`组件图片动态边框 (ArkTS)(API9)](ETSUI/BorderImageSample) + - [`ColorFilterSample:`设置图片颜色(ArkTS)(API9)](ETSUI/ColorFilterSample) - JAVAUI - [`Animation:`动画(Java)(API)(API5)](JAVAUI/Animation) - [`CommonLayout:`常用布局(Java)(API5)](JAVAUI/CommonLayout)