Result updrade

.github/workflows/analyze.yml

@@ -20,7 +20,7 @@ jobs:
       # - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
-          version: 3.10.1
+          version: 3.16.5
       # - run: |
           # sudo apt-get update -y
           # sudo apt-get install -y ninja-build libgtk-3-dev

.github/workflows/coverage.yaml

@@ -24,7 +24,7 @@ jobs:
       # - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
-          version: 3.3.10
+          version: 3.16.5
       # - run: |
           # sudo apt-get update -y
           # sudo apt-get install -y ninja-build libgtk-3-dev

example/pubspec.yaml

@@ -4,7 +4,7 @@ version: 1.0.0+1
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.18.2 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   flutter:
@@ -20,7 +20,10 @@ dependencies:
     git:
       url: https://github.com/a-givertzman/hmi_networking.git
       ref: master
-  fl_chart: ^0.55.1
+  fl_chart:
+    git:
+      url: https://github.com/a-givertzman/fl_chart.git
+      ref: master
   another_flushbar: ^1.12.29
 
 dev_dependencies:

lib/src/buttons/control_button/control_button_indicator.dart

@@ -148,7 +148,7 @@ class _ControlButtonIndicatorState extends State<ControlButtonIndicator> with Ti
                 child: Text(
                   _stateText,
                   style: stateTextStyle.apply(color: color),
-                  textScaleFactor: _stateTextScaleFactor,
+                  textScaler: TextScaler.linear(_stateTextScaleFactor),
                 ),
               ),
             ],

lib/src/core/overflowable_text.dart

@@ -63,7 +63,7 @@ class OverflowableText extends StatelessWidget {
   /// the specified font size.
   ///
   /// The value given to the constructor as textScaleFactor. If null, will
-  /// use the [MediaQueryData.textScaleFactor] obtained from the ambient
+  /// use the [MediaQueryData.textScaler] obtained from the ambient
   /// [MediaQuery], or 1.0 if there is no [MediaQuery] in scope.
   final double? textScaleFactor;
 
@@ -153,6 +153,7 @@ class OverflowableText extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final textData = data;
+    final textScaler = textScaleFactor != null ? TextScaler.linear(textScaleFactor!) : null;
     if (textData != null) {
       return Text(
         textData,
@@ -163,7 +164,7 @@ class OverflowableText extends StatelessWidget {
         locale: locale,
         softWrap: softWrap,
         overflow: overflow,
-        textScaleFactor: textScaleFactor,
+        textScaler: textScaler,
         maxLines: maxLines,
         semanticsLabel: semanticsLabel,
         textWidthBasis: textWidthBasis,
@@ -180,7 +181,7 @@ class OverflowableText extends StatelessWidget {
         locale: locale,
         softWrap: softWrap,
         overflow: overflow,
-        textScaleFactor: textScaleFactor,
+        textScaler: textScaler,
         maxLines: maxLines,
         semanticsLabel: semanticsLabel,
         textWidthBasis: textWidthBasis,

lib/src/core/validation/cases/max_length_validation_case.dart

@@ -1,4 +1,4 @@
-import 'package:hmi_core/hmi_core_result.dart';
+import 'package:hmi_core/hmi_core_result_new.dart';
 import 'package:hmi_core/hmi_core_failure.dart';
 import 'validation_case.dart';
 ///
@@ -10,12 +10,12 @@
     _maxLength = maxLength;
   //
   @override
-  Result<void> isSatisfiedBy(String? value) {
+  ResultF<void> isSatisfiedBy(String? value) {
     if (value != null && value.length <= _maxLength) {
-      return Result(data: true);
+      return Ok(true);
     }
-    return Result(
-      error: Failure(
+    return Err(
+      Failure(
         message: 'Too many characters', 
         stackTrace: StackTrace.current,
       ),

lib/src/core/validation/cases/min_length_validation_case.dart

@@ -1,4 +1,4 @@
-import 'package:hmi_core/hmi_core_result.dart';
+import 'package:hmi_core/hmi_core_result_new.dart';
 import 'package:hmi_core/hmi_core_failure.dart';
 import 'validation_case.dart';
 ///
@@ -10,12 +10,12 @@
     _minLength = minLength;
   //
   @override
-  Result<void> isSatisfiedBy(String? value) {
+  ResultF<void> isSatisfiedBy(String? value) {
     if (value != null && value.length >= _minLength) {
-      return Result(data: true);
+      return Ok(true);
     }
-    return Result(
-      error: Failure(
+    return Err(
+      Failure(
         message: 'Too few characters', 
         stackTrace: StackTrace.current,
       ),

lib/src/core/validation/cases/only_digits_validation_case.dart

@@ -1,4 +1,4 @@
-import 'package:hmi_core/hmi_core_result.dart';
+import 'package:hmi_core/hmi_core_result_new.dart';
 import 'package:hmi_core/hmi_core_failure.dart';
 import 'package:hmi_widgets/src/core/validation/cases/validation_case.dart';
 ///
@@ -7,16 +7,16 @@
   const OnlyDigitsValidationCase();
   //
   @override
-  Result<void> isSatisfiedBy(String? value) {
+  ResultF<void> isSatisfiedBy(String? value) {
     if(value != null && value.isNotEmpty) {
       final regex = RegExp(r'[\d]*');
       final match = regex.matchAsPrefix(value);
       if (match?.end == value.length) {
-        return Result(data: true);
+        return Ok(true);
       }
     }
-    return Result(
-      error: Failure(
+    return Err(
+      Failure(
         message: 'Only digits expected',
         stackTrace: StackTrace.current,
       ),

lib/src/core/validation/cases/validation_case.dart

@@ -1,6 +1,6 @@
-import 'package:hmi_core/hmi_core_result.dart';
+import 'package:hmi_core/hmi_core_result_new.dart';
 ///
 abstract class ValidationCase {
   ///
-  Result<void> isSatisfiedBy(String? value);
+  ResultF<void> isSatisfiedBy(String? value);
 }

lib/src/core/validation/validator.dart

@@ -1,4 +1,5 @@
 import 'cases/validation_case.dart';
+import 'package:hmi_core/hmi_core_result_new.dart';
 
 ///
 class Validator {
@@ -12,8 +13,8 @@
   String? editFieldValidator(String? value) {
     for (final validationCase in _cases) {
       final result = validationCase.isSatisfiedBy(value);
-      if (result.hasError) {
-        return result.error.message;
+      if (result case Err(:final error)) {
+        return error.message;
       }
     }
     return null;

lib/src/edit_field/netword_edit_field/network_edit_field.dart

@@ -1,6 +1,7 @@
 import 'package:hmi_networking/hmi_networking.dart';
 import 'package:flutter/material.dart';
 import 'package:hmi_core/hmi_core.dart';
+import 'package:hmi_core/hmi_core_result_new.dart';
 import 'package:hmi_widgets/src/edit_field/show_unauthorized_editing_flushbar.dart';
 
 ///
@@ -253,58 +254,62 @@ class _NetworkEditFieldState<T> extends State<NetworkEditField<T>> {
   /// validating if the value can be parsed in to T (int / double)
   String? _valueValidator(value) {
     final result = _parseValue(value, fractionDigits: _fractionDigits);
-    return result.hasError ? const Localized('Invalid date value').v : null;
+    return switch(result) {
+      Ok() => null,
+      Err() => const Localized('Invalid date value').v,
+    };
   }
   ///
   void _onEditingComplete() {
     _log.debug('[._onEditingComplete]');
-    _parseValue(_editingController.text, fractionDigits: _fractionDigits).fold(
-      onData: (numValue) {
-        if ('${numValue}' != _initValue) {
-          _log.debug('[.build._onEditingComplete] new numValue: ${numValue}\t_initValue: $_initValue');
-          _sendValue(_dsClient, _writeTagName, _responseTagName, numValue);
+    switch(_parseValue(_editingController.text, fractionDigits: _fractionDigits)) {
+      case Ok(:final value):
+        if ('${value}' != _initValue) {
+          _log.debug('[.build._onEditingComplete] new numValue: ${value}\t_initValue: $_initValue');
+          _sendValue(_dsClient, _writeTagName, _responseTagName, value);
         }
-      }, 
-      onError: (failure) {
-        _log.debug('[.build._onEditingComplete] error: ${failure.message}');
-      },
-    );
+        break;
+      case Err(:final error):
+        _log.debug('[.build._onEditingComplete] error: ${error.message}');
+        break;
+    }
   }
   ///
   /// Parses string into T (int / double)
-  Result<T> _parseValue(String value, {int fractionDigits = 0}) {
+  ResultF<T> _parseValue(String value, {int fractionDigits = 0}) {
     if (T == int) {
       return _textToInt(value);
     } else if (T == double) {
       return _textToFixedDouble(value, fractionDigits);
     } else {
-      return Result<T>(
-        error: Failure.convertion(
+      return Err(
+        Failure.convertion(
           message: 'Ошибка в методе $runtimeType._textToFixedDouble: value "${_editingController.text}" can`t be converted', 
           stackTrace: StackTrace.current
         ),
       );
     }
   }
   ///
-  Result<T> _textToInt(String value) {
+  ResultF<T> _textToInt(String value) {
     final intValue = int.tryParse(value);
     return intValue != null 
-      ? Result<T>(data: intValue as T) 
-      : Result<T>(
-        error: Failure.convertion(
-          message: 'Ошибка в методе $runtimeType._textToInt: value "$value" can`t be converted into int', 
-          stackTrace: StackTrace.current),
+      ? Ok(intValue as T) 
+      : Err(
+          Failure.convertion(
+            message: 'Ошибка в методе $runtimeType._textToInt: value "$value" can`t be converted into int', 
+            stackTrace: StackTrace.current,
+          ),
         );
   }
   ///
-  Result<T> _textToFixedDouble(String value, int fractionDigits) {
+  ResultF<T> _textToFixedDouble(String value, int fractionDigits) {
     final doubleValue = double.tryParse(value);
     if (doubleValue != null) {
-      return Result<T>(data: double.parse(doubleValue.toStringAsFixed(fractionDigits)) as T);
+      return Ok(double.parse(doubleValue.toStringAsFixed(fractionDigits)) as T);
     } else {
-      return Result<T>(
-        error: Failure.convertion(
+      return Err(
+        Failure.convertion(
           message: 'Ошибка в методе $runtimeType._textToFixedDouble: value "$value" can`t be converted into double', 
           stackTrace: StackTrace.current,
         ),
@@ -331,12 +336,15 @@ class _NetworkEditFieldState<T> extends State<NetworkEditField<T>> {
         responseTimeout: _responseTimeout,
       ).exec(value).then((responseValue) {
         setState(() {
-          if (responseValue.hasError) {
-            _savingState = OperationState.undefined;
-            _editingState = EditingState.changed;
-          } else {
-            _savingState = OperationState.success;
-            _editingState = EditingState.notChanged;
+          switch (responseValue) {
+            case Ok(value: _):
+              _savingState = OperationState.success;
+              _editingState = EditingState.notChanged;
+              break;
+            case Err(error: _):
+              _savingState = OperationState.undefined;
+              _editingState = EditingState.changed;
+              break;
           }
         });
       });

lib/src/edit_field/network_dropdown_field/network_dropdown_field.dart

@@ -2,6 +2,7 @@ import 'dart:core';
 import 'package:hmi_networking/hmi_networking.dart';
 import 'package:flutter/material.dart';
 import 'package:hmi_core/hmi_core.dart';
+import 'package:hmi_core/hmi_core_result_new.dart';
 import 'package:hmi_widgets/src/edit_field/show_unauthorized_editing_flushbar.dart';
 import 'package:hmi_widgets/src/theme/app_theme.dart';
 import 'oil_data.dart';
@@ -193,7 +194,7 @@ class _NetworkDropdownFormFieldState extends State<NetworkDropdownFormField> {
           if (mounted) {
             setState(() {
               _state.setSaved();
-              if (responseValue.hasError) {
+              if (responseValue case Err(error: final _)) {
                 _state.setChanged();
               }
             });

lib/src/indicators/value_indicators/circular_value_indicator.dart

@@ -182,7 +182,7 @@ class CircularValueIndicator extends StatelessWidget {
           style: textStyle.copyWith(
             color: textStyle.color!.withOpacity(0.7),
           ),
-          textScaleFactor: 0.8 * 0.0168 * _size,
+          textScaler: TextScaler.linear(0.8 * 0.0168 * _size),
         ),
       );
     }
@@ -211,7 +211,7 @@ class CircularValueIndicator extends StatelessWidget {
                   : textStyle,
             child: Text(valueText,
               textAlign: TextAlign.center,
-              textScaleFactor: 1.5 * 0.01618 * _size,
+              textScaler: TextScaler.linear(1.5 * 0.01618 * _size),
             ),
           ),
         ),

lib/src/indicators/value_indicators/text_value_indicator.dart

@@ -111,7 +111,7 @@ class _TextValueIndicatorState extends State<TextValueIndicator> {
         Text(
           value.toStringAsFixed(_fractionDigits),
           style: _textStyle.apply(color: color),
-          textScaleFactor: 1.5,
+          textScaler: TextScaler.linear(1.5),
         ),
         ..._buildUnitText(_valueUnit, color),
       ],
@@ -125,7 +125,7 @@ class _TextValueIndicatorState extends State<TextValueIndicator> {
         Text(
           _valueUnit,
           style: _unitTextStyle.apply(color: color),
-          textScaleFactor: 1.5,
+          textScaler: TextScaler.linear(1.5),
         ),
       ];
     }

pubspec.yaml

@@ -4,7 +4,7 @@ version: 0.0.1
 homepage: https://github.com/a-givertzman/hmi_widgets
 
 environment:
-  sdk: '>=2.18.2 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
   flutter: ">=1.17.0"
 
 dependencies:
@@ -20,7 +20,7 @@ dev_dependencies:
   # flutter_lints: ^2.0.0
   fl_chart:
     git:
-      url: https://github.com/a-givertzman/fl_chart
+      url: https://github.com/a-givertzman/fl_chart.git
       ref: master
   hmi_core:
     git: