Change icon and splash. Add loading service

src/app/modals/reader/reader.page.html

@@ -21,7 +21,7 @@
 
 
 <ion-content (click)="setShowBar()">
-  <app-loading-spinner-component *ngIf="loading"></app-loading-spinner-component>
+
   <ion-list #leitor (click)="setShowBar()">
     <ion-item (click)="setShowBar()" *ngFor="let item of data;index as i;">{{item.conteudo}}</ion-item>
 

src/app/modals/reader/reader.page.ts

@@ -1,6 +1,7 @@
 import { AfterViewInit, Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
 import { Gesture, GestureController, ModalController } from '@ionic/angular';
 import { StatusBar, Style } from '@capacitor/status-bar';
+import { LoadingService } from 'src/app/services/loading.service';
 
 @Component({
   selector: 'app-reader',
@@ -17,7 +18,8 @@ export class ReaderPage implements AfterViewInit {
   loading=true
   constructor(
     private gestureCtrl: GestureController,
-    private modalController: ModalController
+    private modalController: ModalController,
+    public loadingService: LoadingService
   ) { }
   start=0
   end=0
@@ -51,7 +53,7 @@ export class ReaderPage implements AfterViewInit {
 
     })
     this.data=this.source.readNovel(this.chapter.link)
-    setTimeout(()=>this.loading=false,2000)  
+    this.loadingService.presentLoading(this.data) 
     gesture.enable();
   }
 

src/app/pages/novel-page/novel-page.page.html

@@ -20,7 +20,7 @@
       <p>Adicionar a Biblioteca</p>
     </ion-buttons>
   </div>
-  <app-loading-spinner-component *ngIf="loading"></app-loading-spinner-component>
+
 
   <ion-list >
     <ion-item *ngFor="let item of chapters;index as i;" (click)="openReader(item)" class="ion-activatable ripple-parent">

src/app/pages/novel-page/novel-page.page.ts

@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ModalController, NavController } from '@ionic/angular';
 import { ReaderPage } from 'src/app/modals/reader/reader.page';
+import { LoadingService } from 'src/app/services/loading.service';
 
 @Component({
   selector: 'app-novel-page',
@@ -18,11 +19,26 @@ export class NovelPagePage implements OnInit {
     public modalController: ModalController,
     private route: ActivatedRoute, 
     private router: Router,
-    public nav: NavController
+    public nav: NavController,
+    public loadingService: LoadingService
   ) { }
   addLibrary(){
     this.library=!this.library
   }
+  testLoading(data){
+    if(data.length>0){
+      this.loading=false
+
+    }else{
+      setTimeout(()=>{
+        if(data.length>0){
+          this.loading=false
+
+        }
+      },2000)
+    }
+
+  }
 
   async openReader(item) {
     const modal = await this.modalController.create({
@@ -44,7 +60,8 @@ export class NovelPagePage implements OnInit {
         let caminho=this.router.getCurrentNavigation().extras.state.item.caminho
         this.chapters=this.router.getCurrentNavigation().extras.state.source.getChapters(caminho)
         this.source=this.router.getCurrentNavigation().extras.state.source
-        setTimeout(()=>this.loading=false,2000)
+
+        this.loadingService.presentLoading(this.chapters)
       }
     });
   }

src/app/pages/novels-page/novels-page.page.html

@@ -27,7 +27,7 @@
     <div #item style="height: 60px;">
 
     </div>
-    <app-loading-spinner-component *ngIf="loading"></app-loading-spinner-component>
+
 
     <ion-list  class="listNovels" #content>    
 

src/app/pages/novels-page/novels-page.page.scss

@@ -35,4 +35,4 @@ ion-card {
 ion-img{
     width: 100%;
     border-radius: 100px;
-}
+}

src/app/pages/novels-page/novels-page.page.ts

@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NavController } from '@ionic/angular';
 import { NovelDTO } from 'src/app/models/novel.dto';
+import { LoadingService } from 'src/app/services/loading.service';
 
 @Component({
   selector: 'app-novels-page',
@@ -18,7 +19,8 @@ export class NovelsPagePage implements OnInit {
   constructor(
     private route: ActivatedRoute, 
     private router: Router,
-    public nav: NavController
+    public nav: NavController,
+    public loadingService: LoadingService
   ) { 
 
 
@@ -37,6 +39,23 @@ export class NovelsPagePage implements OnInit {
 
 
   }
+  testLoading(data){
+    if(data.length>0){
+      this.loading=false
+
+    }else{
+      setTimeout(()=>{
+        if(data.length>0){
+          this.loading=false
+
+        }
+      },2000)
+    }
+
+  }
+
+
+
 
   ngOnInit() {
 
@@ -46,8 +65,10 @@ export class NovelsPagePage implements OnInit {
       if (this.router.getCurrentNavigation().extras.state) {
         this.scan = this.router.getCurrentNavigation().extras.state.scan.nome;
         this.source=this.router.getCurrentNavigation().extras.state.scan.source
-        this.obras=this.router.getCurrentNavigation().extras.state.scan.source.getAllNovels()        
-        setTimeout(()=>this.loading=false,2000)
+        this.obras=this.router.getCurrentNavigation().extras.state.scan.source.getAllNovels()
+
+        this.loadingService.presentLoading(this.obras)
+
 
 
       }

src/app/services/loading.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { LoadingService } from './loading.service';
+
+describe('LoadingService', () => {
+  let service: LoadingService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(LoadingService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/services/loading.service.ts

@@ -0,0 +1,61 @@
+import { Injectable } from '@angular/core';
+import { LoadingController } from '@ionic/angular';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class LoadingService {
+
+  constructor(public loadingController: LoadingController) { }
+
+  async presentLoading(data) {
+    const loading = await this.loadingController.create({
+      cssClass: 'my-custom-class',
+      message: 'Please wait...',
+
+    });
+    await loading.present();
+
+    if(data.length>0){
+      await loading.dismiss();
+    }else{
+      setTimeout(async()=>{
+        if(data.length>0){
+          await loading.dismiss();    
+        }else{
+          setTimeout(async()=>{
+            if(data.length>0){
+              await loading.dismiss();    
+            }else{
+              setTimeout(async()=>{
+                if(data.length>0){
+                  await loading.dismiss();    
+                }else{
+                  setTimeout(async()=>{
+
+                    await loading.dismiss();    
+
+                  },2000)
+                }
+              },2000)
+            }
+          },2000)
+        }
+      },2000)
+    }
+  }
+  testLoading(data){
+    if(data.length>0){
+
+
+    }else{
+      setTimeout(()=>{
+        if(data.length>0){
+
+
+        }
+      },2000)
+    }
+
+  }
+}