Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add high contrast theme #357

Merged
merged 1 commit into from
Apr 1, 2024
Merged

feat: add high contrast theme #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@
<button mat-menu-item routerLink="/settings">
<div class="menu-items-with-icons"><i class="fa-solid fa-sliders" aria-hidden="true"></i>&nbsp;Settings</div>
</button>
<!-- <button mat-menu-item [disabled]="isNightMode" [matMenuTriggerFor]="themesMenu"> -->
<!-- <span><i class="fa-solid fa-paint-brush"></i> Themes</span> -->
<!-- </button> -->
<button mat-menu-item [disabled]="!unlockStatus" (click)="newPage()">
<div class="menu-items-with-icons"><i class="fa-solid fa-plus-square" aria-hidden="true"></i>&nbsp;Add Page</div>
</button>
Expand All @@ -63,30 +60,3 @@
<div class="menu-items-with-icons" *ngIf="unlockStatus"><i class="fa-solid fa-lock" aria-hidden="true"></i>&nbsp;Lock Layout</div>
</button>
</mat-menu>

<mat-menu #themesMenu="matMenu" xPosition="before">
<button mat-menu-item (click)="setTheme('default-light')">
<span><i *ngIf="themeName == 'default-light' else elseBlock" class="fa-solid fa-circle" aria-hidden="true"></i>&nbsp;Light Blue</span>
<ng-template #elseBlock><i class="fa-solid fa-circle-o" aria-hidden="true"></i></ng-template>
</button>
<button mat-menu-item (click)="setTheme('signalk-light')">
<span><i *ngIf="themeName == 'signalk-light' else elseBlock" class="fa-solid fa-circle" aria-hidden="true"></i>&nbsp;Signal K</span>
<ng-template #elseBlock><i class="fa-solid fa-circle-o" aria-hidden="true"></i></ng-template>
</button>
<button mat-menu-item (click)="setTheme('high-contrast-light')">
<span><i *ngIf="themeName == 'high-contrast-light' else elseBlock" class="fa-solid fa-circle" aria-hidden="true"></i>&nbsp;High Contrast</span>
<ng-template #elseBlock><i class="fa-solid fa-circle-o" aria-hidden="true"></i></ng-template>
</button>
<button mat-menu-item (click)="setTheme('platypus-light')">
<span><i *ngIf="themeName == 'platypus-light' else elseBlock" class="fa-solid fa-circle" aria-hidden="true"></i>&nbsp;Platypus</span>
<ng-template #elseBlock><i class="fa-solid fa-circle-o" aria-hidden="true"></i></ng-template>
</button>
<button mat-menu-item (click)="setTheme('darkBlue-dark')">
<span><i *ngIf="themeName == 'darkBlue-dark' else elseBlock" class="fa-solid fa-circle" aria-hidden="true"></i>&nbsp;Dark Blue</span>
<ng-template #elseBlock><i class="fa-solid fa-circle-o" aria-hidden="true"></i></ng-template>
</button>
<button mat-menu-item (click)="setTheme('modern-dark')">
<span><i *ngIf="themeName == 'modern-dark' else elseBlock" class="fa-solid fa-circle" aria-hidden="true"></i>&nbsp;Modern Dark</span>
<ng-template #elseBlock><i class="fa-solid fa-circle-o" aria-hidden="true"></i></ng-template>
</button>
</mat-menu>
4 changes: 0 additions & 4 deletions src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,6 @@ export class AppComponent implements OnInit, OnDestroy {
}
}

setTheme(theme: string) {
this.appSettingsService.setThemeName(theme);
}

setNightMode(nightMode: boolean) {
this.isNightMode = nightMode;
if (this.isNightMode) {
Expand Down
6 changes: 3 additions & 3 deletions src/app/settings/general/general.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="mat-typography">
<form #general="ngForm" name="GeneraSetting">
<h2>Night Vision</h2>
<mat-checkbox [(ngModel)]="autoNightModeConfig" [ngModelOptions]="{standalone: false}" name="autoNightMode" (change)="isAutoNightPathSupported($event)">Automatically change between Day and Night display modes based on sun phases</mat-checkbox>
<br/><br/>
<h2>Display Modes</h2>
<mat-checkbox class="full-width" [(ngModel)]="autoNightModeConfig" [ngModelOptions]="{standalone: false}" name="autoNightMode" (change)="isAutoNightPathSupported($event)">Automatically change between Day and Night Modes based on sun phases preserving your night vision</mat-checkbox>
<mat-checkbox class="full-width" [(ngModel)]="enableHighContrast" [ngModelOptions]="{standalone: false}" name="enableHighContrast" (change)="setTheme($event)">Enable full sunlight High Contrast, black and white display</mat-checkbox>
<h2>Notifications</h2>
<p class="mat-card-subtitle">Notifications are a special type of data sent from Signal K and displayed in the
notification menu. They are meant to alert or inform operators. Set server
Expand Down
10 changes: 9 additions & 1 deletion src/app/settings/general/general.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { MatButton } from '@angular/material/button';
import { MatDivider } from '@angular/material/divider';
import { MatAccordion, MatExpansionPanel, MatExpansionPanelHeader, MatExpansionPanelTitle, MatExpansionPanelDescription } from '@angular/material/expansion';
import { MatSlideToggle } from '@angular/material/slide-toggle';
import { MatCheckbox } from '@angular/material/checkbox';
import { MatCheckbox, MatCheckboxChange } from '@angular/material/checkbox';
import { FormsModule } from '@angular/forms';


Expand All @@ -33,6 +33,7 @@ export class SettingsGeneralComponent implements OnInit {

public notificationConfig: INotificationConfig;
public autoNightModeConfig: boolean;
public enableHighContrast: boolean = null;

constructor(
private notifications: NotificationsService,
Expand All @@ -43,13 +44,16 @@ export class SettingsGeneralComponent implements OnInit {
ngOnInit() {
this.notificationConfig = this.settings.getNotificationConfig();
this.autoNightModeConfig = this.app.autoNightMode;
this.enableHighContrast = (this.settings.getThemeName() == "high-contrast") ? true : false;
}

public saveAllSettings():void {
try {
this.saveNotificationsSettings();
this.saveAutoNightMode();
this.notifications.sendSnackbarNotification("General settings saved", 5000, false);
this.enableHighContrast ? this.settings.setThemeName("high-contrast") : this.settings.setThemeName("modernDark")

} catch (error) {
this.notifications.sendSnackbarNotification("Error saving settings: " + error, 5000, false);
}
Expand All @@ -71,4 +75,8 @@ export class SettingsGeneralComponent implements OnInit {
}
}
}

setTheme(e: MatCheckboxChange) {
this.enableHighContrast = e.checked;
}
}
54 changes: 14 additions & 40 deletions src/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@
// For customizations see https://material.angular.io/guide/theming-your-components

//Import themes
// @import 'themes/defaultTheme.scss';
// @import 'themes/signalkTheme.scss';
// @import 'themes/platypusTheme.scss';
// @import 'themes/highContrastTheme.scss';
// @import 'themes/darkBlueTheme.scss';
@import 'themes/modernTheme.scss';
@import 'themes/nightMode.scss';
@import 'themes/highContrastTheme.scss';

// Include the common all common Materiel styles.

Expand Down Expand Up @@ -58,25 +54,10 @@
@include theme-kip-components($nightMode);
}

// .signalk-light {
// @include theme-components($signalKTheme-light);
// }

// .high-contrast-light {
// @include theme-components($highContrast-light);
// }

// .platypus-light {
// @include theme-components($platypusTheme-light);
// }

// .darkBlue-dark {
// @include theme-components($darkBlueTheme-dark);
// }

// .modern-dark {
// @include mat.all-component-themes($modernTheme-dark);
// }
.high-contrast {
@include mat.all-component-colors($highContrast);
@include theme-kip-components($highContrast);
}

/* You can add global styles to this file, and also import other style files */
html,
Expand All @@ -95,27 +76,20 @@ body {
border-left: 5px solid #42A948; /* green */
}

.ng-invalid:not(form) {
border-left: 5px solid #a94442; /* red */
}


.ng-invalid:not(form) {
border-left: 5px solid #a94442; /* red */
}

.verticalCenter {
position: relative;
top: 50%;
transform: translateY(-50%);
position: relative;
top: 50%;
transform: translateY(-50%);
}


.flexContainer {

display: flex;
/*flex-direction: column; */
align-items: stretch;

height: 100%;

display: flex;
align-items: stretch;
height: 100%;
}

.flowRow {
Expand Down
128 changes: 0 additions & 128 deletions src/themes/darkBlueTheme.scss
View file
Open in desktop

This file was deleted.

60 changes: 0 additions & 60 deletions src/themes/defaultTheme.scss
View file
Open in desktop

This file was deleted.

Loading