diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 4bdf7a8e2..c17d79ef7 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -27,7 +27,8 @@ - + + Conversas @@ -198,6 +199,7 @@ @@ -205,6 +207,7 @@ diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss index fc0a86d91..d09c59662 100644 --- a/src/app/pages/chat/chat.page.scss +++ b/src/app/pages/chat/chat.page.scss @@ -182,4 +182,9 @@ ion-content{ .bold-message { font-weight: bold; +} + +.block-button { + pointer-events: none; + opacity: 0.2; } \ No newline at end of file diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 3503e87ef..210021fb6 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -604,6 +604,12 @@ export class ChatPage implements OnInit { } + + async emptyTextDescriptionOpen() { + this.closeAllDesktopComponents() + this.showEmptyComponent = true + } + async getGroups(event?) { this.result = this.chatService.getAllPrivateGroups().subscribe(async (res: any) => { // @@ -701,8 +707,6 @@ export class ChatPage implements OnInit { async openGroupMessagesModal(roomId: any) { - - const modal = await this.modalController.create({ component: GroupMessagesPage, cssClass: 'modal modal-desktop isGroupChatOpened', diff --git a/src/app/pages/chat/new-group/new-group.page.html b/src/app/pages/chat/new-group/new-group.page.html index b6b7a0690..080631e24 100644 --- a/src/app/pages/chat/new-group/new-group.page.html +++ b/src/app/pages/chat/new-group/new-group.page.html @@ -4,6 +4,7 @@
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html index ba60cce1e..66c0d0250 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.html +++ b/src/app/shared/chat/messages/contacts/contacts.page.html @@ -2,9 +2,9 @@
-
- - +
+ +
Nova Conversa diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts index cf0821c9b..99f0b518d 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.ts +++ b/src/app/shared/chat/messages/contacts/contacts.page.ts @@ -27,6 +27,7 @@ export class ContactsPage implements OnInit { sessionStore = SessionStore @Output() openMessage:EventEmitter = new EventEmitter(); + @Output() emptyTextDescriptionOpen:EventEmitter = new EventEmitter(); constructor( private modalController: ModalController, @@ -96,20 +97,20 @@ export class ContactsPage implements OnInit { let first_prev = records[recordIndex - 1].name[0]; let first_current = record.name[0]; - if(first_prev != first_current){ + if(first_prev != first_current) { return first_current; } return null; } - doRefresh(event){ + doRefresh(event) { } - close(){ - this.modalController.dismiss(); + close() { + this.emptyTextDescriptionOpen.emit(); } - clicked(){ + clicked() { } diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts index 8898b563e..309b88ef1 100644 --- a/src/app/shared/chat/new-group/new-group.page.ts +++ b/src/app/shared/chat/new-group/new-group.page.ts @@ -29,6 +29,8 @@ export class NewGroupPage implements OnInit{ @Input() groupName:string; @Output() addGroupMessage:EventEmitter = new EventEmitter(); + @Output() closeAllDesktopComponents:EventEmitter = new EventEmitter(); + constructor( private pickerController: PickerController, @@ -61,7 +63,6 @@ export class NewGroupPage implements OnInit{ } - _ionChange(event){ @@ -172,6 +173,10 @@ export class NewGroupPage implements OnInit{ }], }) }); + + setTimeout(() => { + this.groupName = "" + }, 150); } async addContacts(){