diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift
index 37d759043..9ccc8ec72 100644
--- a/iOS/AppAssets.swift
+++ b/iOS/AppAssets.swift
@@ -115,12 +115,8 @@ struct AppAssets {
return RSImage(named: "faviconTemplateImage")!
}()
- static var filterInactiveImage: UIImage = {
- UIImage(systemName: "line.horizontal.3.decrease.circle")!
- }()
-
- static var filterActiveImage: UIImage = {
- UIImage(systemName: "line.horizontal.3.decrease.circle.fill")!
+ static var filterImage: UIImage = {
+ UIImage(systemName: "line.3.horizontal.decrease")!
}()
static var folderOutlinePlus: UIImage = {
diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard
index fdb00e457..0fcd14b0e 100644
--- a/iOS/Base.lproj/Main.storyboard
+++ b/iOS/Base.lproj/Main.storyboard
@@ -40,7 +40,6 @@
-
@@ -212,7 +211,7 @@
-
+
@@ -415,7 +414,7 @@
-
+
diff --git a/iOS/MainFeed/MainFeedViewController.swift b/iOS/MainFeed/MainFeedViewController.swift
index 429a56158..80a3386eb 100644
--- a/iOS/MainFeed/MainFeedViewController.swift
+++ b/iOS/MainFeed/MainFeedViewController.swift
@@ -818,12 +818,14 @@ extension MainFeedViewController: MainFeedTableViewCellDelegate {
private extension MainFeedViewController {
func setFilterButtonToActive() {
- filterButton?.image = AppAssets.filterActiveImage
+ filterButton.style = .prominent
+ filterButton.tintColor = AppAssets.primaryAccentColor
filterButton?.accLabelText = NSLocalizedString("Selected - Filter Read Feeds", comment: "Selected - Filter Read Feeds")
}
func setFilterButtonToInactive() {
- filterButton?.image = AppAssets.filterInactiveImage
+ filterButton.style = .plain
+ filterButton.tintColor = nil
filterButton?.accLabelText = NSLocalizedString("Filter Read Feeds", comment: "Filter Read Feeds")
}
diff --git a/iOS/MainTimeline/MainTimelineViewController.swift b/iOS/MainTimeline/MainTimelineViewController.swift
index 8f914f809..0fd8dc3ac 100644
--- a/iOS/MainTimeline/MainTimelineViewController.swift
+++ b/iOS/MainTimeline/MainTimelineViewController.swift
@@ -23,7 +23,7 @@ class MainTimelineViewController: UITableViewController, UndoableCommandRunner {
@IBOutlet var markAllAsReadButton: UIBarButtonItem?
- private lazy var filterButton = UIBarButtonItem(image: AppAssets.filterInactiveImage, style: .plain, target: self, action: #selector(toggleFilter(_:)))
+ private lazy var filterButton = UIBarButtonItem(image: AppAssets.filterImage, style: .plain, target: self, action: #selector(toggleFilter(_:)))
private lazy var firstUnreadButton = UIBarButtonItem(image: AppAssets.nextUnreadArticleImage, style: .plain, target: self, action: #selector(firstUnread(_:)))
private lazy var dataSource = makeDataSource()
@@ -149,7 +149,7 @@ class MainTimelineViewController: UITableViewController, UndoableCommandRunner {
// defaulted to "All Articles" as it is global.
if UIDevice.current.userInterfaceIdiom == .pad {
searchController.searchBar.selectedScopeButtonIndex = 1
- navigationItem.searchBarPlacementAllowsExternalIntegration = UIDevice.current.userInterfaceIdiom == .pad
+ navigationItem.searchBarPlacementAllowsExternalIntegration = true
}
definesPresentationContext = true
@@ -742,12 +742,14 @@ private extension MainTimelineViewController {
case .alwaysRead:
navigationItem.rightBarButtonItem = nil
}
-
+
if isReadArticlesFiltered {
- filterButton.image = AppAssets.filterActiveImage
+ filterButton.style = .prominent
+ filterButton.tintColor = AppAssets.primaryAccentColor
filterButton.accLabelText = NSLocalizedString("Selected - Filter Read Articles", comment: "Selected - Filter Read Articles")
} else {
- filterButton.image = AppAssets.filterInactiveImage
+ filterButton.style = .plain
+ filterButton.tintColor = nil
filterButton.accLabelText = NSLocalizedString("Filter Read Articles", comment: "Filter Read Articles")
}