Merge pull request #28 from robiness/clean_up

robiness · Nov 7, 2023 · adf0e96 · adf0e96
2 parents 5c85b52 + 12c55f9
commit adf0e96
Show file tree

Hide file tree

Showing 28 changed files with 259 additions and 229 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -1,14 +1,19 @@
-import 'package:example/stage_data/my_widget_stage.dart';
+import 'package:example/stage_data/string_list_configurator_stage_data.dart';
 import 'package:flutter/material.dart';
 import 'package:stage_craft/stage_craft.dart';
 
 void main() {
   runApp(const MyApp());
 }
 
-class MyApp extends StatelessWidget {
+class MyApp extends StatefulWidget {
   const MyApp({super.key});
 
+  @override
+  State<MyApp> createState() => _MyAppState();
+}
+
+class _MyAppState extends State<MyApp> {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
@@ -17,7 +22,7 @@ class MyApp extends StatelessWidget {
       debugShowCheckedModeBanner: false,
       home: Scaffold(
         body: StageCraft(
-          stageData: MyWidgetStageData(),
+          stageData: StringListConfiguratorStageData(),
         ),
       ),
     );

diff --git a/example/lib/my_widget_stage.dart b/example/lib/my_widget_stage.dart
@@ -1,4 +1,4 @@
-import 'package:example/stage_data/my_widget_stage.dart';
+import 'package:example/stage_data/bool_field_configurator_stage_data.dart';
 import 'package:flutter/material.dart';
 import 'package:stage_craft/stage_craft.dart';
 import 'package:window_manager/window_manager.dart';
@@ -25,7 +25,7 @@ Future<void> main() async {
     MaterialApp(
       home: Scaffold(
         body: StageCraft(
-          stageData: MyWidgetStageData(),
+          stageData: BoolFieldConfiguratorStageData(),
         ),
       ),
     ),

diff --git a/example/lib/stage_data/bool_field_configurator_stage_data.dart b/example/lib/stage_data/bool_field_configurator_stage_data.dart
@@ -0,0 +1,25 @@
+import 'package:flutter/widgets.dart';
+import 'package:stage_craft/stage_craft.dart';
+
+class BoolFieldConfiguratorStageData extends StageData {
+  @override
+  String get name => 'BoolFieldConfiguration';
+
+  final value = BoolFieldConfigurator(value: true, name: 'value');
+
+  @override
+  List<FieldConfigurator> get stageConfigurators => [];
+
+  @override
+  List<FieldConfigurator> get widgetConfigurators => [value];
+
+  @override
+  Widget widgetBuilder(BuildContext context) {
+    return BoolConfigurationWidget(
+      value: value.value,
+      updateValue: (value) {
+        this.value.value = value!;
+      },
+    );
+  }
+}
diff --git a/example/lib/stage_data/color_field_configurator_stage_data.dart b/example/lib/stage_data/color_field_configurator_stage_data.dart
@@ -0,0 +1,25 @@
+import 'package:flutter/widgets.dart';
+import 'package:stage_craft/stage_craft.dart';
+
+class ColorFieldConfiguratorStageData extends StageData {
+  @override
+  String get name => 'ColorFieldConfiguration';
+
+  final value = ColorFieldConfigurator(value: const Color(0xFF000000), name: 'value');
+
+  @override
+  List<FieldConfigurator> get stageConfigurators => [];
+
+  @override
+  List<FieldConfigurator> get widgetConfigurators => [value];
+
+  @override
+  Widget widgetBuilder(BuildContext context) {
+    return ColorConfigurationWidget(
+      value: value.value,
+      updateValue: (value) {
+        this.value.value = value!;
+      },
+    );
+  }
+}
diff --git a/example/lib/stage_data/my_widget_stage.dart b/example/lib/stage_data/my_widget_stage.dart
diff --git a/example/lib/stage_data/string_list_configurator_stage_data.dart b/example/lib/stage_data/string_list_configurator_stage_data.dart
@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+import 'package:stage_craft/stage_craft.dart';
+
+class StringListConfiguratorStageData extends StageData {
+  final value = StringListConfigurator(value: ['jo', 'jojo2', 'jojojo'], name: 'value');
+
+  @override
+  String get name => 'StringListConfigurator';
+
+  @override
+  List<FieldConfigurator> get stageConfigurators => [];
+
+  @override
+  List<FieldConfigurator> get widgetConfigurators => [
+        value,
+      ];
+
+  @override
+  Widget widgetBuilder(BuildContext context) {
+    return StringListConfiguratorWidget(configurator: value);
+  }
+}
diff --git a/example/lib/widgets/my_widget.dart b/example/lib/widgets/my_widget.dart
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -191,6 +191,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.1"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.2"
+  universal_io:
+    dependency: transitive
+    description:
+      name: universal_io
+      sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
   vector_math:
     dependency: transitive
     description:

diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart
@@ -5,21 +5,21 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
-import 'package:example/stage_data/my_widget_stage.dart';
+import 'package:example/stage_data/bool_field_configurator_stage_data.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:stage_craft/stage_craft.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    await tester.pumpWidgetData(MyWidgetStageData());
+    await tester.pumpWidgetData(BoolFieldConfiguratorStageData());
     expect(find.text('MyOtherWidget'), findsOneWidget);
   });
 }
 
 extension WidgetTesterExtension on WidgetTester {
   Future<void> pumpWidgetData(
-    WidgetStageData stageData,
+    StageData stageData,
   ) async {
     await pumpWidget(
       MaterialApp(

diff --git a/lib/src/field_configurators/bool_field_configurator.dart b/lib/src/field_configurators/bool_field_configurator.dart
@@ -9,7 +9,7 @@ class BoolFieldConfiguratorNullable extends FieldConfigurator<bool?> {
 
   @override
   Widget build(BuildContext context) {
-    return BoolFieldConfigurationWidget(
+    return BoolConfigurationWidget(
       value: value,
       updateValue: updateValue,
     );
@@ -25,7 +25,7 @@ class BoolFieldConfigurator extends FieldConfigurator<bool> {
 
   @override
   Widget build(BuildContext context) {
-    return BoolFieldConfigurationWidget(
+    return BoolConfigurationWidget(
       value: value,
       updateValue: (value) {
         updateValue(value ?? false);
@@ -34,8 +34,8 @@ class BoolFieldConfigurator extends FieldConfigurator<bool> {
   }
 }
 
-class BoolFieldConfigurationWidget extends ConfigurationWidget<bool?> {
-  const BoolFieldConfigurationWidget({
+class BoolConfigurationWidget extends ConfigurationWidget<bool?> {
+  const BoolConfigurationWidget({
     required super.value,
     required super.updateValue,
   });

diff --git a/lib/src/field_configurators/color_field_configurator.dart b/lib/src/field_configurators/color_field_configurator.dart
@@ -93,30 +93,27 @@ class ColorConfigurationWidget extends ConfigurationWidget<Color?> {
           },
         );
       },
-      child: Align(
-        alignment: Alignment.centerRight,
-        child: MouseRegion(
-          cursor: SystemMouseCursors.click,
-          child: ClipRRect(
-            borderRadius: BorderRadius.circular(8),
-            child: Container(
-              height: 38,
-              width: 38,
-              foregroundDecoration: BoxDecoration(
-                // The actual color drawn over the chessboard pattern
-                color: value,
+      child: MouseRegion(
+        cursor: SystemMouseCursors.click,
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(8),
+          child: Container(
+            height: 38,
+            width: 38,
+            foregroundDecoration: BoxDecoration(
+              // The actual color drawn over the chessboard pattern
+              color: value,
+            ),
+            // The chessboard pattern
+            child: const CustomPaint(
+              foregroundPainter: ChessBoardPainter(
+                boxSize: 8,
+                // The color of the chessboard pattern
+                color: Colors.grey,
               ),
-              // The chessboard pattern
-              child: const CustomPaint(
-                foregroundPainter: ChessBoardPainter(
-                  boxSize: 8,
-                  // The color of the chessboard pattern
-                  color: Colors.grey,
-                ),
-                child: ColoredBox(
-                  // Background of the chessboard pattern
-                  color: Colors.white,
-                ),
+              child: ColoredBox(
+                // Background of the chessboard pattern
+                color: Colors.white,
               ),
             ),
           ),