From 69475c72f292e47bd9322b683132c0436bfd1376 Mon Sep 17 00:00:00 2001 From: dhf <1511447814@qq.com> Date: Sat, 14 Sep 2024 15:17:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-profile.json5 | 4 ++- .../merge_profile/default/module.json | 25 +++++++++++++++++++ .../src/main/ets/views/AlbumView.ets | 2 +- .../base/media/ic_public_back_black.svg | 18 +++++++++++++ .../resources/base/media/ic_public_back.svg | 8 +++--- .../pictureView/src/main/ets/view/TopBar.ets | 2 +- .../base/media/ic_public_back_black.svg | 18 +++++++++++++ 7 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 commons/base/build/default/intermediates/merge_profile/default/module.json create mode 100644 features/albumView/src/main/resources/base/media/ic_public_back_black.svg create mode 100644 features/pictureView/src/main/resources/base/media/ic_public_back_black.svg diff --git a/build-profile.json5 b/build-profile.json5 index 043a19e..91f981f 100755 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -1,6 +1,8 @@ { "app": { - "signingConfigs": [], + "signingConfigs": [ + + ], "products": [ { "name": "default", diff --git a/commons/base/build/default/intermediates/merge_profile/default/module.json b/commons/base/build/default/intermediates/merge_profile/default/module.json new file mode 100644 index 0000000..d7577b4 --- /dev/null +++ b/commons/base/build/default/intermediates/merge_profile/default/module.json @@ -0,0 +1,25 @@ +{ + "app": { + "bundleName": "com.example.multipicturebeautification", + "debug": true, + "versionCode": 1000000, + "versionName": "1.0.0", + "minAPIVersion": 50000012, + "targetAPIVersion": 50000012, + "apiReleaseType": "Beta3", + "compileSdkVersion": "5.0.0.36", + "compileSdkType": "HarmonyOS", + "appEnvironments": [], + "bundleType": "app" + }, + "module": { + "name": "base", + "type": "har", + "deviceTypes": [ + "phone", + "tablet", + "2in1" + ], + "installationFree": false + } +} diff --git a/features/albumView/src/main/ets/views/AlbumView.ets b/features/albumView/src/main/ets/views/AlbumView.ets index 96a5667..2b94ec9 100644 --- a/features/albumView/src/main/ets/views/AlbumView.ets +++ b/features/albumView/src/main/ets/views/AlbumView.ets @@ -98,7 +98,7 @@ export struct AlbumView { Column() { Row() { Button({ type: ButtonType.Circle, stateEffect: false }) { - Image($r('app.media.ic_public_back')) + Image($r('app.media.ic_public_back_black')) .width(BaseConstants.DEFAULT_ICON_SIZE) .height(BaseConstants.DEFAULT_ICON_SIZE) .onClick(() => { diff --git a/features/albumView/src/main/resources/base/media/ic_public_back_black.svg b/features/albumView/src/main/resources/base/media/ic_public_back_black.svg new file mode 100644 index 0000000..66e3df1 --- /dev/null +++ b/features/albumView/src/main/resources/base/media/ic_public_back_black.svg @@ -0,0 +1,18 @@ + + + Public/ic_public_back + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/features/pictureEdit/src/main/resources/base/media/ic_public_back.svg b/features/pictureEdit/src/main/resources/base/media/ic_public_back.svg index f1ca47c..ea61597 100755 --- a/features/pictureEdit/src/main/resources/base/media/ic_public_back.svg +++ b/features/pictureEdit/src/main/resources/base/media/ic_public_back.svg @@ -6,11 +6,13 @@ - + - - + + + + \ No newline at end of file diff --git a/features/pictureView/src/main/ets/view/TopBar.ets b/features/pictureView/src/main/ets/view/TopBar.ets index 6c11666..3588b29 100755 --- a/features/pictureView/src/main/ets/view/TopBar.ets +++ b/features/pictureView/src/main/ets/view/TopBar.ets @@ -37,7 +37,7 @@ export struct TopBar { alignItems: ItemAlign.Stretch }) { Row() { - Image($r('app.media.ic_public_back')) + Image($r('app.media.ic_public_back_black')) .height(BaseConstants.DEFAULT_ICON_SIZE) .width(BaseConstants.DEFAULT_ICON_SIZE) .margin({ right: $r('app.float.back_image_right') }) diff --git a/features/pictureView/src/main/resources/base/media/ic_public_back_black.svg b/features/pictureView/src/main/resources/base/media/ic_public_back_black.svg new file mode 100644 index 0000000..66e3df1 --- /dev/null +++ b/features/pictureView/src/main/resources/base/media/ic_public_back_black.svg @@ -0,0 +1,18 @@ + + + Public/ic_public_back + + + + + + + + + + + + + + + \ No newline at end of file -- Gitee From 1e42ebc6ff48a009d3799f7ffab05bf36fbb6107 Mon Sep 17 00:00:00 2001 From: dhf <1511447814@qq.com> Date: Sat, 14 Sep 2024 15:38:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?build=E6=96=87=E4=BB=B6=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../merge_profile/default/module.json | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 commons/base/build/default/intermediates/merge_profile/default/module.json diff --git a/commons/base/build/default/intermediates/merge_profile/default/module.json b/commons/base/build/default/intermediates/merge_profile/default/module.json deleted file mode 100644 index d7577b4..0000000 --- a/commons/base/build/default/intermediates/merge_profile/default/module.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "app": { - "bundleName": "com.example.multipicturebeautification", - "debug": true, - "versionCode": 1000000, - "versionName": "1.0.0", - "minAPIVersion": 50000012, - "targetAPIVersion": 50000012, - "apiReleaseType": "Beta3", - "compileSdkVersion": "5.0.0.36", - "compileSdkType": "HarmonyOS", - "appEnvironments": [], - "bundleType": "app" - }, - "module": { - "name": "base", - "type": "har", - "deviceTypes": [ - "phone", - "tablet", - "2in1" - ], - "installationFree": false - } -} -- Gitee