Merge branch 'master' of git://github.com/Idean/Flutter-Neumorphic in…

…to remove_generated_localization_class

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.1.1
+
+* Addresses a conflict with Flutter 2.5.0 ([#239](https://github.com/Idean/Flutter-Neumorphic/issues/239)).
+
 ## 3.1.0
 
 * Null safety

lib/src/widget/button.dart

@@ -2,10 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_neumorphic/flutter_neumorphic.dart';
-
 import '../theme/neumorphic_theme.dart';
 import '../widget/app_bar.dart';
-import 'animation/animated_scale.dart';
+import 'animation/animated_scale.dart' as animationScale;
 import 'container.dart';
 
 typedef void NeumorphicButtonClickListener();
@@ -197,7 +196,7 @@ class _NeumorphicButtonState extends State<NeumorphicButton> {
         hasTapUp = true;
         _resetIfTapUp();
       },
-      child: AnimatedScale(
+      child: animationScale.AnimatedScale(
         scale: _getScale(),
         child: Neumorphic(
           margin: widget.margin ?? const EdgeInsets.all(0),

lib/src/widget/switch.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/widgets.dart';
-import 'package:flutter_neumorphic/src/widget/animation/animated_scale.dart';
+import 'package:flutter_neumorphic/src/widget/animation/animated_scale.dart'
+    as animationScale;
 
 import '../../flutter_neumorphic.dart';
 import '../neumorphic_box_shape.dart';
@@ -164,7 +165,7 @@ class NeumorphicSwitch extends StatelessWidget {
               shape: NeumorphicShape.flat,
               color: _getTrackColor(theme, this.isEnabled),
             ),
-            child: AnimatedScale(
+            child: animationScale.AnimatedScale(
               scale: this.isEnabled ? 1 : 0,
               alignment: this.value ? Alignment(0.5, 0) : Alignment(-0.5, 0),
               child: AnimatedThumb(

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_neumorphic
 description: A complete, ready to use, Neumorphic ui kit for Flutter. Dark theming compatible & fully customizable.
-version: 3.1.0
+version: 3.1.1
 #authors: [
 #  Florent Champigny <[email protected]>,
 #  Olivier Bonvila <[email protected]>,
@@ -11,7 +11,7 @@ issue_tracker: https://github.com/Idean/Flutter-Neumorphic/issues
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=1.13.18 <2.0.0"
+  flutter: ">=1.13.18"
 
 dependencies:
   flutter: