Skip to content

Commit

Permalink
review changes
Browse files Browse the repository at this point in the history 
Signed-off-by: Philemon Ukane <[email protected]>
  • Loading branch information
@ukane-philemon
ukane-philemon committed Nov 5, 2023
1 parent c15498a commit 0e68441
Show file tree
Hide file tree
Showing 9 changed files with 244 additions and 179 deletions.
329 changes: 187 additions & 142 deletions ui/cryptomaterial/dropdown.go
View file

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions ui/cryptomaterial/segmented_control.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type SegmentedControl struct {
leftNavBtn,
rightNavBtn *Clickable

Padding *layout.Inset
Padding layout.Inset

selectedIndex int
segmentTitles []string
Expand All @@ -35,6 +35,7 @@ func (t *Theme) SegmentedControl(segmentTitles []string) *SegmentedControl {
segmentTitles: segmentTitles,
leftNavBtn: t.NewClickable(false),
rightNavBtn: t.NewClickable(false),
Padding: layout.UniformInset(values.MarginPadding8),
}
}

Expand Down Expand Up @@ -66,12 +67,9 @@ func (sc *SegmentedControl) Layout(gtx C) D {
Background: bg,
Margin: layout.UniformInset(values.MarginPadding5),
Border: border,
Padding: sc.Padding,
}
if sc.Padding != nil {
ll.Padding = *sc.Padding
} else {
ll.Padding = layout.UniformInset(values.MarginPadding8)
}

return ll.Layout2(gtx, txt.Layout)
})
})
Expand Down
4 changes: 2 additions & 2 deletions ui/cryptomaterial/theme.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ func mulAlpha(c color.NRGBA, alpha uint8) color.NRGBA {
func (t *Theme) closeAllDropdownMenus(group uint) {
for _, dropDown := range t.dropDownMenus {
if dropDown.group == group {
dropDown.isOpen = false
dropDown.expanded = false
}
}
}
Expand All @@ -225,7 +225,7 @@ func (t *Theme) closeAllDropdownMenus(group uint) {
func (t *Theme) isOpenDropdownGroup(group uint) bool {
for _, dropDown := range t.dropDownMenus {
if dropDown.group == group {
if dropDown.isOpen {
if dropDown.expanded {
return true
}
}
Expand Down
4 changes: 2 additions & 2 deletions ui/page/dcrdex/dex_onboarding_page.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func NewDEXOnboarding(l *load.Load) *DEXOnboarding {
currentStep: onboardingSetPassword,
passwordEditor: newPasswordEditor(th, values.String(values.StrNewPassword)),
confirmPasswordEditor: newPasswordEditor(th, values.String(values.StrConfirmPassword)),
serverDropDown: th.DropDown(knownDEXServers[l.WL.Wallet.Net], values.DEXServerDropdownGroup, 0),
serverDropDown: th.DropDown(knownDEXServers[l.WL.Wallet.Net], values.DEXServerDropdownGroup, 0, 0, false),
addServerBtn: th.NewClickable(false),
serverURLEditor: newTextEditor(th, values.String(values.StrServerURL), values.String(values.StrInputURL), false),
serverCertEditor: newTextEditor(th, values.String(values.StrCertificateOPtional), values.String(values.StrInputCertificate), true),
Expand Down Expand Up @@ -365,7 +365,7 @@ func (pg *DEXOnboarding) stepChooseServer(gtx C) D {
return layout.Inset{Top: u20}.Layout(gtx, l.Layout)
}),
layout.Rigid(func(gtx C) D {
return pg.serverDropDown.Layout(gtx, 0, false)
return pg.serverDropDown.Layout(gtx)
}),
layout.Rigid(func(gtx C) D {
return layout.Flex{Axis: layout.Horizontal, Alignment: layout.Start}.Layout(gtx,
Expand Down
30 changes: 15 additions & 15 deletions ui/page/dcrdex/market.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func NewDEXMarketPage(l *load.Load) *DEXMarketPage {
createOrderBtn: th.Button(values.String(values.StrBuy)), // TODO: toggle
buyOrder: true,
immediateOrder: th.CheckBox(new(widget.Bool), values.String(values.StrImmediate)),
orderTypesDropdown: th.DropDown(orderTypes, values.DEXOrderTypes, 0),
orderTypesDropdown: th.DropDown(orderTypes, values.DEXOrderTypes, 0, 0, true),
immediateMoreInfo: th.NewClickable(false),
addServerBtn: th.NewClickable(false),
seeFullOrderBookBtn: th.Button(values.String(values.StrSeeMore)),
Expand All @@ -115,17 +115,17 @@ func NewDEXMarketPage(l *load.Load) *DEXMarketPage {
}

btnPadding := layout.Inset{Top: u8, Right: u20, Left: u20, Bottom: u8}
pg.toggleBuyAndSellBtn.Padding = &btnPadding
pg.toggleBuyAndSellBtn.Padding = btnPadding
pg.openOrdersBtn.Inset, pg.orderHistoryBtn.Inset = btnPadding, btnPadding
pg.openOrdersBtn.Font.Weight, pg.orderHistoryBtn.Font.Weight = font.SemiBold, font.SemiBold

pg.orderTypesDropdown.SelectedItemDirection = layout.E
pg.orderTypesDropdown.SelectedItemDirectionAfterCollapse = layout.E
pg.orderTypesDropdown.Width = values.MarginPadding120
pg.orderTypesDropdown.FontWeight = font.SemiBold
pg.orderTypesDropdown.MakeSelectedItemHoverable = false
pg.orderTypesDropdown.MakeSelectedItemHoverableAfterCollapse = false
pg.orderTypesDropdown.SelectedItemIconColor = &pg.Theme.Color.Primary
pg.orderTypesDropdown.OpenedLayoutInset = &layout.Inset{Top: values.MarginPadding30}
pg.orderTypesDropdown.Stack = true
pg.orderTypesDropdown.ExpandedLayoutInset = layout.Inset{Top: values.MarginPadding30}
pg.orderTypesDropdown.StackBelowCollapsedLayout = true

pg.priceEditor.IsTitleLabel, pg.lotsAmountEditor.IsTitleLabel, pg.totalEditor.IsTitleLabel = false, false, false

Expand Down Expand Up @@ -157,7 +157,7 @@ func (pg *DEXMarketPage) OnNavigatedTo() {
})
}

pg.serverSelector = pg.Theme.DropDown(servers, values.DEXServerDropdownGroup, 0 /* TODO: use real value */)
pg.serverSelector = pg.Theme.DropDown(servers, values.DEXServerDropdownGroup, 0 /* TODO: use real value */, 0, false)
pg.serverSelector.SetExtraDisplay(pg.addServerDisplay())
pg.marketSelector = pg.Theme.DropDown([]cryptomaterial.DropDownItem{
{
Expand All @@ -172,16 +172,16 @@ func (pg *DEXMarketPage) OnNavigatedTo() {
Text: "LTC/BTC",
DisplayFn: pg.marketDropdownListItem(libutils.LTCWalletAsset, libutils.BTCWalletAsset),
},
}, values.DEXCurrencyPairGroup, 0)
}, values.DEXCurrencyPairGroup, 0, 0, false)

pg.serverSelector.Width, pg.marketSelector.Width = u300, u300
pg.serverSelector.Stack, pg.marketSelector.Stack = true, true
pg.serverSelector.StackBelowCollapsedLayout, pg.marketSelector.StackBelowCollapsedLayout = true, true
pg.serverSelector.BorderWidth, pg.marketSelector.BorderWidth = u2, u2
pg.serverSelector.MakeSelectedItemHoverable, pg.marketSelector.MakeSelectedItemHoverable = false, false
pg.serverSelector.MakeSelectedItemHoverableAfterCollapse, pg.marketSelector.MakeSelectedItemHoverableAfterCollapse = false, false
pg.serverSelector.SelectedItemIconColor, pg.marketSelector.SelectedItemIconColor = &pg.Theme.Color.Primary, &pg.Theme.Color.Primary

inset := &layout.Inset{Top: 45}
pg.serverSelector.OpenedLayoutInset, pg.marketSelector.OpenedLayoutInset = inset, inset
inset := layout.Inset{Top: 45}
pg.serverSelector.ExpandedLayoutInset, pg.marketSelector.ExpandedLayoutInset = inset, inset

// TODO: Fetch orders or order history.
}
Expand Down Expand Up @@ -343,7 +343,7 @@ func (pg *DEXMarketPage) serverAndCurrencySelection() func(gtx C) D {
return layout.Inset{Top: u2}.Layout(gtx, func(gtx C) D {
pg.serverSelector.Background = &pg.Theme.Color.Surface
pg.serverSelector.BorderColor = &pg.Theme.Color.Gray5
return pg.serverSelector.Layout(gtx, 0, false)
return pg.serverSelector.Layout(gtx)
})
}),
)
Expand All @@ -358,7 +358,7 @@ func (pg *DEXMarketPage) serverAndCurrencySelection() func(gtx C) D {
return layout.Inset{Top: u2}.Layout(gtx, func(gtx C) D {
pg.marketSelector.Background = &pg.Theme.Color.Surface
pg.marketSelector.BorderColor = &pg.Theme.Color.Gray5
return pg.marketSelector.Layout(gtx, 0, false)
return pg.marketSelector.Layout(gtx)
})
}),
)
Expand Down Expand Up @@ -650,7 +650,7 @@ func (pg *DEXMarketPage) orderForm(gtx C) D {
layout.Flexed(1, func(gtx C) D {
return layout.Inset{Bottom: u5, Top: u5}.Layout(gtx, func(gtx C) D {
pg.orderTypesDropdown.Background = &pg.Theme.Color.Surface
return pg.orderTypesDropdown.Layout(gtx, 0, true)
return pg.orderTypesDropdown.Layout(gtx)
})
}),
)
Expand Down
4 changes: 2 additions & 2 deletions ui/page/exchange/order_history_page.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func NewOrderHistoryPage(l *load.Load) *OrderHistoryPage {
{Text: api.OrderStatusNew.String()},
{Text: api.OrderStatusCompleted.String()},
{Text: api.OrderStatusExpired.String()},
}, values.OrderStatusDropdownGroup, 0)
}, values.OrderStatusDropdownGroup, 0, 10, true)

return pg
}
Expand Down Expand Up @@ -216,7 +216,7 @@ func (pg *OrderHistoryPage) layout(gtx C) D {
}.Layout(gtx, pg.layoutHistory)
}),
layout.Expanded(func(gtx C) D {
return pg.statusDropdown.Layout(gtx, 10, true)
return pg.statusDropdown.Layout(gtx)
}),
)
})
Expand Down
17 changes: 14 additions & 3 deletions ui/page/governance/consensus_page.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"gioui.org/font/gofont"
"gioui.org/io/clipboard"
"gioui.org/layout"
"gioui.org/unit"
"gioui.org/widget"
"gioui.org/widget/material"
"golang.org/x/text/cases"
Expand Down Expand Up @@ -77,7 +78,7 @@ func NewConsensusPage(l *load.Load) *ConsensusPage {
{Text: values.String(values.StrFailed)},
{Text: values.String(values.StrLockedIn)},
{Text: values.String(values.StrFinished)},
}, values.ConsensusDropdownGroup, 0)
}, values.ConsensusDropdownGroup, 0, 10, true)

return pg
}
Expand Down Expand Up @@ -310,7 +311,12 @@ func (pg *ConsensusPage) layoutDesktop(gtx layout.Context) layout.Dimensions {
}.Layout(gtx, pg.layoutContent)
}),
layout.Expanded(func(gtx C) D {
return pg.statusDropDown.Layout(gtx, 10, true)
if pg.statusDropDown.Reversed() {
pg.statusDropDown.ExpandedLayoutInset.Right = unit.Dp(10)
} else {
pg.statusDropDown.ExpandedLayoutInset.Left = unit.Dp(10)
}
return pg.statusDropDown.Layout(gtx)
}),
)
})
Expand Down Expand Up @@ -353,7 +359,12 @@ func (pg *ConsensusPage) layoutMobile(gtx layout.Context) layout.Dimensions {
})
}),
layout.Expanded(func(gtx C) D {
return pg.statusDropDown.Layout(gtx, 55, true)
if pg.statusDropDown.Reversed() {
pg.statusDropDown.ExpandedLayoutInset.Right = unit.Dp(55)
} else {
pg.statusDropDown.ExpandedLayoutInset.Left = unit.Dp(55)
}
return pg.statusDropDown.Layout(gtx)
}),
)
})
Expand Down
17 changes: 14 additions & 3 deletions ui/page/governance/proposals_page.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"time"

"gioui.org/layout"
"gioui.org/unit"
"gioui.org/widget"
"gioui.org/widget/material"

Expand Down Expand Up @@ -87,7 +88,7 @@ func NewProposalsPage(l *load.Load) *ProposalsPage {
{Text: values.String(values.StrApproved)},
{Text: values.String(values.StrRejected)},
{Text: values.String(values.StrAbandoned)},
}, values.ProposalDropdownGroup, 0)
}, values.ProposalDropdownGroup, 0, 0, true)

return pg
}
Expand Down Expand Up @@ -240,7 +241,12 @@ func (pg *ProposalsPage) layoutDesktop(gtx layout.Context) layout.Dimensions {
return layout.Inset{Top: values.MarginPadding60}.Layout(gtx, pg.layoutContent)
}),
layout.Expanded(func(gtx C) D {
return pg.statusDropDown.Layout(gtx, 10, true)
if pg.statusDropDown.Reversed() {
pg.statusDropDown.ExpandedLayoutInset.Right = values.MarginPadding10
} else {
pg.statusDropDown.ExpandedLayoutInset.Left = values.MarginPadding10
}
return pg.statusDropDown.Layout(gtx)
}),
)
})
Expand Down Expand Up @@ -272,7 +278,12 @@ func (pg *ProposalsPage) layoutMobile(gtx layout.Context) layout.Dimensions {
})
}),
layout.Expanded(func(gtx C) D {
return pg.statusDropDown.Layout(gtx, 55, true)
if pg.statusDropDown.Reversed() {
pg.statusDropDown.ExpandedLayoutInset.Right = unit.Dp(55)
} else {
pg.statusDropDown.ExpandedLayoutInset.Left = unit.Dp(55)
}
return pg.statusDropDown.Layout(gtx)
}),
)
})
Expand Down
8 changes: 4 additions & 4 deletions ui/page/transaction/transactions_page.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func (pg *TransactionsPage) refreshAvailableTxType() {
items = append(items, item)
}

pg.txTypeDropDown = pg.Theme.DropDown(items, values.TxDropdownGroup, 2)
pg.txTypeDropDown = pg.Theme.DropDown(items, values.TxDropdownGroup, 2, 0, true)

go func() {
countfn := func(fType int32) int {
Expand All @@ -184,7 +184,7 @@ func (pg *TransactionsPage) refreshAvailableTxType() {
}
items = append(items, item)
}
pg.txTypeDropDown = pg.Theme.DropDown(items, values.TxDropdownGroup, 2)
pg.txTypeDropDown = pg.Theme.DropDown(items, values.TxDropdownGroup, 2, 0, true)
pg.ParentWindow().Reload()
}()
}
Expand Down Expand Up @@ -292,7 +292,7 @@ func (pg *TransactionsPage) layoutDesktop(gtx layout.Context) layout.Dimensions
})
}),
layout.Expanded(func(gtx C) D {
return pg.txTypeDropDown.Layout(gtx, 0, true)
return pg.txTypeDropDown.Layout(gtx)
}),
)
})
Expand Down Expand Up @@ -363,7 +363,7 @@ func (pg *TransactionsPage) layoutMobile(gtx layout.Context) layout.Dimensions {
}),
layout.Expanded(func(gtx C) D {
return layout.Inset{Right: values.MarginPadding10}.Layout(gtx, func(gtx C) D {
return pg.txTypeDropDown.Layout(gtx, 0, true)
return pg.txTypeDropDown.Layout(gtx)
})
}),
)
Expand Down

0 comments on commit 0e68441

Please sign in to comment.