Skip to content

docs: test colors for progress components in demo-app #2841

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

Merged
merged 1 commit into from
Feb 16, 2017
Merged

docs: test colors for progress components in demo-app #2841

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
54 changes: 31 additions & 23 deletions src/demo-app/progress-bar/progress-bar-demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,45 @@
<md-button-toggle-group class="demo-progress-bar-controls" [(ngModel)]="color">
<md-button-toggle value="primary">Primary Color</md-button-toggle>
<md-button-toggle value="accent">Accent Color</md-button-toggle>
<md-button-toggle value="warn">Warn Color</md-button-toggle>
</md-button-toggle-group>

<h1>Determinate</h1>

<div class="demo-progress-bar-controls">
<span>Value: {{determinateProgressValue}}</span>
<button md-raised-button (click)="stepDeterminateProgressVal(10)">Increase</button>
<button md-raised-button (click)="stepDeterminateProgressVal(-10)">Decrease</button>
</div>

<div class="demo-progress-bar-container">
<md-progress-bar mode="determinate"
[value]="determinateProgressValue"
color="primary"
class="demo-progress-bar-margins"></md-progress-bar>
<md-progress-bar mode="determinate" [value]="determinateProgressValue" [color]="color">
</md-progress-bar>
</div>
<span>Value: {{determinateProgressValue}}</span>
<button md-raised-button (click)="stepDeterminateProgressVal(10)">Increase</button>
<button md-raised-button (click)="stepDeterminateProgressVal(-10)">Decrease</button>

<h1>Buffer</h1>

<div class="demo-progress-bar-controls">
<span>Value: {{bufferProgressValue}}</span>
<button md-raised-button (click)="stepBufferProgressVal(10)">Increase</button>
<button md-raised-button (click)="stepBufferProgressVal(-10)">Decrease</button>
<span class="demo-progress-bar-spacer"></span>
<span>Buffer Value: {{bufferBufferValue}}</span>
<button md-raised-button (click)="stepBufferBufferVal(10)">Increase</button>
<button md-raised-button (click)="stepBufferBufferVal(-10)">Decrease</button>
</div>

<div class="demo-progress-bar-container">
<md-progress-bar [value]="bufferProgressValue"
[bufferValue]="bufferBufferValue"
mode="buffer"
color="warn"
class="demo-progress-bar-margins"></md-progress-bar>
<md-progress-bar [value]="bufferProgressValue" [bufferValue]="bufferBufferValue" mode="buffer"
[color]="color"></md-progress-bar>
</div>
<span>Value: {{bufferProgressValue}}</span>
<button md-raised-button (click)="stepBufferProgressVal(10)">Increase</button>
<button md-raised-button (click)="stepBufferProgressVal(-10)">Decrease</button>
<span class="demo-progress-bar-spacer"></span>
<span>Buffer Value: {{bufferBufferValue}}</span>
<button md-raised-button (click)="stepBufferBufferVal(10)">Increase</button>
<button md-raised-button (click)="stepBufferBufferVal(-10)">Decrease</button>

<h1>Indeterminate</h1>
<div class="demo-progress-bar-container">
<md-progress-bar mode="indeterminate"
class="demo-progress-bar-margins"></md-progress-bar>
<md-progress-bar mode="indeterminate" [color]="color"></md-progress-bar>
</div>

<h1>Query</h1>
<div class="demo-progress-bar-container">
<md-progress-bar mode="query"
class="demo-progress-bar-margins"></md-progress-bar>
<md-progress-bar mode="query" [color]="color"></md-progress-bar>
</div>
10 changes: 7 additions & 3 deletions src/demo-app/progress-bar/progress-bar-demo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
.demo-progress-bar-container {
width: 100%;
}

.demo-progress-bar-margins {
margin: 20px 0;
md-progress-bar {
margin: 20px 0;
}
}

.demo-progress-bar-spacer {
display: inline-block;
width: 50px;
}

.demo-progress-bar-controls {
margin: 10px 0;
}
11 changes: 8 additions & 3 deletions src/demo-app/progress-bar/progress-bar-demo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,24 @@ import {Component} from '@angular/core';
styleUrls: ['progress-bar-demo.css'],
})
export class ProgressBarDemo {
color: string = 'primary';
determinateProgressValue: number = 30;
bufferProgressValue: number = 30;
bufferBufferValue: number = 40;

stepDeterminateProgressVal(val: number) {
this.determinateProgressValue += val;
this.determinateProgressValue = this.clampValue(val + this.determinateProgressValue);
}

stepBufferProgressVal(val: number) {
this.bufferProgressValue += val;
this.bufferProgressValue = this.clampValue(val + this.bufferProgressValue);
}

stepBufferBufferVal(val: number) {
this.bufferBufferValue += val;
this.bufferBufferValue = this.clampValue(val + this.bufferBufferValue);
}

private clampValue(value: number) {
return Math.max(0, Math.min(100, value));
}
}
31 changes: 18 additions & 13 deletions src/demo-app/progress-spinner/progress-spinner-demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
<h1>Determinate</h1>

<div class="demo-progress-spinner-controls">
<p>Value: {{progressValue}}</p>
<button md-raised-button (click)="step(10)">Increase</button>
<button md-raised-button (click)="step(-10)">Decrease</button>
</div>

<div class="demo-progress-spinner">
<md-progress-spinner mode="determinate"
[value]="progressValue"
class="mat-primary"></md-progress-spinner>
<md-progress-spinner [value]="progressValue"
color="accent"></md-progress-spinner>
<md-progress-spinner mode="determinate" [value]="progressValue" color="primary"></md-progress-spinner>
<md-progress-spinner [value]="progressValue" color="accent"></md-progress-spinner>
</div>
<span>Value: {{progressValue}}</span>
<button md-raised-button (click)="step(10)">Increase</button>
<button md-raised-button (click)="step(-10)">Decrease</button>

<h1>Indeterminate</h1>

<md-button-toggle-group class="demo-progress-spinner-controls" [(ngModel)]="color">
<md-button-toggle value="primary">Primary Color</md-button-toggle>
<md-button-toggle value="accent">Accent Color</md-button-toggle>
<md-button-toggle value="warn">Warn Color</md-button-toggle>
</md-button-toggle-group>

<h1>Indeterminate</h1>
<div class="demo-progress-spinner">
<md-progress-spinner mode="indeterminate"></md-progress-spinner>
<md-progress-spinner mode="indeterminate"
color="accent"></md-progress-spinner>
<md-spinner></md-spinner>
<md-progress-spinner mode="indeterminate" [color]="color"></md-progress-spinner>
<md-progress-spinner mode="indeterminate" [color]="color"></md-progress-spinner>
<md-spinner [color]="color"></md-spinner>
</div>
4 changes: 4 additions & 0 deletions src/demo-app/progress-spinner/progress-spinner-demo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@
}

}

.demo-progress-spinner-controls {
margin: 10px 0;
}
3 changes: 2 additions & 1 deletion src/demo-app/progress-spinner/progress-spinner-demo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import {Component} from '@angular/core';
})
export class ProgressSpinnerDemo {
progressValue: number = 40;
color: string = 'primary';

step(val: number) {
this.progressValue += val;
this.progressValue = Math.max(0, Math.min(100, val + this.progressValue));
}

}