change hover color on publications, colors of icons on edit-profil, splash screen changed

This commit is contained in:
Eudes Inácio
2021-10-26 15:27:25 +01:00
parent e126ca2e96
commit 2a00ea8a76
28 changed files with 46 additions and 27 deletions
+1 -7
View File
@@ -27,12 +27,6 @@
<resource-file src="resources/android/xml/network_security_config.xml" target="app/src/main/res/xml/network_security_config.xml" /> <resource-file src="resources/android/xml/network_security_config.xml" target="app/src/main/res/xml/network_security_config.xml" />
<resource-file src="google-services.json" target="google-services.json" /> <resource-file src="google-services.json" target="google-services.json" />
<allow-intent href="market:*" /> <allow-intent href="market:*" />
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
<icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
<icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
<icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
<icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
<icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
<splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" /> <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
<splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" /> <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
<splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" /> <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
@@ -47,7 +41,7 @@
<splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" /> <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
</platform> </platform>
<mfp:android> <mfp:android>
<mfp:sdkChecksum>3077110622</mfp:sdkChecksum> <mfp:sdkChecksum>1109370933</mfp:sdkChecksum>
<mfp:appChecksum>3619450036</mfp:appChecksum> <mfp:appChecksum>3619450036</mfp:appChecksum>
<mfp:security> <mfp:security>
<mfp:testWebResourcesChecksum enabled="false" ignoreFileExtensions="png, jpg, jpeg, gif, mp4, mp3" /> <mfp:testWebResourcesChecksum enabled="false" ignoreFileExtensions="png, jpg, jpeg, gif, mp4, mp3" />
+1 -1
View File
@@ -199,4 +199,4 @@
"url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git" "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git"
}, },
"license": "ISC" "license": "ISC"
} }
Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 196 KiB

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 16 KiB

@@ -36,7 +36,7 @@
<div class="container-div width-100"> <div class="container-div width-100">
<div class="ion-item-class-2"> <div class="ion-item-class-2">
<div class="ion-icon-class"> <div class="ion-icon-class">
<ion-icon slot="start" name="person"></ion-icon> <ion-icon slot="start" name="person" class="ion-icon-class-theme"></ion-icon>
</div> </div>
<div class="ion-input-class"> <div class="ion-input-class">
<ion-input disabled placeholder="Nome" [(ngModel)]="SessionStore.user.FullName"></ion-input> <ion-input disabled placeholder="Nome" [(ngModel)]="SessionStore.user.FullName"></ion-input>
@@ -47,7 +47,7 @@
<div class="container-div width-100"> <div class="container-div width-100">
<div class="ion-item-class-2"> <div class="ion-item-class-2">
<div class="ion-icon-class"> <div class="ion-icon-class">
<ion-icon slot="start" name="mail"></ion-icon> <ion-icon slot="start" name="mail" class="ion-icon-class-theme"></ion-icon>
</div> </div>
<div class="ion-input-class"> <div class="ion-input-class">
<ion-input disabled placeholder="Email" [(ngModel)]="SessionStore.user.Email"></ion-input> <ion-input disabled placeholder="Email" [(ngModel)]="SessionStore.user.Email"></ion-input>
@@ -63,14 +63,14 @@
<div class="profile-title d-flex justify-space-between align-center width-100"> <div class="profile-title d-flex justify-space-between align-center width-100">
<div class="d-flex align-center"> <div class="d-flex align-center">
<div class="btn-close d-flex cursor-pointer pr-10" (click)="changeTheme('default')" >
<img style="width: 40px;" src="assets/images/logo-removebg-preview.png"/>
</div>
<div class="btn-close d-flex cursor-pointer" (click)="changeTheme('gov')"> <div class="btn-close d-flex cursor-pointer" (click)="changeTheme('gov')">
<img style="width: 40px;" src="assets/images/theme/gov/governoangola_A.png"> <img style="width: 40px;" src="assets/images/theme/gov/governoangola_A.png">
</div> </div>
<div class="btn-close d-flex cursor-pointer pr-10" (click)="changeTheme('default')" >
<img style="width: 40px;" src="assets/images/logo-removebg-preview.png"/>
</div>
</div> </div>
</div> </div>
@@ -96,6 +96,10 @@
border-color: transparent !important; border-color: transparent !important;
} }
.ion-icon-class-theme {
color: var(--profile-text-color) ;
}
.login-preference{ .login-preference{
margin-top: 15px; margin-top: 15px;
float: left; float: left;
+8 -3
View File
@@ -9,7 +9,8 @@ import { NotificationsService } from 'src/app/services/notifications.service';
import { SessionStore } from 'src/app/store/session.service'; import { SessionStore } from 'src/app/store/session.service';
import { ClearStoreService } from 'src/app/services/clear-store.service'; import { ClearStoreService } from 'src/app/services/clear-store.service';
import { ChangeProfileService } from 'src/app/services/change-profile.service'; import { ChangeProfileService } from 'src/app/services/change-profile.service';
import { ThemeService } from 'src/app/services/theme.service' import { ThemeService } from 'src/app/services/theme.service';
import { StorageService } from 'src/app/services/storage.service'
@Component({ @Component({
selector: 'app-login', selector: 'app-login',
@@ -37,11 +38,15 @@ export class LoginPage implements OnInit {
public alertController: AlertController, public alertController: AlertController,
private clearStoreService: ClearStoreService, private clearStoreService: ClearStoreService,
private changeProfileService: ChangeProfileService, private changeProfileService: ChangeProfileService,
public ThemeService: ThemeService public themeservice: ThemeService,
private storageservice: StorageService
) {} ) {}
ngOnInit() { ngOnInit() {
this.storageservice.get('theme').then((theme) =>{
console.log('LOGIN THEME',theme)
this.themeservice.setTheme(theme)
})
} }
//Function to validade the login inputs //Function to validade the login inputs
@@ -177,7 +177,7 @@ ion-toolbar{
} }
.item:hover{ .item:hover{
background-color: #e6f6ff75; background-color: var(--box-hover-background-color) !important;
} }
ion-item-options{ ion-item-options{
+20 -6
View File
@@ -1,4 +1,5 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ThemeService } from 'src/app/services/theme.service';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@@ -11,14 +12,27 @@ export class BackgroundService {
funx: Function funx: Function
}[] = [] }[] = []
constructor() { } constructor(
private themeservice: ThemeService
) { }
online() { online() {
document.body.style.setProperty(`--color`, "#0782C9"); if (this.themeservice.currentTheme == 'gov') {
document.body.style.setProperty(`--color2`, "#45BAFF");
document.body.style.setProperty(`--color3`, "#0782C9"); document.body.style.setProperty(`--color`, "#d9d9d9");
document.body.style.setProperty(`--color4`, "#0782c9f0"); document.body.style.setProperty(`--color2`, "#f0f0f0");
document.body.style.setProperty(`--color5`, "#45BAFF"); document.body.style.setProperty(`--color3`, "#d9d9d9");
document.body.style.setProperty(`--color4`, "#d9d9d9ee");
document.body.style.setProperty(`--color5`, "#ececec");
} else {
document.body.style.setProperty(`--color`, "#0782C9");
document.body.style.setProperty(`--color2`, "#45BAFF");
document.body.style.setProperty(`--color3`, "#0782C9");
document.body.style.setProperty(`--color4`, "#0782c9f0");
document.body.style.setProperty(`--color5`, "#45BAFF");
}
this.callBacks.forEach((e) => { this.callBacks.forEach((e) => {
if (e.type == 'Online') { if (e.type == 'Online') {
e.funx() e.funx()
+4 -2
View File
@@ -1,4 +1,5 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { StorageService } from 'src/app/services/storage.service';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@@ -12,7 +13,7 @@ export class ThemeService {
currentTheme = 'gov' currentTheme = 'gov'
constructor() { } constructor(private storageservice: StorageService) { }
setTheme(theme: 'gov' | 'default') { setTheme(theme: 'gov' | 'default') {
@@ -20,7 +21,8 @@ export class ThemeService {
document.body.classList.remove("default"); document.body.classList.remove("default");
document.body.classList.add(theme); document.body.classList.add(theme);
this.currentTheme = theme this.currentTheme = theme
console.log('Current theme', theme) console.log('Current theme', theme);
this.storageservice.store('theme',theme);
} }
+1 -1
View File
@@ -375,7 +375,7 @@ $app-theme: mat-light-theme(
} */ } */
.item-hover:hover { .item-hover:hover {
background-color: var(--box-hover-background-color); background-color: var(--box-hover-background-color) !important;
} }
.box-hover:hover { .box-hover:hover {