diff --git a/entry/src/main/ets/common/MailContent.ets b/entry/src/main/ets/common/MailContent.ets index 28a80edc46a1f53ace95f7db28ece0d218784f26..cc9b2efa7685b28857b60fb41d3b13cd02cb0047 100644 --- a/entry/src/main/ets/common/MailContent.ets +++ b/entry/src/main/ets/common/MailContent.ets @@ -98,7 +98,9 @@ export struct MailContent { .fontSize(10) .lineHeight(12) } - }, (item: string) => item.toString()) + }, (item: OperateTabs, index: number) => { + return index + JSON.stringify(item); + }) } .justifyContent(FlexAlign.SpaceAround) .width('100%') diff --git a/entry/src/main/ets/common/MailSideBar.ets b/entry/src/main/ets/common/MailSideBar.ets index e5edee739743c2c8f107cca2763af3df25e42bda..51a3a34db0509e64962d1fc50dc0d3757bf8fd30 100644 --- a/entry/src/main/ets/common/MailSideBar.ets +++ b/entry/src/main/ets/common/MailSideBar.ets @@ -163,7 +163,9 @@ struct MailStatusList { .height(56) .backgroundColor(index === 0 ? '#19254ff7' : '') .borderRadius(16) - }, (item: string) => item.toString()) + }, (item: MailType, index: number) => { + return index + JSON.stringify(item); + }) } .width('100%') .height('100%') diff --git a/entry/src/main/ets/common/PhotoContent.ets b/entry/src/main/ets/common/PhotoContent.ets index 581cd2f04a24abeb6e79775128814acb26e3b4c7..3a01be3575a1c23bcda3051415adb207e27d2c70 100644 --- a/entry/src/main/ets/common/PhotoContent.ets +++ b/entry/src/main/ets/common/PhotoContent.ets @@ -100,7 +100,9 @@ export struct PhotoContent { }.width('100%').alignItems(HorizontalAlign.Start).padding({ left: 8, right: 8 }) } } - }, (item: string) => item.toString()) + }, (item: PhotoType, index: number) => { + return index + JSON.stringify(item); + }) } .height('85%') .scrollBar(BarState.Off) diff --git a/entry/src/main/ets/common/PhotoSideBar.ets b/entry/src/main/ets/common/PhotoSideBar.ets index 947b34c39c665bb10a3c772e6e6495135147398d..2becec383a454eebb23f8485c1ff6fccd385ad81 100644 --- a/entry/src/main/ets/common/PhotoSideBar.ets +++ b/entry/src/main/ets/common/PhotoSideBar.ets @@ -105,7 +105,9 @@ export struct PhotoSideBar { .padding({ left: 14, right: 14 }) .width('100%') } - }, (item: string) => item.toString()) + }, (item: PhotoType, index: number) => { + return index + JSON.stringify(item); + }) } .width('100%').height('100%') } diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json index ba4271f3ce8312ee21eb9eb0ce8605ad05d1cf41..cc78618ece223a84d52973e1710d5de58db25a90 100644 --- a/entry/src/main/resources/base/element/string.json +++ b/entry/src/main/resources/base/element/string.json @@ -20,10 +20,6 @@ "name": "addAccount", "value": "Adding an Account" }, - { - "name": "allAccount", - "value": "All accounts" - }, { "name": "recUser", "value": "Recipient:" diff --git a/entry/src/main/resources/base/media/add.svg b/entry/src/main/resources/base/media/add.svg deleted file mode 100644 index 1885d67d6c3dba8b7bc235d72e96f97017ce50bc..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/add.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - ic/public/add - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/forward.svg b/entry/src/main/resources/base/media/forward.svg deleted file mode 100644 index bdc17a568a27db2830341a2cb426c523f67ed9b3..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/forward.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - forward - - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/ic_confirm.svg b/entry/src/main/resources/base/media/ic_confirm.svg deleted file mode 100644 index 0d3086e5a0c93bef3b80ddae30c3372e0db7986a..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/ic_confirm.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - ic__comfirm_S - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/ic_expand.svg b/entry/src/main/resources/base/media/ic_expand.svg deleted file mode 100644 index e975f6d1d3935dc01cddb9de888cd27a42e3c054..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/ic_expand.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - public/ic_expand - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/ic_public_arrow_down_0.svg b/entry/src/main/resources/base/media/ic_public_arrow_down_0.svg deleted file mode 100644 index 8e179a2ee991c1036f3b4318202e55dfc4b921f6..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/ic_public_arrow_down_0.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - Public/ic_public_arrow_down_0 - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/ic_public_back.svg b/entry/src/main/resources/base/media/ic_public_back.svg deleted file mode 100644 index 50e4ecd57e4c97b837c830ed7823348a367368f4..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/ic_public_back.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - Public/ic_public_back - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/ic_public_delete.svg b/entry/src/main/resources/base/media/ic_public_delete.svg deleted file mode 100644 index 422ec497a4e97fb01d9f8512ea3bcd8d87fbd0a5..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/ic_public_delete.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - Public/ic_public_delete - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/ic_public_folder.svg b/entry/src/main/resources/base/media/ic_public_folder.svg deleted file mode 100644 index 34df5e620c673da599e76d9dd3b06919d833899b..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/ic_public_folder.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - Public/ic_public_folder 2 - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/ic_public_help.svg b/entry/src/main/resources/base/media/ic_public_help.svg deleted file mode 100644 index 6473fc337b8111554edb2075ae8705e2ea8fb912..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/ic_public_help.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - Public/ic_public_help - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/ic_public_lock_filled.svg b/entry/src/main/resources/base/media/ic_public_lock_filled.svg deleted file mode 100644 index ea72f64a66198928ee1ae22debcc9c55d14b0e11..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/ic_public_lock_filled.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - Public/ic_public_lock_filled - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/ic_public_picture.svg b/entry/src/main/resources/base/media/ic_public_picture.svg deleted file mode 100644 index b3e281d42ce9ad19a405ec49a6b50262cc434000..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/ic_public_picture.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - Public/ic_public_folder - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/more.svg b/entry/src/main/resources/base/media/more.svg deleted file mode 100644 index 9a6ed14f984738c93826468d04c0f09ba95803cc..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/more.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - ic/public/add 2 - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/reply.svg b/entry/src/main/resources/base/media/reply.svg deleted file mode 100644 index 9382d0d5d18a4963ee5ed6a18a3d9b2b40e0de8e..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/reply.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - reply - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/replyAll.svg b/entry/src/main/resources/base/media/replyAll.svg deleted file mode 100644 index a2afd7303bba741e5981ac71e214e256f50afdd1..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/replyAll.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - reply all - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/right_expend_grey.svg b/entry/src/main/resources/base/media/right_expend_grey.svg deleted file mode 100644 index 58df0656c34b173008b5cdf03bbc5dc9d808143c..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/right_expend_grey.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - ic/16x16/Light/Public_arrow/right_expend_grey - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/en_US/element/string.json b/entry/src/main/resources/en_US/element/string.json index ba4271f3ce8312ee21eb9eb0ce8605ad05d1cf41..cc78618ece223a84d52973e1710d5de58db25a90 100644 --- a/entry/src/main/resources/en_US/element/string.json +++ b/entry/src/main/resources/en_US/element/string.json @@ -20,10 +20,6 @@ "name": "addAccount", "value": "Adding an Account" }, - { - "name": "allAccount", - "value": "All accounts" - }, { "name": "recUser", "value": "Recipient:" diff --git a/entry/src/main/resources/zh_CN/element/string.json b/entry/src/main/resources/zh_CN/element/string.json index 3b33c5ecbac628ee51e8038fbf09870d97ba6d4f..8cfea631c8a2622a0b5f9341c2d291e48876b992 100644 --- a/entry/src/main/resources/zh_CN/element/string.json +++ b/entry/src/main/resources/zh_CN/element/string.json @@ -20,10 +20,6 @@ "name": "addAccount", "value": "添加账户" }, - { - "name": "allAccount", - "value": "全部账户" - }, { "name": "recUser", "value": "收件人:"