Now able to change brightness of lights from more info dialog

This commit is contained in:
Paulus Schoutsen 2014-12-29 23:40:27 -08:00
parent 973525da6d
commit cfeb1f1538
9 changed files with 110 additions and 6 deletions

View file

@ -1,2 +1,2 @@
""" DO NOT MODIFY. Auto-generated by build_frontend script """ """ DO NOT MODIFY. Auto-generated by build_frontend script """
VERSION = "9e0c2f360a70a0f7fc95e814d7e99dc1" VERSION = "230e724e74d2deaf5b91eafa63c59c94"

File diff suppressed because one or more lines are too long

View file

@ -33,6 +33,7 @@
"paper-dropdown": "polymer/paper-dropdown#~0.5.2", "paper-dropdown": "polymer/paper-dropdown#~0.5.2",
"paper-item": "polymer/paper-item#~0.5.2", "paper-item": "polymer/paper-item#~0.5.2",
"moment": "~2.8.4", "moment": "~2.8.4",
"core-style": "polymer/core-style#~0.5.2" "core-style": "polymer/core-style#~0.5.2",
"paper-slider": "polymer/paper-slider#~0.5.2"
} }
} }

View file

@ -7,7 +7,7 @@
<template> <template>
<style> <style>
.state { .state {
margin-left: 10px; margin-left: 16px;
text-transform: capitalize; text-transform: capitalize;
font-weight: 300; font-weight: 300;
font-size: 1.3rem; font-size: 1.3rem;

View file

@ -2,6 +2,7 @@
<link rel="import" href="../bower_components/core-style/core-style.html"> <link rel="import" href="../bower_components/core-style/core-style.html">
<link rel="import" href="../cards/state-card-content.html"> <link rel="import" href="../cards/state-card-content.html">
<link rel="import" href="../more-infos/more-info-content.html">
<polymer-element name="state-card-dialog" attributes="api"> <polymer-element name="state-card-dialog" attributes="api">
<template> <template>
@ -12,8 +13,14 @@
<core-style ref='ha-dialog'></core-style> <core-style ref='ha-dialog'></core-style>
<style>
</style>
<div> <div>
<state-card-content stateObj="{{stateObj}}" api="{{api}}"></state-card-content> <state-card-content stateObj="{{stateObj}}" api="{{api}}"></state-card-content>
<br />
<more-info-content stateObj="{{stateObj}}" api="{{api}}"></more-info-content>
</div> </div>
<paper-button dismissive>Dismiss</paper-button> <paper-button dismissive>Dismiss</paper-button>

View file

@ -72,6 +72,17 @@
return "display"; return "display";
} }
} }
},
// how to render the more info of this state
moreInfoType: {
get: function() {
if(this.domain === 'light') {
return 'light';
} else {
return 'default';
}
}
} }
}); });

View file

@ -0,0 +1,21 @@
<link rel="import" href="../bower_components/polymer/polymer.html">
<link rel="import" href="more-info-default.html">
<link rel="import" href="more-info-light.html">
<polymer-element name="more-info-content" attributes="api stateObj" noscript>
<template>
<template id="more-info-light">
<more-info-light
api="{{api}}"
stateObj="{{stateObj}}">
</more-info-light>
</template>
<template id="more-info-default">
<more-info-default stateObj="{{stateObj}}"></more-info-default>
</template>
<template bind ref="{{'more-info-' + stateObj.moreInfoType}}"></template>
</template>
</polymer-element>

View file

@ -0,0 +1,9 @@
<link rel="import" href="../bower_components/polymer/polymer.html">
<polymer-element name="more-info-default" attributes="stateObj" noscript>
<template>
<div>
No further options here yet..
</div>
</template>
</polymer-element>

View file

@ -0,0 +1,53 @@
<link rel="import" href="../bower_components/polymer/polymer.html">
<link rel="import" href="../bower_components/paper-slider/paper-slider.html">
<polymer-element name="more-info-light" attributes="stateObj api">
<template>
<style>
.brightness paper-slider::shadow #sliderKnobInner,
.brightness paper-slider::shadow #sliderBar::shadow #activeProgress {
background-color: #039be5;
}
</style>
<div>
<div center horizontal layout class='brightness'>
<div>Brightness</div>
<paper-slider
max="255" flex
on-core-change="{{brightnessSliderChanged}}"
value="{{brightnessValue}}">
</paper-slider>
</div>
</div>
</template>
<script>
Polymer({
brightnessValue: 0,
observe: {
'stateObj.attributes.brightness': 'brightnessChanged'
},
brightnessChanged: function(oldVal, newVal) {
this.brightnessValue = newVal;
},
brightnessSliderChanged: function(ev, details, target) {
var bri = parseInt(target.value);
if(isNaN(bri)) return;
if(bri === 0) {
this.api.turn_off(this.stateObj.entity_id);
} else {
this.api.call_service("light", "turn_on", {
entity_id: this.stateObj.entity_id,
brightness: bri
});
}
}
});
</script>
</polymer-element>