From 470cd5ddf2ae3f37e6d64eb781ec141f3a7893e9 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Wed, 27 Dec 2023 11:00:37 +0800 Subject: [PATCH] Navigation toolbar colours --- .../App/Views/Home/HomeFeedViewIOS.swift | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift index 7f413663d..71424ba16 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift @@ -282,19 +282,20 @@ struct AnimatingCellHeight: AnimatableModifier { label: { Image .selectMultiple - .foregroundColor(ThemeManager.currentTheme.toolbarColor) + .foregroundColor(Color.toolbarItemForeground) } - ).foregroundColor(ThemeManager.currentTheme.toolbarColor) + ).buttonStyle(.plain) } if enableGrid { Button( action: { prefersListLayout.toggle() }, label: { Image(systemName: prefersListLayout ? "square.grid.2x2" : "list.bullet") - .foregroundColor(ThemeManager.currentTheme.toolbarColor) + .foregroundColor(Color.toolbarItemForeground) } - ) + ).buttonStyle(.plain) } + Button( action: { if viewModel.folder == "inbox" { @@ -305,9 +306,10 @@ struct AnimatingCellHeight: AnimatableModifier { }, label: { Image.addLink - .foregroundColor(ThemeManager.currentTheme.toolbarColor) + .foregroundColor(Color.toolbarItemForeground) } - ).tint(Color.appGrayText) + ).buttonStyle(.plain) + Button( action: { searchPresented = true @@ -316,9 +318,9 @@ struct AnimatingCellHeight: AnimatableModifier { label: { Image .magnifyingGlass - .foregroundColor(ThemeManager.currentTheme.toolbarColor) + .foregroundColor(Color.toolbarItemForeground) } - ) + ).buttonStyle(.plain) } ToolbarItemGroup(placement: .bottomBar) {