Explorar el Código

Destroy camera on exit, social sharing buttons style changes

master
kj1352 hace 4 años
padre
commit
23e1c8763a
Se han modificado 3 ficheros con 14 adiciones y 12 borrados
  1. +4
    -3
      src/app/ar-fan-cam/ar-fan-cam.page.html
  2. +7
    -7
      src/app/ar-fan-cam/ar-fan-cam.page.scss
  3. +3
    -2
      src/app/ar-fan-cam/ar-fan-cam.page.ts

+ 4
- 3
src/app/ar-fan-cam/ar-fan-cam.page.html Ver fichero

@@ -19,9 +19,10 @@
</div> </div>


<section class="image-action-buttons" *ngIf="tempImg"> <section class="image-action-buttons" *ngIf="tempImg">
<button (click)="approveImage()"> <img src="assets/icons/emojis/thumb-up.png"> </button>
<button (click)="tempImg = null"> <img src="assets/icons/emojis/thumb-up.png"> </button>
<button> <ion-icon name="logo-facebook"></ion-icon> </button>
<button> <ion-icon name="logo-instagram"></ion-icon> </button>
<button> <ion-icon name="logo-whatsapp"></ion-icon> </button>
<button> <ion-icon name="share-social-outline"></ion-icon> </button> <button> <ion-icon name="share-social-outline"></ion-icon> </button>
<button (click)="tempImg = null"> <img src="assets/icons/emojis/thumb-up.png"> </button>
</section> </section>
</ion-content> </ion-content>

+ 7
- 7
src/app/ar-fan-cam/ar-fan-cam.page.scss Ver fichero

@@ -37,7 +37,7 @@


ion-icon { ion-icon {
color: white; color: white;
font-size: 20px;
font-size: 25px;
} }
} }


@@ -127,13 +127,13 @@
position: fixed; position: fixed;
left: 0; left: 0;
bottom: 20px; bottom: 20px;
width: 200px;
margin-left: calc(50% - 100px);
width: 90%;
margin-left: 5%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 10px; padding: 10px;
background-color: rgba(black, 0.6);
background-color: rgb(253 253 253);
border-radius: 30px; border-radius: 30px;
z-index: 1; z-index: 1;


@@ -141,13 +141,13 @@
width: 50px; width: 50px;
height: 50px; height: 50px;
border-radius: 50%; border-radius: 50%;
border: 1px solid rgba($blue-grey, 0.6);
border: 2px solid $brand-blue;
background-color: transparent; background-color: transparent;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;


&:nth-child(2) {
&:last-child {
transform: rotate(180deg); transform: rotate(180deg);
} }


@@ -156,7 +156,7 @@
} }


ion-icon { ion-icon {
color: white;
color: $brand-blue;
font-size: 20px; font-size: 20px;
} }
} }

+ 3
- 2
src/app/ar-fan-cam/ar-fan-cam.page.ts Ver fichero

@@ -22,8 +22,8 @@ export class ArFanCamPage implements OnInit {


tempImg = ''; tempImg = '';


glassesFramesMeshLoaded = false;
glassesLensMeshLoaded = false;
glassesFramesMeshLoaded: boolean = false;
glassesLensMeshLoaded: boolean = false;


constructor( constructor(
private modalController: ModalController private modalController: ModalController
@@ -31,6 +31,7 @@ export class ArFanCamPage implements OnInit {
} }


back() { back() {
JEELIZFACEFILTER.destroy();
this.modalController.dismiss(); this.modalController.dismiss();
} }




Cargando…
Cancelar
Guardar