From e84410c4eeb3e3de74495d6d21a7606776d4fca7 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Tue, 17 Sep 2019 10:57:02 -0500 Subject: [PATCH] Update to the latest credit verbiage --- iOS/Resources/Acknowledgments.rtf | 11 +++++++---- iOS/Resources/Credits.rtf | 12 ++++++++---- iOS/Resources/Thanks.rtf | 4 ++-- iOS/Settings/SettingsAboutView.swift | 8 ++++---- iOS/SwiftUI Extensions/AttributedStringView.swift | 2 +- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/iOS/Resources/Acknowledgments.rtf b/iOS/Resources/Acknowledgments.rtf index 5c97b7be4..7f9f3d50f 100644 --- a/iOS/Resources/Acknowledgments.rtf +++ b/iOS/Resources/Acknowledgments.rtf @@ -1,10 +1,13 @@ {\rtf1\ansi\ansicpg1252\cocoartf2507 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue0;} -{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;} +{\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;} \margl1440\margr1440\vieww9000\viewh8400\viewkind0 \deftab720 -\pard\pardeftab720\li82\fi-83\sa60\partightenfactor0 +\pard\pardeftab720\li360\fi-360\sa60\partightenfactor0 {\field{\*\fldinst{HYPERLINK "https://github.com/ccgus/fmdb"}}{\fldrslt -\f0\fs28 \cf2 FMDB}} -\f0\fs28 \cf2 (greatest SQLite wrapper ever in history) is by {\field{\*\fldinst{HYPERLINK "http://flyingmeat.com/"}}{\fldrslt Flying Meat Software}}.} \ No newline at end of file +\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\li360\fi-360\sa60\partightenfactor0 +{\field{\*\fldinst{HYPERLINK "https://sparkle-project.org/"}}{\fldrslt \cf2 Sparkle}} is by Sparkle Project.} \ No newline at end of file diff --git a/iOS/Resources/Credits.rtf b/iOS/Resources/Credits.rtf index d89fe1e5e..273197b63 100644 --- a/iOS/Resources/Credits.rtf +++ b/iOS/Resources/Credits.rtf @@ -1,10 +1,14 @@ {\rtf1\ansi\ansicpg1252\cocoartf2507 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue0;} -{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;} +{\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;} \margl1440\margr1440\vieww9000\viewh8400\viewkind0 \deftab720 -\pard\pardeftab720\sa60\partightenfactor0 +\pard\pardeftab720\li360\fi-360\sa60\partightenfactor0 -\f0\fs28 \cf2 App icon and most other icons: {\field{\*\fldinst{HYPERLINK "https://twitter.com/BradEllis"}}{\fldrslt Brad Ellis}}\ -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}}} \ No newline at end of file +\f0\fs22 \cf2 App icon and most other icons: {\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 diff --git a/iOS/Resources/Thanks.rtf b/iOS/Resources/Thanks.rtf index bfd228524..039738f66 100644 --- a/iOS/Resources/Thanks.rtf +++ b/iOS/Resources/Thanks.rtf @@ -1,9 +1,9 @@ {\rtf1\ansi\ansicpg1252\cocoartf2507 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue0;} -{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;} +{\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;} \margl1440\margr1440\vieww9000\viewh8400\viewkind0 \deftab720 \pard\pardeftab720\sa60\partightenfactor0 -\f0\fs28 \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.} \ No newline at end of file +\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. Thanks to {\field{\*\fldinst{HYPERLINK "https://github.com/"}}{\fldrslt GitHub}}, {\field{\*\fldinst{HYPERLINK "https://slack.com/"}}{\fldrslt Slack}}, and {\field{\*\fldinst{HYPERLINK "https://circleci.com/"}}{\fldrslt CircleCI}} for making open source collaboration easy and fun.} \ No newline at end of file diff --git a/iOS/Settings/SettingsAboutView.swift b/iOS/Settings/SettingsAboutView.swift index 45dc6d2ea..bcc275dc0 100644 --- a/iOS/Settings/SettingsAboutView.swift +++ b/iOS/Settings/SettingsAboutView.swift @@ -15,16 +15,16 @@ struct SettingsAboutView: View { var body: some View { Form { - Text("NetNewsWire 5").font(.largeTitle) + Text("NetNewsWire").font(.largeTitle) AttributedStringView(string: viewModel.about).frame(height: 54) Section(header: Text("CREDITS")) { - AttributedStringView(string: viewModel.credits).frame(height: 81) + AttributedStringView(string: viewModel.credits).frame(height: 135) } Section(header: Text("ACKNOWLEDGEMENTS")) { - AttributedStringView(string: viewModel.acknowledgements).frame(height: 54) + AttributedStringView(string: viewModel.acknowledgements).frame(height: 81) } Section(header: Text("THANKS")) { - AttributedStringView(string: viewModel.thanks).frame(height: 135) + AttributedStringView(string: viewModel.thanks).frame(height: 189) } Section(header: Text("DEDICATION"), footer: Text("Copyright © 2002-2019 Ranchero Software").font(.footnote)) { AttributedStringView(string: viewModel.dedication).frame(height: 108) diff --git a/iOS/SwiftUI Extensions/AttributedStringView.swift b/iOS/SwiftUI Extensions/AttributedStringView.swift index f6e7a325e..273fd0866 100644 --- a/iOS/SwiftUI Extensions/AttributedStringView.swift +++ b/iOS/SwiftUI Extensions/AttributedStringView.swift @@ -1,5 +1,5 @@ // -// RichTextView.swift +// AttributedStringView.swift // NetNewsWire-iOS // // Created by Maurice Parker on 9/16/19.