FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SF Symbols 

• Updates more of AppAssets to use SF Symbols and tints using `withTintColor` rather than `maskWithColor` to stop the aliasing appearing.

• Updates Storyboard to use SF Symbols where appropriate.
This commit is contained in:
Stuart Breckenridge 2019-06-21 14:24:52 +08:00
parent fbf2da0ab5
commit 11961605d5
2 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
iOS/AppAssets.swift
View File

@ -18,26 +18,26 @@ struct AppAssets {
return UIColor(named: "avatarLightBackgroundColor")! return UIColor(named: "avatarLightBackgroundColor")!
} }
static var circleClosedImage: RSImage = { static var circleClosedImage: UIImage = {
return RSImage(named: "circleClosedImage")! return UIImage(systemName: "circle.fill")!
}() }()
static var circleOpenImage: RSImage = { static var circleOpenImage: UIImage = {
return RSImage(named: "circleOpenImage")! return UIImage(systemName: "circle")!
}() }()
static var chevronDisclosureColor: UIColor = { static var chevronDisclosureColor: UIColor = {
return UIColor(named: "chevronDisclosureColor")! return UIColor(named: "chevronDisclosureColor")!
}() }()
static var chevronDownImage: RSImage = { static var chevronDownImage: UIImage = {
let image = RSImage(named: "chevronDownImage")! let image = UIImage(systemName: "chevron.down")!
return image.maskWithColor(color: AppAssets.chevronDisclosureColor.cgColor)! return image.withTintColor(AppAssets.chevronDisclosureColor, renderingMode: .alwaysOriginal)
}() }()
static var chevronRightImage: RSImage = { static var chevronRightImage: UIImage = {
let image = RSImage(named: "chevronRightImage")! let image = UIImage(systemName: "chevron.right")!
return image.maskWithColor(color: AppAssets.chevronDisclosureColor.cgColor)! return image.withTintColor(AppAssets.chevronDisclosureColor, renderingMode: .alwaysOriginal)
}() }()
static var faviconTemplateImage: RSImage = { static var faviconTemplateImage: RSImage = {
@ -52,9 +52,9 @@ struct AppAssets {
return UIColor(named: "masterFolderColor")! return UIColor(named: "masterFolderColor")!
}() }()
static var masterFolderImage: RSImage = { static var masterFolderImage: UIImage = {
let image = RSImage(systemName: "folder.fill")! let image = UIImage(systemName: "folder.fill")!
return image.maskWithColor(color: AppAssets.masterFolderColor.cgColor)! return image.withTintColor(AppAssets.masterFolderColor, renderingMode: .alwaysOriginal)
}() }()
static var netNewsWireBlueColor: UIColor = { static var netNewsWireBlueColor: UIColor = {
@ -65,26 +65,26 @@ struct AppAssets {
return UIColor(named: "smartFeedColor")! return UIColor(named: "smartFeedColor")!
}() }()
static var smartFeedImage: RSImage = { static var smartFeedImage: UIImage = {
let image = RSImage(named: "smartFeedImage")! let image = UIImage(systemName: "gear")!
return image.maskWithColor(color: AppAssets.smartFeedColor.cgColor)! return image.withTintColor(AppAssets.smartFeedColor, renderingMode: .alwaysOriginal)
}() }()
static var starColor: UIColor = { static var starColor: UIColor = {
return UIColor(named: "starColor")! return UIColor(named: "starColor")!
}() }()
static var starClosedImage: RSImage = { static var starClosedImage: UIImage = {
return RSImage(named: "starClosedImage")! return UIImage(systemName: "star.fill")!
}() }()
static var starOpenImage: RSImage = { static var starOpenImage: UIImage = {
return RSImage(named: "starOpenImage")! return UIImage(systemName: "star")!
}() }()
static var timelineStarImage: RSImage = { static var timelineStarImage: UIImage = {
let image = RSImage(named: "starClosedImage")! let image = UIImage(systemName: "star.fill")!
return image.maskWithColor(color: AppAssets.starColor.cgColor)! return image.withTintColor(AppAssets.starColor, renderingMode: .alwaysOriginal)
}() }()
static var timelineUnreadCircleColor: UIColor = { static var timelineUnreadCircleColor: UIColor = {

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

@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14810.12" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
<device id="retina6_1" orientation="portrait"> <device id="retina6_1" orientation="portrait" appearance="light"/>
<adaptation id="fullscreen"/>
</device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.15"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
@ -57,7 +54,7 @@
<viewLayoutGuide key="safeArea" id="VUw-jc-0yf"/> <viewLayoutGuide key="safeArea" id="VUw-jc-0yf"/>
</view> </view>
<toolbarItems> <toolbarItems>
<barButtonItem enabled="NO" title="Next Unread" image="nextUnreadImage" id="2w5-e9-C2V"> <barButtonItem enabled="NO" title="Next Unread" image="arrow.down.circle" catalog="system" id="2w5-e9-C2V">
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/> <userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/>
<userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Next Unread"/> <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Next Unread"/>
@ -67,7 +64,7 @@
</connections> </connections>
</barButtonItem> </barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="vAq-iW-Yyo"/> <barButtonItem style="plain" systemItem="flexibleSpace" id="vAq-iW-Yyo"/>
<barButtonItem title="Previous Article" image="prevArticleImage" style="plain" id="v4j-fq-23N"> <barButtonItem title="Previous Article" image="arrow.up" catalog="system" style="plain" id="v4j-fq-23N">
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/> <userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/>
<userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Previous Article"/> <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Previous Article"/>
@ -77,7 +74,7 @@
</connections> </connections>
</barButtonItem> </barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="G92-nw-kXs"/> <barButtonItem style="plain" systemItem="flexibleSpace" id="G92-nw-kXs"/>
<barButtonItem title="Next Article" image="nextArticleImage" id="2qz-M5-Yhk"> <barButtonItem title="Next Article" image="arrow.down" catalog="system" id="2qz-M5-Yhk">
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/> <userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/>
<userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Next Article"/> <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Next Article"/>
@ -87,7 +84,7 @@
</connections> </connections>
</barButtonItem> </barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="Myj-ux-Zc5"/> <barButtonItem style="plain" systemItem="flexibleSpace" id="Myj-ux-Zc5"/>
<barButtonItem title="Toggle Read" image="circleOpenImage" id="hy0-LS-MzE"> <barButtonItem title="Toggle Read" image="circle" catalog="system" id="hy0-LS-MzE">
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Toggle Read"/> <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Toggle Read"/>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
@ -96,7 +93,7 @@
</connections> </connections>
</barButtonItem> </barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="n8Q-7d-yb4"/> <barButtonItem style="plain" systemItem="flexibleSpace" id="n8Q-7d-yb4"/>
<barButtonItem title="Toggle Starred" image="starOpenImage" id="wU4-eH-wC9"> <barButtonItem title="Toggle Starred" image="star" catalog="system" id="wU4-eH-wC9">
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Toggle Starred"/> <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Toggle Starred"/>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
@ -105,7 +102,7 @@
</connections> </connections>
</barButtonItem> </barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="bf9-AH-def"/> <barButtonItem style="plain" systemItem="flexibleSpace" id="bf9-AH-def"/>
<barButtonItem systemItem="action" id="9Ut-5B-JKP"> <barButtonItem image="square.and.arrow.up" catalog="system" id="9Ut-5B-JKP">
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/> <userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/>
<userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Action"/> <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Action"/>
@ -115,7 +112,7 @@
</connections> </connections>
</barButtonItem> </barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="KUq-GZ-WY9"/> <barButtonItem style="plain" systemItem="flexibleSpace" id="KUq-GZ-WY9"/>
<barButtonItem title="Safari" image="browserImage" id="DMh-3X-ebd"> <barButtonItem title="Safari" image="safari" catalog="system" id="DMh-3X-ebd">
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/> <userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/>
<userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Safari"/> <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Safari"/>
@ -155,7 +152,7 @@
<rect key="frame" x="0.0" y="28" width="414" height="208"/> <rect key="frame" x="0.0" y="28" width="414" height="208"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="T5d-L4-OKG" id="QKC-jN-XDy"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="T5d-L4-OKG" id="QKC-jN-XDy">
<rect key="frame" x="0.0" y="0.0" width="414" height="207.5"/> <rect key="frame" x="0.0" y="0.0" width="414" height="208"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView> </tableViewCellContentView>
<connections> <connections>
@ -216,7 +213,7 @@
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" id="zNG-5C-pQm" customClass="MasterFeedTableViewCell" customModule="NetNewsWire" customModuleProvider="target"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" id="zNG-5C-pQm" customClass="MasterFeedTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
<rect key="frame" x="0.0" y="55.5" width="414" height="44"/> <rect key="frame" x="0.0" y="55.5" width="414" height="43.5"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="zNG-5C-pQm" id="5gB-Jr-qIo"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="zNG-5C-pQm" id="5gB-Jr-qIo">
<rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/> <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
@ -289,13 +286,14 @@
</scene> </scene>
</scenes> </scenes>
<resources> <resources>
<image name="browserImage" width="24" height="24"/> <image name="arrow.down" catalog="system" width="58" height="64"/>
<image name="circleOpenImage" width="22" height="22"/> <image name="arrow.down.circle" catalog="system" width="64" height="62"/>
<image name="nextArticleImage" width="17" height="23"/> <image name="arrow.up" catalog="system" width="58" height="64"/>
<image name="nextUnreadImage" width="23" height="23"/> <image name="circle" catalog="system" width="64" height="62"/>
<image name="prevArticleImage" width="16" height="23"/> <image name="safari" catalog="system" width="64" height="62"/>
<image name="settingsImage" width="24" height="24"/> <image name="settingsImage" width="24" height="24"/>
<image name="starOpenImage" width="26" height="24"/> <image name="square.and.arrow.up" catalog="system" width="56" height="64"/>
<image name="star" catalog="system" width="64" height="58"/>
</resources> </resources>
<inferredMetricsTieBreakers> <inferredMetricsTieBreakers>
<segue reference="RT3-gH-cyN"/> <segue reference="RT3-gH-cyN"/>