Skip to content

Commit bb7f2d4

Browse files
rxlabzrxlabz
committed
minors fixes
1 parent 83d4ebd commit bb7f2d4

13 files changed

+24308
-24053
lines changed

‎docs/main.dart.js‎

Lines changed: 24122 additions & 23878 deletions
Large diffs are not rendered by default.

‎lib/controls/animation_control.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ class AnimationControl extends StatelessWidget {
3333
Expanded(
3434
child: DurationControl(
3535
duration: duration,
36-
onDurationChange: (value) =>
37-
duration > 100 ? onDurationChanged : null,
36+
onDurationChange: duration > 100 ? onDurationChanged : null,
3837
),
3938
),
4039
SizedBox(

‎lib/curves/curve_painter.dart‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ import 'package:quiver/iterables.dart';
66
import 'curves_data.dart';
77

88
class CurvePainter extends CustomPainter {
9-
CurvePainter(this.controller, this.anim, {this.thumbMode = false});
9+
CurvePainter(this.value, this.anim, {this.thumbMode = false});
1010

1111
final CurvedAnimation anim;
1212
final bool thumbMode;
1313

14-
final AnimationController controller;
14+
final double value;
15+
//final AnimationController controller;
1516

1617
double _heightRef;
1718
double _widthRef;
@@ -28,10 +29,8 @@ class CurvePainter extends CustomPainter {
2829

2930
void _drawCurrentValueMarker(Canvas canvas, Size size, List<double> points) {
3031
canvas.drawCircle(
31-
Offset(
32-
controller.value * _widthRef,
33-
points[(controller.value * (divisions - 1)).floor()] *
34-
(_heightRef * 1.1)),
32+
Offset(value * _widthRef,
33+
points[(value * (divisions - 1)).floor()] * (_heightRef * 1.1)),
3534
5.0,
3635
Paint()..color = Colors.cyan.shade800,
3736
);
@@ -80,8 +79,7 @@ class CurvePainter extends CustomPainter {
8079
..paint(canvas, offset);
8180

8281
@override
83-
bool shouldRepaint(CurvePainter oldDelegate) =>
84-
thumbMode ? controller.value != oldDelegate.controller.value : false;
82+
bool shouldRepaint(CurvePainter oldDelegate) => true;
8583
}
8684

8785
List<double> generateCurveValues(CurvedAnimation anim, int divisions) =>

‎lib/curves/curves_menu.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class CurvesThumbMenu extends StatelessWidget {
9595
child: CustomPaint(
9696
willChange: false,
9797
painter: CurvePainter(
98-
animController,
98+
animController.value,
9999
curvedAnimation,
100100
thumbMode: true,
101101
),

‎lib/screens/animateds/animated_align_example.dart‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ class _AnimatedAlignExampleState extends State<AnimatedAlignExample>
6060
return SizedBox.expand(
6161
child: Padding(
6262
padding: const EdgeInsets.all(16.0),
63-
child: Column(
64-
crossAxisAlignment: CrossAxisAlignment.start,
63+
child: ListView(
64+
/*crossAxisAlignment: CrossAxisAlignment.start,*/
6565
children: <Widget>[
6666
ExampleHeader(
6767
title: 'AnimatedAlign',
@@ -80,7 +80,8 @@ class _AnimatedAlignExampleState extends State<AnimatedAlignExample>
8080
setState(() => _currentCurve = curve),
8181
),
8282
),
83-
Expanded(
83+
ConstrainedBox(
84+
constraints: BoxConstraints(maxHeight: 300),
8485
child: AnimationContainer(
8586
child: Stack(
8687
children: <Widget>[
@@ -90,7 +91,7 @@ class _AnimatedAlignExampleState extends State<AnimatedAlignExample>
9091
duration: aMillisecond * _duration,
9192
child: Container(
9293
color: Colors.blue,
93-
height: 150,
94+
height: 60,
9495
width: 200,
9596
child: Center(
9697
child: Text(

‎lib/screens/animateds/animated_container_example.dart‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -46,55 +46,55 @@ class _AnimatedContainerExampleState extends State<AnimatedContainerExample>
4646

4747
@override
4848
Widget build(BuildContext context) {
49-
double itemWidth = ((_count % 3) + 1) * 100;
49+
double itemWidth = ((_count % 3) + 1) * 70;
5050
double itemHeight = ((_count % 3) + 1) * 60;
51-
return SizedBox.expand(
52-
child: Padding(
53-
padding: const EdgeInsets.all(16.0),
54-
child: Column(
55-
crossAxisAlignment: CrossAxisAlignment.start,
56-
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
57-
children: <Widget>[
58-
ExampleHeader(
59-
title: 'AnimatedContainer',
60-
description:
61-
'An AnimatedContainer can automatically interpolate between differents values of his properties( width, height, color, padding).'),
62-
ConstrainedBox(
63-
constraints: BoxConstraints(maxHeight: 100),
64-
child: AnimationControl(
65-
duration: _duration,
66-
curve: _currentCurve,
67-
/*direction: Axis.vertical,*/
68-
animationController: animationController,
69-
onDurationChanged: (value) =>
70-
setState(() => _duration += value),
71-
onCurveChanged: (curve) =>
72-
setState(() => _currentCurve = curve),
73-
),
51+
return Padding(
52+
padding: const EdgeInsets.all(16.0),
53+
child: ListView(
54+
/*crossAxisAlignment: CrossAxisAlignment.start,
55+
mainAxisAlignment: MainAxisAlignment.spaceEvenly,*/
56+
children: <Widget>[
57+
ExampleHeader(
58+
title: 'AnimatedContainer',
59+
description:
60+
'An AnimatedContainer can automatically interpolate between differents values of his properties( width, height, color, padding).'),
61+
ConstrainedBox(
62+
constraints: BoxConstraints(maxHeight: 100),
63+
child: AnimationControl(
64+
duration: _duration,
65+
curve: _currentCurve,
66+
/*direction: Axis.vertical,*/
67+
animationController: animationController,
68+
onDurationChanged: (value) => setState(() {
69+
_duration += value;
70+
//animationController.duration = _duration;
71+
}),
72+
onCurveChanged: (curve) => setState(() => _currentCurve = curve),
7473
),
75-
Expanded(
76-
child: AnimationContainer(
77-
child: Center(
78-
child: AnimatedContainer(
79-
duration: aMillisecond * _duration,
80-
curve: _currentCurve,
81-
color: Colors.primaries[(_count % 8).floor()],
82-
height: itemHeight,
83-
width: itemWidth,
84-
child: Center(
85-
child: Text(
86-
'Animated Container',
87-
textAlign: TextAlign.center,
88-
style: TextStyle(
89-
color: Colors.white,
90-
),
91-
)),
92-
),
74+
),
75+
ConstrainedBox(
76+
constraints: BoxConstraints(maxHeight: 300),
77+
child: AnimationContainer(
78+
child: Center(
79+
child: AnimatedContainer(
80+
duration: aMillisecond * _duration,
81+
curve: _currentCurve,
82+
color: Colors.primaries[(_count % 8).floor()],
83+
height: itemHeight,
84+
width: itemWidth,
85+
child: Center(
86+
child: Text(
87+
'Animated Container',
88+
textAlign: TextAlign.center,
89+
style: TextStyle(
90+
color: Colors.white,
91+
),
92+
)),
9393
),
9494
),
95-
)
96-
],
97-
),
95+
),
96+
)
97+
],
9898
),
9999
);
100100
}

‎lib/screens/animateds/animated_opacity_example.dart‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ class _AnimatedOpacityExampleState extends State<AnimatedOpacityExample>
4343
return SizedBox.expand(
4444
child: Padding(
4545
padding: const EdgeInsets.all(16),
46-
child: Column(
47-
crossAxisAlignment: CrossAxisAlignment.start,
48-
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
46+
child: ListView(
47+
/*crossAxisAlignment: CrossAxisAlignment.start,
48+
mainAxisAlignment: MainAxisAlignment.spaceEvenly,*/
4949
children: <Widget>[
5050
ExampleHeader(
5151
title: 'AnimatedOpacity',
@@ -64,16 +64,17 @@ class _AnimatedOpacityExampleState extends State<AnimatedOpacityExample>
6464
setState(() => _currentCurve = curve),
6565
),
6666
),
67-
Expanded(
67+
ConstrainedBox(
68+
constraints: BoxConstraints(maxHeight: 180),
6869
child: AnimationContainer(
6970
child: AnimatedOpacity(
7071
curve: _currentCurve,
7172
duration: aMillisecond * _duration,
7273
opacity: opaque ? 1 : .2,
7374
child: Container(
7475
color: Colors.pink,
75-
height: 200,
76-
width: 200,
76+
height: 60,
77+
width: 120,
7778
child: Center(
7879
child: Text(
7980
'Animated Opacity ${opaque ? 1 : 0.2}',

‎lib/screens/animateds/animated_positioned_example.dart‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
import 'package:animation_widgets/examples.dart';
21
import 'package:flutter/material.dart';
32
import 'package:quiver/time.dart';
43

5-
import '../../controls/animation_control.dart';
64
import '../../controls/animation_container.dart';
5+
import '../../controls/animation_control.dart';
76
import '../../controls/example_header.dart';
8-
import '../../controls/theme_code_preview.dart';
97
import '../../curves/curves_data.dart';
108

119
final positions = [
12-
Rect.fromLTWH(0, 0, 200, 200),
13-
Rect.fromLTWH(100, 100, 150, 150),
14-
Rect.fromLTWH(0, 200, 200, 100),
10+
Rect.fromLTWH(0, 0, 200, 120),
11+
Rect.fromLTWH(50, 50, 150, 150),
12+
Rect.fromLTWH(0, 100, 120, 100),
1513
];
1614

1715
class AnimatedPositionedExample extends StatefulWidget {
@@ -62,8 +60,8 @@ class _AnimatedPositionedExampleState extends State<AnimatedPositionedExample>
6260
return SizedBox.expand(
6361
child: Padding(
6462
padding: const EdgeInsets.all(16.0),
65-
child: Column(
66-
crossAxisAlignment: CrossAxisAlignment.start,
63+
child: ListView(
64+
/*crossAxisAlignment: CrossAxisAlignment.start,*/
6765
children: <Widget>[
6866
ExampleHeader(
6967
title: 'AnimatedPositioned',
@@ -82,7 +80,8 @@ class _AnimatedPositionedExampleState extends State<AnimatedPositionedExample>
8280
setState(() => _currentCurve = curve),
8381
),
8482
),
85-
Expanded(
83+
ConstrainedBox(
84+
constraints: BoxConstraints(maxHeight: 300),
8685
child: AnimationContainer(
8786
child: Stack(
8887
children: <Widget>[

‎lib/screens/animateds/animated_textstyle_example.dart‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ class _AnimatedTextExampleState extends State<AnimatedTextExample>
5050
return SizedBox.expand(
5151
child: Padding(
5252
padding: const EdgeInsets.all(16),
53-
child: Column(
54-
crossAxisAlignment: CrossAxisAlignment.start,
55-
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
53+
child: ListView(
54+
/*crossAxisAlignment: CrossAxisAlignment.start,
55+
mainAxisAlignment: MainAxisAlignment.spaceEvenly,*/
5656
children: <Widget>[
5757
ExampleHeader(
5858
title: 'AnimatedDefaultTextStyle',
@@ -71,7 +71,8 @@ class _AnimatedTextExampleState extends State<AnimatedTextExample>
7171
setState(() => _currentCurve = curve),
7272
),
7373
),
74-
Expanded(
74+
ConstrainedBox(
75+
constraints: BoxConstraints(maxHeight: 200),
7576
child: AnimationContainer(
7677
child: Container(
7778
height: 300,

‎lib/screens/animateds/animated_widgets.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class _AnimatedWidgetsScreenState extends State<AnimatedWidgetsScreen>
6060
endDrawer: Drawer(
6161
child: ThemeCodePreview(codeExamples[_widgetTabsController.index]),
6262
),
63-
floatingActionButtonLocation: FloatingActionButtonLocation.endTop,
63+
floatingActionButtonLocation: FloatingActionButtonLocation.endFloat,
6464
floatingActionButton: FloatingActionButton(
6565
backgroundColor: running ? Colors.grey : Colors.pink,
6666
child: Icon(Icons.play_arrow),
@@ -85,7 +85,7 @@ class _AnimatedWidgetsScreenState extends State<AnimatedWidgetsScreen>
8585
);
8686

8787
return AppBar(
88-
title: Text('Flutter animated widgets'),
88+
title: Text('Animated widgets'),
8989
bottom: tabBar,
9090
actions: <Widget>[
9191
FlatButton.icon(

0 commit comments

Comments
 (0)