diff --git a/Account/Sources/Account/CloudKit/CloudKitArticleStatusUpdate.swift b/Account/Sources/Account/CloudKit/CloudKitArticleStatusUpdate.swift index 9bad6d6d0..8e57a6e99 100644 --- a/Account/Sources/Account/CloudKit/CloudKitArticleStatusUpdate.swift +++ b/Account/Sources/Account/CloudKit/CloudKitArticleStatusUpdate.swift @@ -31,7 +31,7 @@ struct CloudKitArticleStatusUpdate { let rec = record // This is an invalid status update. The article is required for new and all if article == nil && (rec == .all || rec == .new) { - return nil + fatalError() } } diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index 1e2ae11ca..b9e388d8f 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -147,7 +147,7 @@ struct AppAssets { } static var markAllAsReadImage: RSImage = { - return RSImage(named: "markAllAsRead")! + return NSImage(systemSymbolName: "arrow.up.arrow.down.circle", accessibilityDescription: nil)! }() static var nextUnreadImage: RSImage = { diff --git a/Mac/Resources/Assets.xcassets/markAllAsRead.imageset/Contents.json b/Mac/Resources/Assets.xcassets/markAllAsRead.imageset/Contents.json deleted file mode 100644 index 9937c57c5..000000000 --- a/Mac/Resources/Assets.xcassets/markAllAsRead.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "markAllAsRead.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/Mac/Resources/Assets.xcassets/markAllAsRead.imageset/markAllAsRead.pdf b/Mac/Resources/Assets.xcassets/markAllAsRead.imageset/markAllAsRead.pdf deleted file mode 100644 index 420f9d49c..000000000 Binary files a/Mac/Resources/Assets.xcassets/markAllAsRead.imageset/markAllAsRead.pdf and /dev/null differ diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index e91b39487..23e3a4d91 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -162,15 +162,15 @@ struct AppAssets { }() static var markAllAsReadImage: UIImage = { - return UIImage(named: "markAllAsRead")! - }() - - static var markBelowAsReadImage: UIImage = { - return UIImage(systemName: "arrowtriangle.down.circle")! + return UIImage(systemName: "arrow.up.arrow.down.circle")! }() static var markAboveAsReadImage: UIImage = { - return UIImage(systemName: "arrowtriangle.up.circle")! + return UIImage(systemName: "arrow.up.circle")! + }() + + static var markBelowAsReadImage: UIImage = { + return UIImage(systemName: "arrow.down.circle")! }() static var masterFolderImage: IconImage = { diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard index 1aaef03a2..d807aea09 100644 --- a/iOS/Base.lproj/Main.storyboard +++ b/iOS/Base.lproj/Main.storyboard @@ -1,8 +1,9 @@ - + - + + @@ -17,7 +18,7 @@ -