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

add security tools with info #299

Merged
merged 3 commits into from
Feb 2, 2021
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
Binary file added ui/assets/decredicons/location_pin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ui/assets/decredicons/verify_message.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions ui/modal_templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const UserAgentTemplate = "UserAgent"
const ConfirmSetupMixerTemplate = "ConfirmSetupMixer"
const ConfirmSetupMixerAcctTemplate = "SetupMixerAcctTemplate"
const ConfirmMixerAcctExistTemplate = "MixerAcctExistTemplate"
const SecurityToolsInfoTemplate = "SecurityToolsInfo"

type ModalTemplate struct {
th *decredmaterial.Theme
Expand Down Expand Up @@ -229,6 +230,16 @@ func (m *ModalTemplate) rescanWallet() []func(gtx C) D {
}
}

func (m *ModalTemplate) securityToolsInfo() []func(gtx C) D {
return []func(gtx C) D{
func(gtx C) D {
text := m.th.Body1("Various tools that help in different aspects of crypto currency security will be located here.")
text.Color = m.th.Color.Gray
return text.Layout(gtx)
},
}
}

func (m *ModalTemplate) privacyInfo() []func(gtx C) D {
return []func(gtx C) D{
func(gtx C) D {
Expand Down Expand Up @@ -549,6 +560,12 @@ func (m *ModalTemplate) handle(th *decredmaterial.Theme, load *modalLoad) (templ
}
template = m.setupMixerAcct()
return
case SecurityToolsInfoTemplate:
if m.cancel.Button.Clicked() {
load.cancel.(func())()
}
template = m.securityToolsInfo()
return
default:
return
}
Expand Down
4 changes: 3 additions & 1 deletion ui/page.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ type pageIcons struct {
pendingIcon, logo, redirectIcon, confirmIcon, newWalletIcon, walletAlertIcon,
importedAccountIcon, accountIcon, editIcon, expandIcon, collapseIcon, copyIcon, mixer,
arrowFowardIcon, transactionFingerPrintIcon, settingsIcon, securityIcon, helpIcon,
aboutIcon, debugIcon, alert *widget.Image
aboutIcon, debugIcon, alert, verifyMessageIcon, locationPinIcon *widget.Image

walletIcon, syncingIcon image.Image
}
Expand Down Expand Up @@ -150,6 +150,8 @@ func (win *Window) addPages(decredIcons map[string]image.Image) {
aboutIcon: &widget.Image{Src: paint.NewImageOp(decredIcons["info_icon"])},
debugIcon: &widget.Image{Src: paint.NewImageOp(decredIcons["debug"])},
alert: &widget.Image{Src: paint.NewImageOp(decredIcons["alert"])},
verifyMessageIcon: &widget.Image{Src: paint.NewImageOp(decredIcons["verify_message"])},
locationPinIcon: &widget.Image{Src: paint.NewImageOp(decredIcons["location_pin"])},

syncingIcon: decredIcons["syncing"],
walletIcon: decredIcons["wallet"],
Expand Down
85 changes: 79 additions & 6 deletions ui/security_tools_page.go
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
package ui

import (
"image"

"gioui.org/layout"
"gioui.org/widget"
"github.com/planetdecred/godcr/ui/values"

"github.com/planetdecred/godcr/ui/decredmaterial"
)

const PageSecurityTools = "Security_Tools"
const PageSecurityTools = "Security Tools"

type securityToolsPage struct {
dummyText decredmaterial.Label
theme *decredmaterial.Theme
verifyMessage *widget.Clickable
validateAddress *widget.Clickable
}

func (win *Window) SecurityToolsPage(common pageCommon) layout.Widget {
pg := &securityToolsPage{
dummyText: common.theme.H5("Not yet implemented"),
theme: common.theme,
verifyMessage: new(widget.Clickable),
validateAddress: new(widget.Clickable),
}

return func(gtx C) D {
Expand All @@ -25,9 +33,74 @@ func (win *Window) SecurityToolsPage(common pageCommon) layout.Widget {

// main settings layout
func (pg *securityToolsPage) Layout(gtx layout.Context, common pageCommon) layout.Dimensions {
return common.Layout(gtx, func(gtx C) D {
return layout.Center.Layout(gtx, func(gtx C) D {
return pg.dummyText.Layout(gtx)
body := func(gtx C) D {
page := SubPage{
title: "Security Tools",
back: func() {
*common.page = PageMore
},
body: func(gtx C) D {
return layout.Inset{Top: values.MarginPadding5}.Layout(gtx, func(gtx C) D {
return layout.Flex{Spacing: layout.SpaceBetween}.Layout(gtx,
layout.Flexed(.5, pg.message(common)),
layout.Rigid(func(gtx C) D {
size := image.Point{X: 15, Y: gtx.Constraints.Min.Y}
return layout.Dimensions{Size: size}
}),
layout.Flexed(.5, pg.address(common)),
)
})
},
infoTemplate: SecurityToolsInfoTemplate,
}
return common.SubPageLayout(gtx, page)
}
return common.Layout(gtx, body)
}

func (pg *securityToolsPage) message(common pageCommon) layout.Widget {
return func(gtx C) D {
return pg.pageSections(gtx, common.icons.verifyMessageIcon, pg.verifyMessage, func(gtx C) D {
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
layout.Rigid(func(gtx C) D {
return common.theme.Body1("Verify Message").Layout(gtx)
}),
)
})
}
}

func (pg *securityToolsPage) address(common pageCommon) layout.Widget {
return func(gtx C) D {
return pg.pageSections(gtx, common.icons.locationPinIcon, pg.validateAddress, func(gtx C) D {
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
layout.Rigid(func(gtx C) D {
return common.theme.Body1("Validate Address").Layout(gtx)
}),
)
})
}
}

func (pg *securityToolsPage) pageSections(gtx layout.Context, icon *widget.Image, action *widget.Clickable, body layout.Widget) layout.Dimensions {
return layout.Inset{Bottom: values.MarginPadding10}.Layout(gtx, func(gtx C) D {
return pg.theme.Card().Layout(gtx, func(gtx C) D {
return decredmaterial.Clickable(gtx, action, func(gtx C) D {
return layout.UniformInset(values.MarginPadding15).Layout(gtx, func(gtx C) D {
return layout.Flex{Axis: layout.Vertical, Alignment: layout.Middle, Spacing: layout.SpaceAround}.Layout(gtx,
layout.Rigid(func(gtx C) D {
icon := icon
icon.Scale = 1
return icon.Layout(gtx)
}),
layout.Rigid(body),
layout.Rigid(func(gtx C) D {
size := image.Point{X: gtx.Constraints.Max.X, Y: gtx.Constraints.Min.Y}
return layout.Dimensions{Size: size}
}),
)
})
})
})
})
}
Expand Down