From cace67bdcfae05605bbdafffcfcaf0b1789a19cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 14 May 2021 15:53:33 +0200
Subject: [PATCH 1/2] MOBILE-3563 workshop: Show submission button if late
 submission allowed

---
 .../index/addon-mod-assign-index.html         |  2 +-
 src/addons/mod/data/pages/index/index.html    |  2 +-
 .../index/addon-mod-workshop-index.html       | 47 +++++++++----------
 .../mod/workshop/components/index/index.ts    |  2 +-
 .../mod/workshop/pages/index/index.html       |  2 +-
 5 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 74bcc59ab..3a5789600 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -61,7 +61,7 @@
 
     <!-- User can view all submissions (teacher). -->
     <ng-container *ngIf="assign && canViewAllSubmissions">
-        <ion-list class="core-list-align-detail-right with-borders">
+        <ion-list class="core-list-align-detail-right">
             <ion-item class="ion-text-wrap" *ngIf="(groupInfo.separateGroups || groupInfo.visibleGroups)">
                 <ion-label id="addon-assign-groupslabel">
                     <ng-container *ngIf="groupInfo.separateGroups">{{'core.groupsseparate' | translate }}</ng-container>
diff --git a/src/addons/mod/data/pages/index/index.html b/src/addons/mod/data/pages/index/index.html
index cd9d63d28..d9d8edfcf 100644
--- a/src/addons/mod/data/pages/index/index.html
+++ b/src/addons/mod/data/pages/index/index.html
@@ -14,7 +14,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event)">
+    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index 0b14cbaa0..b2b61caa4 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -33,7 +33,7 @@
         (completionChanged)="onCompletionChange()">
     </core-course-module-info>
 
-    <ion-card class="with-borders" *ngIf="phases">
+    <ion-card *ngIf="phases">
         <ion-item button (click)="viewPhaseInfo()" detail="true">
             <ion-label>
                 <h2 class="ion-text-wrap">{{ phases[workshop!.phase].title }}</h2>
@@ -95,7 +95,7 @@
                 </ion-item>
             </ion-card>
 
-            <ion-card class="with-borders" *ngIf="userGrades">
+            <ion-card *ngIf="userGrades">
                 <ion-item-divider class="ion-text-wrap">
                     <ion-label><h2>{{ 'addon.mod_workshop.yourgrades' | translate }}</h2></ion-label>
                 </ion-item-divider>
@@ -128,30 +128,26 @@
         </ion-card>
 
         <ion-card *ngIf="canSubmit">
+            <ion-item-divider class="ion-text-wrap">
+                <ion-label>
+                    <h2 *ngIf="workshop!.phase != PHASE_CLOSED || !submission">
+                        {{ 'addon.mod_workshop.yoursubmission' | translate }}
+                    </h2>
+                    <h2 *ngIf="workshop!.phase == PHASE_CLOSED && submission">
+                        {{ 'addon.mod_workshop.yoursubmissionwithassessments' | translate }}
+                    </h2>
+                </ion-label>
+            </ion-item-divider>
             <ion-item class="ion-text-wrap" *ngIf="!submission">
                 <ion-label>
-                    <h2>{{ 'addon.mod_workshop.yoursubmission' | translate }}</h2>
-                    <p>{{ 'addon.mod_workshop.noyoursubmission' | translate }}</p>
+                    <p *ngIf="!submission">{{ 'addon.mod_workshop.noyoursubmission' | translate }}</p>
                 </ion-label>
             </ion-item>
+            <addon-mod-workshop-submission *ngIf="submission" [submission]="submission" [courseId]="workshop!.course" [module]="module"
+                [workshop]="workshop" [access]="access">
+            </addon-mod-workshop-submission>
 
-            <ng-container *ngIf="submission">
-                <ion-item-divider class="ion-text-wrap">
-                    <ion-label>
-                        <h2 *ngIf="workshop!.phase != PHASE_CLOSED">{{ 'addon.mod_workshop.yoursubmission' | translate }}</h2>
-                        <h2 *ngIf="workshop!.phase == PHASE_CLOSED">
-                            {{ 'addon.mod_workshop.yoursubmissionwithassessments' | translate }}
-                        </h2>
-                    </ion-label>
-                </ion-item-divider>
-                <addon-mod-workshop-submission [submission]="submission" [courseId]="workshop!.course" [module]="module"
-                    [workshop]="workshop" [access]="access">
-                </addon-mod-workshop-submission>
-            </ng-container>
-        </ion-card>
-
-        <!-- Show only on current phase -->
-        <ng-container *ngIf="workshop!.phase == PHASE_SUBMISSION">
+            <!-- Show only on current phase -->
             <ion-item class="ion-text-wrap" *ngIf="showSubmit">
                 <ion-label>
                     <ion-button expand="block" *ngIf="access.creatingsubmissionallowed && !submission" (click)="gotoSubmit()">
@@ -164,10 +160,11 @@
                     </ion-button>
                 </ion-label>
             </ion-item>
-        </ng-container>
+        </ion-card>
+
 
         <ng-container *ngIf="workshop!.phase >= PHASE_CLOSED">
-            <ion-card class="with-borders" *ngIf="publishedSubmissions && publishedSubmissions.length">
+            <ion-card *ngIf="publishedSubmissions && publishedSubmissions.length">
                 <ion-item-divider class="ion-text-wrap">
                     <ion-label><h2>{{ 'addon.mod_workshop.publishedsubmissions' | translate }}</h2></ion-label>
                 </ion-item-divider>
@@ -193,7 +190,7 @@
                 </ion-item>
             </ion-card>
 
-            <ion-card class="with-borders" *ngIf="canAssess">
+            <ion-card *ngIf="canAssess">
                 <ion-item-divider class="ion-text-wrap">
                     <ion-label><h2>{{ 'addon.mod_workshop.assignedassessments' | translate }}</h2></ion-label>
                 </ion-item-divider>
@@ -210,7 +207,7 @@
         </ng-container>
 
         <!-- MULTIPLE PHASES SUBMISSION OR GREATER only teachers -->
-        <ion-card class="with-borders" *ngIf="access.canviewallsubmissions && workshop!.phase >= PHASE_SUBMISSION &&
+        <ion-card *ngIf="access.canviewallsubmissions && workshop!.phase >= PHASE_SUBMISSION &&
             ((grades && grades.length) || (groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)))">
             <ion-item-divider class="ion-text-wrap">
                 <ion-label>
diff --git a/src/addons/mod/workshop/components/index/index.ts b/src/addons/mod/workshop/components/index/index.ts
index 4f3717f4a..d47607361 100644
--- a/src/addons/mod/workshop/components/index/index.ts
+++ b/src/addons/mod/workshop/components/index/index.ts
@@ -434,7 +434,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
             this.phases![AddonModWorkshopPhase.PHASE_SUBMISSION].tasks,
         );
 
-        this.showSubmit = this.workshop!.phase == AddonModWorkshopPhase.PHASE_SUBMISSION && this.canSubmit &&
+        this.showSubmit = this.canSubmit &&
             ((this.access!.creatingsubmissionallowed && !this.submission) ||
                 (this.access!.modifyingsubmissionallowed && !!this.submission));
 
diff --git a/src/addons/mod/workshop/pages/index/index.html b/src/addons/mod/workshop/pages/index/index.html
index 4c9704015..fded8cdc1 100644
--- a/src/addons/mod/workshop/pages/index/index.html
+++ b/src/addons/mod/workshop/pages/index/index.html
@@ -13,7 +13,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event)">
+    <ion-refresher slot="fixed" [disabled]="!activityComponent?.loaded" (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 

From 45ca30cfadeb6e1dd58dc6cea4d2f642f29ed81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 14 May 2021 17:08:41 +0200
Subject: [PATCH 2/2] MOBILE-3563 more: Add custom colors to more page

---
 src/core/features/mainmenu/pages/more/more.scss | 17 +++++++++++++++++
 src/core/features/mainmenu/pages/more/more.ts   |  1 +
 src/theme/globals.variables.scss                |  3 +++
 src/theme/theme.light.scss                      |  7 +++++++
 4 files changed, 28 insertions(+)
 create mode 100644 src/core/features/mainmenu/pages/more/more.scss

diff --git a/src/core/features/mainmenu/pages/more/more.scss b/src/core/features/mainmenu/pages/more/more.scss
new file mode 100644
index 000000000..ce358f133
--- /dev/null
+++ b/src/core/features/mainmenu/pages/more/more.scss
@@ -0,0 +1,17 @@
+ion-item {
+	--border-color: var(--core-more-item-border,
+        var(--ion-item-border-color,
+        var(--ion-border-color,
+        var(--ion-color-step-150,
+        rgba(0, 0, 0, 0.13)))));
+
+    ion-icon {
+        color: var(--core-more-icon, rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.54));
+    }
+}
+
+:host-context(ion-app.ios) {
+    ion-item ion-icon {
+        color: var(--core-more-icon, inherit);
+    }
+}
diff --git a/src/core/features/mainmenu/pages/more/more.ts b/src/core/features/mainmenu/pages/more/more.ts
index 42dafbdfb..6eb72b24d 100644
--- a/src/core/features/mainmenu/pages/more/more.ts
+++ b/src/core/features/mainmenu/pages/more/more.ts
@@ -34,6 +34,7 @@ import { Translate } from '@singletons';
 @Component({
     selector: 'page-core-mainmenu-more',
     templateUrl: 'more.html',
+    styleUrls: ['more.scss'],
 })
 export class CoreMainMenuMorePage implements OnInit, OnDestroy {
 
diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss
index deecb2f0a..d4d9c27fd 100644
--- a/src/theme/globals.variables.scss
+++ b/src/theme/globals.variables.scss
@@ -250,3 +250,6 @@ $addon-forum-highlight-color: $gray-lighter !default;
 
 $addon-forum-border-color-dark: $gray-darker !default;
 $addon-forum-highlight-color-dark: $gray-dark !default;
+
+$core-more-icon: null !default;
+$core-more-item-border: null !default;
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 291a0a027..a691002fa 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -244,4 +244,11 @@
 
     --core-dd-question-selected-shadow: 2px 2px 4px var(--gray-dark);
 
+    @if ($core-more-icon) {
+        --core-more-icon: #{$core-more-icon};
+    }
+
+    @if ($core-more-item-border) {
+        --core-more-item-border: #{$core-more-item-border};
+    }
 }