improve dark mode

JustinBeBoy · May 13, 2024 · b1fee7f · b1fee7f
1 parent e507ac0
commit b1fee7f
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 5 deletions.
diff --git a/ui/assets/decredicons/dm_matrix.png b/ui/assets/decredicons/dm_matrix.png
diff --git a/ui/assets/decredicons/dm_www_icon.png b/ui/assets/decredicons/dm_www_icon.png
diff --git a/ui/assets/decredicons/telegram.png b/ui/assets/decredicons/telegram.png
diff --git a/ui/assets/decredicons/twitter.png b/ui/assets/decredicons/twitter.png
diff --git a/ui/cryptomaterial/icon_gallery.go b/ui/cryptomaterial/icon_gallery.go
@@ -265,5 +265,7 @@ func (i *Icons) DarkModeIcons() *Icons {
 	i.ChevronLeft = NewImage(decredIcons["chevron_left"])
 	i.Notification = NewImage(decredIcons["dm_notification"])
 	i.TradeExchangeIcon = NewImage(decredIcons["dm_trade_exchange_icon"])
+	i.WebsiteIcon = NewImage(decredIcons["dm_www_icon"])
+	i.MatrixIcon = NewImage(decredIcons["dm_matrix"])
 	return i
 }
diff --git a/ui/page/components/components.go b/ui/page/components/components.go
@@ -896,7 +896,7 @@ func DisablePageWithOverlay(l *load.Load, currentPage app.Page, gtx C, title, su
 
 func WalletHighlightLabel(theme *cryptomaterial.Theme, gtx C, textSize unit.Sp, content string) D {
 	indexLabel := theme.Label(textSize, content)
-	indexLabel.Color = theme.Color.PageNavText
+	indexLabel.Color = theme.Color.DeepBlueOrigin
 	indexLabel.Font.Weight = font.Medium
 	return cryptomaterial.LinearLayout{
 		Width:      cryptomaterial.WrapContent,

diff --git a/ui/page/components/sub_page.go b/ui/page/components/sub_page.go
@@ -65,7 +65,7 @@ func (sp *SubPage) Layout(window app.WindowNavigator, gtx C) D {
 				return sp.Header(window, gtx)
 			})
 		}),
-		layout.Rigid(sp.Body),
+		layout.Flexed(1, sp.Body),
 	)
 }
 

diff --git a/ui/page/components/wallet_setup_page.go b/ui/page/components/wallet_setup_page.go
@@ -131,7 +131,7 @@ func NewCreateWallet(l *load.Load, walletCreationSuccessCallback func(), assetTy
 	pg.seedTypeDropdown.FontWeight = font.SemiBold
 	pg.seedTypeDropdown.ExpandedLayoutInset = layout.Inset{Top: values.MarginPadding35}
 	pg.seedTypeDropdown.MakeCollapsedLayoutVisibleWhenExpanded = true
-	pg.seedTypeDropdown.Background = &pg.Theme.Color.White
+	pg.seedTypeDropdown.Background = &pg.Theme.Color.Surface
 
 	pg.backButton = GetBackButton(l)
 

diff --git a/ui/preference/list_preference.go b/ui/preference/list_preference.go
@@ -193,6 +193,7 @@ func (lp *ListPreferenceModal) Layout(gtx C) D {
 			return layout.E.Layout(gtx, func(gtx C) D {
 				return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
 					layout.Rigid(lp.btnCancel.Layout),
+					layout.Rigid(layout.Spacer{Width: values.MarginPadding5}.Layout),
 					layout.Rigid(lp.btnSave.Layout),
 				)
 			})

diff --git a/ui/values/colors.go b/ui/values/colors.go
@@ -15,7 +15,6 @@ const (
 
 type Color struct {
 	Primary          color.NRGBA
-	Primary50        color.NRGBA
 	PrimaryHighlight color.NRGBA
 
 	// text colors
@@ -34,6 +33,7 @@ type Color struct {
 	BlueProgressTint color.NRGBA
 	Danger           color.NRGBA
 	DeepBlue         color.NRGBA
+	DeepBlueOrigin   color.NRGBA
 	NavyBlue         color.NRGBA
 	LightBlue        color.NRGBA
 	LightBlue2       color.NRGBA
@@ -98,7 +98,6 @@ func (c *Color) DarkThemeColors() {
 func (c *Color) DefaultThemeColors() *Color {
 	cl := Color{
 		Primary:          rgb(0x2970ff),
-		Primary50:        rgb(0xE3F2FF),
 		PrimaryHighlight: rgb(0x1B41B3),
 
 		// text colors
@@ -117,6 +116,7 @@ func (c *Color) DefaultThemeColors() *Color {
 		BlueProgressTint: rgb(0x73d7ff),
 		Danger:           rgb(0xed6d47),
 		DeepBlue:         rgb(0x091440),
+		DeepBlueOrigin:   rgb(0x091440),
 		NavyBlue:         rgb(0x1F45B0),
 		LightBlue:        rgb(0xe4f6ff),
 		LightBlue2:       rgb(0x75D8FF),
-Original file line number
+Diff line change
@@ Expand Up @@
     				return sp.Header(window, gtx)
     			})
     		}),
-    		layout.Rigid(sp.Body),
+    		layout.Flexed(1, sp.Body),
     	)
     }
@@ Expand Down @@