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

Continuing migrating to AppImage.

Browse Source
This commit is contained in:
Brent Simmons
2025-01-27 22:21:01 -08:00
parent d99e683389
commit 6ed742c5a7
13 changed files with 135 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
iOS/AppAssets.swift
View File

@@ -87,13 +87,13 @@ struct AppAssets {
return UIColor(named: "iconBackgroundColor")!
}()
static var circleClosedImage: UIImage = {
return UIImage(systemName: "largecircle.fill.circle")!
}()
// static var circleClosedImage: UIImage = {
// return UIImage(systemName: "largecircle.fill.circle")!
// }()
static var circleOpenImage: UIImage = {
return UIImage(systemName: "circle")!
}()
// static var circleOpenImage: UIImage = {
// return UIImage(systemName: "circle")!
// }()
// static var disclosureImage: UIImage = {
// return UIImage(named: "disclosure")!
@@ -107,33 +107,33 @@ struct AppAssets {
// UIImage(systemName: "minus.circle")!
// }()
static var editImage: UIImage = {
UIImage(systemName: "square.and.pencil")!
}()
// static var editImage: UIImage = {
// UIImage(systemName: "square.and.pencil")!
// }()
static var faviconTemplateImage: RSImage = {
return RSImage(named: "faviconTemplateImage")!
}()
// static var faviconTemplateImage: RSImage = {
// return RSImage(named: "faviconTemplateImage")!
// }()
static var filterInactiveImage: UIImage = {
UIImage(systemName: "line.horizontal.3.decrease.circle")!
}()
// 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 filterActiveImage: UIImage = {
// UIImage(systemName: "line.horizontal.3.decrease.circle.fill")!
// }()
static var folderOutlinePlus: UIImage = {
UIImage(systemName: "folder.badge.plus")!
}()
// static var folderOutlinePlus: UIImage = {
// UIImage(systemName: "folder.badge.plus")!
// }()
static var fullScreenBackgroundColor: UIColor = {
return UIColor(named: "fullScreenBackgroundColor")!
}()
static var infoImage: UIImage = {
UIImage(systemName: "info.circle")!
}()
// static var infoImage: UIImage = {
// UIImage(systemName: "info.circle")!
// }()
// static var markAllAsReadImage: UIImage = {
// return UIImage(named: "markAllAsRead")!
@@ -163,9 +163,9 @@ struct AppAssets {
// return UIImage(systemName: "chevron.down.circle")!
// }()
static var plus: UIImage = {
UIImage(systemName: "plus")!
}()
// static var plus: UIImage = {
// UIImage(systemName: "plus")!
// }()
// static var prevArticleImage: UIImage = {
// return UIImage(systemName: "chevron.up")!
@@ -195,13 +195,13 @@ struct AppAssets {
return UIColor(named: "sectionHeaderColor")!
}()
static var shareImage: UIImage = {
return UIImage(systemName: "square.and.arrow.up")!
}()
// static var shareImage: UIImage = {
// return UIImage(systemName: "square.and.arrow.up")!
// }()
static var smartFeedImage: UIImage = {
return UIImage(systemName: "gear")!
}()
// static var smartFeedImage: UIImage = {
// return UIImage(systemName: "gear")!
// }()
static var starColor: UIColor = {
return UIColor(named: "starColor")!
@@ -224,19 +224,19 @@ struct AppAssets {
return UIColor(named: "tickMarkColor")!
}()
static var timelineStarImage: UIImage = {
let image = UIImage(systemName: "star.fill")!
return image.withTintColor(AppAssets.starColor, renderingMode: .alwaysOriginal)
}()
// static var timelineStarImage: UIImage = {
// let image = UIImage(systemName: "star.fill")!
// return image.withTintColor(AppAssets.starColor, renderingMode: .alwaysOriginal)
// }()
static var todayFeedImage: IconImage {
let image = UIImage(systemName: "sun.max.fill")!
return IconImage(image, isSymbol: true, isBackgroundSuppressed: true, preferredColor: UIColor.systemOrange.cgColor)
}
static var trashImage: UIImage = {
return UIImage(systemName: "trash")!
}()
// static var trashImage: UIImage = {
// return UIImage(systemName: "trash")!
// }()
static var unreadFeedImage: IconImage {
let image = UIImage(systemName: "largecircle.fill.circle")!

4
iOS/Article/ArticleViewController.swift
View File

@@ -223,11 +223,11 @@ final class ArticleViewController: UIViewController {
actionBarButtonItem.isEnabled = permalinkPresent
if article.status.read {
readBarButtonItem.image = AppAssets.circleOpenImage
readBarButtonItem.image = AppImage.circleOpen
readBarButtonItem.isEnabled = article.isAvailableToMarkUnread
readBarButtonItem.accLabelText = NSLocalizedString("Mark Article Unread", comment: "Mark Article Unread")
} else {
readBarButtonItem.image = AppAssets.circleClosedImage
readBarButtonItem.image = AppImage.circleClosed
readBarButtonItem.isEnabled = true
readBarButtonItem.accLabelText = NSLocalizedString("Selected - Mark Article Unread", comment: "Selected - Mark Article Unread")
}

4
iOS/Article/WebViewController.swift
View File

@@ -742,7 +742,7 @@ private extension WebViewController {
guard let article = article, !article.status.read || article.isAvailableToMarkUnread else { return nil }
let title = article.status.read ? NSLocalizedString("Mark as Unread", comment: "Mark as Unread") : NSLocalizedString("Mark as Read", comment: "Mark as Read")
let readImage = article.status.read ? AppAssets.circleClosedImage : AppAssets.circleOpenImage
let readImage = article.status.read ? AppImage.circleClosed : AppImage.circleOpen
return UIAction(title: title, image: readImage) { [weak self] _ in
self?.coordinator.toggleReadForCurrentArticle()
}
@@ -776,7 +776,7 @@ private extension WebViewController {
func shareAction() -> UIAction {
let title = NSLocalizedString("Share", comment: "Share")
return UIAction(title: title, image: AppAssets.shareImage) { [weak self] _ in
return UIAction(title: title, image: AppImage.share) { [weak self] _ in
self?.showActivityDialog()
}
}

2
iOS/IconView.swift
View File

@@ -30,7 +30,7 @@ final class IconView: UIView {
private var isDiscernable = true
private let imageView: UIImageView = {
let imageView = NonIntrinsicImageView(image: AppAssets.faviconTemplateImage)
let imageView = NonIntrinsicImageView(image: AppImage.faviconTemplate)
imageView.contentMode = .scaleAspectFit
imageView.clipsToBounds = true
imageView.layer.cornerRadius = 2.0

16
iOS/MainFeed/MainFeedViewController.swift
View File

@@ -644,13 +644,13 @@ final class MainFeedViewController: UITableViewController, UndoableCommandRunner
var menuItems: [UIAction] = []
let addFeedActionTitle = NSLocalizedString("Add Feed", comment: "Add Feed")
let addFeedAction = UIAction(title: addFeedActionTitle, image: AppAssets.plus) { _ in
let addFeedAction = UIAction(title: addFeedActionTitle, image: AppImage.plus) { _ in
self.coordinator.showAddFeed()
}
menuItems.append(addFeedAction)
let addWebFolderActionTitle = NSLocalizedString("Add Folder", comment: "Add Folder")
let addWebFolderAction = UIAction(title: addWebFolderActionTitle, image: AppAssets.folderOutlinePlus) { _ in
let addWebFolderAction = UIAction(title: addWebFolderActionTitle, image: AppImage.folderOutlinePlus) { _ in
self.coordinator.showAddFolder()
}
@@ -751,12 +751,12 @@ private extension MainFeedViewController {
}
func setFilterButtonToActive() {
filterButton?.image = AppAssets.filterActiveImage
filterButton?.image = AppImage.filterActive
filterButton?.accLabelText = NSLocalizedString("Selected - Filter Read Feeds", comment: "Selected - Filter Read Feeds")
}
func setFilterButtonToInactive() {
filterButton?.image = AppAssets.filterInactiveImage
filterButton?.image = AppImage.filterInactive
filterButton?.accLabelText = NSLocalizedString("Filter Read Feeds", comment: "Filter Read Feeds")
}
@@ -1081,7 +1081,7 @@ private extension MainFeedViewController {
func deleteAction(indexPath: IndexPath) -> UIAction {
let title = NSLocalizedString("Delete", comment: "Delete")
let action = UIAction(title: title, image: AppAssets.trashImage, attributes: .destructive) { [weak self] _ in
let action = UIAction(title: title, image: AppImage.trash, attributes: .destructive) { [weak self] _ in
self?.delete(indexPath: indexPath)
}
return action
@@ -1089,7 +1089,7 @@ private extension MainFeedViewController {
func renameAction(indexPath: IndexPath) -> UIAction {
let title = NSLocalizedString("Rename", comment: "Rename")
let action = UIAction(title: title, image: AppAssets.editImage) { [weak self] _ in
let action = UIAction(title: title, image: AppImage.edit) { [weak self] _ in
self?.rename(indexPath: indexPath)
}
return action
@@ -1101,7 +1101,7 @@ private extension MainFeedViewController {
}
let title = NSLocalizedString("Get Info", comment: "Get Info")
let action = UIAction(title: title, image: AppAssets.infoImage) { [weak self] _ in
let action = UIAction(title: title, image: AppImage.info) { [weak self] _ in
self?.coordinator.showFeedInspector(for: feed)
}
return action
@@ -1109,7 +1109,7 @@ private extension MainFeedViewController {
func getAccountInfoAction(account: Account) -> UIAction {
let title = NSLocalizedString("Get Info", comment: "Get Info")
let action = UIAction(title: title, image: AppAssets.infoImage) { [weak self] _ in
let action = UIAction(title: title, image: AppImage.info) { [weak self] _ in
self?.coordinator.showAccountInspector(for: account)
}
return action

2
iOS/MainTimeline/Cell/MainTimelineTableViewCell.swift
View File

@@ -20,7 +20,7 @@ final class MainTimelineTableViewCell: VibrantTableViewCell {
private lazy var iconView = IconView()
private lazy var starView = {
return NonIntrinsicImageView(image: AppAssets.timelineStarImage)
return NonIntrinsicImageView(image: AppImage.timelineStar)
}()
private var unreadIndicatorPropertyAnimator: UIViewPropertyAnimator?

12
iOS/MainTimeline/TimelineViewController.swift
View File

@@ -70,7 +70,7 @@ final class TimelineViewController: UITableViewController, UndoableCommandRunner
NotificationCenter.default.addObserver(self, selector: #selector(willEnterForeground(_:)), name: UIApplication.willEnterForegroundNotification, object: nil)
// Initialize Programmatic Buttons
filterButton = UIBarButtonItem(image: AppAssets.filterInactiveImage, style: .plain, target: self, action: #selector(toggleFilter(_:)))
filterButton = UIBarButtonItem(image: AppImage.filterInactive, style: .plain, target: self, action: #selector(toggleFilter(_:)))
firstUnreadButton = UIBarButtonItem(image: AppImage.nextUnreadArticle, style: .plain, target: self, action: #selector(firstUnread(_:)))
// Setup the Search Controller
@@ -282,7 +282,7 @@ final class TimelineViewController: UITableViewController, UndoableCommandRunner
completion(true)
}
readAction.image = article.status.read ? AppAssets.circleClosedImage : AppAssets.circleOpenImage
readAction.image = article.status.read ? AppImage.circleClosed : AppImage.circleOpen
readAction.backgroundColor = AppAssets.primaryAccentColor
return UISwipeActionsConfiguration(actions: [readAction])
@@ -687,10 +687,10 @@ private extension TimelineViewController {
}
if coordinator.isReadArticlesFiltered {
filterButton?.image = AppAssets.filterActiveImage
filterButton?.image = AppImage.filterActive
filterButton?.accLabelText = NSLocalizedString("Selected - Filter Read Articles", comment: "Selected - Filter Read Articles")
} else {
filterButton?.image = AppAssets.filterInactiveImage
filterButton?.image = AppImage.filterInactive
filterButton?.accLabelText = NSLocalizedString("Filter Read Articles", comment: "Filter Read Articles")
}
@@ -791,7 +791,7 @@ private extension TimelineViewController {
let title = article.status.read ?
NSLocalizedString("Mark as Unread", comment: "Mark as Unread") :
NSLocalizedString("Mark as Read", comment: "Mark as Read")
let image = article.status.read ? AppAssets.circleClosedImage : AppAssets.circleOpenImage
let image = article.status.read ? AppImage.circleClosed : AppImage.circleOpen
let action = UIAction(title: title, image: image) { [weak self] _ in
self?.coordinator.toggleRead(article)
@@ -1005,7 +1005,7 @@ private extension TimelineViewController {
func shareAction(_ article: Article, indexPath: IndexPath) -> UIAction? {
guard let url = article.preferredURL else { return nil }
let title = NSLocalizedString("Share", comment: "Share")
let action = UIAction(title: title, image: AppAssets.shareImage) { [weak self] _ in
let action = UIAction(title: title, image: AppImage.share) { [weak self] _ in
self?.shareDialogForTableCell(indexPath: indexPath, url: url, title: article.title)
}
return action

2
iOS/Settings/ArticleThemesTableViewController.swift
View File

@@ -104,7 +104,7 @@ final class ArticleThemesTableViewController: UITableViewController {
self?.present(alertController, animated: true)
}
deleteAction.image = AppAssets.trashImage
deleteAction.image = AppImage.trash
deleteAction.backgroundColor = UIColor.systemRed
return UISwipeActionsConfiguration(actions: [deleteAction])

2
iOS/Settings/TimelinePreviewTableViewController.swift
View File

@@ -84,7 +84,7 @@ private extension TimelinePreviewTableViewController {
status: status
)
let iconImage = IconImage(AppAssets.faviconTemplateImage.withTintColor(AppAssets.secondaryAccentColor))
let iconImage = IconImage(AppImage.faviconTemplate.withTintColor(AppAssets.secondaryAccentColor))
return MainTimelineCellData(
article: prototypeArticle,