From 1310c712f531d809007e908e51a31e2c78d7f6db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 1 Jul 2021 12:17:26 +0200
Subject: [PATCH 1/2] MOBILE-3320 styles: Improve action sheet title style

---
 src/theme/theme.base.scss  | 10 +++++++---
 src/theme/theme.light.scss |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index adb9cf7f8..348792be8 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -570,12 +570,12 @@ ion-toolbar h1 .core-bar-button-image img {
 // Action sheet.
 .md ion-action-sheet {
     .action-sheet-group-cancel {
-        -webkit-filter: drop-shadow(0px 3px 3px rgba(var(--action-sheet-shadow-color)));
-        filter: drop-shadow(0px 3px 3px rgba(var(--action-sheet-shadow-color)));
+        -webkit-filter: drop-shadow(0px 3px 6px rgba(var(--drop-shadow)));
+        filter: drop-shadow(0px 3px 6px rgba(var(--drop-shadow)));
     }
 
     .action-sheet-title {
-        border-bottom: 1px solid var(--title-border-color);
+        border-bottom: 2px solid var(--title-border-color);
     }
 }
 
@@ -583,6 +583,10 @@ ion-toolbar h1 .core-bar-button-image img {
     .action-sheet-title {
         font-size: 16px;
     }
+
+    .action-sheet-title {
+        border-bottom: 2px solid var(--title-border-color);
+    }
 }
 
 // Radio.
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 709e40895..1800dc330 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -146,10 +146,11 @@
     ion-action-sheet {
         --button-color: var(--ion-text-color);
         --button-color-selected: var(--ion-text-color);
-        --title-border-color: var(--gray);
+        --title-border-color: var(--brand-color);
 
         .action-sheet-title {
             --color: var(--ion-text-color);
+            font-weight: bold;
         }
 
         @media (min-height: 500px) {

From f5a2d6114980027838abfab69d6cd494cb6e08c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 1 Jul 2021 14:19:53 +0200
Subject: [PATCH 2/2] MOBILE-3320 forum: Fix message inline file prefetch

---
 src/addons/mod/forum/services/handlers/prefetch.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/addons/mod/forum/services/handlers/prefetch.ts b/src/addons/mod/forum/services/handlers/prefetch.ts
index 722fd004b..7b7f62dbb 100644
--- a/src/addons/mod/forum/services/handlers/prefetch.ts
+++ b/src/addons/mod/forum/services/handlers/prefetch.ts
@@ -15,7 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/activity-prefetch-handler';
 import { AddonModForum, AddonModForumData, AddonModForumPost, AddonModForumProvider } from '../forum';
-import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
+import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreFilepool } from '@services/filepool';
 import { CoreWSFile } from '@services/ws';
 import { CoreCourse, CoreCourseAnyModuleData, CoreCourseCommonModWSOptions } from '@features/course/services/course';
@@ -71,15 +71,15 @@ export class AddonModForumPrefetchHandlerService extends CoreCourseActivityPrefe
      */
     protected getPostsFiles(posts: AddonModForumPost[]): CoreWSFile[] {
         let files: CoreWSFile[] = [];
-        const getInlineFiles = CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.2');
 
         posts.forEach((post) => {
             if (post.attachments && post.attachments.length) {
                 files = files.concat(post.attachments as CoreWSFile[]);
             }
-            if (getInlineFiles && post.messageinlinefiles && post.messageinlinefiles.length) {
+
+            if (post.messageinlinefiles) {
                 files = files.concat(post.messageinlinefiles);
-            } else if (post.message && !getInlineFiles) {
+            } else if (post.message) {
                 files = files.concat(CoreFilepool.extractDownloadableFilesFromHtmlAsFakeFileObjects(post.message));
             }
         });