diff --git a/package.json b/package.json
index 8affa6bb6..37884141a 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,6 @@
"@fullcalendar/interaction": "^5.3.0",
"@ionic-native/camera": "^5.31.1",
"@ionic-native/core": "^5.0.7",
- "@ionic-native/crop": "^5.36.0",
"@ionic-native/fcm": "^5.36.0",
"@ionic-native/file": "^5.36.0",
"@ionic-native/file-path": "^5.30.0",
diff --git a/src/app/modals/preview-camera/preview-camera.page.html b/src/app/modals/preview-camera/preview-camera.page.html
index 1bcfaa040..bc40a9eab 100644
--- a/src/app/modals/preview-camera/preview-camera.page.html
+++ b/src/app/modals/preview-camera/preview-camera.page.html
@@ -30,8 +30,7 @@
-
-
+
diff --git a/src/app/modals/preview-camera/preview-camera.page.scss b/src/app/modals/preview-camera/preview-camera.page.scss
index 20cee576f..de3ee420c 100644
--- a/src/app/modals/preview-camera/preview-camera.page.scss
+++ b/src/app/modals/preview-camera/preview-camera.page.scss
@@ -7,10 +7,11 @@ ion-slides {
}
.redla{
-
color: rgb(250, 248, 248);
background-color: rgb(255, 187, 0);
border-radius: 120px;
+ width: 30px;
+ height: 30px;
}
.cardconteudo {
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index c864de07c..879f56f13 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -30,7 +30,7 @@ import { environment } from 'src/environments/environment';
import { TimeService } from 'src/app/services/functions/time.service';
import { ThemeService } from 'src/app/services/theme.service'
import { DataService } from 'src/app/services/data.service';
-import { Crop } from '@ionic-native/crop/ngx';
+
@Component({
@@ -120,7 +120,7 @@ export class ChatPage implements OnInit {
public ThemeService: ThemeService,
private dataService:DataService,
private router: Router,
- private crop: Crop,
+
){
this.loggedUserChat = authService.ValidatedUserChat['data'];
this.headers = new HttpHeaders();
diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html
index c934ab530..1d61c1731 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.html
+++ b/src/app/pages/publications/new-publication/new-publication.page.html
@@ -29,11 +29,7 @@
-<<<<<<< HEAD
-=======
-
->>>>>>> 6dcc59980c0116ee04582f93d3d44cc985659ce6
![]()
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 4a347baf5..8fd4fb4de 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -138,7 +138,7 @@ export class NewPublicationPage implements OnInit {
async laodPicture() {
const capturedImage = await Camera.getPhoto({
resultType: CameraResultType.Uri,
- source: CameraSource.Photos,
+ source: CameraSource.Camera,
quality: 90,
width: 1080,
height: 720,
@@ -393,7 +393,7 @@ export class NewPublicationPage implements OnInit {
quality: 50,
allowEditing: false,
resultType: CameraResultType.Uri,
- source: CameraSource.Photos // Camera, Photos or Prompt!
+ source: CameraSource.Camera // Camera, Photos or Prompt!
});
if (image) {
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 1916b987a..bd155c51f 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -16,7 +16,7 @@ import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-f
import { SqliteService } from 'src/app/services/sqlite.service';
import { BackgroundService } from 'src/app/services/background.service';
import { ThemeService } from 'src/app/services/theme.service'
-import { Crop } from '@ionic-native/crop/ngx';
+
@Component({
selector: 'app-publications',
@@ -70,7 +70,7 @@ export class PublicationsPage implements OnInit {
private backgroundservice: BackgroundService,
private platform: Platform,
public ThemeService: ThemeService,
- private crop: Crop,
+
) {
this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
this.days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
diff --git a/src/assets/icon/chat/circle-xmark-solid 1.svg b/src/assets/icon/chat/circle-xmark-solid 1.svg
new file mode 100644
index 000000000..dbc039351
--- /dev/null
+++ b/src/assets/icon/chat/circle-xmark-solid 1.svg
@@ -0,0 +1,3 @@
+