Skip to content

Commit

Permalink
Fix feedback:
Browse files Browse the repository at this point in the history
- Fix darkmode for modals
- Fix darkmode for receive address
  • Loading branch information
tuhalang committed May 23, 2021
1 parent 87fd4f7 commit 4ad65f8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
11 changes: 6 additions & 5 deletions ui/page.go
Expand Up @@ -221,6 +221,11 @@ func (win *Window) addPages(decredIcons map[string]image.Image) {
listGridIcon: &widget.Image{Src: paint.NewImageOp(decredIcons["list_grid"])},
}

win.loadPage(ic)
}

func (win *Window) loadPage(ic pageIcons) {

appBarNavItems := []navHandler{
{
clickable: new(widget.Clickable),
Expand Down Expand Up @@ -348,10 +353,6 @@ func (win *Window) addPages(decredIcons map[string]image.Image) {

common.modalTemplate = win.LoadModalTemplates()

win.loadPage(common)
}

func (win *Window) loadPage(common pageCommon) {
win.pages = make(map[string]layout.Widget)
win.pages[PageWallet] = win.WalletPage(common)
win.pages[PageOverview] = win.OverviewPage(common)
Expand Down Expand Up @@ -382,7 +383,7 @@ func (win *Window) loadPage(common pageCommon) {
}

func (win *Window) reloadPage(common pageCommon) {
win.loadPage(common)
win.loadPage(common.icons)
}

func (page *pageCommon) fetchExchangeValue(target interface{}) error {
Expand Down
1 change: 1 addition & 0 deletions ui/receive_page.go
Expand Up @@ -225,6 +225,7 @@ func (pg *receivePage) addressLayout(gtx layout.Context, c pageCommon) layout.Di
return layout.Flex{Alignment: layout.Middle}.Layout(gtx,
layout.Flexed(1, func(gtx C) D {
pg.receiveAddress.Text = pg.addrs
pg.receiveAddress.Color = pg.theme.Color.DeepBlue
pg.receiveAddress.Alignment = text.Middle
pg.receiveAddress.MaxLines = 1
card.Radius = decredmaterial.CornerRadius{NE: 8, NW: 0, SE: 0, SW: 8}
Expand Down
2 changes: 1 addition & 1 deletion ui/settings_page.go
Expand Up @@ -388,7 +388,7 @@ func (pg *settingsPage) lineSeparator() layout.Widget {
func (pg *settingsPage) handle(common pageCommon, win *Window) {

if pg.isDarkModeOn.Changed() {
pg.theme.SwitchDarkMode(pg.isDarkModeOn.Value)
win.theme.SwitchDarkMode(pg.isDarkModeOn.Value)
pg.wal.SaveConfigValueForKey("isDarkModeOn", pg.isDarkModeOn.Value)
win.reloadPage(common)
}
Expand Down

0 comments on commit 4ad65f8

Please sign in to comment.