diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..0210352ae2ade0dd7b4c841cb6e8ba08b4780038 --- /dev/null +++ b/LICENSE @@ -0,0 +1,78 @@ + Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved. + + 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. + +Apache License, Version 2.0 +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: +1.You must give any other recipients of the Work or Derivative Works a copy of this License; and +2.You must cause any modified files to carry prominent notices stating that You changed the files; and +3.You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and +4.If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/features/pictureEdit/src/main/resources/base/media/ic_public_back.svg b/commons/base/src/main/resources/base/media/ic_public_back.svg old mode 100755 new mode 100644 similarity index 98% rename from features/pictureEdit/src/main/resources/base/media/ic_public_back.svg rename to commons/base/src/main/resources/base/media/ic_public_back.svg index ea61597d92453dbdcc0e7bbe5407036b123dd4b3..8135b60df3db143f028f0b3de26061b0aa17d99a --- a/features/pictureEdit/src/main/resources/base/media/ic_public_back.svg +++ b/commons/base/src/main/resources/base/media/ic_public_back.svg @@ -1,18 +1,18 @@ - - - Public/ic_public_back - - - - - - - - - - - - - - + + + Public/ic_public_back + + + + + + + + + + + + + + \ No newline at end of file diff --git a/features/albumView/src/main/resources/base/media/ic_public_back_black.svg b/commons/base/src/main/resources/base/media/ic_public_back_black.svg similarity index 100% rename from features/albumView/src/main/resources/base/media/ic_public_back_black.svg rename to commons/base/src/main/resources/base/media/ic_public_back_black.svg diff --git a/commons/base/src/main/resources/base/media/icon.png b/commons/base/src/main/resources/base/media/icon.png deleted file mode 100755 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/commons/base/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/features/albumView/src/main/ets/constants/AlbumViewConstants.ets b/features/albumView/src/main/ets/constants/AlbumViewConstants.ets index 013cb445b3309f185407681548531eb4bf5cff74..c07a687d2b7a23cd4c60670f88edde9bff93eb9d 100755 --- a/features/albumView/src/main/ets/constants/AlbumViewConstants.ets +++ b/features/albumView/src/main/ets/constants/AlbumViewConstants.ets @@ -26,48 +26,48 @@ export class AlbumViewConstants { * Image list. */ static readonly IMAGE_LIST: ImageData[] = [ - { src: $r('app.media.photo1'), selected: false }, - { src: $r('app.media.photo2'), selected: false }, - { src: $r('app.media.photo3'), selected: false }, - { src: $r('app.media.photo4'), selected: false }, - { src: $r('app.media.photo5'), selected: false }, - { src: $r('app.media.photo6'), selected: false }, - { src: $r('app.media.photo7'), selected: false }, - { src: $r('app.media.photo1'), selected: false }, - { src: $r('app.media.photo2'), selected: false }, - { src: $r('app.media.photo3'), selected: false }, - { src: $r('app.media.photo4'), selected: false }, - { src: $r('app.media.photo5'), selected: false }, - { src: $r('app.media.photo6'), selected: false }, - { src: $r('app.media.photo7'), selected: false }, - { src: $r('app.media.photo1'), selected: false }, - { src: $r('app.media.photo2'), selected: false }, - { src: $r('app.media.photo3'), selected: false }, - { src: $r('app.media.photo4'), selected: false }, - { src: $r('app.media.photo5'), selected: false }, - { src: $r('app.media.photo6'), selected: false }, - { src: $r('app.media.photo7'), selected: false }, - { src: $r('app.media.photo1'), selected: false }, - { src: $r('app.media.photo2'), selected: false }, - { src: $r('app.media.photo3'), selected: false }, - { src: $r('app.media.photo4'), selected: false }, - { src: $r('app.media.photo5'), selected: false }, - { src: $r('app.media.photo6'), selected: false }, - { src: $r('app.media.photo7'), selected: false }, - { src: $r('app.media.photo1'), selected: false }, - { src: $r('app.media.photo2'), selected: false }, - { src: $r('app.media.photo3'), selected: false }, - { src: $r('app.media.photo4'), selected: false }, - { src: $r('app.media.photo5'), selected: false }, - { src: $r('app.media.photo6'), selected: false }, - { src: $r('app.media.photo7'), selected: false }, - { src: $r('app.media.photo1'), selected: false }, - { src: $r('app.media.photo2'), selected: false }, - { src: $r('app.media.photo3'), selected: false }, - { src: $r('app.media.photo4'), selected: false }, - { src: $r('app.media.photo5'), selected: false }, - { src: $r('app.media.photo6'), selected: false }, - { src: $r('app.media.photo7'), selected: false } + { src: $r("app.media.album_photo1"), selected: false }, + { src: $r("app.media.album_photo2"), selected: false }, + { src: $r("app.media.album_photo3"), selected: false }, + { src: $r("app.media.album_photo4"), selected: false }, + { src: $r("app.media.album_photo5"), selected: false }, + { src: $r("app.media.album_photo6"), selected: false }, + { src: $r("app.media.album_photo7"), selected: false }, + { src: $r("app.media.album_photo1"), selected: false }, + { src: $r("app.media.album_photo2"), selected: false }, + { src: $r("app.media.album_photo3"), selected: false }, + { src: $r("app.media.album_photo4"), selected: false }, + { src: $r("app.media.album_photo5"), selected: false }, + { src: $r("app.media.album_photo6"), selected: false }, + { src: $r("app.media.album_photo7"), selected: false }, + { src: $r("app.media.album_photo1"), selected: false }, + { src: $r("app.media.album_photo2"), selected: false }, + { src: $r("app.media.album_photo3"), selected: false }, + { src: $r("app.media.album_photo4"), selected: false }, + { src: $r("app.media.album_photo5"), selected: false }, + { src: $r("app.media.album_photo6"), selected: false }, + { src: $r("app.media.album_photo7"), selected: false }, + { src: $r("app.media.album_photo1"), selected: false }, + { src: $r("app.media.album_photo2"), selected: false }, + { src: $r("app.media.album_photo3"), selected: false }, + { src: $r("app.media.album_photo4"), selected: false }, + { src: $r("app.media.album_photo5"), selected: false }, + { src: $r("app.media.album_photo6"), selected: false }, + { src: $r("app.media.album_photo7"), selected: false }, + { src: $r("app.media.album_photo1"), selected: false }, + { src: $r("app.media.album_photo2"), selected: false }, + { src: $r("app.media.album_photo3"), selected: false }, + { src: $r("app.media.album_photo4"), selected: false }, + { src: $r("app.media.album_photo5"), selected: false }, + { src: $r("app.media.album_photo6"), selected: false }, + { src: $r("app.media.album_photo7"), selected: false }, + { src: $r("app.media.album_photo1"), selected: false }, + { src: $r("app.media.album_photo2"), selected: false }, + { src: $r("app.media.album_photo3"), selected: false }, + { src: $r("app.media.album_photo4"), selected: false }, + { src: $r("app.media.album_photo5"), selected: false }, + { src: $r("app.media.album_photo6"), selected: false }, + { src: $r("app.media.album_photo7"), selected: false } ]; /** * Default text. diff --git a/features/albumView/src/main/ets/views/AlbumView.ets b/features/albumView/src/main/ets/views/AlbumView.ets index 2b94ec9201d3878bd0f53e90ec02537c9a526cf0..30fd4eb7f940588c88ca194a442833fad707533c 100644 --- a/features/albumView/src/main/ets/views/AlbumView.ets +++ b/features/albumView/src/main/ets/views/AlbumView.ets @@ -20,7 +20,7 @@ import { deviceInfo } from '@kit.BasicServicesKit'; // Grid unit. const DEFAULT_GRID_TEMPLATE: string = '1fr'; -// Animate tiem. +// Animate Item. const ANIMATE_TIME: number = 100; // Max grid column. const MAX_GRID_COLUMN = 16; diff --git a/features/albumView/src/main/resources/base/media/photo1.jpg b/features/albumView/src/main/resources/base/media/album_photo1.jpg old mode 100755 new mode 100644 similarity index 100% rename from features/albumView/src/main/resources/base/media/photo1.jpg rename to features/albumView/src/main/resources/base/media/album_photo1.jpg diff --git a/features/albumView/src/main/resources/base/media/album_photo10.jpg b/features/albumView/src/main/resources/base/media/album_photo10.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5ed4902c874809a32adedc8f49de2381e16251a9 Binary files /dev/null and b/features/albumView/src/main/resources/base/media/album_photo10.jpg differ diff --git a/features/albumView/src/main/resources/base/media/photo2.jpg b/features/albumView/src/main/resources/base/media/album_photo2.jpg old mode 100755 new mode 100644 similarity index 100% rename from features/albumView/src/main/resources/base/media/photo2.jpg rename to features/albumView/src/main/resources/base/media/album_photo2.jpg diff --git a/features/albumView/src/main/resources/base/media/photo3.jpg b/features/albumView/src/main/resources/base/media/album_photo3.jpg old mode 100755 new mode 100644 similarity index 100% rename from features/albumView/src/main/resources/base/media/photo3.jpg rename to features/albumView/src/main/resources/base/media/album_photo3.jpg diff --git a/features/albumView/src/main/resources/base/media/photo4.jpg b/features/albumView/src/main/resources/base/media/album_photo4.jpg old mode 100755 new mode 100644 similarity index 100% rename from features/albumView/src/main/resources/base/media/photo4.jpg rename to features/albumView/src/main/resources/base/media/album_photo4.jpg diff --git a/features/albumView/src/main/resources/base/media/photo5.jpg b/features/albumView/src/main/resources/base/media/album_photo5.jpg old mode 100755 new mode 100644 similarity index 100% rename from features/albumView/src/main/resources/base/media/photo5.jpg rename to features/albumView/src/main/resources/base/media/album_photo5.jpg diff --git a/features/albumView/src/main/resources/base/media/photo6.jpg b/features/albumView/src/main/resources/base/media/album_photo6.jpg old mode 100755 new mode 100644 similarity index 100% rename from features/albumView/src/main/resources/base/media/photo6.jpg rename to features/albumView/src/main/resources/base/media/album_photo6.jpg diff --git a/features/albumView/src/main/resources/base/media/photo7.jpg b/features/albumView/src/main/resources/base/media/album_photo7.jpg old mode 100755 new mode 100644 similarity index 100% rename from features/albumView/src/main/resources/base/media/photo7.jpg rename to features/albumView/src/main/resources/base/media/album_photo7.jpg diff --git a/features/pictureView/src/main/resources/base/media/photo3.jpg b/features/albumView/src/main/resources/base/media/album_photo8.jpg old mode 100755 new mode 100644 similarity index 46% rename from features/pictureView/src/main/resources/base/media/photo3.jpg rename to features/albumView/src/main/resources/base/media/album_photo8.jpg index 926a77f6e6d96090d759f521ed352d6210c645d4..92562e9297c7bb2c702145630847f1d6c8474ad3 Binary files a/features/pictureView/src/main/resources/base/media/photo3.jpg and b/features/albumView/src/main/resources/base/media/album_photo8.jpg differ diff --git a/features/pictureView/src/main/resources/base/media/photo2.jpg b/features/albumView/src/main/resources/base/media/album_photo9.jpg old mode 100755 new mode 100644 similarity index 51% rename from features/pictureView/src/main/resources/base/media/photo2.jpg rename to features/albumView/src/main/resources/base/media/album_photo9.jpg index 7a3a7e45696d6f32f0818f0ce6e9252f77f463ee..90d2f285aefd4e72a9fc48b1ad3e2be968454905 Binary files a/features/pictureView/src/main/resources/base/media/photo2.jpg and b/features/albumView/src/main/resources/base/media/album_photo9.jpg differ diff --git a/features/albumView/src/main/resources/base/media/ic_public_back.svg b/features/albumView/src/main/resources/base/media/ic_public_back.svg deleted file mode 100755 index 466903b263bebc25ae9b2e40098b30b6c12f1653..0000000000000000000000000000000000000000 --- a/features/albumView/src/main/resources/base/media/ic_public_back.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - Public/ic_public_back - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/features/albumView/src/main/resources/base/media/ic_public_more.svg b/features/albumView/src/main/resources/base/media/ic_public_more.svg old mode 100755 new mode 100644 index 2c4f6192ffddb951114eddab041bb77ffd106094..2078baf063972687f6922a7f3368879eef0a0bbd --- a/features/albumView/src/main/resources/base/media/ic_public_more.svg +++ b/features/albumView/src/main/resources/base/media/ic_public_more.svg @@ -1,18 +1,18 @@ - - - Public/ic_public_more - - - - - - - - - - - - - - + + + Public/ic_public_more + + + + + + + + + + + + + + \ No newline at end of file diff --git a/features/albumView/src/main/resources/base/media/icon.png b/features/albumView/src/main/resources/base/media/icon.png deleted file mode 100755 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/features/albumView/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/features/albumView/src/main/resources/base/media/setting.jpeg b/features/albumView/src/main/resources/base/media/setting.jpeg deleted file mode 100755 index 57e67dd49d39ad64ef090f59db3db9dfe6632106..0000000000000000000000000000000000000000 Binary files a/features/albumView/src/main/resources/base/media/setting.jpeg and /dev/null differ diff --git a/features/albumView/src/main/resources/base/media/startIcon.png b/features/albumView/src/main/resources/base/media/startIcon.png deleted file mode 100755 index 366f76459ffd4494ec40d0ddd5c59385b9c5da11..0000000000000000000000000000000000000000 Binary files a/features/albumView/src/main/resources/base/media/startIcon.png and /dev/null differ diff --git a/features/pictureEdit/src/main/resources/base/media/icon.png b/features/pictureEdit/src/main/resources/base/media/icon.png deleted file mode 100755 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/features/pictureEdit/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/features/pictureEdit/src/main/resources/base/media/setting.jpeg b/features/pictureEdit/src/main/resources/base/media/setting.jpeg deleted file mode 100755 index 57e67dd49d39ad64ef090f59db3db9dfe6632106..0000000000000000000000000000000000000000 Binary files a/features/pictureEdit/src/main/resources/base/media/setting.jpeg and /dev/null differ diff --git a/features/pictureEdit/src/main/resources/base/profile/main_pages.json b/features/pictureEdit/src/main/resources/base/profile/main_pages.json deleted file mode 100755 index f3ee419dbc6ab7a5ded7d3136ec5913e5f2b33d6..0000000000000000000000000000000000000000 --- a/features/pictureEdit/src/main/resources/base/profile/main_pages.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/features/pictureView/src/main/ets/constants/PictureViewConstants.ets b/features/pictureView/src/main/ets/constants/PictureViewConstants.ets index 32a6822a0fb5b89b0ede3d308fdf7c63b8b7d95f..a2d4343452acf877e8ee2e9689ac21adfe6f6b6d 100755 --- a/features/pictureView/src/main/ets/constants/PictureViewConstants.ets +++ b/features/pictureView/src/main/ets/constants/PictureViewConstants.ets @@ -57,59 +57,59 @@ export default class PictureViewConstants { * Pictures. */ static readonly PICTURES: Resource[] = [ - $r('app.media.photo1'), - $r('app.media.photo2'), - $r('app.media.photo3'), - $r('app.media.photo4'), - $r('app.media.photo5'), - $r('app.media.photo6'), - $r('app.media.photo7'), - $r('app.media.photo8'), - $r('app.media.photo9'), - $r('app.media.photo1'), - $r('app.media.photo2'), - $r('app.media.photo3'), - $r('app.media.photo4'), - $r('app.media.photo5'), - $r('app.media.photo6'), - $r('app.media.photo7'), - $r('app.media.photo8'), - $r('app.media.photo9'), - $r('app.media.photo1'), - $r('app.media.photo2'), - $r('app.media.photo3'), - $r('app.media.photo4'), - $r('app.media.photo5'), - $r('app.media.photo6'), - $r('app.media.photo7'), - $r('app.media.photo8'), - $r('app.media.photo9'), - $r('app.media.photo1'), - $r('app.media.photo2'), - $r('app.media.photo3'), - $r('app.media.photo4'), - $r('app.media.photo5'), - $r('app.media.photo6'), - $r('app.media.photo7'), - $r('app.media.photo8'), - $r('app.media.photo9'), - $r('app.media.photo1'), - $r('app.media.photo2'), - $r('app.media.photo3'), - $r('app.media.photo4'), - $r('app.media.photo5'), - $r('app.media.photo6'), - $r('app.media.photo7'), - $r('app.media.photo8'), - $r('app.media.photo9'), - $r('app.media.photo1'), - $r('app.media.photo2'), - $r('app.media.photo3'), - $r('app.media.photo4'), - $r('app.media.photo5'), - $r('app.media.photo6'), - $r('app.media.photo7'), - $r('app.media.photo8'), - $r('app.media.photo9') + $r("app.media.album_photo1"), + $r("app.media.album_photo2"), + $r("app.media.album_photo3"), + $r("app.media.album_photo4"), + $r("app.media.album_photo5"), + $r("app.media.album_photo6"), + $r("app.media.album_photo7"), + $r("app.media.album_photo8"), + $r("app.media.album_photo9"), + $r("app.media.album_photo1"), + $r("app.media.album_photo2"), + $r("app.media.album_photo3"), + $r("app.media.album_photo4"), + $r("app.media.album_photo5"), + $r("app.media.album_photo6"), + $r("app.media.album_photo7"), + $r("app.media.album_photo8"), + $r("app.media.album_photo9"), + $r("app.media.album_photo1"), + $r("app.media.album_photo2"), + $r("app.media.album_photo3"), + $r("app.media.album_photo4"), + $r("app.media.album_photo5"), + $r("app.media.album_photo6"), + $r("app.media.album_photo7"), + $r("app.media.album_photo8"), + $r("app.media.album_photo9"), + $r("app.media.album_photo1"), + $r("app.media.album_photo2"), + $r("app.media.album_photo3"), + $r("app.media.album_photo4"), + $r("app.media.album_photo5"), + $r("app.media.album_photo6"), + $r("app.media.album_photo7"), + $r("app.media.album_photo8"), + $r("app.media.album_photo9"), + $r("app.media.album_photo1"), + $r("app.media.album_photo2"), + $r("app.media.album_photo3"), + $r("app.media.album_photo4"), + $r("app.media.album_photo5"), + $r("app.media.album_photo6"), + $r("app.media.album_photo7"), + $r("app.media.album_photo8"), + $r("app.media.album_photo9"), + $r("app.media.album_photo1"), + $r("app.media.album_photo2"), + $r("app.media.album_photo3"), + $r("app.media.album_photo4"), + $r("app.media.album_photo5"), + $r("app.media.album_photo6"), + $r("app.media.album_photo7"), + $r("app.media.album_photo8"), + $r("app.media.album_photo9") ]; } \ No newline at end of file diff --git a/features/pictureView/src/main/ets/pages/PictureViewIndex.ets b/features/pictureView/src/main/ets/pages/PictureViewIndex.ets index 8107b9029aac14796c6554df5071728c21795bd9..b6b168aebb3becbac5e61b27fbd836c869ee566a 100755 --- a/features/pictureView/src/main/ets/pages/PictureViewIndex.ets +++ b/features/pictureView/src/main/ets/pages/PictureViewIndex.ets @@ -22,7 +22,6 @@ import { deviceInfo } from '@kit.BasicServicesKit'; import { AlbumView } from '@ohos/album'; import { PictureEdit } from '@ohos/pictureEdit'; -@Entry @Preview @Component export struct PictureViewIndex { diff --git a/features/pictureView/src/main/resources/base/media/ic_public_back.svg b/features/pictureView/src/main/resources/base/media/ic_public_back.svg deleted file mode 100755 index 466903b263bebc25ae9b2e40098b30b6c12f1653..0000000000000000000000000000000000000000 --- a/features/pictureView/src/main/resources/base/media/ic_public_back.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - Public/ic_public_back - - - - - - - - - - - - - - - \ No newline at end of file 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 deleted file mode 100644 index 66e3df10acde5c58b785774850139d12b0f4ad04..0000000000000000000000000000000000000000 --- a/features/pictureView/src/main/resources/base/media/ic_public_back_black.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - Public/ic_public_back - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/features/pictureView/src/main/resources/base/media/ic_public_more.svg b/features/pictureView/src/main/resources/base/media/ic_public_more.svg deleted file mode 100755 index 2c4f6192ffddb951114eddab041bb77ffd106094..0000000000000000000000000000000000000000 --- a/features/pictureView/src/main/resources/base/media/ic_public_more.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - Public/ic_public_more - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/features/pictureView/src/main/resources/base/media/icon.png b/features/pictureView/src/main/resources/base/media/icon.png deleted file mode 100755 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/features/pictureView/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/features/pictureView/src/main/resources/base/media/photo.jpg b/features/pictureView/src/main/resources/base/media/photo.jpg deleted file mode 100755 index acab7e7af890f6589b9f29241c940f1a6ca1b483..0000000000000000000000000000000000000000 Binary files a/features/pictureView/src/main/resources/base/media/photo.jpg and /dev/null differ diff --git a/features/pictureView/src/main/resources/base/media/photo1.jpg b/features/pictureView/src/main/resources/base/media/photo1.jpg deleted file mode 100755 index cb4e7161886e7db0944ceddf0bcbd130371cb7c6..0000000000000000000000000000000000000000 Binary files a/features/pictureView/src/main/resources/base/media/photo1.jpg and /dev/null differ diff --git a/features/pictureView/src/main/resources/base/media/photo4.jpg b/features/pictureView/src/main/resources/base/media/photo4.jpg deleted file mode 100755 index fb763b87279c3fd1bcf7a2335c70f9b0846412cb..0000000000000000000000000000000000000000 Binary files a/features/pictureView/src/main/resources/base/media/photo4.jpg and /dev/null differ diff --git a/features/pictureView/src/main/resources/base/media/photo5.jpg b/features/pictureView/src/main/resources/base/media/photo5.jpg deleted file mode 100755 index a830f0ce6fa0a0791a3621ba1266c2b63e8b8723..0000000000000000000000000000000000000000 Binary files a/features/pictureView/src/main/resources/base/media/photo5.jpg and /dev/null differ diff --git a/features/pictureView/src/main/resources/base/media/photo6.jpg b/features/pictureView/src/main/resources/base/media/photo6.jpg deleted file mode 100755 index fe642935525294294c90a56308706cbf6b2aa2d3..0000000000000000000000000000000000000000 Binary files a/features/pictureView/src/main/resources/base/media/photo6.jpg and /dev/null differ diff --git a/features/pictureView/src/main/resources/base/media/photo7.jpg b/features/pictureView/src/main/resources/base/media/photo7.jpg deleted file mode 100755 index fe642935525294294c90a56308706cbf6b2aa2d3..0000000000000000000000000000000000000000 Binary files a/features/pictureView/src/main/resources/base/media/photo7.jpg and /dev/null differ diff --git a/features/pictureView/src/main/resources/base/media/setting.jpeg b/features/pictureView/src/main/resources/base/media/setting.jpeg deleted file mode 100755 index 57e67dd49d39ad64ef090f59db3db9dfe6632106..0000000000000000000000000000000000000000 Binary files a/features/pictureView/src/main/resources/base/media/setting.jpeg and /dev/null differ diff --git a/features/pictureView/src/main/resources/base/media/startIcon.png b/features/pictureView/src/main/resources/base/media/startIcon.png deleted file mode 100755 index 366f76459ffd4494ec40d0ddd5c59385b9c5da11..0000000000000000000000000000000000000000 Binary files a/features/pictureView/src/main/resources/base/media/startIcon.png and /dev/null differ diff --git a/features/pictureView/src/main/resources/base/profile/main_pages.json b/features/pictureView/src/main/resources/base/profile/main_pages.json deleted file mode 100755 index ad688a678b7c216d5787b1b1e77bacab2cd9b465..0000000000000000000000000000000000000000 --- a/features/pictureView/src/main/resources/base/profile/main_pages.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "src": [ - "pages/PictureViewIndex" - ] -}