From a98baa3ce93befb8c82f812926e5cbbf503cc690 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 2 Jun 2021 10:30:10 +0200
Subject: [PATCH 1/2] MOBILE-3765 about: Add link to feedback form

---
 scripts/langindex.json                            | 1 +
 src/core/features/settings/lang.json              | 1 +
 src/core/features/settings/pages/about/about.html | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index c2cbfdb35..044c28f95 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2096,6 +2096,7 @@
   "core.settings.fontsizecharacter": "block_accessibility/char",
   "core.settings.forcedsetting": "local_moodlemobileapp",
   "core.settings.general": "moodle",
+  "core.settings.helpusimprove": "local_moodlemobileapp",
   "core.settings.ioscookies": "local_moodlemobileapp",
   "core.settings.ioscookiesdescription": "local_moodlemobileapp",
   "core.settings.language": "moodle",
diff --git a/src/core/features/settings/lang.json b/src/core/features/settings/lang.json
index b1580a355..81a87ded2 100644
--- a/src/core/features/settings/lang.json
+++ b/src/core/features/settings/lang.json
@@ -42,6 +42,7 @@
     "fontsizecharacter": "A",
     "forcedsetting": "This setting has been forced by your site configuration.",
     "general": "General",
+    "helpusimprove": "Help us improve this app",
     "ioscookies": "Cross-Website Tracking",
     "ioscookiesdescription": "Embedded content from the site might require cross-site cookies to work. To enable it, please go to the app's iOS settings and enable 'Allow Cross-Website Tracking'.",
     "language": "Language",
diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index c0fca1aee..9435d438d 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -25,4 +25,8 @@
         <ion-icon name="fas-mobile" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>{{ 'core.settings.deviceinfo' | translate }}</ion-label>
     </ion-item>
+    <ion-item button class="ion-text-wrap" href="https://feedback.moodle.org/mobileapp" core-link detail="true">
+        <ion-icon name="fas-bullhorn" slot="start" aria-hidden="true"></ion-icon>
+        <ion-label>{{ 'core.settings.helpusimprove' | translate }}</ion-label>
+    </ion-item>
 </ion-content>

From 7c9dcf4932ec0b1980ffcba4c8ef58370e1b627d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 2 Jun 2021 11:59:31 +0200
Subject: [PATCH 2/2] MOBILE-3765 UX: Change item icon in external links

---
 .../features/mainmenu/pages/more/more.html    |  7 ++++---
 .../features/settings/pages/about/about.html  | 19 ++++++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/core/features/mainmenu/pages/more/more.html b/src/core/features/mainmenu/pages/more/more.html
index cba182921..f13caba8c 100644
--- a/src/core/features/mainmenu/pages/more/more.html
+++ b/src/core/features/mainmenu/pages/more/more.html
@@ -41,7 +41,8 @@
             </ion-item>
             <ng-container *ngFor="let item of customItems">
                 <ion-item button *ngIf="item.type != 'embedded'" [href]="item.url" [attr.aria-label]="item.label" core-link
-                    [capture]="item.type == 'app'" [inApp]="item.type == 'inappbrowser'" class="core-moremenu-customitem" detail="true">
+                    [capture]="item.type == 'app'" [inApp]="item.type == 'inappbrowser'" class="core-moremenu-customitem" detail="true"
+                    [detailIcon]="item.type == 'browser' ? 'open-outline' : null">
                     <ion-icon [name]="item.icon" slot="start" aria-hidden="true"></ion-icon>
                     <ion-label>
                         <p class="item-heading">{{item.label}}</p>
@@ -62,14 +63,14 @@
                 </ion-label>
             </ion-item>
             <ion-item button *ngIf="showWeb && siteInfo" [href]="siteInfo.siteurl" core-link autoLogin="yes"
-                [attr.aria-label]="'core.mainmenu.website' | translate" detail="true">
+                [attr.aria-label]="'core.mainmenu.website' | translate" detail="true" detailIcon="open-outline">
                 <ion-icon name="fas-globe" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <p class="item-heading">{{ 'core.mainmenu.website' | translate }}</p>
                 </ion-label>
             </ion-item>
             <ion-item button *ngIf="showHelp" [href]="docsUrl" core-link autoLogin="no"
-                [attr.aria-label]="'core.mainmenu.help' | translate" detail="true">
+                [attr.aria-label]="'core.mainmenu.help' | translate" detail="true" detailIcon="open-outline">
                 <ion-icon name="far-life-ring" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <p class="item-heading">{{ 'core.mainmenu.help' | translate }}</p>
diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index 9435d438d..29a58aefc 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -17,15 +17,24 @@
         <ion-icon name="far-copyright" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>{{ 'core.settings.opensourcelicenses' | translate }}</ion-label>
     </ion-item>
-    <ion-item button class="ion-text-wrap" *ngIf="privacyPolicy" [href]="privacyPolicy" core-link auto-login="no" detail="true">
-        <ion-icon name="fas-user-shield" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>{{ 'core.settings.privacypolicy' | translate }}</ion-label>
-    </ion-item>
     <ion-item button class="ion-text-wrap" (click)="openPage('deviceinfo')" detail="true">
         <ion-icon name="fas-mobile" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>{{ 'core.settings.deviceinfo' | translate }}</ion-label>
     </ion-item>
-    <ion-item button class="ion-text-wrap" href="https://feedback.moodle.org/mobileapp" core-link detail="true">
+    <ion-item
+        *ngIf="privacyPolicy"
+        class="ion-text-wrap"
+        button core-link auto-login="no" [href]="privacyPolicy"
+        detail="true" detailIcon="open-outline"
+    >
+        <ion-icon name="fas-user-shield" slot="start" aria-hidden="true"></ion-icon>
+        <ion-label>{{ 'core.settings.privacypolicy' | translate }}</ion-label>
+    </ion-item>
+    <ion-item
+        class="ion-text-wrap"
+        button core-link href="https://feedback.moodle.org/mobileapp"
+        detail="true" detailIcon="open-outline"
+    >
         <ion-icon name="fas-bullhorn" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>{{ 'core.settings.helpusimprove' | translate }}</ion-label>
     </ion-item>