Merge branch 'master' into as-const-types

.github/scripts/generate-android-vectors.js

@@ -130,11 +130,14 @@ function generateKotlinValues() {
 
         // Probably a more efficient way to do this, but I don't think it really matters
         const expressiveVariant = generatedDrawables.find((element) => {
-            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"
+            // Icon variants such as "nrk-bell--active", "nrk-media-play-expressive--fail", or " nrk-media-volume-expressive--1"
+            // Variants end with "--variant", with "-expressive" being infront of the variant type. For those we need to insert "_expressive" into the name
+            // instead of just adding it at the end like
+            const indexOfVariantStart = drawable.indexOf("__")
+
+            if (indexOfVariantStart != -1) {
+                // From "nrk_media_playe__fail" to "nrk_media_playe_expressive__fail"
+                return element == rawNormalIconName.substring(0, indexOfVariantStart) + "_expressive" + rawNormalIconName.substring(indexOfVariantStart) + ".xml"
             } else {
                 return element == rawNormalIconName + "_expressive.xml"
             }

android/icons/src/main/kotlin/no/nrk/core/icons/NrkIcons.kt

@@ -575,17 +575,17 @@ object NrkIcons {
 
 	val NrkMediaChromecast1 = NrkIcon(
 		normal = R.drawable.nrk_media_chromecast__1,
-		expressive = null
+		expressive = R.drawable.nrk_media_chromecast_expressive__1
 	)
 
 	val NrkMediaChromecast2 = NrkIcon(
 		normal = R.drawable.nrk_media_chromecast__2,
-		expressive = null
+		expressive = R.drawable.nrk_media_chromecast_expressive__2
 	)
 
 	val NrkMediaChromecast3 = NrkIcon(
 		normal = R.drawable.nrk_media_chromecast__3,
-		expressive = null
+		expressive = R.drawable.nrk_media_chromecast_expressive__3
 	)
 
 	val NrkMediaChromecastActive = NrkIcon(
@@ -705,7 +705,7 @@ object NrkIcons {
 
 	val NrkMediaPlayFail = NrkIcon(
 		normal = R.drawable.nrk_media_play__fail,
-		expressive = null
+		expressive = R.drawable.nrk_media_play_expressive__fail
 	)
 
 	val NrkMediaPlaylist = NrkIcon(
@@ -835,7 +835,7 @@ object NrkIcons {
 
 	val NrkMediaSubtitlesUnavailable = NrkIcon(
 		normal = R.drawable.nrk_media_subtitles__unavailable,
-		expressive = null
+		expressive = R.drawable.nrk_media_subtitles_expressive__unavailable
 	)
 
 	val NrkMediaTheater = NrkIcon(
@@ -870,22 +870,22 @@ object NrkIcons {
 
 	val NrkMediaVolume1 = NrkIcon(
 		normal = R.drawable.nrk_media_volume__1,
-		expressive = null
+		expressive = R.drawable.nrk_media_volume_expressive__1
 	)
 
 	val NrkMediaVolume2 = NrkIcon(
 		normal = R.drawable.nrk_media_volume__2,
-		expressive = null
+		expressive = R.drawable.nrk_media_volume_expressive__2
 	)
 
 	val NrkMediaVolume3 = NrkIcon(
 		normal = R.drawable.nrk_media_volume__3,
-		expressive = null
+		expressive = R.drawable.nrk_media_volume_expressive__3
 	)
 
 	val NrkMediaVolumeMuted = NrkIcon(
 		normal = R.drawable.nrk_media_volume__muted,
-		expressive = null
+		expressive = R.drawable.nrk_media_volume_expressive__muted
 	)
 
 	val NrkMening = NrkIcon(
@@ -963,6 +963,11 @@ object NrkIcons {
 		expressive = null
 	)
 
+	val NrkRadioActive = NrkIcon(
+		normal = R.drawable.nrk_radio__active,
+		expressive = R.drawable.nrk_radio_expressive__active
+	)
+
 	val NrkRefresh = NrkIcon(
 		normal = R.drawable.nrk_refresh,
 		expressive = R.drawable.nrk_refresh_expressive

android/icons/src/main/res/drawable/nrk_radio__active.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFF0F0F0"
+        android:pathData="M16 12a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z"/>
+    <path
+        android:fillColor="#FFF0F0F0"
+        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"/>
+</vector>

android/icons/src/main/res/drawable/nrk_radio_expressive__active.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFF0F0F0"
+        android:pathData="M16 12a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z"/>
+    <path
+        android:fillColor="#FFF0F0F0"
+        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"/>
+</vector>