diff --git a/FuelBoard/Assets.xcassets/brand_circle_k.imageset/Contents.json b/FuelBoard/Assets.xcassets/brand_circle_k.imageset/Contents.json new file mode 100644 index 0000000..d75e6c2 --- /dev/null +++ b/FuelBoard/Assets.xcassets/brand_circle_k.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images": [ + { + "filename": "brand_circle_k_2x.png", + "idiom": "universal", + "scale": "2x" + }, + { + "filename": "brand_circle_k_3x.png", + "idiom": "universal", + "scale": "3x" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} diff --git a/FuelBoard/Assets.xcassets/brand_circle_k.imageset/brand_circle_k_2x.png b/FuelBoard/Assets.xcassets/brand_circle_k.imageset/brand_circle_k_2x.png new file mode 100644 index 0000000..c1d85d6 Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_circle_k.imageset/brand_circle_k_2x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_circle_k.imageset/brand_circle_k_3x.png b/FuelBoard/Assets.xcassets/brand_circle_k.imageset/brand_circle_k_3x.png new file mode 100644 index 0000000..d0fc6cc Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_circle_k.imageset/brand_circle_k_3x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_essar.imageset/Contents.json b/FuelBoard/Assets.xcassets/brand_essar.imageset/Contents.json new file mode 100644 index 0000000..cd782f4 --- /dev/null +++ b/FuelBoard/Assets.xcassets/brand_essar.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images": [ + { + "filename": "brand_essar_2x.png", + "idiom": "universal", + "scale": "2x" + }, + { + "filename": "brand_essar_3x.png", + "idiom": "universal", + "scale": "3x" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} diff --git a/FuelBoard/Assets.xcassets/brand_essar.imageset/brand_essar_2x.png b/FuelBoard/Assets.xcassets/brand_essar.imageset/brand_essar_2x.png new file mode 100644 index 0000000..18b7948 Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_essar.imageset/brand_essar_2x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_essar.imageset/brand_essar_3x.png b/FuelBoard/Assets.xcassets/brand_essar.imageset/brand_essar_3x.png new file mode 100644 index 0000000..c354d0a Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_essar.imageset/brand_essar_3x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_gleaner.imageset/Contents.json b/FuelBoard/Assets.xcassets/brand_gleaner.imageset/Contents.json new file mode 100644 index 0000000..116f93e --- /dev/null +++ b/FuelBoard/Assets.xcassets/brand_gleaner.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images": [ + { + "filename": "brand_gleaner_2x.png", + "idiom": "universal", + "scale": "2x" + }, + { + "filename": "brand_gleaner_3x.png", + "idiom": "universal", + "scale": "3x" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} diff --git a/FuelBoard/Assets.xcassets/brand_gleaner.imageset/brand_gleaner_2x.png b/FuelBoard/Assets.xcassets/brand_gleaner.imageset/brand_gleaner_2x.png new file mode 100644 index 0000000..dec21ac Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_gleaner.imageset/brand_gleaner_2x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_gleaner.imageset/brand_gleaner_3x.png b/FuelBoard/Assets.xcassets/brand_gleaner.imageset/brand_gleaner_3x.png new file mode 100644 index 0000000..148407e Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_gleaner.imageset/brand_gleaner_3x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_highland_fuels.imageset/Contents.json b/FuelBoard/Assets.xcassets/brand_highland_fuels.imageset/Contents.json new file mode 100644 index 0000000..ae4c20b --- /dev/null +++ b/FuelBoard/Assets.xcassets/brand_highland_fuels.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images": [ + { + "filename": "brand_highland_fuels_2x.png", + "idiom": "universal", + "scale": "2x" + }, + { + "filename": "brand_highland_fuels_3x.png", + "idiom": "universal", + "scale": "3x" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} diff --git a/FuelBoard/Assets.xcassets/brand_highland_fuels.imageset/brand_highland_fuels_2x.png b/FuelBoard/Assets.xcassets/brand_highland_fuels.imageset/brand_highland_fuels_2x.png new file mode 100644 index 0000000..3c1b26e Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_highland_fuels.imageset/brand_highland_fuels_2x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_highland_fuels.imageset/brand_highland_fuels_3x.png b/FuelBoard/Assets.xcassets/brand_highland_fuels.imageset/brand_highland_fuels_3x.png new file mode 100644 index 0000000..83cac27 Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_highland_fuels.imageset/brand_highland_fuels_3x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_maxol.imageset/Contents.json b/FuelBoard/Assets.xcassets/brand_maxol.imageset/Contents.json new file mode 100644 index 0000000..51a060d --- /dev/null +++ b/FuelBoard/Assets.xcassets/brand_maxol.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images": [ + { + "filename": "brand_maxol_2x.png", + "idiom": "universal", + "scale": "2x" + }, + { + "filename": "brand_maxol_3x.png", + "idiom": "universal", + "scale": "3x" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} diff --git a/FuelBoard/Assets.xcassets/brand_maxol.imageset/brand_maxol_2x.png b/FuelBoard/Assets.xcassets/brand_maxol.imageset/brand_maxol_2x.png new file mode 100644 index 0000000..b86ec31 Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_maxol.imageset/brand_maxol_2x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_maxol.imageset/brand_maxol_3x.png b/FuelBoard/Assets.xcassets/brand_maxol.imageset/brand_maxol_3x.png new file mode 100644 index 0000000..12c1267 Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_maxol.imageset/brand_maxol_3x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_murco.imageset/Contents.json b/FuelBoard/Assets.xcassets/brand_murco.imageset/Contents.json new file mode 100644 index 0000000..e9ca373 --- /dev/null +++ b/FuelBoard/Assets.xcassets/brand_murco.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images": [ + { + "filename": "brand_murco_2x.png", + "idiom": "universal", + "scale": "2x" + }, + { + "filename": "brand_murco_3x.png", + "idiom": "universal", + "scale": "3x" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} diff --git a/FuelBoard/Assets.xcassets/brand_murco.imageset/brand_murco_2x.png b/FuelBoard/Assets.xcassets/brand_murco.imageset/brand_murco_2x.png new file mode 100644 index 0000000..d228fc0 Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_murco.imageset/brand_murco_2x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_murco.imageset/brand_murco_3x.png b/FuelBoard/Assets.xcassets/brand_murco.imageset/brand_murco_3x.png new file mode 100644 index 0000000..d0ac311 Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_murco.imageset/brand_murco_3x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_spar.imageset/Contents.json b/FuelBoard/Assets.xcassets/brand_spar.imageset/Contents.json new file mode 100644 index 0000000..73f7612 --- /dev/null +++ b/FuelBoard/Assets.xcassets/brand_spar.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images": [ + { + "filename": "brand_spar_2x.png", + "idiom": "universal", + "scale": "2x" + }, + { + "filename": "brand_spar_3x.png", + "idiom": "universal", + "scale": "3x" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} diff --git a/FuelBoard/Assets.xcassets/brand_spar.imageset/brand_spar_2x.png b/FuelBoard/Assets.xcassets/brand_spar.imageset/brand_spar_2x.png new file mode 100644 index 0000000..46f22c4 Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_spar.imageset/brand_spar_2x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_spar.imageset/brand_spar_3x.png b/FuelBoard/Assets.xcassets/brand_spar.imageset/brand_spar_3x.png new file mode 100644 index 0000000..3ca67ee Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_spar.imageset/brand_spar_3x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_the_co_operative.imageset/Contents.json b/FuelBoard/Assets.xcassets/brand_the_co_operative.imageset/Contents.json new file mode 100644 index 0000000..927d60e --- /dev/null +++ b/FuelBoard/Assets.xcassets/brand_the_co_operative.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images": [ + { + "filename": "brand_the_co_operative_2x.png", + "idiom": "universal", + "scale": "2x" + }, + { + "filename": "brand_the_co_operative_3x.png", + "idiom": "universal", + "scale": "3x" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} diff --git a/FuelBoard/Assets.xcassets/brand_the_co_operative.imageset/brand_the_co_operative_2x.png b/FuelBoard/Assets.xcassets/brand_the_co_operative.imageset/brand_the_co_operative_2x.png new file mode 100644 index 0000000..5eaa038 Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_the_co_operative.imageset/brand_the_co_operative_2x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_the_co_operative.imageset/brand_the_co_operative_3x.png b/FuelBoard/Assets.xcassets/brand_the_co_operative.imageset/brand_the_co_operative_3x.png new file mode 100644 index 0000000..99bf323 Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_the_co_operative.imageset/brand_the_co_operative_3x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_valero.imageset/Contents.json b/FuelBoard/Assets.xcassets/brand_valero.imageset/Contents.json new file mode 100644 index 0000000..6b9b579 --- /dev/null +++ b/FuelBoard/Assets.xcassets/brand_valero.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images": [ + { + "filename": "brand_valero_2x.png", + "idiom": "universal", + "scale": "2x" + }, + { + "filename": "brand_valero_3x.png", + "idiom": "universal", + "scale": "3x" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} diff --git a/FuelBoard/Assets.xcassets/brand_valero.imageset/brand_valero_2x.png b/FuelBoard/Assets.xcassets/brand_valero.imageset/brand_valero_2x.png new file mode 100644 index 0000000..b750516 Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_valero.imageset/brand_valero_2x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_valero.imageset/brand_valero_3x.png b/FuelBoard/Assets.xcassets/brand_valero.imageset/brand_valero_3x.png new file mode 100644 index 0000000..5f9e4d3 Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_valero.imageset/brand_valero_3x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_welcome_break.imageset/Contents.json b/FuelBoard/Assets.xcassets/brand_welcome_break.imageset/Contents.json new file mode 100644 index 0000000..e686f18 --- /dev/null +++ b/FuelBoard/Assets.xcassets/brand_welcome_break.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images": [ + { + "filename": "brand_welcome_break_2x.png", + "idiom": "universal", + "scale": "2x" + }, + { + "filename": "brand_welcome_break_3x.png", + "idiom": "universal", + "scale": "3x" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} diff --git a/FuelBoard/Assets.xcassets/brand_welcome_break.imageset/brand_welcome_break_2x.png b/FuelBoard/Assets.xcassets/brand_welcome_break.imageset/brand_welcome_break_2x.png new file mode 100644 index 0000000..abeb536 Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_welcome_break.imageset/brand_welcome_break_2x.png differ diff --git a/FuelBoard/Assets.xcassets/brand_welcome_break.imageset/brand_welcome_break_3x.png b/FuelBoard/Assets.xcassets/brand_welcome_break.imageset/brand_welcome_break_3x.png new file mode 100644 index 0000000..83cf9cd Binary files /dev/null and b/FuelBoard/Assets.xcassets/brand_welcome_break.imageset/brand_welcome_break_3x.png differ diff --git a/FuelBoardTests/Tests/FuelBoardSharedTests/FuelBoardTests.swift b/FuelBoardTests/Tests/FuelBoardSharedTests/FuelBoardTests.swift index c1d598e..62fd5ab 100644 --- a/FuelBoardTests/Tests/FuelBoardSharedTests/FuelBoardTests.swift +++ b/FuelBoardTests/Tests/FuelBoardSharedTests/FuelBoardTests.swift @@ -233,11 +233,25 @@ final class BrandTests: XCTestCase { XCTAssertEqual(station(brand: "JET").brandImageName, "brand_jet") XCTAssertEqual(station(brand: "TEXACO").brandImageName, "brand_texaco") XCTAssertEqual(station(brand: "APPLEGREEN").brandImageName, "brand_applegreen") + XCTAssertEqual(station(brand: "VALERO").brandImageName, "brand_valero") + XCTAssertEqual(station(brand: "WELCOME BREAK").brandImageName, "brand_welcome_break") + XCTAssertEqual(station(brand: "THE CO-OPERATIVE").brandImageName, "brand_the_co_operative") + XCTAssertEqual(station(brand: "CO-OP").brandImageName, "brand_the_co_operative") + XCTAssertEqual(station(brand: "MURCO").brandImageName, "brand_murco") + XCTAssertEqual(station(brand: "GLEANER").brandImageName, "brand_gleaner") + XCTAssertEqual(station(brand: "HIGHLAND FUELS").brandImageName, "brand_highland_fuels") + XCTAssertEqual(station(brand: "CIRCLE K").brandImageName, "brand_circle_k") + XCTAssertEqual(station(brand: "MAXOL").brandImageName, "brand_maxol") + XCTAssertEqual(station(brand: "SPAR").brandImageName, "brand_spar") + XCTAssertEqual(station(brand: "ESSAR").brandImageName, "brand_essar") + XCTAssertEqual(station(brand: "EG ON THE MOVE").brandImageName, "brand_esso") + XCTAssertEqual(station(brand: "GO FORECOURT").brandImageName, "brand_gulf") } - func testUnknownBrand() { - XCTAssertNil(station(brand: "WELCOME BREAK").brandImageName) - XCTAssertNil(station(brand: "VALERO").brandImageName) + func testUnknownBrandUsesGenericFuelPumpFallbackInUI() { + XCTAssertNil(station(brand: "TOTAL HARVEST ENERGY").brandImageName) + XCTAssertNil(station(brand: "SOLO").brandImageName) + XCTAssertNil(station(brand: "PACE").brandImageName) XCTAssertNil(station(brand: "").brandImageName) } } diff --git a/Shared/FuelStore.swift b/Shared/FuelStore.swift index 95056c3..c47b2c6 100644 --- a/Shared/FuelStore.swift +++ b/Shared/FuelStore.swift @@ -242,21 +242,37 @@ struct FuelStation: Identifiable, Codable, Equatable { var brandImageName: String? { let raw = brand.uppercased() let known: [(String, String)] = [ + ("CIRCLE K", "brand_circle_k"), + ("MAXOL", "brand_maxol"), + ("SPAR", "brand_spar"), ("SHELL", "brand_shell"), ("SAINSBURY", "brand_sainsburys"), ("MORRISONS", "brand_morrisons"), ("APPLEGREEN", "brand_applegreen"), ("TESCO", "brand_tesco"), ("TEXACO", "brand_texaco"), + ("ESSAR", "brand_essar"), ("ESSO", "brand_esso"), ("ASDA", "brand_asda"), ("GULF", "brand_gulf"), + ("VALERO", "brand_valero"), + ("WELCOME BREAK", "brand_welcome_break"), + ("THE CO-OPERATIVE", "brand_the_co_operative"), + ("CO-OPERATIVE", "brand_the_co_operative"), + ("CO OPERATIVE", "brand_the_co_operative"), + ("CO-OP", "brand_the_co_operative"), + ("CO OP", "brand_the_co_operative"), + ("MURCO", "brand_murco"), + ("GLEANER", "brand_gleaner"), + ("HIGHLAND FUELS", "brand_highland_fuels"), ("BP", "brand_bp"), ("JET", "brand_jet"), ] for (needle, asset) in known where raw.contains(needle) { return asset } + if raw.contains("EG ON THE MOVE") { return "brand_esso" } + if raw == "GO" || raw.contains("GO FORECOURT") || raw.contains("GO FUEL") { return "brand_gulf" } return nil } }