yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#68] Badges icon size fix

Browse Source
This commit is contained in:
estevez 2018-09-23 16:07:41 +03:00
parent 4ad728d369
commit 2db432ccd2
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/data_model.dart
View File

@ -17,7 +17,7 @@ class HassioDataModel {
String _hassioPassword; String _hassioPassword;
String _hassioAuthType; String _hassioAuthType;
IOWebSocketChannel _hassioChannel; IOWebSocketChannel _hassioChannel;
int _currentMssageId = 0; int _currentMessageId = 0;
int _statesMessageId = 0; int _statesMessageId = 0;
int _servicesMessageId = 0; int _servicesMessageId = 0;
int _subscriptionMessageId = 0; int _subscriptionMessageId = 0;
@ -128,8 +128,8 @@ class HassioDataModel {
_parseEntities(data); _parseEntities(data);
} else if (data["id"] == _servicesMessageId) { } else if (data["id"] == _servicesMessageId) {
_parseServices(data); _parseServices(data);
} else if (data["id"] == _currentMssageId) { } else if (data["id"] == _currentMessageId) {
debugPrint("Request id:$_currentMssageId was successful"); debugPrint("Request id:$_currentMessageId was successful");
} else { } else {
debugPrint("Skipped message due to messageId:"); debugPrint("Skipped message due to messageId:");
debugPrint(message); debugPrint(message);
@ -150,14 +150,14 @@ class HassioDataModel {
void _sendSubscribe() { void _sendSubscribe() {
_incrementMessageId(); _incrementMessageId();
_subscriptionMessageId = _currentMssageId; _subscriptionMessageId = _currentMessageId;
_sendMessageRaw('{"id": $_subscriptionMessageId, "type": "subscribe_events", "event_type": "state_changed"}'); _sendMessageRaw('{"id": $_subscriptionMessageId, "type": "subscribe_events", "event_type": "state_changed"}');
} }
Future _getConfig() { Future _getConfig() {
_configCompleter = new Completer(); _configCompleter = new Completer();
_incrementMessageId(); _incrementMessageId();
_configMessageId = _currentMssageId; _configMessageId = _currentMessageId;
_sendMessageRaw('{"id": $_configMessageId, "type": "get_config"}'); _sendMessageRaw('{"id": $_configMessageId, "type": "get_config"}');
return _configCompleter.future; return _configCompleter.future;
@ -166,7 +166,7 @@ class HassioDataModel {
Future _getStates() { Future _getStates() {
_statesCompleter = new Completer(); _statesCompleter = new Completer();
_incrementMessageId(); _incrementMessageId();
_statesMessageId = _currentMssageId; _statesMessageId = _currentMessageId;
_sendMessageRaw('{"id": $_statesMessageId, "type": "get_states"}'); _sendMessageRaw('{"id": $_statesMessageId, "type": "get_states"}');
return _statesCompleter.future; return _statesCompleter.future;
@ -175,14 +175,14 @@ class HassioDataModel {
Future _getServices() { Future _getServices() {
_servicesCompleter = new Completer(); _servicesCompleter = new Completer();
_incrementMessageId(); _incrementMessageId();
_servicesMessageId = _currentMssageId; _servicesMessageId = _currentMessageId;
_sendMessageRaw('{"id": $_servicesMessageId, "type": "get_services"}'); _sendMessageRaw('{"id": $_servicesMessageId, "type": "get_services"}');
return _servicesCompleter.future; return _servicesCompleter.future;
} }
_incrementMessageId() { _incrementMessageId() {
_currentMssageId += 1; _currentMessageId += 1;
} }
_sendMessageRaw(message) { _sendMessageRaw(message) {
@ -278,7 +278,6 @@ class HassioDataModel {
var viewGroup = _entitiesData[viewId]; var viewGroup = _entitiesData[viewId];
Map viewGroupStructure = {}; Map viewGroupStructure = {};
if (viewGroup != null) { if (viewGroup != null) {
viewGroupStructure["standalone"] = {};
viewGroupStructure["groups"] = {}; viewGroupStructure["groups"] = {};
viewGroupStructure["state"] = "on"; viewGroupStructure["state"] = "on";
viewGroupStructure["entity_id"] = viewGroup["entity_id"]; viewGroupStructure["entity_id"] = viewGroup["entity_id"];
@ -334,7 +333,7 @@ class HassioDataModel {
}); });
_reConnectSocket().then((r) { _reConnectSocket().then((r) {
_incrementMessageId(); _incrementMessageId();
_sendMessageRaw('{"id": $_currentMssageId, "type": "call_service", "domain": "$domain", "service": "$service", "service_data": {"entity_id": "$entity_id"}}'); _sendMessageRaw('{"id": $_currentMessageId, "type": "call_service", "domain": "$domain", "service": "$service", "service_data": {"entity_id": "$entity_id"}}');
_sendTimer.cancel(); _sendTimer.cancel();
sendCompleter.complete(); sendCompleter.complete();
}).catchError((e){ }).catchError((e){

15
lib/main.dart
View File

@ -220,11 +220,20 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
} }
Widget _buildSingleBadge(data) { Widget _buildSingleBadge(data) {
double iconSize = 26.0;
Widget badgeIcon; Widget badgeIcon;
String badgeTextValue; String badgeTextValue;
switch (data["domain"]) { switch (data["domain"]) {
case "sun": { case "sun": {
badgeIcon = data["state"] == "below_horizon" ? Icon(MaterialDesignIcons.createIconDataFromIconCode(0xf0dc)) : Icon(MaterialDesignIcons.createIconDataFromIconCode(0xf5a8)); badgeIcon = data["state"] == "below_horizon" ?
Icon(
MaterialDesignIcons.createIconDataFromIconCode(0xf0dc),
size: iconSize,
) :
Icon(
MaterialDesignIcons.createIconDataFromIconCode(0xf5a8),
size: iconSize,
);
break; break;
} }
case "sensor": { case "sensor": {
@ -241,12 +250,12 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
break; break;
} }
case "device_tracker": { case "device_tracker": {
badgeIcon = MaterialDesignIcons.createIconFromEntityData(data, 50.0,Colors.black); badgeIcon = MaterialDesignIcons.createIconFromEntityData(data, iconSize,Colors.black);
badgeTextValue = data["state"]; badgeTextValue = data["state"];
break; break;
} }
default: { default: {
badgeIcon = MaterialDesignIcons.createIconFromEntityData(data, 50.0,Colors.black); badgeIcon = MaterialDesignIcons.createIconFromEntityData(data, iconSize,Colors.black);
} }
} }
Widget badgeText; Widget badgeText;