diff --git a/Mac/Resources/Assets.xcassets/accountBazQux.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountBazQux.imageset/Contents.json index 5dc93b35e..25d8387f8 100644 --- a/Mac/Resources/Assets.xcassets/accountBazQux.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountBazQux.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "bazqux-logo.png", + "filename" : "bazqux-any.pdf", "idiom" : "universal" } ], @@ -11,6 +11,6 @@ }, "properties" : { "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "template-rendering-intent" : "original" } } diff --git a/Mac/Resources/Assets.xcassets/accountBazQux.imageset/bazqux-any.pdf b/Mac/Resources/Assets.xcassets/accountBazQux.imageset/bazqux-any.pdf new file mode 100644 index 000000000..d13a0defd Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountBazQux.imageset/bazqux-any.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountBazQux.imageset/bazqux-logo.png b/Mac/Resources/Assets.xcassets/accountBazQux.imageset/bazqux-logo.png deleted file mode 100644 index a73b4eb8c..000000000 Binary files a/Mac/Resources/Assets.xcassets/accountBazQux.imageset/bazqux-logo.png and /dev/null differ diff --git a/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitAny.pdf b/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitAny.pdf new file mode 100644 index 000000000..27a2f136a Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitAny.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitDark.pdf b/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitDark.pdf new file mode 100644 index 000000000..c2777a879 Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitDark.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json index f0e09dead..abd37acbd 100644 --- a/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json @@ -1,15 +1,25 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "icloud.pdf" + "filename" : "CloudKitAny.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "CloudKitDark.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { - "template-rendering-intent" : "template" + "template-rendering-intent" : "original" } -} \ No newline at end of file +} diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json index 0721d5d1f..a29363d1e 100644 --- a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json @@ -1,15 +1,59 @@ { "images" : [ { + "filename" : "feedwranger-any.png", "idiom" : "universal", - "filename" : "outline-512.png" + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "feedwranger-dark.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "feedwranger-any@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "feedwranger-dark@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "feedwranger-any@3x.png", + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "feedwranger-dark@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { - "template-rendering-intent" : "template" + "template-rendering-intent" : "original" } -} \ No newline at end of file +} diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any.png new file mode 100644 index 000000000..e2c215e32 Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any.png differ diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@2x.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@2x.png new file mode 100644 index 000000000..da7ec8828 Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@2x.png differ diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@3x.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@3x.png new file mode 100644 index 000000000..6ee6ef7ce Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@3x.png differ diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark.png new file mode 100644 index 000000000..4eb275ba0 Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark.png differ diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@2x.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@2x.png new file mode 100644 index 000000000..672efa478 Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@2x.png differ diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@3x.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@3x.png new file mode 100644 index 000000000..f10de405b Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@3x.png differ diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/outline-512.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/outline-512.png deleted file mode 100644 index f7d29faa1..000000000 Binary files a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/outline-512.png and /dev/null differ diff --git a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/Contents.json index 2cf7c070c..b16e4373f 100644 --- a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/Contents.json @@ -1,7 +1,17 @@ { "images" : [ { - "filename" : "feedbin-logo.pdf", + "filename" : "feedbin-logo-filled-1.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "feedbin-logo-filled.pdf", "idiom" : "universal" } ], @@ -10,6 +20,7 @@ "version" : 1 }, "properties" : { - "template-rendering-intent" : "template" + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" } } diff --git a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled-1.pdf b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled-1.pdf new file mode 100644 index 000000000..a68d754ae Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled-1.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled.pdf b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled.pdf new file mode 100644 index 000000000..a68d754ae Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo.pdf b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo.pdf deleted file mode 100644 index de686614a..000000000 Binary files a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo.pdf and /dev/null differ diff --git a/Mac/Resources/Assets.xcassets/accountFeedly.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountFeedly.imageset/Contents.json index 754629a4a..236ba8fa6 100644 --- a/Mac/Resources/Assets.xcassets/accountFeedly.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountFeedly.imageset/Contents.json @@ -1,15 +1,25 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "accountFeedly.pdf" + "filename" : "feedly-logo-any.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "feedly-logo-dark.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { - "template-rendering-intent" : "template" + "template-rendering-intent" : "original" } -} \ No newline at end of file +} diff --git a/Mac/Resources/Assets.xcassets/accountFeedly.imageset/accountFeedly.pdf b/Mac/Resources/Assets.xcassets/accountFeedly.imageset/accountFeedly.pdf deleted file mode 100644 index 907e486bc..000000000 Binary files a/Mac/Resources/Assets.xcassets/accountFeedly.imageset/accountFeedly.pdf and /dev/null differ diff --git a/Mac/Resources/Assets.xcassets/accountFeedly.imageset/feedly-logo-any.pdf b/Mac/Resources/Assets.xcassets/accountFeedly.imageset/feedly-logo-any.pdf new file mode 100644 index 000000000..e1ccaab94 Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedly.imageset/feedly-logo-any.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountFeedly.imageset/feedly-logo-dark.pdf b/Mac/Resources/Assets.xcassets/accountFeedly.imageset/feedly-logo-dark.pdf new file mode 100644 index 000000000..f287b271b Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedly.imageset/feedly-logo-dark.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json index b2c62a136..151fb1a8e 100644 --- a/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json @@ -1,15 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "accountFreshRSS.pdf" + "filename" : "freshrss-any.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { - "template-rendering-intent" : "template" + "template-rendering-intent" : "original" } -} \ No newline at end of file +} diff --git a/Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo.pdf b/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/freshrss-any.pdf similarity index 77% rename from Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo.pdf rename to Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/freshrss-any.pdf index 6ae613d52..78d2bca2b 100644 Binary files a/Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo.pdf and b/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/freshrss-any.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountInoreader.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountInoreader.imageset/Contents.json index 979b7673c..8711b150a 100644 --- a/Mac/Resources/Assets.xcassets/accountInoreader.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountInoreader.imageset/Contents.json @@ -1,7 +1,17 @@ { "images" : [ { - "filename" : "inoreader_logo.pdf", + "filename" : "inoreader_logo-any.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "inoreader_logo-dark.pdf", "idiom" : "universal" } ], @@ -11,6 +21,6 @@ }, "properties" : { "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "template-rendering-intent" : "original" } } diff --git a/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/icloud.pdf b/Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-any.pdf similarity index 50% rename from Mac/Resources/Assets.xcassets/accountCloudKit.imageset/icloud.pdf rename to Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-any.pdf index 74406f4cb..d22c40842 100644 Binary files a/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/icloud.pdf and b/Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-any.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon.pdf b/Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-dark.pdf similarity index 53% rename from Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon.pdf rename to Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-dark.pdf index 8a8a3baa6..4de910eaf 100644 Binary files a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon.pdf and b/Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-dark.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountLocal.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountLocal.imageset/Contents.json index 1d99e9ded..63f3b392e 100644 --- a/Mac/Resources/Assets.xcassets/accountLocal.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountLocal.imageset/Contents.json @@ -1,15 +1,25 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "localAccountMac.pdf" + "filename" : "localAccountLight.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "localAccountDark-1.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { - "template-rendering-intent" : "template" + "template-rendering-intent" : "original" } -} \ No newline at end of file +} diff --git a/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/accountFreshRSS.pdf b/Mac/Resources/Assets.xcassets/accountLocal.imageset/localAccountDark-1.pdf similarity index 68% rename from Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/accountFreshRSS.pdf rename to Mac/Resources/Assets.xcassets/accountLocal.imageset/localAccountDark-1.pdf index 1ff98e115..584b84f4a 100644 Binary files a/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/accountFreshRSS.pdf and b/Mac/Resources/Assets.xcassets/accountLocal.imageset/localAccountDark-1.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountLocal.imageset/localAccountMac.pdf b/Mac/Resources/Assets.xcassets/accountLocal.imageset/localAccountLight.pdf similarity index 69% rename from Mac/Resources/Assets.xcassets/accountLocal.imageset/localAccountMac.pdf rename to Mac/Resources/Assets.xcassets/accountLocal.imageset/localAccountLight.pdf index 5c3292ce0..d3d3d40e2 100644 Binary files a/Mac/Resources/Assets.xcassets/accountLocal.imageset/localAccountMac.pdf and b/Mac/Resources/Assets.xcassets/accountLocal.imageset/localAccountLight.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json index 99f78349c..f560c64f3 100644 --- a/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json @@ -1,15 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "newsblur-512.png" + "filename" : "NewsBlur.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { - "template-rendering-intent" : "template" + "template-rendering-intent" : "original" } -} \ No newline at end of file +} diff --git a/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/NewsBlur.pdf b/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/NewsBlur.pdf new file mode 100644 index 000000000..d2b62c6eb Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/NewsBlur.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/newsblur-512.png b/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/newsblur-512.png deleted file mode 100644 index 5fab67691..000000000 Binary files a/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/newsblur-512.png and /dev/null differ diff --git a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json index 54e6957d5..31c201dd0 100644 --- a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json @@ -1,7 +1,17 @@ { "images" : [ { - "filename" : "oldreader-icon.pdf", + "filename" : "theOldReaderAny.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "theOldReaderDark.pdf", "idiom" : "universal" } ], @@ -11,6 +21,6 @@ }, "properties" : { "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "template-rendering-intent" : "original" } } diff --git a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderAny.pdf b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderAny.pdf new file mode 100644 index 000000000..2c1511bf2 Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderAny.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderDark.pdf b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderDark.pdf new file mode 100644 index 000000000..1f3dac415 Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderDark.pdf differ diff --git a/iOS/Resources/Assets.xcassets/Account icon colors/localColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/Account icon colors/localColor.colorset/Contents.json index da49629e9..116d254f0 100644 --- a/iOS/Resources/Assets.xcassets/Account icon colors/localColor.colorset/Contents.json +++ b/iOS/Resources/Assets.xcassets/Account icon colors/localColor.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "255", - "green" : "122", - "red" : "0" + "blue" : "0xFF", + "green" : "0x7A", + "red" : "0x00" } }, "idiom" : "universal" @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "255", - "green" : "132", - "red" : "10" + "blue" : "0xFF", + "green" : "0x84", + "red" : "0x0A" } }, "idiom" : "universal"