From 043df3fd47bb939158aecddfb601f70c15fabe16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 14 Jan 2025 15:46:29 +0100
Subject: [PATCH] MOBILE-4736 icons: Update icons due to MDL-83639

---
 src/addons/mod/scorm/services/scorm.ts        |  2 +-
 .../qtype/ordering/component/ordering.ts      |  2 +-
 .../font-awesome/arrow-turn-down-right.svg    |  3 --
 src/assets/fonts/moodle/moodle/browsed.svg    |  4 +++
 .../moodle/moodle/grade-partiallycorrect.svg  |  3 ++
 src/assets/fonts/moodle/moodle/item.svg       |  3 ++
 src/assets/fonts/moodle/moodle/level.svg      |  3 ++
 .../policy/pages/acceptances/acceptances.html |  6 ++--
 .../policy/pages/acceptances/acceptances.scss |  5 ----
 src/core/features/question/question.scss      |  2 ++
 .../question/services/question-helper.ts      | 28 +++++++++++++++----
 11 files changed, 43 insertions(+), 18 deletions(-)
 delete mode 100644 src/assets/fonts/moodle/font-awesome/arrow-turn-down-right.svg
 create mode 100644 src/assets/fonts/moodle/moodle/browsed.svg
 create mode 100644 src/assets/fonts/moodle/moodle/grade-partiallycorrect.svg
 create mode 100644 src/assets/fonts/moodle/moodle/item.svg
 create mode 100644 src/assets/fonts/moodle/moodle/level.svg

diff --git a/src/addons/mod/scorm/services/scorm.ts b/src/addons/mod/scorm/services/scorm.ts
index 81bd0355e8a..441c1714ccb 100644
--- a/src/addons/mod/scorm/services/scorm.ts
+++ b/src/addons/mod/scorm/services/scorm.ts
@@ -62,7 +62,7 @@ const STATUSES = {
 };
 const STATUS_TO_ICON = {
     asset: '', // Empty to show an space.
-    browsed: 'fas-book',
+    browsed: 'moodle-browsed',
     completed: 'fas-check',
     failed: 'fas-xmark',
     incomplete: 'fas-pen-to-square',
diff --git a/src/addons/qtype/ordering/component/ordering.ts b/src/addons/qtype/ordering/component/ordering.ts
index 8d4edc9b455..41c2bdb9400 100644
--- a/src/addons/qtype/ordering/component/ordering.ts
+++ b/src/addons/qtype/ordering/component/ordering.ts
@@ -76,7 +76,7 @@ export class AddonQtypeOrderingComponent extends CoreQuestionBaseComponent<Addon
             const itemContentEl = element.querySelector<HTMLElement>('[data-itemcontent]');
             itemContentEl?.querySelector(
                 '.icon.fa-check, .icon.fa-remove, .icon.fa-check-square, .icon.fa-circle-check, .icon.fa-xmark, ' +
-                '.icon.fa-circle-xmark, .icon.fa-square-check, .icon.circle-half-stroke',
+                '.icon.fa-circle-xmark, .icon.fa-square-check, .icon.circle-half-stroke, img.icon[src*="grade_partiallycorrect"]',
             )?.remove();
 
             return {
diff --git a/src/assets/fonts/moodle/font-awesome/arrow-turn-down-right.svg b/src/assets/fonts/moodle/font-awesome/arrow-turn-down-right.svg
deleted file mode 100644
index b092fa12fa6..00000000000
--- a/src/assets/fonts/moodle/font-awesome/arrow-turn-down-right.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="20" height="17" viewBox="0 0 20 17" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5459 4.25281C4.5459 3.83859 4.21011 3.50281 3.7959 3.50281C3.38168 3.50281 3.0459 3.83859 3.0459 4.25281C3.0459 4.57259 3.04612 5.06957 3.04641 5.7082C3.04674 6.42035 3.04714 7.30873 3.0474 8.32386C3.04779 9.8405 4.2759 11.0715 5.79313 11.074L14.3978 11.0882L12.3432 13.1431C12.0503 13.436 12.0503 13.9109 12.3432 14.2038C12.6361 14.4966 13.111 14.4966 13.4039 14.2037L16.7351 10.8721C17.0279 10.5792 17.0279 10.1043 16.735 9.81143L13.4034 6.47991C13.1105 6.18703 12.6356 6.18704 12.3427 6.47993C12.0498 6.77283 12.0498 7.24771 12.3427 7.54059L14.3904 9.58821L5.7956 9.57403C5.10627 9.57289 4.54758 9.0134 4.5474 8.32348C4.54714 7.30775 4.54674 6.41971 4.54641 5.70791C4.54612 5.06975 4.5459 4.57254 4.5459 4.25281Z" fill="black"/>
-</svg>
diff --git a/src/assets/fonts/moodle/moodle/browsed.svg b/src/assets/fonts/moodle/moodle/browsed.svg
new file mode 100644
index 00000000000..6eea474f79b
--- /dev/null
+++ b/src/assets/fonts/moodle/moodle/browsed.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 20 17" fill="none" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMid meet">
+<rect width="20" height="16" transform="translate(0 0.0148163)" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.56907 8.01482C5.56907 5.51482 7.54996 3.44339 10.0174 3.44339C11.6859 3.44339 13.1582 4.4178 13.9185 5.83659C13.3694 5.9892 12.8526 6.21932 12.3806 6.51442C11.889 5.70166 11.012 5.15767 10.0174 5.15767H9.91312C9.98262 5.37196 10.0174 5.55053 10.0174 5.7291C10.0174 7.01482 9.00956 8.01482 7.79322 8.01482C7.58471 8.01482 7.41095 8.01482 7.23718 7.94339V8.01482C7.23718 9.49173 8.26438 10.667 9.64451 10.8478C9.61985 11.0667 9.60718 11.2893 9.60718 11.5148C9.60718 11.8768 9.63982 12.2312 9.70231 12.5751C7.38348 12.4105 5.56907 10.4416 5.56907 8.01482ZM15.543 4.15767C16.1019 4.68782 16.5839 5.2544 16.9916 5.81235C18.1526 6.11518 19.1742 6.7632 19.9401 7.64022C19.9344 7.6221 19.9283 7.6041 19.9218 7.58625C19.4005 6.30053 18.3232 4.44339 16.6898 2.90767C15.0565 1.33624 12.7976 0.0148163 10.0174 0.0148163C7.20243 0.0148163 4.94353 1.33624 3.31016 2.90767C1.6768 4.44339 0.599479 6.30053 0.0781929 7.58625C-0.0260643 7.87196 -0.0260643 8.19339 0.0781929 8.4791C0.599479 9.7291 1.6768 11.5862 3.31016 13.1577C4.94353 14.7291 7.20243 16.0148 10.0174 16.0148C10.5453 16.0148 11.0545 15.9685 11.5441 15.8826C11.045 15.4302 10.6238 14.8935 10.3029 14.295C10.2085 14.2987 10.1133 14.3005 10.0174 14.3005C7.72372 14.3005 5.88184 13.2648 4.45699 11.9077C3.10165 10.622 2.19809 9.08625 1.71156 8.01482C2.19809 6.94339 3.10165 5.44339 4.45699 4.15767C5.88184 2.80053 7.72372 1.7291 10.0174 1.7291C12.2763 1.7291 14.1182 2.80053 15.543 4.15767ZM15.5 7.01482C13.0039 7.01482 11 9.0363 11 11.5148C11 14.0109 13.0039 16.0148 15.5 16.0148C17.9785 16.0148 20 14.0109 20 11.5148C20 9.0363 17.9785 7.01482 15.5 7.01482ZM17.5215 10.0558C17.7148 10.2492 17.7148 10.548 17.5215 10.7414L15.2715 12.9914C15.0781 13.1847 14.7793 13.1847 14.5859 12.9914L13.4609 11.8664C13.2676 11.673 13.2676 11.3742 13.4609 11.1808C13.6543 10.9875 13.9531 10.9875 14.1465 11.1808L14.9375 11.9543L16.8359 10.0558C17.0293 9.86247 17.3281 9.86247 17.5215 10.0558Z" fill="#212529"/>
+</svg>
diff --git a/src/assets/fonts/moodle/moodle/grade-partiallycorrect.svg b/src/assets/fonts/moodle/moodle/grade-partiallycorrect.svg
new file mode 100644
index 00000000000..6ea046bfc1a
--- /dev/null
+++ b/src/assets/fonts/moodle/moodle/grade-partiallycorrect.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.99995 0.924789C8.54359 0.924789 8.09547 0.962657 7.65871 1.03558C7.22292 1.10835 6.92862 1.52062 7.00139 1.95642C7.07416 2.39221 7.48643 2.6865 7.92222 2.61374C8.27225 2.55529 8.63223 2.52479 8.99995 2.52479C9.36767 2.52479 9.72766 2.55529 10.0777 2.61374C10.5135 2.6865 10.9257 2.39221 10.9985 1.95642C11.0713 1.52062 10.777 1.10835 10.3412 1.03558C9.90444 0.962657 9.45631 0.924789 8.99995 0.924789ZM5.23563 3.72731C5.59531 3.47072 5.67889 2.97113 5.4223 2.61144C5.16572 2.25175 4.66613 2.16818 4.30644 2.42476C3.57396 2.94729 2.93241 3.58883 2.40989 4.32132C2.1533 4.681 2.23688 5.18059 2.59657 5.43718C2.95625 5.69377 3.45584 5.61019 3.71243 5.2505C4.13204 4.66229 4.64741 4.14692 5.23563 3.72731ZM13.6935 2.42476C13.3338 2.16818 12.8342 2.25176 12.5776 2.61144C12.321 2.97113 12.4046 3.47072 12.7643 3.72731C13.3525 4.14692 13.8679 4.66229 14.2875 5.2505C14.5441 5.61019 15.0437 5.69377 15.4033 5.43718C15.763 5.18059 15.8466 4.68101 15.59 4.32132C15.0675 3.58883 14.4259 2.94729 13.6935 2.42476ZM2.59886 7.9371C2.67163 7.50131 2.37733 7.08904 1.94154 7.01627C1.50575 6.9435 1.09347 7.23779 1.02071 7.67359C0.947779 8.11034 0.909912 8.55847 0.909912 9.01483C0.909912 9.47119 0.947779 9.91931 1.02071 10.3561C1.09347 10.7919 1.50575 11.0862 1.94154 11.0134C2.37733 10.9406 2.67163 10.5283 2.59886 10.0926C2.54041 9.74253 2.50991 9.38255 2.50991 9.01483C2.50991 8.64711 2.54041 8.28712 2.59886 7.9371ZM16.9792 7.67359C16.9064 7.23779 16.4942 6.9435 16.0584 7.01627C15.6226 7.08904 15.3283 7.50131 15.401 7.9371C15.4595 8.28712 15.49 8.64711 15.49 9.01483C15.49 9.38255 15.4595 9.74253 15.401 10.0926C15.3283 10.5284 15.6226 10.9406 16.0584 11.0134C16.4942 11.0862 16.9064 10.7919 16.9792 10.3561C17.0521 9.91931 17.09 9.47119 17.09 9.01483C17.09 8.55847 17.0521 8.11034 16.9792 7.67359ZM3.71243 12.7792C3.45584 12.4195 2.95625 12.3359 2.59656 12.5925C2.23688 12.8491 2.1533 13.3487 2.40989 13.7083C2.93241 14.4408 3.57396 15.0824 4.30644 15.6049C4.66613 15.8615 5.16572 15.7779 5.4223 15.4182C5.67889 15.0585 5.59531 14.5589 5.23562 14.3024C4.64741 13.8827 4.13204 13.3674 3.71243 12.7792ZM15.59 13.7083C15.8466 13.3487 15.763 12.8491 15.4033 12.5925C15.0437 12.3359 14.5441 12.4195 14.2875 12.7792C13.8679 13.3674 13.3525 13.8827 12.7643 14.3024C12.4046 14.5589 12.321 15.0585 12.5776 15.4182C12.8342 15.7779 13.3338 15.8615 13.6935 15.6049C14.4259 15.0824 15.0675 14.4408 15.59 13.7083ZM7.92222 15.4159C7.48643 15.3432 7.07416 15.6374 7.00139 16.0732C6.92862 16.509 7.22291 16.9213 7.65871 16.9941C8.09547 17.067 8.54359 17.1049 8.99995 17.1049C9.45631 17.1049 9.90444 17.067 10.3412 16.9941C10.777 16.9213 11.0713 16.509 10.9985 16.0732C10.9257 15.6374 10.5135 15.3432 10.0777 15.4159C9.72766 15.4744 9.36767 15.5049 8.99995 15.5049C8.63223 15.5049 8.27225 15.4744 7.92222 15.4159ZM12.5656 7.58051C12.8781 7.26809 12.8781 6.76156 12.5656 6.44914C12.2532 6.13672 11.7467 6.13672 11.4343 6.44914L7.99995 9.88346L6.56564 8.44914C6.25322 8.13672 5.74669 8.13672 5.43427 8.44914C5.12185 8.76156 5.12185 9.2681 5.43427 9.58051L7.43427 11.5805C7.74669 11.8929 8.25322 11.8929 8.56564 11.5805L12.5656 7.58051Z" fill="#90682f"/>
+</svg>
diff --git a/src/assets/fonts/moodle/moodle/item.svg b/src/assets/fonts/moodle/moodle/item.svg
new file mode 100644
index 00000000000..2aff21e63bf
--- /dev/null
+++ b/src/assets/fonts/moodle/moodle/item.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 20 17" fill="none" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMid meet">
+<circle cx="10" cy="8.01482" r="2" fill="#212529"/>
+</svg>
diff --git a/src/assets/fonts/moodle/moodle/level.svg b/src/assets/fonts/moodle/moodle/level.svg
new file mode 100644
index 00000000000..ec71be13265
--- /dev/null
+++ b/src/assets/fonts/moodle/moodle/level.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 16 12" fill="none" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMid meet">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 1.41817C0 0.865883 0.447715 0.418168 1 0.418168C1.55228 0.418168 2 0.865883 2 1.41817V4.41817C2 4.97045 2.44772 5.41817 3 5.41817L12.5858 5.41817L10.0996 2.93198C9.7091 2.54146 9.7091 1.90829 10.0996 1.51777C10.4901 1.12724 11.1233 1.12724 11.5138 1.51777L15.7071 5.71106C15.8099 5.81381 15.8856 5.93336 15.9343 6.06086C15.9694 6.15255 15.9913 6.25072 15.9979 6.35309C16.0007 6.39643 16.0007 6.43991 15.9979 6.48325C15.9914 6.5854 15.9695 6.68338 15.9345 6.77491C15.8858 6.90262 15.81 7.02237 15.7071 7.12528L11.5138 11.3186C11.1233 11.7091 10.4901 11.7091 10.0996 11.3186C9.7091 10.928 9.7091 10.2949 10.0996 9.90436L12.5858 7.41817L3 7.41817C1.34315 7.41817 0 6.07502 0 4.41817V1.41817Z" fill="#212529"/>
+</svg>
diff --git a/src/core/features/policy/pages/acceptances/acceptances.html b/src/core/features/policy/pages/acceptances/acceptances.html
index f07e889b5ae..df4491848f7 100644
--- a/src/core/features/policy/pages/acceptances/acceptances.html
+++ b/src/core/features/policy/pages/acceptances/acceptances.html
@@ -66,12 +66,12 @@ <h1>{{ 'core.policy.policiesagreements' | translate }}</h1>
 <ng-template #policyTabletTemplate let-policy="policy" let-isPreviousVersion="isPreviousVersion">
     <tr [class.core-policy-previous-version]="isPreviousVersion">
         <td class="core-policy-title">
-            <ion-icon *ngIf="isPreviousVersion" name="fam-arrow-turn-down-right" aria-hidden="true" />
+            <ion-icon *ngIf="isPreviousVersion" name="moodle-level" aria-hidden="true" />
             <ion-icon *ngIf="!isPreviousVersion && policy.previousVersions.length" name="fas-chevron-right" flip-rtl
                 (ariaButtonClick)="toggle($event, policy)" class="expandable-status-icon"
                 [class.expandable-status-icon-expanded]="policy.expanded" [attr.aria-expanded]="policy.expanded"
                 [attr.aria-label]="(policy.expanded ? 'core.collapse' : 'core.expand') | translate" />
-            <ion-icon *ngIf="!isPreviousVersion && !policy.previousVersions.length" name="fas-circle" color="secondary"
+            <ion-icon *ngIf="!isPreviousVersion && !policy.previousVersions.length" name="moodle-item" color="secondary"
                 class="core-policy-icon-bullet" aria-hidden="true" />
 
             <a href="#" (click)="viewFullPolicy($event, policy)">{{ policy.name }}</a>
@@ -180,7 +180,7 @@ <h1>{{ 'core.policy.policiesagreements' | translate }}</h1>
 <ng-template #policyMobileTemplate let-policy="policy" let-isPreviousVersion="isPreviousVersion">
     <ion-item class="ion-text-wrap core-policy-title">
         <div slot="start">
-            <ion-icon *ngIf="isPreviousVersion" name="fam-arrow-turn-down-right" aria-hidden="true" />
+            <ion-icon *ngIf="isPreviousVersion" name="moodle-level" aria-hidden="true" />
             <ion-icon name="fas-chevron-right" flip-rtl (ariaButtonClick)="toggle($event, policy)" class="expandable-status-icon"
                 [class.expandable-status-icon-expanded]="policy.expanded" [attr.aria-expanded]="policy.expanded"
                 [attr.aria-label]="(policy.expanded ? 'core.collapse' : 'core.expand') | translate"
diff --git a/src/core/features/policy/pages/acceptances/acceptances.scss b/src/core/features/policy/pages/acceptances/acceptances.scss
index a597035655f..02a0ed23d0b 100644
--- a/src/core/features/policy/pages/acceptances/acceptances.scss
+++ b/src/core/features/policy/pages/acceptances/acceptances.scss
@@ -103,11 +103,6 @@
                 font-size: 1.125rem;
                 padding: 13px;
                 margin: 3px;
-
-                &.core-policy-icon-bullet {
-                    font-size: #{dynamic-font(6px)};
-                    width: 18px;
-                }
             }
 
         }
diff --git a/src/core/features/question/question.scss b/src/core/features/question/question.scss
index fe5726aa207..bbd8106d7ec 100644
--- a/src/core/features/question/question.scss
+++ b/src/core/features/question/question.scss
@@ -106,5 +106,7 @@
     .questioncorrectnessicon,
     .fa.icon.questioncorrectnessicon {
         font-size: var(--mdl-typography-icon-fontSize-md);
+        vertical-align: middle;
+        margin: 4px;
     }
 }
diff --git a/src/core/features/question/services/question-helper.ts b/src/core/features/question/services/question-helper.ts
index 1bc6e0cd91b..69d76d1a04d 100644
--- a/src/core/features/question/services/question-helper.ts
+++ b/src/core/features/question/services/question-helper.ts
@@ -810,6 +810,7 @@ export class CoreQuestionHelperProvider {
     getCorrectIcon(): IconData {
         if (CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('4.5')) {
             return {
+                font: 'font-awesome',
                 name: 'circle-check',
                 prefix: 'far',
                 library: 'regular',
@@ -817,6 +818,7 @@ export class CoreQuestionHelperProvider {
             };
         } else {
             return {
+                font: 'font-awesome',
                 name: 'check',
                 prefix: 'fas',
                 library: 'solid',
@@ -833,6 +835,7 @@ export class CoreQuestionHelperProvider {
     getIncorrectIcon(): IconData {
         if (CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('4.5')) {
             return {
+                font: 'font-awesome',
                 name: 'circle-xmark',
                 prefix: 'far',
                 library: 'regular',
@@ -840,6 +843,7 @@ export class CoreQuestionHelperProvider {
             };
         } else {
             return {
+                font: 'font-awesome',
                 name: 'xmark',
                 prefix: 'fas',
                 library: 'solid',
@@ -855,8 +859,17 @@ export class CoreQuestionHelperProvider {
      * @returns Icon data.
      */
     getPartiallyCorrectIcon(): IconData {
-        if (CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('4.5')) {
+        if (CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('5.0')) {
+            return {
+                font: 'moodle',
+                name: 'grade-partiallycorrect',
+                prefix: 'moodle',
+                library: 'moodle',
+                fullName: 'moodle-grade-partiallycorrect',
+            };
+        } else if (CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('4.5')) {
             return {
+                font: 'font-awesome',
                 name: 'circle-half-stroke',
                 prefix: 'fas',
                 library: 'solid',
@@ -864,6 +877,7 @@ export class CoreQuestionHelperProvider {
             };
         } else {
             return {
+                font: 'font-awesome',
                 name: 'square-check',
                 prefix: 'fas',
                 library: 'solid',
@@ -887,12 +901,15 @@ export class CoreQuestionHelperProvider {
             const incorrectIcon = this.getIncorrectIcon();
             const partiallyCorrectIcon = this.getPartiallyCorrectIcon();
             if ('src' in icon) {
-                if ((icon as HTMLImageElement).src.indexOf('correct') >= 0) {
-                    iconData = correctIcon;
-                    color = CoreIonicColorNames.SUCCESS;
+                if ((icon as HTMLImageElement).src.indexOf('grade_partiallycorrect') >= 0) {
+                    iconData = partiallyCorrectIcon;
+                    color = CoreIonicColorNames.WARNING;
                 } else if ((icon as HTMLImageElement).src.indexOf('incorrect') >= 0 ) {
                     iconData = incorrectIcon;
                     color = CoreIonicColorNames.DANGER;
+                } else if((icon as HTMLImageElement).src.indexOf('correct') >= 0) {
+                    iconData = correctIcon;
+                    color = CoreIonicColorNames.SUCCESS;
                 }
             } else {
                 if (icon.classList.contains(`fa-${partiallyCorrectIcon.name}`)) {
@@ -915,7 +932,7 @@ export class CoreQuestionHelperProvider {
             const newIcon: HTMLIonIconElement = document.createElement('ion-icon');
 
             newIcon.setAttribute('name', iconData.fullName);
-            newIcon.setAttribute('src', CoreIcons.getIconSrc('font-awesome', iconData.library, iconData.name));
+            newIcon.setAttribute('src', CoreIcons.getIconSrc(iconData.font, iconData.library, iconData.name));
             newIcon.className = `core-correct-icon ion-color ion-color-${color} questioncorrectnessicon`;
             newIcon.title = icon.title;
             newIcon.setAttribute('aria-label', icon.title);
@@ -1051,6 +1068,7 @@ export type CoreQuestionBehaviourCertaintyOption = CoreQuestionBehaviourButton &
  */
 type IconData = {
     name: string;
+    font: string;
     prefix: string;
     library: string;
     fullName: string;