From 9513542c566a27b02f935535bc25f64030c04b96 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 21 Oct 2021 15:05:37 +0100 Subject: [PATCH 1/5] Improve --- src/app/pages/events/events.page.html | 23 ++++++++++++++++++- src/app/pages/events/events.page.ts | 3 ++- src/app/services/theme.service.ts | 2 ++ src/app/shared/header/header.page.html | 23 +++++++++++++------ src/app/shared/header/header.page.ts | 5 +++- .../icons-arrow-circle-arrow-right.svg} | 0 .../icons-nav-a-es-inactive.svg} | 0 .../icons-nav-agenda-inactive.svg} | 0 .../icons-nav-grupos-inactive-dk-white.svg} | 0 .../icons-nav-home-active-black.svg} | 0 .../icons-nav-home-dk.svg} | 0 .../icons-search.svg} | 0 src/theme/variables.scss | 2 +- 13 files changed, 47 insertions(+), 11 deletions(-) rename src/assets/images/theme/{icons-arrow-circle-arrow-right 2.svg => gov/icons-arrow-circle-arrow-right.svg} (100%) rename src/assets/images/theme/{icons-nav-a-es-inactive 3.svg => gov/icons-nav-a-es-inactive.svg} (100%) rename src/assets/images/theme/{icons-nav-agenda-inactive 1.svg => gov/icons-nav-agenda-inactive.svg} (100%) rename src/assets/images/theme/{icons-nav-grupos-inactive-dk-white 2.svg => gov/icons-nav-grupos-inactive-dk-white.svg} (100%) rename src/assets/images/theme/{icons-nav-home-active-black 1.svg => gov/icons-nav-home-active-black.svg} (100%) rename src/assets/images/theme/{icons-nav-home-dk 3.svg => gov/icons-nav-home-dk.svg} (100%) rename src/assets/images/theme/{icons-search 2.svg => gov/icons-search.svg} (100%) 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/services/theme.service.ts b/src/app/services/theme.service.ts index 74f0e7012..a9726e021 100644 --- a/src/app/services/theme.service.ts +++ b/src/app/services/theme.service.ts @@ -10,6 +10,8 @@ export class ThemeService { 'default' ] + currentTheme = 'gov' + constructor() { } setTheme() {} diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index a63e6df67..b45c00feb 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -28,32 +28,40 @@
- - + + + + Início
- + + Agenda
- + + + + Gabinete
- + + Acções
- + + Chat
@@ -62,7 +70,8 @@
- + +
@@ -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/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/shared/header/header.page.html b/src/app/shared/header/header.page.html index b45c00feb..f056a7689 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -9,7 +9,8 @@
{{this.notificationLength}}
@@ -21,7 +22,10 @@
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 @@