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

Merge branch 'ios-candidate' of https://github.com/Ranchero-Software/NetNewsWire into ios-candidate

This commit is contained in:
Brent Simmons 2021-05-22 21:31:57 -07:00
parent 22941eccf5 d59f0cf23b
commit 01af4049b4
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Account/Sources/Account/FeedProvider/Twitter/TwitterStatus.swift
View File

@ -78,21 +78,21 @@ private extension TwitterStatus {
var html = String()
var prevIndex = displayStartIndex
var emojiOffset = 0
var unicodeScalarOffset = 0
for entity in entities {
// The twitter indices are messed up by emoji with more than one scalar, we are going to adjust for that here.
let emojiEndIndex = text.index(text.startIndex, offsetBy: entity.endIndex, limitedBy: text.endIndex) ?? text.endIndex
if prevIndex < emojiEndIndex {
let emojis = String(text[prevIndex..<emojiEndIndex]).emojis
for emoji in emojis {
emojiOffset += emoji.unicodeScalars.count - 1
// The twitter indices are messed up by characters with more than one scalar, we are going to adjust for that here.
let endIndex = text.index(text.startIndex, offsetBy: entity.endIndex, limitedBy: text.endIndex) ?? text.endIndex
if prevIndex < endIndex {
let characters = String(text[prevIndex..<endIndex])
for character in characters {
unicodeScalarOffset += character.unicodeScalars.count - 1
}
}
let offsetStartIndex = entity.startIndex - emojiOffset
let offsetEndIndex = entity.endIndex - emojiOffset
let offsetStartIndex = entity.startIndex - unicodeScalarOffset
let offsetEndIndex = entity.endIndex - unicodeScalarOffset
let entityStartIndex = text.index(text.startIndex, offsetBy: offsetStartIndex, limitedBy: text.endIndex) ?? text.startIndex
let entityEndIndex = text.index(text.startIndex, offsetBy: offsetEndIndex, limitedBy: text.endIndex) ?? text.endIndex

18
Technotes/ReleaseNotes-iOS.markdown
View File

@ -1,5 +1,23 @@
# iOS Release Notes
### 6.0 TestFlight build 603 - 16 May 2021
Feedly: handle Feedly API change with return value on deleting a folder
NewsBlur: sync no longer includes items marked as hidden on NewsBlur
FreshRSS: form for adding account now suggests endpoing URL
FreshRSS: improved the error message for when the API URL can’t be found
iCloud: retain existing feeds moved to a folder that doesn’t exist yet (sync ordering issue)
Renamed a Delete Account button to Remove Account
iCloud: skip displaying an error message on deleting a feed that doesn’t exist in iCloud
Preferences: Tweaked text explaining Feed Providers
Feeds list: context menu for smart feeds is back (regression fix)
Feeds list: all smart feeds remain visible despite Hide Read Feeds setting
Article view: fixed zoom issue on iPad on rotation
Article view: fixed bug where mark-read button on toolbar would flash on navigating to an unread article
Article view: made footnote detection more robust
Fixed regression on iPad where timeline and article wouldn’t update after the selected feed was deleted
Sharing: handle feeds where the URL has unencoded space characters (why a feed would do that is beyond our ken)
### 6.0 TestFlight build 602 - 21 April 2021
Inoreader: don’t call it so often, so we don’t go over the API limits

2
iOS/Settings/AddExtensionPointViewController.swift
View File

@ -44,7 +44,7 @@ class AddExtensionPointViewController: UITableViewController, AddExtensionPointD
}
override func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {
return NSLocalizedString("Feed Providers allow you to subscribe to website URLs as if they were RSS feeds.", comment: "Feed Provider Footer")
return NSLocalizedString("Feed Providers allow you to subscribe to some pages as if they were RSS feeds.", comment: "Feed Provider Footer")
}
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {