Some UI improvements for #245

This commit is contained in:
estevez-dev
2019-03-13 14:08:54 +02:00
parent cb118b599a
commit 736b38b64c
2 changed files with 12 additions and 4 deletions

View File

@ -14,6 +14,10 @@ class EntityName extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper; final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
TextStyle textStyle = TextStyle(fontSize: fontSize);
if (entityWrapper.entity.statelessType == StatelessEntityType.WEBLINK) {
textStyle = textStyle.apply(color: Colors.blue, decoration: TextDecoration.underline);
}
return Padding( return Padding(
padding: padding, padding: padding,
child: Text( child: Text(
@ -21,7 +25,7 @@ class EntityName extends StatelessWidget {
overflow: textOverflow, overflow: textOverflow,
softWrap: wordsWrap, softWrap: wordsWrap,
maxLines: maxLines, maxLines: maxLines,
style: TextStyle(fontSize: fontSize), style: textStyle,
textAlign: textAlign, textAlign: textAlign,
), ),
); );

View File

@ -14,6 +14,12 @@ class SimpleEntityState extends StatelessWidget {
final entityModel = EntityModel.of(context); final entityModel = EntityModel.of(context);
String state = entityModel.entityWrapper.entity.displayState ?? ""; String state = entityModel.entityWrapper.entity.displayState ?? "";
state = state.replaceAll("\n", "").replaceAll("\t", " ").trim(); state = state.replaceAll("\n", "").replaceAll("\t", " ").trim();
TextStyle textStyle = TextStyle(
fontSize: Sizes.stateFontSize,
);
if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.CALL_SERVICE) {
textStyle = textStyle.apply(color: Colors.blue);
}
while (state.contains(" ")){ while (state.contains(" ")){
state = state.replaceAll(" ", " "); state = state.replaceAll(" ", " ");
} }
@ -25,9 +31,7 @@ class SimpleEntityState extends StatelessWidget {
maxLines: maxLines, maxLines: maxLines,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
softWrap: true, softWrap: true,
style: new TextStyle( style: textStyle
fontSize: Sizes.stateFontSize,
)
) )
); );
if (expanded) { if (expanded) {