diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index a0360274e..7be7347da 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -114,11 +114,13 @@ - + + - + + @@ -180,10 +182,13 @@ - + + - + + + diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index edaca3579..f1d47b0f3 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -31,6 +31,7 @@ import { ChangeProfileService } from 'src/app/services/change-profile.service'; 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({ @@ -176,7 +177,8 @@ export class AgendaPage implements OnInit { private changeProfileService: ChangeProfileService, private sqliteservice: SqliteService, private platform: Platform, - private backgroundservice: BackgroundService + private backgroundservice: BackgroundService, + public ThemeService: ThemeService ) { this.dateAdapter.setLocale('es'); diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 35ae9787e..f2b97e047 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -18,10 +18,12 @@ - + + - + + diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 991abb5a2..c7cb6b850 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -28,6 +28,8 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { environment } from 'src/environments/environment'; import { NotificationsService } from 'src/app/services/notifications.service'; import { TimeService } from 'src/app/services/functions/time.service'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-chat', @@ -119,6 +121,7 @@ export class ChatPage implements OnInit { private resolver: ComponentFactoryResolver, private route: Router, private timeService: TimeService, + public ThemeService: ThemeService ){ this.loggedUserChat = authService.ValidatedUserChat['data']; this.headers = new HttpHeaders(); diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index bb555611b..40e240658 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -34,10 +34,19 @@ + + + @@ -85,7 +94,19 @@ Correspondência por ler - + + + diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 80f075a36..81d64aa56 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -20,7 +20,7 @@ import { SqliteService } from 'src/app/services/sqlite.service'; import { NetworkConnectionService } from 'src/app/services/network-connection.service' import { BackgroundService } from 'src/app/services/background.service'; import { momentG } from 'src/plugin/momentG'; - +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-events', templateUrl: './events.page.html', @@ -95,6 +95,7 @@ export class EventsPage implements OnInit { private sqliteservice: SqliteService, private networkconnection: NetworkConnectionService, private backgroundservice: BackgroundService, + public ThemeService: ThemeService ) { this.existingScreenOrientation = this.screenOrientation.type; console.log(this.existingScreenOrientation); diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index f802c4aed..a3b734557 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -8,7 +8,10 @@ - + + + + diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index e83bae32f..3f0acc240 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -9,6 +9,7 @@ import { NotificationsService } from 'src/app/services/notifications.service'; import { SessionStore } from 'src/app/store/session.service'; import { ClearStoreService } from 'src/app/services/clear-store.service'; import { ChangeProfileService } from 'src/app/services/change-profile.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-login', @@ -35,9 +36,9 @@ export class LoginPage implements OnInit { private toastService: ToastService, public alertController: AlertController, private clearStoreService: ClearStoreService, - private changeProfileService: ChangeProfileService - ) { - } + private changeProfileService: ChangeProfileService, + public ThemeService: ThemeService + ) {} ngOnInit() { diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index d1ae5d28b..866dfbbcf 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -26,7 +26,8 @@ - + + diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 81a1d09b0..b96eb8e80 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -15,6 +15,7 @@ import { PublicationEventFolderStorage } from 'src/app/store/publication-event-f import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-folder.service'; 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-publications', @@ -66,7 +67,8 @@ export class PublicationsPage implements OnInit { private toastService: ToastService, private sqliteservice: SqliteService, private backgroundservice: BackgroundService, - private platform: Platform + private platform: Platform, + public ThemeService: ThemeService ) { 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/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html index 508f6e140..ee14eb539 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -16,7 +16,8 @@ - + + diff --git a/src/app/services/theme.service.ts b/src/app/services/theme.service.ts index 74f0e7012..cda6299cc 100644 --- a/src/app/services/theme.service.ts +++ b/src/app/services/theme.service.ts @@ -10,8 +10,17 @@ export class ThemeService { 'default' ] + currentTheme = 'gov' + constructor() { } - setTheme() {} + setTheme(theme: 'gov' | 'default') { + + document.body.classList.remove("gov"); + document.body.classList.remove("default"); + document.body.classList.add(theme); + this.currentTheme = theme + + } } diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index a63e6df67..f056a7689 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -9,7 +9,8 @@ - + + 0" class="icon-badge">{{this.notificationLength}} @@ -21,39 +22,50 @@ - + + + + - - + + + + Início - + + Agenda - + + + + Gabinete - + + Acções - + + Chat @@ -62,7 +74,8 @@ - + + diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 31ccac939..de913d563 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -9,6 +9,7 @@ import { SessionStore } from 'src/app/store/session.service'; import { NotificationsService } from '../../services/notifications.service'; import { environment } from 'src/environments/environment'; import { EventTrigger } from '../../services/eventTrigger.service'; +import { ThemeService } from '../../services/theme.service'; @Component({ selector: 'app-header', @@ -35,7 +36,8 @@ export class HeaderPage implements OnInit { private storageservice: StorageService, private platform: Platform, private notificationsService: NotificationsService, - private eventrigger: EventTrigger + private eventrigger: EventTrigger, + public ThemeService: ThemeService ) { this.loggeduser = SessionStore.user; router.events.subscribe((val) => { diff --git a/src/app/shared/popover/actions-options/actions-options.page.scss b/src/app/shared/popover/actions-options/actions-options.page.scss index 37e90de2f..d03fc9ca3 100644 --- a/src/app/shared/popover/actions-options/actions-options.page.scss +++ b/src/app/shared/popover/actions-options/actions-options.page.scss @@ -32,7 +32,7 @@ } .btn-cancel:hover, .btn-delete:hover{ color: #ffffff !important; - background-color: #42b9fe; + background-color: var(--button-hover); } @media only screen and (max-width: 800px) { .btn-ok, .btn-cancel, .btn-delete{ diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index b8b4f2aa0..b11435853 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -14,7 +14,8 @@ - + + diff --git a/src/assets/images/theme/gov/gabinetedigital_logo.png b/src/assets/images/theme/gov/gabinetedigital_logo.png new file mode 100644 index 000000000..75708e4c3 Binary files /dev/null and b/src/assets/images/theme/gov/gabinetedigital_logo.png differ diff --git a/src/assets/images/theme/gov/governoangola_A.png b/src/assets/images/theme/gov/governoangola_A.png new file mode 100644 index 000000000..9c360396a Binary files /dev/null and b/src/assets/images/theme/gov/governoangola_A.png differ diff --git a/src/assets/images/theme/gov/icons-add.svg b/src/assets/images/theme/gov/icons-add.svg new file mode 100644 index 000000000..d7ecdaa09 --- /dev/null +++ b/src/assets/images/theme/gov/icons-add.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/images/theme/icons-arrow-circle-arrow-right 2.svg b/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg similarity index 63% rename from src/assets/images/theme/icons-arrow-circle-arrow-right 2.svg rename to src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg index e62623ebf..e75c82ae4 100644 --- a/src/assets/images/theme/icons-arrow-circle-arrow-right 2.svg +++ b/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg @@ -1,4 +1,4 @@ - - + + diff --git a/src/assets/images/theme/gov/icons-chat-new-conversation.svg b/src/assets/images/theme/gov/icons-chat-new-conversation.svg new file mode 100644 index 000000000..08c91d1b9 --- /dev/null +++ b/src/assets/images/theme/gov/icons-chat-new-conversation.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/images/theme/gov/icons-chat-new-group.svg b/src/assets/images/theme/gov/icons-chat-new-group.svg new file mode 100644 index 000000000..c67dacd31 --- /dev/null +++ b/src/assets/images/theme/gov/icons-chat-new-group.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/images/theme/gov/icons-collaps-down.svg b/src/assets/images/theme/gov/icons-collaps-down.svg new file mode 100644 index 000000000..e2930614e --- /dev/null +++ b/src/assets/images/theme/gov/icons-collaps-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/gov/icons-collaps-up.svg b/src/assets/images/theme/gov/icons-collaps-up.svg new file mode 100644 index 000000000..f7678ebca --- /dev/null +++ b/src/assets/images/theme/gov/icons-collaps-up.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/icons-nav-a-es-inactive 3.svg b/src/assets/images/theme/gov/icons-nav-a-es-inactive.svg similarity index 100% rename from src/assets/images/theme/icons-nav-a-es-inactive 3.svg rename to src/assets/images/theme/gov/icons-nav-a-es-inactive.svg diff --git a/src/assets/images/theme/icons-nav-agenda-inactive 1.svg b/src/assets/images/theme/gov/icons-nav-agenda-inactive.svg similarity index 100% rename from src/assets/images/theme/icons-nav-agenda-inactive 1.svg rename to src/assets/images/theme/gov/icons-nav-agenda-inactive.svg diff --git a/src/assets/images/theme/icons-nav-grupos-inactive-dk-white 2.svg b/src/assets/images/theme/gov/icons-nav-grupos-inactive-dk-white.svg similarity index 100% rename from src/assets/images/theme/icons-nav-grupos-inactive-dk-white 2.svg rename to src/assets/images/theme/gov/icons-nav-grupos-inactive-dk-white.svg diff --git a/src/assets/images/theme/icons-nav-home-active-black 1.svg b/src/assets/images/theme/gov/icons-nav-home-active-black.svg similarity index 100% rename from src/assets/images/theme/icons-nav-home-active-black 1.svg rename to src/assets/images/theme/gov/icons-nav-home-active-black.svg diff --git a/src/assets/images/theme/icons-nav-home-dk 3.svg b/src/assets/images/theme/gov/icons-nav-home-dk.svg similarity index 100% rename from src/assets/images/theme/icons-nav-home-dk 3.svg rename to src/assets/images/theme/gov/icons-nav-home-dk.svg diff --git a/src/assets/images/theme/gov/icons-received-event.svg b/src/assets/images/theme/gov/icons-received-event.svg new file mode 100644 index 000000000..ddeddbc08 --- /dev/null +++ b/src/assets/images/theme/gov/icons-received-event.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/images/theme/icons-search 2.svg b/src/assets/images/theme/gov/icons-search.svg similarity index 100% rename from src/assets/images/theme/icons-search 2.svg rename to src/assets/images/theme/gov/icons-search.svg diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 7a34a7cad..4deb35ded 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -541,9 +541,8 @@ $app-theme: mat-light-theme( margin: 0 auto !important; } -.btn-cancel:hover, -.btn-delete:hover { - background-color: #42b9fe; +.btn-cancel:hover, .btn-delete:hover{ + background-color: var(--button-hover); color: #ffffff !important; }