Moves Hide balance to settings page

planetdecred · Sep 29, 2021 · fa30658 · fa30658
1 parent 6899c7f
commit fa30658
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 42 deletions.
diff --git a/ui/page/main_page.go b/ui/page/main_page.go
@@ -6,7 +6,6 @@ import (
 	"gioui.org/layout"
 	"gioui.org/unit"
 	"gioui.org/widget"
-	"gioui.org/widget/material"
 
 	"github.com/decred/dcrd/dcrutil"
 	"github.com/planetdecred/dcrlibwallet"
@@ -62,12 +61,9 @@ type MainPage struct {
 	totalBalanceUSD string
 
 	hideBalance *widget.Bool
-	text        string
-	hide        bool
 }
 
 func NewMainPage(l *load.Load) *MainPage {
-
 	mp := &MainPage{
 		Load:        l,
 		autoSync:    true,
@@ -482,14 +478,17 @@ func (mp *MainPage) LayoutUSDBalance(gtx layout.Context) layout.Dimensions {
 	)
 }
 
-func (mp *MainPage) titleRow(gtx layout.Context, leftWidget, rightWidget func(C) D) layout.Dimensions {
-	return layout.Flex{Axis: layout.Horizontal, Spacing: layout.SpaceBetween}.Layout(gtx,
-		layout.Rigid(leftWidget),
-		layout.Rigid(rightWidget),
-	)
+func (mp *MainPage) HideMyBalance(gtx layout.Context, hbal bool) layout.Dimensions {
+	if hbal {
+		hidenText := mp.Theme.Label(values.TextSize24, "********")
+		return hidenText.Layout(gtx)
+	}
+	return components.LayoutBalance(gtx, mp.Load, mp.totalBalance.String())
+
 }
 
 func (mp *MainPage) LayoutTopBar(gtx layout.Context) layout.Dimensions {
+	hideValue:= mp.WL.MultiWallet.ReadBoolConfigValueForKey("HideBalance", false)
 	return decredmaterial.LinearLayout{
 		Width:       decredmaterial.MatchParent,
 		Height:      decredmaterial.WrapContent,
@@ -523,40 +522,9 @@ func (mp *MainPage) LayoutTopBar(gtx layout.Context) layout.Dimensions {
 												return img.Layout24dp(gtx)
 											})
 									}),
-									layout.Rigid(func(gtx C) D {
-										if mp.hideBalance.Changed() {
-											mp.hide = !mp.hide
-										}
-										return layout.Center.Layout(gtx, func(gtx C) D {
-											if mp.hide {
-												hidenText := mp.Theme.Label(values.TextSize24, "********")
-												return hidenText.Layout(gtx)
-											} else {
-												return components.LayoutBalance(gtx, mp.Load, mp.totalBalance.String())
-											}
-										})
+									layout.Rigid(func(gtx C) D{
+										return mp.HideMyBalance(gtx, hideValue)
 									}),
-									layout.Rigid(
-										func(gtx C) D {
-											margins := layout.Inset{
-												Top:    unit.Dp(8),
-												Left:   unit.Dp(18),
-												Bottom: unit.Dp(4),
-											}
-											return margins.Layout(gtx,
-												func(gtx C) D {
-													if mp.hide {
-														mp.text = "Show Balance   "
-													} else {
-														mp.text = "Hide Balance   "
-													}
-													// hidebal:= material.Button(mp.theme.Base, mp.hideBalance, mp.text)
-													hidebal := material.Switch(mp.Theme.Base, mp.hideBalance)
-													balTitle := mp.Theme.Label(values.TextSize12, mp.text)
-													balTitle.Color = mp.Theme.Color.Gray2
-													return mp.titleRow(gtx, balTitle.Layout, hidebal.Layout)
-												})
-										}),
 									layout.Rigid(func(gtx C) D {
 										return mp.LayoutUSDBalance(gtx)
 									}),

diff --git a/ui/page/settings_page.go b/ui/page/settings_page.go
@@ -51,6 +51,7 @@ type SettingsPage struct {
 	beepNewBlocks    *decredmaterial.Switch
 	connectToPeer    *decredmaterial.Switch
 	userAgent        *decredmaterial.Switch
+	HideBalance      *decredmaterial.Switch
 
 	peerLabel, agentLabel decredmaterial.Label
 
@@ -80,6 +81,7 @@ func NewSettingsPage(l *load.Load) *SettingsPage {
 		beepNewBlocks:    l.Theme.Switch(),
 		connectToPeer:    l.Theme.Switch(),
 		userAgent:        l.Theme.Switch(),
+		HideBalance:      l.Theme.Switch(),
 		chevronRightIcon: chevronRightIcon,
 
 		errorReceiver: make(chan error),
@@ -177,6 +179,9 @@ func (pg *SettingsPage) general() layout.Widget {
 				layout.Rigid(func(gtx C) D {
 					return pg.subSectionSwitch(gtx, "Dark mode", pg.isDarkModeOn)
 				}),
+				layout.Rigid(func(gtx C) D {
+					return pg.subSectionSwitch(gtx, "Hide balance", pg.HideBalance)
+				}),
 				layout.Rigid(func(gtx C) D {
 					return pg.subSectionSwitch(gtx, values.String(values.StrUnconfirmedFunds), pg.spendUnconfirmed)
 				}),
@@ -407,6 +412,9 @@ func (pg *SettingsPage) Handle() {
 		pg.RefreshTheme()
 	}
 
+	if pg.HideBalance.Changed() {
+		pg.wal.SaveConfigValueForKey("HideBalance", pg.HideBalance.IsChecked())
+	}
 	if pg.spendUnconfirmed.Changed() {
 		pg.wal.SaveConfigValueForKey(dcrlibwallet.SpendUnconfirmedConfigKey, pg.spendUnconfirmed.IsChecked())
 	}
@@ -597,6 +605,12 @@ func (pg *SettingsPage) updateSettingOptions() {
 		pg.isDarkModeOn.SetChecked(isDarkModeOn)
 	}
 
+	HideBalance := pg.wal.ReadBoolConfigValueForKey("HideBalance")
+	pg.HideBalance.SetChecked(false)
+	if HideBalance {
+		pg.HideBalance.SetChecked(HideBalance)
+	}
+
 	isSpendUnconfirmed := pg.wal.ReadBoolConfigValueForKey(dcrlibwallet.SpendUnconfirmedConfigKey)
 	pg.spendUnconfirmed.SetChecked(false)
 	if isSpendUnconfirmed {