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

Resolves #163 Location title

Browse Source
This commit is contained in:
Yegor Vialov
2018-11-04 21:02:12 +02:00
parent 04d8681656
commit bb17885b4a
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/home_assistant.class.dart
View File

@ -40,7 +40,13 @@ class HomeAssistant {
Duration fetchTimeout = Duration(seconds: 30); Duration fetchTimeout = Duration(seconds: 30);
Duration connectTimeout = Duration(seconds: 15); Duration connectTimeout = Duration(seconds: 15);
String get locationName => _instanceConfig["location_name"] ?? ""; String get locationName {
if (_useLovelace) {
return ui?.title ?? "";
} else {
return _instanceConfig["location_name"] ?? "";
}
}
String get userName => _userName ?? locationName; String get userName => _userName ?? locationName;
String get userAvatarText => userName.length > 0 ? userName[0] : ""; String get userAvatarText => userName.length > 0 ? userName[0] : "";
//int get viewsCount => entities.views.length ?? 0; //int get viewsCount => entities.views.length ?? 0;
@ -376,8 +382,8 @@ class HomeAssistant {
} }
void _parseLovelace() { void _parseLovelace() {
ui = HomeAssistantUI();
TheLogger.debug("--Title: ${_rawLovelaceData["title"]}"); TheLogger.debug("--Title: ${_rawLovelaceData["title"]}");
ui.title = _rawLovelaceData["title"];
int viewCounter = 0; int viewCounter = 0;
TheLogger.debug("--Views count: ${_rawLovelaceData['views'].length}"); TheLogger.debug("--Views count: ${_rawLovelaceData['views'].length}");
_rawLovelaceData["views"].forEach((rawView){ _rawLovelaceData["views"].forEach((rawView){
@ -437,12 +443,12 @@ class HomeAssistant {
} }
void _createUI() { void _createUI() {
ui = HomeAssistantUI();
if ((_useLovelace) && (_rawLovelaceData != null)) { if ((_useLovelace) && (_rawLovelaceData != null)) {
TheLogger.debug("Creating Lovelace UI"); TheLogger.debug("Creating Lovelace UI");
_parseLovelace(); _parseLovelace();
} else { } else {
TheLogger.debug("Creating group-based UI"); TheLogger.debug("Creating group-based UI");
ui = HomeAssistantUI();
int viewCounter = 0; int viewCounter = 0;
if (!entities.hasDefaultView) { if (!entities.hasDefaultView) {
HAView view = HAView( HAView view = HAView(

1
lib/ui_class/ui.dart
View File

@ -2,6 +2,7 @@ part of '../main.dart';
class HomeAssistantUI { class HomeAssistantUI {
List<HAView> views; List<HAView> views;
String title;
HomeAssistantUI() { HomeAssistantUI() {
views = []; views = [];