diff --git a/Backpack/Icon/Assets/BpkIconIOS.ttf b/Backpack/Icon/Assets/BpkIconIOS.ttf index 19ac39005..91b8cc87f 100644 Binary files a/Backpack/Icon/Assets/BpkIconIOS.ttf and b/Backpack/Icon/Assets/BpkIconIOS.ttf differ diff --git a/Backpack/Icon/Assets/iconMapping.json b/Backpack/Icon/Assets/iconMapping.json index 96a762424..7801dca85 100644 --- a/Backpack/Icon/Assets/iconMapping.json +++ b/Backpack/Icon/Assets/iconMapping.json @@ -8,6 +8,7 @@ "add-circle": "EAAF", "adult": "EA04", "aircon": "EA05", + "aircraft": "EADA", "airline--multiple": "EA06", "airline": "EA07", "airports": "EA08", @@ -78,6 +79,8 @@ "filter": "EACD", "flag": "EA40", "flask": "EAAC", + "flight-landing": "EADB", + "flight-takeoff": "EADC", "flight": "EA41", "food": "EA42", "gears-automatic-circle": "EAB5", diff --git a/Backpack/Icon/Classes/Generated/BPKIconNames.h b/Backpack/Icon/Classes/Generated/BPKIconNames.h index 98d796e82..ed0dc0866 100644 --- a/Backpack/Icon/Classes/Generated/BPKIconNames.h +++ b/Backpack/Icon/Classes/Generated/BPKIconNames.h @@ -30,6 +30,7 @@ FOUNDATION_EXPORT BPKIconName const BPKIconNameAccount; FOUNDATION_EXPORT BPKIconName const BPKIconNameAddCircle; FOUNDATION_EXPORT BPKIconName const BPKIconNameAdult; FOUNDATION_EXPORT BPKIconName const BPKIconNameAircon; +FOUNDATION_EXPORT BPKIconName const BPKIconNameAircraft; FOUNDATION_EXPORT BPKIconName const BPKIconNameAirlineMultiple; FOUNDATION_EXPORT BPKIconName const BPKIconNameAirline; FOUNDATION_EXPORT BPKIconName const BPKIconNameAirports; @@ -100,6 +101,8 @@ FOUNDATION_EXPORT BPKIconName const BPKIconNameFastTrain; FOUNDATION_EXPORT BPKIconName const BPKIconNameFilter; FOUNDATION_EXPORT BPKIconName const BPKIconNameFlag; FOUNDATION_EXPORT BPKIconName const BPKIconNameFlask; +FOUNDATION_EXPORT BPKIconName const BPKIconNameFlightLanding; +FOUNDATION_EXPORT BPKIconName const BPKIconNameFlightTakeoff; FOUNDATION_EXPORT BPKIconName const BPKIconNameFlight; FOUNDATION_EXPORT BPKIconName const BPKIconNameFood; FOUNDATION_EXPORT BPKIconName const BPKIconNameGearsAutomaticCircle; diff --git a/Backpack/Icon/Classes/Generated/BPKIconNames.m b/Backpack/Icon/Classes/Generated/BPKIconNames.m index 496a5fc46..ad3b71211 100644 --- a/Backpack/Icon/Classes/Generated/BPKIconNames.m +++ b/Backpack/Icon/Classes/Generated/BPKIconNames.m @@ -28,6 +28,7 @@ BPKIconName const BPKIconNameAddCircle = @"add-circle"; BPKIconName const BPKIconNameAdult = @"adult"; BPKIconName const BPKIconNameAircon = @"aircon"; +BPKIconName const BPKIconNameAircraft = @"aircraft"; BPKIconName const BPKIconNameAirlineMultiple = @"airline--multiple"; BPKIconName const BPKIconNameAirline = @"airline"; BPKIconName const BPKIconNameAirports = @"airports"; @@ -98,6 +99,8 @@ BPKIconName const BPKIconNameFilter = @"filter"; BPKIconName const BPKIconNameFlag = @"flag"; BPKIconName const BPKIconNameFlask = @"flask"; +BPKIconName const BPKIconNameFlightLanding = @"flight-landing"; +BPKIconName const BPKIconNameFlightTakeoff = @"flight-takeoff"; BPKIconName const BPKIconNameFlight = @"flight"; BPKIconName const BPKIconNameFood = @"food"; BPKIconName const BPKIconNameGearsAutomaticCircle = @"gears-automatic-circle"; diff --git a/UNRELEASED.md b/UNRELEASED.md index 96976c093..a28ae65ff 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -2,6 +2,13 @@ > Place your changes below this line. +**Added:** +- Backpack/Icon + - New icons: + - Added `flight-landing` as `BPKIconNameFlightLanding`. + - Added `flight-takeoff` as `BPKIconNameFlightTakeoff`. + - Added `aircraft` as `BPKIconNameAircraft`. + ## How to write a good changelog entry 1. Add 'Breaking', 'Added' or 'Fixed' in bold depending on if the change will be major, minor or patch according to [semver](semver.org). diff --git a/package-lock.json b/package-lock.json index bf04da9e9..33b8e6167 100644 --- a/package-lock.json +++ b/package-lock.json @@ -679,9 +679,9 @@ "dev": true }, "bpk-svgs": { - "version": "6.8.0", - "resolved": "https://artifactory.skyscannertools.net/artifactory/api/npm/npm/bpk-svgs/-/bpk-svgs-6.8.0.tgz", - "integrity": "sha1-IBTOi/SNlmlqNZwIPzJlcUyXIPo=", + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/bpk-svgs/-/bpk-svgs-6.9.0.tgz", + "integrity": "sha512-x5+mYHAD7UhG5jO/TsS0K7zTTvLsaBv4T+ERV7Oj3f77f+AueEdj/GrqLXdNYDXdmQacaEKCu2/1wYwGqmL+jA==", "dev": true }, "bpk-tokens": { @@ -4560,6 +4560,21 @@ "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", "dev": true }, + "del": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", + "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", + "dev": true, + "requires": { + "@types/glob": "^7.1.1", + "globby": "^6.1.0", + "is-path-cwd": "^2.0.0", + "is-path-in-cwd": "^2.0.0", + "p-map": "^2.0.0", + "pify": "^4.0.1", + "rimraf": "^2.6.3" + } + }, "execa": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/execa/-/execa-2.0.2.tgz", @@ -4601,6 +4616,30 @@ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, + "is-path-cwd": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", + "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", + "dev": true + }, + "is-path-in-cwd": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", + "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", + "dev": true, + "requires": { + "is-path-inside": "^2.1.0" + } + }, + "is-path-inside": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", + "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", + "dev": true, + "requires": { + "path-is-inside": "^1.0.2" + } + }, "is-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", @@ -4663,6 +4702,15 @@ "once": "^1.3.1" } }, + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", diff --git a/package.json b/package.json index 9b3f78af9..607c4d271 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "homepage": "https://github.com/Skyscanner/backpack-ios#readme", "devDependencies": { - "bpk-svgs": "^6.8.0", + "bpk-svgs": "^6.9.0", "bpk-tokens": "^27.6.0", "del": "^5.0.0", "eslint-config-skyscanner-with-prettier": "^0.8.0",