review changes

Signed-off-by: Philemon Ukane <[email protected]>
ukane-philemon · Nov 27, 2023 · 6db823b · 6db823b
1 parent 95375fd
commit 6db823b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 20 deletions.
diff --git a/ui/page/dcrdex/market.go b/ui/page/dcrdex/market.go
@@ -32,9 +32,10 @@ var (
 	u8                         = values.MarginPadding8
 	u300                       = values.MarginPadding300
 	orderFormAndOrderBookWidth = (values.AppWidth / 2) - 40 // Minus 40 px to allow for margin between the order form and order book.
-	// orderFormAndOrderBookHeight is a constant height for the order form and
-	// orderbook. Use this to ensure they have the same height as they are
-	// displayed sided by side.
+	// orderFormAndOrderBookHeight is a an arbitrary height that accommodates
+	// the current order form elements and maxOrderDisplayedInOrderBook. Use
+	// this to ensure they(order form nad orderbook) have the same height as
+	// they are displayed sided by side.
 	orderFormAndOrderBookHeight = values.MarginPadding515
 
 	limitOrderIndex = 0

diff --git a/ui/page/exchange/order_history_page.go b/ui/page/exchange/order_history_page.go
@@ -202,9 +202,7 @@ func (pg *OrderHistoryPage) layout(gtx C) D {
 												Top: values.MarginPadding60,
 											}.Layout(gtx, pg.layoutHistory)
 										}),
-										layout.Expanded(func(gtx C) D {
-											return pg.statusDropdown.Layout(gtx)
-										}),
+										layout.Expanded(pg.statusDropdown.Layout),
 									)
 								})
 							}),

diff --git a/ui/page/governance/consensus_page.go b/ui/page/governance/consensus_page.go
@@ -6,7 +6,6 @@ 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"
@@ -81,9 +80,9 @@ func NewConsensusPage(l *load.Load) *ConsensusPage {
 	}, values.ConsensusDropdownGroup, 0, 10, true)
 
 	if pg.statusDropDown.Reversed() {
-		pg.statusDropDown.ExpandedLayoutInset.Right = unit.Dp(55)
+		pg.statusDropDown.ExpandedLayoutInset.Right = values.MarginPadding55
 	} else {
-		pg.statusDropDown.ExpandedLayoutInset.Left = unit.Dp(55)
+		pg.statusDropDown.ExpandedLayoutInset.Left = values.MarginPadding55
 	}
 
 	return pg
@@ -318,9 +317,9 @@ func (pg *ConsensusPage) layoutDesktop(gtx layout.Context) layout.Dimensions {
 					}),
 					layout.Expanded(func(gtx C) D {
 						if pg.statusDropDown.Reversed() {
-							pg.statusDropDown.ExpandedLayoutInset.Right = unit.Dp(10)
+							pg.statusDropDown.ExpandedLayoutInset.Right = values.MarginPadding10
 						} else {
-							pg.statusDropDown.ExpandedLayoutInset.Left = unit.Dp(10)
+							pg.statusDropDown.ExpandedLayoutInset.Left = values.MarginPadding10
 						}
 						return pg.statusDropDown.Layout(gtx)
 					}),

diff --git a/ui/page/governance/proposals_page.go b/ui/page/governance/proposals_page.go
@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"gioui.org/layout"
-	"gioui.org/unit"
 	"gioui.org/widget"
 	"gioui.org/widget/material"
 
@@ -274,9 +273,9 @@ func (pg *ProposalsPage) layoutMobile(gtx layout.Context) layout.Dimensions {
 					}),
 					layout.Expanded(func(gtx C) D {
 						if pg.statusDropDown.Reversed() {
-							pg.statusDropDown.ExpandedLayoutInset.Right = unit.Dp(55)
+							pg.statusDropDown.ExpandedLayoutInset.Right = values.MarginPadding55
 						} else {
-							pg.statusDropDown.ExpandedLayoutInset.Left = unit.Dp(55)
+							pg.statusDropDown.ExpandedLayoutInset.Left = values.MarginPadding55
 						}
 						return pg.statusDropDown.Layout(gtx)
 					}),

diff --git a/ui/page/transaction/transactions_page.go b/ui/page/transaction/transactions_page.go
@@ -283,9 +283,7 @@ func (pg *TransactionsPage) layoutDesktop(gtx layout.Context) layout.Dimensions
 						})
 					})
 				}),
-				layout.Expanded(func(gtx C) D {
-					return pg.txTypeDropDown.Layout(gtx)
-				}),
+				layout.Expanded(pg.txTypeDropDown.Layout),
 			)
 		})
 	})
@@ -351,9 +349,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)
-						})
+						return layout.Inset{Right: values.MarginPadding10}.Layout(gtx, pg.txTypeDropDown.Layout)
 					}),
 				)
 			}),

diff --git a/ui/values/dimensions.go b/ui/values/dimensions.go
@@ -51,6 +51,7 @@ var (
 	MarginPadding48       = unit.Dp(48)
 	MarginPadding50       = unit.Dp(50)
 	MarginPadding52       = unit.Dp(52)
+	MarginPadding55       = unit.Dp(55)
 	MarginPadding56       = unit.Dp(56)
 	MarginPadding60       = unit.Dp(60)
 	MarginPadding62       = unit.Dp(62)