From 1e1210e9e349f4c1fd4db6afcec867a8dd401414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 13 Mar 2024 12:24:48 +0100
Subject: [PATCH 1/2] MOBILE-4544 styles: Fix modal sheet handle color

---
 src/theme/theme.base.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 25b28b996..e80b93dbc 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1965,6 +1965,10 @@ ion-modal {
             display: none;
         }
     }
+
+    &.modal-sheet::part(handle) {
+        background: var(--core-header-buttons-color);
+    }
 }
 
 ion-popover {

From f16ee024aacca7162ad4b89457d18f4ea0c2fe39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 13 Mar 2024 13:25:57 +0100
Subject: [PATCH 2/2] MOBILE-4544 timer: Add timerHiddenPreferenceName to set
 visibility pref

---
 src/addons/mod/quiz/pages/player/player.html |  5 +--
 src/core/components/timer/core-timer.html    |  2 +-
 src/core/components/timer/timer.ts           | 33 ++++++++++++++++++--
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/addons/mod/quiz/pages/player/player.html b/src/addons/mod/quiz/pages/player/player.html
index aef418478..1e0753e79 100644
--- a/src/addons/mod/quiz/pages/player/player.html
+++ b/src/addons/mod/quiz/pages/player/player.html
@@ -21,8 +21,9 @@
             </ion-button>
         </ion-buttons>
     </ion-toolbar>
-    <core-timer *ngIf="loaded && endTime && questions.length && !quizAborted && !showSummary" [endTime]="endTime" (finished)="timeUp()"
-        [timerText]="'addon.mod_quiz.timeleft' | translate" [hiddable]="true" />
+    <core-timer *ngIf="endTime && questions.length && !quizAborted && !showSummary" [endTime]="endTime" (finished)="timeUp()"
+        [timerText]="'addon.mod_quiz.timeleft' | translate" [hidable]="true" [hidden]="!loaded"
+        timerHiddenPreferenceName="quiz_timerhidden" />
 </ion-header>
 <ion-content class="limited-width">
     <core-loading [hideUntil]="loaded" class="has-spacer">
diff --git a/src/core/components/timer/core-timer.html b/src/core/components/timer/core-timer.html
index 1ad29de84..705d12f01 100644
--- a/src/core/components/timer/core-timer.html
+++ b/src/core/components/timer/core-timer.html
@@ -18,7 +18,7 @@
                 </span>
             </div>
 
-            <div *ngIf="hiddable" class="core-timer-visibility">
+            <div *ngIf="hidable" class="core-timer-visibility">
                 ( <button class="as-link" *ngIf="showTimeLeft" (click)="toggleTimeLeftVisibility()">{{ 'core.hide' | translate }}</button>
                 <button class="as-link" *ngIf="!showTimeLeft" (click)="toggleTimeLeftVisibility()">{{ 'core.show' | translate }}</button> )
             </div>
diff --git a/src/core/components/timer/timer.ts b/src/core/components/timer/timer.ts
index 9350fce02..eefe50a37 100644
--- a/src/core/components/timer/timer.ts
+++ b/src/core/components/timer/timer.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Component, Input, Output, EventEmitter, OnInit, OnDestroy, ElementRef } from '@angular/core';
+import { CoreUser } from '@features/user/services/user';
 
 import { CoreTimeUtils } from '@services/utils/time';
 
@@ -34,12 +35,18 @@ export class CoreTimerComponent implements OnInit, OnDestroy {
     @Input() timeLeftClass?: string; // Name of the class to apply with each second. By default, 'core-timer-timeleft-'.
     @Input() timeLeftClassThreshold = 100; // Number of seconds to start adding the timeLeftClass. Set it to -1 to not add it.
     @Input() align = 'start'; // Where to align the time and text. Defaults to 'start'. Other values: 'center', 'end'.
-    @Input() hiddable = false; // Whether the user can hide the time left.
+    @Input() hidable = false; // Whether the user can hide the time left.
     @Input() timeUpText?: string; // Text to show when the timer reaches 0. If not defined, 'core.timesup'.
     @Input() mode: CoreTimerMode = CoreTimerMode.ITEM; // How to display data.
     @Input() underTimeClassThresholds = []; // Number of seconds to add the class 'core-timer-under-'.
+    @Input() timerHiddenPreferenceName?: string; // Name of the preference to store the timer visibility.
     @Output() finished = new EventEmitter<void>(); // Will emit an event when the timer reaches 0.
 
+    /**
+     * @deprecated since 4.4. Use hidable instead.
+     */
+    @Input() hiddable?: boolean; // Whether the user can hide the time left.
+
     timeLeft?: number; // Seconds left to end.
     modeBasic = CoreTimerMode.BASIC;
     showTimeLeft = true;
@@ -54,7 +61,13 @@ export class CoreTimerComponent implements OnInit, OnDestroy {
     /**
      * @inheritdoc
      */
-    ngOnInit(): void {
+    async ngOnInit(): Promise<void> {
+        // eslint-disable-next-line deprecation/deprecation
+        if (this.hiddable !== undefined && this.hidable === undefined) {
+            // eslint-disable-next-line deprecation/deprecation
+            this.hidable = this.hiddable;
+        }
+
         const timeLeftClass = this.timeLeftClass || 'core-timer-timeleft-';
         const endTime = Math.round(this.endTime);
         this.underTimeClassThresholds.sort((a, b) => a - b); // Sort by increase order.
@@ -66,6 +79,16 @@ export class CoreTimerComponent implements OnInit, OnDestroy {
             this.align = 'end';
         }
 
+        if (this.hidable && this.timerHiddenPreferenceName) {
+            try {
+                const hidden = await CoreUser.getUserPreference(this.timerHiddenPreferenceName);
+
+                this.showTimeLeft = hidden !== '1';
+            } catch{
+                // Ignore errors.
+            }
+        }
+
         let container: HTMLElement | undefined;
 
         // Check time left every 200ms.
@@ -74,7 +97,7 @@ export class CoreTimerComponent implements OnInit, OnDestroy {
             this.timeLeft = Math.max(endTime - CoreTimeUtils.timestamp(), 0);
 
             if (this.timeLeft <= 100) {
-                this.hiddable = false;
+                this.hidable = false;
                 this.showTimeLeft = true;
             }
 
@@ -118,6 +141,10 @@ export class CoreTimerComponent implements OnInit, OnDestroy {
      */
     toggleTimeLeftVisibility(): void {
         this.showTimeLeft = !this.showTimeLeft;
+
+        if (this.hidable && this.timerHiddenPreferenceName) {
+            CoreUser.setUserPreference(this.timerHiddenPreferenceName, this.showTimeLeft ? '0' : '1');
+        }
     }
 
     /**