Last PR of the morning - more refactoring (#109)

fermi-ad · Aug 11, 2023 · ea23f7f · ea23f7f
2 parents b7bead7 + 385e8dc
commit ea23f7f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/lib/page_entry.dart → lib/entities/page_entry.dart b/lib/page_entry.dart → lib/entities/page_entry.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
-import 'widgets/comment_entry_widget.dart';
-import 'widgets/display_settings_widget.dart';
-import 'widgets/parameter_widget.dart';
+import '../widgets/comment_entry_widget.dart';
+import '../widgets/display_settings_widget.dart';
+import '../widgets/parameter_widget.dart';
 
 // Base class for the Entry class hierarchy.
 

diff --git a/lib/parameter_page.dart → lib/entities/parameter_page.dart b/lib/parameter_page.dart → lib/entities/parameter_page.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/foundation.dart';
-import 'package:parameter_page/page_entry.dart';
+import 'package:parameter_page/entities/page_entry.dart';
 
 class ParameterPage {
   ParameterPage([List<PageEntry>? entries])

diff --git a/lib/main.dart b/lib/main.dart
@@ -10,7 +10,7 @@ import 'services/dpm/dpm_service.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'services/dpm/graphql_dpm_service.dart';
 import 'services/dpm/mock_dpm_service.dart';
-import 'page_entry.dart';
+import 'entities/page_entry.dart';
 import 'widgets/page_widget.dart';
 
 void main() async {

diff --git a/lib/widgets/new_entry_editor_widget.dart b/lib/widgets/new_entry_editor_widget.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 import 'data_acquisition_widget.dart';
-import '../page_entry.dart';
+import '../entities/page_entry.dart';
 
 class NewEntryEditorWidget extends StatefulWidget {
   final Function(PageEntry) onSubmitted;

diff --git a/lib/widgets/page_widget.dart b/lib/widgets/page_widget.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:parameter_page/services/parameter_page/parameter_page_service.dart';
-import '../parameter_page.dart';
-import '../page_entry.dart';
+import '../entities/parameter_page.dart';
+import '../entities/page_entry.dart';
 import 'display_settings_widget.dart';
 import 'new_entry_editor_widget.dart';
 

diff --git a/test/unit_tests/parameter_page_test.dart b/test/unit_tests/parameter_page_test.dart
@@ -1,5 +1,5 @@
-import 'package:parameter_page/page_entry.dart';
-import 'package:parameter_page/parameter_page.dart';
+import 'package:parameter_page/entities/page_entry.dart';
+import 'package:parameter_page/entities/parameter_page.dart';
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/widget_tests/new_entry_editor_widget_test.dart b/test/widget_tests/new_entry_editor_widget_test.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:parameter_page/services/dpm/mock_dpm_service.dart';
-import 'package:parameter_page/page_entry.dart';
+import 'package:parameter_page/entities/page_entry.dart';
 import 'package:parameter_page/widgets/new_entry_editor_widget.dart';
 import 'package:parameter_page/widgets/data_acquisition_widget.dart';