From 549bf3197ca954352b3c3a2ca32143c6b5282341 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 25 Nov 2019 20:36:15 -0600 Subject: [PATCH] Show article extractor target state in context menu. --- iOS/AppAssets.swift | 6 +- iOS/Article/ArticleViewController.swift | 2 +- .../Contents.json | 12 + .../doc.plaintext.on.svg | 218 ++++++++++++++++++ 4 files changed, 234 insertions(+), 4 deletions(-) create mode 100644 iOS/Resources/Assets.xcassets/articleExtractorOnSF.symbolset/Contents.json create mode 100644 iOS/Resources/Assets.xcassets/articleExtractorOnSF.symbolset/doc.plaintext.on.svg diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index dcc9217a5..318a50643 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -43,7 +43,7 @@ struct AppAssets { return UIImage(named: "articleExtractorOff")! }() - static var articleExtractorOffSmall: UIImage = { + static var articleExtractorOffSF: UIImage = { return UIImage(systemName: "doc.plaintext")! }() @@ -56,8 +56,8 @@ struct AppAssets { return UIImage(named: "articleExtractorOn")! }() - static var articleExtractorOnSmall: UIImage = { - return UIImage(systemName: "doc.plaintext")! + static var articleExtractorOnSF: UIImage = { + return UIImage(named: "articleExtractorOnSF")! }() static var articleExtractorOnTinted: UIImage = { diff --git a/iOS/Article/ArticleViewController.swift b/iOS/Article/ArticleViewController.swift index 0d4773230..b072f34c8 100644 --- a/iOS/Article/ArticleViewController.swift +++ b/iOS/Article/ArticleViewController.swift @@ -617,7 +617,7 @@ private extension ArticleViewController { func toggleArticleExtractorAction() -> UIAction { let extracted = articleExtractorButton.buttonState == .on let title = extracted ? NSLocalizedString("Show Feed Article", comment: "Show Feed Article") : NSLocalizedString("Show Reader View", comment: "Show Reader View") - let extractorImage = extracted ? AppAssets.articleExtractorOffSmall : AppAssets.articleExtractorOnSmall + let extractorImage = extracted ? AppAssets.articleExtractorOffSF : AppAssets.articleExtractorOnSF return UIAction(title: title, image: extractorImage) { [weak self] action in self?.coordinator.toggleArticleExtractor() } diff --git a/iOS/Resources/Assets.xcassets/articleExtractorOnSF.symbolset/Contents.json b/iOS/Resources/Assets.xcassets/articleExtractorOnSF.symbolset/Contents.json new file mode 100644 index 000000000..909dba50f --- /dev/null +++ b/iOS/Resources/Assets.xcassets/articleExtractorOnSF.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "symbols" : [ + { + "idiom" : "universal", + "filename" : "doc.plaintext.on.svg" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iOS/Resources/Assets.xcassets/articleExtractorOnSF.symbolset/doc.plaintext.on.svg b/iOS/Resources/Assets.xcassets/articleExtractorOnSF.symbolset/doc.plaintext.on.svg new file mode 100644 index 000000000..f0a3af753 --- /dev/null +++ b/iOS/Resources/Assets.xcassets/articleExtractorOnSF.symbolset/doc.plaintext.on.svg @@ -0,0 +1,218 @@ + + + + Untitled + Created with Sketch. + + + + + + + Weight/Scale Variations + + + Ultralight + + + Thin + + + Light + + + Regular + + + Medium + + + Semibold + + + Bold + + + Heavy + + + Black + + + + + + + + + + + + + Design Variations + + + Symbols are supported in up to nine weights and three scales. + + + For optimal layout with text and other symbols, vertically align + + + symbols with the adjacent text. + + + + + + + + Margins + + + Leading and trailing margins on the left and right side of each symbol + + + can be adjusted by modifying the width of the blue rectangles. + + + Modifications are automatically applied proportionally to all + + + scales and weights. + + + + + + Exporting + + + Symbols should be outlined when exporting to ensure the + + + design is preserved when submitting to Xcode. + + + Template v.1.0 + + + Generated from doc.plaintext + + + Typeset at 100 points + + + Small + + + Medium + + + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file