From 23cf5a724785ccb16332b61aef0df6b7e0fb52a1 Mon Sep 17 00:00:00 2001
From: Eduardo Folly <edufolly@gmail.com>
Date: Thu, 11 Mar 2021 11:13:13 -0300
Subject: [PATCH] Better generics implementation.

---
 example/lib/advanced/base_consumer_mock.dart |  4 +--
 example/lib/advanced/example_builder.dart    |  2 +-
 example/lib/advanced/example_consumer.dart   |  2 +-
 example/lib/advanced/example_edit.dart       |  2 +-
 example/lib/advanced/example_list.dart       |  2 +-
 example/lib/main.dart                        |  2 +-
 example/pubspec.lock                         |  2 +-
 example/pubspec.yaml                         |  2 +-
 lib/crud/abstract_consumer.dart              |  2 +-
 lib/crud/abstract_edit.dart                  | 17 +++++-------
 lib/crud/abstract_list.dart                  | 28 +++++++++-----------
 lib/crud/abstract_ui_builder.dart            |  2 +-
 lib/fields/list_field.dart                   | 13 ++++-----
 lib/fields/model_field.dart                  | 24 ++++++++---------
 lib/fields/table_field.dart                  |  6 ++---
 lib/folly_fields.dart                        | 19 ++++++++-----
 pubspec.yaml                                 |  2 +-
 17 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/example/lib/advanced/base_consumer_mock.dart b/example/lib/advanced/base_consumer_mock.dart
index 309579c7..b6dfd15f 100644
--- a/example/lib/advanced/base_consumer_mock.dart
+++ b/example/lib/advanced/base_consumer_mock.dart
@@ -6,8 +6,8 @@ import 'package:folly_fields_example/example_model.dart';
 ///
 ///
 ///
-abstract class BaseConsumerMock<A, T extends AbstractModel<A>>
-    extends AbstractConsumer<A, T> {
+abstract class BaseConsumerMock<T extends AbstractModel<Object>>
+    extends AbstractConsumer<T> {
   ///
   ///
   ///
diff --git a/example/lib/advanced/example_builder.dart b/example/lib/advanced/example_builder.dart
index 234b8c30..7b05a5b0 100644
--- a/example/lib/advanced/example_builder.dart
+++ b/example/lib/advanced/example_builder.dart
@@ -7,7 +7,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 ///
 ///
 ///
-class ExampleBuilder extends AbstractUIBuilder<int, ExampleModel> {
+class ExampleBuilder extends AbstractUIBuilder<ExampleModel> {
   ///
   ///
   ///
diff --git a/example/lib/advanced/example_consumer.dart b/example/lib/advanced/example_consumer.dart
index d385cf45..fe60686c 100644
--- a/example/lib/advanced/example_consumer.dart
+++ b/example/lib/advanced/example_consumer.dart
@@ -4,7 +4,7 @@ import 'package:folly_fields_example/example_model.dart';
 ///
 ///
 ///
-class ExampleConsumer extends BaseConsumerMock<int, ExampleModel> {
+class ExampleConsumer extends BaseConsumerMock<ExampleModel> {
   ///
   ///
   ///
diff --git a/example/lib/advanced/example_edit.dart b/example/lib/advanced/example_edit.dart
index c871c1cd..6faa0569 100644
--- a/example/lib/advanced/example_edit.dart
+++ b/example/lib/advanced/example_edit.dart
@@ -28,7 +28,7 @@ import 'package:folly_fields_example/example_model.dart';
 ///
 ///
 class ExampleEdit
-    extends AbstractEdit<int, ExampleModel, ExampleBuilder, ExampleConsumer> {
+    extends AbstractEdit<ExampleModel, ExampleBuilder, ExampleConsumer> {
   ///
   ///
   ///
diff --git a/example/lib/advanced/example_list.dart b/example/lib/advanced/example_list.dart
index 3d858d5a..0d79acf6 100644
--- a/example/lib/advanced/example_list.dart
+++ b/example/lib/advanced/example_list.dart
@@ -9,7 +9,7 @@ import 'package:folly_fields_example/example_model.dart';
 ///
 ///
 class ExampleList
-    extends AbstractList<int, ExampleModel, ExampleBuilder, ExampleConsumer> {
+    extends AbstractList<ExampleModel, ExampleBuilder, ExampleConsumer> {
   ///
   ///
   ///
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 51cdfd5e..11484f9f 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -572,7 +572,7 @@ class _MyHomePageState extends State<MyHomePage> {
                             'blob/main/lib/fields/list_field.dart',
                         child:
                             // [ListField]
-                            ListField<int, ExampleModel, ExampleBuilder>(
+                            ListField<ExampleModel, ExampleBuilder>(
                           enabled: edit,
                           initialValue: list,
                           uiBuilder: ExampleBuilder(prefix),
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 6f7021d5..b73b3b99 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -134,7 +134,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.2+29"
+    version: "0.1.3+30"
   font_awesome_flutter:
     dependency: transitive
     description:
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index a052b726..6b2b31ed 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -3,7 +3,7 @@ description: A new Flutter project.
 
 publish_to: 'none'
 
-version: 0.1.2+29
+version: 0.1.3+30
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
diff --git a/lib/crud/abstract_consumer.dart b/lib/crud/abstract_consumer.dart
index 151c153b..8670a875 100644
--- a/lib/crud/abstract_consumer.dart
+++ b/lib/crud/abstract_consumer.dart
@@ -4,7 +4,7 @@ import 'package:folly_fields/crud/abstract_model.dart';
 ///
 ///
 ///
-abstract class AbstractConsumer<A, T extends AbstractModel<A>> {
+abstract class AbstractConsumer<T extends AbstractModel<Object>> {
   ///
   ///
   ///
diff --git a/lib/crud/abstract_edit.dart b/lib/crud/abstract_edit.dart
index e035499b..a14be2cb 100644
--- a/lib/crud/abstract_edit.dart
+++ b/lib/crud/abstract_edit.dart
@@ -14,10 +14,9 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 ///
 ///
 abstract class AbstractEdit<
-    A,
-    T extends AbstractModel<A>,
-    UI extends AbstractUIBuilder<A, T>,
-    C extends AbstractConsumer<A, T>> extends StatefulWidget {
+    T extends AbstractModel<Object>,
+    UI extends AbstractUIBuilder<T>,
+    C extends AbstractConsumer<T>> extends StatefulWidget {
   final T model;
   final UI uiBuilder;
   final C? consumer;
@@ -38,8 +37,7 @@ abstract class AbstractEdit<
   ///
   ///
   @override
-  _AbstractEditState<A, T, UI, C> createState() =>
-      _AbstractEditState<A, T, UI, C>();
+  _AbstractEditState<T, UI, C> createState() => _AbstractEditState<T, UI, C>();
 
   ///
   ///
@@ -89,10 +87,9 @@ abstract class AbstractEdit<
 ///
 ///
 class _AbstractEditState<
-    A,
-    T extends AbstractModel<A>,
-    UI extends AbstractUIBuilder<A, T>,
-    C extends AbstractConsumer<A, T>> extends State<AbstractEdit<A, T, UI, C>> {
+    T extends AbstractModel<Object>,
+    UI extends AbstractUIBuilder<T>,
+    C extends AbstractConsumer<T>> extends State<AbstractEdit<T, UI, C>> {
   final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
 
   final StreamController<bool> _controller = StreamController<bool>();
diff --git a/lib/crud/abstract_list.dart b/lib/crud/abstract_list.dart
index 85baab8d..738a7d50 100644
--- a/lib/crud/abstract_list.dart
+++ b/lib/crud/abstract_list.dart
@@ -18,10 +18,9 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 ///
 ///
 abstract class AbstractList<
-    A,
-    T extends AbstractModel<A>,
-    UI extends AbstractUIBuilder<A, T>,
-    C extends AbstractConsumer<A, T>> extends AbstractRoute {
+    T extends AbstractModel<Object>,
+    UI extends AbstractUIBuilder<T>,
+    C extends AbstractConsumer<T>> extends AbstractRoute {
   final bool selection;
   final bool multipleSelection;
   final bool invertSelection;
@@ -94,18 +93,16 @@ abstract class AbstractList<
   ///
   ///
   @override
-  _AbstractListState<A, T, UI, C> createState() =>
-      _AbstractListState<A, T, UI, C>();
+  _AbstractListState<T, UI, C> createState() => _AbstractListState<T, UI, C>();
 }
 
 ///
 ///
 ///
 class _AbstractListState<
-    A,
-    T extends AbstractModel<A>,
-    UI extends AbstractUIBuilder<A, T>,
-    C extends AbstractConsumer<A, T>> extends State<AbstractList<A, T, UI, C>> {
+    T extends AbstractModel<Object>,
+    UI extends AbstractUIBuilder<T>,
+    C extends AbstractConsumer<T>> extends State<AbstractList<T, UI, C>> {
   final GlobalKey<RefreshIndicatorState> _refreshIndicatorKey =
       GlobalKey<RefreshIndicatorState>();
 
@@ -120,7 +117,7 @@ class _AbstractListState<
   bool _update = false;
   bool _delete = false;
 
-  Map<A, T> selections = <A, T>{};
+  Map<Object, T> selections = <Object, T>{};
 
   final Map<String, String> _qsParam = <String, String>{};
 
@@ -293,7 +290,7 @@ class _AbstractListState<
                 onPressed: () {
                   showSearch<T?>(
                     context: context,
-                    delegate: InternalSearch<A, T, UI, C>(
+                    delegate: InternalSearch<T, UI, C>(
                       buildResultItem: _buildResultItem,
                       canDelete: (T model) =>
                           _delete &&
@@ -647,10 +644,9 @@ class _AbstractListState<
 ///
 ///
 class InternalSearch<
-    A,
-    W extends AbstractModel<A>,
-    UI extends AbstractUIBuilder<A, W>,
-    C extends AbstractConsumer<A, W>> extends SearchDelegate<W?> {
+    W extends AbstractModel<Object>,
+    UI extends AbstractUIBuilder<W>,
+    C extends AbstractConsumer<W>> extends SearchDelegate<W?> {
   final UI uiBuilder;
   final C consumer;
 
diff --git a/lib/crud/abstract_ui_builder.dart b/lib/crud/abstract_ui_builder.dart
index 4babe255..e50bac5f 100644
--- a/lib/crud/abstract_ui_builder.dart
+++ b/lib/crud/abstract_ui_builder.dart
@@ -5,7 +5,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 ///
 ///
 ///
-abstract class AbstractUIBuilder<A, T extends AbstractModel<A>> {
+abstract class AbstractUIBuilder<T extends AbstractModel<Object>> {
   final String prefix;
 
   ///
diff --git a/lib/fields/list_field.dart b/lib/fields/list_field.dart
index f27d6fe1..ae88b79a 100644
--- a/lib/fields/list_field.dart
+++ b/lib/fields/list_field.dart
@@ -10,8 +10,8 @@ import 'package:sprintf/sprintf.dart';
 ///
 /// TODO - Create controller.
 ///
-class ListField<A, T extends AbstractModel<A>,
-    UI extends AbstractUIBuilder<A, T>> extends FormField<List<T>> {
+class ListField<T extends AbstractModel<Object>,
+    UI extends AbstractUIBuilder<T>> extends FormField<List<T>> {
   ///
   ///
   ///
@@ -82,7 +82,7 @@ class ListField<A, T extends AbstractModel<A>,
                           .asMap()
                           .entries
                           .map(
-                            (MapEntry<int, T> entry) => _MyListTile<A, T, UI>(
+                            (MapEntry<int, T> entry) => _MyListTile<T, UI>(
                               index: entry.key,
                               model: entry.value,
                               uiBuilder: uiBuilder,
@@ -151,7 +151,8 @@ class ListField<A, T extends AbstractModel<A>,
                               }
                             }
                           } else {
-                            if ((selected as AbstractModel<A>).id == null ||
+                            if ((selected as AbstractModel<Object>).id ==
+                                    null ||
                                 !field.value!.any((T element) {
                                   return element.id == selected.id;
                                 })) {
@@ -177,8 +178,8 @@ class ListField<A, T extends AbstractModel<A>,
 ///
 ///
 ///
-class _MyListTile<A, T extends AbstractModel<A>,
-    UI extends AbstractUIBuilder<A, T>> extends StatelessWidget {
+class _MyListTile<T extends AbstractModel<Object>,
+    UI extends AbstractUIBuilder<T>> extends StatelessWidget {
   final int index;
   final T model;
   final UI uiBuilder;
diff --git a/lib/fields/model_field.dart b/lib/fields/model_field.dart
index e37e25b1..ed2ed6ff 100644
--- a/lib/fields/model_field.dart
+++ b/lib/fields/model_field.dart
@@ -5,8 +5,8 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 ///
 ///
 ///
-class ModelField<A, T extends AbstractModel<A>> extends FormField<T?> {
-  final ModelEditingController<A, T>? controller;
+class ModelField<T extends AbstractModel<Object>> extends FormField<T?> {
+  final ModelEditingController<T>? controller;
 
   ///
   ///
@@ -40,7 +40,7 @@ class ModelField<A, T extends AbstractModel<A>> extends FormField<T?> {
           enabled: enabled,
           autovalidateMode: autoValidateMode,
           builder: (FormFieldState<T?> field) {
-            final _ModelFieldState<A, T> state = field as _ModelFieldState<A, T>;
+            final _ModelFieldState<T> state = field as _ModelFieldState<T>;
 
             final InputDecoration effectiveDecoration = InputDecoration(
               border: OutlineInputBorder(),
@@ -130,25 +130,25 @@ class ModelField<A, T extends AbstractModel<A>> extends FormField<T?> {
   ///
   ///
   @override
-  _ModelFieldState<A, T> createState() => _ModelFieldState<A, T>();
+  _ModelFieldState<T> createState() => _ModelFieldState<T>();
 }
 
 ///
 ///
 ///
-class _ModelFieldState<A, T extends AbstractModel<A>> extends FormFieldState<T?> {
-  ModelEditingController<A, T>? _controller;
+class _ModelFieldState<T extends AbstractModel<Object>> extends FormFieldState<T?> {
+  ModelEditingController<T>? _controller;
 
   ///
   ///
   ///
   @override
-  ModelField<A, T> get widget => super.widget as ModelField<A, T>;
+  ModelField<T> get widget => super.widget as ModelField<T>;
 
   ///
   ///
   ///
-  ModelEditingController<A, T> get _effectiveController =>
+  ModelEditingController<T> get _effectiveController =>
       widget.controller ?? _controller!;
 
   ///
@@ -158,7 +158,7 @@ class _ModelFieldState<A, T extends AbstractModel<A>> extends FormFieldState<T?>
   void initState() {
     super.initState();
     if (widget.controller == null) {
-      _controller = ModelEditingController<A, T>(model: widget.initialValue);
+      _controller = ModelEditingController<T>(model: widget.initialValue);
     } else {
       widget.controller!.addListener(_handleControllerChanged);
     }
@@ -168,7 +168,7 @@ class _ModelFieldState<A, T extends AbstractModel<A>> extends FormFieldState<T?>
   ///
   ///
   @override
-  void didUpdateWidget(ModelField<A, T> oldWidget) {
+  void didUpdateWidget(ModelField<T> oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (widget.controller != oldWidget.controller) {
       oldWidget.controller?.removeListener(_handleControllerChanged);
@@ -176,7 +176,7 @@ class _ModelFieldState<A, T extends AbstractModel<A>> extends FormFieldState<T?>
       widget.controller?.addListener(_handleControllerChanged);
 
       if (oldWidget.controller != null && widget.controller == null) {
-        _controller = ModelEditingController<A, T>(
+        _controller = ModelEditingController<T>(
           model: oldWidget.controller!.model,
         );
       }
@@ -233,7 +233,7 @@ class _ModelFieldState<A, T extends AbstractModel<A>> extends FormFieldState<T?>
 ///
 ///
 ///
-class ModelEditingController<A, T extends AbstractModel<A>>
+class ModelEditingController<T extends AbstractModel<Object>>
     extends TextEditingController {
   T? _model;
 
diff --git a/lib/fields/table_field.dart b/lib/fields/table_field.dart
index 50902bc3..7c783ead 100644
--- a/lib/fields/table_field.dart
+++ b/lib/fields/table_field.dart
@@ -11,15 +11,15 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 /// TODO - Customize messages.
 /// TODO - Create controller??
 ///
-class TableField<A, T extends AbstractModel<A>> extends FormField<List<T>> {
+class TableField<T extends AbstractModel<Object>> extends FormField<List<T>> {
   ///
   ///
   ///
   TableField({
     Key? key,
     required List<T> initialValue,
-    required AbstractUIBuilder<A, T> uiBuilder,
-    required AbstractConsumer<A, T> consumer,
+    required AbstractUIBuilder<T> uiBuilder,
+    required AbstractConsumer<T> consumer,
     required List<String> columns,
     List<int> columnsFlex = const <int>[],
     required List<Widget> Function(
diff --git a/lib/folly_fields.dart b/lib/folly_fields.dart
index eed11a09..80d1e857 100644
--- a/lib/folly_fields.dart
+++ b/lib/folly_fields.dart
@@ -188,14 +188,21 @@ abstract class AbstractConfig implements _InternalConfig {
         _platform = RunningPlatform.IOS;
       }
 
-      ConnectivityResult result = await Connectivity().checkConnectivity();
+      // FIXME - Problem with connectivity plugin on web.
+      if (isWeb) {
+        _online = true;
+      } else {
+        ConnectivityResult result = await Connectivity().checkConnectivity();
 
-      _online = result != ConnectivityResult.none;
-
-      Connectivity().onConnectivityChanged.listen((ConnectivityResult result) {
         _online = result != ConnectivityResult.none;
-        if (debug) print('Connectivity Changed: $_online');
-      });
+
+        Connectivity()
+            .onConnectivityChanged
+            .listen((ConnectivityResult result) {
+          _online = result != ConnectivityResult.none;
+          if (debug) print('Connectivity Changed: $_online');
+        });
+      }
     }
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index e6efb3f3..fe8632f3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: folly_fields
 description: Basic form fields and utilities.
-version: 0.1.2+29
+version: 0.1.3+30
 # author:
 homepage: https://edufolly.github.io/folly_fields/