Skip to content

Commit

Permalink
Make icons white, in an interesting way
Browse files Browse the repository at this point in the history
  • Loading branch information
hakonschia committed Jun 18, 2024
1 parent 305ebd2 commit 5172f28
Show file tree
Hide file tree
Showing 415 changed files with 587 additions and 583 deletions.
12 changes: 8 additions & 4 deletions .github/scripts/generate-android-vectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ const ANDROID_ICONS_FOLDER = "android/icons/src/main/kotlin/no/nrk/core/icons"
const svg2vectordrawableOptions = {
floatPrecision: 4,
strict: false,
// TODO some icons just have no color now. setting fillBlack true at least makes them black, but we probably want #FFF0F0F0 instead
// The SVGs have "fill=currentColor", and the library has this check if (!/^url\(#.*\)$/.test(elem.attr('fill').value)) so it
// is ignored (and wouldn't know what currentColor is anyways). The SVGs would need an actual HEX color for the library to fill it in
// So instead just fill them black and override the black color again later. A bit stupid, but oh well
// Docs say that you can do "tint: '#FFF0F0F0" but that doesn't seem to do anything
// The SVGs have "fill=currentColor", and the library has this check if (!/^url\(#.*\)$/.test(elem.attr('fill').value))
// I think if the SVGs have an actual hex color here it will work
// Otherwise we might have to manually loop over the generated files and override the color, which is a bit stupid
fillBlack: true,
xmlTag: false
}
Expand Down Expand Up @@ -61,6 +60,10 @@ async function convertSvgToXml() {
const xmlFile = path.join(ANDROID_DRAWABLE_FOLDER, xmlFileName)

await svg2vectordrawable.convertFile(svgFile, xmlFile, svg2vectordrawableOptions)

// Override the fillBlack=true with the NRK white color we actually want the icons to have
const colorAdjustedXmlFile = fs.readFileSync(xmlFile, { encoding: 'utf8'}).replaceAll("android:fillColor=\"#FF000000\"", "android:fillColor=\"#FFF0F0F0\"")
fs.writeFileSync(xmlFile, colorAdjustedXmlFile)
}
}

Expand Down Expand Up @@ -130,6 +133,7 @@ function generateKotlinValues() {
const isActiveVariant = drawable.match("__active")

if (isActiveVariant) {
// Active expressive variants are named "horse_expressive__active", if "_expressive" was always the postfix we could just handle it like non-active ones
return element == rawNormalIconName.replace("__active", "") + "_expressive__active.xml"
} else {
return element == rawNormalIconName + "_expressive.xml"
Expand Down
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_360.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M6.0832 8.2125C4.5609 8.9736 4 9.8402 4 10.5c0 0.6598 0.5609 1.5264 2.0833 2.2876C7.5458 13.5188 9.6363 14 12 14h0.5793l-2.1-3h2.4414l2.7999 4-2.8 4h-2.4413l2.1-3H12c-2.6069 0-5.0164-0.5262-6.8112-1.4236C3.4538 13.7089 2 12.3255 2 10.5c0-1.8255 1.4538-3.2089 3.1888-4.0764C6.9836 5.5262 9.3931 5 12 5c2.6069 0 5.0164 0.5262 6.8112 1.4236C20.5462 7.2911 22 8.6745 22 10.5c0 1.4413-0.9195 2.6129-2.1184 3.4462-0.4356 0.3027-0.927 0.5757-1.4633 0.8163l-1.1724-1.6749c0.5793-0.2316 1.0818-0.497 1.4942-0.7837C19.6673 11.6595 20 11.0181 20 10.5c0-0.6598-0.5609-1.5264-2.0833-2.2875C16.4542 7.4812 14.3637 7 12 7c-2.3637 0-4.4542 0.4812-5.9168 1.2125z"/>
</vector>
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_360_expressive.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M4 10.5c0-0.66 0.56-1.526 2.083-2.288C7.546 7.482 9.636 7 12 7s4.454 0.481 5.917 1.212C19.439 8.974 20 9.84 20 10.5c0 0.487-0.291 1.08-1.101 1.69a6.238 6.238 0 0 1-0.862 0.536 1 1 0 1 0 0.926 1.773 8.229 8.229 0 0 0 1.138-0.711C21.187 12.97 22 11.853 22 10.5c0-1.825-1.454-3.209-3.189-4.076C17.016 5.526 14.607 5 12 5s-5.016 0.526-6.811 1.424C3.454 7.29 2 8.674 2 10.5c0 1.825 1.454 3.209 3.189 4.076C6.984 15.474 9.393 16 12 16h0.579l-1.298 1.848a1 1 0 0 0 1.637 1.15L15.725 15l-2.807-3.997a1 1 0 1 0-1.637 1.149L12.58 14H12c-2.364 0-4.454-0.481-5.917-1.212C4.561 12.026 4 11.16 4 10.5Z"/>
</vector>
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_404.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M9.5922 8.2767l-0.8987-1.3839 3.4598-2.2469 0.8988 1.384L9.5922 8.2767z m-0.4851 2.2827l-0.8988-1.384-0.8987-1.3839-0.8987-1.3839 1.3839-0.8988 3.4598-2.2468 1.3839-0.8987 0.8988 1.3839 0.8987 1.3839 0.8987 1.384-1.3839 0.8987-3.4598 2.2468-1.3839 0.8988z m4.4695 4.0629l1.6978 0.865-0.0997-1.9028-0.1892-3.6098-0.0997-1.9029-1.5981 1.0378-3.0316 1.9687-1.598 1.0378 1.6978 0.865 3.2207 1.6412z m-0.0997-1.9029l-0.0894-1.707-1.4336 0.931 1.523 0.776z m4.2577-0.755h2.4753v8.2507h-2.4753v-8.2507z m4.1254-1.6501v11.551h-5.7755v-11.551H21.86z m-13.6517 0.6981L4.4477 21.9341l-1.5603-0.5372 3.7607-10.9217 1.5602 0.5372z m2.5132 9.2027c1.1392 0 2.0627-0.9235 2.0627-2.0627 0-1.1391-0.9235-2.0626-2.0627-2.0626-1.1392 0-2.0626 0.9235-2.0626 2.0626 0 1.1392 0.9235 2.0627 2.0626 2.0627z m3.7129-2.0627c0 2.0506-1.6623 3.7129-3.7129 3.7129-2.0505 0-3.7128-1.6623-3.7128-3.7129 0-2.0505 1.6623-3.7128 3.7128-3.7128 2.0506 0 3.7129 1.6623 3.7129 3.7128z"/>
</vector>
6 changes: 3 additions & 3 deletions android/icons/src/main/res/drawable/nrk_404_expressive.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M13.936 1.92a3 3 0 0 0-4.156-0.853l-2.505 1.65a3 3 0 0 0 3.302 5.01l2.505-1.65a3 3 0 0 0 0.854-4.157Zm-3.056 0.816a1 1 0 0 1 1.101 1.67L9.476 6.057a1 1 0 1 1-1.1-1.67l2.504-1.65ZM17 13a3 3 0 0 1 6 0v6a3 3 0 0 1-6 0v-6Zm3-1a1 1 0 0 0-1 1v6a1 1 0 1 0 2 0v-6a1 1 0 0 0-1-1Z"/>
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M5.316 11.051a1 1 0 0 1 0.633 1.265l-3 9a1 1 0 1 1-1.898-0.632l3-9a1 1 0 0 1 1.265-0.633Z"/>
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M12.688 8.02c0.998-0.649 2.318 0.067 2.318 1.258v4.118a1.5 1.5 0 0 1-2.193 1.33l-3.515-1.83a1.5 1.5 0 0 1-0.126-2.589l3.516-2.287Zm0.318 2.18l-2.025 1.317 2.025 1.055V10.2ZM9.5 15a3.5 3.5 0 1 0 0 7 3.5 3.5 0 0 0 0-7ZM8 18.5a1.5 1.5 0 1 1 3 0 1.5 1.5 0 0 1-3 0Z"/>
</vector>
6 changes: 3 additions & 3 deletions android/icons/src/main/res/drawable/nrk_alarm_clock.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M2.177 0.63l-1.5 1.5 1.414 1.414 1.5-1.5L2.177 0.63ZM11 12.414V6h2v5.586l3.707 3.707-1.414 1.414L11 12.414Z"/>
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11c0 2.678-0.958 5.13-2.549 7.037L23 21.586 21.586 23l-2.549-2.549A10.952 10.952 0 0 1 12 23c-2.678 0-5.13-0.958-7.037-2.549L2.414 23 1 21.586l2.549-2.549A10.952 10.952 0 0 1 1 12Zm11-9a9 9 0 1 0 0 18 9 9 0 0 0 0-18Z"/>
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M20.421 2.044L21.835 0.63l1.5 1.5-1.414 1.414-1.5-1.5Z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M11.586 13A2 2 0 0 1 11 11.586V7a1 1 0 1 1 2 0v4.586l3 3A1 1 0 0 1 14.586 16l-3-3Z"/>
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11c0 2.678-0.958 5.13-2.549 7.037l1.842 1.842a1 1 0 1 1-1.414 1.414l-1.842-1.841A10.952 10.952 0 0 1 12 23c-2.678 0-5.13-0.958-7.037-2.549L3.12 22.293a1 1 0 1 1-1.414-1.414l1.842-1.842A10.952 10.952 0 0 1 1 12Zm11-9a9 9 0 1 0 0 18 9 9 0 0 0 0-18Z"/>
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M3.58 2.078a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Zm19.84 0a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Z"/>
</vector>
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_arrange_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M2 8h20v2H2V8Zm20 6H2v2h20v-2Z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M2 9a1 1 0 0 1 1-1h18a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1Zm20 6a1 1 0 0 0-1-1H3a1 1 0 1 0 0 2h18a1 1 0 0 0 1-1Z"/>
</vector>
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_arrow_down.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M12 20l-7-4.9v-2.27l6 4.2V4l2 1v12.03l6-4.2v2.27L12 20Z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M18.419 13.186a1 1 0 0 1 1.162 1.628l-7.58 5.415-7.582-5.415a1 1 0 0 1 1.162-1.628l5.42 3.87V5a1 1 0 1 1 2 0v12.057l5.418-3.87Z"/>
</vector>
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_arrow_dropdown.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M12 15L17 10H7L12 15Z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M10.879 15.739a1.5 1.5 0 0 0 2.242 0l4.66-5.243C18.64 9.53 17.954 8 16.66 8H7.34c-1.294 0-1.98 1.53-1.12 2.496l4.659 5.243Z"/>
</vector>
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_arrow_left.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M4 12l4.9-7h2.2723l-4.2 6H20l-1 2H6.9723l4.2 6H8.9L4 12z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M10.814 5.581A1 1 0 1 0 9.186 4.42L3.771 12l5.415 7.581a1 1 0 1 0 1.628-1.162L6.944 13H19a1 1 0 0 0 0-2H6.943l3.87-5.419Z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:viewportWidth="40"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M4 12l4.9-7h2.2723l-4.2 6H36l-1 2H6.9723l4.2 6H8.9L4 12z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="40"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M10.814 5.581A1 1 0 1 0 9.186 4.42L3.771 12l5.415 7.581a1 1 0 1 0 1.628-1.162L6.944 13H35a1 1 0 0 0 0-2H6.943l3.87-5.419Z"/>
</vector>
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_arrow_nested.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M17 4H2v2h13v11.08l-5-3.25v2.272l6 3.9 6-3.9V13.83l-5 3.25V4Z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M17 10a6 6 0 0 0-6-6H3a1 1 0 0 0 0 2h8a4 4 0 0 1 4 4v7.08l-3.528-2.293a0.953 0.953 0 0 0-1.039 1.597L16 20.002l5.567-3.618a0.953 0.953 0 0 0-1.039-1.597L17 17.08V10Z"/>
</vector>
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_arrow_right.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M20.0023 12l-4.9-7H12.83l4.2 6H5L4 13h13.03l-4.2 6h2.2723l4.9-7z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M13.186 5.581a1 1 0 0 1 1.628-1.162L20.229 12l-5.415 7.581a1 1 0 0 1-1.628-1.162L17.056 13H5a1 1 0 1 1 0-2h12.057l-3.87-5.419Z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:viewportWidth="40"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M36 12l-4.9-7h-2.2723l4.2 6H4l1 2h28.0277l-4.2 6H31.1l4.9-7z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="40"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M30.186 5.581a1 1 0 1 1 1.628-1.162L37.229 12l-5.415 7.581a1 1 0 1 1-1.628-1.162L34.056 13H6a1 1 0 0 1 0-2h28.057l-3.87-5.419Z"/>
</vector>
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_arrow_up.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M12 4l7 4.9v2.27l-6-4.2V20l-2-1V6.97l-6 4.2V8.9L12 4Z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M18.419 10.814a1 1 0 0 0 1.162-1.628l-7.58-5.415-7.582 5.415a1 1 0 0 0 1.162 1.628l5.42-3.87V19a1 1 0 1 0 2 0V6.943l5.418 3.87Z"/>
</vector>
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_article.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M5 3h14v18H5V3zM3 23V1h18v22H3z m4-11v2h8v-2H7z m0-6h4v2H7V6z m6 10H7v2h6v-2z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M8 6a1 1 0 0 0 0 2h3a1 1 0 1 0 0-2H8ZM7 13a1 1 0 0 1 1-1h7a1 1 0 1 1 0 2H8a1 1 0 0 1-1-1ZM8 16a1 1 0 1 0 0 2h5a1 1 0 1 0 0-2H8Z"/>
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M6 1a3 3 0 0 0-3 3v16a3 3 0 0 0 3 3h12a3 3 0 0 0 3-3V4a3 3 0 0 0-3-3H6ZM5 4a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H6a1 1 0 0 1-1-1V4Z"/>
</vector>
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_back.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M4.4 7.4l3.5-5 1.7 1.2L7.2 7h6.3a6.5 6.5 0 0 1 0 13H9l1-2h3.5a4.5 4.5 0 0 0 0-9H7.2l2.4 3.4-1.7 1.2-3.5-5L4 8l0.4-0.6Z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M6.08 8l2.7 3.375a1 1 0 0 1-1.56 1.25L2.72 7l4.5-5.625a1 1 0 0 1 1.56 1.25L6.08 6H15a7 7 0 1 1 0 14H9a1 1 0 1 1 0-2h6a5 5 0 1 0 0-10H6.08Z"/>
</vector>
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_bell.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M13 1h-2v1.0548C7.8632 2.4004 5 4.3821 5 8v8.5L3 18v2h18v-2l-2-1.5V8c0-3.6179-2.8632-5.5996-6-5.9452V1z m1 20H10c0 1.1046 0.8954 2 2 2s2-0.8954 2-2zM11.9974 4h0.0052c1.3984 0.0005 2.6978 0.4052 3.5978 1.0909C16.4454 5.7346 17 6.6597 17 8v9.5l0.6667 0.5H6.3333L7 17.5V8c0-1.3403 0.5546-2.2654 1.3996-2.9091 0.9-0.6857 2.1994-1.0903 3.5978-1.0909z"/>
</vector>
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_bell__active.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M13 1h-2v1.0548C7.8632 2.4004 5 4.3821 5 8v8.5L3 18l0 2H21v-2l-2-1.5V8c0-3.6179-2.8632-5.5996-6-5.9452V1z m1 20h-4c0 1.1046 0.8954 2 2 2s2-0.8954 2-2z"/>
</vector>
4 changes: 2 additions & 2 deletions android/icons/src/main/res/drawable/nrk_bell_expressive.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M12 1a1 1 0 0 1 1 1v0.07c3.392 0.486 6 3.404 6 6.93v5.586l1.317 1.317C21.83 17.415 20.758 20 18.62 20H5.38c-2.138 0-3.21-2.585-1.697-4.097L5 14.586V9a7.002 7.002 0 0 1 6-6.93V2a1 1 0 0 1 1-1Zm0 3a5 5 0 0 0-5 5v6.414l-1.903 1.903A0.4 0.4 0 0 0 5.38 18h13.24a0.4 0.4 0 0 0 0.283-0.683L17 15.414V9a5 5 0 0 0-5-5Z"/>
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M12 23a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2Z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M12 1a1 1 0 0 1 1 1v0.07c3.392 0.486 6 3.404 6 6.93v5.586l1.317 1.317C21.83 17.415 20.758 20 18.62 20H5.38c-2.138 0-3.21-2.585-1.697-4.097L5 14.586V9a7.002 7.002 0 0 1 6-6.93V2a1 1 0 0 1 1-1ZM12 23a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2Z"/>
</vector>
4 changes: 2 additions & 2 deletions android/icons/src/main/res/drawable/nrk_bookmark.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M12 17.5422l1.1625 0.8303L17 21.1136V3H7v18.1136l3.8375-2.7411L12 17.5422z m-7 4.7287l1.8941 1.3762L7 23.5714 12 20l5 3.5714 0.1084 0.0775L19 22.2745V1H5v21.2709z"/>
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M17 7H7V5h10v2z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M6.8941 23.6471L5 22.2709V1h14v21.2745l-1.8916 1.3744L12 20l-5.1059 3.6471zM7 5h10V3H7v2z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M7 1a2 2 0 0 0-2 2v17.66c0 1.976 2.304 3.055 3.822 1.79L12 19.802l3.178 2.648c1.518 1.265 3.822 0.186 3.822-1.79V3a2 2 0 0 0-2-2H7Zm0 2h10v2H7V3Zm0 4v13.66c0 0.28 0.326 0.433 0.541 0.254L12 17.198l4.459 3.716A0.33 0.33 0 0 0 17 20.66V7H7Z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:pathData="M5 3a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2v17.66c0 1.976-2.304 3.055-3.822 1.79L12 19.802 8.822 22.45C7.304 23.715 5 22.636 5 20.66V7h12V5H5V3Z"/>
</vector>
2 changes: 1 addition & 1 deletion android/icons/src/main/res/drawable/nrk_broadcast.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="#FFF0F0F0"
android:fillType="evenOdd"
android:pathData="M2.8689 9.6987L6.9284 2H4.5595L0.5 9.6987 4.3499 17h2.369L2.8689 9.6987z m4.7334-0.0001l2.4776-4.6986H7.7109L5.2334 9.6986 7.5015 14h2.3689L7.6023 9.6986z m13.5249 0.0001L17.0677 2h2.3689l4.0595 7.6987L19.6462 17h-2.3689l3.8499-7.3013z m-4.7334-0.0001L13.9163 5h2.3689l2.4776 4.6986L16.4946 14h-2.3689l2.2681-4.3014zM13.1072 22v-8H11v8h2.1072z"/>
</vector>
Loading

0 comments on commit 5172f28

Please sign in to comment.