diff --git a/entry/src/main/ets/common/constants/CommonConstants.ets b/entry/src/main/ets/common/constants/CommonConstants.ets index 961c53a0304f6848d201320c29187c7b3a16d80b..e20f82981e2f46badcfdcaf6722da360f90e2042 100644 --- a/entry/src/main/ets/common/constants/CommonConstants.ets +++ b/entry/src/main/ets/common/constants/CommonConstants.ets @@ -57,16 +57,6 @@ export default class CommonConstants { */ static readonly TOAST_DURATION: number = 3000; - /** - * Title text of the home page. - */ - static readonly HOME_TITLE: string = '首页'; - - /** - * Title text of the setting page. - */ - static readonly MINE_TITLE: string = '我的'; - /** * Home tab index. */ diff --git a/entry/src/main/ets/pages/MainPage.ets b/entry/src/main/ets/pages/MainPage.ets index 177b9eaad90c03a09b19a81308e24d8ccd935cdf..e8b85a80c06f549540e390260445617f950ce579 100644 --- a/entry/src/main/ets/pages/MainPage.ets +++ b/entry/src/main/ets/pages/MainPage.ets @@ -44,13 +44,13 @@ struct MainPage { TabContent() { HomePage() } - .tabBar(this.TabBuilder(CommonConstants.HOME_TITLE, CommonConstants.HOME_TAB_INDEX, + .tabBar(this.TabBuilder($r('app.string.home_title'), CommonConstants.HOME_TAB_INDEX, $r('app.media.ic_home_selected'), $r('app.media.ic_home_normal'))) TabContent() { MinePage() } - .tabBar(this.TabBuilder(CommonConstants.MINE_TITLE, CommonConstants.MINE_TAB_INDEX, + .tabBar(this.TabBuilder($r('app.string.mine_title'), CommonConstants.MINE_TAB_INDEX, $r('app.media.ic_mine_selected'), $r('app.media.ic_mine_normal'))) } .barWidth(this.currentDeviceSize === CommonConstants.LG ? @@ -67,7 +67,7 @@ struct MainPage { }) } - @Builder TabBuilder(title: string, index: number, selectedImg: Resource, normalImg: Resource) { + @Builder TabBuilder(title: Resource, index: number, selectedImg: Resource, normalImg: Resource) { Column() { Image(this.currentIndex === index ? selectedImg : normalImg) .width($r('app.float.base_tab_size')) diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json index 3316c038debbc618b080cd7a343aa9f51372a816..1b2bf20c6efa02d3dad00a4c59c2afde3ed90178 100644 --- a/entry/src/main/resources/base/element/string.json +++ b/entry/src/main/resources/base/element/string.json @@ -239,6 +239,14 @@ { "name": "check_privacy", "value": "Check privacy agreement" + }, + { + "name": "home_title", + "value": "Home" + }, + { + "name": "mine_title", + "value": "Mine" } ] } \ 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 3316c038debbc618b080cd7a343aa9f51372a816..1b2bf20c6efa02d3dad00a4c59c2afde3ed90178 100644 --- a/entry/src/main/resources/en_US/element/string.json +++ b/entry/src/main/resources/en_US/element/string.json @@ -239,6 +239,14 @@ { "name": "check_privacy", "value": "Check privacy agreement" + }, + { + "name": "home_title", + "value": "Home" + }, + { + "name": "mine_title", + "value": "Mine" } ] } \ No newline at end of file diff --git a/entry/src/main/resources/zh_CN/element/string.json b/entry/src/main/resources/zh_CN/element/string.json index db214f28a5d866a5298fdab687c0fa4d6dfadd60..a6102c56489091340936a5c959f162039a5be3c4 100644 --- a/entry/src/main/resources/zh_CN/element/string.json +++ b/entry/src/main/resources/zh_CN/element/string.json @@ -239,6 +239,14 @@ { "name": "check_privacy", "value": "查看隐私协议" + }, + { + "name": "home_title", + "value": "首页" + }, + { + "name": "mine_title", + "value": "我的" } ] } \ No newline at end of file