Skip to content

Commit a751620

Browse files
author
Gordon Hayes
committed
feat: null safety
1 parent 4c7694f commit a751620

File tree

8 files changed

+27
-27
lines changed

8 files changed

+27
-27
lines changed

section_2/built_in_explicit_animations/lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:transition_widgets_example/transitions.dart/slide_transition.dar
99
void main() => runApp(const MyApp());
1010

1111
class MyApp extends StatelessWidget {
12-
const MyApp({Key key}) : super(key: key);
12+
const MyApp({Key? key}) : super(key: key);
1313

1414
@override
1515
Widget build(BuildContext context) {

section_2/built_in_explicit_animations/lib/transitions.dart/align_transition.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@ import 'package:flutter/material.dart';
22
import 'package:transition_widgets_example/styles.dart';
33

44
class AlignTransitionExample extends StatefulWidget {
5-
const AlignTransitionExample({Key key}) : super(key: key);
5+
const AlignTransitionExample({Key? key}) : super(key: key);
66

77
@override
88
_AlignTransitionExampleState createState() => _AlignTransitionExampleState();
99
}
1010

1111
class _AlignTransitionExampleState extends State<AlignTransitionExample>
1212
with SingleTickerProviderStateMixin {
13-
AnimationController _controller;
14-
Animation<AlignmentGeometry> _animation;
13+
late AnimationController _controller;
14+
late Animation<AlignmentGeometry> _animation;
1515

1616
@override
1717
void initState() {
18+
super.initState();
1819
_controller = AnimationController(
1920
vsync: this,
2021
duration: const Duration(seconds: 2),
@@ -24,7 +25,6 @@ class _AlignTransitionExampleState extends State<AlignTransitionExample>
2425
.chain(CurveTween(curve: Curves.bounceOut))
2526
.animate(_controller);
2627
_controller.repeat(reverse: true);
27-
super.initState();
2828
}
2929

3030
@override

section_2/built_in_explicit_animations/lib/transitions.dart/fade_transition.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
import 'package:flutter/material.dart';
22

33
class FadeTransitionExample extends StatefulWidget {
4-
const FadeTransitionExample({Key key}) : super(key: key);
4+
const FadeTransitionExample({Key? key}) : super(key: key);
55

66
@override
77
_FadeTransitionExampleState createState() => _FadeTransitionExampleState();
88
}
99

1010
class _FadeTransitionExampleState extends State<FadeTransitionExample>
1111
with SingleTickerProviderStateMixin {
12-
AnimationController _controller;
12+
late AnimationController _controller;
1313

1414
String _text = 'Fade In';
1515
String _key = 'fadein';
1616

1717
@override
1818
void initState() {
19+
super.initState();
1920
_controller =
2021
AnimationController(vsync: this, duration: const Duration(seconds: 5));
2122
_controller
2223
..repeat(reverse: true)
2324
..addStatusListener(_animationStatusListener);
24-
super.initState();
2525
}
2626

2727
void _animationStatusListener(AnimationStatus status) {

section_2/built_in_explicit_animations/lib/transitions.dart/rotate_and_scale_transition.dart

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
22
import 'package:transition_widgets_example/styles.dart';
33

44
class RotateAndScaleTransitionExample extends StatefulWidget {
5-
const RotateAndScaleTransitionExample({Key key}) : super(key: key);
5+
const RotateAndScaleTransitionExample({Key? key}) : super(key: key);
66

77
@override
88
_RotateAndScaleTransitionExampleState createState() =>
@@ -12,13 +12,14 @@ class RotateAndScaleTransitionExample extends StatefulWidget {
1212
class _RotateAndScaleTransitionExampleState
1313
extends State<RotateAndScaleTransitionExample>
1414
with TickerProviderStateMixin {
15-
AnimationController _controller;
16-
AnimationController _controller2;
17-
Animation<double> _rotateAnimation;
18-
Animation<double> _scaleAnimation;
15+
late AnimationController _controller;
16+
late AnimationController _controller2;
17+
late Animation<double> _rotateAnimation;
18+
late Animation<double> _scaleAnimation;
1919

2020
@override
2121
void initState() {
22+
super.initState();
2223
_controller = AnimationController(
2324
vsync: this,
2425
duration: const Duration(seconds: 3),
@@ -33,12 +34,12 @@ class _RotateAndScaleTransitionExampleState
3334
.animate(CurvedAnimation(parent: _controller2, curve: Curves.ease));
3435
_controller.repeat(reverse: true);
3536
_controller2.forward();
36-
super.initState();
3737
}
3838

3939
@override
4040
void dispose() {
4141
_controller.dispose();
42+
_controller2.dispose();
4243
super.dispose();
4344
}
4445

section_2/built_in_explicit_animations/lib/transitions.dart/scale_transition.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
33
import 'package:transition_widgets_example/styles.dart';
44

55
class ScaleTransitionExample extends HookWidget {
6-
const ScaleTransitionExample({Key key}) : super(key: key);
6+
const ScaleTransitionExample({Key? key}) : super(key: key);
77

88
@override
99
Widget build(BuildContext context) {

section_2/built_in_explicit_animations/lib/transitions.dart/slide_transition.dart

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
import 'package:flutter/material.dart';
22

33
class SlideTransitionExample extends StatefulWidget {
4-
const SlideTransitionExample({Key key, this.child}) : super(key: key);
4+
const SlideTransitionExample({Key? key, this.child}) : super(key: key);
55

6-
final Widget child;
6+
final Widget? child;
77

88
@override
99
_SlideTransitionExampleState createState() => _SlideTransitionExampleState();
1010
}
1111

1212
class _SlideTransitionExampleState extends State<SlideTransitionExample>
1313
with SingleTickerProviderStateMixin {
14-
AnimationController _controller;
15-
Animation<Offset> _animation;
14+
late AnimationController _controller;
15+
late Animation<Offset> _animation;
1616

1717
@override
1818
void initState() {
19+
super.initState();
1920
_controller = AnimationController(
2021
vsync: this,
2122
duration: const Duration(seconds: 1),
@@ -30,8 +31,6 @@ class _SlideTransitionExampleState extends State<SlideTransitionExample>
3031
),
3132
);
3233
_controller.forward();
33-
34-
super.initState();
3534
}
3635

3736
@override

section_2/built_in_explicit_animations/pubspec.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ packages:
4949
name: cupertino_icons
5050
url: "https://pub.dartlang.org"
5151
source: hosted
52-
version: "0.1.2"
52+
version: "1.0.3"
5353
fake_async:
5454
dependency: transitive
5555
description:
@@ -68,7 +68,7 @@ packages:
6868
name: flutter_hooks
6969
url: "https://pub.dartlang.org"
7070
source: hosted
71-
version: "0.7.0"
71+
version: "0.18.0"
7272
flutter_test:
7373
dependency: "direct dev"
7474
description: flutter
@@ -165,4 +165,4 @@ packages:
165165
version: "2.1.2"
166166
sdks:
167167
dart: ">=2.12.0 <3.0.0"
168-
flutter: ">=1.5.8"
168+
flutter: ">=1.20.0"

section_2/built_in_explicit_animations/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ description: A new Flutter project.
1414
version: 1.0.0+1
1515

1616
environment:
17-
sdk: ">=2.1.0 <3.0.0"
17+
sdk: '>=2.12.0 <3.0.0'
1818

1919
dependencies:
2020
flutter:
2121
sdk: flutter
22-
cupertino_icons: ^0.1.2
23-
flutter_hooks: ^0.7.0
22+
cupertino_icons: ^1.0.3
23+
flutter_hooks: ^0.18.0
2424

2525
dev_dependencies:
2626
flutter_test:

0 commit comments

Comments
 (0)