diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ed5f0d..8ed11f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 1.1.0 + +* Move creation of CurvedAnimation to didUpdateWidget +* Add sticky header case to example +* Fix usage without header +* Fix translationOffset not passed to SliverExpandable by AnimatedSliverExpandable + ## 1.0.0 * Ability to use without a header diff --git a/README.md b/README.md index 13bc28e..fd81c73 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,14 @@ Sliver Expandable lets expand and collapse any Sliver in Flutter. - + ## Getting started 1. Add it to your `pubspec.yaml`: ```yaml -sliver_expandable: ^1.0.0 +sliver_expandable: ^1.1.0 ``` 2. Use it: diff --git a/example/lib/main.dart b/example/lib/main.dart index 4b879f1..efb0553 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,6 +1,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; +import 'package:flutter_sticky_header/flutter_sticky_header.dart'; import 'package:sliver_expandable/sliver_expandable.dart'; void main() { @@ -13,9 +14,10 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { return MaterialApp( - title: 'Flutter Demo', + title: 'Sliver Expandable Demo', theme: ThemeData( - primarySwatch: Colors.blue, + useMaterial3: false, + colorScheme: ColorScheme.fromSeed(seedColor: Colors.pink), ), home: const MyHomePage(), ); @@ -42,49 +44,100 @@ class _MyHomePageState extends State { expandedHeight: 160, stretch: true, pinned: true, - title: Text('Title'), centerTitle: false, + title: Text('Title'), ), SliverList( delegate: SliverChildBuilderDelegate( - (context, index) => ListTile( - title: Text('Before expandable item no. $index'), - ), + (context, index) => + ListTile(title: Text('Before expandable item no. $index')), childCount: 5, )), AnimatedSliverExpandable( expanded: _expanded, - headerBuilder: (context, animation) => ListTile( - onTap: () => setState(() => _expanded = !_expanded), - tileColor: Colors.amber, - title: const Text('Expandable'), - trailing: AnimatedBuilder( - animation: animation, - builder: (context, child) => Transform.rotate( - angle: (animation.value - 0.5) * pi, - child: child, + headerBuilder: (context, animation) => ColoredBox( + color: Colors.deepPurpleAccent, + child: ListTile( + onTap: () => setState(() => _expanded = !_expanded), + title: const Text('Expandable'), + trailing: AnimatedBuilder( + animation: animation, + builder: (context, child) => Transform.rotate( + angle: (animation.value - 0.5) * pi, + child: child, + ), + child: const Icon(Icons.chevron_left), ), - child: const Icon(Icons.chevron_left), ), ), sliver: SliverList( delegate: SliverChildBuilderDelegate( - (context, index) => ListTile( - title: Text('Expandable item no. $index'), - ), + (context, index) => + ListTile(title: Text('Expandable item no. $index')), childCount: 5, ), ), ), - SliverList( - delegate: SliverChildBuilderDelegate( - (context, index) => ListTile( - title: Text('After expandable item no. $index'), - ), - childCount: 5, - )), + const StickyExpandableList(), + SliverSafeArea( + top: false, + sliver: SliverList( + delegate: SliverChildBuilderDelegate( + (context, index) => + ListTile(title: Text('After expandable item no. $index')), + childCount: 10, + )), + ), ], ), ); } } + +class StickyExpandableList extends StatefulWidget { + const StickyExpandableList({super.key}); + + @override + State createState() => _StickyExpandableListState(); +} + +class _StickyExpandableListState extends State + with SingleTickerProviderStateMixin { + late final _controller = AnimationController( + vsync: this, duration: const Duration(milliseconds: 250)); + late final _animation = + CurvedAnimation(parent: _controller, curve: Curves.easeInOut); + bool _expandable = false; + + @override + Widget build(BuildContext context) => SliverStickyHeader( + header: ColoredBox( + color: Colors.deepOrangeAccent, + child: ListTile( + onTap: () { + _expandable = !_expandable; + _controller.animateTo(_expandable ? 1 : 0); + }, + title: const Text('Sticky Expandable'), + trailing: AnimatedBuilder( + animation: _animation, + builder: (context, child) => Transform.rotate( + angle: (_animation.value - 0.5) * pi, + child: child, + ), + child: const Icon(Icons.chevron_left), + ), + ), + ), + sliver: SliverExpandable( + sliver: SliverList( + delegate: SliverChildBuilderDelegate( + (context, index) => + ListTile(title: Text('Expandable item no. $index')), + childCount: 10, + ), + ), + animation: _animation, + ), + ); +} diff --git a/example/pubspec.lock b/example/pubspec.lock index 074ac2c..6869263 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: @@ -70,11 +70,43 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.1" + flutter_sticky_header: + dependency: "direct main" + description: + name: flutter_sticky_header + sha256: "017f398fbb45a589e01491861ca20eb6570a763fd9f3888165a978e11248c709" + url: "https://pub.dev" + source: hosted + version: "0.6.5" flutter_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" lints: dependency: transitive description: @@ -87,34 +119,34 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.11.0" path: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" sky_engine: dependency: transitive description: flutter @@ -126,7 +158,7 @@ packages: path: ".." relative: true source: path - version: "1.0.0" + version: "1.1.0" source_span: dependency: transitive description: @@ -139,18 +171,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -171,10 +203,18 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + url: "https://pub.dev" + source: hosted + version: "0.6.1" + value_layout_builder: + dependency: transitive + description: + name: value_layout_builder + sha256: "98202ec1807e94ac72725b7f0d15027afde513c55c69ff3f41bcfccb950831bc" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.3.1" vector_math: dependency: transitive description: @@ -183,14 +223,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - web: + vm_service: dependency: transitive description: - name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "13.0.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" - flutter: ">=1.17.0" + dart: ">=3.2.0-0 <4.0.0" + flutter: ">=1.24.0-10.2.pre" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 5d0ef56..5d4b79e 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -11,6 +11,7 @@ dependencies: flutter: sdk: flutter cupertino_icons: ^1.0.2 + flutter_sticky_header: ^0.6.5 sliver_expandable: path: ../ diff --git a/pubspec.yaml b/pubspec.yaml index 2777320..258109e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,11 +1,11 @@ name: sliver_expandable description: A Sliver Flutter widget that can be used to expand or collapse another child Sliver widget -version: 1.0.0 +version: 1.1.0 homepage: https://github.com/Taskulu/sliver_expandable repository: https://github.com/Taskulu/sliver_expandable issue_tracker: https://github.com/Taskulu/sliver_expandable/issues screenshots: - - description: 'This screenshot shows an expanding and collapsing SliverList in a CustomScrollView' + - description: 'Expanding and collapsing SliverList in a CustomScrollView' path: screenshots/1.webp topics: - sliver diff --git a/screenshots/1.webp b/screenshots/1.webp index 14bfeb9..b4e401c 100644 Binary files a/screenshots/1.webp and b/screenshots/1.webp differ