Merge branch 'core_data_rewrite' into develop

Author: ccrama

Slide for Reddit.xcodeproj/project.pbxproj

@@ -304,6 +304,9 @@
 		BE86300F1E2E6A54004F0E1F /* PostFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE86300E1E2E6A54004F0E1F /* PostFilter.swift */; };
 		BE8630111E2EDFB2004F0E1F /* SettingsContentFilters.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE8630101E2EDFB2004F0E1F /* SettingsContentFilters.swift */; };
 		BE8643FD25D8AF9F0089E5EB /* UISplitViewController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE8643FC25D8AF9F0089E5EB /* UISplitViewController+Extensions.swift */; };
+		BE8643FF25D8C6920089E5EB /* ic_matte@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8643FE25D8C6920089E5EB /* ic_matte@3x.png */; };
+		BE86440125D8C6990089E5EB /* ic_matte@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE86440025D8C6980089E5EB /* ic_matte@2x.png */; };
+		BE86440325D8C7570089E5EB /* ic_matte@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = BE86440225D8C7570089E5EB /* ic_matte@2x~ipad.png */; };
 		BE8833F1251FB66900131DEB /* ic_space@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8833EE251FB66800131DEB /* ic_space@2x.png */; };
 		BE8833F2251FB66900131DEB /* ic_space@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8833EF251FB66900131DEB /* ic_space@2x~ipad.png */; };
 		BE8833F3251FB66900131DEB /* ic_space@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8833F0251FB66900131DEB /* ic_space@3x.png */; };
@@ -818,6 +821,9 @@
 		BE86300E1E2E6A54004F0E1F /* PostFilter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PostFilter.swift; sourceTree = "<group>"; };
 		BE8630101E2EDFB2004F0E1F /* SettingsContentFilters.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsContentFilters.swift; sourceTree = "<group>"; };
 		BE8643FC25D8AF9F0089E5EB /* UISplitViewController+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UISplitViewController+Extensions.swift"; sourceTree = "<group>"; };
+		BE8643FE25D8C6920089E5EB /* ic_matte@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_matte@3x.png"; sourceTree = "<group>"; };
+		BE86440025D8C6980089E5EB /* ic_matte@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_matte@2x.png"; sourceTree = "<group>"; };
+		BE86440225D8C7570089E5EB /* ic_matte@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_matte@2x~ipad.png"; sourceTree = "<group>"; };
 		BE8833EE251FB66800131DEB /* ic_space@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_space@2x.png"; sourceTree = "<group>"; };
 		BE8833EF251FB66900131DEB /* ic_space@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_space@2x~ipad.png"; sourceTree = "<group>"; };
 		BE8833F0251FB66900131DEB /* ic_space@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_space@3x.png"; sourceTree = "<group>"; };
@@ -1328,6 +1334,9 @@
 		BE4AB49C21BC4DAE001092C4 /* App Icons */ = {
 			isa = PBXGroup;
 			children = (
+				BE8643FE25D8C6920089E5EB /* ic_matte@3x.png */,
+				BE86440025D8C6980089E5EB /* ic_matte@2x.png */,
+				BE86440225D8C7570089E5EB /* ic_matte@2x~ipad.png */,
 				B422D251252270AD00A168BB /* ic_garbage@2x.png */,
 				B422D250252270AD00A168BB /* ic_garbage@2x~ipad.png */,
 				B422D24F252270AD00A168BB /* ic_garbage@3x.png */,
@@ -2143,11 +2152,14 @@
 				BE1DA5E12208AC80001C7DB4 /* ic_red@2x~ipad.png in Resources */,
 				BE8592C21E0EE72800836C1D /* reddift_config.json in Resources */,
 				BE1DA5E22208AC80001C7DB4 /* ic_lightblue@2x~ipad.png in Resources */,
+				BE8643FF25D8C6920089E5EB /* ic_matte@3x.png in Resources */,
 				BE1B57E221CEFA9800FF6F98 /* ic_outrun@3x.png in Resources */,
 				BE35216E1E3D22B000C30B8D /* RobotoCondensed-Regular.ttf in Resources */,
 				BE232698222DE433005CA83A /* ic_ghost@2x~ipad.png in Resources */,
 				BE3521771E3D2E3300C30B8D /* Roboto-BoldItalic.ttf in Resources */,
 				BE0C4F8A21BCBE83006C54FF /* ic_yellow@2x.png in Resources */,
+				BE86440125D8C6990089E5EB /* ic_matte@2x.png in Resources */,
+				BE86440325D8C7570089E5EB /* ic_matte@2x~ipad.png in Resources */,
 				BE0C4F8C21BCBE83006C54FF /* ic_blue@2x.png in Resources */,
 				BE0C4F9121BCBE83006C54FF /* ic_lightblue@3x.png in Resources */,
 				BE1DA5DE2208AC80001C7DB4 /* ic_black@2x~ipad.png in Resources */,

Slide for Reddit/App Icons/ic_matte@2x.png

@@ -207,6 +207,15 @@
 				<key>UIPrerenderedIcon</key>
 				<false/>
 			</dict>
+			<key>matteblack</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string>ic_matte</string>
+				</array>
+				<key>UIPrerenderedIcon</key>
+				<false/>
+			</dict>
 			<key>blackwhite</key>
 			<dict>
 				<key>CFBundleIconFiles</key>

Slide for Reddit/App Icons/ic_matte@2x~ipad.png

@@ -32,6 +32,7 @@ class SettingsIcon: BubbleSettingTableViewController {
             AlternateIcon(id: "space", title: "Space", contributor: "hilabius"),
             AlternateIcon(id: "stars", title: "Starry night", contributor: "TyShark"),
             AlternateIcon(id: "ghost", title: "Ghost"),
+            AlternateIcon(id: "matteblack", title: "Matte Black Everything"),
             AlternateIcon(id: "mint", title: "Mint", contributor: "Baselt95"),
             AlternateIcon(id: "garbage", title: "Garbage", contributor: "SandwichEconomist"),
         ]),