From c7f5030079b1010bad87ddc968771721fc34ca46 Mon Sep 17 00:00:00 2001 From: Andrew Brogdon Date: Mon, 4 May 2020 13:38:38 -0700 Subject: [PATCH] Moved two animation vignettes into misc. (#425) --- animations/README.md | 63 ++++++++++--------- animations/lib/main.dart | 21 ++++--- .../animated_positioned.dart} | 0 .../animated_switcher.dart} | 0 animations/pubspec.lock | 2 +- 5 files changed, 45 insertions(+), 41 deletions(-) rename animations/lib/src/{basics/09_animated_positioned.dart => misc/animated_positioned.dart} (100%) rename animations/lib/src/{basics/10_animated_switcher.dart => misc/animated_switcher.dart} (100%) diff --git a/animations/README.md b/animations/README.md index 190c5412c..4a13eee51 100644 --- a/animations/README.md +++ b/animations/README.md @@ -1,10 +1,10 @@ # Animation Samples -Sample apps that showcasing Flutter's animation features +Sample apps that showcase Flutter's animation features ## Goals -- Demonstrate the building blocks for animations and how they work together -- Provide samples for common patterns and use-cases +- Demonstrate the building blocks for animations and how they work together. +- Provide samples for common patterns and use-cases. ## Samples @@ -12,38 +12,40 @@ Sample apps that showcasing Flutter's animation features Building blocks and patterns -1. **AnimatedContainerDemo** Demonstrates how to use `AnimatedContainer`. -2. **PageRouteBuilderDemo** Demonstrates how to use `Tween` and `Animation` to -*build a custom page route transition. -3. **AnimationControllerDemo** Demonstrates how to use an `AnimationController`. -4. **TweenDemo** Demonstrates how to use a `Tween` with an -`AnimationController`. -5. **AnimatedBuilderDemo** Demonstrates how to use an `AnimatedBuilder` with an -`AnimationController`. -6. **CustomTweenDemo** Demonstrates how to extend `Tween`. -7. **TweenSequenceDemo** Demonstrates how to use `TweenSequence` to build a -button that changes between different colors. -8. **FadeTransitionDemo** Demonstrates how to use `FadeTransition`. -9. **AnimatedPositionedDemo** Demonstrates how to use `AnimatedPositioned`. -10. **AnimatedSwitcherDemo** Demonstrates how to use `AnimatedSwitcher`. +1. **AnimatedContainerDemo**: Demonstrates how to use `AnimatedContainer`. +2. **PageRouteBuilderDemo**: Demonstrates how to use `Tween` and `Animation` to + build a custom page route transition. +3. **AnimationControllerDemo**: Demonstrates how to use an + `AnimationController`. +4. **TweenDemo**: Demonstrates how to use a `Tween` with an + `AnimationController`. +5. **AnimatedBuilderDemo**: Demonstrates how to use an `AnimatedBuilder` with an + `AnimationController`. +6. **CustomTweenDemo**: Demonstrates how to extend `Tween`. +7. **TweenSequenceDemo**: Demonstrates how to use `TweenSequence` to build a + button that changes between different colors. +8. **FadeTransitionDemo**: Demonstrates how to use `FadeTransition`. ### Misc Other uses-cases and examples -- **RepeatingAnimationDemo** Demonstrates how to repeat an animation. -- **ExpandCardDemo** Demonstrates how to use `AnimatedCrossFade` to fade between -two widgets and change the size. -- **CarouselDemo** Demonstrates how to use `PageView` with a custom animation. -- **FocusImageDemo** Demonstrates how to measure the size of a widget and expand -it using a `PageRouteBuilder`. -- **PhysicsCardDragDemo** Demonstrates how to run an AnimationController with a -spring simulation. -- **CardSwipeDemo** A swipeable card that demonstrates how to use gesture -detection to drive an animation. -- **AnimatedList** Demonstrates how to use `AnimatedList`. -- **HeroAnimationDemo** Demonstrates how to use `Hero` animation. -- **CurvedAnimationDemo** Demonstrates how to use different curves in `CurvedAnimation`. +- **RepeatingAnimationDemo**: Demonstrates how to repeat an animation. +- **ExpandCardDemo**: Demonstrates how to use `AnimatedCrossFade` to fade + between two widgets and change the size. +- **CarouselDemo**: Demonstrates how to use `PageView` with a custom animation. +- **FocusImageDemo**: Demonstrates how to measure the size of a widget and + expand it using a `PageRouteBuilder`. +- **PhysicsCardDragDemo**: Demonstrates how to run an AnimationController with a + spring simulation. +- **CardSwipeDemo**: A swipeable card that demonstrates how to use gesture + detection to drive an animation. +- **AnimatedList**: Demonstrates how to use `AnimatedList`. +- **AnimatedPositionedDemo**: Demonstrates how to use `AnimatedPositioned`. +- **AnimatedSwitcherDemo**: Demonstrates how to use `AnimatedSwitcher`. +- **HeroAnimationDemo**: Demonstrates how to use `Hero` animation. +- **CurvedAnimationDemo**: Demonstrates how to use different curves in + `CurvedAnimation`. ## Other Resources @@ -51,3 +53,4 @@ detection to drive an animation. - [Animation widgets](https://flutter.dev/docs/development/ui/widgets/animation) - [Flutter cookbook - Animations](https://flutter.dev/docs/cookbook/animation) - [Animations tutorial](https://flutter.dev/docs/development/ui/animations/tutorial) +- [Implicit animation codelab](https://flutter.dev/docs/codelabs/implicit-animations) diff --git a/animations/lib/main.dart b/animations/lib/main.dart index 924d624d6..fadd4c6e7 100644 --- a/animations/lib/main.dart +++ b/animations/lib/main.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/material.dart'; + import 'src/basics/01_animated_container.dart'; import 'src/basics/02_page_route_builder.dart'; import 'src/basics/03_animation_controller.dart'; @@ -11,9 +12,9 @@ import 'src/basics/05_animated_builder.dart'; import 'src/basics/06_custom_tween.dart'; import 'src/basics/07_tween_sequence.dart'; import 'src/basics/08_fade_transition.dart'; -import 'src/basics/09_animated_positioned.dart'; -import 'src/basics/10_animated_switcher.dart'; import 'src/misc/animated_list.dart'; +import 'src/misc/animated_positioned.dart'; +import 'src/misc/animated_switcher.dart'; import 'src/misc/card_swipe.dart'; import 'src/misc/carousel.dart'; import 'src/misc/curved_animation.dart'; @@ -66,14 +67,6 @@ final basicDemos = [ name: 'Fade Transition', route: FadeTransitionDemo.routeName, builder: (context) => FadeTransitionDemo()), - Demo( - name: 'AnimatedPositioned', - route: AnimatedPositionedDemo.routeName, - builder: (context) => AnimatedPositionedDemo()), - Demo( - name: 'AnimatedSwitcher', - route: AnimatedSwitcherDemo.routeName, - builder: (context) => AnimatedSwitcherDemo()) ]; final miscDemos = [ @@ -105,6 +98,14 @@ final miscDemos = [ name: 'AnimatedList', route: AnimatedListDemo.routeName, builder: (context) => AnimatedListDemo()), + Demo( + name: 'AnimatedPositioned', + route: AnimatedPositionedDemo.routeName, + builder: (context) => AnimatedPositionedDemo()), + Demo( + name: 'AnimatedSwitcher', + route: AnimatedSwitcherDemo.routeName, + builder: (context) => AnimatedSwitcherDemo()), Demo( name: 'Hero Animation', route: HeroAnimationDemo.routeName, diff --git a/animations/lib/src/basics/09_animated_positioned.dart b/animations/lib/src/misc/animated_positioned.dart similarity index 100% rename from animations/lib/src/basics/09_animated_positioned.dart rename to animations/lib/src/misc/animated_positioned.dart diff --git a/animations/lib/src/basics/10_animated_switcher.dart b/animations/lib/src/misc/animated_switcher.dart similarity index 100% rename from animations/lib/src/basics/10_animated_switcher.dart rename to animations/lib/src/misc/animated_switcher.dart diff --git a/animations/pubspec.lock b/animations/pubspec.lock index 9879eac2a..9a0f87f64 100644 --- a/animations/pubspec.lock +++ b/animations/pubspec.lock @@ -169,7 +169,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.15" + version: "0.2.11" typed_data: dependency: transitive description: