Add comment about fill color

nrkno · Jun 14, 2024 · 11fe12d · 11fe12d
1 parent 3a339c4
commit 11fe12d
Show file tree

Hide file tree

Showing 128 changed files with 207 additions and 1 deletion.
diff --git a/.github/scripts/generate-android-vectors.js b/.github/scripts/generate-android-vectors.js
@@ -17,7 +17,12 @@ const ANDROID_ICONS_FOLDER = "android/icons/src/main/kotlin/no/nrk/core/icons"
 const svg2vectordrawableOptions = {
     floatPrecision: 4,
     strict: false,
-    fillBlack: false,
+    // TODO some icons just have no color now. setting fillBlack true at least makes them black, but we probably want #FFF0F0F0 instead
+    // 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
 }
 

diff --git a/android/icons/src/main/res/drawable/nrk_404_expressive.xml b/android/icons/src/main/res/drawable/nrk_404_expressive.xml
@@ -4,11 +4,14 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         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: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: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>
diff --git a/android/icons/src/main/res/drawable/nrk_alarm_clock.xml b/android/icons/src/main/res/drawable/nrk_alarm_clock.xml
@@ -4,10 +4,13 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         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: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:pathData="M20.421 2.044L21.835 0.63l1.5 1.5-1.414 1.414-1.5-1.5Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_alarm_clock_expressive.xml b/android/icons/src/main/res/drawable/nrk_alarm_clock_expressive.xml
@@ -4,10 +4,13 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         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: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: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>
diff --git a/android/icons/src/main/res/drawable/nrk_arrange_list.xml b/android/icons/src/main/res/drawable/nrk_arrange_list.xml
@@ -4,5 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M2 8h20v2H2V8Zm20 6H2v2h20v-2Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_arrange_list_expressive.xml b/android/icons/src/main/res/drawable/nrk_arrange_list_expressive.xml
@@ -4,5 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         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>
diff --git a/android/icons/src/main/res/drawable/nrk_arrow_down.xml b/android/icons/src/main/res/drawable/nrk_arrow_down.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M12 20l-7-4.9v-2.27l6 4.2V4l2 1v12.03l6-4.2v2.27L12 20Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_arrow_nested.xml b/android/icons/src/main/res/drawable/nrk_arrow_nested.xml
@@ -4,5 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M17 4H2v2h13v11.08l-5-3.25v2.272l6 3.9 6-3.9V13.83l-5 3.25V4Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_arrow_nested_expressive.xml b/android/icons/src/main/res/drawable/nrk_arrow_nested_expressive.xml
@@ -4,5 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         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>
diff --git a/android/icons/src/main/res/drawable/nrk_arrow_up.xml b/android/icons/src/main/res/drawable/nrk_arrow_up.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M12 4l7 4.9v2.27l-6-4.2V20l-2-1V6.97l-6 4.2V8.9L12 4Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_bullet_square.xml b/android/icons/src/main/res/drawable/nrk_bullet_square.xml
@@ -4,5 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M8 8h8v8H8z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_bullet_square_expressive.xml b/android/icons/src/main/res/drawable/nrk_bullet_square_expressive.xml
@@ -4,5 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M8 12c0-2.2091 1.7909-4 4-4h0c2.2091 0 4 1.7909 4 4v0c0 2.2091-1.7909 4-4 4h0c-2.2091 0-4-1.7909-4-4z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_bulleted_list.xml b/android/icons/src/main/res/drawable/nrk_bulleted_list.xml
@@ -4,5 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M6 11h16v2H6v-2Zm16 6H6v2h16v-2ZM6 5h16v2H6V5Zm-4 6h2v2H2v-2Zm2 6H2v2h2v-2ZM2 5h2v2H2V5Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_bulleted_list_expressive.xml b/android/icons/src/main/res/drawable/nrk_bulleted_list_expressive.xml
@@ -4,5 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M8 12a1 1 0 0 1 1-1h12a1 1 0 1 1 0 2H9a1 1 0 0 1-1-1Zm14 6a1 1 0 0 0-1-1H9a1 1 0 1 0 0 2h12a1 1 0 0 0 1-1ZM8 6a1 1 0 0 1 1-1h12a1 1 0 1 1 0 2H9a1 1 0 0 1-1-1ZM2 6a2 2 0 1 1 4 0 2 2 0 0 1-4 0Zm0 6a2 2 0 1 1 4 0 2 2 0 0 1-4 0Zm0 6a2 2 0 1 1 4 0 2 2 0 0 1-4 0Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_category__active.xml b/android/icons/src/main/res/drawable/nrk_category__active.xml
@@ -4,5 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M2 11V2h9v9H2ZM2 13h9v9H2v-9ZM13 2v9h9V2h-9ZM13 22v-9h9v9h-9Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_check_radio__unchecked.xml b/android/icons/src/main/res/drawable/nrk_check_radio__unchecked.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillAlpha=".5"
         android:fillType="evenOdd"
         android:pathData="M12 19a7 7 0 1 0 0-14 7 7 0 0 0 0 14Zm0 2a9 9 0 1 0 0-18 9 9 0 0 0 0 18Z"/>

diff --git a/android/icons/src/main/res/drawable/nrk_checkbox.xml b/android/icons/src/main/res/drawable/nrk_checkbox.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillAlpha=".5"
         android:fillType="evenOdd"
         android:pathData="M20 4H4v16h16V4Zm-2 2H6v12h12V6Z"/>

diff --git a/android/icons/src/main/res/drawable/nrk_checkbox__active.xml b/android/icons/src/main/res/drawable/nrk_checkbox__active.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M3 21V3h18v18H3Zm6.95-4.03l8.26-8.26-1.41-1.42-6.74 6.74L7.5 11.1 6 12.4l3.95 4.57Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_clock.xml b/android/icons/src/main/res/drawable/nrk_clock.xml
@@ -4,8 +4,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M13 11.586V6h-2v6.414l4.293 4.293 1.414-1.414L13 11.586Z"/>
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M12 23c6.075 0 11-4.925 11-11S18.075 1 12 1 1 5.925 1 12s4.925 11 11 11Zm0-2a9 9 0 1 1 0-18 9 9 0 0 1 0 18Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_clock_expressive.xml b/android/icons/src/main/res/drawable/nrk_clock_expressive.xml
@@ -4,8 +4,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M13 11.586V7a1 1 0 1 0-2 0v4.586A2 2 0 0 0 11.586 13l3 3A1 1 0 0 0 16 14.586l-3-3Z"/>
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M12 23c6.075 0 11-4.925 11-11S18.075 1 12 1 1 5.925 1 12s4.925 11 11 11Zm0-2a9 9 0 1 1 0-18 9 9 0 0 1 0 18Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_dialogue.xml b/android/icons/src/main/res/drawable/nrk_dialogue.xml
@@ -4,9 +4,11 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M23 12H6v7h12l2 3h2l-2-3h3v-7Z"/>
     <path
+        android:fillColor="#FF000000"
         android:fillAlpha=".5"
         android:fillType="evenOdd"
         android:pathData="M1 9V2h17v7H6l-2 3H2l2-3H1Zm2-2V4h13v3H3Z"/>

diff --git a/android/icons/src/main/res/drawable/nrk_dialogue_expressive.xml b/android/icons/src/main/res/drawable/nrk_dialogue_expressive.xml
@@ -4,9 +4,11 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M23 15.5a3.5 3.5 0 0 0-3.5-3.5h-10a3.5 3.5 0 1 0 0 7H17l1.753 2.63a0.832 0.832 0 1 0 1.385-0.924L19 19h0.5a3.5 3.5 0 0 0 3.5-3.5Z"/>
     <path
+        android:fillColor="#FF000000"
         android:fillAlpha=".5"
         android:fillType="evenOdd"
         android:pathData="M4.5 9a3.5 3.5 0 1 1 0-7h10a3.5 3.5 0 1 1 0 7H8l-1.753 2.63a0.832 0.832 0 1 1-1.385-0.924L6 9H4.5Zm0-2a1.5 1.5 0 1 1 0-3h10a1.5 1.5 0 0 1 0 3h-10Z"/>

diff --git a/android/icons/src/main/res/drawable/nrk_download.xml b/android/icons/src/main/res/drawable/nrk_download.xml
@@ -4,8 +4,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M13 2h-2v15.1l-7-4.4V15l8 5 8-5v-2.3l-7 4.4V2Z"/>
     <path
+        android:fillColor="#FF000000"
         android:fillAlpha=".5"
         android:pathData="M4 22h16v2H4z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_downloaded.xml b/android/icons/src/main/res/drawable/nrk_downloaded.xml
@@ -4,10 +4,13 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M4 0h16v2H6v20h12v-8.5l2-2V24H4V0Z"/>
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M22.21 5.7l-8.26 8.27L10 9.4l1.51-1.3 2.55 2.93L20.8 4.3l1.41 1.42Z"/>
     <path
+        android:fillColor="#FF000000"
         android:pathData="M13.5 19a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_edit.xml b/android/icons/src/main/res/drawable/nrk_edit.xml
@@ -4,8 +4,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M15.9 2L3 14.9v5.7h5.7L21.5 7.7 15.9 2ZM7.8 18.5H5v-2.8l7.9-7.9 2.8 2.8-7.9 7.9Zm6.5-12.1l1.6-1.6 2.8 2.8-1.6 1.6-2.8-2.8Z"/>
     <path
+        android:fillColor="#FF000000"
         android:fillAlpha=".5"
         android:pathData="M12 21h8.6v-2H14l-2 2Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_edit_expressive.xml b/android/icons/src/main/res/drawable/nrk_edit_expressive.xml
@@ -4,8 +4,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M18.021 5.159a3 3 0 0 0-4.261-0.019l-9.588 9.588A4 4 0 0 0 3 17.557V21.6h4.034a4 4 0 0 0 2.84-1.183l9.54-9.614a3 3 0 0 0 0.01-4.216L18.021 5.16ZM8.093 19.207a1 1 0 0 1-0.707 0.293H5v-2.386a1 1 0 0 1 0.293-0.707L12.9 8.8l2.8 2.8-7.607 7.607ZM14.3 7.4l0.893-0.893a1 1 0 0 1 1.414 0l1.386 1.386a1 1 0 0 1 0 1.414l-0.893 0.893-2.8-2.8Z"/>
     <path
+        android:fillColor="#FF000000"
         android:fillAlpha=".5"
         android:pathData="M12 22h8a1 1 0 1 0 0-2h-6l-2 2Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_ellipsis.xml b/android/icons/src/main/res/drawable/nrk_ellipsis.xml
@@ -4,9 +4,12 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M18 10C19.1046 10 20 10.8954 20 12 20 13.1046 19.1046 14 18 14 16.8954 14 16 13.1046 16 12 16 10.8954 16.8954 10 18 10Z"/>
     <path
+        android:fillColor="#FF000000"
         android:pathData="M12 10C13.1046 10 14 10.8954 14 12 14 13.1046 13.1046 14 12 14 10.8954 14 10 13.1046 10 12 10 10.8954 10.8954 10 12 10Z"/>
     <path
+        android:fillColor="#FF000000"
         android:pathData="M8 12C8 10.8954 7.1046 10 6 10 4.8954 10 4 10.8954 4 12 4 13.1046 4.8954 14 6 14 7.1046 14 8 13.1046 8 12Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_ellipsis__active.xml b/android/icons/src/main/res/drawable/nrk_ellipsis__active.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M23 12C23 5.9249 18.0751 1 12 1 5.9249 1 1 5.9249 1 12 1 18.0751 5.9249 23 12 23 18.0751 23 23 18.0751 23 12ZM6 10C7.1046 10 8 10.8954 8 12 8 13.1046 7.1046 14 6 14 4.8954 14 4 13.1046 4 12 4 10.8954 4.8954 10 6 10ZM12 10C13.1046 10 14 10.8954 14 12 14 13.1046 13.1046 14 12 14 10.8954 14 10 13.1046 10 12 10 10.8954 10.8954 10 12 10ZM18 10C19.1046 10 20 10.8954 20 12 20 13.1046 19.1046 14 18 14 16.8954 14 16 13.1046 16 12 16 10.8954 16.8954 10 18 10Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_geo_expressive.xml b/android/icons/src/main/res/drawable/nrk_geo_expressive.xml
@@ -4,7 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M12 8a4 4 0 1 0 0 8 4 4 0 0 0 0-8Zm-2 4a2 2 0 1 1 4 0 2 2 0 0 1-4 0Z"/>
     <path
+        android:fillColor="#FF000000"
         android:pathData="M13 20.95A9 9 0 0 0 20.95 13H23a1 1 0 1 0 0-2h-2.06A9 9 0 0 0 13 3.05V1a1 1 0 1 0-2 0v2.06A9 9 0 0 0 3.05 11H1a1 1 0 1 0 0 2h2.06A9 9 0 0 0 11 20.95V23a1 1 0 1 0 2 0v-2.06ZM5 12a7 7 0 1 1 14 0 7 7 0 0 1-14 0Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_geo_expressive__active.xml b/android/icons/src/main/res/drawable/nrk_geo_expressive__active.xml
@@ -4,8 +4,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:pathData="M10 12a2 2 0 1 1 4 0 2 2 0 0 1-4 0Z"/>
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M13 3.06A9 9 0 0 1 20.95 11H23a1 1 0 1 1 0 2h-2.06A9 9 0 0 1 13 20.95V23a1 1 0 1 1-2 0v-2.06A9 9 0 0 1 3.05 13H1a1 1 0 1 1 0-2h2.06A9 9 0 0 1 11 3.05V1a1 1 0 1 1 2 0v2.06ZM12 8a4 4 0 1 0 0 8 4 4 0 0 0 0-8Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_hardware_camera_expressive.xml b/android/icons/src/main/res/drawable/nrk_hardware_camera_expressive.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M8 5a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2h4a3 3 0 0 1 3 3v10a3 3 0 0 1-3 3H4a3 3 0 0 1-3-3V8a3 3 0 0 1 3-3h4Zm6 1a1 1 0 0 0 1 1h5a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V8a1 1 0 0 1 1-1h5a1 1 0 0 0 1-1V5h4v1Zm0 7a2 2 0 1 1-4 0 2 2 0 0 1 4 0Zm2 0a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_hardware_computer_expressive.xml b/android/icons/src/main/res/drawable/nrk_hardware_computer_expressive.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M22.005 5a3 3 0 0 0-3-3H4.996a3 3 0 0 0-3 3l0.003 11.006A3 3 0 0 0 5 19.005l14.006-0.004a3 3 0 0 0 2.999-3V5ZM5 14.006a1 1 0 0 1-1-1V4.994a1 1 0 0 1 1-1L19.005 4a1 1 0 0 1 1 1L20 13.006a1 1 0 0 1-1 1H5ZM10 23a1 1 0 0 1 0-2h4a1 1 0 1 1 0 2h-4Zm3-7a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_hardware_game_expressive.xml b/android/icons/src/main/res/drawable/nrk_hardware_game_expressive.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M23 19a3 3 0 0 1-3 3h-0.658a3 3 0 0 1-2.91-2.272L16 18H8l-0.432 1.728A3 3 0 0 1 4.658 22H4a3 3 0 0 1-3-3v-6C1 6.925 5.925 2 12 2s11 4.925 11 11v6ZM7.813 16a1.76 1.76 0 0 0-1.708 1.333l-0.407 1.63A1.37 1.37 0 0 1 3 18.63V13a9 9 0 0 1 18 0v5.63a1.37 1.37 0 0 1-2.698 0.333l-0.407-1.63A1.76 1.76 0 0 0 16.187 16H7.813ZM9 10V9a1 1 0 0 0-2 0v1H6a1 1 0 1 0 0 2h1v1a1 1 0 1 0 2 0v-1h1a1 1 0 1 0 0-2H9Zm6 1a1 1 0 1 0 2 0 1 1 0 0 0-2 0Zm-2 0a3 3 0 1 0 6 0 3 3 0 0 0-6 0Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_hardware_headphones.xml b/android/icons/src/main/res/drawable/nrk_hardware_headphones.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M2 22V6.667L5.5 2h13L22 6.667V22h-7v-9h5V7.333L17.5 4h-11L4 7.333V13h5v9H2Zm5-7v5H4v-5h3Zm13 5v-5h-3v5h3Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_hardware_headphones_expressive.xml b/android/icons/src/main/res/drawable/nrk_hardware_headphones_expressive.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M4 12a8 8 0 1 1 16 0v1.337a3.5 3.5 0 0 0-5 3.163v2a3.5 3.5 0 1 0 7 0V12c0-5.523-4.477-10-10-10S2 6.477 2 12v6.5a3.5 3.5 0 1 0 7 0v-2a3.5 3.5 0 0 0-5-3.163V12Zm0 4.5v2a1.5 1.5 0 0 0 3 0v-2a1.5 1.5 0 0 0-3 0Zm16 0a1.5 1.5 0 0 0-3 0v2a1.5 1.5 0 0 0 3 0v-2Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_hardware_laptop_expressive.xml b/android/icons/src/main/res/drawable/nrk_hardware_laptop_expressive.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M3 16h2l-0.004-9a1 1 0 0 1 1-1h12.008a1 1 0 0 1 1 1L19 16h2l0.004-8.999a3 3 0 0 0-3-3.001H5.996a3 3 0 0 0-3 3.001L3 16Zm-2 3.5A1.5 1.5 0 0 1 2.5 18H10a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1h7.5a1.5 1.5 0 0 1 0 3h-19A1.5 1.5 0 0 1 1 19.5Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_hardware_microphone.xml b/android/icons/src/main/res/drawable/nrk_hardware_microphone.xml
@@ -4,8 +4,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M8 14V2h8v12H8Zm2-10h4v8h-4V4Z"/>
     <path
+        android:fillColor="#FF000000"
         android:pathData="M6 12H4v6h7v2H8v2h8v-2h-3v-2h7v-6h-2v4H6v-4Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_hardware_microphone_expressive.xml b/android/icons/src/main/res/drawable/nrk_hardware_microphone_expressive.xml
@@ -4,8 +4,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M12 14a4 4 0 0 1-4-4V6a4 4 0 1 1 8 0v4a4 4 0 0 1-4 4Zm-2-8a2 2 0 1 1 4 0v4a2 2 0 1 1-4 0V6Z"/>
     <path
+        android:fillColor="#FF000000"
         android:pathData="M6 13a1 1 0 1 0-2 0v2a3 3 0 0 0 3 3h4v2H9a1 1 0 1 0 0 2h6a1 1 0 1 0 0-2h-2v-2h4a3 3 0 0 0 3-3v-2a1 1 0 1 0-2 0v2a1 1 0 0 1-1 1H7a1 1 0 0 1-1-1v-2Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_hardware_printer_expressive.xml b/android/icons/src/main/res/drawable/nrk_hardware_printer_expressive.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M17 5a1 1 0 0 0-1-1H8a1 1 0 0 0-1 1h10ZM5 5a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h1a3 3 0 0 0 3 3h6a3 3 0 0 0 3-3h1a3 3 0 0 0 3-3V8a3 3 0 0 0-3-3 3 3 0 0 0-3-3H8a3 3 0 0 0-3 3ZM4 8a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1h-1a3 3 0 0 0-3-3H9a3 3 0 0 0-3 3H5a1 1 0 0 1-1-1V8Zm12 11a1 1 0 0 1-1 1H9a1 1 0 0 1-1-1h8Zm0-2H8a1 1 0 0 1 1-1h6a1 1 0 0 1 1 1Zm-8-6.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_hardware_radio_expressive.xml b/android/icons/src/main/res/drawable/nrk_hardware_radio_expressive.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M6.047 4l1.25-2.454a1 1 0 1 1 1.782 0.908L8.29 4H20a3 3 0 0 1 3 3v10a3 3 0 0 1-3 3H4a3 3 0 0 1-3-3V7a3 3 0 0 1 3-3h2.047ZM8.5 12a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Zm4.5 0a2 2 0 1 0 4 0 2 2 0 0 0-4 0Zm-2 0a4 4 0 1 0 8 0 4 4 0 0 0-8 0ZM3 7a1 1 0 0 1 1-1h17v11a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V7Z"/>
 </vector>
diff --git a/android/icons/src/main/res/drawable/nrk_hardware_smart_speaker_expressive.xml b/android/icons/src/main/res/drawable/nrk_hardware_smart_speaker_expressive.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="M22 2a1 1 0 1 1 2 0v8a1 1 0 1 1-2 0V2Zm-5.003 21.001a3 3 0 0 0 2.999-2.998L20 10.982h-2l-0.005 9.02a1 1 0 0 1-1 0.998L7 21.005a1 1 0 0 1-1-1V5.995a1 1 0 0 1 1-1L16 5V3l-8.999-0.004a3 3 0 0 0-3.001 3v14.009a3 3 0 0 0 3.001 3L16.997 23ZM17 19.067v0.001-0.017c0.008 0.002 0.004 0.008 0.002 0.013l-0.002 0.003ZM12 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM20 4a1 1 0 1 0-2 0v4a1 1 0 1 0 2 0V4Zm-8 13a2 2 0 1 1 0-4 2 2 0 0 1 0 4Zm0 2a4 4 0 1 1 0-8 4 4 0 0 1 0 8Z"/>
 </vector>