renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

💄 Switch to using platform filter button

Browse Source
This commit is contained in:
Stuart Breckenridge
2025-06-13 19:22:43 +08:00
parent d70fca45d4
commit 6eb65e9f61
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
iOS/AppAssets.swift
View File

@@ -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 = {

5
iOS/Base.lproj/Main.storyboard
View File

@@ -40,7 +40,6 @@
<action selector="toggleRead:" destination="JEX-9P-axG" id="A8V-r1-o9u"/>
</connections>
</barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="n8Q-7d-yb4"/>
<barButtonItem title="Toggle Starred" image="star" catalog="system" id="wU4-eH-wC9">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Toggle Starred"/>
@@ -212,7 +211,7 @@
</barButtonItem>
</toolbarItems>
<navigationItem key="navigationItem" title="Feeds" id="Zdf-7t-Un8">
<barButtonItem key="rightBarButtonItem" image="line.3.horizontal.decrease.circle" catalog="system" id="9ro-XY-5xU">
<barButtonItem key="rightBarButtonItem" image="line.3.horizontal.decrease" catalog="system" id="9ro-XY-5xU">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Feeds Filter"/>
</userDefinedRuntimeAttributes>
@@ -415,7 +414,7 @@
<image name="chevron.up" catalog="system" width="128" height="70"/>
<image name="circle" catalog="system" width="128" height="123"/>
<image name="gear" catalog="system" width="128" height="122"/>
<image name="line.3.horizontal.decrease.circle" catalog="system" width="128" height="123"/>
<image name="line.3.horizontal.decrease" catalog="system" width="128" height="73"/>
<image name="markAllAsRead" width="13" height="20"/>
<image name="multiply.circle.fill" catalog="system" width="128" height="123"/>
<image name="square.and.arrow.up" catalog="system" width="110" height="128"/>

6
iOS/MainFeed/MainFeedViewController.swift
View File

@@ -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")
}

12
iOS/MainTimeline/MainTimelineViewController.swift
View File

@@ -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")
}