Upgraded to Flutter 2.0

Author: pawlik92

README.md

@@ -21,4 +21,4 @@ If you want to be informed about new projects, follow me on [Twitter](https://tw
 
 ## Dev
 
-To build application, you need to install **Flutter (1.17+)**. You can find help here: https://flutter.dev/docs/get-started/install
+To build application, you need to install **Flutter (2.0+)**. You can find help here: https://flutter.dev/docs/get-started/install

lib/main.dart

@@ -5,7 +5,8 @@ import 'package:flutter_parallax_scroll/screens/home/home_screen.dart';
 void main() {
  WidgetsFlutterBinding.ensureInitialized();
 
- SystemChrome.setEnabledSystemUIOverlays([SystemUiOverlay.bottom]);
+ SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
+ overlays: [SystemUiOverlay.bottom]);
  SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp])
  .then((_) {
  runApp(MyApp());

lib/screens/home/home_screen.dart

@@ -6,7 +6,7 @@ import 'package:flutter_parallax_scroll/shared/consts.dart';
 import 'package:flutter_parallax_scroll/shared/widgets/paralax.dart';
 
 class HomeScreen extends StatefulWidget {
- HomeScreen({Key key}) : super(key: key);
+ HomeScreen({Key? key}) : super(key: key);
 
  @override
  _HomeScreenState createState() => _HomeScreenState();

lib/screens/home/subscreens/benefits_subscreen.dart

@@ -5,11 +5,11 @@ import 'package:google_fonts/google_fonts.dart';
 
 class BenefitsSubscreen extends StatelessWidget {
  const BenefitsSubscreen({
- Key key,
+ Key? key,
  this.controller,
  }) : super(key: key);
 
- final ScrollController controller;
+ final ScrollController? controller;
 
  @override
  Widget build(BuildContext context) {
@@ -103,7 +103,7 @@ class BenefitsSubscreen extends StatelessWidget {
  text: 'Get in touch',
  minWidth: 200,
  onPressed: () {
- controller.animateTo(0,
+ controller!.animateTo(0,
  duration: Duration(milliseconds: 2300), curve: Curves.ease);
  },
  ),

lib/screens/home/subscreens/urban_planners_subscreen.dart

@@ -4,11 +4,11 @@ import 'package:google_fonts/google_fonts.dart';
 
 class UrbanPlannersSubscreen extends StatelessWidget {
  const UrbanPlannersSubscreen({
- Key key,
+ Key? key,
  this.controller,
  }) : super(key: key);
 
- final ScrollController controller;
+ final ScrollController? controller;
 
  @override
  Widget build(BuildContext context) {
@@ -67,9 +67,9 @@ class UrbanPlannersSubscreen extends StatelessWidget {
  SizedBox(
  height: 10,
  ),
- FlatButton(
+ TextButton(
  onPressed: () {
- controller.animateTo(1540,
+ controller!.animateTo(1540,
  duration: Duration(milliseconds: 2300), curve: Curves.ease);
  },
  child: Text(

lib/shared/widgets/custom_button.dart

@@ -4,9 +4,9 @@ import 'package:google_fonts/google_fonts.dart';
 
 class CustomButton extends StatelessWidget {
  const CustomButton({
- Key key,
- @required this.text,
- @required this.onPressed,
+ Key? key,
+ required this.text,
+ required this.onPressed,
  this.minWidth = 135.0,
  this.height = 62.0,
  }) : super(key: key);
@@ -21,14 +21,16 @@ class CustomButton extends StatelessWidget {
  return ButtonTheme(
  minWidth: minWidth,
  height: height,
- child: RaisedButton(
- elevation: 0,
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(25.0),
- ),
+ child: ElevatedButton(
+ style: ElevatedButton.styleFrom(
+ padding: EdgeInsets.symmetric(horizontal: 40.0, vertical: 20.0),
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(25.0),
+ ),
+ primary: CustomColors.orange,
+ elevation: 0,
+ textStyle: TextStyle(color: Colors.white)),
  onPressed: onPressed,
- color: CustomColors.orange,
- textColor: Colors.white,
  child: Text(
  text.toUpperCase(),
  style: GoogleFonts.nunito(

lib/shared/widgets/paralax/parallax_scroll.dart

@@ -3,7 +3,7 @@ import 'package:rxdart/rxdart.dart';
 
 class ParallaxScroll extends StatefulWidget {
  const ParallaxScroll({
- Key key,
+ Key? key,
  this.children = const <Widget>[],
  this.parallaxBackgroundChildren = const <ParallaxElement>[],
  this.parallaxForegroundChildren = const <ParallaxElement>[],
@@ -14,8 +14,8 @@ class ParallaxScroll extends StatefulWidget {
  final List<Widget> children;
  final List<ParallaxElement> parallaxBackgroundChildren;
  final List<ParallaxElement> parallaxForegroundChildren;
- final ScrollPhysics physic;
- final ScrollController controller;
+ final ScrollPhysics? physic;
+ final ScrollController? controller;
 
  @override
  _ParallaxScrollState createState() => _ParallaxScrollState();
@@ -53,10 +53,6 @@ class _ParallaxScrollState extends State<ParallaxScroll> {
 
  List<_ParallaxElementWrapper> _buildParallaxElements(
  List<ParallaxElement> elements) {
- if (elements == null) {
- return [];
- }
-
  List<_ParallaxElementWrapper> result = [];
  for (ParallaxElement element in elements) {
  result.add(
@@ -77,9 +73,7 @@ class _ParallaxScrollState extends State<ParallaxScroll> {
  return true;
  }
 
- Stream<double> _getDelayedScrollStream(Duration duration) {
- assert(duration != null);
-
+ Stream<double>? _getDelayedScrollStream(Duration duration) {
  if (!_scrollStreams.containsKey(duration)) {
  _generateScrollStream(duration);
  }
@@ -95,29 +89,29 @@ class _ParallaxScrollState extends State<ParallaxScroll> {
 
 class ParallaxElement extends StatelessWidget {
  const ParallaxElement({
- Key key,
+ Key? key,
  this.scrollDelay = const Duration(),
- @required this.child,
+ required this.child,
  }) : super(key: key);
 
  final Duration scrollDelay;
  final Widget child;
 
  @override
  Widget build(BuildContext context) {
- return child ?? Container();
+ return child;
  }
 }
 
 class _ParallaxElementWrapper extends StatelessWidget {
  const _ParallaxElementWrapper(
  this.child, {
- @required this.scrollPostitionStream,
- Key key,
+ required this.scrollPostitionStream,
+ Key? key,
  }) : super(key: key);
 
  final ParallaxElement child;
- final Stream<double> scrollPostitionStream;
+ final Stream<double>? scrollPostitionStream;
 
  @override
  Widget build(BuildContext context) {

lib/shared/widgets/paralax/parallax_svg_background.dart

@@ -1,11 +1,8 @@
 import 'dart:typed_data';
-import 'dart:ui';
 
 import 'package:quiver/core.dart' as quiver;
 import 'package:flutter/widgets.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:vector_math/vector_math_64.dart';
 
 class ParallaxBackgroundSettings {
  const ParallaxBackgroundSettings({
@@ -14,7 +11,7 @@ class ParallaxBackgroundSettings {
  this.shadowColor = const Color(0x00000000),
  });
 
- final Float64List deepEffectMatrix;
+ final Float64List? deepEffectMatrix;
  final double shadowSigma;
  final Color shadowColor;
 
@@ -37,14 +34,14 @@ class ParallaxBackgroundSettings {
  shadowColor == other.shadowColor;
 
  @override
- int get hashCode => quiver.hash3(deepEffectMatrix?.hashCode ?? 1,
- shadowColor?.hashCode ?? 2, shadowSigma?.hashCode ?? 3);
+ int get hashCode => quiver.hash3(
+ deepEffectMatrix.hashCode, shadowColor.hashCode, shadowSigma.hashCode);
 }
 
 class ParallaxSvgBackground extends StatefulWidget {
  const ParallaxSvgBackground({
- Key key,
- @required this.svgAssetName,
+ Key? key,
+ required this.svgAssetName,
  this.disableDeepEffect = false,
  this.disableShadow = false,
  this.translationOffset = Offset.zero,
@@ -57,7 +54,7 @@ class ParallaxSvgBackground extends StatefulWidget {
  final bool disableShadow;
  final String svgAssetName;
  final Offset translationOffset;
- final ParallaxBackgroundSettings settings;
+ final ParallaxBackgroundSettings? settings;
  final bool autoXScale;
  final bool autoYScale;
 
@@ -109,7 +106,7 @@ class _ParallaxSvgBackgroundState extends State<ParallaxSvgBackground> {
  ),
  );
  if (_needsRepaint == true) {
- WidgetsBinding.instance.addPostFrameCallback(
+ WidgetsBinding.instance!.addPostFrameCallback(
  (_) => setState(() => _needsRepaint = false));
  }
  return result;
@@ -138,37 +135,37 @@ class _ParallaxBackgroundPainter extends CustomPainter {
  this.screenSize,
  });
 
- final bool disableDeepEffect;
- final bool disableShadow;
- final bool needsRepaint;
- final DrawableRoot drawableRoot;
- final Offset translationOffset;
- final ParallaxBackgroundSettings settings;
- final bool autoXScale;
- final bool autoYScale;
- final Size screenSize;
+ final bool? disableDeepEffect;
+ final bool? disableShadow;
+ final bool? needsRepaint;
+ final DrawableRoot? drawableRoot;
+ final Offset? translationOffset;
+ final ParallaxBackgroundSettings? settings;
+ final bool? autoXScale;
+ final bool? autoYScale;
+ final Size? screenSize;
 
  @override
  void paint(Canvas canvas, Size size) async {
  canvas.save();
  if (translationOffset != null) {
- canvas.translate(translationOffset.dx, translationOffset.dy);
+ canvas.translate(translationOffset!.dx, translationOffset!.dy);
  }
 
  double scaleXFactor = 1;
  double scaleYFactor = 1;
 
  if (autoXScale == true) {
- scaleXFactor = screenSize.width / drawableRoot.viewport.width;
+ scaleXFactor = screenSize!.width / drawableRoot!.viewport.width;
  }
  if (autoYScale == true) {
- scaleYFactor = screenSize.height / drawableRoot.viewport.height;
+ scaleYFactor = screenSize!.height / drawableRoot!.viewport.height;
  }
 
  canvas.scale(scaleXFactor, scaleYFactor);
 
- drawableRoot.clipCanvasToViewBox(canvas);
- _drawPath(canvas, drawableRoot);
+ drawableRoot!.clipCanvasToViewBox(canvas);
+ _drawPath(canvas, drawableRoot!);
 
  canvas.restore();
  }
@@ -187,16 +184,17 @@ class _ParallaxBackgroundPainter extends CustomPainter {
  DrawableStyle(
  fill: DrawablePaint(
  PaintingStyle.fill,
- color: settings.shadowColor,
- maskFilter: MaskFilter.blur(BlurStyle.normal, settings.shadowSigma),
+ color: settings!.shadowColor,
+ maskFilter:
+ MaskFilter.blur(BlurStyle.normal, settings!.shadowSigma),
  ),
  ),
  );
 
  canvas.save();
 
  canvas.transform(deepEffectMatrix);
- shadowDrawable.draw(canvas, null);
+ shadowDrawable.draw(canvas, Rect.zero);
 
  canvas.restore();
  }
@@ -214,12 +212,12 @@ class _ParallaxBackgroundPainter extends CustomPainter {
  canvas.save();
 
  canvas.transform(deepEffectMatrix);
- drawable.draw(canvas, null);
- deepDrawable.draw(canvas, null);
+ drawable.draw(canvas, Rect.zero);
+ deepDrawable.draw(canvas, Rect.zero);
 
  canvas.restore();
  }
 
- drawable.draw(canvas, null);
+ drawable.draw(canvas, Rect.zero);
  }
 }

lib/shared/widgets/svg_label.dart

@@ -5,8 +5,8 @@ import 'package:google_fonts/google_fonts.dart';
 
 class SvgLabel extends StatelessWidget {
  SvgLabel({
- @required this.assetName,
- @required this.label,
+ required this.assetName,
+ required this.label,
  });
 
  final String assetName;