Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

重构我的中心标题栏: 自适应宽度、居中、编辑、菜单按钮 #73

Merged
merged 2 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions entry/src/main/ets/componets/myCenter/MyCenterTitle.ets
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
import { router } from '@kit.ArkUI'
import CommonConstants from '../../common/constants/CommonConstants'

@Component
export struct MyCenterTitle{

@Prop title:string

// 是否显示编辑按钮
isShowEdit?:boolean = false
// 是否显示菜单
isShowMore?:boolean = false

// 编辑标题按钮事件
onEditClickEvent?: (event: ClickEvent) => void
// 更多菜单按钮
onMoreClickEvent?: (event: ClickEvent) => void

@StorageProp('topRectHeight') topRectHeight: number = 0

// 重构 我的中心标题栏
build() {
Column(){
// 如果同步状态栏高度不成功,默认40
Blank(this.topRectHeight == 0 ? 40 : this.topRectHeight)

Row(){
Image($r("app.media.return_left"))
.size({width:CommonConstants.TITLE_IMG_SIZE,height:CommonConstants.TITLE_IMG_SIZE})
.onClick(()=>{
router.back()
})

Row(){
Row(){
if (this.isShowEdit){
// 左占位
Blank(CommonConstants.TITLE_IMG_SIZE)
.margin({right: 8})
}

// 标题
Text(this.title).fontSize(16).fontWeight(600).lineHeight(24)
.textAlign(TextAlign.Center)

// 修改标题的 笔图标
if (this.isShowEdit){
Image($r("app.media.ic_public_edit"))
.size({width:CommonConstants.TITLE_IMG_SIZE,height:CommonConstants.TITLE_IMG_SIZE})
.margin({left: 8})
.onClick(this.onEditClickEvent)
}
}
}
.justifyContent(FlexAlign.Center)
.layoutWeight(1) // 占满剩余空间

// 修改标题的 菜单标
if (this.isShowMore){
Image($r("app.media.more_vertical"))
.size({width:CommonConstants.TITLE_IMG_SIZE,height:CommonConstants.TITLE_IMG_SIZE})
.onClick(this.onMoreClickEvent)
}else { // 占位,保持标题居中
Blank(CommonConstants.TITLE_IMG_SIZE)
}
}
// 固定高度不能适配所有设备,应该100%,主轴居中显示
.width("100%").justifyContent(FlexAlign.Center).padding({top:12,bottom:12})
//.width(320).justifyContent(FlexAlign.Start).padding({top:12,bottom:12})
}
}
}
24 changes: 0 additions & 24 deletions entry/src/main/ets/componets/myCenter/myCenterTitle.ets

This file was deleted.

4 changes: 2 additions & 2 deletions entry/src/main/ets/pages/view/myCenter/clearCache.ets
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { dataItem } from '../../../componets/dataList/dataItem'
import { myCenterTitle } from '../../../componets/myCenter/myCenterTitle'
import { MyCenterTitle } from '../../../componets/myCenter/MyCenterTitle'
import { serviceDialog } from '../../../componets/webDavService/serviceDialog'

@Entry
Expand All @@ -17,7 +17,7 @@ struct clearCache{
build() {
Column({space:12}){
//标题栏
myCenterTitle({title:"清理缓存"})
MyCenterTitle({title:"清理缓存"})
Column(){
ForEach(this.clearList,(item:dataItem,index:number)=>{
Row({space:10}){
Expand Down
4 changes: 2 additions & 2 deletions entry/src/main/ets/pages/view/myCenter/cloudDisk.ets
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { promptAction, router } from '@kit.ArkUI';
import { dataItem } from '../../../componets/dataList/dataItem';
import { myCenterTitle } from '../../../componets/myCenter/myCenterTitle';
import { MyCenterTitle } from '../../../componets/myCenter/MyCenterTitle';
import { cloudDisKBindSheetComponet } from '../../../componets/myCenter/cloudDisKBindSheetComponet';

@Entry
Expand Down Expand Up @@ -147,7 +147,7 @@ struct CloudDisk {
Column() {
//标题栏

myCenterTitle({title:"云备份"})
MyCenterTitle({title:"云备份"})
//备份图片及按钮
Column(){
Column(){
Expand Down
4 changes: 2 additions & 2 deletions entry/src/main/ets/pages/view/myCenter/diskSet.ets
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ColumnModifier } from '../../../common/utils/ComponetModifier';
import { dataItem } from '../../../componets/dataList/dataItem';

import { myCenterTitle } from '../../../componets/myCenter/myCenterTitle';
import { MyCenterTitle } from '../../../componets/myCenter/MyCenterTitle';

import { diskComponet } from '../../../componets/myCenter/diskComponet';

Expand Down Expand Up @@ -83,7 +83,7 @@ struct DiskSet {
build() {
Column() {
//标题栏
myCenterTitle({title:"备份设置"})
MyCenterTitle({title:"备份设置"})

Column(){
diskComponet({
Expand Down
5 changes: 5 additions & 0 deletions entry/src/main/resources/base/media/more_vertical.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading