-
Notifications
You must be signed in to change notification settings - Fork 47
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
multi : Godcr newui #262
Merged
Merged
multi : Godcr newui #262
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oshorefueled
suggested changes
Nov 16, 2020
oshorefueled
suggested changes
Nov 16, 2020
Comment on lines
+267
to
+333
func (page pageCommon) layoutAppBar(gtx layout.Context) layout.Dimensions { | ||
return decredmaterial.Card{Color: page.theme.Color.Surface}.Layout(gtx, func(gtx C) D { | ||
gtx.Constraints.Min.X = gtx.Constraints.Max.X | ||
return layout.Flex{Axis: layout.Vertical}.Layout(gtx, | ||
layout.Rigid(func(gtx C) D { | ||
m := values.MarginPadding5 | ||
return layout.Inset{ | ||
Top: m, | ||
Bottom: m, | ||
Left: m, | ||
Right: values.MarginPadding15, | ||
}.Layout(gtx, func(gtx C) D { | ||
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx, | ||
layout.Rigid(func(gtx C) D { | ||
img := widget.Image{Src: paint.NewImageOp(page.icons.logo)} | ||
img.Scale = 0.085 | ||
|
||
return img.Layout(gtx) | ||
}), | ||
layout.Rigid(func(gtx C) D { | ||
return layout.Inset{Left: values.MarginPadding10}.Layout(gtx, func(gtx C) D { | ||
return layout.Inset{Top: values.MarginPadding5}.Layout(gtx, func(gtx C) D { | ||
return page.layoutBalance(gtx, page.info.TotalBalance) | ||
}) | ||
}) | ||
}), | ||
layout.Rigid(func(gtx C) D { | ||
gtx.Constraints.Min.X = gtx.Constraints.Max.X | ||
return layout.E.Layout(gtx, func(gtx C) D { | ||
list := layout.List{Axis: layout.Horizontal} | ||
return list.Layout(gtx, len(page.appBarNavItems), func(gtx C, i int) D { | ||
return layout.UniformInset(values.MarginPadding15).Layout(gtx, func(gtx C) D { | ||
return decredmaterial.Clickable(gtx, page.appBarNavItems[i].clickable, func(gtx C) D { | ||
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx, | ||
layout.Rigid(func(gtx C) D { | ||
page.appBarNavItems[i].image.Scale = 0.05 | ||
|
||
return layout.Center.Layout(gtx, func(gtx C) D { | ||
return page.appBarNavItems[i].image.Layout(gtx) | ||
}) | ||
}), | ||
layout.Rigid(func(gtx C) D { | ||
return layout.Inset{ | ||
Left: values.MarginPadding10, | ||
}.Layout(gtx, func(gtx C) D { | ||
return layout.Center.Layout(gtx, func(gtx C) D { | ||
return page.theme.Body1(page.appBarNavItems[i].page).Layout(gtx) | ||
}) | ||
}) | ||
}), | ||
) | ||
}) | ||
}) | ||
}) | ||
}) | ||
}), | ||
) | ||
}) | ||
}), | ||
layout.Rigid(func(gtx C) D { | ||
l := page.theme.Line() | ||
l.Color = page.theme.Color.Background | ||
l.Width = gtx.Constraints.Min.X | ||
l.Height = 2 | ||
return l.Layout(gtx) | ||
}), | ||
) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why wasn't the tab widget modified to do this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No idea. This can be revisited when the PR is merged to prevent further stalling in the project.
e00a626
to
9e09006
Compare
set active and inactive nav item
and more sub-page btns are clicked
remove overview page hardcoded unit parameters update dropdown widget to confirm to new ui design
change collapsible widget chevron icon remove hardcoded unit params from txpage
fix app crash when tx detail back btn is clicked
align header contents to new ui
add step amount to tx table amount optimize overview, tx, txdetails,page codes
remove modal line and title use newui gray color on details text
rename combo to dropdown fix lint optimize code
9e09006
to
af4a322
Compare
oshorefueled
approved these changes
Nov 25, 2020
song50119
pushed a commit
to song50119/godcr
that referenced
this pull request
Apr 24, 2022
multi : Implement new UI
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #259
Fix #264
Close #260
This PR Implements the new Godcr UI Navigation, overview page and transactions page.
Transaction pages
Overview Page
Transaction details page