Merge pull request #78 from netglade/feat/packages_upgrade

update packages

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.16.5"
+  "flutter": "3.27.1"
 }

.github/workflows/ci.yaml

@@ -21,26 +21,24 @@ jobs:
           channel: ${{ steps.fvm-config-action.outputs.FLUTTER_CHANNEL }}
 
       - name: Install DCM
-        uses: CQLabs/setup-dcm@v1
+        uses: CQLabs/setup-dcm@v2
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          version: 1.24.2
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          version: 1.26.2
 
-      - uses: bluefireteam/melos-action@v2
+      - uses: bluefireteam/melos-action@v3
 
       - name: Dart Analyze
         run: melos run lint:dart
 
       - name: Run DCM
-        uses: CQLabs/dcm-action@v1
+        uses: CQLabs/dcm-action@v2
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          ci_key: ${{ secrets.DCM_KEY }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          ci-key: ${{ secrets.DCM_KEY }}
           email: ${{ secrets.DCM_EMAIL }}
           folders: .
-          fatal_style: true
-          fatal_performance: true
-          fatal_warnings: true
+          fatal-found: true
 
       - name: Test
         run: melos run test

.github/workflows/storybook.yaml

@@ -46,7 +46,7 @@ jobs:
           flutter-version: ${{ env.FLUTTER_VERSION }}
           channel: ${{ env.FLUTTER_CHANNEL }}
 
-      - uses: bluefireteam/melos-action@v2
+      - uses: bluefireteam/melos-action@v3
 
       - name: Setup
         run: |
@@ -57,7 +57,7 @@ jobs:
         run: flutter build web --base-href "/glade_forms/"
 
       - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v2

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.16.5",
+  "dart.flutterSdkPath": ".fvm/versions/3.27.1",
   "dart.lineLength": 120,
   "yaml.schemaStore.enable": false
 }

dcm_global.yaml

@@ -1 +1 @@
-version: "1.24.2"
+version: "1.26.2"

glade_forms/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.0
+- updated dependencies
+
 # 3.0.1
 - **[Fix]**: GladeFormProvider is missing key property [Fix 73](https://github.com/netglade/glade_forms/issues/73)
 - **[Fix]**: enable value transform with text editing controller [Fix 72](https://github.com/netglade/glade_forms/issues/72)

glade_forms/analysis_options.yaml

@@ -5,3 +5,17 @@ dart_code_metrics:
     - package:netglade_analysis/dcm.yaml
   pubspec-rules:
     prefer-publish-to-none: false
+  rules:
+    avoid-commented-out-code: false # code examples in comments
+    prefer-boolean-prefixes: false # # TODO: release new major version (breaking change)
+    prefer-named-parameters: false # TODO: release new major version (breaking change)
+    dispose-class-fields: false # callback parameters are better without named
+    avoid-undisposed-instances:
+      ignored-invocations:
+          - WithAutoDispose
+    prefer-single-declaration-per-file:
+      exclude:
+        - build/unit_test_assets/**
+    prefer-abstract-final-static-class:
+      exclude:
+        - build/unit_test_assets/**

glade_forms/example/lib/example.dart

@@ -17,7 +17,10 @@ class _Model extends GladeModel {
     age = GladeInput.intInput(value: 0, inputKey: 'age');
     email = GladeInput.stringInput(validator: (validator) => (validator..isEmail()).build(), inputKey: 'email');
     income = GladeInput.intInput(
-        value: 10000, validator: (validator) => (validator..isMin(min: 1000)).build(), inputKey: 'income');
+      value: 10000,
+      validator: (validator) => (validator..isMin(min: 1000)).build(),
+      inputKey: 'income',
+    );
 
     super.initialize();
   }
@@ -29,6 +32,7 @@ class Example extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return GladeFormBuilder.create(
+      // ignore: avoid-undisposed-instances, handled by GladeFormBuilder
       create: (context) => _Model(),
       builder: (context, model, _) => Padding(
         padding: const EdgeInsets.all(32),
@@ -58,6 +62,7 @@ class Example extends StatelessWidget {
               ),
               const SizedBox(height: 10),
               ElevatedButton(
+                // ignore: no-empty-block, empty function, just for example
                 onPressed: model.isValid ? () {} : null,
                 child: const Text('Save'),
               ),

glade_forms/example/pubspec.yaml

@@ -4,7 +4,10 @@ version: 1.0.1
 publish_to: none
 
 environment:
-  sdk: ">=2.18.7 <4.0.0"
+  sdk: ">=3.5.0 <4.0.0"
+resolution: workspace
 
 dependencies:
-  glade_forms: ^1.1.0
+  flutter:
+    sdk: flutter
+  glade_forms: ^3.1.0

glade_forms/lib/src/core/glade_error_keys.dart

@@ -1,4 +1,4 @@
-class GladeErrorKeys {
+abstract final class GladeErrorKeys {
   static const String conversionError = 'value-cant-be-converted';
   static const String stringEmpty = 'string-empty-error';
   static const String stringNotUrl = 'string-not-url';

glade_forms/lib/src/core/input_dependencies.dart

@@ -2,6 +2,7 @@
 
 import 'package:collection/collection.dart';
 import 'package:glade_forms/src/core/core.dart';
+import 'package:glade_forms/src/core/object_ex.dart';
 
 typedef InputDependencies = List<GladeInput<Object?>>;
 typedef InputDependenciesFactory = InputDependencies Function();
@@ -13,8 +14,3 @@ extension InputDependenciesFunctions on InputDependencies {
   /// Finds input by its key or returns null.
   GladeInput<T>? byKeyOrNull<T>(String key) => firstWhereOrNull((x) => x.inputKey == key).castOrNull();
 }
-
-extension ObjectEx on Object? {
-  T? castOrNull<T>() => this is T ? this as T : null;
-  T cast<T>() => this as T;
-}

glade_forms/lib/src/core/object_ex.dart

@@ -0,0 +1,5 @@
+extension ObjectEx on Object? {
+  T? castOrNull<T>() => this is T ? this as T : null;
+
+  T cast<T>() => this as T;
+}

glade_forms/lib/src/core/type_helper.dart

@@ -1,4 +1,4 @@
-class TypeHelper {
+abstract final class TypeHelper {
   static bool typesEqual<T1, T2>() => T1 == T2;
 
   static bool typeIsNullable<T>() => null is T;

glade_forms/lib/src/validator/int_validator.dart

@@ -1,8 +1,6 @@
 import 'package:glade_forms/src/src.dart';
 
 class IntValidator extends GladeValidator<int> {
-  IntValidator();
-
   /// Compares given value with [min] and [max] values. With [inclusiveInterval] set to true(default), the comparison is inclusive.
   void isBetween({
     required int min,

glade_forms/lib/src/validator/regex_patterns.dart

@@ -1,4 +1,4 @@
-class RegexPatterns {
+abstract final class RegexPatterns {
   static const email = r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$';
   static const urlWithOptionalHttp = r'^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&\(\)\*\+,;=.]+$';
   static const urlWithHttp =

glade_forms/lib/src/validator/string_validator.dart

@@ -2,8 +2,6 @@ import 'package:glade_forms/src/core/glade_error_keys.dart';
 import 'package:glade_forms/src/validator/validator.dart';
 
 class StringValidator extends GladeValidator<String> {
-  StringValidator();
-
   /// Given value can't be empty string (or null).
   void notEmpty({
     OnValidateError<String>? devError,

glade_forms/lib/src/widgets/glade_form_listener.dart

@@ -44,13 +44,13 @@ class _GladeFormListenerState<M extends GladeModel> extends State<GladeFormListe
     super.didChangeDependencies();
   }
 
-  void _onModelUpdate() {
-    final m = context.read<M>();
-    widget.listener(context, m, m.lastUpdatedInputKeys);
-  }
-
   @override
   Widget build(BuildContext context) {
     return widget.child;
   }
+
+  void _onModelUpdate() {
+    final m = context.read<M>();
+    widget.listener(context, m, m.lastUpdatedInputKeys);
+  }
 }

glade_forms/lib/src/widgets/glade_model_debug_info.dart

@@ -1,4 +1,3 @@
-import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:glade_forms/src/model/glade_model.dart';
 import 'package:glade_forms/src/widgets/glade_form_builder.dart';
@@ -196,7 +195,7 @@ class _Table extends StatelessWidget {
 
     return Table(
       defaultColumnWidth: scrollable ? const IntrinsicColumnWidth() : const FlexColumnWidth(),
-      border: TableBorder.symmetric(outside: const BorderSide()),
+      border: const TableBorder.symmetric(outside: BorderSide()),
       children: [
         // Columns header.
         TableRow(
@@ -212,8 +211,8 @@ class _Table extends StatelessWidget {
             if (showControllerText) const _ColumnHeader('controller.text'),
           ],
         ),
-        ...inputs.mapIndexed(
-          (index, x) => TableRow(
+        for (final (index, x) in inputs.indexed)
+          TableRow(
             decoration: BoxDecoration(color: index.isEven ? Colors.white : const Color.fromARGB(255, 235, 234, 234)),
             children: [
               Padding(
@@ -229,7 +228,6 @@ class _Table extends StatelessWidget {
               if (showControllerText) _RowValue(value: x.controller?.text, colorizedValue: true),
             ],
           ),
-        ),
       ],
     );
   }
@@ -365,6 +363,19 @@ class _DangerStrips extends StatelessWidget {
     required this.gap,
   });
 
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 5,
+      width: double.infinity,
+      child: LayoutBuilder(
+        builder: (context, constraints) {
+          return Stack(children: _getListOfStripes((constraints.maxWidth / 2).ceil()));
+        },
+      ),
+    );
+  }
+
   List<Widget> _getListOfStripes(int count) {
     final stripes = <Widget>[];
     for (var i = 0; i < count; i++) {
@@ -378,17 +389,4 @@ class _DangerStrips extends StatelessWidget {
 
     return stripes;
   }
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      height: 5,
-      width: double.infinity,
-      child: LayoutBuilder(
-        builder: (context, constraints) {
-          return Stack(children: _getListOfStripes((constraints.maxWidth / 2).ceil()));
-        },
-      ),
-    );
-  }
 }

glade_forms/lib/src/widgets/glade_model_debug_info_modal.dart

@@ -3,8 +3,9 @@ import 'package:glade_forms/src/model/glade_model.dart';
 import 'package:glade_forms/src/widgets/glade_model_debug_info.dart';
 import 'package:glade_forms/src/widgets/glade_model_provider.dart';
 
-class GladeModelDebugInfoModal {
+abstract final class GladeModelDebugInfoModal {
   const GladeModelDebugInfoModal();
+
   static void showDebugInfoModel<M extends GladeModel>(BuildContext context, M model) {
     final _ = showModalBottomSheet<void>(
       context: context,

glade_forms/pubspec.yaml

@@ -1,14 +1,15 @@
 name: glade_forms
 description: A universal way to define form validators with support of translations.
-version: 3.0.1
+version: 3.1.0
 repository: https://github.com/netglade/glade_forms
 issue_tracker: https://github.com/netglade/glade_forms/issues
 screenshots:
   - description: The glade_forms package logo.
     path: doc/icon.png
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
+resolution: workspace
 
 # Add regular dependencies here.
 dependencies:
@@ -20,5 +21,5 @@ dependencies:
   provider: ^6.0.5
 
 dev_dependencies:
-  netglade_analysis: ^7.0.0
-  test: ^1.24.6
+  netglade_analysis: ^15.0.0
+  test: ^1.25.8