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

Adds hide balance button #646

Merged
merged 11 commits into from
Oct 21, 2021
Merged

Adds hide balance button #646

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
12d8c11
Adds hide balance button
AdimekweEbuka Sep 27, 2021
6a0f96e
Moves Hide balance to settings page
AdimekweEbuka Sep 29, 2021
e3b79fb
Implements a hide/show balance icon button on main page
AdimekweEbuka Oct 12, 2021
fee98e4
Addresses requested changes
AdimekweEbuka Oct 14, 2021
1438a00
Addresses new requested changes
AdimekweEbuka Oct 15, 2021
1c97b04
Removes USD balance when balance is hidden
AdimekweEbuka Oct 16, 2021
3a1cd71
Removes unused comments
AdimekweEbuka Oct 16, 2021
7e231f6
Resolves HideBalanceConfigKey string value
AdimekweEbuka Oct 17, 2021
dbbcf55
add tooltip to hide balance icon
dreacot Oct 17, 2021
7c674e4
fix hidden balance tooltip hover
Sirmorrison Oct 21, 2021
cdbd6a1
comment out hidden balance label/tooltip
Sirmorrison Oct 21, 2021
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
59 changes: 26 additions & 33 deletions ui/page/main_page.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const (
TicketsNavID
ProposalsNavID
MoreNavID
HideBalanceConfigKey = "hide_Balance"
dreacot marked this conversation as resolved.
Show resolved Hide resolved
AdimekweEbuka marked this conversation as resolved.
Show resolved Hide resolved
AdimekweEbuka marked this conversation as resolved.
Show resolved Hide resolved
)

var (
Expand Down Expand Up @@ -60,7 +61,7 @@ type MainPage struct {
totalBalance dcrutil.Amount
totalBalanceUSD string

hideBalance decredmaterial.IconButton
hideBalanceButton decredmaterial.IconButton
isBalanceHidden bool
}

Expand All @@ -70,7 +71,12 @@ func NewMainPage(l *load.Load) *MainPage {
autoSync: true,
}

mp.hideBalance = mp.hideBalanceIcon()
//mp.hideBalanceButton = mp.hideBalanceIcon()
dreacot marked this conversation as resolved.
Show resolved Hide resolved
AdimekweEbuka marked this conversation as resolved.
Show resolved Hide resolved
mp.hideBalanceButton = mp.Theme.PlainIconButton(mp.Icons.ConcealIcon)
mp.hideBalanceButton.Color = mp.Theme.Color.Gray3
mp.hideBalanceButton.Size = unit.Dp(19)
buttonInset := layout.UniformInset(values.MarginPadding4)
mp.hideBalanceButton.Inset = buttonInset
AdimekweEbuka marked this conversation as resolved.
Show resolved Hide resolved

// init shared page functions
toggleSync := func() {
Expand Down Expand Up @@ -333,10 +339,10 @@ func (mp *MainPage) Handle() {
}
}

mp.isBalanceHidden = mp.WL.MultiWallet.ReadBoolConfigValueForKey("hide Balance", false)
if mp.hideBalance.Button.Clicked() {
mp.isBalanceHidden = mp.WL.MultiWallet.ReadBoolConfigValueForKey(HideBalanceConfigKey, false)
if mp.hideBalanceButton.Button.Clicked() {
mp.isBalanceHidden = !mp.isBalanceHidden
mp.WL.MultiWallet.SetBoolConfigValueForKey("hide Balance", mp.isBalanceHidden)
mp.WL.MultiWallet.SetBoolConfigValueForKey(HideBalanceConfigKey, mp.isBalanceHidden)
}
}

Expand Down Expand Up @@ -470,7 +476,7 @@ func (mp *MainPage) LayoutUSDBalance(gtx layout.Context) layout.Dimensions {
}
return border.Layout(gtx, func(gtx C) D {
return padding.Layout(gtx, func(gtx C) D {
return mp.totalUSDBalance(gtx)
return mp.Theme.Body2(mp.totalBalanceUSD).Layout(gtx)
})
})
})
Expand All @@ -480,33 +486,17 @@ func (mp *MainPage) LayoutUSDBalance(gtx layout.Context) layout.Dimensions {
)
}

func (mp *MainPage) totalUSDBalance(gtx layout.Context) layout.Dimensions {
if mp.isBalanceHidden {
hiddenText:= mp.Theme.Body2("$******")
return hiddenText.Layout(gtx)
}
return mp.Theme.Body2(mp.totalBalanceUSD).Layout(gtx)
}


func (mp *MainPage) totalDCRBalance(gtx layout.Context) layout.Dimensions {
if mp.isBalanceHidden {
hiddenBalanceText := mp.Theme.Label(values.TextSize20.Scale(0.8), "**********DCR")
return hiddenBalanceText.Layout(gtx)
}
hiddenBalanceText := mp.Theme.Label(values.TextSize18.Scale(0.8), "**********DCR")
return layout.Inset{Bottom: values.MarginPadding0, Top: values.MarginPadding5}.Layout(gtx, func(gtx C) D {
return hiddenBalanceText.Layout(gtx)
})

}
return components.LayoutBalance(gtx, mp.Load, mp.totalBalance.String())
}

func (mp *MainPage) hideBalanceIcon() (decredmaterial.IconButton) {
hideButton := mp.Theme.PlainIconButton(mp.Icons.ConcealIcon)
hideButton.Color = mp.Theme.Color.Gray3
hideButton.Size = unit.Dp(20)
buttonInset := layout.UniformInset(values.MarginPadding4)
hideButton.Inset = buttonInset

return hideButton
}

func (mp *MainPage) LayoutTopBar(gtx layout.Context) layout.Dimensions {
return decredmaterial.LinearLayout{
Width: decredmaterial.MatchParent,
Expand Down Expand Up @@ -545,15 +535,18 @@ func (mp *MainPage) LayoutTopBar(gtx layout.Context) layout.Dimensions {
return mp.totalDCRBalance(gtx)
}),
layout.Rigid(func(gtx C) D {
if !mp.isBalanceHidden {
return mp.LayoutUSDBalance(gtx)
}),
}
return layout.Dimensions{}
}),
layout.Rigid(func(gtx C) D {
mp.hideBalance.Icon = mp.Icons.RevealIcon
mp.hideBalanceButton.Icon = mp.Icons.RevealIcon
if mp.isBalanceHidden {
mp.hideBalance.Icon = mp.Icons.ConcealIcon
mp.hideBalanceButton.Icon = mp.Icons.ConcealIcon
}
return layout.Inset{Top: values.MarginPadding1}.Layout(gtx, func(gtx C) D {
return layout.E.Layout(gtx, mp.hideBalance.Layout)
return layout.Inset{Top: values.MarginPadding1, Left: values.MarginPadding9}.Layout(gtx, func(gtx C) D {
return layout.E.Layout(gtx, mp.hideBalanceButton.Layout)
})

}),
Expand Down