renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4669 from stuartbreckenridge/experimental/liquid-glass

Browse Source 
Minor Liquid Glass Fixes
This commit is contained in:
Brent Simmons
2025-06-22 17:57:35 -07:00
committed by GitHub
parent eeabfa51af 39991d187c
commit 4706cfb3c9
10 changed files with 364 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Mac/AppAssets.swift
View File

@@ -161,6 +161,16 @@ struct AppAssets {
let image = RSImage(named: "markAllAsRead")
return image!
}()
static var markBelowAsReadImage: RSImage = {
let image = RSImage(named: "markBelowAsRead")
return image!
}()
static var markAboveAsReadImage: RSImage = {
let image = RSImage(named: "markAboveAsRead")
return image!
}()
static var nextUnreadImage: RSImage = {

1
Mac/MainWindow/MainWindowController.swift
View File

@@ -90,6 +90,7 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
timelineContainerViewController = splitViewController?.splitViewItems[1].viewController as? TimelineContainerViewController
timelineContainerViewController!.delegate = self
splitViewController?.splitViewItems[1].automaticallyAdjustsSafeAreaInsets = true
detailViewController = splitViewController?.splitViewItems[2].viewController as? DetailViewController

2
Mac/MainWindow/Sidebar/UnreadCountView.swift
View File

@@ -35,7 +35,7 @@ class UnreadCountView : NSView {
}
private var currentTextColor: NSColor {
return isSelected ? NSColor.white : NSColor.tertiaryLabelColor
return isSelected ? NSColor.white : NSColor.secondaryLabelColor
}
private var textAttributes: [NSAttributedString.Key: AnyObject] {

4
Mac/MainWindow/Timeline/TimelineViewController+ContextualMenus.swift
View File

@@ -241,11 +241,11 @@ private extension TimelineViewController {
}
func markAboveReadMenuItem(_ articles: [Article]) -> NSMenuItem {
return menuItem(NSLocalizedString("Mark Above as Read", comment: "Command"), #selector(markAboveArticlesReadFromContextualMenu(_:)), articles, image: nil)
return menuItem(NSLocalizedString("Mark Above as Read", comment: "Command"), #selector(markAboveArticlesReadFromContextualMenu(_:)), articles, image: AppAssets.markAboveAsReadImage)
}
func markBelowReadMenuItem(_ articles: [Article]) -> NSMenuItem {
return menuItem(NSLocalizedString("Mark Below as Read", comment: "Command"), #selector(markBelowArticlesReadFromContextualMenu(_:)), articles, image: nil)
return menuItem(NSLocalizedString("Mark Below as Read", comment: "Command"), #selector(markBelowArticlesReadFromContextualMenu(_:)), articles, image: AppAssets.markBelowAsReadImage)
}
func selectFeedInSidebarMenuItem(_ feed: WebFeed) -> NSMenuItem {

12
Mac/Resources/Assets.xcassets/markAboveAsRead.symbolset/Contents.json Normal file
View File

@@ -0,0 +1,12 @@
{
"info" : {
"author" : "xcode",
"version" : 1
},
"symbols" : [
{
"filename" : "markAsReadAbove.svg",
"idiom" : "universal"
}
]
}

159
Mac/Resources/Assets.xcassets/markAboveAsRead.symbolset/markAsReadAbove.svg Normal file
View File

@@ -0,0 +1,159 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="3300px" height="2200px" viewBox="0 0 3300 2200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>markAsReadAbove</title>
<g id="markAsReadAbove" stroke="none" fill="none" fill-rule="evenodd" stroke-width="1">
<g id="markAllAsReadAbove">
<g id="Notes">
<rect id="artboard" fill="#FFFFFF" fill-rule="nonzero" x="0" y="0" width="3300" height="2200"></rect>
<line x1="263" y1="292" x2="3036" y2="292" id="Path" stroke="#000000" stroke-width="0.5"></line>
<text id="Weight/Scale-Variations" fill="#000000" fill-rule="nonzero" font-family="Helvetica-Bold, Helvetica" font-size="13" font-weight="bold">
<tspan x="263" y="322">Weight/Scale Variations</tspan>
</text>
<text id="Ultralight" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="533.711" y="322">Ultralight</tspan>
</text>
<text id="Thin" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="843.422" y="322">Thin</tspan>
</text>
<text id="Light" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="1138.63" y="322">Light</tspan>
</text>
<text id="Regular" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="1426.84" y="322">Regular</tspan>
</text>
<text id="Medium" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="1723.06" y="322">Medium</tspan>
</text>
<text id="Semibold" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="2015.77" y="322">Semibold</tspan>
</text>
<text id="Bold" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="2326.48" y="322">Bold</tspan>
</text>
<text id="Heavy" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="2618.19" y="322">Heavy</tspan>
</text>
<text id="Black" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="2917.4" y="322">Black</tspan>
</text>
<line x1="263" y1="1903" x2="3036" y2="1903" id="Path" stroke="#000000" stroke-width="0.5"></line>
<g id="Group" transform="translate(264, 1918)" fill="#000000" fill-rule="nonzero">
<path d="M8.24805,15.830078 C12.5547,15.830078 16.1387,12.25586 16.1387,7.94922 C16.1387,3.6426 12.5449,0.0684 8.23828,0.0684 C3.94141,0.0684 0.36719,3.6426 0.36719,7.94922 C0.36719,12.25586 3.95117,15.830078 8.24805,15.830078 Z M8.24805,14.345703 C4.70312,14.345703 1.87109,11.50391 1.87109,7.94922 C1.87109,4.3945 4.69336,1.5527 8.23828,1.5527 C11.793,1.5527 14.6348,4.3945 14.6446,7.94922 C14.6543,11.50391 11.8027,14.345703 8.24805,14.345703 Z M8.22852,11.57227 C8.69727,11.57227 8.9707,11.25977 8.9707,10.74219 L8.9707,8.68164 L11.1973,8.68164 C11.6953,8.68164 12.0371,8.42773 12.0371,7.95898 C12.0371,7.48047 11.7148,7.2168 11.1973,7.2168 L8.9707,7.2168 L8.9707,4.9902 C8.9707,4.4727 8.69727,4.1504 8.22852,4.1504 C7.75977,4.1504 7.50586,4.4922 7.50586,4.9902 L7.50586,7.2168 L5.29883,7.2168 C4.78125,7.2168 4.44922,7.48047 4.44922,7.95898 C4.44922,8.42773 4.80078,8.68164 5.29883,8.68164 L7.50586,8.68164 L7.50586,10.74219 C7.50586,11.24023 7.75977,11.57227 8.22852,11.57227 Z" id="Shape"></path>
</g>
<g id="Group" transform="translate(282.506, 1915)" fill="#000000" fill-rule="nonzero">
<path d="M10.709,20.91016 C16.1582,20.91016 20.6699,16.39844 20.6699,10.94922 C20.6699,5.5098 16.1484,0.9883 10.6992,0.9883 C5.25977,0.9883 0.74805,5.5098 0.74805,10.94922 C0.74805,16.39844 5.26953,20.91016 10.709,20.91016 Z M10.709,19.25 C6.09961,19.25 2.41797,15.55859 2.41797,10.94922 C2.41797,6.3496 6.08984,2.6484 10.6992,2.6484 C15.3086,2.6484 19,6.3496 19.0098756,10.94922 C19.0195,15.55859 15.3184,19.25 10.709,19.25 Z M10.6895,15.58789 C11.207,15.58789 11.5195,15.22656 11.5195,14.66016 L11.5195,11.76953 L14.5762,11.76953 C15.123,11.76953 15.5039,11.48633 15.5039,10.96875 C15.5039,10.44141 15.1426,10.13867 14.5762,10.13867 L11.5195,10.13867 L11.5195,7.0723 C11.5195,6.4961 11.207,6.1445 10.6895,6.1445 C10.1719,6.1445 9.8789,6.5156 9.8789,7.0723 L9.8789,10.13867 L6.83203,10.13867 C6.26562,10.13867 5.89453,10.44141 5.89453,10.96875 C5.89453,11.48633 6.28516,11.76953 6.83203,11.76953 L9.8789,11.76953 L9.8789,14.66016 C9.8789,15.20703 10.1719,15.58789 10.6895,15.58789 Z" id="Shape"></path>
</g>
<g id="Group" transform="translate(306.924, 1913)" fill="#000000" fill-rule="nonzero">
<path d="M12.9707,25.67383 C19.9336,25.67383 25.6953,19.921875 25.6953,12.95898 C25.6953,5.9961 19.9238,0.2441 12.9609,0.2441 C6.00781,0.2441 0.25586,5.9961 0.25586,12.95898 C0.25586,19.921875 6.01758,25.67383 12.9707,25.67383 Z M12.9707,23.85742 C6.93555,23.85742 2.08203,18.99414 2.08203,12.95898 C2.08203,6.9238 6.92578,2.0605 12.9609,2.0605 C19.0059,2.0605 23.8594,6.9238 23.8691589,12.95898 C23.8789,18.99414 19.0156,23.85742 12.9707,23.85742 Z M12.9512,18.93555 C13.5176,18.93555 13.8691,18.54492 13.8691,17.93945 L13.8691,13.86719 L18.1074,13.86719 C18.6934,13.86719 19.1133,13.53516 19.1133,12.97852 C19.1133,12.40234 18.7227,12.06055 18.1074,12.06055 L13.8691,12.06055 L13.8691,7.8125 C13.8691,7.1973 13.5176,6.8066 12.9512,6.8066 C12.3848,6.8066 12.0625,7.2168 12.0625,7.8125 L12.0625,12.06055 L7.83398,12.06055 C7.21875,12.06055 6.80859,12.40234 6.80859,12.97852 C6.80859,13.53516 7.23828,13.86719 7.83398,13.86719 L12.0625,13.86719 L12.0625,17.93945 C12.0625,18.52539 12.3848,18.93555 12.9512,18.93555 Z" id="Shape"></path>
</g>
<text id="Design-Variations" fill="#000000" fill-rule="nonzero" font-family="Helvetica-Bold, Helvetica" font-size="13" font-weight="bold">
<tspan x="263" y="1953">Design Variations</tspan>
</text>
<text id="Symbols-are-supported-in-up-to-nine-weights-and-three-scales." fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="263" y="1971">Symbols are supported in up to nine weights and three scales.</tspan>
</text>
<text id="For-optimal-layout-with-text-and-other-symbols,-vertically-align" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="263" y="1989">For optimal layout with text and other symbols, vertically align</tspan>
</text>
<text id="symbols-with-the-adjacent-text." fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="263" y="2007">symbols with the adjacent text.</tspan>
</text>
<rect id="Rectangle" fill="#00AEEF" fill-rule="nonzero" opacity="0.4" x="776" y="1919" width="3" height="14"></rect>
<g id="Group" transform="translate(779, 1918)" fill="#000000" fill-rule="nonzero">
<path d="M10.5273,15 L12.373,15 L7.17773,0.9082 L5.43945,0.9082 L0.244141,15 L2.08984,15 L3.50586,10.9668 L9.11133,10.9668 L10.5273,15 Z M6.2793,3.0469 L6.33789,3.0469 L8.59375,9.47266 L4.02344,9.47266 L6.2793,3.0469 Z" id="Shape"></path>
</g>
<rect id="Rectangle" fill="#00AEEF" fill-rule="nonzero" opacity="0.4" x="791.617" y="1919" width="3" height="14"></rect>
<text id="Margins" fill="#000000" fill-rule="nonzero" font-family="Helvetica-Bold, Helvetica" font-size="13" font-weight="bold">
<tspan x="776" y="1953">Margins</tspan>
</text>
<text id="Leading-and-trailing-margins-on-the-left-and-right-side-of-each-symbol" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="776" y="1971">Leading and trailing margins on the left and right side of each symbol</tspan>
</text>
<text id="can-be-adjusted-by-modifying-the-width-of-the-blue-rectangles." fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="776" y="1989">can be adjusted by modifying the width of the blue rectangles.</tspan>
</text>
<text id="Modifications-are-automatically-applied-proportionally-to-all" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="776" y="2007">Modifications are automatically applied proportionally to all</tspan>
</text>
<text id="scales-and-weights." fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="776" y="2025">scales and weights.</tspan>
</text>
<g id="Group" transform="translate(1291, 1915)" fill="#000000" fill-rule="nonzero">
<path d="M0.83203,21.11523 L2.375,22.6582 C3.22461,23.48828 4.19141,23.41992 5.06055,22.46289 L15.2754,11.33984 C15.7051,11.63281 16.0957,11.62305 16.5645,11.52539 L17.6094,11.31055 L18.3027,12.00391 L18.2539,12.52148 C18.1855,13.04883 18.3516,13.46875 18.8496,13.9668 L19.6602,14.77734 C20.168,15.28516 20.8223,15.31445 21.3008,14.83594 L24.5527,11.58398 C25.0312,11.10547 25.0117,10.45117 24.5039,9.94336 L23.6836,9.12305 C23.1855,8.625 22.7754,8.44922 22.2383,8.52734 L21.7109,8.58594 L21.0566,7.9219 L21.3398,6.7793 C21.4863,6.2129 21.3398,5.7441 20.7148,5.1387 L18.3027,2.7461 C14.7578,-0.7793 10.2266,-0.6719 7.11133,2.4629 C6.69141,2.8926 6.64258,3.4785 6.91602,3.9082 C7.15039,4.2793 7.62891,4.5039 8.2734,4.3379 C9.7871,3.957 11.3008,4.0742 12.7852,5.0801 L12.1602,6.6621 C11.9258,7.248 11.9453,7.7266 12.1797,8.16602 L1.01758,18.439453 C0.08008,19.30859 -0.02734,20.25586 0.83203,21.11523 Z M8.6738,2.8535 C11.3398,0.8613 14.6504,1.1738 17.0527,3.5859 L19.6797,6.1934 C19.9141,6.4277 19.9434,6.6133 19.8848,6.9062 L19.5039,8.46875 L21.0762,10.04102 L22.043,9.95312 C22.3262,9.92383 22.4141,9.94336 22.6387,10.16797 L23.2637,10.79297 L20.5098,13.53711 L19.8848,12.92188 C19.6602,12.69727 19.6406,12.59961 19.6699,12.31641 L19.7578,11.35938 L18.1953,9.79688 L16.5742,10.10938 C16.291,10.16797 16.1445,10.16797 15.9102,9.92383 L13.7324,7.7461 C13.5078,7.5117 13.4785,7.375 13.6055,7.0527 L14.5527,4.7773 C12.9512,3.2441 10.8418,2.3945 8.8008,3.0488 C8.7129,3.0781 8.6445,3.0586 8.6152,3.0195 C8.5859,2.9707 8.5859,2.9219 8.6738,2.8535 Z M2.10156,20.41211 C1.61328,19.91406 1.78906,19.61133 2.12109,19.30859 L13.0781,9.19141 L14.3086,10.42188 L4.15234,21.34961 C3.84961,21.68164 3.46875,21.7793 3.06836,21.37891 L2.10156,20.41211 Z" id="Shape"></path>
</g>
<text id="Exporting" fill="#000000" fill-rule="nonzero" font-family="Helvetica-Bold, Helvetica" font-size="13" font-weight="bold">
<tspan x="1289" y="1953">Exporting</tspan>
</text>
<text id="Symbols-should-be-outlined-when-exporting-to-ensure-the" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="1289" y="1971">Symbols should be outlined when exporting to ensure the</tspan>
</text>
<text id="design-is-preserved-when-submitting-to-Xcode." fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="1289" y="1989">design is preserved when submitting to Xcode.</tspan>
</text>
<text id="Template-v.1.0" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="2952" y="1933">Template v.1.0</tspan>
</text>
<text id="Generated-from-circle" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="2911" y="1951">Generated from circle</tspan>
</text>
<text id="Typeset-at-100-points" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="2912" y="1969">Typeset at 100 points</tspan>
</text>
<text id="Small" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="263" y="726">Small</tspan>
</text>
<text id="Medium" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="263" y="1156">Medium</tspan>
</text>
<text id="Large" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="263" y="1586">Large</tspan>
</text>
</g>
<g id="Guides" transform="translate(263, 625)">
<g id="H-reference" transform="translate(76, 0)" fill="#27AAE1" fill-rule="nonzero">
<path d="M54.9316,71 L57.666,71 L30.5664,0.541 L28.0762,0.541 L0.976562,71 L3.66211,71 L12.9395,46.5371 L45.7031,46.5371 L54.9316,71 Z M29.1992,3.9102 L29.4434,3.9102 L44.8242,44.291 L13.8184,44.291 L29.1992,3.9102 Z" id="Shape"></path>
</g>
<line x1="0" y1="71" x2="2773" y2="71" id="Baseline-S" stroke="#27AAE1" stroke-width="0.577"></line>
<line x1="0" y1="0.541" x2="2773" y2="0.541" id="Capline-S" stroke="#27AAE1" stroke-width="0.577"></line>
<g id="H-reference" transform="translate(76, 430)" fill="#27AAE1" fill-rule="nonzero">
<path d="M54.9316,71 L57.666,71 L30.5664,0.541 L28.0762,0.541 L0.976562,71 L3.66211,71 L12.9395,46.5371 L45.7031,46.5371 L54.9316,71 Z M29.1992,3.9102 L29.4434,3.9102 L44.8242,44.291 L13.8184,44.291 L29.1992,3.9102 Z" id="Shape"></path>
</g>
<line x1="0" y1="501" x2="2773" y2="501" id="Baseline-M" stroke="#27AAE1" stroke-width="0.577"></line>
<line x1="0" y1="430.54" x2="2773" y2="430.54" id="Capline-M" stroke="#27AAE1" stroke-width="0.577"></line>
<g id="H-reference" transform="translate(76, 860)" fill="#27AAE1" fill-rule="nonzero">
<path d="M54.9316,71 L57.666,71 L30.5664,0.541 L28.0762,0.541 L0.976562,71 L3.66211,71 L12.9395,46.5371 L45.7031,46.5371 L54.9316,71 Z M29.1992,3.9102 L29.4434,3.9102 L44.8242,44.291 L13.8184,44.291 L29.1992,3.9102 Z" id="Shape"></path>
</g>
<line x1="0" y1="931" x2="2773" y2="931" id="Baseline-L" stroke="#27AAE1" stroke-width="0.577"></line>
<line x1="0" y1="860.54" x2="2773" y2="860.54" id="Capline-L" stroke="#27AAE1" stroke-width="0.577"></line>
<rect id="left-margin" fill="#00AEEF" fill-rule="nonzero" opacity="0.4" x="1128.3" y="405.79" width="8.74023" height="119.336"></rect>
<rect id="right-margin" fill="#00AEEF" fill-rule="nonzero" opacity="0.4" x="1236.65" y="405.79" width="8.74023" height="119.336"></rect>
</g>
<g id="Symbols" transform="translate(1399, 1016)">
<g id="Regular-L" transform="translate(-6, 420)">
<path d="M34.9998316,170 C56.335046,170 74,152.335286 74,131 C74,109.70292 56.2968329,92 34.9616185,92 C13.6646172,92 -4,109.70292 -4,131 C-4,152.335286 13.7029086,170 34.9998316,170 Z M34.4806527,163 C16.4230831,163 2,148.547081 2,130.5 C2,112.491132 16.3848476,98 34.4424172,98 C52.4999868,98 66.9613057,112.491132 67,130.5 C67.0380901,148.547081 52.5382223,163 34.4806527,163 Z" id="Shape" fill="#000000" fill-rule="nonzero"></path>
<path d="M34.9343715,72.2309106 C56.2695859,72.2309106 73.972753,89.9107208 73.972753,111.18 C73.972753,111.23118 73.972753,111.282338 73.972753,111.333475 L73.5988026,111.333475 C71.9288099,93.0178969 55.3503795,78.7224385 34.9073295,78.7224385 C14.4642796,78.7224385 -2.03197302,93.0178969 -3.65438154,111.333475 L-4.02646394,111.332732 L-4.027247,111.18 C-4.027247,90.1234136 13.2858444,72.5848657 34.2965651,72.2362004 L34.9343715,72.2309106 Z" id="Combined-Shape" fill="#000000" fill-rule="nonzero"></path>
<path d="M34.9343715,52.68 C56.2695859,52.68 73.972753,70.3598102 73.972753,91.6290894 C73.972753,91.680269 73.972753,91.7314275 73.972753,91.7825646 L73.5988026,91.7825646 C71.9288099,73.4669864 55.3503795,59.1715279 34.9073295,59.1715279 C14.4642796,59.1715279 -2.03197302,73.4669864 -3.65438154,91.7825646 L-4.02646394,91.7818212 L-4.027247,91.6290894 C-4.027247,70.572503 13.2858444,53.0339552 34.2965651,52.6852899 L34.9343715,52.68 Z" id="Combined-Shape" fill="#000000" fill-rule="nonzero"></path>
<g id="Arrow-L" transform="translate(27.5, 88)" stroke="#000000" stroke-width="0.2">
<path d="M20.6973,-42.4683 C21.9436,-42.4683 23.2176,-42.9457 24.0393,-43.7397 L41.3749,-60.8919 L63.2875,-84.6789 L85.3057,-60.8919 L102.669,-43.7397 C103.463,-42.9457 104.737,-42.4683 106.011,-42.4683 C108.634,-42.4683 110.597,-44.5086 110.597,-47.1344 C110.597,-48.4084 110.147,-49.5215 109.139,-50.607 L66.8656,-92.8227 C65.858,-93.8831 64.667,-94.4384 63.3403,-94.4384 C62.0412,-94.4384 60.8226,-93.8831 59.815,-92.8227 L17.569,-50.607 C16.5614,-49.5215 16.084,-48.4084 16.084,-47.1344 C16.084,-44.5086 18.0464,-42.4683 20.6973,-42.4683 Z M63.3403,23.9794 C66.0967,23.9794 68.1119,22.0169 68.1119,19.2882 L68.1119,-66.5878 L67.529,-84.2692 C67.529,-86.7618 65.8329,-88.5132 63.3403,-88.5132 C60.8753,-88.5132 59.1516,-86.7618 59.1516,-84.3245 L58.5963,-66.5878 L58.5963,19.2882 C58.5963,22.0169 60.5839,23.9794 63.3403,23.9794 Z" id="Shape"></path>
</g>
</g>
<g id="Regular-M" transform="translate(6, 13)">
<path d="M24.4998683,131 C41.1851001,131 55,117.185288 55,100.5 C55,83.844591 41.1552155,70 24.4699837,70 C7.81463656,70 -6,83.844591 -6,100.5 C-6,117.185288 7.84458244,131 24.4998683,131 Z M24.4848198,126 C10.3165729,126 -1,114.660017 -1,100.5 C-1,86.3699652 10.2865727,75 24.4548196,75 C38.6230666,75 49.9696396,86.3699652 50,100.5 C50.0298858,114.660017 38.6530667,126 24.4848198,126 Z" id="Shape" fill="#000000" fill-rule="nonzero"></path>
<path d="M24.4699837,55.2062638 C41.1552155,55.2062638 55,68.9572273 55,85.5 C55,85.5398063 55,85.5795963 55,85.6193696 L54.707552,85.6193696 C53.4015316,71.3739199 40.4363491,60.25523 24.4488355,60.25523 C8.46132206,60.25523 -4.43959342,71.3739199 -5.70840009,85.6193696 L-5.99938761,85.6187913 L-6,85.5 C-6,69.122655 7.53972535,55.4815623 23.9711865,55.2103781 L24.4699837,55.2062638 Z" id="Combined-Shape" fill="#000000" fill-rule="nonzero"></path>
<path d="M24.4699837,40 C41.1552155,40 55,53.7509635 55,70.2937362 C55,70.3335425 55,70.3733325 55,70.4131058 L54.707552,70.4131058 C53.4015316,56.1676561 40.4363491,45.0489662 24.4488355,45.0489662 C8.46132206,45.0489662 -4.43959342,56.1676561 -5.70840009,70.4131058 L-5.99938761,70.4125276 L-6,70.2937362 C-6,53.9163912 7.53972535,40.2752985 23.9711865,40.0041143 L24.4699837,40 Z" id="Combined-Shape" fill="#000000" fill-rule="nonzero"></path>
<g id="Arrow-M" transform="translate(29.8469, -14.3621)" stroke="#000000" stroke-width="0.2">
<path d="M4.0367797,38.4970902 C5.0838948,38.4970902 6.14074965,38.0962511 6.8355798,37.4092695 L17.0676475,27.3312661 L34.1055957,8.5701351 L51.2385525,27.3312661 L61.48036,37.4092695 C62.1655422,38.0962511 63.2223052,38.4970902 64.2790682,38.4970902 C66.5062551,38.4970902 68.1531,36.7602436 68.1531,34.5554904 C68.1531,33.4959522 67.7629587,32.5512027 66.9157841,31.6161264 L37.1323611,1.74573652 C36.2851866,0.848616043 35.2574591,0.3621 34.1531,0.3621 C33.0584806,0.3621 32.0210134,0.848616043 31.1738389,1.74573652 L1.40015564,31.6161264 C0.552981091,32.5512027 0.1531,33.4959522 0.1531,34.5554904 C0.1531,36.7602436 1.79994485,38.4970902 4.0367797,38.4970902 Z M34.1531,85.3621 C36.4850352,85.3621 38.1794762,83.7109672 38.1794762,81.3825996 L38.1794762,22.1537994 L37.6844948,8.77244323 C37.6844948,6.67271332 36.2473302,5.21233606 34.1531,5.21233606 C32.0686096,5.21233606 30.6217052,6.67271332 30.6217052,8.7530047 L30.1364635,22.1537994 L30.1364635,81.3825996 C30.1364635,83.7109672 31.8211648,85.3621 34.1531,85.3621 Z" id="Shape"></path>
</g>
</g>
<g id="Regular-S" transform="translate(25, -376)">
<path d="M6.49988996,79 C20.4498378,79 32,67.4499946 32,53.5 C32,39.5749859 20.4248523,28 6.47490441,28 C-7.45005796,28 -19,39.5749859 -19,53.5 C-19,67.4499946 -7.42502124,79 6.49988996,79 Z M6.49988996,74.7499915 C-5.30007607,74.7499915 -14.7250371,65.3000099 -14.7250371,53.5 C-14.7250371,41.7249758 -5.32506155,32.2500086 6.47490441,32.2500086 C18.2748704,32.2500086 27.724817,41.7249758 27.7501025,53.5 C27.7749927,65.3000099 18.2998559,74.7499915 6.49988996,74.7499915 Z" id="Shape" fill="#000000" fill-rule="nonzero"></path>
<path d="M6.47490441,15 C20.4248523,15 32,26.7556245 32,40.8979516 C32,40.9319819 32,40.965998 32,41 L31.7554942,41 C30.6635756,28.8216419 19.8238327,19.3163339 6.45722316,19.3163339 C-6.90938643,19.3163339 -17.6953978,28.8216419 -18.7562033,41 L-18.999488,40.9995057 L-19,40.8979516 C-19,26.8970477 -7.67990178,15.2353512 6.05787724,15.0035173 L6.47490441,15 Z" id="Combined-Shape" fill="#000000" fill-rule="nonzero"></path>
<path d="M6.47490441,2 C20.4248523,2 32,13.7556244 32,27.8979516 C32,27.9319818 32,27.965998 32,28 L31.7554942,28 C30.6635756,15.8216419 19.8238327,6.31633393 6.45722316,6.31633393 C-6.90938643,6.31633393 -17.6953978,15.8216419 -18.7562033,28 L-18.999488,27.9995056 L-19,27.8979516 C-19,13.8970477 -7.67990178,2.23535116 6.05787724,2.00351732 L6.47490441,2 Z" id="Combined-Shape" fill="#000000" fill-rule="nonzero"></path>
<g id="Arrow-S" transform="translate(17.1394, -34.8769)" stroke="#000000" stroke-width="0.2">
<path d="M3.1105866,28.2745592 C3.98559415,28.2745592 4.8606,27.9413857 5.44394007,27.3584386 L11.4022517,21.5706673 L24.8189488,6.70568611 L38.3189312,21.5706673 L44.2772429,27.3584386 C44.8605812,27.9413857 45.7355888,28.2745592 46.6105963,28.2745592 C48.4855394,28.2745592 49.8606,26.8171914 49.8606,24.9850353 C49.8606,24.1106146 49.5272882,23.3195087 48.8189365,22.5284027 L27.3606,1.04284425 C26.6522492,0.293267711 25.7772417,-0.12305 24.8606,-0.12305 C23.9439413,-0.12305 23.0689337,0.293267711 22.3605821,1.04284425 L0.9022464,22.5284027 C0.193894763,23.3195087 -0.1394,24.1106146 -0.1394,24.9850353 C-0.1394,26.8171914 1.23564356,28.2745592 3.1105866,28.2745592 Z M24.8605915,61.87695 C26.8189051,61.87695 28.2356084,60.5028705 28.2356084,58.545854 L28.2356084,17.032105 L27.818926,6.78891554 C27.818926,5.04015943 26.6106066,3.83256519 24.8605915,3.83256519 C23.1105764,3.83256519 21.902257,5.04015943 21.902257,6.78891554 L21.4855745,17.032105 L21.4855745,58.545854 C21.4855745,60.5028705 22.9022778,61.87695 24.8605915,61.87695 Z" id="Shape"></path>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

12
Mac/Resources/Assets.xcassets/markBelowAsRead.symbolset/Contents.json Normal file
View File

@@ -0,0 +1,12 @@
{
"info" : {
"author" : "xcode",
"version" : 1
},
"symbols" : [
{
"filename" : "markBelowAsRead.svg",
"idiom" : "universal"
}
]
}

159
Mac/Resources/Assets.xcassets/markBelowAsRead.symbolset/markBelowAsRead.svg Normal file
View File

@@ -0,0 +1,159 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="3300px" height="2200px" viewBox="0 0 3300 2200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>markBelowAsRead</title>
<g id="markBelowAsRead" stroke="none" fill="none" fill-rule="evenodd" stroke-width="1">
<g>
<g id="Notes">
<rect id="artboard" fill="#FFFFFF" fill-rule="nonzero" x="0" y="0" width="3300" height="2200"></rect>
<line x1="263" y1="292" x2="3036" y2="292" id="Path" stroke="#000000" stroke-width="0.5"></line>
<text id="Weight/Scale-Variations" fill="#000000" fill-rule="nonzero" font-family="Helvetica-Bold, Helvetica" font-size="13" font-weight="bold">
<tspan x="263" y="322">Weight/Scale Variations</tspan>
</text>
<text id="Ultralight" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="533.711" y="322">Ultralight</tspan>
</text>
<text id="Thin" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="843.422" y="322">Thin</tspan>
</text>
<text id="Light" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="1138.63" y="322">Light</tspan>
</text>
<text id="Regular" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="1426.84" y="322">Regular</tspan>
</text>
<text id="Medium" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="1723.06" y="322">Medium</tspan>
</text>
<text id="Semibold" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="2015.77" y="322">Semibold</tspan>
</text>
<text id="Bold" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="2326.48" y="322">Bold</tspan>
</text>
<text id="Heavy" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="2618.19" y="322">Heavy</tspan>
</text>
<text id="Black" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="2917.4" y="322">Black</tspan>
</text>
<line x1="263" y1="1903" x2="3036" y2="1903" id="Path" stroke="#000000" stroke-width="0.5"></line>
<g id="Group" transform="translate(264, 1918)" fill="#000000" fill-rule="nonzero">
<path d="M8.24805,15.830078 C12.5547,15.830078 16.1387,12.25586 16.1387,7.94922 C16.1387,3.6426 12.5449,0.0684 8.23828,0.0684 C3.94141,0.0684 0.36719,3.6426 0.36719,7.94922 C0.36719,12.25586 3.95117,15.830078 8.24805,15.830078 Z M8.24805,14.345703 C4.70312,14.345703 1.87109,11.50391 1.87109,7.94922 C1.87109,4.3945 4.69336,1.5527 8.23828,1.5527 C11.793,1.5527 14.6348,4.3945 14.6446,7.94922 C14.6543,11.50391 11.8027,14.345703 8.24805,14.345703 Z M8.22852,11.57227 C8.69727,11.57227 8.9707,11.25977 8.9707,10.74219 L8.9707,8.68164 L11.1973,8.68164 C11.6953,8.68164 12.0371,8.42773 12.0371,7.95898 C12.0371,7.48047 11.7148,7.2168 11.1973,7.2168 L8.9707,7.2168 L8.9707,4.9902 C8.9707,4.4727 8.69727,4.1504 8.22852,4.1504 C7.75977,4.1504 7.50586,4.4922 7.50586,4.9902 L7.50586,7.2168 L5.29883,7.2168 C4.78125,7.2168 4.44922,7.48047 4.44922,7.95898 C4.44922,8.42773 4.80078,8.68164 5.29883,8.68164 L7.50586,8.68164 L7.50586,10.74219 C7.50586,11.24023 7.75977,11.57227 8.22852,11.57227 Z" id="Shape"></path>
</g>
<g id="Group" transform="translate(282.506, 1915)" fill="#000000" fill-rule="nonzero">
<path d="M10.709,20.91016 C16.1582,20.91016 20.6699,16.39844 20.6699,10.94922 C20.6699,5.5098 16.1484,0.9883 10.6992,0.9883 C5.25977,0.9883 0.74805,5.5098 0.74805,10.94922 C0.74805,16.39844 5.26953,20.91016 10.709,20.91016 Z M10.709,19.25 C6.09961,19.25 2.41797,15.55859 2.41797,10.94922 C2.41797,6.3496 6.08984,2.6484 10.6992,2.6484 C15.3086,2.6484 19,6.3496 19.0098756,10.94922 C19.0195,15.55859 15.3184,19.25 10.709,19.25 Z M10.6895,15.58789 C11.207,15.58789 11.5195,15.22656 11.5195,14.66016 L11.5195,11.76953 L14.5762,11.76953 C15.123,11.76953 15.5039,11.48633 15.5039,10.96875 C15.5039,10.44141 15.1426,10.13867 14.5762,10.13867 L11.5195,10.13867 L11.5195,7.0723 C11.5195,6.4961 11.207,6.1445 10.6895,6.1445 C10.1719,6.1445 9.8789,6.5156 9.8789,7.0723 L9.8789,10.13867 L6.83203,10.13867 C6.26562,10.13867 5.89453,10.44141 5.89453,10.96875 C5.89453,11.48633 6.28516,11.76953 6.83203,11.76953 L9.8789,11.76953 L9.8789,14.66016 C9.8789,15.20703 10.1719,15.58789 10.6895,15.58789 Z" id="Shape"></path>
</g>
<g id="Group" transform="translate(306.924, 1913)" fill="#000000" fill-rule="nonzero">
<path d="M12.9707,25.67383 C19.9336,25.67383 25.6953,19.921875 25.6953,12.95898 C25.6953,5.9961 19.9238,0.2441 12.9609,0.2441 C6.00781,0.2441 0.25586,5.9961 0.25586,12.95898 C0.25586,19.921875 6.01758,25.67383 12.9707,25.67383 Z M12.9707,23.85742 C6.93555,23.85742 2.08203,18.99414 2.08203,12.95898 C2.08203,6.9238 6.92578,2.0605 12.9609,2.0605 C19.0059,2.0605 23.8594,6.9238 23.8691589,12.95898 C23.8789,18.99414 19.0156,23.85742 12.9707,23.85742 Z M12.9512,18.93555 C13.5176,18.93555 13.8691,18.54492 13.8691,17.93945 L13.8691,13.86719 L18.1074,13.86719 C18.6934,13.86719 19.1133,13.53516 19.1133,12.97852 C19.1133,12.40234 18.7227,12.06055 18.1074,12.06055 L13.8691,12.06055 L13.8691,7.8125 C13.8691,7.1973 13.5176,6.8066 12.9512,6.8066 C12.3848,6.8066 12.0625,7.2168 12.0625,7.8125 L12.0625,12.06055 L7.83398,12.06055 C7.21875,12.06055 6.80859,12.40234 6.80859,12.97852 C6.80859,13.53516 7.23828,13.86719 7.83398,13.86719 L12.0625,13.86719 L12.0625,17.93945 C12.0625,18.52539 12.3848,18.93555 12.9512,18.93555 Z" id="Shape"></path>
</g>
<text id="Design-Variations" fill="#000000" fill-rule="nonzero" font-family="Helvetica-Bold, Helvetica" font-size="13" font-weight="bold">
<tspan x="263" y="1953">Design Variations</tspan>
</text>
<text id="Symbols-are-supported-in-up-to-nine-weights-and-three-scales." fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="263" y="1971">Symbols are supported in up to nine weights and three scales.</tspan>
</text>
<text id="For-optimal-layout-with-text-and-other-symbols,-vertically-align" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="263" y="1989">For optimal layout with text and other symbols, vertically align</tspan>
</text>
<text id="symbols-with-the-adjacent-text." fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="263" y="2007">symbols with the adjacent text.</tspan>
</text>
<rect id="Rectangle" fill="#00AEEF" fill-rule="nonzero" opacity="0.4" x="776" y="1919" width="3" height="14"></rect>
<g id="Group" transform="translate(779, 1918)" fill="#000000" fill-rule="nonzero">
<path d="M10.5273,15 L12.373,15 L7.17773,0.9082 L5.43945,0.9082 L0.244141,15 L2.08984,15 L3.50586,10.9668 L9.11133,10.9668 L10.5273,15 Z M6.2793,3.0469 L6.33789,3.0469 L8.59375,9.47266 L4.02344,9.47266 L6.2793,3.0469 Z" id="Shape"></path>
</g>
<rect id="Rectangle" fill="#00AEEF" fill-rule="nonzero" opacity="0.4" x="791.617" y="1919" width="3" height="14"></rect>
<text id="Margins" fill="#000000" fill-rule="nonzero" font-family="Helvetica-Bold, Helvetica" font-size="13" font-weight="bold">
<tspan x="776" y="1953">Margins</tspan>
</text>
<text id="Leading-and-trailing-margins-on-the-left-and-right-side-of-each-symbol" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="776" y="1971">Leading and trailing margins on the left and right side of each symbol</tspan>
</text>
<text id="can-be-adjusted-by-modifying-the-width-of-the-blue-rectangles." fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="776" y="1989">can be adjusted by modifying the width of the blue rectangles.</tspan>
</text>
<text id="Modifications-are-automatically-applied-proportionally-to-all" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="776" y="2007">Modifications are automatically applied proportionally to all</tspan>
</text>
<text id="scales-and-weights." fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="776" y="2025">scales and weights.</tspan>
</text>
<g id="Group" transform="translate(1291, 1915)" fill="#000000" fill-rule="nonzero">
<path d="M0.83203,21.11523 L2.375,22.6582 C3.22461,23.48828 4.19141,23.41992 5.06055,22.46289 L15.2754,11.33984 C15.7051,11.63281 16.0957,11.62305 16.5645,11.52539 L17.6094,11.31055 L18.3027,12.00391 L18.2539,12.52148 C18.1855,13.04883 18.3516,13.46875 18.8496,13.9668 L19.6602,14.77734 C20.168,15.28516 20.8223,15.31445 21.3008,14.83594 L24.5527,11.58398 C25.0312,11.10547 25.0117,10.45117 24.5039,9.94336 L23.6836,9.12305 C23.1855,8.625 22.7754,8.44922 22.2383,8.52734 L21.7109,8.58594 L21.0566,7.9219 L21.3398,6.7793 C21.4863,6.2129 21.3398,5.7441 20.7148,5.1387 L18.3027,2.7461 C14.7578,-0.7793 10.2266,-0.6719 7.11133,2.4629 C6.69141,2.8926 6.64258,3.4785 6.91602,3.9082 C7.15039,4.2793 7.62891,4.5039 8.2734,4.3379 C9.7871,3.957 11.3008,4.0742 12.7852,5.0801 L12.1602,6.6621 C11.9258,7.248 11.9453,7.7266 12.1797,8.16602 L1.01758,18.439453 C0.08008,19.30859 -0.02734,20.25586 0.83203,21.11523 Z M8.6738,2.8535 C11.3398,0.8613 14.6504,1.1738 17.0527,3.5859 L19.6797,6.1934 C19.9141,6.4277 19.9434,6.6133 19.8848,6.9062 L19.5039,8.46875 L21.0762,10.04102 L22.043,9.95312 C22.3262,9.92383 22.4141,9.94336 22.6387,10.16797 L23.2637,10.79297 L20.5098,13.53711 L19.8848,12.92188 C19.6602,12.69727 19.6406,12.59961 19.6699,12.31641 L19.7578,11.35938 L18.1953,9.79688 L16.5742,10.10938 C16.291,10.16797 16.1445,10.16797 15.9102,9.92383 L13.7324,7.7461 C13.5078,7.5117 13.4785,7.375 13.6055,7.0527 L14.5527,4.7773 C12.9512,3.2441 10.8418,2.3945 8.8008,3.0488 C8.7129,3.0781 8.6445,3.0586 8.6152,3.0195 C8.5859,2.9707 8.5859,2.9219 8.6738,2.8535 Z M2.10156,20.41211 C1.61328,19.91406 1.78906,19.61133 2.12109,19.30859 L13.0781,9.19141 L14.3086,10.42188 L4.15234,21.34961 C3.84961,21.68164 3.46875,21.7793 3.06836,21.37891 L2.10156,20.41211 Z" id="Shape"></path>
</g>
<text id="Exporting" fill="#000000" fill-rule="nonzero" font-family="Helvetica-Bold, Helvetica" font-size="13" font-weight="bold">
<tspan x="1289" y="1953">Exporting</tspan>
</text>
<text id="Symbols-should-be-outlined-when-exporting-to-ensure-the" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="1289" y="1971">Symbols should be outlined when exporting to ensure the</tspan>
</text>
<text id="design-is-preserved-when-submitting-to-Xcode." fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="1289" y="1989">design is preserved when submitting to Xcode.</tspan>
</text>
<text id="Template-v.1.0" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="2952" y="1933">Template v.1.0</tspan>
</text>
<text id="Generated-from-circle" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="2911" y="1951">Generated from circle</tspan>
</text>
<text id="Typeset-at-100-points" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="2912" y="1969">Typeset at 100 points</tspan>
</text>
<text id="Small" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="263" y="726">Small</tspan>
</text>
<text id="Medium" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="263" y="1156">Medium</tspan>
</text>
<text id="Large" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
<tspan x="263" y="1586">Large</tspan>
</text>
</g>
<g id="Guides" transform="translate(263, 625)">
<g id="H-reference" transform="translate(76, 0)" fill="#27AAE1" fill-rule="nonzero">
<path d="M54.9316,71 L57.666,71 L30.5664,0.541 L28.0762,0.541 L0.976562,71 L3.66211,71 L12.9395,46.5371 L45.7031,46.5371 L54.9316,71 Z M29.1992,3.9102 L29.4434,3.9102 L44.8242,44.291 L13.8184,44.291 L29.1992,3.9102 Z" id="Shape"></path>
</g>
<line x1="0" y1="71" x2="2773" y2="71" id="Baseline-S" stroke="#27AAE1" stroke-width="0.577"></line>
<line x1="0" y1="0.541" x2="2773" y2="0.541" id="Capline-S" stroke="#27AAE1" stroke-width="0.577"></line>
<g id="H-reference" transform="translate(76, 430)" fill="#27AAE1" fill-rule="nonzero">
<path d="M54.9316,71 L57.666,71 L30.5664,0.541 L28.0762,0.541 L0.976562,71 L3.66211,71 L12.9395,46.5371 L45.7031,46.5371 L54.9316,71 Z M29.1992,3.9102 L29.4434,3.9102 L44.8242,44.291 L13.8184,44.291 L29.1992,3.9102 Z" id="Shape"></path>
</g>
<line x1="0" y1="501" x2="2773" y2="501" id="Baseline-M" stroke="#27AAE1" stroke-width="0.577"></line>
<line x1="0" y1="430.54" x2="2773" y2="430.54" id="Capline-M" stroke="#27AAE1" stroke-width="0.577"></line>
<g id="H-reference" transform="translate(76, 860)" fill="#27AAE1" fill-rule="nonzero">
<path d="M54.9316,71 L57.666,71 L30.5664,0.541 L28.0762,0.541 L0.976562,71 L3.66211,71 L12.9395,46.5371 L45.7031,46.5371 L54.9316,71 Z M29.1992,3.9102 L29.4434,3.9102 L44.8242,44.291 L13.8184,44.291 L29.1992,3.9102 Z" id="Shape"></path>
</g>
<line x1="0" y1="931" x2="2773" y2="931" id="Baseline-L" stroke="#27AAE1" stroke-width="0.577"></line>
<line x1="0" y1="860.54" x2="2773" y2="860.54" id="Capline-L" stroke="#27AAE1" stroke-width="0.577"></line>
<rect id="left-margin" fill="#00AEEF" fill-rule="nonzero" opacity="0.4" x="1128.3" y="405.79" width="8.74023" height="119.336"></rect>
<rect id="right-margin" fill="#00AEEF" fill-rule="nonzero" opacity="0.4" x="1236.65" y="405.79" width="8.74023" height="119.336"></rect>
</g>
<g id="Symbols" transform="translate(1399, 1016)">
<g id="Regular-L" transform="translate(-6, 409)">
<path d="M34.9998316,143 C56.335046,143 74,125.335286 74,104 C74,82.7029196 56.2968329,65 34.9616185,65 C13.6646172,65 -4,82.7029196 -4,104 C-4,125.335286 13.7029086,143 34.9998316,143 Z M34.4806527,136 C16.4230831,136 2,121.547081 2,103.5 C2,85.4911322 16.3848476,71 34.4424172,71 C52.4999868,71 66.9613057,85.4911322 67,103.5 C67.0380901,121.547081 52.5382223,136 34.4806527,136 Z" id="Shape" fill="#000000" fill-rule="nonzero"></path>
<path d="M34.9343715,45.2309106 C56.2695859,45.2309106 73.972753,62.9107208 73.972753,84.18 C73.972753,84.2311796 73.972753,84.282338 73.972753,84.3334752 L73.5988026,84.3334752 C71.9288099,66.0178969 55.3503795,51.7224385 34.9073295,51.7224385 C14.4642796,51.7224385 -2.03197302,66.0178969 -3.65438154,84.3334752 L-4.02646394,84.3327317 L-4.027247,84.18 C-4.027247,63.1234136 13.2858444,45.5848657 34.2965651,45.2362004 L34.9343715,45.2309106 Z" id="Combined-Shape" fill="#000000" fill-rule="nonzero"></path>
<path d="M34.9343715,25.68 C56.2695859,25.68 73.972753,43.3598102 73.972753,64.6290894 C73.972753,64.680269 73.972753,64.7314275 73.972753,64.7825646 L73.5988026,64.7825646 C71.9288099,46.4669864 55.3503795,32.1715279 34.9073295,32.1715279 C14.4642796,32.1715279 -2.03197302,46.4669864 -3.65438154,64.7825646 L-4.02646394,64.7818212 L-4.027247,64.6290894 C-4.027247,43.572503 13.2858444,26.0339552 34.2965651,25.6852899 L34.9343715,25.68 Z" id="Combined-Shape" fill="#000000" fill-rule="nonzero"></path>
<g id="Arrow-L" transform="translate(27.5, 88)" stroke="#000000" stroke-width="0.2">
<path d="M20.6973,46.5317 C21.9436,46.5317 23.2176,46.0543 24.0393,45.2603 L41.3749,28.1081 L63.2875,4.3211 L85.3057,28.1081 L102.669,45.2603 C103.463,46.0543 104.737,46.5317 106.011,46.5317 C108.634,46.5317 110.597,44.4914 110.597,41.8656 C110.597,40.5916 110.147,39.4785 109.139,38.393 L66.8656,-3.8227 C65.858,-4.8831 64.667,-5.4384 63.3403,-5.4384 C62.0412,-5.4384 60.8226,-4.8831 59.815,-3.8227 L17.569,38.393 C16.5614,39.4785 16.084,40.5916 16.084,41.8656 C16.084,44.4914 18.0464,46.5317 20.6973,46.5317 Z M63.3403,112.9794 C66.0967,112.9794 68.1119,111.0169 68.1119,108.2882 L68.1119,22.4122 L67.529,4.7308 C67.529,2.2382 65.8329,0.4868 63.3403,0.4868 C60.8753,0.4868 59.1516,2.2382 59.1516,4.6755 L58.5963,22.4122 L58.5963,108.2882 C58.5963,111.0169 60.5839,112.9794 63.3403,112.9794 Z" id="Shape" transform="translate(63.3405, 53.7705) scale(1, -1) translate(-63.3405, -53.7705)"></path>
</g>
</g>
<g id="Regular-M" transform="translate(6, 13)">
<path d="M24.4998683,96 C41.1851001,96 55,82.1852875 55,65.5 C55,48.844591 41.1552155,35 24.4699837,35 C7.81463656,35 -6,48.844591 -6,65.5 C-6,82.1852875 7.84458244,96 24.4998683,96 Z M24.4848198,91 C10.3165729,91 -1,79.6600172 -1,65.5 C-1,51.3699652 10.2865727,40 24.4548196,40 C38.6230666,40 49.9696396,51.3699652 50,65.5 C50.0298858,79.6600172 38.6530667,91 24.4848198,91 Z" id="Shape" fill="#000000" fill-rule="nonzero"></path>
<path d="M24.4699837,20.2062638 C41.1552155,20.2062638 55,33.9572273 55,50.5 C55,50.5398063 55,50.5795963 55,50.6193696 L54.707552,50.6193696 C53.4015316,36.3739199 40.4363491,25.25523 24.4488355,25.25523 C8.46132206,25.25523 -4.43959342,36.3739199 -5.70840009,50.6193696 L-5.99938761,50.6187913 L-6,50.5 C-6,34.122655 7.53972535,20.4815623 23.9711865,20.2103781 L24.4699837,20.2062638 Z" id="Combined-Shape" fill="#000000" fill-rule="nonzero"></path>
<path d="M24.4699837,5 C41.1552155,5 55,18.7509635 55,35.2937362 C55,35.3335425 55,35.3733325 55,35.4131058 L54.707552,35.4131058 C53.4015316,21.1676561 40.4363491,10.0489662 24.4488355,10.0489662 C8.46132206,10.0489662 -4.43959342,21.1676561 -5.70840009,35.4131058 L-5.99938761,35.4125276 L-6,35.2937362 C-6,18.9163912 7.53972535,5.27529845 23.9711865,5.00411433 L24.4699837,5 Z" id="Combined-Shape" fill="#000000" fill-rule="nonzero"></path>
<g id="Arrow-M" transform="translate(63.8469, 106.1379) scale(1, -1) translate(-63.8469, -106.1379)translate(29.8469, 63.6379)" stroke="#000000" stroke-width="0.2">
<path d="M4.0367797,38.4970902 C5.0838948,38.4970902 6.14074965,38.0962511 6.8355798,37.4092695 L17.0676475,27.3312661 L34.1055957,8.5701351 L51.2385525,27.3312661 L61.48036,37.4092695 C62.1655422,38.0962511 63.2223052,38.4970902 64.2790682,38.4970902 C66.5062551,38.4970902 68.1531,36.7602436 68.1531,34.5554904 C68.1531,33.4959522 67.7629587,32.5512027 66.9157841,31.6161264 L37.1323611,1.74573652 C36.2851866,0.848616043 35.2574591,0.3621 34.1531,0.3621 C33.0584806,0.3621 32.0210134,0.848616043 31.1738389,1.74573652 L1.40015564,31.6161264 C0.552981091,32.5512027 0.1531,33.4959522 0.1531,34.5554904 C0.1531,36.7602436 1.79994485,38.4970902 4.0367797,38.4970902 Z M34.1531,85.3621 C36.4850352,85.3621 38.1794762,83.7109672 38.1794762,81.3825996 L38.1794762,22.1537994 L37.6844948,8.77244323 C37.6844948,6.67271332 36.2473302,5.21233606 34.1531,5.21233606 C32.0686096,5.21233606 30.6217052,6.67271332 30.6217052,8.7530047 L30.1364635,22.1537994 L30.1364635,81.3825996 C30.1364635,83.7109672 31.8211648,85.3621 34.1531,85.3621 Z" id="Shape"></path>
</g>
</g>
<g id="Regular-S" transform="translate(25, -376)">
<path d="M6.49988996,53 C20.4498378,53 32,41.4499946 32,27.5 C32,13.5749859 20.4248523,2 6.47490441,2 C-7.45005796,2 -19,13.5749859 -19,27.5 C-19,41.4499946 -7.42502124,53 6.49988996,53 Z M6.49988996,48.7499915 C-5.30007607,48.7499915 -14.7250371,39.3000099 -14.7250371,27.5 C-14.7250371,15.7249758 -5.32506155,6.25000859 6.47490441,6.25000859 C18.2748704,6.25000859 27.724817,15.7249758 27.7501025,27.5 C27.7749927,39.3000099 18.2998559,48.7499915 6.49988996,48.7499915 Z" id="Shape" fill="#000000" fill-rule="nonzero"></path>
<path d="M6.47490441,-11 C20.4248523,-11 32,0.755624512 32,14.8979516 C32,14.9319819 32,14.965998 32,15 L31.7554942,15 C30.6635756,2.82164191 19.8238327,-6.68366609 6.45722316,-6.68366609 C-6.90938643,-6.68366609 -17.6953978,2.82164191 -18.7562033,15 L-18.999488,14.9995057 L-19,14.8979516 C-19,0.897047723 -7.67990178,-10.7646488 6.05787724,-10.9964827 L6.47490441,-11 Z" id="Combined-Shape" fill="#000000" fill-rule="nonzero"></path>
<path d="M6.47490441,-24 C20.4248523,-24 32,-12.2443756 32,1.89795158 C32,1.93198177 32,1.96599796 32,2 L31.7554942,2 C30.6635756,-10.1783581 19.8238327,-19.6836661 6.45722316,-19.6836661 C-6.90938643,-19.6836661 -17.6953978,-10.1783581 -18.7562033,2 L-18.999488,1.99950559 L-19,1.89795158 C-19,-12.1029523 -7.67990178,-23.7646488 6.05787724,-23.9964827 L6.47490441,-24 Z" id="Combined-Shape" fill="#000000" fill-rule="nonzero"></path>
<g id="Arrow-S" transform="translate(42, 55) scale(1, -1) translate(-42, -55)translate(17, 24)" stroke="#000000" stroke-width="0.2">
<path d="M3.2499866,28.3976092 C4.12499415,28.3976092 5,28.0644357 5.58334007,27.4814886 L11.5416517,21.6937173 L24.9583488,6.82873611 L38.4583312,21.6937173 L44.4166429,27.4814886 C44.9999812,28.0644357 45.8749888,28.3976092 46.7499963,28.3976092 C48.6249394,28.3976092 50,26.9402414 50,25.1080853 C50,24.2336646 49.6666882,23.4425587 48.9583365,22.6514527 L27.5,1.16589425 C26.7916492,0.416317711 25.9166417,0 25,0 C24.0833413,0 23.2083337,0.416317711 22.4999821,1.16589425 L1.0416464,22.6514527 C0.333294763,23.4425587 0,24.2336646 0,25.1080853 C0,26.9402414 1.37504356,28.3976092 3.2499866,28.3976092 Z M24.9999915,62 C26.9583051,62 28.3750084,60.6259205 28.3750084,58.668904 L28.3750084,17.155155 L27.958326,6.91196554 C27.958326,5.16320943 26.7500066,3.95561519 24.9999915,3.95561519 C23.2499764,3.95561519 22.041657,5.16320943 22.041657,6.91196554 L21.6249745,17.155155 L21.6249745,58.668904 C21.6249745,60.6259205 23.0416778,62 24.9999915,62 Z" id="Shape"></path>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

8
iOS/SceneCoordinator.swift
View File

@@ -85,7 +85,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
var isArticleViewControllerPending = false
/// `Bool` to track whether a refresh is scheduled.
private var isRefreshScheduled: Bool = false
private var isNavigationBarSubtitleRefreshScheduled: Bool = false
private(set) var sortDirection = AppDefaults.shared.timelineSortDirection {
didSet {
@@ -628,12 +628,12 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
}
func scheduleNavigationBarSubtitleUpdate() {
if isRefreshScheduled {
if isNavigationBarSubtitleRefreshScheduled {
return
}
isRefreshScheduled = true
isNavigationBarSubtitleRefreshScheduled = true
DispatchQueue.main.asyncAfter(deadline: .now() + 60) { [weak self] in
self?.isRefreshScheduled = false
self?.isNavigationBarSubtitleRefreshScheduled = false
self?.updateNavigationBarSubtitles(nil)
}
}

9
xcconfig/NetNewsWire_iOSapp_target.xcconfig
View File

@@ -44,8 +44,7 @@ PRODUCT_NAME = NetNewsWire
CLANG_ENABLE_MODULES = YES
SWIFT_OBJC_BRIDGING_HEADER = iOS/Resources/NetNewsWire-iOS-Bridging-Header.h
SWIFT_VERSION = 5.7
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
TARGETED_DEVICE_FAMILY = "1,2";
SUPPORTED_PLATFORMS = iphoneos iphonesimulator
SUPPORTS_MACCATALYST = NO
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO