From 7a628552d0addcd64153bca2886d85e2ecaca7a0 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 25 Nov 2019 22:19:44 -0800 Subject: [PATCH] Edit the About screen. --- iOS/Resources/About.rtf | 8 ++++---- iOS/Resources/Acknowledgments.rtf | 7 +++---- iOS/Resources/Credits.rtf | 15 ++++++++------- iOS/Resources/Dedication.rtf | 4 ++-- iOS/Resources/Thanks.rtf | 8 ++++---- iOS/Settings/AboutViewController.swift | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/iOS/Resources/About.rtf b/iOS/Resources/About.rtf index 881fea1f3..dca510b3a 100644 --- a/iOS/Resources/About.rtf +++ b/iOS/Resources/About.rtf @@ -1,12 +1,12 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2509 +{\rtf1\ansi\ansicpg1252\cocoartf2511 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande-Bold;} {\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red10\green96\blue255;} {\*\expandedcolortbl;;\cssrgb\c0\c0\c0;\cssrgb\c0\c47843\c100000\cname systemBlueColor;} \margl1440\margr1440\vieww11860\viewh9620\viewkind0 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0 -\f0\b\fs28 \cf2 By Brent Simmons +\f0\b\fs28 \cf2 By Brent Simmons and the NetNewsWire team \fs22 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0 -{\field{\*\fldinst{HYPERLINK "http://inessential.com/"}}{\fldrslt -\fs28 \cf3 inessential.com}}} \ No newline at end of file +{\field{\*\fldinst{HYPERLINK "https://ranchero.com/netnewswire/"}}{\fldrslt +\fs28 \cf3 ranchero.com/netnewswire/}}} \ No newline at end of file diff --git a/iOS/Resources/Acknowledgments.rtf b/iOS/Resources/Acknowledgments.rtf index 5f8b59acd..7404f7a5f 100644 --- a/iOS/Resources/Acknowledgments.rtf +++ b/iOS/Resources/Acknowledgments.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2509 +{\rtf1\ansi\ansicpg1252\cocoartf2511 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue0;} {\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;} @@ -7,6 +7,5 @@ \pard\tx0\pardeftab720\sa60\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/ccgus/fmdb"}}{\fldrslt \f0\fs22 \cf2 FMDB}} -\f0\fs22 \cf2 (greatest SQLite wrapper ever in history) is by {\field{\*\fldinst{HYPERLINK "http://flyingmeat.com/"}}{\fldrslt Flying Meat Software}}.\ -\pard\pardeftab720\sa60\partightenfactor0 -{\field{\*\fldinst{HYPERLINK "https://sparkle-project.org/"}}{\fldrslt \cf2 Sparkle}} is by Sparkle Project.} \ No newline at end of file +\f0\fs22 \cf2 is by {\field{\*\fldinst{HYPERLINK "http://flyingmeat.com/"}}{\fldrslt Flying Meat Software}}\ +} \ No newline at end of file diff --git a/iOS/Resources/Credits.rtf b/iOS/Resources/Credits.rtf index 273197b63..67d04ca36 100644 --- a/iOS/Resources/Credits.rtf +++ b/iOS/Resources/Credits.rtf @@ -1,14 +1,15 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2507 +{\rtf1\ansi\ansicpg1252\cocoartf2511 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue0;} {\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;} -\margl1440\margr1440\vieww9000\viewh8400\viewkind0 +\margl1440\margr1440\vieww14220\viewh13280\viewkind0 \deftab720 \pard\pardeftab720\li360\fi-360\sa60\partightenfactor0 -\f0\fs22 \cf2 App icon and most other icons: {\field{\*\fldinst{HYPERLINK "https://twitter.com/BradEllis"}}{\fldrslt Brad Ellis}}\ +\f0\fs22 \cf2 iOS app design: {\field{\*\fldinst{HYPERLINK "https://inessential.com/"}}{\fldrslt Brent Simmons}} and {\field{\*\fldinst{HYPERLINK "https://github.com/vincode-io"}}{\fldrslt Maurice Parker}}\ +Lead iOS developer: {\field{\*\fldinst{HYPERLINK "https://github.com/vincode-io"}}{\fldrslt Maurice Parker}}\ +App icon: {\field{\*\fldinst{HYPERLINK "https://twitter.com/BradEllis"}}{\fldrslt Brad Ellis}}\ \pard\pardeftab720\sa60\partightenfactor0 -\cf2 Major code contributors: {\field{\*\fldinst{HYPERLINK "https://github.com/olofhellman"}}{\fldrslt Olof Hellman}}, {\field{\*\fldinst{HYPERLINK "https://github.com/vincode-io"}}{\fldrslt Maurice Parker}}, and {\field{\*\fldinst{HYPERLINK "https://github.com/danielpunkass"}}{\fldrslt Daniel Jalkut}}\ -Help book almost entirely by {\field{\*\fldinst{HYPERLINK "https://nostodnayr.net/"}}{\fldrslt Ryan Dotson}}.\ -\pard\pardeftab720\li360\fi-360\sa60\partightenfactor0 -\cf2 Difficult infrastructure by {\field{\*\fldinst{HYPERLINK "https://rhonabwy.com/"}}{\fldrslt Joe Heck}}.} \ No newline at end of file +\cf2 Feedly syncing: {\field{\*\fldinst{HYPERLINK "https://twitter.com/kielgillard"}}{\fldrslt Kiel Gillard}}\ +Help book: {\field{\*\fldinst{HYPERLINK "https://nostodnayr.net/"}}{\fldrslt Ryan Dotson}}\ +And more {\field{\*\fldinst{HYPERLINK "https://github.com/brentsimmons/NetNewsWire/graphs/contributors"}}{\fldrslt contributors}}!} \ No newline at end of file diff --git a/iOS/Resources/Dedication.rtf b/iOS/Resources/Dedication.rtf index a0c26ac3e..2fecd1091 100644 --- a/iOS/Resources/Dedication.rtf +++ b/iOS/Resources/Dedication.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2507 +{\rtf1\ansi\ansicpg1252\cocoartf2511 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue0;} {\*\expandedcolortbl;;\cssrgb\c0\c0\c0;} @@ -6,4 +6,4 @@ \deftab720 \pard\pardeftab720\sa60\partightenfactor0 -\f0\fs28 \cf2 NetNewsWire 5.0 is dedicated to Aaron Swartz, Derek Miller, and Alex King, who helped with earlier versions of NetNewsWire, who I miss.} \ No newline at end of file +\f0\fs28 \cf2 NetNewsWire 5.0 is dedicated to all the people who showed up to help with code, design, HTML, documentation, icons, testing, and just to help talk things over and think things through. This app\'92s for you!} \ No newline at end of file diff --git a/iOS/Resources/Thanks.rtf b/iOS/Resources/Thanks.rtf index 3bcce8cd6..1caa476b5 100644 --- a/iOS/Resources/Thanks.rtf +++ b/iOS/Resources/Thanks.rtf @@ -1,11 +1,11 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2509 +{\rtf1\ansi\ansicpg1252\cocoartf2511 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue0;} {\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;} -\margl1440\margr1440\vieww9000\viewh8400\viewkind0 +\margl1440\margr1440\vieww12580\viewh11720\viewkind0 \deftab720 \pard\pardeftab720\sa60\partightenfactor0 -\f0\fs22 \cf2 Thanks to Sheila and my family; thanks to my friends in Seattle and around the globe; thanks to my co-workers and friends at {\field{\*\fldinst{HYPERLINK "https://www.omnigroup.com"}}{\fldrslt The Omni Group}}; thanks to the ever-patient and ever-awesome NetNewsWire beta testers. \ +\f0\fs22 \cf2 Thanks to Sheila and my family; thanks to my friends in Seattle and around the globe; thanks to my co-workers and friends at {\field{\*\fldinst{HYPERLINK "https://www.omnigroup.com"}}{\fldrslt the Omni Group}}; thanks to the ever-patient and ever-awesome NetNewsWire beta testers. \ \pard\tx0\pardeftab720\sa60\partightenfactor0 -\cf2 Thanks to {\field{\*\fldinst{HYPERLINK "https://github.com"}}{\fldrslt GitHub}} and {\field{\*\fldinst{HYPERLINK "https://slack.com"}}{\fldrslt Slack}} for making open source collaboration easy and fun.} \ No newline at end of file +\cf2 Thanks to {\field{\*\fldinst{HYPERLINK "https://shapeof.com/"}}{\fldrslt Gus Mueller}} for {\field{\*\fldinst{HYPERLINK "https://github.com/ccgus/fmdb"}}{\fldrslt FMDB}} by {\field{\*\fldinst{HYPERLINK "http://flyingmeat.com/"}}{\fldrslt Flying Meat Software}}. Thanks to {\field{\*\fldinst{HYPERLINK "https://github.com"}}{\fldrslt GitHub}} and {\field{\*\fldinst{HYPERLINK "https://slack.com"}}{\fldrslt Slack}} for making open source collaboration easy and fun. Thanks to {\field{\*\fldinst{HYPERLINK "https://benubois.com/"}}{\fldrslt Ben Ubois}} at {\field{\*\fldinst{HYPERLINK "https://feedbin.com/"}}{\fldrslt Feedbin}} for all the extra help with syncing and article rendering.} \ No newline at end of file diff --git a/iOS/Settings/AboutViewController.swift b/iOS/Settings/AboutViewController.swift index 59fc79207..52f54507d 100644 --- a/iOS/Settings/AboutViewController.swift +++ b/iOS/Settings/AboutViewController.swift @@ -29,7 +29,7 @@ class AboutViewController: UITableViewController { let buildLabel = NonIntrinsicLabel(frame: CGRect(x: 20.0, y: 0.0, width: 0.0, height: 0.0)) buildLabel.font = UIFont.systemFont(ofSize: 11.0) buildLabel.textColor = UIColor.gray - buildLabel.text = NSLocalizedString("Copyright © 2002-2019 Ranchero Software", comment: "Copyright") + buildLabel.text = NSLocalizedString("Copyright © 2002-2019 Brent Simmons", comment: "Copyright") buildLabel.numberOfLines = 0 buildLabel.sizeToFit() buildLabel.translatesAutoresizingMaskIntoConstraints = false