diff --git a/lib/pages/common/buttons/search_reset_buttons.dart b/lib/pages/common/buttons/search_reset_buttons.dart index 7b63a485..6fdbfd2a 100644 --- a/lib/pages/common/buttons/search_reset_buttons.dart +++ b/lib/pages/common/buttons/search_reset_buttons.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:syncrow_web/pages/common/buttons/default_button.dart'; +import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/extension/build_context_x.dart'; import 'package:syncrow_web/utils/style.dart'; -import 'package:syncrow_web/utils/color_manager.dart'; class SearchResetButtons extends StatelessWidget { const SearchResetButtons({ @@ -17,8 +17,10 @@ class SearchResetButtons extends StatelessWidget { @override Widget build(BuildContext context) { return Row( + mainAxisSize: MainAxisSize.min, children: [ Column( + mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.center, children: [ const SizedBox(height: 25), diff --git a/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart b/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart index 907e5390..a3c975c1 100644 --- a/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart +++ b/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart @@ -72,6 +72,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout { child: state is DeviceManagementLoading ? const Center(child: CircularProgressIndicator()) : Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( padding: isLargeScreenSize(context) diff --git a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart index fbbe65ab..18d72fc9 100644 --- a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart +++ b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart @@ -14,29 +14,29 @@ class DeviceSearchFilters extends StatefulWidget { class _DeviceSearchFiltersState extends State with HelperResponsiveLayout { - final _unitNameController = TextEditingController(); - final _productNameController = TextEditingController(); + late final TextEditingController _unitNameController; + late final TextEditingController _productNameController; - List get _widgets => [ - _buildSearchField("Space Name", _unitNameController, 200), - _buildSearchField("Device Name / Product Name", _productNameController, 300), - _buildSearchResetButtons(), - ]; + @override + void initState() { + _unitNameController = TextEditingController(); + _productNameController = TextEditingController(); + super.initState(); + } @override Widget build(BuildContext context) { - if (isExtraLargeScreenSize(context)) { - return Row( - children: _widgets - .map((e) => Padding(padding: const EdgeInsets.all(10), child: e)) - .toList(), - ); - } - return Wrap( + alignment: WrapAlignment.start, + runAlignment: WrapAlignment.start, + crossAxisAlignment: WrapCrossAlignment.center, spacing: 20, runSpacing: 10, - children: _widgets, + children: [ + _buildSearchField("Space Name", _unitNameController, 200), + _buildSearchField("Device Name / Product Name", _productNameController, 300), + _buildSearchResetButtons(), + ], ); }