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.

Sign up for GitHub

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

Jump to bottom

update ui for account detail page #348

Merged
merged 1 commit into from
Mar 25, 2021
Merged

update ui for account detail page #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 35 additions & 36 deletions ui/account_details_page.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (pg *acctDetailsPage) Layout(gtx layout.Context, common pageCommon) layout.
func(gtx C) D {
pg.line.Width = gtx.Constraints.Max.X
pg.line.Height = 2
m := values.MarginPadding5
m := values.MarginPadding10
return layout.Inset{Top: m, Bottom: m}.Layout(gtx, func(gtx C) D {
return pg.line.Layout(gtx)
})
Expand All @@ -82,13 +82,15 @@ func (pg *acctDetailsPage) Layout(gtx layout.Context, common pageCommon) layout.
common.changePage(PageWallet)
},
body: func(gtx C) D {
return pg.theme.Card().Layout(gtx, func(gtx C) D {
return layout.Inset{Top: values.MarginPadding5}.Layout(gtx, func(gtx C) D {
if *pg.acctInfo == nil {
return layout.Dimensions{}
}
return pg.acctDetailsPageContainer.Layout(gtx, len(widgets), func(gtx C, i int) D {
return layout.Inset{}.Layout(gtx, widgets[i])
return layout.Inset{Left: values.MarginPadding9, Right: values.MarginPadding9, Bottom: values.MarginPadding7}.Layout(gtx, func(gtx C) D {
return pg.theme.Card().Layout(gtx, func(gtx C) D {
return layout.Inset{Top: values.MarginPadding5}.Layout(gtx, func(gtx C) D {
if *pg.acctInfo == nil {
return layout.Dimensions{}
}
return pg.acctDetailsPageContainer.Layout(gtx, len(widgets), func(gtx C, i int) D {
return layout.Inset{}.Layout(gtx, widgets[i])
})
})
})
})
Expand Down Expand Up @@ -168,7 +170,7 @@ func (pg *acctDetailsPage) accountBalanceLayout(gtx layout.Context, common *page
func (pg *acctDetailsPage) acctBalLayout(gtx layout.Context, balType string, mainBalance, subBalance string, isFirst bool) layout.Dimensions {
mainLabel := pg.theme.Body1(mainBalance)
subLabel := pg.theme.Caption(subBalance)
marginTop := values.MarginPadding15
marginTop := values.MarginPadding16
marginLeft := values.MarginPadding35
if isFirst {
mainLabel = pg.theme.H4(mainBalance)
Expand Down Expand Up @@ -202,43 +204,19 @@ func (pg *acctDetailsPage) acctBalLayout(gtx layout.Context, balType string, mai
}

func (pg *acctDetailsPage) accountInfoLayout(gtx layout.Context) layout.Dimensions {
acctInfoLayout := func(gtx layout.Context, leftText, rightText string) layout.Dimensions {
return layout.Flex{}.Layout(gtx,
layout.Rigid(func(gtx C) D {
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
layout.Rigid(func(gtx C) D {
leftTextLabel := pg.theme.Body1(leftText)
leftTextLabel.Color = pg.theme.Color.Gray
return leftTextLabel.Layout(gtx)
}),
)
}),
layout.Flexed(1, func(gtx C) D {
return layout.E.Layout(gtx, func(gtx C) D {
inset := layout.Inset{
Right: values.MarginPadding10,
}
return inset.Layout(gtx, func(gtx C) D {
return pg.theme.Body1(rightText).Layout(gtx)
})
})
}),
)
}

return pg.pageSections(gtx, func(gtx C) D {
m := values.MarginPadding10
return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
layout.Rigid(func(gtx C) D {
return acctInfoLayout(gtx, "Account Number", fmt.Sprint((*pg.acctInfo).Number))
return pg.acctInfoLayout(gtx, "Account Number", fmt.Sprint((*pg.acctInfo).Number))
}),
layout.Rigid(func(gtx C) D {
inset := layout.Inset{
Top: m,
Bottom: m,
}
return inset.Layout(gtx, func(gtx C) D {
return acctInfoLayout(gtx, "HD Path", (*pg.acctInfo).HDPath)
return pg.acctInfoLayout(gtx, "HD Path", (*pg.acctInfo).HDPath)
})
}),
layout.Rigid(func(gtx C) D {
Expand All @@ -249,13 +227,34 @@ func (pg *acctDetailsPage) accountInfoLayout(gtx layout.Context) layout.Dimensio
ext := (*pg.acctInfo).Keys.External
int := (*pg.acctInfo).Keys.Internal
imp := (*pg.acctInfo).Keys.Imported
return acctInfoLayout(gtx, "Key", ext+" external, "+int+" internal, "+imp+" imported")
return pg.acctInfoLayout(gtx, "Key", ext+" external, "+int+" internal, "+imp+" imported")
})
}),
)
})
}

func (pg *acctDetailsPage) acctInfoLayout(gtx layout.Context, leftText, rightText string) layout.Dimensions {
return layout.Flex{}.Layout(gtx,
layout.Rigid(func(gtx C) D {
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
layout.Rigid(func(gtx C) D {
leftTextLabel := pg.theme.Label(values.TextSize14, leftText)
leftTextLabel.Color = pg.theme.Color.Gray
return leftTextLabel.Layout(gtx)
}),
)
}),
layout.Flexed(1, func(gtx C) D {
return layout.E.Layout(gtx, func(gtx C) D {
rightTextLabel := pg.theme.Label(values.TextSize16, rightText)
rightTextLabel.Color = pg.theme.Color.DeepBlue
return rightTextLabel.Layout(gtx)
})
}),
)
}

func (pg *acctDetailsPage) pageSections(gtx layout.Context, body layout.Widget) layout.Dimensions {
m := values.MarginPadding20
mtb := values.MarginPadding5
Expand Down
18 changes: 10 additions & 8 deletions ui/page.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ type SubPage struct {
func (page pageCommon) SubPageLayout(gtx layout.Context, sp SubPage) layout.Dimensions {
return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
layout.Rigid(func(gtx layout.Context) layout.Dimensions {
return layout.Inset{Bottom: values.MarginPadding15}.Layout(gtx, func(gtx C) D {
return layout.Inset{Bottom: values.MarginPadding15, Left: values.MarginPadding10}.Layout(gtx, func(gtx C) D {
return page.subpageHeader(gtx, sp)
})
}),
Expand Down Expand Up @@ -731,13 +731,15 @@ func (page pageCommon) subpageHeader(gtx layout.Context, sp SubPage) layout.Dime
return layout.Dimensions{}
}),
layout.Flexed(1, func(gtx layout.Context) layout.Dimensions {
return layout.E.Layout(gtx, func(gtx C) D {
if sp.infoTemplate != "" {
return page.subPageInfoButton.Layout(gtx)
} else if sp.extraItem != nil {
return decredmaterial.Clickable(gtx, sp.extraItem, sp.extra)
}
return layout.Dimensions{}
return layout.Inset{Right: values.MarginPadding9}.Layout(gtx, func(gtx C) D {
return layout.E.Layout(gtx, func(gtx C) D {
if sp.infoTemplate != "" {
return page.subPageInfoButton.Layout(gtx)
} else if sp.extraItem != nil {
return decredmaterial.Clickable(gtx, sp.extraItem, sp.extra)
}
return layout.Dimensions{}
})
})
}),
)
Expand Down
1 change: 1 addition & 0 deletions ui/values/dimensions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ var (
MarginPadding10 = unit.Dp(10)
MarginPaddingMinus10 = unit.Dp(-10)
MarginPadding15 = unit.Dp(15)
MarginPadding16 = unit.Dp(16)
MarginPadding20 = unit.Dp(20)
MarginPadding22 = unit.Dp(22)
MarginPadding24 = unit.Dp(24)
Expand Down