From 0ef2ebfe31448b3d7f7746553e31ce8b39968156 Mon Sep 17 00:00:00 2001
From: estevez-dev <vyalov.egor@gmail.com>
Date: Sun, 10 Mar 2019 23:49:05 +0200
Subject: [PATCH] Fix 'Paste color' button background when saved color is null

---
 .../controls/light_controls.dart              | 49 +++++++++----------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/lib/entity_widgets/controls/light_controls.dart b/lib/entity_widgets/controls/light_controls.dart
index 2fbbe70..8fbadf6 100644
--- a/lib/entity_widgets/controls/light_controls.dart
+++ b/lib/entity_widgets/controls/light_controls.dart
@@ -179,32 +179,29 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
             color: _tmpColor,
             onColorSelected: (color) => _setColor(entity, color),
           ),
-          Padding(
-            padding: EdgeInsets.only(top: 0.0),
-            child: Row(
-              mainAxisSize: MainAxisSize.min,
-              children: <Widget>[
-                FlatButton(
-                  color: _tmpColor.toColor(),
-                  child: Text('Copy color'),
-                  onPressed: _tmpColor == null ? null : () {
-                    setState(() {
-                      HomeAssistantModel
-                          .of(context)
-                          .homeAssistant
-                          .savedColor = _tmpColor;
-                    });
-                  },
-                ),
-                FlatButton(
-                  color: savedColor.toColor(),
-                  child: Text('Paste color'),
-                  onPressed: savedColor == null ? null : () {
-                    _setColor(entity, savedColor);
-                  },
-                )
-              ],
-            )
+          Row(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              FlatButton(
+                color: _tmpColor.toColor(),
+                child: Text('Copy color'),
+                onPressed: _tmpColor == null ? null : () {
+                  setState(() {
+                    HomeAssistantModel
+                        .of(context)
+                        .homeAssistant
+                        .savedColor = _tmpColor;
+                  });
+                },
+              ),
+              FlatButton(
+                color: savedColor?.toColor() ?? Colors.transparent,
+                child: Text('Paste color'),
+                onPressed: savedColor == null ? null : () {
+                  _setColor(entity, savedColor);
+                },
+              )
+            ],
           )
         ],
       );