Fix colour

Skyscanner · Nov 22, 2024 · ce531c0 · ce531c0
1 parent c4dca19
commit ce531c0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/backpack-common/src/main/res/drawable-nodpi/bpk_speaker.xml b/backpack-common/src/main/res/drawable-nodpi/bpk_speaker.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="24">
     <path
         android:pathData="M13.599,2.354C14.53,1.557 16,2.193 16,3.392V20.608C16,21.807 14.529,22.443 13.599,21.646L8.417,17.209C8.258,17.073 8.054,16.998 7.842,16.998H3.596C2.162,16.998 1,15.879 1,14.498V9.501C1,8.12 2.162,7.001 3.596,7.001H7.842C8.054,7.001 8.258,6.926 8.417,6.79L13.599,2.354Z"
-      android:fillColor="#161616" />
+        android:fillColor="@color/bpkTextPrimary" />
     <path
         android:pathData="M21.041,6.054C20.794,5.721 20.324,5.651 19.992,5.897C19.659,6.144 19.589,6.614 19.835,6.946C20.882,8.359 21.5,10.106 21.5,12C21.5,13.894 20.882,15.641 19.835,17.054C19.589,17.386 19.659,17.856 19.992,18.103C20.324,18.349 20.794,18.279 21.041,17.946C22.272,16.284 23,14.226 23,12C23,9.774 22.272,7.716 21.041,6.054Z"
-      android:fillColor="#161616" />
+        android:fillColor="@color/bpkTextPrimary" />
     <path
         android:pathData="M19.16,8.672C18.962,8.308 18.507,8.172 18.143,8.369C17.779,8.567 17.643,9.022 17.84,9.386C18.261,10.163 18.5,11.052 18.5,12C18.5,12.948 18.261,13.837 17.84,14.614C17.643,14.978 17.779,15.434 18.143,15.631C18.507,15.828 18.962,15.692 19.16,15.328C19.696,14.338 20,13.203 20,12C20,10.797 19.696,9.662 19.16,8.672Z"
-      android:fillColor="#161616" />
+        android:fillColor="@color/bpkTextPrimary" />
 </vector>
diff --git a/backpack-common/src/main/res/drawable-nodpi/bpk_speaker_mute.xml b/backpack-common/src/main/res/drawable-nodpi/bpk_speaker_mute.xml
@@ -5,14 +5,14 @@
     android:viewportHeight="24">
     <path
         android:pathData="M5.587,16.998H3.596C2.162,16.998 1,15.879 1,14.498V9.501C1,8.12 2.162,7.001 3.596,7.001H7.842C8.054,7.001 8.258,6.926 8.417,6.79L13.599,2.354C14.53,1.557 16,2.193 16,3.392V6.586L20.293,2.293C20.683,1.902 21.317,1.902 21.707,2.293C22.098,2.683 22.098,3.317 21.707,3.707L3.707,21.707C3.317,22.098 2.683,22.098 2.293,21.707C1.902,21.317 1.902,20.683 2.293,20.293L5.587,16.998Z"
-      android:fillColor="#161616" />
+        android:fillColor="@color/bpkTextPrimary" />
     <path
         android:pathData="M9.764,18.362C9.542,18.173 9.529,17.835 9.735,17.629L15.146,12.217C15.461,11.903 16,12.126 16,12.571V20.608C16,21.807 14.529,22.443 13.599,21.646L9.764,18.362Z"
-      android:fillColor="#161616" />
+        android:fillColor="@color/bpkTextPrimary" />
     <path
         android:pathData="M18.017,9.347C17.94,9.424 17.923,9.541 17.969,9.64C18.309,10.354 18.5,11.154 18.5,12C18.5,12.948 18.261,13.837 17.84,14.614C17.643,14.978 17.779,15.434 18.143,15.631C18.507,15.828 18.962,15.692 19.16,15.328C19.696,14.338 20,13.203 20,12C20,10.797 19.898,10.148 19.492,9.299C19.373,9.079 19.199,8.778 19.073,8.59C19.005,8.487 18.878,8.486 18.791,8.573L18.017,9.347Z"
-      android:fillColor="#161616" />
+        android:fillColor="@color/bpkTextPrimary" />
     <path
         android:pathData="M20.188,7.46C20.124,7.359 20.136,7.228 20.221,7.143L20.945,6.419C21.054,6.31 21.236,6.325 21.322,6.453C22.382,8.041 23,9.949 23,12C23,14.226 22.272,16.284 21.041,17.946C20.794,18.279 20.324,18.349 19.992,18.103C19.659,17.856 19.589,17.386 19.835,17.054C20.882,15.641 21.5,13.894 21.5,12C21.5,10.33 21.019,8.773 20.188,7.46Z"
-      android:fillColor="#161616" />
+        android:fillColor="@color/bpkTextPrimary" />
 </vector>
diff --git a/backpack-common/src/main/res/drawable-nodpi/bpk_speaker_mute_sm.xml b/backpack-common/src/main/res/drawable-nodpi/bpk_speaker_mute_sm.xml
@@ -5,14 +5,14 @@
     android:viewportHeight="24">
     <path
         android:pathData="M5.893,17.248H3.141C1.406,17.248 0,16.073 0,14.623V9.376C0,7.926 1.406,6.751 3.141,6.751H6.629C6.885,6.751 7.133,6.672 7.324,6.53L13.595,1.871C14.721,1.035 16.5,1.703 16.5,2.961V6.641L20.671,2.47C20.964,2.177 21.439,2.177 21.732,2.47C22.025,2.763 22.025,3.237 21.732,3.53L3.53,21.732C3.237,22.025 2.763,22.025 2.47,21.732C2.177,21.439 2.177,20.964 2.47,20.671L5.893,17.248Z"
-      android:fillColor="#161616" />
+        android:fillColor="@color/bpkTextPrimary" />
     <path
         android:pathData="M9.767,19.285C9.584,19.148 9.564,18.88 9.726,18.718L15.86,12.584C16.096,12.348 16.5,12.515 16.5,12.849V21.039C16.5,22.297 14.721,22.965 13.595,22.129L9.767,19.285Z"
-      android:fillColor="#161616" />
+        android:fillColor="@color/bpkTextPrimary" />
     <path
         android:pathData="M20.983,7.915C20.877,7.762 20.891,7.553 21.023,7.421L21.651,6.793C21.807,6.637 22.064,6.648 22.198,6.824C23.338,8.317 24,10.095 24,12C24,14.137 23.168,16.113 21.761,17.708C21.479,18.028 20.942,18.095 20.562,17.858C20.181,17.622 20.101,17.171 20.383,16.851C21.579,15.495 22.286,13.818 22.286,12C22.286,10.511 21.812,9.116 20.983,7.915Z"
-      android:fillColor="#161616" />
+        android:fillColor="@color/bpkTextPrimary" />
     <path
         android:pathData="M18.596,9.848C18.483,9.961 18.455,10.131 18.516,10.278C18.737,10.817 18.857,11.396 18.857,12C18.857,12.91 18.584,13.764 18.104,14.509C17.878,14.859 18.033,15.296 18.449,15.485C18.865,15.675 19.386,15.545 19.611,15.195C20.224,14.244 20.572,13.155 20.572,12C20.572,11.011 20.317,10.071 19.859,9.224C19.745,9.013 19.462,8.982 19.292,9.152L18.596,9.848Z"
-      android:fillColor="#161616" />
+        android:fillColor="@color/bpkTextPrimary" />
 </vector>
diff --git a/backpack-common/src/main/res/drawable-nodpi/bpk_speaker_sm.xml b/backpack-common/src/main/res/drawable-nodpi/bpk_speaker_sm.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="24">
     <path
         android:pathData="M13.595,1.871C14.721,1.035 16.5,1.703 16.5,2.961V21.039C16.5,22.297 14.721,22.965 13.595,22.129L7.324,17.469C7.133,17.327 6.885,17.248 6.629,17.248H3.141C1.406,17.248 0,16.073 0,14.623V9.376C0,7.926 1.406,6.751 3.141,6.751H6.629C6.885,6.751 7.133,6.672 7.324,6.53L13.595,1.871Z"
-      android:fillColor="#161616" />
+        android:fillColor="@color/bpkTextPrimary" />
     <path
         android:pathData="M21.761,6.292C21.479,5.972 20.942,5.905 20.562,6.141C20.181,6.378 20.101,6.829 20.383,7.149C21.579,8.505 22.286,10.182 22.286,12C22.286,13.818 21.579,15.495 20.383,16.851C20.101,17.171 20.181,17.622 20.562,17.858C20.942,18.095 21.479,18.028 21.761,17.708C23.168,16.113 24,14.137 24,12C24,9.863 23.168,7.887 21.761,6.292Z"
-      android:fillColor="#161616" />
+        android:fillColor="@color/bpkTextPrimary" />
     <path
         android:pathData="M19.611,8.805C19.386,8.455 18.865,8.325 18.449,8.515C18.033,8.704 17.878,9.141 18.104,9.491C18.584,10.236 18.857,11.09 18.857,12C18.857,12.91 18.584,13.764 18.104,14.509C17.878,14.859 18.033,15.296 18.449,15.485C18.865,15.675 19.386,15.545 19.611,15.195C20.224,14.244 20.572,13.155 20.572,12C20.572,10.845 20.224,9.756 19.611,8.805Z"
-      android:fillColor="#161616" />
+        android:fillColor="@color/bpkTextPrimary" />
 </vector>
diff --git a/buildSrc/src/main/kotlin/net/skyscanner/backpack/tokens/BpkIcons.kt b/buildSrc/src/main/kotlin/net/skyscanner/backpack/tokens/BpkIcons.kt
@@ -190,6 +190,7 @@ private fun toXml(source: BpkIcons, rootDir: String, metadataPath: String): Map<
     fun BpkIcon.fileContent(metadata: Map<String, String?>) =
         value
             .replace("android:fillColor=\"#FF000000\"", "  android:fillColor=\"@color/bpkTextPrimary\"")
+            .replace("android:fillColor=\"#161616\"", "  android:fillColor=\"@color/bpkTextPrimary\"")
             .replace("<path", "  <path")
             .replace("android:pathData=", "  android:pathData=")
             .replace("\"/>", "\" />")