Improve

src/app/modals/document-viewer/document-viewer.page.ts

@@ -19,7 +19,7 @@ export class DocumentViewerPage implements OnInit {
   constructor(
     private modalController: ModalController,
     private navParams: NavParams,
-    private processes: ProcessesService) {
+    public processes: ProcessesService) {
       
       this.task = this.navParams.get('task') || null;
       this.DocId = this.navParams.get('DocId');

src/app/modals/profile/edit-profile/edit-profile.page.html

@@ -7,7 +7,8 @@
         </div>
       </div>
       <div class="btn-close d-flex cursor-pointer" (click)="close()">
-        <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
       </div>
     </div>
     <div class="profile-content overflow-y-auto width-100 height-100">
@@ -62,15 +63,18 @@
           <div class="d-flex align-center">
             <div class="btn-close d-flex cursor-pointer" (click)="changeTheme('gov')" style="background-color: red;">
               
-              <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
             </div>
 
             <div class="btn-close d-flex cursor-pointer" (click)="changeTheme('default')">
-              <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
             </div>
 
             <div class="btn-close d-flex cursor-pointer" (click)="close()">
-              <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
             </div>
 
           </div>

src/app/modals/profile/edit-profile/edit-profile.page.ts

@@ -21,7 +21,7 @@ export class EditProfilePage implements OnInit {
     private animationController: AnimationController,
     public platform: Platform,
     private backgroundservice: BackgroundService,
-    private themeservice: ThemeService
+    public ThemeService: ThemeService
     ) {}
 
   ngOnInit() {}
@@ -117,7 +117,7 @@ export class EditProfilePage implements OnInit {
   }
 
   changeTheme(name) {
-    this.themeservice.setTheme(name)
+    this.ThemeService.setTheme(name)
   }
 
 }

src/app/modals/profile/profile.page.html

@@ -6,7 +6,8 @@
       </div>
     </div>
     <div class="btn-close d-flex cursor-pointer" (click)="close()">
-      <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
     </div>
   </div>
 </ion-header>

src/app/modals/profile/profile.page.ts

@@ -12,6 +12,7 @@ import { StorageService } from '../../services/storage.service';
 import { NotificationsService } from '../../services/notifications.service';
 import { SessionStore } from 'src/app/store/session.service';
 import { EventTrigger } from '../../services/eventTrigger.service';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-profile',
@@ -44,7 +45,8 @@ export class ProfilePage implements OnInit {
     private notificationservice: NotificationsService,
     private platform: Platform,
     private notificationsService: NotificationsService,
-    private eventtrigger: EventTrigger
+    private eventtrigger: EventTrigger,
+    public ThemeService: ThemeService
   ) {
 
     this.loggeduser = authService.ValidatedUser;

src/app/pages/chat/edit-group/edit-group.page.ts

@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ModalController, NavParams, PickerController } from '@ionic/angular';
 import { ChatService } from 'src/app/services/chat.service';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-edit-group',
@@ -21,6 +22,7 @@ export class EditGroupPage implements OnInit {
     private pickerController: PickerController,
     private chatService: ChatService,
     private navParams: NavParams,
+    public ThemeService: ThemeService
   ) {
     this.roomId = this.navParams.get('roomId');
    }

src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts

@@ -2,18 +2,15 @@ import { Component, OnInit } from '@angular/core';
 import { AnimationController, ModalController, PopoverController } from '@ionic/angular';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
 import { momentG }  from 'src/plugin/momentG';
 
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
-import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { Location } from '@angular/common'
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-diploma-assinar',
@@ -44,6 +41,7 @@ export class DiplomaAssinarPage implements OnInit {
     private animationController: AnimationController,
     private toastService: ToastService,
     private location: Location,
+    public ThemeService: ThemeService
   ) {
     this.activatedRoute.paramMap.subscribe(params => {
       if(params["params"].SerialNumber) {

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts

@@ -12,6 +12,7 @@ import { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend
 import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ToastService } from 'src/app/services/toast.service';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-approve-event-modal',
@@ -43,6 +44,7 @@ export class ApproveEventModalPage implements OnInit {
     private iab: InAppBrowser,
     private animationController: AnimationController,
     private toastService: ToastService,
+    public ThemeService: ThemeService
   ) {
 
 

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -12,6 +12,7 @@ import { SqliteService } from '../../../services/sqlite.service';
 import { BackgroundService } from '../../../services/background.service';
 import { Platform } from '@ionic/angular';
 import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-event-list',
@@ -42,7 +43,8 @@ export class EventListPage implements OnInit {
     private sqliteservice: SqliteService,
     private platform: Platform,
     private sortService: SortService,
-    private backgroundservice: BackgroundService
+    private backgroundservice: BackgroundService,
+    public ThemeService: ThemeService
   ) { }
 
   ngOnInit() {

src/app/pages/publications/publication-detail/publication-detail.page.ts

@@ -8,6 +8,7 @@ import { NewPublicationPage } from '../new-publication/new-publication.page';
 import { Location } from '@angular/common';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
+import { ThemeService } from 'src/app/services/theme.service'
 
 
 @Component({
@@ -29,7 +30,8 @@ export class PublicationDetailPage implements OnInit {
     private toastService: ToastService,
     private location: Location,
     private sqliteservice: SqliteService,
-    private backgroundservice: BackgroundService ) {
+    private backgroundservice: BackgroundService,
+    public ThemeService: ThemeService ) {
 
       this.publicationId = this.navParams.get('publicationId');
       /* this.folderId = this.navParams.get('folderIdId'); */

src/app/pages/publications/view-publications/view-publications.page.ts

@@ -12,6 +12,7 @@ import { NewPublicationPage } from '../new-publication/new-publication.page';
 import { PublicationDetailPage } from './publication-detail/publication-detail.page';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-view-publications',
@@ -43,7 +44,8 @@ export class ViewPublicationsPage implements OnInit {
     private activatedRoute: ActivatedRoute,
     private router: Router,
     private sqliteservice: SqliteService,
-    private backgroundservice: BackgroundService) {
+    private backgroundservice: BackgroundService,
+    public ThemeService: ThemeService) {
 
     this.item = new PublicationFolder();
     this.activatedRoute.paramMap.subscribe(params => {

src/app/pages/search/organic-entity/organic-entity.page.ts

@@ -3,6 +3,8 @@ import { ModalController } from '@ionic/angular';
 import { from } from 'rxjs';
 import { OrganicEntityService } from 'src/app/services/organic-entity.service';
 import { OrganicEntity } from 'src/app/models/organic-entity.model';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-organic-entity',
@@ -16,8 +18,11 @@ export class OrganicEntityPage implements OnInit {
   findEntity: string;
 
   
-  constructor(private modalController:ModalController,
+  constructor(
-    private OrganicEntityService: OrganicEntityService) {
+    private modalController:ModalController,
+    private OrganicEntityService: OrganicEntityService,
+    public ThemeService: ThemeService
+  ) {
 
     }
 

src/app/pages/search/search.page.html

@@ -15,7 +15,8 @@
         </div>
         <div (click)="clearSearchInput()"  class="d-flex align-center icon">
 
-          <ion-icon class="font-25" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-25" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-25" name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
 
         </div>
       </div>
@@ -35,7 +36,7 @@
 
     <div class="btn-modal-dismiss" *ngIf="showSearchInput">
       <button class="btn-no-color" (click)="close()">
-        <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+        <ion-icon c*ngIf="ThemeService.currentTheme == 'default' " lass="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
       </button>
     </div>
   </div>
@@ -50,7 +51,8 @@
       <div class="input-container d-flex ion-align-items-center">
         <ion-datetime [(ngModel)]='searchDocumentDate'  placeholder="Data" display-timezone="utc"></ion-datetime>
         <div class="icon" (click)="clearInputDocumentDate()">
-          <ion-icon name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
         </div>
       </div>
     </li>
@@ -62,7 +64,8 @@
       <div class="input-container d-flex ion-align-items-center">
         <ion-input [(ngModel)]='searchSender' class="search-input" (click)="openAdvanceSearchSelection()" type="search" placeholder="Remetentes"></ion-input>
         <div class="icon" (click)="clearInputRemetente()" >
-          <ion-icon name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
         </div>
       </div>
     </li>
@@ -74,7 +77,8 @@
       <div class="input-container d-flex ion-align-items-center">
         <ion-input [(ngModel)]='searchOrganicEntiry'  class="search-input" type="search" placeholder="Entidade Orgânica" (click)="openOrganicEntitySelection()"></ion-input>
         <div class="icon" (click)="clearInputOrganicEntity()" >
-          <ion-icon name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
         </div>
       </div>
     </li>

src/app/pages/search/search.page.ts

@@ -9,6 +9,7 @@ import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
 import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page';
 import { DocumentDetailPage } from 'src/app/modals/document-detail/document-detail.page';
 import { SearchCategory, SearchList } from 'src/app/models/search-document';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-search',
@@ -58,7 +59,9 @@ export class SearchPage implements OnInit {
   constructor(private modalController: ModalController,
     private search: SearchService,
     private modalCtrl: ModalController,
-    private navParams: NavParams) {
+    private navParams: NavParams,
+    public ThemeService: ThemeService) 
+    {
       this.ordinance = "recent";
       this.currentPath= window.location.pathname;
 

src/app/pages/search/sender/sender.page.ts

@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ModalController } from '@ionic/angular';
 import { ContactsService } from 'src/app/services/contacts.service';
 import { EventPerson } from  'src/app/models/eventperson.model';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-sender',
@@ -17,7 +18,8 @@ export class SenderPage implements OnInit {
   selectedUser: string;
 
   constructor(private modalController:ModalController,
-    private ContactsService: ContactsService) { 
+    private ContactsService: ContactsService,
+    public ThemeService: ThemeService) { 
 
     }
 

src/app/shared/header/header.page.html

@@ -80,7 +80,8 @@
               <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-45" src='assets/images/theme/gov/icons-search.svg'></ion-icon>
             </div>
             <button class="btn-no-color" (click)="closeSearch();showSearch=false;searchSubject=''" *ngIf="showSearch">
-              <ion-icon class="font-40" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
             </button>
 
             <div *ngIf="showSearch">
@@ -93,7 +94,8 @@
                     class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
                 </div>
                 <div class="icon" (click)="clearSearchInput()">
-                  <ion-icon name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
                 </div>
               </div>
             </div>

src/assets/images/theme/gov/icons-search-close.svg

@@ -0,0 +1,7 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 5H12.778V6H5V5Z" fill="white"/>
+<path d="M7.77799 6.66701C8.39158 6.66701 8.88899 6.1696 8.88899 5.55601C8.88899 4.94242 8.39158 4.44501 7.77799 4.44501C7.1644 4.44501 6.66699 4.94242 6.66699 5.55601C6.66699 6.1696 7.1644 6.66701 7.77799 6.66701Z" fill="white"/>
+<path d="M12.5 25C19.4036 25 25 19.4036 25 12.5C25 5.59644 19.4036 0 12.5 0C5.59644 0 0 5.59644 0 12.5C0 19.4036 5.59644 25 12.5 25Z" fill="#FFB81C"/>
+<path d="M8.26038 7.98245L17.2951 17.0172" stroke="#061B52" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.2958 7.98245L8.26107 17.0172" stroke="#061B52" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>