-
-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into steam-beta
- Loading branch information
Showing
19 changed files
with
229 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
...components/brightness-advanced-mode-toggle/brightness-advanced-mode-toggle.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <div class="advanced-toggle"> | ||
| <div class="advanced-toggle-clickable" (click)="toggleAdvancedMode()"> | ||
| <label class="switch-toggle"> | ||
| <input type="checkbox" [checked]="advancedMode" disabled /> | ||
| <span class="switch-toggle-slider"></span> | ||
| </label> | ||
| <span @hshrink *ngIf="!advancedMode" translate>brightness-automations.mode.simple</span> | ||
| <span @hshrink *ngIf="advancedMode" translate>brightness-automations.mode.advanced</span> | ||
| </div> | ||
| <i class="material-icons-round help-icon" (click)="showModeInfoModal()">help</i> | ||
| </div> |
46 changes: 46 additions & 0 deletions
46
...components/brightness-advanced-mode-toggle/brightness-advanced-mode-toggle.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| .advanced-toggle { | ||
| font-size: 0.6em; | ||
| display: flex; | ||
| flex-direction: row; | ||
| align-items: center; | ||
| background: var(--color-surface-0); | ||
| border-radius: var(--surface-border-radius); | ||
|
|
||
| &-clickable { | ||
| display: flex; | ||
| flex-direction: row; | ||
| align-items: center; | ||
| padding: 0.5em 0.75em; | ||
| transition: all 0.15s ease; | ||
| cursor: pointer; | ||
|
|
||
| &:active { | ||
| opacity: 0.75; | ||
| } | ||
| } | ||
|
|
||
| .help-icon { | ||
| font-size: 1.2em; | ||
| color: var(--color-text-3); | ||
| transition: all 0.15s ease; | ||
| line-height: 0; | ||
| padding: 0.5em 0.75em 0.5em 0; | ||
|
|
||
| &:hover { | ||
| cursor: pointer; | ||
| color: var(--color-text-2); | ||
| } | ||
|
|
||
| &:active { | ||
| color: var(--color-text-3); | ||
| } | ||
| } | ||
|
|
||
| span { | ||
| white-space: nowrap; | ||
| } | ||
|
|
||
| label { | ||
| margin-right: 0.5em; | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
...p/components/brightness-advanced-mode-toggle/brightness-advanced-mode-toggle.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| import { Component } from '@angular/core'; | ||
| import { | ||
| ConfirmModalComponent, | ||
| ConfirmModalInputModel, | ||
| ConfirmModalOutputModel, | ||
| } from '../confirm-modal/confirm-modal.component'; | ||
| import { BrightnessAutomationsConfig } from '../../models/automations'; | ||
| import { ModalService } from '../../services/modal.service'; | ||
| import { AutomationConfigService } from '../../services/automation-config.service'; | ||
| import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; | ||
| import { hshrink } from '../../utils/animations'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-brightness-advanced-mode-toggle', | ||
| templateUrl: './brightness-advanced-mode-toggle.component.html', | ||
| styleUrl: './brightness-advanced-mode-toggle.component.scss', | ||
| animations: [hshrink()], | ||
| }) | ||
| export class BrightnessAdvancedModeToggleComponent { | ||
| advancedMode = false; | ||
|
|
||
| constructor( | ||
| private modalService: ModalService, | ||
| private automationConfigService: AutomationConfigService | ||
| ) { | ||
| this.automationConfigService.configs.pipe(takeUntilDestroyed()).subscribe((configs) => { | ||
| this.advancedMode = configs.BRIGHTNESS_AUTOMATIONS.advancedMode; | ||
| }); | ||
| } | ||
| showModeInfoModal() { | ||
| this.modalService | ||
| .addModal<ConfirmModalInputModel, ConfirmModalOutputModel>(ConfirmModalComponent, { | ||
| title: 'brightness-automations.modeInfoModal.title', | ||
| message: 'brightness-automations.modeInfoModal.message', | ||
| confirmButtonText: 'shared.modals.ok', | ||
| showCancel: false, | ||
| }) | ||
| .subscribe(); | ||
| } | ||
|
|
||
| async toggleAdvancedMode() { | ||
| await this.automationConfigService.updateAutomationConfig<BrightnessAutomationsConfig>( | ||
| 'BRIGHTNESS_AUTOMATIONS', | ||
| { advancedMode: !this.advancedMode } | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 1 addition & 11 deletions
12
...shboard-view/views/brightness-automations-view/brightness-automations-view.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.