From 39b9d1700d2cff171079d469de55932a0ab97bd6 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Tue, 6 Aug 2019 13:46:48 +0200
Subject: [PATCH] MOBILE-3021 calendar: Don't show "There are no events" while
 loading data

---
 src/addon/calendar/pages/day/day.html | 62 ++++++++++++++-------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/addon/calendar/pages/day/day.html b/src/addon/calendar/pages/day/day.html
index 0ef39ef72..083bdd315 100644
--- a/src/addon/calendar/pages/day/day.html
+++ b/src/addon/calendar/pages/day/day.html
@@ -38,37 +38,39 @@
         </ion-row>
     </ion-grid>
 
-    <!-- There is data to be synchronized -->
-    <ion-card class="core-warning-card" icon-start *ngIf="hasOffline">
-        <ion-icon name="warning"></ion-icon> {{ 'core.hasdatatosync' | translate:{$a: 'core.day' | translate} }}
-    </ion-card>
+    <core-loading [hideUntil]="loaded">
+        <!-- There is data to be synchronized -->
+        <ion-card class="core-warning-card" icon-start *ngIf="hasOffline">
+            <ion-icon name="warning"></ion-icon> {{ 'core.hasdatatosync' | translate:{$a: 'core.day' | translate} }}
+        </ion-card>
 
-    <core-empty-box *ngIf="!filteredEvents || !filteredEvents.length" icon="calendar" [message]="'addon.calendar.noevents' | translate">
-    </core-empty-box>
+        <core-empty-box *ngIf="!filteredEvents || !filteredEvents.length" icon="calendar" [message]="'addon.calendar.noevents' | translate">
+        </core-empty-box>
 
-    <ion-list *ngIf="filteredEvents && filteredEvents.length" no-margin>
-        <ng-container *ngFor="let event of filteredEvents">
-            <a ion-item text-wrap [title]="event.name" (click)="gotoEvent(event.id)" [class.core-split-item-selected]="event.id == eventId">
-                <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" item-start class="core-module-icon">
-                <core-icon *ngIf="event.icon && !event.moduleIcon" [name]="event.icon" item-start></core-icon>
-                <h2><core-format-text [text]="event.name"></core-format-text></h2>
-                <p><core-format-text [text]="event.formattedtime"></core-format-text></p>
-                <ion-note *ngIf="event.offline && !event.deleted" item-end>
-                    <ion-icon name="time"></ion-icon>
-                    <span text-wrap>{{ 'core.notsent' | translate }}</span>
-                </ion-note>
-                <ion-note *ngIf="event.deleted" item-end>
-                    <ion-icon name="trash"></ion-icon>
-                    <span text-wrap>{{ 'core.deletedoffline' | translate }}</span>
-                </ion-note>
-            </a>
-        </ng-container>
-    </ion-list>
+        <ion-list *ngIf="filteredEvents && filteredEvents.length" no-margin>
+            <ng-container *ngFor="let event of filteredEvents">
+                <a ion-item text-wrap [title]="event.name" (click)="gotoEvent(event.id)">
+                    <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" item-start class="core-module-icon">
+                    <core-icon *ngIf="event.icon && !event.moduleIcon" [name]="event.icon" item-start></core-icon>
+                    <h2><core-format-text [text]="event.name"></core-format-text></h2>
+                    <p><core-format-text [text]="event.formattedtime"></core-format-text></p>
+                    <ion-note *ngIf="event.offline && !event.deleted" item-end>
+                        <ion-icon name="time"></ion-icon>
+                        <span text-wrap>{{ 'core.notsent' | translate }}</span>
+                    </ion-note>
+                    <ion-note *ngIf="event.deleted" item-end>
+                        <ion-icon name="trash"></ion-icon>
+                        <span text-wrap>{{ 'core.deletedoffline' | translate }}</span>
+                    </ion-note>
+                </a>
+            </ng-container>
+        </ion-list>
 
-    <!-- Create a calendar event. -->
-    <ion-fab core-fab bottom end *ngIf="canCreate">
-        <button ion-fab (click)="openEdit()" [attr.aria-label]="'addon.calendar.newevent' | translate">
-            <ion-icon name="add"></ion-icon>
-        </button>
-    </ion-fab>
+        <!-- Create a calendar event. -->
+        <ion-fab core-fab bottom end *ngIf="canCreate">
+            <button ion-fab (click)="openEdit()" [attr.aria-label]="'addon.calendar.newevent' | translate">
+                <ion-icon name="add"></ion-icon>
+            </button>
+        </ion-fab>
+    </core-loading>
 </ion-content>