diff --git a/src/app/ar-fan-cam/ar-fan-cam.page.html b/src/app/ar-fan-cam/ar-fan-cam.page.html index d3cab13..5877f8b 100644 --- a/src/app/ar-fan-cam/ar-fan-cam.page.html +++ b/src/app/ar-fan-cam/ar-fan-cam.page.html @@ -2,6 +2,8 @@ +
Loading Camera...
+
diff --git a/src/app/ar-fan-cam/ar-fan-cam.page.ts b/src/app/ar-fan-cam/ar-fan-cam.page.ts index b1010ed..92f3bb5 100644 --- a/src/app/ar-fan-cam/ar-fan-cam.page.ts +++ b/src/app/ar-fan-cam/ar-fan-cam.page.ts @@ -21,6 +21,8 @@ export class ArFanCamPage implements OnInit { width: number; height: number; + camLoaded: boolean = false; + tempImg = ''; glassesFramesMeshLoaded: boolean = false; @@ -34,6 +36,7 @@ export class ArFanCamPage implements OnInit { back() { JEELIZFACEFILTER.destroy(); + this.camLoaded = false; this.modalController.dismiss(); } @@ -200,6 +203,7 @@ export class ArFanCamPage implements OnInit { } console.log('INFO: JEELIZFACEFILTER IS READY'); + this.camLoaded = true; this.init_threeScene(spec); }, diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 2a9fb98..fdd875e 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -35,7 +35,7 @@
-
@@ -69,7 +69,7 @@
-
@@ -88,7 +88,7 @@
-
+
@@ -100,7 +100,7 @@
-
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index ed2ae18..4cccb28 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -5,7 +5,7 @@ import { NewsService, IMAGE_BASE_URL } from '../services/news.service'; import { ToastService } from '../services/toast.service'; import { DomSanitizer } from '@angular/platform-browser'; import { Uptime } from '@ionic-native/uptime/ngx'; - +import { SocialSharing } from '@ionic-native/social-sharing/ngx'; @Component({ selector: 'app-home', @@ -41,13 +41,18 @@ export class HomePage implements OnInit { private newsService: NewsService, private toastService: ToastService, private dom: DomSanitizer, - private uptime: Uptime + private uptime: Uptime, + private socialSharing: SocialSharing ) { } transformYourHtml(htmlTextWithStyle) { return this.dom.bypassSecurityTrustHtml(htmlTextWithStyle += ''); } + share(message: string, image?: string, url?: string) { + this.socialSharing.share(message, '', image ? image : '', url? url : ''); + } + ngOnInit() { this.uptime.getUptime(true)