diff --git a/Modules/RSWeb/Sources/RSWeb/WebServices/TransportJSON.swift b/Modules/RSWeb/Sources/RSWeb/WebServices/TransportJSON.swift index ff8dee89f..8d11954a1 100644 --- a/Modules/RSWeb/Sources/RSWeb/WebServices/TransportJSON.swift +++ b/Modules/RSWeb/Sources/RSWeb/WebServices/TransportJSON.swift @@ -13,7 +13,7 @@ extension Transport { /** Sends an HTTP get and returns JSON object(s) */ - public func send(request: URLRequest, resultType: R.Type, dateDecoding: JSONDecoder.DateDecodingStrategy = .iso8601, keyDecoding: JSONDecoder.KeyDecodingStrategy = .useDefaultKeys, completion: @escaping (Result<(HTTPURLResponse, R?), Error>) -> Void) { + public func send(request: URLRequest, resultType: R.Type, dateDecoding: JSONDecoder.DateDecodingStrategy = .iso8601, keyDecoding: JSONDecoder.KeyDecodingStrategy = .useDefaultKeys, completion: @escaping (Result<(HTTPURLResponse, R?), Error>) -> Void) { send(request: request) { result in DispatchQueue.main.async { diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 41dd76ac5..75c4065b9 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -1464,6 +1464,11 @@ baseConfigurationReferenceAnchor = 84719F372DB9C60400EEF332 /* xcconfig */; baseConfigurationReferenceRelativePath = NetNewsWire_iOSapp_target.xcconfig; buildSettings = { + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -1472,6 +1477,11 @@ baseConfigurationReferenceAnchor = 84719F372DB9C60400EEF332 /* xcconfig */; baseConfigurationReferenceRelativePath = NetNewsWire_iOSapp_target.xcconfig; buildSettings = { + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; 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/Article/ArticleViewController.swift b/iOS/Article/ArticleViewController.swift index 055c54849..c49facc64 100644 --- a/iOS/Article/ArticleViewController.swift +++ b/iOS/Article/ArticleViewController.swift @@ -174,6 +174,7 @@ class ArticleViewController: UIViewController { override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(true) + navigationController?.navigationBar.topItem?.subtitle = nil coordinator.isArticleViewControllerPending = false } diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard index a33807d8c..0fcd14b0e 100644 --- a/iOS/Base.lproj/Main.storyboard +++ b/iOS/Base.lproj/Main.storyboard @@ -1,8 +1,9 @@ - + - + + @@ -39,7 +40,6 @@ - @@ -114,7 +114,7 @@ - + @@ -173,19 +173,18 @@ - + - - + - + - + @@ -195,7 +194,8 @@ - + + @@ -203,7 +203,6 @@ - @@ -212,7 +211,7 @@ - + @@ -246,7 +245,7 @@ - + @@ -254,13 +253,13 @@