Move and refactor dialogs

vehikl · Apr 7, 2024 · 575db71 · 575db71
1 parent 3eafbd3
commit 575db71
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 13 deletions.
diff --git a/lib/business_logic/item_action.dart b/lib/business_logic/item_action.dart
@@ -11,7 +11,7 @@ import 'package:spare_parts/utilities/constants.dart';
 import 'package:spare_parts/utilities/helpers.dart';
 import 'package:spare_parts/widgets/dialogs/print_dialog/print_dialog_mobile.dart'
     if (dart.library.html) 'package:spare_parts/widgets/dialogs/print_dialog/print_dialog_web.dart';
-import 'package:spare_parts/widgets/inputs/user_selection_dialog.dart';
+import 'package:spare_parts/widgets/dialogs/user_selection_dialog.dart';
 import 'package:spare_parts/widgets/inventory_list_item/inventory_item_form.dart';
 
 import '../services/repositories/repositories.dart';

diff --git a/lib/pages/home_page/settings_view/borrowing_rules_setting/item_type_edit_button.dart b/lib/pages/home_page/settings_view/borrowing_rules_setting/item_type_edit_button.dart
@@ -3,7 +3,7 @@ import 'package:provider/provider.dart';
 import 'package:spare_parts/entities/borrowing_rule.dart';
 import 'package:spare_parts/services/repositories/repositories.dart';
 import 'package:spare_parts/utilities/constants.dart';
-import 'package:spare_parts/widgets/inputs/value_selection_dialog.dart';
+import 'package:spare_parts/widgets/dialogs/value_selection_dialog.dart';
 
 class ItemTypeEditButton extends StatelessWidget {
   final List<BorrowingRule> existingRules;

diff --git a/lib/pages/home_page/settings_view/set_admins_button.dart b/lib/pages/home_page/settings_view/set_admins_button.dart
@@ -4,7 +4,7 @@ import 'package:provider/provider.dart';
 import 'package:spare_parts/services/callable_service.dart';
 import 'package:spare_parts/utilities/constants.dart';
 import 'package:spare_parts/utilities/helpers.dart';
-import 'package:spare_parts/widgets/inputs/value_selection_dialog.dart';
+import 'package:spare_parts/widgets/dialogs/value_selection_dialog.dart';
 import 'package:spare_parts/widgets/title_text.dart';
 import 'package:spare_parts/widgets/user_avatar.dart';
 

diff --git a/lib/widgets/dialogs/dialog_width.dart b/lib/widgets/dialogs/dialog_width.dart
@@ -0,0 +1,12 @@
+import 'package:flutter/material.dart';
+
+class DialogWidth extends StatelessWidget {
+  final Widget child;
+
+  const DialogWidth({super.key, required this.child});
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(width: 300, child: child);
+  }
+}
diff --git a/...widgets/inputs/user_selection_dialog.dart → ...idgets/dialogs/user_selection_dialog.dart b/...widgets/inputs/user_selection_dialog.dart → ...idgets/dialogs/user_selection_dialog.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:spare_parts/entities/custom_user.dart';
 import 'package:spare_parts/services/repositories/user_repository.dart';
+import 'package:spare_parts/widgets/dialogs/dialog_width.dart';
 import 'package:spare_parts/widgets/inputs/new_user_input.dart';
 import 'package:spare_parts/widgets/user_avatar.dart';
 
@@ -38,8 +39,7 @@ class _UserSelectionDialogState extends State<UserSelectionDialog> {
   Widget build(BuildContext context) {
     return AlertDialog(
       title: Text(widget.title),
-      content: SizedBox(
-        width: 300,
+      content: DialogWidth(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           mainAxisSize: MainAxisSize.min,

diff --git a/...idgets/inputs/value_selection_dialog.dart → ...dgets/dialogs/value_selection_dialog.dart b/...idgets/inputs/value_selection_dialog.dart → ...dgets/dialogs/value_selection_dialog.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:spare_parts/widgets/dialogs/dialog_width.dart';
 import 'package:spare_parts/widgets/inputs/search_field.dart';
 
 class ValueSelectionDialog extends StatefulWidget {
@@ -49,8 +50,7 @@ class _ValueSelectionDialogState extends State<ValueSelectionDialog> {
 
     return AlertDialog(
       title: Text(widget.title),
-      content: SizedBox(
-        width: 300,
+      content: DialogWidth(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [

diff --git a/lib/widgets/inputs/borrower_input.dart b/lib/widgets/inputs/borrower_input.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:spare_parts/entities/custom_user.dart';
-import 'package:spare_parts/widgets/inputs/user_selection_dialog.dart';
+import 'package:spare_parts/widgets/dialogs/user_selection_dialog.dart';
 import 'package:spare_parts/widgets/user_avatar.dart';
 
 class BorrowerInput extends StatelessWidget {

diff --git a/lib/widgets/inputs/multiselect_button.dart b/lib/widgets/inputs/multiselect_button.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:spare_parts/widgets/inputs/value_selection_dialog.dart';
+import 'package:spare_parts/widgets/dialogs/value_selection_dialog.dart';
 
 class MultiselectButton extends StatelessWidget {
   final List<String> values;

diff --git a/test/pages/home_page/inventory_view/inventory_view_test.dart b/test/pages/home_page/inventory_view/inventory_view_test.dart
@@ -11,8 +11,8 @@ import 'package:spare_parts/pages/home_page/inventory_view/inventory_view.dart';
 import 'package:spare_parts/pages/item_page/item_page.dart';
 import 'package:spare_parts/services/callable_service.mocks.dart';
 import 'package:spare_parts/utilities/constants.dart';
-import 'package:spare_parts/widgets/inputs/user_selection_dialog.dart';
-import 'package:spare_parts/widgets/inputs/value_selection_dialog.dart';
+import 'package:spare_parts/widgets/dialogs/user_selection_dialog.dart';
+import 'package:spare_parts/widgets/dialogs/value_selection_dialog.dart';
 import 'package:spare_parts/widgets/inventory_list_item.dart';
 import 'package:spare_parts/widgets/inventory_list_item/inventory_item_form.dart';
 

diff --git a/test/pages/home_page/settings_view/borrowing_rules_setting.dart b/test/pages/home_page/settings_view/borrowing_rules_setting.dart
@@ -4,7 +4,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:spare_parts/entities/borrowing_rule.dart';
 import 'package:spare_parts/pages/home_page/settings_view/borrowing_rules_setting/borrowing_rules_setting.dart';
 import 'package:spare_parts/utilities/constants.dart';
-import 'package:spare_parts/widgets/inputs/value_selection_dialog.dart';
+import 'package:spare_parts/widgets/dialogs/value_selection_dialog.dart';
 
 import '../../../helpers/test_helpers.dart';
 

diff --git a/test/widgets/inputs/value_selection_dialog_test.dart b/test/widgets/inputs/value_selection_dialog_test.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:spare_parts/widgets/inputs/search_field.dart';
-import 'package:spare_parts/widgets/inputs/value_selection_dialog.dart';
+import 'package:spare_parts/widgets/dialogs/value_selection_dialog.dart';
 
 import '../../helpers/test_helpers.dart';