diff --git a/lib/features/devices/view/widgets/6_scene_switch/select_scene_page.dart b/lib/features/devices/view/widgets/6_scene_switch/select_scene_page.dart index cb1ee63..ab6fb36 100644 --- a/lib/features/devices/view/widgets/6_scene_switch/select_scene_page.dart +++ b/lib/features/devices/view/widgets/6_scene_switch/select_scene_page.dart @@ -242,53 +242,45 @@ class SceneItem extends StatelessWidget { ], ), padding: const EdgeInsets.all(16), - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Column( + Row( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - if (!disablePlayButton) - Expanded( - child: Image.memory( - icon, - height: 32, - width: 32, - fit: BoxFit.fill, - errorBuilder: (context, error, stackTrace) => Image.asset( - Assets.assetsIconsLogo, - height: 32, - width: 32, - fit: BoxFit.fill), - ), - ), - Spacer(), - Expanded( - child: Container( - width: MediaQuery.of(context).size.width * 0.3, - child: Row( - children: [ - BodyMedium( - text: title, - style: const TextStyle( - fontSize: 17, - fontWeight: FontWeight.w700, - color: ColorsManager.secondaryTextColor), - textAlign: TextAlign.center, - ), - ], - ), - ), + Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + if (!disablePlayButton) + Image.memory( + icon, + height: 32, + width: 32, + fit: BoxFit.fill, + errorBuilder: (context, error, stackTrace) => Image.asset( + Assets.assetsIconsLogo, + height: 32, + width: 32, + fit: BoxFit.fill), + ), + ], + ), + CircularCheckbox( + value: value, + onChanged: (isSelected) => onChanged(isSelected!), ), ], ), - Expanded( - child: CircularCheckbox( - value: value, - onChanged: (isSelected) => onChanged(isSelected!), - ), + BodyMedium( + text: title, + style: const TextStyle( + fontSize: 17, + fontWeight: FontWeight.w700, + color: ColorsManager.secondaryTextColor), + textAlign: TextAlign.center, ), ], ), diff --git a/lib/features/devices/view/widgets/four_scene_switch/four_select_scene_page.dart b/lib/features/devices/view/widgets/four_scene_switch/four_select_scene_page.dart index bf18442..9346f58 100644 --- a/lib/features/devices/view/widgets/four_scene_switch/four_select_scene_page.dart +++ b/lib/features/devices/view/widgets/four_scene_switch/four_select_scene_page.dart @@ -213,39 +213,45 @@ class SceneItem extends StatelessWidget { ], ), padding: const EdgeInsets.all(16), - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.center, + Row( + crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - if (!disablePlayButton) - Image.memory( - icon, - height: 32, - width: 32, - fit: BoxFit.fill, - errorBuilder: (context, error, stackTrace) => Image.asset( - Assets.assetsIconsLogo, + Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + if (!disablePlayButton) + Image.memory( + icon, height: 32, width: 32, - fit: BoxFit.fill), - ), - BodyMedium( - text: title, - style: const TextStyle( - fontSize: 17, - fontWeight: FontWeight.w700, - color: ColorsManager.secondaryTextColor), - textAlign: TextAlign.center, + fit: BoxFit.fill, + errorBuilder: (context, error, stackTrace) => Image.asset( + Assets.assetsIconsLogo, + height: 32, + width: 32, + fit: BoxFit.fill), + ), + ], + ), + CircularCheckbox( + value: value, + onChanged: (isSelected) => onChanged(isSelected!), ), ], ), - CircularCheckbox( - value: value, - onChanged: (isSelected) => onChanged(isSelected!), + BodyMedium( + text: title, + style: const TextStyle( + fontSize: 17, + fontWeight: FontWeight.w700, + color: ColorsManager.secondaryTextColor), + textAlign: TextAlign.center, ), ], ), diff --git a/pubspec.yaml b/pubspec.yaml index 42bd7df..27b05f4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ description: This is the mobile application project, developed with Flutter for # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: "none" # Remove this line if you wish to publish to pub.dev -version: 1.0.9+42 +version: 1.0.9+44 environment: sdk: ">=3.0.6 <4.0.0"