refactor: Make tiles have customizable background color

Yonomi · Dec 29, 2021 · cd0fa7f · cd0fa7f
1 parent db0ec27
commit cd0fa7f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/lib/traits/detail_screen.dart b/lib/traits/detail_screen.dart
@@ -105,7 +105,7 @@ class DetailScreenWidget extends StatelessWidget {
     }
   }
 
-  Widget _createTraitListWidget(Trait trait) {
+  Widget _createTraitListWidget(Trait trait, {backgroundColor = Colors.white}) {
     switch (trait.runtimeType) {
       case LockTrait:
         return Consumer<LockProvider>(builder: (_, lockProvider, child) {
@@ -145,10 +145,12 @@ class DetailScreenWidget extends StatelessWidget {
       case BatteryLevelTrait:
         return Consumer<BatteryLevelTraitProvider>(
             builder: (_, batteryLevelTraitProvider, child) {
-          return BatteryExpandWidget(batteryLevelTraitProvider);
+          return BatteryExpandWidget(batteryLevelTraitProvider,
+              backgroundColor: backgroundColor);
         });
       default:
         return DeviceExpandableWidget(
+          backgroundColor: backgroundColor,
           leftIcon: UnknownItemIcon(
             size: 20.0,
             color: WidgetStyleConstants.deviceDetailIconColorActive,

diff --git a/lib/traits/expandable/battery_expand_widget.dart b/lib/traits/expandable/battery_expand_widget.dart
@@ -4,8 +4,10 @@ import 'package:yonomi_device_widgets/traits/expandable/device_expandable_widget
 import 'package:yonomi_device_widgets/ui/widget_style_constants.dart';
 
 class BatteryExpandWidget extends DeviceExpandableWidget {
-  BatteryExpandWidget(_batteryLevelTraitProvider, {Key? key})
+  BatteryExpandWidget(_batteryLevelTraitProvider,
+      {Color? backgroundColor, Key? key})
       : super(
+          backgroundColor: backgroundColor,
           leftIcon:
               _getBatteryLevelIcon(_batteryLevelTraitProvider.getBatteryLevel),
           headerText: Text(

diff --git a/lib/traits/expandable/device_expandable_widget.dart b/lib/traits/expandable/device_expandable_widget.dart
@@ -9,11 +9,14 @@ class DeviceExpandableWidget extends StatelessWidget {
 
   final Widget? content;
 
+  final Color? backgroundColor;
+
   DeviceExpandableWidget(
       {required this.leftIcon,
       required this.headerText,
       this.rightIcon,
       this.content,
+      this.backgroundColor,
       Key? key})
       : super(key: key);
 
@@ -27,6 +30,7 @@ class DeviceExpandableWidget extends StatelessWidget {
     return ExpansionTile(
       childrenPadding: EdgeInsets.all(8.0),
       trailing: rightIcon,
+      backgroundColor: backgroundColor,
       title: Row(children: [
         leftIcon,
         Padding(padding: EdgeInsets.all(8.0)),
@@ -41,6 +45,7 @@ class DeviceExpandableWidget extends StatelessWidget {
 
   Widget _tile() {
     return ListTile(
+      tileColor: backgroundColor,
       trailing: rightIcon,
       title: Row(children: [
         leftIcon,