Fixed the names of the accounts

This commit is contained in:
Maurice Parker 2020-12-07 13:35:00 -06:00
parent 608c11d872
commit df359db69f
41 changed files with 24 additions and 25 deletions

View File

@ -19,52 +19,51 @@ struct AppAssets {
#endif #endif
static var accountBazQux: RSImage! = { static var accountBazQux: RSImage! = {
return RSImage(named: "AccountBazQux") return RSImage(named: "accountBazQux")
}() }()
static var accountLocalMacImage: RSImage! = { static var accountLocalMacImage: RSImage! = {
return RSImage(named: "AccountLocalMac") return RSImage(named: "accountLocalMac")
}() }()
static var accountLocalPadImage: RSImage = { static var accountLocalPadImage: RSImage = {
return RSImage(named: "AccountLocalPad")! return RSImage(named: "accountLocalPad")!
}() }()
static var accountLocalPhoneImage: RSImage = { static var accountLocalPhoneImage: RSImage = {
return RSImage(named: "AccountLocalPhone")! return RSImage(named: "accountLocalPhone")!
}() }()
static var accountCloudKitImage: RSImage = { static var accountCloudKitImage: RSImage = {
return RSImage(named: "AccountCloudKit")! return RSImage(named: "accountCloudKit")!
}() }()
static var accountFeedbinImage: RSImage = { static var accountFeedbinImage: RSImage = {
return RSImage(named: "AccountFeedbin")! return RSImage(named: "accountFeedbin")!
}() }()
static var accountFeedlyImage: RSImage = { static var accountFeedlyImage: RSImage = {
return RSImage(named: "AccountFeedly")! return RSImage(named: "accountFeedly")!
}() }()
static var accountFeedWranglerImage: RSImage = { static var accountFeedWranglerImage: RSImage = {
return RSImage(named: "AccountFeedWrangler")! return RSImage(named: "accountFeedWrangler")!
}() }()
static var accountFreshRSSImage: RSImage = { static var accountFreshRSSImage: RSImage = {
return RSImage(named: "AccountFreshRSS")! return RSImage(named: "accountFreshRSS")!
}() }()
static var accountInoreader: RSImage! = { static var accountInoreader: RSImage! = {
return RSImage(named: "AccountInoreader") return RSImage(named: "accountInoreader")
}() }()
static var accountNewsBlurImage: RSImage = { static var accountNewsBlurImage: RSImage = {
return RSImage(named: "AccountNewsBlur")! return RSImage(named: "accountNewsBlur")!
}() }()
static var accountTheOldReader: RSImage! = { static var accountTheOldReader: RSImage! = {
return RSImage(named: "AccountTheOldReader") return RSImage(named: "accountTheOldReader")
}() }()
static var addMenuImage: Image = { static var addMenuImage: Image = {

View File

@ -61,32 +61,32 @@ extension AccountType {
case .onMyMac: case .onMyMac:
// If it's the multiplatform app, the asset catalog contains assets for // If it's the multiplatform app, the asset catalog contains assets for
#if os(macOS) #if os(macOS)
return Image("AccountLocal") return Image("accountLocal")
#else #else
if UIDevice.current.userInterfaceIdiom == .pad { if UIDevice.current.userInterfaceIdiom == .pad {
return Image("AccountLocalPad") return Image("accountLocalPad")
} else { } else {
return Image("AccountLocalPhone") return Image("accountLocalPhone")
} }
#endif #endif
case .bazQux: case .bazQux:
return Image("AccountBazQux") return Image("accountBazQux")
case .cloudKit: case .cloudKit:
return Image("AccountCloudKit") return Image("accountCloudKit")
case .feedWrangler: case .feedWrangler:
return Image("AccountFeedWrangler") return Image("accountFeedWrangler")
case .feedbin: case .feedbin:
return Image("AccountFeedbin") return Image("accountFeedbin")
case .feedly: case .feedly:
return Image("AccountFeedly") return Image("accountFeedly")
case .freshRSS: case .freshRSS:
return Image("AccountFreshRSS") return Image("accountFreshRSS")
case .inoreader: case .inoreader:
return Image("AccountInoreader") return Image("accountInoreader")
case .newsBlur: case .newsBlur:
return Image("AccountNewsBlur") return Image("accountNewsBlur")
case .theOldReader: case .theOldReader:
return Image("AccountTheOldReader") return Image("accountTheOldReader")
} }
} }