Merge branch 'themesDeveloper' of https://bitbucket.org/equilibriumito/gabinete-digital into themesDeveloper

src/app/shared/agenda/approve-event/approve-event.page.html

@@ -27,7 +27,9 @@
 
         <div  (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">
           <button class="btn-no-color">
-            <ion-icon src="assets/images/icons-edit.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-edit.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  src="assets/images/theme/gov/icons-edit.svg"></ion-icon>
+
           </button>
         </div>
 

src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html

@@ -1,6 +1,6 @@
 <div class="btn-modal-dismiss">
   <button class="btn-no-color" (click)="close()">
     <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
-    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
+    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
   </button>
 </div>

src/app/shared/popover/actions-options/actions-options.page.html

@@ -1,7 +1,8 @@
 <ion-content class="container">
   <div class="arrow-right" (click)="close()">
     <button class="btn-no-color">
-      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
     </button>
   </div>
 

src/app/shared/popover/actions-options/actions-options.page.ts

@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ModalController, NavParams } from '@ionic/angular';
 import { PublicationsService } from 'src/app/services/publications.service';
 import { ToastService } from 'src/app/services/toast.service';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-actions-options',
@@ -16,7 +17,8 @@ export class ActionsOptionsPage implements OnInit {
     private modalController: ModalController,
     private navParams: NavParams,
     private publicationsService: PublicationsService,
-    private toastService: ToastService
+    private toastService: ToastService,
+    public ThemeService: ThemeService
   ) { 
     this.id = this.navParams.get('id');
   }

src/app/shared/popover/chat-options-popover/chat-options-popover.page.html

@@ -1,7 +1,8 @@
 <ion-content class="container">
   <div class="arrow-right">
     <button class="btn-no-color" (click)="close()">
-      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
     </button>
   </div>
   <div class="buttons">

src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts

@@ -6,6 +6,7 @@ import { NewEventPage } from 'src/app/pages/agenda/new-event/new-event.page';
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { AlertService } from 'src/app/services/alert.service';
 import { environment } from 'src/environments/environment';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-chat-options-popover',
@@ -23,6 +24,7 @@ export class ChatOptionsPopoverPage implements OnInit {
     private modalController: ModalController,
     private alertService: AlertService,
     private navParams: NavParams,
+    public ThemeService: ThemeService
   ) {
 
     this.members = this.navParams.get('members');

src/app/shared/popover/chat-popover/chat-popover.page.html

@@ -1,7 +1,8 @@
 <ion-content class="options-container">
   <div class="arrow-right">
     <button class="btn-no-color" (click)="close('cancel')">
-      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
     </button>
   </div>
   <div class="buttons">

src/app/shared/popover/chat-popover/chat-popover.page.scss

@@ -37,7 +37,7 @@
       margin-bottom: 10px !important;
   }
   .btn-cancel:hover, .btn-delete:hover{
-    background-color: #42b9fe;
+    background-color: var(--button-hover);
     color: #fff !important;
   }
   .btn-ok{

src/app/shared/popover/chat-popover/chat-popover.page.ts

@@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core';
 import { ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { ChatService } from 'src/app/services/chat.service';
 import { ToastService } from 'src/app/services/toast.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-chat-popover',
@@ -18,6 +20,7 @@ export class ChatPopoverPage implements OnInit {
     private navParams: NavParams,
     private chatService: ChatService,
     private toastService: ToastService,
+    public ThemeService: ThemeService
   ) {
     this.roomId = this.navParams.get('roomId');
   }

src/app/shared/popover/despachos-options/despachos-options.page.html

@@ -1,7 +1,8 @@
 <ion-content class="options-container">
   <div class="arrow-right" (click)="close()">
     <button class="btn-no-color">
-      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
     </button>
   </div>
 

src/app/shared/popover/despachos-options/despachos-options.page.ts

@@ -10,6 +10,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
 import { ToastService } from 'src/app/services/toast.service';
 import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
 import { PermissionService } from 'src/app/services/worker/permission.service';
+import { ThemeService } from 'src/app/services/theme.service'
 
 
 @Component({
@@ -31,6 +32,7 @@ export class DespachosOptionsPage implements OnInit {
     private navParams: NavParams,
     private toastService: ToastService,
     public p: PermissionService,
+    public ThemeService: ThemeService
     ) { 
       this.task = this.navParams.get('task')
       this.fulltask = this.navParams.get('fulltask')

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html

@@ -1,7 +1,8 @@
 <ion-content class="options-container">
   <div class="arrow-right" (click)="close()">
     <button class="btn-no-color">
-      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
     </button>
   </div>
 

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts

@@ -10,6 +10,8 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
 import { ToastService } from 'src/app/services/toast.service';
 import { Location } from '@angular/common'
 import { PermissionService } from 'src/app/services/worker/permission.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-despachos-pr-options',
@@ -33,6 +35,7 @@ export class DespachosPrOptionsPage implements OnInit {
     private toastService: ToastService,
     private location: Location,
     public p: PermissionService,
+    public ThemeService: ThemeService
   ) { }
 
   ngOnInit() {

src/app/shared/popover/messages-options/messages-options.page.html

@@ -1,7 +1,8 @@
 <ion-content class="container">
   <div class="arrow-right" (click)="close()">
     <button class="btn-no-color">
-      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
     </button>
   </div>
   <div class="buttons">

src/app/shared/popover/messages-options/messages-options.page.ts

@@ -1,6 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { ChatService } from 'src/app/services/chat.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-messages-options',
@@ -16,6 +18,7 @@ export class MessagesOptionsPage implements OnInit {
     private modalController: ModalController,
     private chatService: ChatService,
     private navParams: NavParams,
+    public ThemeService: ThemeService
   )
   {
     this.roomId = this.navParams.get('roomId');

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html

@@ -2,7 +2,8 @@
 
   <div class="arrow-right" (click)="close()">
     <button class="btn-no-color">
-      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
     </button>
   </div>
 

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts

@@ -13,6 +13,8 @@ import { AuthService } from 'src/app/services/auth.service';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { Location } from '@angular/common'
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-opts-expediente-pr',
@@ -49,6 +51,7 @@ export class OptsExpedientePrPage implements OnInit {
     private animationController: AnimationController,
     private toastService: ToastService,
     private location: Location,
+    public ThemeService: ThemeService
 
   ) {
 

src/app/shared/popover/opts-expediente/opts-expediente.page.html

@@ -1,7 +1,8 @@
 <ion-content class="options-container width-100 ">
   <div class="arrow-right" (click)="close()">
     <button class="btn-no-color">
-      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
     </button>
   </div>
   <div class="width-100">

src/app/shared/popover/opts-expediente/opts-expediente.page.ts

@@ -16,6 +16,8 @@ import { Location } from '@angular/common';
 import { TaskService } from 'src/app/Rules/task.service'
 import { ExpedienteService } from 'src/app/Rules/expediente.service';
 import { PermissionService } from 'src/app/services/worker/permission.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-opts-expediente',
@@ -45,7 +47,8 @@ export class OptsExpedientePage implements OnInit {
     private attachmentsService: AttachmentsService,
     private location: Location,
     private TaskService: TaskService,
-    private expedienteService: ExpedienteService
+    private expedienteService: ExpedienteService,
+    public ThemeService: ThemeService
   ) {
     this.task = this.navParams.get('task');
     this.fulltask = this.navParams.get('fulltask');