fix title overlay

JustinBeBoy · May 4, 2024 · 7c99122 · 7c99122
1 parent a247b2f
commit 7c99122
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/ui/page/components/components.go b/ui/page/components/components.go
@@ -17,6 +17,7 @@ import (
 	"gioui.org/font"
 	"gioui.org/io/clipboard"
 	"gioui.org/layout"
+	"gioui.org/text"
 	"gioui.org/unit"
 	"gioui.org/widget"
 
@@ -875,6 +876,7 @@ func DisablePageWithOverlay(l *load.Load, currentPage app.Page, gtx C, title, su
 		lbl := l.Theme.Label(values.TextSize20, title)
 		lbl.Font.Weight = font.SemiBold
 		lbl.Color = l.Theme.Color.PageNavText
+		lbl.Alignment = text.Middle
 		return layout.Inset{Bottom: values.MarginPadding20}.Layout(gtx.Disabled(), lbl.Layout)
 	}
 

diff --git a/ui/page/receive/receive_page.go b/ui/page/receive/receive_page.go
@@ -10,6 +10,7 @@ import (
 	"gioui.org/io/semantic"
 	"gioui.org/layout"
 	"gioui.org/op"
+	"gioui.org/text"
 	"gioui.org/widget"
 
 	"github.com/crypto-power/cryptopower/app"
@@ -290,6 +291,7 @@ func (pg *Page) contentLayout(gtx C) D {
 									func(gtx C) D {
 										warning := pg.Theme.Label(textSize16, values.String(values.StrFunctionUnavailable))
 										warning.Color = pg.Theme.Color.Danger
+										warning.Alignment = text.Middle
 										return warning.Layout(gtx)
 
 									},

diff --git a/ui/page/send/layout.go b/ui/page/send/layout.go
@@ -6,6 +6,7 @@ import (
 	"gioui.org/font"
 	"gioui.org/layout"
 	"gioui.org/op"
+	"gioui.org/text"
 	"gioui.org/widget"
 
 	sharedW "github.com/crypto-power/cryptopower/libwallet/assets/wallet"
@@ -189,6 +190,7 @@ func (pg *Page) notSyncedLayout(gtx C) D {
 			func(gtx C) D {
 				warning := pg.Theme.Label(textSize16, values.String(values.StrFunctionUnavailable))
 				warning.Color = pg.Theme.Color.Danger
+				warning.Alignment = text.Middle
 				return warning.Layout(gtx)
 
 			},

diff --git a/ui/page/transaction/transactions_page.go b/ui/page/transaction/transactions_page.go
@@ -13,6 +13,7 @@ import (
 
 	"gioui.org/font"
 	"gioui.org/layout"
+	"gioui.org/text"
 	"gioui.org/widget"
 	"gioui.org/widget/material"
 
@@ -382,6 +383,7 @@ func (pg *TransactionsPage) dropdownLayout(gtx C) D {
 }
 
 func (pg *TransactionsPage) leftDropdown(gtx C) D {
+	showOverlay := pg.walletNotReady() && pg.multiWalletLayout
 	return layout.Flex{Spacing: layout.SpaceBetween}.Layout(gtx,
 		layout.Rigid(func(gtx C) D {
 			if pg.isShowTitle && pg.IsMobileView() {
@@ -396,6 +398,9 @@ func (pg *TransactionsPage) leftDropdown(gtx C) D {
 
 		}),
 		layout.Rigid(func(gtx C) D {
+			if showOverlay {
+				return D{}
+			}
 			icon := pg.Theme.Icons.FilterOffImgIcon
 			if pg.isFilterOpen {
 				icon = pg.Theme.Icons.FilterImgIcon
@@ -550,6 +555,7 @@ func (pg *TransactionsPage) txListLayout(gtx C) D {
 			lbl := pg.Theme.Label(pg.ConvertTextSize(values.TextSize20), values.String(values.StrFunctionUnavailable))
 			lbl.Font.Weight = font.SemiBold
 			lbl.Color = pg.Theme.Color.PageNavText
+			lbl.Alignment = text.Middle
 			return cryptomaterial.CentralizeWidget(gtx, lbl.Layout)
 		}),
 	)