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

Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire

This commit is contained in:
Brent Simmons 2019-04-28 16:55:09 -07:00
parent d398bd287f bf50c7a7e3
commit dd78670787
8 changed files with 47 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
iOS/AppAssets.swift
View File

@ -32,12 +32,13 @@ struct AppAssets {
return image.maskWithColor(color: AppAssets.chevronDisclosureColor)!
}()
static var feedImage: RSImage = {
return RSImage(named: "rssImage")!
static var feedColor: UIColor = {
return UIColor(named: "feedColor")!
}()
static var folderImage: RSImage = {
return RSImage(named: "folderImage")!
static var feedImage: RSImage = {
let image = RSImage(named: "feedImage")!
return image.maskWithColor(color: AppAssets.feedColor)!
}()
static var masterFolderColor: UIColor = {

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

@ -10,10 +10,10 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Master-->
<!--Feeds-->
<scene sceneID="pY4-Hu-kfo">
<objects>
<navigationController storyboardIdentifier="MasterNavigationViewController" title="Master" useStoryboardIdentifierAsRestorationIdentifier="YES" toolbarHidden="NO" id="RMx-3f-FxP" sceneMemberID="viewController">
<navigationController storyboardIdentifier="MasterNavigationViewController" title="Feeds" useStoryboardIdentifierAsRestorationIdentifier="YES" toolbarHidden="NO" id="RMx-3f-FxP" sceneMemberID="viewController">
<navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" largeTitles="YES" id="Pmd-2v-anx">
<rect key="frame" x="0.0" y="44" width="414" height="96"/>
<autoresizingMask key="autoresizingMask"/>
@ -140,7 +140,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="FJe-Yq-33r" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="900" y="763"/>
<point key="canvasLocation" x="1151" y="-23"/>
</scene>
<!--Timeline-->
<scene sceneID="fag-XH-avP">
@ -190,27 +190,7 @@
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="nzm-Gf-Xce" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="900" y="-42"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="uQv-y4-hI4">
<objects>
<navigationController storyboardIdentifier="MasterTimelineNavigationViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" toolbarHidden="NO" id="vHh-eJ-Wug" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Df0-za-Olh">
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<toolbar key="toolbar" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Tqe-Na-Jew">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<autoresizingMask key="autoresizingMask"/>
</toolbar>
<connections>
<segue destination="Kyk-vK-QRX" kind="relationship" relationship="rootViewController" id="g8t-I4-iBe"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Kif-ju-wKR" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="154" y="-42"/>
<point key="canvasLocation" x="1620" y="-759"/>
</scene>
<!--Split View Controller-->
<scene sceneID="Nki-YV-4Qg">
@ -226,10 +206,10 @@
</objects>
<point key="canvasLocation" x="-856" y="-330"/>
</scene>
<!--Master-->
<!--Feeds-->
<scene sceneID="smW-Zh-WAh">
<objects>
<tableViewController storyboardIdentifier="MasterViewController" title="Master" useStoryboardIdentifierAsRestorationIdentifier="YES" clearsSelectionOnViewWillAppear="NO" id="7bK-jq-Zjz" customClass="MasterFeedViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
<tableViewController storyboardIdentifier="MasterViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" clearsSelectionOnViewWillAppear="NO" id="7bK-jq-Zjz" customClass="MasterFeedViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="r7i-6Z-zg0">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@ -304,7 +284,7 @@
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="SLD-UC-DBI" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="154" y="763"/>
<point key="canvasLocation" x="345" y="-23"/>
</scene>
</scenes>
<resources>

1
iOS/MasterFeed/MasterFeedViewController.swift
View File

@ -49,6 +49,7 @@ class MasterFeedViewController: ProgressTableViewController, UndoableCommandRunn
override func viewWillAppear(_ animated: Bool) {
clearsSelectionOnViewWillAppear = splitViewController!.isCollapsed
navigationController?.title = NSLocalizedString("Feeds", comment: "Feeds")
super.viewWillAppear(animated)
}

1
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@ -348,6 +348,7 @@ private extension MasterTimelineViewController {
updateTableViewRowHeight()
title = navState?.timelineName
navigationController?.title = navState?.timelineName
if navState?.articles.count ?? 0 > 0 {
tableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: false)

20
iOS/Resources/Assets.xcassets/feedColor.colorset/Contents.json Normal file
View File

@ -0,0 +1,20 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "20",
"alpha" : "1.000",
"blue" : "243",
"green" : "140"
}
}
}
]
}

12
iOS/Resources/Assets.xcassets/feedImage.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,12 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "globe.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
iOS/Resources/Assets.xcassets/feedImage.imageset/globe.pdf vendored Normal file
View File

Binary file not shown.

BIN
iOS/Resources/Assets.xcassets/folderImage.imageset/folder.pdf vendored
View File

Binary file not shown.