diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index ef1757776..d2fa7bad8 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -157,6 +157,10 @@ struct AppAssets { return IconImage(UIImage(systemName: "folder.fill")!, isSymbol: true, isBackgroundSupressed: true, preferredColor: AppAssets.secondaryAccentColor.cgColor) }() + static var masterFolderImageNonIcon: UIImage = { + return UIImage(systemName: "folder.fill")!.withRenderingMode(.alwaysOriginal).withTintColor(.secondaryLabel) + }() + static var moreImage: UIImage = { return UIImage(systemName: "ellipsis.circle")! }() @@ -181,6 +185,10 @@ struct AppAssets { return UIColor(named: "primaryAccentColor")! } + static var redditOriginal: UIImage = { + return UIImage(named: "redditWhite")!.withRenderingMode(.alwaysOriginal).withTintColor(.secondaryLabel) + }() + static var safariImage: UIImage = { return UIImage(systemName: "safari")! }() @@ -240,6 +248,10 @@ struct AppAssets { return UIImage(systemName: "trash")! }() + static var twitterOriginal: UIImage = { + return UIImage(named: "twitterWhite")!.withRenderingMode(.alwaysOriginal).withTintColor(.secondaryLabel) + }() + static var unreadFeedImage: IconImage { let image = UIImage(systemName: "largecircle.fill.circle")! return IconImage(image, isSymbol: true, isBackgroundSupressed: true, preferredColor: AppAssets.secondaryAccentColor.cgColor) @@ -253,6 +265,7 @@ struct AppAssets { return UIColor(named: "controlBackgroundColor")! }() + static func image(for accountType: AccountType) -> UIImage? { switch accountType { case .onMyMac: diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard index cf1166c5f..7a89c6297 100644 --- a/iOS/Base.lproj/Main.storyboard +++ b/iOS/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - + @@ -138,9 +138,6 @@ - - - @@ -196,9 +193,6 @@ - - - @@ -332,7 +326,7 @@