From eda3aa04043152fb5415d3a84c7c5b9dee2fab44 Mon Sep 17 00:00:00 2001 From: gesi Date: Tue, 12 Nov 2024 12:24:10 +0000 Subject: [PATCH] Convert updated SVG files to Android vector files --- .../src/main/kotlin/no/nrk/core/icons/NrkIcons.kt | 5 +++++ android/icons/src/main/res/drawable/nrk_back.xml | 2 +- .../src/main/res/drawable/nrk_back_expressive.xml | 2 +- .../src/main/res/drawable/nrk_media_jumpto.xml | 5 ++++- .../res/drawable/nrk_media_jumpto_expressive.xml | 2 +- .../icons/src/main/res/drawable/nrk_offline.xml | 3 +-- .../main/res/drawable/nrk_offline_expressive.xml | 11 ++++++++++- .../icons/src/main/res/drawable/nrk_online.xml | 15 +++++++++++++++ .../main/res/drawable/nrk_online_expressive.xml | 15 +++++++++++++++ 9 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 android/icons/src/main/res/drawable/nrk_online.xml create mode 100644 android/icons/src/main/res/drawable/nrk_online_expressive.xml diff --git a/android/icons/src/main/kotlin/no/nrk/core/icons/NrkIcons.kt b/android/icons/src/main/kotlin/no/nrk/core/icons/NrkIcons.kt index efaed9d2..099cbe9c 100644 --- a/android/icons/src/main/kotlin/no/nrk/core/icons/NrkIcons.kt +++ b/android/icons/src/main/kotlin/no/nrk/core/icons/NrkIcons.kt @@ -933,6 +933,11 @@ object NrkIcons { expressive = R.drawable.nrk_offline_expressive ) + val NrkOnline = NrkIcon( + normal = R.drawable.nrk_online, + expressive = R.drawable.nrk_online_expressive + ) + val NrkOpenInNew = NrkIcon( normal = R.drawable.nrk_open_in_new, expressive = R.drawable.nrk_open_in_new_expressive diff --git a/android/icons/src/main/res/drawable/nrk_back.xml b/android/icons/src/main/res/drawable/nrk_back.xml index 9f4e9b20..85950a37 100644 --- a/android/icons/src/main/res/drawable/nrk_back.xml +++ b/android/icons/src/main/res/drawable/nrk_back.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M4.4 7.4L6.8 4h2.5L7.2 7h6.3a6.5 6.5 0 0 1 0 13H9l1-2h3.5a4.5 4.5 0 1 0 0-9H7.2l2.1 3H6.8L4.4 8.6 4 8l0.4-0.6Z"/> diff --git a/android/icons/src/main/res/drawable/nrk_back_expressive.xml b/android/icons/src/main/res/drawable/nrk_back_expressive.xml index 6d004c69..9698d95f 100644 --- a/android/icons/src/main/res/drawable/nrk_back_expressive.xml +++ b/android/icons/src/main/res/drawable/nrk_back_expressive.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M4.4 7.4L6.4708 4.4417C6.6646 4.1649 6.9812 4 7.3191 4 8.1588 4 8.6493 4.9467 8.1651 5.6327L7.2 7H13.5C15.2239 7 16.8772 7.6848 18.0962 8.9038 19.3152 10.1228 20 11.7761 20 13.5 20 15.2239 19.3152 16.8772 18.0962 18.0962 16.8772 19.3152 15.2239 20 13.5 20H10.618C9.8747 20 9.3912 19.2177 9.7236 18.5528 9.893 18.214 10.2393 18 10.618 18H13.5C14.6935 18 15.8381 17.5259 16.682 16.682 17.5259 15.838 18 14.6934 18 13.5 18 12.3065 17.5259 11.1619 16.682 10.318 15.8381 9.4741 14.6935 9 13.5 9H7.2L8.1651 10.3672C8.6493 11.0532 8.1588 12 7.3191 12 6.9812 12 6.6646 11.8351 6.4708 11.5583L4.4 8.6 4 8 4.4 7.4Z"/> diff --git a/android/icons/src/main/res/drawable/nrk_media_jumpto.xml b/android/icons/src/main/res/drawable/nrk_media_jumpto.xml index 86686203..293887d6 100644 --- a/android/icons/src/main/res/drawable/nrk_media_jumpto.xml +++ b/android/icons/src/main/res/drawable/nrk_media_jumpto.xml @@ -5,5 +5,8 @@ android:viewportHeight="24"> + android:pathData="M18 9.98C18 7.55 16 5 12.5 5S7 7.55 7 9.98v2.12l3-2.1v2.45l-4 2.8-4-2.8V10l3 2.1V9.98C5 6.3 8.2 3 12.5 3S20 6.3 20 9.98v5.82h-2V9.98Z"/> + diff --git a/android/icons/src/main/res/drawable/nrk_media_jumpto_expressive.xml b/android/icons/src/main/res/drawable/nrk_media_jumpto_expressive.xml index 1288040a..d1e20ba3 100644 --- a/android/icons/src/main/res/drawable/nrk_media_jumpto_expressive.xml +++ b/android/icons/src/main/res/drawable/nrk_media_jumpto_expressive.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M6 15.241L2.427 12.74A1 1 0 1 1 3.573 11.1L5 12.1V9.977C5 6.297 8.203 3 12.5 3 16.8 3 20 6.297 20 9.977V14.8a1 1 0 1 1-2 0V9.977C18 7.553 16 5 12.5 5S7 7.553 7 9.977V12.1l1.427-0.999a1 1 0 0 1 1.146 1.639L6 15.24ZM8 20a2 2 0 1 0-4 0 2 2 0 0 0 4 0ZM14 20a1 1 0 1 0-2 0 1 1 0 0 0 2 0ZM20 20a1 1 0 1 0-2 0 1 1 0 0 0 2 0Z"/> diff --git a/android/icons/src/main/res/drawable/nrk_offline.xml b/android/icons/src/main/res/drawable/nrk_offline.xml index 392a7ec2..a02fe306 100644 --- a/android/icons/src/main/res/drawable/nrk_offline.xml +++ b/android/icons/src/main/res/drawable/nrk_offline.xml @@ -5,6 +5,5 @@ android:viewportHeight="24"> + android:pathData="M15.41 22L6.2781 2H8.4767l1.4275 3.1264C10.5912 5.0429 11.2906 5 12 5c4.6409 0 8.8547 1.8378 11.9498 4.8232l-1.3885 1.4395C19.824 8.6224 16.1025 7 12 7c-0.4101 0-0.8165 0.0162-1.2184 0.048l1.3603 2.9791c3.2179 0.0368 6.1379 1.3217 8.2951 3.3914l-1.3846 1.4432c-1.5873-1.5228-3.6643-2.5358-5.9719-2.7788l1.5685 3.4352c0.8688 0.3413 1.655 0.8466 2.32 1.4774l-1.1107 1.171L17.6086 22H15.41ZM7.0249 17.0401c0.8616-0.8319 1.9317-1.4512 3.124-1.7717l0.8469 1.8548c-0.9916 0.1982-1.8807 0.6789-2.5816 1.3557L7.0249 17.0401ZM8.0537 10.6796c-1.6969 0.5805-3.225 1.5246-4.4907 2.7389l1.3846 1.4432c1.1055-1.0606 2.4486-1.8739 3.9417-2.352l-0.8356-1.8301ZM0.0503 9.8232c1.6774-1.618 3.6834-2.8989 5.9079-3.7328l0.833 1.8243c-2.0178 0.7351-3.8361 1.8854-5.3524 3.348L0.0503 9.8232Z"/> diff --git a/android/icons/src/main/res/drawable/nrk_offline_expressive.xml b/android/icons/src/main/res/drawable/nrk_offline_expressive.xml index b5a679dc..de8b88e9 100644 --- a/android/icons/src/main/res/drawable/nrk_offline_expressive.xml +++ b/android/icons/src/main/res/drawable/nrk_offline_expressive.xml @@ -5,5 +5,14 @@ android:viewportHeight="24"> + android:pathData="M7.4596 2.0903C7.962 1.861 8.5553 2.0823 8.7847 2.5846L9.9431 5.1217C10.6179 5.0413 11.3043 5 12 5 16.4853 5 20.5719 6.7167 23.635 9.5272 24.042 9.9006 24.0692 10.5331 23.6958 10.9401 23.3224 11.347 22.6898 11.3742 22.2829 11.0009 19.5742 8.5156 15.9652 7 12 7 11.6032 7 11.2101 7.0152 10.8212 7.0449L12.1829 10.0271C15.2745 10.0624 18.0915 11.25 20.2209 13.1788 20.6303 13.5496 20.6615 14.182 20.2908 14.5913 19.92 15.0006 19.2876 15.0319 18.8783 14.6611 17.3206 13.2502 15.3264 12.3151 13.1215 12.0829L14.6901 15.5182C15.4574 15.8197 16.1603 16.2491 16.7722 16.7798 17.1894 17.1417 17.2342 17.7733 16.8723 18.1905 16.6629 18.4319 16.3633 18.5486 16.0671 18.534L17.0034 20.5847C17.2328 21.087 17.0115 21.6803 16.5091 21.9097 16.0067 22.1391 15.4135 21.9177 15.1841 21.4153L6.9653 3.4154C6.7359 2.913 6.9573 2.3197 7.4596 2.0903Z"/> + + + diff --git a/android/icons/src/main/res/drawable/nrk_online.xml b/android/icons/src/main/res/drawable/nrk_online.xml new file mode 100644 index 00000000..b5e3d687 --- /dev/null +++ b/android/icons/src/main/res/drawable/nrk_online.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/android/icons/src/main/res/drawable/nrk_online_expressive.xml b/android/icons/src/main/res/drawable/nrk_online_expressive.xml new file mode 100644 index 00000000..30426e73 --- /dev/null +++ b/android/icons/src/main/res/drawable/nrk_online_expressive.xml @@ -0,0 +1,15 @@ + + + + +