From 9bb85a2adfffc2d07d6ca1c3d98f421ff3fbd37f Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 25 Oct 2021 13:54:34 +0100 Subject: [PATCH] Improve --- .../modals/document-viewer/document-viewer.page.ts | 2 +- .../profile/edit-profile/edit-profile.page.html | 12 ++++++++---- .../profile/edit-profile/edit-profile.page.ts | 4 ++-- src/app/modals/profile/profile.page.html | 3 ++- src/app/modals/profile/profile.page.ts | 4 +++- src/app/pages/chat/edit-group/edit-group.page.ts | 2 ++ .../diploma-assinar/diploma-assinar.page.ts | 8 +++----- .../approve-event-modal.page.ts | 2 ++ .../gabinete-digital/event-list/event-list.page.ts | 4 +++- .../publication-detail/publication-detail.page.ts | 4 +++- .../view-publications/view-publications.page.ts | 4 +++- .../search/organic-entity/organic-entity.page.ts | 9 +++++++-- src/app/pages/search/search.page.html | 14 +++++++++----- src/app/pages/search/search.page.ts | 5 ++++- src/app/pages/search/sender/sender.page.ts | 4 +++- src/app/shared/header/header.page.html | 6 ++++-- src/assets/images/theme/gov/icons-search-close.svg | 7 +++++++ 17 files changed, 66 insertions(+), 28 deletions(-) create mode 100644 src/assets/images/theme/gov/icons-search-close.svg diff --git a/src/app/modals/document-viewer/document-viewer.page.ts b/src/app/modals/document-viewer/document-viewer.page.ts index c8711fe32..1d2081da8 100644 --- a/src/app/modals/document-viewer/document-viewer.page.ts +++ b/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'); diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html index 9a6073e0d..daa5336ad 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -7,7 +7,8 @@
- + +
@@ -62,15 +63,18 @@
- + +
- + +
- + +
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.ts b/src/app/modals/profile/edit-profile/edit-profile.page.ts index 8e0e7a2ba..2cd0302b8 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.ts +++ b/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) } } diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html index eee16e4e6..ff5276b6e 100644 --- a/src/app/modals/profile/profile.page.html +++ b/src/app/modals/profile/profile.page.html @@ -6,7 +6,8 @@
- + +
diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index 0c72c221c..218084254 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/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; diff --git a/src/app/pages/chat/edit-group/edit-group.page.ts b/src/app/pages/chat/edit-group/edit-group.page.ts index 4a9fd2a85..5d5c1d1f2 100644 --- a/src/app/pages/chat/edit-group/edit-group.page.ts +++ b/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'); } diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index 36fc4cc0f..b4fa28380 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/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 { 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 { ActivatedRoute, Router } from '@angular/router'; 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) { diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index de4345992..3dc0df31b 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/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 ) { diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 765450313..444e0e291 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/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() { diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts index 8160c658b..57f5da6c1 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ b/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'); */ diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index a41378420..9b53a6c34 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/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 => { diff --git a/src/app/pages/search/organic-entity/organic-entity.page.ts b/src/app/pages/search/organic-entity/organic-entity.page.ts index a5e429bbe..f326df95d 100644 --- a/src/app/pages/search/organic-entity/organic-entity.page.ts +++ b/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, - private OrganicEntityService: OrganicEntityService) { + constructor( + private modalController:ModalController, + private OrganicEntityService: OrganicEntityService, + public ThemeService: ThemeService + ) { } diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 1d92a8d98..1e13757dc 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -15,7 +15,8 @@
- + +
@@ -35,7 +36,7 @@
@@ -50,7 +51,8 @@
- + +
@@ -62,7 +64,8 @@
- + +
@@ -74,7 +77,8 @@
- + +
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 3dc1930a4..3963f7fad 100644 --- a/src/app/pages/search/search.page.ts +++ b/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; diff --git a/src/app/pages/search/sender/sender.page.ts b/src/app/pages/search/sender/sender.page.ts index 3a316bdc3..5052a3b70 100644 --- a/src/app/pages/search/sender/sender.page.ts +++ b/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) { } diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index b3ebb7e55..17f103e35 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -80,7 +80,8 @@
@@ -93,7 +94,8 @@ class="search-input text-black" type="search" placeholder="Pesquisar">
- + +
diff --git a/src/assets/images/theme/gov/icons-search-close.svg b/src/assets/images/theme/gov/icons-search-close.svg new file mode 100644 index 000000000..63b648aa3 --- /dev/null +++ b/src/assets/images/theme/gov/icons-search-close.svg @@ -0,0 +1,7 @@ + + + + + + +