diff --git a/package-lock.json b/package-lock.json index 878a7078f..a5beebb2b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2958,21 +2958,6 @@ "@types/cordova": "^0.0.34" } }, - "@ionic-native/crop": { - "version": "5.36.0", - "resolved": "https://registry.npmjs.org/@ionic-native/crop/-/crop-5.36.0.tgz", - "integrity": "sha512-wRO8J9oSHl4klvPMti7MTYjFCl6dYHYlbe56gzImf1pwfKQ7gmusskeedABfZggPV1NHruMBKUNALdatJf603A==", - "requires": { - "@types/cordova": "^0.0.34" - }, - "dependencies": { - "@types/cordova": { - "version": "0.0.34", - "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", - "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" - } - } - }, "@ionic-native/fcm": { "version": "5.36.0", "resolved": "https://registry.npmjs.org/@ionic-native/fcm/-/fcm-5.36.0.tgz", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 701c78b64..77e583867 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -215,6 +215,10 @@ const routes = [ path: 'video-allowed', loadChildren: () => import('./modals/video-allowed/video-allowed.module').then( m => m.VideoAllowedPageModule) }, + { + path: 'preview-photo', + loadChildren: () => import('./modals/preview-photo/preview-photo.module').then( m => m.PreviewPhotoPageModule) + }, diff --git a/src/app/modals/preview-camera/preview-camera.page.html b/src/app/modals/preview-camera/preview-camera.page.html index bc40a9eab..53647d342 100644 --- a/src/app/modals/preview-camera/preview-camera.page.html +++ b/src/app/modals/preview-camera/preview-camera.page.html @@ -27,32 +27,32 @@ - + - + - + - + - + diff --git a/src/app/modals/preview-camera/preview-camera.page.scss b/src/app/modals/preview-camera/preview-camera.page.scss index de3ee420c..e8333bcdf 100644 --- a/src/app/modals/preview-camera/preview-camera.page.scss +++ b/src/app/modals/preview-camera/preview-camera.page.scss @@ -8,14 +8,20 @@ ion-slides { .redla{ color: rgb(250, 248, 248); - background-color: rgb(255, 187, 0); + background-color: rgb(255, 238, 0); border-radius: 120px; width: 30px; height: 30px; } +.blacking{ + background-color: rgb(168, 41, 41); +} .cardconteudo { - background: rgba(255,255,255,0.5); + background: rgb(8, 8, 8); + display: flex; + flex-wrap: wrap; + } .whiter{ diff --git a/src/app/modals/preview-camera/preview-camera.page.ts b/src/app/modals/preview-camera/preview-camera.page.ts index 477e5eda0..2766fc583 100644 --- a/src/app/modals/preview-camera/preview-camera.page.ts +++ b/src/app/modals/preview-camera/preview-camera.page.ts @@ -80,6 +80,10 @@ async getIconGallery(){ openChat(){ + } + + openChatVideo(){ + } } diff --git a/src/app/modals/preview-photo/preview-photo-routing.module.ts b/src/app/modals/preview-photo/preview-photo-routing.module.ts new file mode 100644 index 000000000..6a8d5e20c --- /dev/null +++ b/src/app/modals/preview-photo/preview-photo-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { PreviewPhotoPage } from './preview-photo.page'; + +const routes: Routes = [ + { + path: '', + component: PreviewPhotoPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class PreviewPhotoPageRoutingModule {} diff --git a/src/app/modals/preview-photo/preview-photo.module.ts b/src/app/modals/preview-photo/preview-photo.module.ts new file mode 100644 index 000000000..56980fefd --- /dev/null +++ b/src/app/modals/preview-photo/preview-photo.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { PreviewPhotoPageRoutingModule } from './preview-photo-routing.module'; + +import { PreviewPhotoPage } from './preview-photo.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + PreviewPhotoPageRoutingModule + ], + declarations: [PreviewPhotoPage] +}) +export class PreviewPhotoPageModule {} diff --git a/src/app/modals/preview-photo/preview-photo.page.html b/src/app/modals/preview-photo/preview-photo.page.html new file mode 100644 index 000000000..7d321438a --- /dev/null +++ b/src/app/modals/preview-photo/preview-photo.page.html @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/app/modals/preview-photo/preview-photo.page.scss b/src/app/modals/preview-photo/preview-photo.page.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/modals/preview-photo/preview-photo.page.spec.ts b/src/app/modals/preview-photo/preview-photo.page.spec.ts new file mode 100644 index 000000000..5bb31b8c1 --- /dev/null +++ b/src/app/modals/preview-photo/preview-photo.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { PreviewPhotoPage } from './preview-photo.page'; + +describe('PreviewPhotoPage', () => { + let component: PreviewPhotoPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ PreviewPhotoPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(PreviewPhotoPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modals/preview-photo/preview-photo.page.ts b/src/app/modals/preview-photo/preview-photo.page.ts new file mode 100644 index 000000000..e91170d93 --- /dev/null +++ b/src/app/modals/preview-photo/preview-photo.page.ts @@ -0,0 +1,33 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController, NavParams } from '@ionic/angular'; + + +@Component({ + selector: 'app-preview-photo', + templateUrl: './preview-photo.page.html', + styleUrls: ['./preview-photo.page.scss'], +}) +export class PreviewPhotoPage implements OnInit { + + constructor(private modalController: ModalController, + private navParams:NavParams) { } + + ngOnInit() { + } + + image: any; + + exit( ){ this.modalController.dismiss() + + } + save(img){ + var canvas = document.createElement('canvas'); + var ctx = canvas.getContext('2d'); + canvas.width=300 + canvas.height=234 + ctx.drawImage(img.attachments[0].image_url, 0, 0, 300, 234); + document.body.appendChild(canvas); +} + + +} diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index b1f719324..51936512e 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -39,8 +39,9 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { /* @ViewChild('messageContainer') messageContainer: ElementRef; */ @ViewChild('rectangle') private rectangle: ElementRef; + canvas: any + ctx: any loggedUser: any; - message = ''; messages:any; userPresence=''; @@ -635,6 +636,7 @@ touchStart(card) { card.el.style['z-index'] = 11; } + async openPreview(msg) { const modal = await this.modalController.create({ component: PreviewCameraPage, @@ -658,6 +660,16 @@ touchStart(card) { ctx.drawImage(img.attachments[0].image_url, 0, 0, 300, 234); document.body.appendChild(canvas); } + +getPicture(img){ + var canvas = document.createElement('canvas'); + var ctx = canvas.getContext('2d'); + canvas.width=300 + canvas.height=234 + ctx.drawImage(img.attachments[0].image_url, 0, 0, 300, 234); + document.body.appendChild(canvas); + + } } diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 8fd4fb4de..5fb46c486 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -108,6 +108,7 @@ export class NewPublicationPage implements OnInit { allowEditing: false, resultType: CameraResultType.Uri, source: CameraSource.Camera // Camera, Photos or Prompt! + }); if (image) { @@ -116,12 +117,13 @@ export class NewPublicationPage implements OnInit { } + imageSize(image){ var canvas = document.createElement('canvas'); var ctx = canvas.getContext('2d'); - canvas.width=300 - canvas.height=234 - ctx.drawImage(image, 0, 0, 300, 234); + canvas.width=100 + canvas.height=34 + ctx.drawImage(image, 0, 0, 100, 34); document.body.appendChild(canvas); } diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index f1c15bcad..6d802fcb7 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -77,7 +77,6 @@ - console.log('new image path is: ' + newImage), // error => console.error('Error cropping image', error) // ); - - } diff --git a/src/app/pages/publications/view-publications/view-publications.page.scss b/src/app/pages/publications/view-publications/view-publications.page.scss index e4c1a0dd2..77534f9d2 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.scss +++ b/src/app/pages/publications/view-publications/view-publications.page.scss @@ -126,7 +126,7 @@ } .post-img{ width: 100%; - //height: 400px; + height: 400px; margin: 0 auto; border-radius: 0px!important; overflow: hidden; diff --git a/src/app/services/functions/file.service.ts b/src/app/services/functions/file.service.ts index 843b12bb1..146f8cb91 100644 --- a/src/app/services/functions/file.service.ts +++ b/src/app/services/functions/file.service.ts @@ -240,7 +240,6 @@ export class FileService { //this.capturedImage = this.capturedImage; - } @@ -250,7 +249,7 @@ export class FileService { quality: 50, // allowEditing: true, resultType: CameraResultType.Uri, - source: CameraSource.Photos + source: CameraSource.Camera });