Some refactorings from Recall parameter page (#107)

fermi-ad · Aug 11, 2023 · c87d019 · c87d019
2 parents d43611e + 3ff94cd
commit c87d019
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 70 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:parameter_page/gql_param/graphql_parameter_page_service.dart';
-import 'package:parameter_page/mock_parameter_page_service.dart';
-import 'package:parameter_page/parameter_page_service.dart';
+import 'package:parameter_page/services/parameter_page/gql_param/graphql_parameter_page_service.dart';
+import 'package:parameter_page/services/parameter_page/mock_parameter_page_service.dart';
+import 'package:parameter_page/services/parameter_page/parameter_page_service.dart';
 import 'package:parameter_page/theme/theme.dart';
 import 'package:parameter_page/widgets/data_acquisition_widget.dart';
 import 'package:parameter_page/widgets/display_settings_widget.dart';

diff --git a/...param/graphql_parameter_page_service.dart → ...param/graphql_parameter_page_service.dart b/...param/graphql_parameter_page_service.dart → ...param/graphql_parameter_page_service.dart
@@ -1,8 +1,8 @@
 import 'package:graphql_flutter/graphql_flutter.dart';
-import 'package:parameter_page/gql_param/mutations.dart';
-import 'package:parameter_page/parameter_page_service.dart';
+import 'package:parameter_page/services/parameter_page/gql_param/mutations.dart';
+import 'package:parameter_page/services/parameter_page/parameter_page_service.dart';
 
-import '../gqlconnect.dart';
+import '../../../gqlconnect.dart';
 import 'queries.dart';
 
 class GraphQLParameterPageService extends ParameterPageService {

diff --git a/lib/gql_param/mutations.dart → ...s/parameter_page/gql_param/mutations.dart b/lib/gql_param/mutations.dart → ...s/parameter_page/gql_param/mutations.dart
diff --git a/lib/gql_param/queries.dart → ...ces/parameter_page/gql_param/queries.dart b/lib/gql_param/queries.dart → ...ces/parameter_page/gql_param/queries.dart
diff --git a/lib/mock_parameter_page_service.dart → ...ter_page/mock_parameter_page_service.dart b/lib/mock_parameter_page_service.dart → ...ter_page/mock_parameter_page_service.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:parameter_page/parameter_page_service.dart';
+import 'package:parameter_page/services/parameter_page/parameter_page_service.dart';
 
 class MockParameterPageService extends ParameterPageService {
   @override

diff --git a/lib/parameter_page_service.dart → ...arameter_page/parameter_page_service.dart b/lib/parameter_page_service.dart → ...arameter_page/parameter_page_service.dart
diff --git a/lib/widgets/entryquerywrapper_widget.dart b/lib/widgets/entryquerywrapper_widget.dart
@@ -2,13 +2,17 @@ import 'package:flutter/material.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:logger/logger.dart';
 import '../gqlconnect.dart';
-import '../gql_param/mutations.dart';
+import '../services/parameter_page/gql_param/mutations.dart';
 
 class EntryQueryWrapper extends StatefulWidget {
   final List<dynamic> entries;
   final Function fetchData;
 
-  const EntryQueryWrapper({Key? key, required this.entries, required this.fetchData,}) : super(key: key);
+  const EntryQueryWrapper({
+    Key? key,
+    required this.entries,
+    required this.fetchData,
+  }) : super(key: key);
 
   @override
   State<EntryQueryWrapper> createState() => _EntryQueryWrapperState();
@@ -19,62 +23,56 @@ class _EntryQueryWrapperState extends State<EntryQueryWrapper> {
 
   @override
   Widget build(BuildContext context) {
-                return
-                     ListView.builder(
-                                itemBuilder: (BuildContext context, int index) {
-                                  return  Card(
-                                            child: GestureDetector(
-                                                    onTap: (){},
-                                                    child: ListTile(
-                                                      title: Text(
-                                                        widget.entries[index]['text'],
-                                                        style: const TextStyle(fontSize: 17,),), 
-                                                      subtitle: Text(
-                                                        widget.entries[index]['type'], 
-                                                        style: const TextStyle(fontSize: 13,),
-                                                        ), 
-                                                      trailing: IconButton(
-                                                                  icon: const Icon(Icons.delete),
-                                                                  iconSize: 20,
-                                                                  color: Theme.of(context).hintColor,
-                                                                  onPressed: ()=>{_deleteEntry(widget.entries[index]['entryid']),
-                                                                                  },      
-                                                                ),
-
-                                                      selectedColor: Colors.green,
-                                                    ),
-                                          ),
-                                  );
-                                },
-                                itemCount: widget.entries.length,
-                              );
-      }
-
-
- Future <void> _deleteEntry(String entryid) async {
-
-    final QueryOptions options = QueryOptions(
-            document: gql(deletepageentry),
-            variables: <String, dynamic>{
-                        'entryid': entryid, 
-                      },
+    return ListView.builder(
+      itemBuilder: (BuildContext context, int index) {
+        return Card(
+          child: GestureDetector(
+            onTap: () {},
+            child: ListTile(
+              title: Text(
+                widget.entries[index]['text'],
+                style: const TextStyle(
+                  fontSize: 17,
+                ),
+              ),
+              subtitle: Text(
+                widget.entries[index]['type'],
+                style: const TextStyle(
+                  fontSize: 13,
+                ),
+              ),
+              trailing: IconButton(
+                icon: const Icon(Icons.delete),
+                iconSize: 20,
+                color: Theme.of(context).hintColor,
+                onPressed: () => {
+                  _deleteEntry(widget.entries[index]['entryid']),
+                },
+              ),
+              selectedColor: Colors.green,
+            ),
+          ),
         );
+      },
+      itemCount: widget.entries.length,
+    );
+  }
 
-      final QueryResult result = await client.value.query(options);
-      //final dynamic data = result.data;
-
-      if (result.hasException) {
-        logger.e('GraphQL Error: ${result.exception}');
-      } 
-      else {       
-          widget.fetchData();
-      } //else
- } //delete Title function
-
-
+  Future<void> _deleteEntry(String entryid) async {
+    final QueryOptions options = QueryOptions(
+      document: gql(deletepageentry),
+      variables: <String, dynamic>{
+        'entryid': entryid,
+      },
+    );
+
+    final QueryResult result = await client.value.query(options);
+    //final dynamic data = result.data;
+
+    if (result.hasException) {
+      logger.e('GraphQL Error: ${result.exception}');
+    } else {
+      widget.fetchData();
+    } //else
+  } //delete Title function
 }
-
-
-
-
-
diff --git a/lib/widgets/newtitledialog_widget.dart b/lib/widgets/newtitledialog_widget.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
-import 'package:parameter_page/parameter_page_service.dart';
+import 'package:parameter_page/services/parameter_page/parameter_page_service.dart';
 
 class NewTitleDialog extends StatefulWidget {
   final List<dynamic> titles;

diff --git a/lib/widgets/open_page_widget.dart b/lib/widgets/open_page_widget.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
-import '../parameter_page_service.dart';
+import '../services/parameter_page/parameter_page_service.dart';
 import 'open_pages_list_view_widget.dart';
 import 'newtitledialog_widget.dart';
 

diff --git a/lib/widgets/open_pages_list_view_widget.dart b/lib/widgets/open_pages_list_view_widget.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
-import 'package:parameter_page/parameter_page_service.dart';
+import 'package:parameter_page/services/parameter_page/parameter_page_service.dart';
 
 class OpenPagesListViewWidget extends StatefulWidget {
   final List<dynamic> titles;

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

diff --git a/lib/widgets/parampagedetail_widget.dart b/lib/widgets/parampagedetail_widget.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
-import 'package:parameter_page/parameter_page_service.dart';
+import 'package:parameter_page/services/parameter_page/parameter_page_service.dart';
 import 'entryquerywrapper_widget.dart';
 
 class ParamPageDetail extends StatefulWidget {