From d018815e7aa8cfbe8597c3809ab79ca82d609e05 Mon Sep 17 00:00:00 2001 From: Vyacheslav Pak Date: Wed, 29 Sep 2021 17:41:31 +0600 Subject: [PATCH 01/69] Templates and actions added --- .github/ISSUE_TEMPLATE/bug_report.md | 45 +++++++++++++++++ .../ISSUE_TEMPLATE/documentation_update.md | 24 ++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 24 ++++++++++ .github/PULL_REQUEST_TEMPLATE/bug_fix.md | 29 +++++++++++ .../documentation_update.md | 29 +++++++++++ .github/PULL_REQUEST_TEMPLATE/new_feature.md | 27 +++++++++++ .github/workflows/build.yaml | 48 +++++++++++++++++++ 7 files changed, 226 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/documentation_update.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/PULL_REQUEST_TEMPLATE/bug_fix.md create mode 100644 .github/PULL_REQUEST_TEMPLATE/documentation_update.md create mode 100644 .github/PULL_REQUEST_TEMPLATE/new_feature.md create mode 100644 .github/workflows/build.yaml diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..3a48652 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,45 @@ +--- +name: Bug report +about: Something is wrong with Flutter Swipe Refresh. +title: "[BUG] " +labels: bug +assignees: MbIXjkee +--- + + + +## Prior Issues + +Are there any existing issues or PRs that relate to this problem? If so, link them here. + +## Describe the bug + +A clear and concise description of what the bug is. +Please show the code you wrote as completely as possible. + +```dart +/// your code here +``` + +## Steps to Reproduce + +If the current behavior is a bug, please provide the steps to reproduce. + +## What is the expected behavior? + +A clear and concise description of what you expected to happen. + +## Additional context + +* What package and OS are affected by this issue? Did this work in previous versions of a package? + +* If applicable, add screenshots to help explain your problem. + +* Please provide output from `flutter doctor -v` and `flutter analyze`. + +* Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/documentation_update.md b/.github/ISSUE_TEMPLATE/documentation_update.md new file mode 100644 index 0000000..0c7bf5b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/documentation_update.md @@ -0,0 +1,24 @@ +--- +name: Documentation update +about: Fixing a problem or improve in an existing docs page. +labels: documentation +assignees: MbIXjkee +--- + + + +## Describe what scenario you think is uncovered by the existing examples / articles + +A clear and concise description of the problem that you want explained. + +## Describe why existing examples / articles do not cover this case + +Explain which examples / articles you have seen before making this request, and +why they did not help you with your problem. + +## Additional context + +Add any other context or screenshots about the documentation request here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..f5baad7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,24 @@ +--- +name: Feature Request +about: I'd like Flutter Swipe Refresh to do something new. +labels: enhancement +assignees: MbIXjkee +--- + + + +## What is the new or updated feature that you are suggesting? + +A clear and concise description of what you want to happen. + +## Why should this feature be included? + +Is your feature request related to a problem? Please describe a clear and concise description of what the problem is. If you investigated any alternative solutions please describe. + +## Additional context + +Please provide any other context or screenshots about the feature request here. diff --git a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md b/.github/PULL_REQUEST_TEMPLATE/bug_fix.md new file mode 100644 index 0000000..66a216d --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/bug_fix.md @@ -0,0 +1,29 @@ +--- +name: Bug fix +about: Fixing a problem with Flutter Swipe Refresh. +assignees: MbIXjkee +--- + + + +## Checklist + +- [ ] Have you added an explanation of what your changes do and why you'd like us to include them? +- [ ] Is there an existing issue for this PR? + - _link issue here_ +- [ ] Have the files been linted and formatted? +- [ ] Have the docs been updated to match the changes in the PR? +- [ ] Have the tests been updated to match the changes in the PR? +- [ ] Have you run the tests locally to confirm they pass? + +## Changes + +### What is the current behavior, and the steps to reproduce the issue? + +### What is the expected behavior? + +### How does this PR fix the problem? diff --git a/.github/PULL_REQUEST_TEMPLATE/documentation_update.md b/.github/PULL_REQUEST_TEMPLATE/documentation_update.md new file mode 100644 index 0000000..c9565ec --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/documentation_update.md @@ -0,0 +1,29 @@ +--- +name: Documentation update +about: Fixing a problem or improve in an existing docs page. +labels: documentation +assignees: MbIXjkee +--- + + + +## Checklist + +- [ ] Is there an existing issue for this PR? + - _link issue here_ +- [ ] Have the files been linted and formatted? + +## Changes + +### What docs page needs to be fixed? + +- **Section**: +- **Page**: + +## What is the problem? + +## What changes does this PR make to fix the problem? diff --git a/.github/PULL_REQUEST_TEMPLATE/new_feature.md b/.github/PULL_REQUEST_TEMPLATE/new_feature.md new file mode 100644 index 0000000..7ebbb47 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/new_feature.md @@ -0,0 +1,27 @@ +--- +name: New feature +labels: enhancement +assignees: MbIXjkee +--- + + + +## Checklist + +- [ ] Have you added an explanation of what your changes do and why you'd like us to include them? +- [ ] Is there an existing issue for this PR? + - _link issue here_ +- [ ] Have the files been linted and formatted? +- [ ] Have the docs been updated to match the changes in the PR? +- [ ] Have the tests been updated to match the changes in the PR? +- [ ] Have you run the tests locally to confirm they pass? + +## New Features + +### What new capabilities does this PR add? + +### What docs changes are needed to explain this? diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..40df31d --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,48 @@ +name: build + +on: + pull_request: + branches: + - main + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout 🛎️ + uses: actions/checkout@v2 + + - name: Install Flutter 🔧 + uses: subosito/flutter-action@v1 + with: + channel: "stable" + + - name: Install dependencies 🔧 + run: flutter pub get + + - name: Run dependency validator 🔍 + run: | + dart pub global activate dependency_validator + dart pub global run dependency_validator:dependency_validator + + - name: Run analyzer 🔍 + run: flutter analyze --fatal-warnings --fatal-infos . + + - name: Run formatter ⚙️ + run: flutter format --set-exit-if-changed . + + - name: Run tests ⚙️ + run: flutter test + + package-analysis: + runs-on: ubuntu-latest + + steps: + - name: Checkout 🛎️ + uses: actions/checkout@v2 + + - name: Run package analyzer 🔍 + uses: axel-op/dart-package-analyzer@v3 + with: + githubToken: ${{ secrets.GITHUB_TOKEN }} From 09fd16b8d54839658968f87c35f34c979431b69a Mon Sep 17 00:00:00 2001 From: KristinaZoteva Date: Wed, 13 Oct 2021 16:00:01 +0300 Subject: [PATCH 02/69] Remove analizator errors from lib. Fix FIXME in cupertino_swipe_refresh.dart. --- lib/src/cupertino_swipe_refresh.dart | 53 +++-- lib/src/material_swipe_refresh.dart | 8 +- lib/src/swipe_refresh.dart | 71 ++++--- lib/src/swipe_refresh_base.dart | 72 +++---- pubspec.lock | 300 +++++++++++++++++++++++++++ 5 files changed, 422 insertions(+), 82 deletions(-) create mode 100644 pubspec.lock diff --git a/lib/src/cupertino_swipe_refresh.dart b/lib/src/cupertino_swipe_refresh.dart index be5bc77..186ce66 100644 --- a/lib/src/cupertino_swipe_refresh.dart +++ b/lib/src/cupertino_swipe_refresh.dart @@ -18,10 +18,15 @@ import 'package:flutter/cupertino.dart'; import 'package:swipe_refresh/src/swipe_refresh_base.dart'; import 'package:swipe_refresh/src/swipe_refresh_state.dart'; -// ignore_for_file: avoid-returning-widgets - /// Refresh indicator widget with Cupertino style. class CupertinoSwipeRefresh extends SwipeRefreshBase { + static const double defaultRefreshTriggerPullDistance = 100.0; + static const double defaultRefreshIndicatorExtent = 60.0; + + final double refreshTriggerPullDistance; + final double refreshIndicatorExtent; + final RefreshControlIndicatorBuilder indicatorBuilder; + const CupertinoSwipeRefresh({ required Stream stateStream, required VoidCallback onRefresh, @@ -35,7 +40,6 @@ class CupertinoSwipeRefresh extends SwipeRefreshBase { this.refreshTriggerPullDistance = defaultRefreshTriggerPullDistance, this.refreshIndicatorExtent = defaultRefreshIndicatorExtent, this.indicatorBuilder = CupertinoSliverRefreshControl.buildRefreshIndicator, - //FIXME add parameter to CustomScrollView, when fix it in Flutter ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior, ScrollPhysics? physics, }) : super( @@ -52,13 +56,6 @@ class CupertinoSwipeRefresh extends SwipeRefreshBase { physics: physics, ); - static const double defaultRefreshTriggerPullDistance = 100.0; - static const double defaultRefreshIndicatorExtent = 60.0; - - final double refreshTriggerPullDistance; - final double refreshIndicatorExtent; - final RefreshControlIndicatorBuilder indicatorBuilder; - @override // ignore: no_logic_in_create_state SwipeRefreshBaseState createState() => _CupertinoSwipeRefreshState( @@ -68,12 +65,12 @@ class CupertinoSwipeRefresh extends SwipeRefreshBase { class _CupertinoSwipeRefreshState extends SwipeRefreshBaseState { + final ScrollController _scrollController; + _CupertinoSwipeRefreshState( ScrollController? scrollController, ) : _scrollController = scrollController ?? ScrollController(); - final ScrollController _scrollController; - @override Widget buildRefresher( Key key, @@ -83,6 +80,8 @@ class _CupertinoSwipeRefreshState return CustomScrollView( shrinkWrap: widget.shrinkWrap, controller: _scrollController, + keyboardDismissBehavior: widget.keyboardDismissBehavior ?? + ScrollViewKeyboardDismissBehavior.onDrag, physics: widget.physics == null ? const BouncingScrollPhysics( parent: AlwaysScrollableScrollPhysics(), @@ -101,7 +100,11 @@ class _CupertinoSwipeRefreshState left: widget.padding == null, right: widget.padding == null, top: widget.padding == null, - sliver: _buildList(children), + sliver: _ListChildren( + children: children, + padding: widget.padding, + childrenDelegate: widget.childrenDelegate, + ), ), ], ); @@ -120,13 +123,27 @@ class _CupertinoSwipeRefreshState } } } +} + +class _ListChildren extends StatelessWidget { + final List children; + final EdgeInsets? padding; + final SliverChildDelegate? childrenDelegate; - Widget _buildList(List children) { - if (widget.padding != null) { + const _ListChildren({ + required this.children, + Key? key, + this.padding, + this.childrenDelegate, + }) : super(key: key); + + @override + Widget build(BuildContext context) { + if (padding != null) { return SliverPadding( - padding: widget.padding!, + padding: padding!, sliver: SliverList( - delegate: widget.childrenDelegate ?? + delegate: childrenDelegate ?? SliverChildListDelegate( children, ), @@ -134,7 +151,7 @@ class _CupertinoSwipeRefreshState ); } return SliverList( - delegate: widget.childrenDelegate ?? + delegate: childrenDelegate ?? SliverChildListDelegate( children, ), diff --git a/lib/src/material_swipe_refresh.dart b/lib/src/material_swipe_refresh.dart index b551268..e75f869 100644 --- a/lib/src/material_swipe_refresh.dart +++ b/lib/src/material_swipe_refresh.dart @@ -19,10 +19,11 @@ import 'package:flutter/widgets.dart'; import 'package:swipe_refresh/src/swipe_refresh_base.dart'; import 'package:swipe_refresh/src/swipe_refresh_state.dart'; -// ignore_for_file: avoid-returning-widgets - /// Refresh indicator widget with Material Design style. class MaterialSwipeRefresh extends SwipeRefreshBase { + final Color? indicatorColor; + final Color backgroundColor; + const MaterialSwipeRefresh({ required Stream stateStream, required VoidCallback onRefresh, @@ -52,9 +53,6 @@ class MaterialSwipeRefresh extends SwipeRefreshBase { physics: physics, ); - final Color? indicatorColor; - final Color backgroundColor; - @override _MaterialSwipeRefreshState createState() => _MaterialSwipeRefreshState(); } diff --git a/lib/src/swipe_refresh.dart b/lib/src/swipe_refresh.dart index 543f394..e5acf56 100644 --- a/lib/src/swipe_refresh.dart +++ b/lib/src/swipe_refresh.dart @@ -28,6 +28,23 @@ import 'package:swipe_refresh/src/swipe_refresh_style.dart'; /// Params for Cupertino style: /// [refreshTriggerPullDistance], [refreshIndicatorExtent], [indicatorBuilder]. class SwipeRefresh extends StatelessWidget { + final List? children; + final VoidCallback onRefresh; + final SwipeRefreshState? initState; + final Stream stateStream; + final Color? indicatorColor; + final Color backgroundColor; + final double refreshTriggerPullDistance; + final double refreshIndicatorExtent; + final RefreshControlIndicatorBuilder indicatorBuilder; + final SwipeRefreshStyle style; + final ScrollController? scrollController; + final SliverChildDelegate? childrenDelegate; + final EdgeInsets? padding; + final bool shrinkWrap; + final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior; + final ScrollPhysics? physics; + const SwipeRefresh( this.style, { required this.stateStream, @@ -197,30 +214,8 @@ class SwipeRefresh extends StatelessWidget { ); } - final List? children; - final VoidCallback onRefresh; - final SwipeRefreshState? initState; - final Stream stateStream; - final Color? indicatorColor; - final Color backgroundColor; - final double refreshTriggerPullDistance; - final double refreshIndicatorExtent; - final RefreshControlIndicatorBuilder indicatorBuilder; - final SwipeRefreshStyle style; - final ScrollController? scrollController; - final SliverChildDelegate? childrenDelegate; - final EdgeInsets? padding; - final bool shrinkWrap; - final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior; - final ScrollPhysics? physics; - @override Widget build(BuildContext context) { - return _buildByStyle(style); - } - - // ignore: avoid-returning-widgets - Widget _buildByStyle(SwipeRefreshStyle style) { switch (style) { case SwipeRefreshStyle.material: return MaterialSwipeRefresh( @@ -257,9 +252,37 @@ class SwipeRefresh extends StatelessWidget { case SwipeRefreshStyle.builder: case SwipeRefreshStyle.adaptive: if (Platform.isAndroid) { - return _buildByStyle(SwipeRefreshStyle.material); + return MaterialSwipeRefresh( + key: key, + childrenDelegate: childrenDelegate, + stateStream: stateStream, + initState: initState, + onRefresh: onRefresh, + scrollController: scrollController, + backgroundColor: backgroundColor, + indicatorColor: indicatorColor, + shrinkWrap: shrinkWrap, + padding: padding, + keyboardDismissBehavior: keyboardDismissBehavior, + physics: physics, + children: children, + ); } else if (Platform.isIOS) { - return _buildByStyle(SwipeRefreshStyle.cupertino); + return CupertinoSwipeRefresh( + key: key, + childrenDelegate: childrenDelegate, + stateStream: stateStream, + initState: initState, + onRefresh: onRefresh, + scrollController: scrollController, + refreshIndicatorExtent: refreshIndicatorExtent, + refreshTriggerPullDistance: refreshTriggerPullDistance, + indicatorBuilder: indicatorBuilder, + shrinkWrap: shrinkWrap, + padding: padding, + physics: physics, + children: children, + ); } } diff --git a/lib/src/swipe_refresh_base.dart b/lib/src/swipe_refresh_base.dart index 24e7672..d108dfb 100644 --- a/lib/src/swipe_refresh_base.dart +++ b/lib/src/swipe_refresh_base.dart @@ -19,6 +19,17 @@ import 'package:swipe_refresh/src/swipe_refresh_state.dart'; /// Base refresh indicator widget. abstract class SwipeRefreshBase extends StatefulWidget { + final List? children; + final VoidCallback onRefresh; + final SwipeRefreshState? initState; + final Stream stateStream; + final ScrollController? scrollController; + final SliverChildDelegate? childrenDelegate; + final EdgeInsets? padding; + final bool shrinkWrap; + final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior; + final ScrollPhysics? physics; + const SwipeRefreshBase({ required this.stateStream, required this.onRefresh, @@ -35,17 +46,6 @@ abstract class SwipeRefreshBase extends StatefulWidget { (children != null || childrenDelegate != null)), super(key: key); - final List? children; - final VoidCallback onRefresh; - final SwipeRefreshState? initState; - final Stream stateStream; - final ScrollController? scrollController; - final SliverChildDelegate? childrenDelegate; - final EdgeInsets? padding; - final bool shrinkWrap; - final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior; - final ScrollPhysics? physics; - @override @protected // ignore: no_logic_in_create_state @@ -55,9 +55,11 @@ abstract class SwipeRefreshBase extends StatefulWidget { abstract class SwipeRefreshBaseState extends State { @protected - Completer? completer; - @protected final GlobalKey refreshKey = GlobalKey(); + + @protected + Completer? completer; + StreamSubscription? _stateSubscription; SwipeRefreshState _currentState = SwipeRefreshState.hidden; @@ -75,20 +77,35 @@ abstract class SwipeRefreshBaseState @override Widget build(BuildContext context) { + // ignore: avoid-returning-widgets return buildRefresher(refreshKey, widget.children ?? [], _onRefresh); } - // ignore: avoid-returning-widgets - @protected - Widget buildRefresher( - Key key, - List children, - Future Function() onRefresh, - ); + @override + void dispose() { + _stateSubscription?.cancel(); + + super.dispose(); + } + + @protected + Widget buildRefresher( + Key key, + List children, + Future Function() onRefresh, + ); @protected void onUpdateState(SwipeRefreshState state); + @protected + Future _onRefresh() { + _currentState = SwipeRefreshState.loading; + widget.onRefresh(); + completer = Completer(); + return completer!.future; + } + void _updateState(SwipeRefreshState newState) { if (_currentState != newState) { setState( @@ -100,19 +117,4 @@ abstract class SwipeRefreshBaseState ); } } - - @protected - Future _onRefresh() { - _currentState = SwipeRefreshState.loading; - widget.onRefresh(); - completer = Completer(); - return completer!.future; - } - - @override - void dispose() { - _stateSubscription?.cancel(); - - super.dispose(); - } } diff --git a/pubspec.lock b/pubspec.lock new file mode 100644 index 0000000..0f5d9c0 --- /dev/null +++ b/pubspec.lock @@ -0,0 +1,300 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + url: "https://pub.dartlang.org" + source: hosted + version: "26.0.0" + analyzer: + dependency: transitive + description: + name: analyzer + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.0" + analyzer_plugin: + dependency: transitive + description: + name: analyzer_plugin + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.0" + ansicolor: + dependency: transitive + description: + name: ansicolor + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + args: + dependency: transitive + description: + name: args + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.0" + async: + dependency: transitive + description: + name: async + url: "https://pub.dartlang.org" + source: hosted + version: "2.8.1" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + charcode: + dependency: transitive + description: + name: charcode + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.1" + cli_util: + dependency: transitive + description: + name: cli_util + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.5" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + collection: + dependency: transitive + description: + name: collection + url: "https://pub.dartlang.org" + source: hosted + version: "1.15.0" + convert: + dependency: transitive + description: + name: convert + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + crypto: + dependency: transitive + description: + name: crypto + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + csslib: + dependency: transitive + description: + name: csslib + url: "https://pub.dartlang.org" + source: hosted + version: "0.17.1" + dart_code_metrics: + dependency: transitive + description: + name: dart_code_metrics + url: "https://pub.dartlang.org" + source: hosted + version: "4.4.0" + dart_style: + dependency: transitive + description: + name: dart_style + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.0" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + file: + dependency: transitive + description: + name: file + url: "https://pub.dartlang.org" + source: hosted + version: "6.1.2" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: transitive + description: + name: flutter_lints + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + glob: + dependency: transitive + description: + name: glob + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" + html: + dependency: transitive + description: + name: html + url: "https://pub.dartlang.org" + source: hosted + version: "0.15.0" + lints: + dependency: transitive + description: + name: lints + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + matcher: + dependency: transitive + description: + name: matcher + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.10" + meta: + dependency: transitive + description: + name: meta + url: "https://pub.dartlang.org" + source: hosted + version: "1.7.0" + package_config: + dependency: transitive + description: + name: package_config + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" + path: + dependency: transitive + description: + name: path + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.0" + pedantic: + dependency: transitive + description: + name: pedantic + url: "https://pub.dartlang.org" + source: hosted + version: "1.11.1" + pub_semver: + dependency: transitive + description: + name: pub_semver + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_span: + dependency: transitive + description: + name: source_span + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.1" + stack_trace: + dependency: transitive + description: + name: stack_trace + url: "https://pub.dartlang.org" + source: hosted + version: "1.10.0" + stream_channel: + dependency: transitive + description: + name: stream_channel + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + string_scanner: + dependency: transitive + description: + name: string_scanner + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + surf_lint_rules: + dependency: "direct dev" + description: + name: surf_lint_rules + url: "https://pub.dartlang.org" + source: hosted + version: "1.4.0" + term_glyph: + dependency: transitive + description: + name: term_glyph + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + test_api: + dependency: transitive + description: + name: test_api + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.2" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0" + vector_math: + dependency: transitive + description: + name: vector_math + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + watcher: + dependency: transitive + description: + name: watcher + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + yaml: + dependency: transitive + description: + name: yaml + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.0" +sdks: + dart: ">=2.14.0 <3.0.0" From 52629b2f0912f438dca4b06157ccf1bd4b156ae9 Mon Sep 17 00:00:00 2001 From: KristinaZoteva Date: Wed, 13 Oct 2021 16:04:21 +0300 Subject: [PATCH 03/69] Rename method _ListChildren on _ListChildrenWidget. --- example/pubspec.lock | 253 +++++++++++++++++++++++++++ lib/src/cupertino_swipe_refresh.dart | 6 +- 2 files changed, 256 insertions(+), 3 deletions(-) create mode 100644 example/pubspec.lock diff --git a/example/pubspec.lock b/example/pubspec.lock new file mode 100644 index 0000000..5c68e85 --- /dev/null +++ b/example/pubspec.lock @@ -0,0 +1,253 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + url: "https://pub.dartlang.org" + source: hosted + version: "26.0.0" + analyzer: + dependency: transitive + description: + name: analyzer + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.0" + analyzer_plugin: + dependency: transitive + description: + name: analyzer_plugin + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.0" + ansicolor: + dependency: transitive + description: + name: ansicolor + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + args: + dependency: transitive + description: + name: args + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.0" + async: + dependency: transitive + description: + name: async + url: "https://pub.dartlang.org" + source: hosted + version: "2.8.2" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + charcode: + dependency: transitive + description: + name: charcode + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.1" + cli_util: + dependency: transitive + description: + name: cli_util + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.5" + collection: + dependency: transitive + description: + name: collection + url: "https://pub.dartlang.org" + source: hosted + version: "1.15.0" + convert: + dependency: transitive + description: + name: convert + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + crypto: + dependency: transitive + description: + name: crypto + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + csslib: + dependency: transitive + description: + name: csslib + url: "https://pub.dartlang.org" + source: hosted + version: "0.17.1" + dart_code_metrics: + dependency: transitive + description: + name: dart_code_metrics + url: "https://pub.dartlang.org" + source: hosted + version: "4.4.0" + dart_style: + dependency: transitive + description: + name: dart_style + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.0" + file: + dependency: transitive + description: + name: file + url: "https://pub.dartlang.org" + source: hosted + version: "6.1.2" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: transitive + description: + name: flutter_lints + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" + glob: + dependency: transitive + description: + name: glob + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" + html: + dependency: transitive + description: + name: html + url: "https://pub.dartlang.org" + source: hosted + version: "0.15.0" + lints: + dependency: transitive + description: + name: lints + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + meta: + dependency: transitive + description: + name: meta + url: "https://pub.dartlang.org" + source: hosted + version: "1.7.0" + package_config: + dependency: transitive + description: + name: package_config + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" + path: + dependency: transitive + description: + name: path + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.0" + pedantic: + dependency: transitive + description: + name: pedantic + url: "https://pub.dartlang.org" + source: hosted + version: "1.11.1" + pub_semver: + dependency: transitive + description: + name: pub_semver + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_span: + dependency: transitive + description: + name: source_span + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.1" + string_scanner: + dependency: transitive + description: + name: string_scanner + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + surf_lint_rules: + dependency: "direct dev" + description: + name: surf_lint_rules + url: "https://pub.dartlang.org" + source: hosted + version: "1.4.0" + swipe_refresh: + dependency: "direct main" + description: + path: ".." + relative: true + source: path + version: "1.0.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0" + vector_math: + dependency: transitive + description: + name: vector_math + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + watcher: + dependency: transitive + description: + name: watcher + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + yaml: + dependency: transitive + description: + name: yaml + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.0" +sdks: + dart: ">=2.14.0 <3.0.0" diff --git a/lib/src/cupertino_swipe_refresh.dart b/lib/src/cupertino_swipe_refresh.dart index 186ce66..fa2ae65 100644 --- a/lib/src/cupertino_swipe_refresh.dart +++ b/lib/src/cupertino_swipe_refresh.dart @@ -100,7 +100,7 @@ class _CupertinoSwipeRefreshState left: widget.padding == null, right: widget.padding == null, top: widget.padding == null, - sliver: _ListChildren( + sliver: _ListChildrenWidget( children: children, padding: widget.padding, childrenDelegate: widget.childrenDelegate, @@ -125,12 +125,12 @@ class _CupertinoSwipeRefreshState } } -class _ListChildren extends StatelessWidget { +class _ListChildrenWidget extends StatelessWidget { final List children; final EdgeInsets? padding; final SliverChildDelegate? childrenDelegate; - const _ListChildren({ + const _ListChildrenWidget({ required this.children, Key? key, this.padding, From d6c2e5495dbcda7ddb270f919162efc420840938 Mon Sep 17 00:00:00 2001 From: KristinaZoteva Date: Wed, 13 Oct 2021 16:05:40 +0300 Subject: [PATCH 04/69] flutter format . completed. --- lib/src/swipe_refresh_base.dart | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/src/swipe_refresh_base.dart b/lib/src/swipe_refresh_base.dart index d108dfb..6c97e7b 100644 --- a/lib/src/swipe_refresh_base.dart +++ b/lib/src/swipe_refresh_base.dart @@ -88,12 +88,12 @@ abstract class SwipeRefreshBaseState super.dispose(); } - @protected - Widget buildRefresher( - Key key, - List children, - Future Function() onRefresh, - ); + @protected + Widget buildRefresher( + Key key, + List children, + Future Function() onRefresh, + ); @protected void onUpdateState(SwipeRefreshState state); From a60ffd7e38bb5a3b5dd71920f7dfa52a68482ab7 Mon Sep 17 00:00:00 2001 From: KristinaZoteva Date: Wed, 13 Oct 2021 16:40:40 +0300 Subject: [PATCH 05/69] Refactoring. --- lib/src/swipe_refresh.dart | 4 ++-- lib/src/swipe_refresh_state.dart | 2 +- lib/src/swipe_refresh_style.dart | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/src/swipe_refresh.dart b/lib/src/swipe_refresh.dart index e5acf56..5979a0a 100644 --- a/lib/src/swipe_refresh.dart +++ b/lib/src/swipe_refresh.dart @@ -170,9 +170,9 @@ class SwipeRefresh extends StatelessWidget { physics: physics, ); - /// Crete SwipeRefresh as common link + /// Create SwipeRefresh as common link /// remove some conflicts between ScrollControllers when ListView added into - /// SwipeRefresh (remove need to add extra ListView) + /// SwipeRefresh (remove need to add extra ListView). factory SwipeRefresh.builder({ required IndexedWidgetBuilder itemBuilder, required int itemCount, diff --git a/lib/src/swipe_refresh_state.dart b/lib/src/swipe_refresh_state.dart index 04433dc..14ddd8b 100644 --- a/lib/src/swipe_refresh_state.dart +++ b/lib/src/swipe_refresh_state.dart @@ -17,6 +17,6 @@ enum SwipeRefreshState { /// Indicator hidden. hidden, - /// Indicator showed. + /// Indicator shown. loading, } diff --git a/lib/src/swipe_refresh_style.dart b/lib/src/swipe_refresh_style.dart index a58de0a..cb30ba2 100644 --- a/lib/src/swipe_refresh_style.dart +++ b/lib/src/swipe_refresh_style.dart @@ -14,15 +14,15 @@ /// Indicator style. enum SwipeRefreshStyle { - /// Material Design + /// Material Design. material, - /// Cupertino + /// Cupertino. cupertino, - /// Adaptive + /// Adaptive. adaptive, - /// Builder + /// Builder. builder, } From a1f3f700418252271a45438dd0337798bf2fb7cd Mon Sep 17 00:00:00 2001 From: KristinaZoteva Date: Wed, 13 Oct 2021 17:01:54 +0300 Subject: [PATCH 06/69] Refactoring example. --- example/lib/main.dart | 124 ++++++++++++++++++++++++------------------ 1 file changed, 71 insertions(+), 53 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 3b00df2..b97a979 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -17,8 +17,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:swipe_refresh/swipe_refresh.dart'; -// ignore_for_file: avoid-returning-widgets - void main() => runApp(const MyApp()); class MyApp extends StatelessWidget { @@ -57,11 +55,11 @@ class _MainPageState extends State { padding: const EdgeInsets.only(top: 25), child: Column( children: [ - TabBar( + const TabBar( tabs: [ - _buildTab(SwipeRefreshStyle.material), - _buildTab(SwipeRefreshStyle.cupertino), - _buildTab(SwipeRefreshStyle.builder), + _TabWidget(style: SwipeRefreshStyle.material), + _TabWidget(style: SwipeRefreshStyle.cupertino), + _TabWidget(style: SwipeRefreshStyle.builder), ], ), Expanded( @@ -71,13 +69,17 @@ class _MainPageState extends State { stateStream: _stream, onRefresh: _refresh, padding: const EdgeInsets.symmetric(vertical: 10), - children: _buildExampleBody(SwipeRefreshStyle.material), + children: const [ + _ExampleBodyWidget(style: SwipeRefreshStyle.material), + ], ), SwipeRefresh.cupertino( stateStream: _stream, onRefresh: _refresh, padding: const EdgeInsets.symmetric(vertical: 10), - children: _buildExampleBody(SwipeRefreshStyle.cupertino), + children: const [ + _ExampleBodyWidget(style: SwipeRefreshStyle.cupertino), + ], ), SwipeRefresh.builder( stateStream: _stream, @@ -114,69 +116,85 @@ class _MainPageState extends State { super.dispose(); } - Widget _buildTab(SwipeRefreshStyle style) { - var color = _getColor(style); - color = color.withOpacity(.5); + Future _refresh() async { + await Future.delayed(const Duration(seconds: 3)); + // when all needed is done change state + _controller.sink.add(SwipeRefreshState.hidden); + } +} + +class _TabWidget extends StatelessWidget { + final SwipeRefreshStyle style; + + const _TabWidget({ + required this.style, + Key? key, + }) : super(key: key); + + @override + Widget build(BuildContext context) { return InkWell( child: SizedBox( height: 100, child: Center( child: Text( _getText(style), - style: TextStyle(color: color), + style: TextStyle(color: _getColor(style).withOpacity(0.5)), ), ), ), ); } +} - List _buildExampleBody(SwipeRefreshStyle style) { - final isMaterial = style == SwipeRefreshStyle.material; - final color = _getColor(style); - return [ - Container( - color: color, - height: 100, - child: Center( - child: Text( - isMaterial ? 'Material example' : 'Cupertino example', - style: const TextStyle(color: white), - ), +class _ExampleBodyWidget extends StatelessWidget { + final SwipeRefreshStyle style; + + const _ExampleBodyWidget({ + required this.style, + Key? key, + }) : super(key: key); + + @override + Widget build(BuildContext context) { + return Container( + color: _getColor(style), + height: 100, + child: Center( + child: Text( + style == SwipeRefreshStyle.material + ? 'Material example' + : 'Cupertino example', + style: const TextStyle(color: white), ), ), - ]; - } - - Color _getColor(SwipeRefreshStyle style) { - switch (style) { - case SwipeRefreshStyle.material: - return red; - case SwipeRefreshStyle.cupertino: - return blue; - case SwipeRefreshStyle.builder: - return green; - default: - return black; - } + ); } +} - String _getText(SwipeRefreshStyle style) { - switch (style) { - case SwipeRefreshStyle.material: - return 'Material'; - case SwipeRefreshStyle.cupertino: - return 'Cupertino'; - case SwipeRefreshStyle.builder: - return 'Builder'; - default: - return 'SipeRefresh'; - } +Color _getColor(SwipeRefreshStyle style) { + switch (style) { + case SwipeRefreshStyle.material: + return red; + case SwipeRefreshStyle.cupertino: + return blue; + case SwipeRefreshStyle.builder: + return green; + default: + return black; } +} - Future _refresh() async { - await Future.delayed(const Duration(seconds: 3)); - // when all needed is done change state - _controller.sink.add(SwipeRefreshState.hidden); +String _getText(SwipeRefreshStyle style) { + switch (style) { + case SwipeRefreshStyle.material: + return 'Material'; + case SwipeRefreshStyle.cupertino: + return 'Cupertino'; + case SwipeRefreshStyle.builder: + return 'Builder'; + default: + return 'SwipeRefresh'; } } From 8f4f8afe2ceb10bd264812f613ab50062e2b0666 Mon Sep 17 00:00:00 2001 From: KristinaZoteva Date: Wed, 13 Oct 2021 17:19:41 +0300 Subject: [PATCH 07/69] Refactoring README.md, CONTRIBUTING.md and pubspec.yaml. --- CHANGELOG.md | 4 ++++ CONTRIBUTING.md | 34 ++++++++++++++++++---------------- README.md | 10 +++++----- pubspec.yaml | 4 ++-- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8668af6..dfd9117 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## next + +*Refactoring. + ## 1.0.1 - 2021-05-30 * Stable release diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 496da65..dc53313 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,27 +6,29 @@ Thank you for your help! Before you start, let's take a look at some agreements. Make sure that your code: -1. Does not contain analyzer errors -2. Follows a [official style](https://dart.dev/guides/language/effective-dart/style) -3. Follows the official [style of formatting](https://flutter.dev/docs/development/tools/formatting) -3. Contains no errors -4. New functionality is covered by tests. New functionality passes old tests -5. Create example that demonstrate new functionality if it is possible +1. Does not contain analyzer errors. +2. Follows a [official style](https://dart.dev/guides/language/effective-dart/style). +3. Follows the official [style of formatting](https://flutter.dev/docs/development/tools/formatting) + . +3. Contains no errors. +4. New functionality is covered by tests. New functionality passes old tests. +5. Create example that demonstrate new functionality if it is possible. ## Accepting the changes -After your pull request passes the review code, the project maintainers will merge the changes -into the branch to which the pull request was sent. +After your pull request passes the review code, the project maintainers will merge the changes into +the branch to which the pull request was sent. ## Issues Feel free to report any issues and bugs. -1. To report about the problem, create an issue on GithHub -2. In the issue add the description of the problem -3. Do not forget to mention your development environment, Flutter version, libraries required for - illustration of the problem -4. It is necessary to attach the code part that causes an issue or to make a small demo project - that shows the issue -5. Attach stack trace so it helps us to deal with the issue -6. If the issue is related to graphics, screen recording is required +1. To report about the problem, create + an [Issues](https://github.com/surfstudio/flutter-otp-autofill/issues) on GitHub. +2. In the issue add the description of the problem. +3. Do not forget to mention your development environment, Flutter version, libraries required for + illustration of the problem. +4. It is necessary to attach the code part that causes an issue or to make a small demo project that + shows the issue. +5. Attach stack trace so it helps us to deal with the issue. +6. If the issue is related to graphics, screen recording is required. diff --git a/README.md b/README.md index 8679172..162ac6b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Swipe Refresh -[![Build Status](https://shields.io/github/workflow/status/surfstudio/SurfGear/build?logo=github&logoColor=white)](https://github.com/surfstudio/SurfGear/tree/main/packages/swipe_refresh) -[![Coverage Status](https://img.shields.io/codecov/c/github/surfstudio/SurfGear?flag=swipe_refresh&logo=codecov&logoColor=white)](https://codecov.io/gh/surfstudio/SurfGear) +[![Build Status](https://shields.io/github/workflow/status/surfstudio/SurfGear/build?logo=github&logoColor=white)](https://github.com/surfstudio/flutter-swipe-refresh) +[![Coverage Status](https://img.shields.io/codecov/c/github/surfstudio/SurfGear?flag=swipe_refresh&logo=codecov&logoColor=white)](https://app.codecov.io/gh/surfstudio/flutter-swipe-refresh) [![Pub Version](https://img.shields.io/pub/v/swipe_refresh?logo=dart&logoColor=white)](https://pub.dev/packages/swipe_refresh) [![Pub Likes](https://badgen.net/pub/likes/swipe_refresh)](https://pub.dev/packages/swipe_refresh) [![Pub popularity](https://badgen.net/pub/popularity/swipe_refresh)](https://pub.dev/packages/swipe_refresh/score) @@ -31,7 +31,7 @@ Add `swipe_refresh` to your `pubspec.yaml` file: ```yaml dependencies: - swipe_refresh: ^1.0.0 + swipe_refresh: ^1.0.1 ``` You can use both `stable` and `dev` versions of the package listed above in the badges bar. @@ -42,11 +42,11 @@ All notable changes to this project will be documented in [this file](./CHANGELO ## Issues -For issues, file directly in the Issues section. +For issues, file directly in the [Issues](https://github.com/surfstudio/flutter-swipe-refresh/issues) section. ## Contribute -If you would like to contribute to the package (e.g. by improving the documentation, solving a bug or adding a cool new feature), please review our [contribution guide](../../CONTRIBUTING.md) first and send us your pull request. +If you would like to contribute to the package (e.g. by improving the documentation, solving a bug or adding a cool new feature), please review our [contribution guide](./CONTRIBUTING.md) first and send us your pull request. Your PRs are always welcome. diff --git a/pubspec.yaml b/pubspec.yaml index aa1b419..7ca4fdf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,8 +1,8 @@ name: swipe_refresh version: 1.0.1 description: Widget for refresh by swipe. -repository: "https://github.com/surfstudio/SurfGear/tree/main/packages/swipe_refresh" -issue_tracker: "https://github.com/surfstudio/SurfGear/issues" +repository: "https://github.com/surfstudio/flutter-swipe-refresh" +issue_tracker: "https://github.com/surfstudio/flutter-swipe-refresh/issues" dependencies: flutter: From c64446b2f3225ab1f3e1ae16be3004653a016385 Mon Sep 17 00:00:00 2001 From: zhukeev Date: Fri, 15 Oct 2021 17:28:25 +0600 Subject: [PATCH 08/69] new github workflow --- .github/workflows/build.yaml | 48 ------------- .github/workflows/workflow.yaml | 124 ++++++++++++++++++++++++++++++++ .gitignore | 17 +++-- 3 files changed, 136 insertions(+), 53 deletions(-) delete mode 100644 .github/workflows/build.yaml create mode 100644 .github/workflows/workflow.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml deleted file mode 100644 index 40df31d..0000000 --- a/.github/workflows/build.yaml +++ /dev/null @@ -1,48 +0,0 @@ -name: build - -on: - pull_request: - branches: - - main - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout 🛎️ - uses: actions/checkout@v2 - - - name: Install Flutter 🔧 - uses: subosito/flutter-action@v1 - with: - channel: "stable" - - - name: Install dependencies 🔧 - run: flutter pub get - - - name: Run dependency validator 🔍 - run: | - dart pub global activate dependency_validator - dart pub global run dependency_validator:dependency_validator - - - name: Run analyzer 🔍 - run: flutter analyze --fatal-warnings --fatal-infos . - - - name: Run formatter ⚙️ - run: flutter format --set-exit-if-changed . - - - name: Run tests ⚙️ - run: flutter test - - package-analysis: - runs-on: ubuntu-latest - - steps: - - name: Checkout 🛎️ - uses: actions/checkout@v2 - - - name: Run package analyzer 🔍 - uses: axel-op/dart-package-analyzer@v3 - with: - githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml new file mode 100644 index 0000000..a97dc12 --- /dev/null +++ b/.github/workflows/workflow.yaml @@ -0,0 +1,124 @@ +name: "Analysis" + +on: + pull_request: + branches: + - main + push: + branches: + - main + +jobs: + analysis: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Install Flutter + uses: subosito/flutter-action@v1 + with: + channel: "stable" + + - name: Content + id: check_license + uses: andstor/file-existence-action@v1 + with: + files: "LICENSE, README.md, example, CHANGELOG.md, CONTRIBUTING.md" + + - name: File exists + if: steps.check_files.outputs.files_exists == 'true' + run: echo Content is ok! + + - name: Check Description + run: echo | grep -q Description README.md ; echo $? + + - name: Check Example + run: echo | grep -q Example README.md ; echo $? + + - name: Check Installation + run: echo | grep -q Installation README.md ; echo $? + + - name: Install dependencies + run: flutter pub get + + - name: Run dependency validator + run: | + dart pub global activate dependency_validator + dart pub global run dependency_validator:dependency_validator + - name: Run analyzer + run: flutter analyze --fatal-warnings --fatal-infos . + + - name: Run formatter + run: flutter format --set-exit-if-changed . + + - name: Run package analyzer + uses: axel-op/dart-package-analyzer@v3 + with: + githubToken: ${{ secrets.GITHUB_TOKEN }} + + testing: + needs: analysis + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Install Flutter + uses: subosito/flutter-action@v1 + with: + channel: "stable" + + - name: Install dependencies + run: flutter pub get + + - name: Run tests + run: flutter test + + build_android_example: + needs: analysis + runs-on: ubuntu-latest + + steps: + # Setup Java environment in order to build the Android app. + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: "12.x" + + - name: Install Flutter + uses: subosito/flutter-action@v1 + with: + channel: "stable" + + - name: Install dependencies + run: flutter pub get + + - name: Build Android + run: | + cd example + flutter pub get + flutter build apk + + build_ios_example: + needs: analysis + runs-on: macos-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Install Flutter + uses: subosito/flutter-action@v1 + with: + channel: "stable" + + - name: Install dependencies + run: flutter pub get + + - name: Build iOS + run: | + cd example + flutter pub get + flutter build ios --release --no-codesign diff --git a/.gitignore b/.gitignore index 9f87252..dd440d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,10 @@ +.idea + +build/ +ios/.generated/ +ios/Flutter/Generated.xcconfig +ios/Runner/GeneratedPluginRegistrant.* + # Miscellaneous *.class *.log @@ -15,10 +22,8 @@ *.iws .idea/ -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ +# Visual Studio Code related +.vscode/ # Flutter/Dart/Pub related **/doc/api/ @@ -27,7 +32,8 @@ .packages .pub-cache/ .pub/ -build/ +/build/ +*.lock # Android related **/android/**/gradle-wrapper.jar @@ -58,6 +64,7 @@ build/ **/ios/Flutter/App.framework **/ios/Flutter/Flutter.framework **/ios/Flutter/Generated.xcconfig +**/ios/Flutter/flutter_export_environment.sh **/ios/Flutter/app.flx **/ios/Flutter/app.zip **/ios/Flutter/flutter_assets/ From 6ccc2d9e0298b52bca87ac96a01f484c26aee5de Mon Sep 17 00:00:00 2001 From: KristinaZoteva Date: Fri, 15 Oct 2021 17:47:01 +0300 Subject: [PATCH 09/69] Rework tests, add PlatformWrapper. --- lib/src/swipe_refresh.dart | 22 ++-- lib/utills/platform_wrapper.dart | 16 +++ pubspec.yaml | 1 + test/swipe_refresh_adaptive_test.dart | 142 ++++++++++++++++++++ test/swipe_refresh_cupertino_test.dart | 169 +++++++++++++++--------- test/swipe_refresh_material_test.dart | 172 ++++++++++++++++--------- test/swipe_refresh_test.dart | 80 ------------ test/swipe_refresh_with_builder.dart | 68 ++++++++++ test/test_utils.dart | 2 +- 9 files changed, 466 insertions(+), 206 deletions(-) create mode 100644 lib/utills/platform_wrapper.dart create mode 100644 test/swipe_refresh_adaptive_test.dart delete mode 100644 test/swipe_refresh_test.dart create mode 100644 test/swipe_refresh_with_builder.dart diff --git a/lib/src/swipe_refresh.dart b/lib/src/swipe_refresh.dart index 5979a0a..f960507 100644 --- a/lib/src/swipe_refresh.dart +++ b/lib/src/swipe_refresh.dart @@ -12,13 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -import 'dart:io'; - import 'package:flutter/cupertino.dart'; import 'package:swipe_refresh/src/cupertino_swipe_refresh.dart'; import 'package:swipe_refresh/src/material_swipe_refresh.dart'; import 'package:swipe_refresh/src/swipe_refresh_state.dart'; import 'package:swipe_refresh/src/swipe_refresh_style.dart'; +import 'package:swipe_refresh/utills/platform_wrapper.dart'; /// Refresh indicator widget. /// @@ -44,8 +43,9 @@ class SwipeRefresh extends StatelessWidget { final bool shrinkWrap; final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior; final ScrollPhysics? physics; + final PlatformWrapper _platform; - const SwipeRefresh( + SwipeRefresh( this.style, { required this.stateStream, required this.onRefresh, @@ -63,6 +63,7 @@ class SwipeRefresh extends StatelessWidget { double? refreshTriggerPullDistance, double? refreshIndicatorExtent, RefreshControlIndicatorBuilder? indicatorBuilder, + PlatformWrapper? platform, }) : backgroundColor = backgroundColor ?? const Color(0xFFFFFFFF), refreshTriggerPullDistance = refreshTriggerPullDistance ?? CupertinoSwipeRefresh.defaultRefreshTriggerPullDistance, @@ -70,10 +71,11 @@ class SwipeRefresh extends StatelessWidget { CupertinoSwipeRefresh.defaultRefreshIndicatorExtent, indicatorBuilder = indicatorBuilder ?? CupertinoSliverRefreshControl.buildRefreshIndicator, + _platform = platform ?? PlatformWrapper(), super(key: key); /// Create refresh indicator adaptive to platform. - const SwipeRefresh.adaptive({ + SwipeRefresh.adaptive({ required Stream stateStream, required VoidCallback onRefresh, required List children, @@ -89,6 +91,7 @@ class SwipeRefresh extends StatelessWidget { bool shrinkWrap = false, ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior, ScrollPhysics? physics, + PlatformWrapper? platform, }) : this( SwipeRefreshStyle.adaptive, key: key, @@ -106,10 +109,11 @@ class SwipeRefresh extends StatelessWidget { shrinkWrap: shrinkWrap, keyboardDismissBehavior: keyboardDismissBehavior, physics: physics, + platform: platform, ); /// Create refresh indicator with Material Design style. - const SwipeRefresh.material({ + SwipeRefresh.material({ required Stream stateStream, required VoidCallback onRefresh, required List children, @@ -139,7 +143,7 @@ class SwipeRefresh extends StatelessWidget { ); /// Create refresh indicator with Cupertino style. - const SwipeRefresh.cupertino({ + SwipeRefresh.cupertino({ required Stream stateStream, required VoidCallback onRefresh, required List children, @@ -190,6 +194,7 @@ class SwipeRefresh extends StatelessWidget { bool shrinkWrap = false, ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior, ScrollPhysics? physics, + PlatformWrapper? platform, }) { return SwipeRefresh( SwipeRefreshStyle.adaptive, @@ -211,6 +216,7 @@ class SwipeRefresh extends StatelessWidget { itemBuilder, childCount: itemCount, ), + platform: platform, ); } @@ -251,7 +257,7 @@ class SwipeRefresh extends StatelessWidget { ); case SwipeRefreshStyle.builder: case SwipeRefreshStyle.adaptive: - if (Platform.isAndroid) { + if (_platform.getPlatform() == TargetPlatform.android) { return MaterialSwipeRefresh( key: key, childrenDelegate: childrenDelegate, @@ -267,7 +273,7 @@ class SwipeRefresh extends StatelessWidget { physics: physics, children: children, ); - } else if (Platform.isIOS) { + } else if (_platform.getPlatform() == TargetPlatform.iOS) { return CupertinoSwipeRefresh( key: key, childrenDelegate: childrenDelegate, diff --git a/lib/utills/platform_wrapper.dart b/lib/utills/platform_wrapper.dart new file mode 100644 index 0000000..9e93bf7 --- /dev/null +++ b/lib/utills/platform_wrapper.dart @@ -0,0 +1,16 @@ +import 'dart:io'; + +import 'package:flutter/cupertino.dart'; + +/// Wrapper for Platform io. +class PlatformWrapper { + TargetPlatform? getPlatform() { + if (Platform.isAndroid) { + return TargetPlatform.android; + } else { + if (Platform.isIOS) { + return TargetPlatform.iOS; + } + } + } +} diff --git a/pubspec.yaml b/pubspec.yaml index 7ca4fdf..f80ed67 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,6 +11,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter + mocktail: ^0.2.0 surf_lint_rules: ^1.0.0 environment: diff --git a/test/swipe_refresh_adaptive_test.dart b/test/swipe_refresh_adaptive_test.dart new file mode 100644 index 0000000..f9cb9d1 --- /dev/null +++ b/test/swipe_refresh_adaptive_test.dart @@ -0,0 +1,142 @@ +// Copyright (c) 2019-present, SurfStudio LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import 'dart:async'; + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:mocktail/mocktail.dart'; +import 'package:swipe_refresh/swipe_refresh.dart'; +import 'package:swipe_refresh/utills/platform_wrapper.dart'; + +import 'test_utils.dart'; + +void main() { + late StreamController _controller; + late Stream stream; + late MockPlatformWrapper platformWrapper; + + setUp(() { + _controller = StreamController.broadcast(); + stream = _controller.stream; + + platformWrapper = MockPlatformWrapper(); + }); + + tearDown(() async { + await _controller.close(); + }); + + Future _onRefresh() async { + await Future.delayed(const Duration(seconds: 3)); + + _controller.sink.add(SwipeRefreshState.hidden); + } + + final listColors = [ + Colors.blue, + Colors.green, + Colors.red, + Colors.amber, + ]; + + testWidgets( + 'When call SwipeRefresh.adaptive not on android or iOS platform should build normally with one Container', + (tester) async { + final adaptiveSwipeRefresh = makeTestableWidget( + SwipeRefresh.adaptive( + stateStream: stream, + onRefresh: _onRefresh, + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), + platform: platformWrapper, + ), + ); + + await tester.pumpWidget(adaptiveSwipeRefresh); + + expect(() => adaptiveSwipeRefresh, returnsNormally); + + expect(find.byType(Container), findsOneWidget); + }, + ); + + testWidgets( + 'When call SwipeRefresh.adaptive on android platform should build MaterialSwipeRefresh', + (tester) async { + when(() => platformWrapper.getPlatform()) + .thenReturn(TargetPlatform.android); + + final adaptiveSwipeRefresh = makeTestableWidget( + SwipeRefresh.adaptive( + stateStream: stream, + onRefresh: _onRefresh, + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), + platform: platformWrapper, + ), + ); + + await tester.pumpWidget(adaptiveSwipeRefresh); + + expect(() => adaptiveSwipeRefresh, returnsNormally); + + expect(find.byType(MaterialSwipeRefresh), findsOneWidget); + }, + ); + + testWidgets( + 'When call SwipeRefresh.adaptive on iOS platform should build CupertinoSwipeRefresh', + (tester) async { + when(() => platformWrapper.getPlatform()) + .thenReturn(TargetPlatform.iOS); + + final adaptiveSwipeRefresh = makeTestableWidget( + SwipeRefresh.adaptive( + stateStream: stream, + onRefresh: _onRefresh, + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), + platform: platformWrapper, + ), + ); + + await tester.pumpWidget(adaptiveSwipeRefresh); + + expect(() => adaptiveSwipeRefresh, returnsNormally); + + expect(find.byType(CupertinoSwipeRefresh), findsOneWidget); + }, + ); +} + +class MockPlatformWrapper extends Mock implements PlatformWrapper {} diff --git a/test/swipe_refresh_cupertino_test.dart b/test/swipe_refresh_cupertino_test.dart index 9a25412..680dffb 100644 --- a/test/swipe_refresh_cupertino_test.dart +++ b/test/swipe_refresh_cupertino_test.dart @@ -14,6 +14,7 @@ import 'dart:async'; +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:swipe_refresh/swipe_refresh.dart'; @@ -21,81 +22,133 @@ import 'package:swipe_refresh/swipe_refresh.dart'; import 'test_utils.dart'; void main() { - group('SwipeRefresh.cupertino', () { - late StreamController _controller; - late Stream stream; - - setUp(() { - _controller = StreamController.broadcast(); - stream = _controller.stream; - }); - - tearDown(() async { - await _controller.close(); - }); - - Future _onRefresh() async { - await Future.delayed(const Duration(seconds: 3)); - - _controller.sink.add(SwipeRefreshState.hidden); - } - - group("doesn't break", () { - testWidgets('with children as argument', (tester) async { - final testWidget = makeTestableWidget( - SwipeRefresh.cupertino( - stateStream: stream, - onRefresh: _onRefresh, - children: Colors.primaries - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), - ), - ); - - await tester.pumpWidget(testWidget); - }); - }); - - testWidgets('emits hidden state on drag after 3 seconds', (tester) async { - final events = []; + late StreamController _streamController; + late Stream stream; + + setUp(() { + _streamController = StreamController.broadcast(); + stream = _streamController.stream; + }); + + tearDown(() async { + await _streamController.close(); + }); - stream.listen(expectAsync1(events.add)); + Future _onRefresh() async { + _streamController.sink.add(SwipeRefreshState.loading); - final testWidget = makeTestableWidget( + await Future.delayed(const Duration(seconds: 3)); + + _streamController.sink.add(SwipeRefreshState.hidden); + } + + final listColors = [ + Colors.blue, + Colors.green, + Colors.red, + Colors.amber, + ]; + + testWidgets( + 'SwipeRefresh.cupertino widget with children as argument does not break', + (tester) async { + final cupertinoSwipeRefresh = makeTestableWidget( SwipeRefresh.cupertino( stateStream: stream, onRefresh: _onRefresh, - children: const [ - SizedBox(height: 100), - SizedBox(height: 100), - ], + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), ), ); - await tester.pumpWidget(testWidget); + await tester.pumpWidget(cupertinoSwipeRefresh); - expect(events, isEmpty); + expect(() => cupertinoSwipeRefresh, returnsNormally); + + expect(find.byType(Container), findsNWidgets(4)); + + expect(find.byType(CupertinoSwipeRefresh), findsOneWidget); + }, + ); + + testWidgets( + 'When drag down enough, the refresh should start with the correct statuses', + (tester) async { + final events = []; + + stream.listen(events.add); + + final cupertinoSwipeRefresh = makeTestableWidget( + SwipeRefresh.cupertino( + stateStream: stream, + onRefresh: _onRefresh, + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), + ), + ); - /// drag is not enouth to trugger refresh - await tester.drag(find.byType(SwipeRefresh), const Offset(0, 100)); + await tester.pumpWidget(cupertinoSwipeRefresh); expect(events, isEmpty); - await tester.drag(find.byType(SwipeRefresh), const Offset(0, 300)); + await tester.drag( + find.byType(SwipeRefresh), + const Offset(0, 300), + touchSlopY: 0, + ); await tester.pump(const Duration(seconds: 1)); - /// event must reveal after 3 seconds - expect(events, isEmpty); + expect(events, equals([SwipeRefreshState.loading])); await tester.pump(const Duration(seconds: 3)); - expect(events, equals([SwipeRefreshState.hidden])); - }); - }); + expect(events.last, equals(SwipeRefreshState.hidden)); + }, + ); + + testWidgets( + 'When drag down is not enough to trigger an update the update should not be', + (tester) async { + final events = []; + + stream.listen(events.add); + + final cupertinoSwipeRefresh = makeTestableWidget( + SwipeRefresh.cupertino( + stateStream: stream, + onRefresh: _onRefresh, + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), + ), + ); + + await tester.pumpWidget(cupertinoSwipeRefresh); + + expect(events, isEmpty); + + await tester.drag(find.byType(SwipeRefresh), const Offset(0.0, 50.0)); + await tester.pump(); + + expect(events, isEmpty); + }, + ); } diff --git a/test/swipe_refresh_material_test.dart b/test/swipe_refresh_material_test.dart index 30f4743..c02d10a 100644 --- a/test/swipe_refresh_material_test.dart +++ b/test/swipe_refresh_material_test.dart @@ -21,81 +21,135 @@ import 'package:swipe_refresh/swipe_refresh.dart'; import 'test_utils.dart'; void main() { - group('SwipeRefresh.material', () { - late StreamController _controller; - late Stream stream; - - setUp(() { - _controller = StreamController.broadcast(); - stream = _controller.stream; - }); - - tearDown(() async { - await _controller.close(); - }); - - Future _onRefresh() async { - await Future.delayed(const Duration(seconds: 3)); - - _controller.sink.add(SwipeRefreshState.hidden); - } - - group("doesn't break", () { - testWidgets('with children as argument', (tester) async { - final testWidget = makeTestableWidget( - SwipeRefresh.material( - stateStream: stream, - onRefresh: _onRefresh, - children: Colors.primaries - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), - ), - ); - - await tester.pumpWidget(testWidget); - }); - }); - - testWidgets('emits hidden state on drag after 3 seconds', (tester) async { - final events = []; + late StreamController _controller; + late Stream stream; + + setUp(() { + _controller = StreamController.broadcast(); + stream = _controller.stream; + }); + + tearDown(() async { + await _controller.close(); + }); - stream.listen(expectAsync1(events.add)); + Future _onRefresh() async { + _controller.sink.add(SwipeRefreshState.loading); - final testWidget = makeTestableWidget( + await Future.delayed(const Duration(seconds: 3)); + + _controller.sink.add(SwipeRefreshState.hidden); + } + + final listColors = [ + Colors.blue, + Colors.green, + Colors.red, + Colors.amber, + ]; + + testWidgets( + 'SwipeRefresh.material widget with children as argument does not break', + (tester) async { + final materialSwipeRefresh = makeTestableWidget( SwipeRefresh.material( stateStream: stream, onRefresh: _onRefresh, - children: const [ - SizedBox(height: 100), - SizedBox(height: 100), - ], + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), ), ); - await tester.pumpWidget(testWidget); + await tester.pumpWidget(materialSwipeRefresh); - expect(events, isEmpty); + expect(() => materialSwipeRefresh, returnsNormally); - /// drag is not enouth to trugger refresh - await tester.drag(find.byType(SwipeRefresh), const Offset(0, 100)); + expect(find.byType(Container), findsNWidgets(4)); - expect(events, isEmpty); + expect(find.byType(MaterialSwipeRefresh), findsOneWidget); + }, + ); + + testWidgets( + 'When drag down enough, the refresh should start with the correct statuses', + (tester) async { + final events = []; + + stream.listen(events.add); + + final materialSwipeRefresh = makeTestableWidget( + SwipeRefresh.material( + stateStream: stream, + onRefresh: _onRefresh, + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), + ), + ); - await tester.drag(find.byType(SwipeRefresh), const Offset(0, 300)); + await tester.pumpWidget(materialSwipeRefresh); + await tester.drag( + find.byType(SwipeRefresh), + const Offset(0, 300), + touchSlopY: 0, + ); + await tester.pump(); await tester.pump(const Duration(seconds: 1)); - /// event must reveal after 3 seconds - expect(events, isEmpty); + expect(events, equals([SwipeRefreshState.loading])); await tester.pump(const Duration(seconds: 3)); - expect(events, equals([SwipeRefreshState.hidden])); - }); - }); + expect(events.last, equals(SwipeRefreshState.hidden)); + }, + ); + + testWidgets( + 'When drag down is not enough to trigger an update the update should not be', + (tester) async { + final events = []; + + stream.listen(events.add); + + final materialSwipeRefresh = makeTestableWidget( + SwipeRefresh.material( + stateStream: stream, + onRefresh: _onRefresh, + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), + ), + ); + await tester.pumpWidget(materialSwipeRefresh); + + expect(events, isEmpty); + + await tester.drag( + find.byType(SwipeRefresh), + const Offset(0, 50), + touchSlopY: 0, + ); + + await tester.pump(); + + expect(events, isEmpty); + }, + ); } diff --git a/test/swipe_refresh_test.dart b/test/swipe_refresh_test.dart deleted file mode 100644 index fae7597..0000000 --- a/test/swipe_refresh_test.dart +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) 2019-present, SurfStudio LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import 'dart:async'; - -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:swipe_refresh/swipe_refresh.dart'; - -import 'test_utils.dart'; - -void main() { - group('SwipeRefresh', () { - late StreamController _controller; - late Stream stream; - - setUp(() { - _controller = StreamController.broadcast(); - stream = _controller.stream; - }); - - tearDown(() async { - await _controller.close(); - }); - - Future _onRefresh() async { - await Future.delayed(const Duration(seconds: 3)); - - _controller.sink.add(SwipeRefreshState.hidden); - } - - group("doesn't break", () { - testWidgets('with children as argument', (tester) async { - final testWidget = makeTestableWidget( - SwipeRefresh.adaptive( - stateStream: stream, - onRefresh: _onRefresh, - children: Colors.primaries - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), - ), - ); - - await tester.pumpWidget(testWidget); - }); - - testWidgets('with itemBuilder as argument', (tester) async { - final testWidget = makeTestableWidget( - SwipeRefresh.builder( - stateStream: stream, - onRefresh: _onRefresh, - itemCount: Colors.primaries.length, - itemBuilder: (_, index) => Container( - color: Colors.primaries[index], - height: 100, - ), - ), - ); - - await tester.pumpWidget(testWidget); - }); - }); - }); -} diff --git a/test/swipe_refresh_with_builder.dart b/test/swipe_refresh_with_builder.dart new file mode 100644 index 0000000..b4c5c83 --- /dev/null +++ b/test/swipe_refresh_with_builder.dart @@ -0,0 +1,68 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:mocktail/mocktail.dart'; +import 'package:swipe_refresh/swipe_refresh.dart'; +import 'package:swipe_refresh/utills/platform_wrapper.dart'; + +import 'test_utils.dart'; + +void main() { + late StreamController _controller; + late Stream stream; + + late MockPlatformWrapper platformWrapper; + + setUp(() { + _controller = StreamController.broadcast(); + stream = _controller.stream; + + platformWrapper = MockPlatformWrapper(); + }); + + tearDown(() async { + await _controller.close(); + }); + + Future _onRefresh() async { + await Future.delayed(const Duration(seconds: 3)); + + _controller.sink.add(SwipeRefreshState.hidden); + } + + final listColors = [ + Colors.blue, + Colors.green, + Colors.red, + Colors.amber, + ]; + + testWidgets( + 'SwipeRefresh.builder with itemBuilder as argument builds normally(iOS platform as example)', + (tester) async { + when(() => platformWrapper.getPlatform()).thenReturn(TargetPlatform.iOS); + + final testWidget = makeTestableWidget( + SwipeRefresh.builder( + stateStream: stream, + onRefresh: _onRefresh, + itemCount: listColors.length, + itemBuilder: (_, index) => Container( + color: listColors[index], + height: 100, + ), + platform: platformWrapper, + ), + ); + + await tester.pumpWidget(testWidget); + + expect(() => testWidget, returnsNormally); + + expect(find.byType(Container), findsNWidgets(4)); + }, + ); +} + +class MockPlatformWrapper extends Mock implements PlatformWrapper {} diff --git a/test/test_utils.dart b/test/test_utils.dart index cf7674f..2ecff09 100644 --- a/test/test_utils.dart +++ b/test/test_utils.dart @@ -13,5 +13,5 @@ // limitations under the License. import 'package:flutter/material.dart'; - +// ignore: avoid-returning-widgets Widget makeTestableWidget(Widget widget) => MaterialApp(home: widget); From 6840e39bfc2324f941f11c15e474168d0c9222d7 Mon Sep 17 00:00:00 2001 From: KristinaZoteva Date: Fri, 15 Oct 2021 17:50:30 +0300 Subject: [PATCH 10/69] Fix after checking the editor. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 162ac6b..aa6be04 100644 --- a/README.md +++ b/README.md @@ -42,11 +42,11 @@ All notable changes to this project will be documented in [this file](./CHANGELO ## Issues -For issues, file directly in the [Issues](https://github.com/surfstudio/flutter-swipe-refresh/issues) section. +To report your issues, submit them directly in the [Issues](https://github.com/surfstudio/flutter-swipe-refresh/issues) section. ## Contribute -If you would like to contribute to the package (e.g. by improving the documentation, solving a bug or adding a cool new feature), please review our [contribution guide](./CONTRIBUTING.md) first and send us your pull request. +If you would like to contribute to the package (e.g. by improving the documentation, fixing a bug or adding a cool new feature), please read our [contribution guide](./CONTRIBUTING.md) first and send us your pull request. Your PRs are always welcome. From 7722a15b282a797f19bba658426bc7d737c5c3e7 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Mon, 18 Oct 2021 13:11:08 +0300 Subject: [PATCH 11/69] Fix CONTRIBUTING.md . --- CONTRIBUTING.md | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dc53313..d607fb3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,29 +6,27 @@ Thank you for your help! Before you start, let's take a look at some agreements. Make sure that your code: -1. Does not contain analyzer errors. -2. Follows a [official style](https://dart.dev/guides/language/effective-dart/style). -3. Follows the official [style of formatting](https://flutter.dev/docs/development/tools/formatting) - . -3. Contains no errors. -4. New functionality is covered by tests. New functionality passes old tests. -5. Create example that demonstrate new functionality if it is possible. +1. Does not contain analyzer errors. +2. Follows a [official style](https://dart.dev/guides/language/effective-dart/style). +3. Follows the official [style of formatting](https://flutter.dev/docs/development/tools/formatting). +4. Contains no errors. +5. New functionality is covered by tests. New functionality passes old tests. +6. Create example that demonstrate new functionality if it is possible. ## Accepting the changes -After your pull request passes the review code, the project maintainers will merge the changes into -the branch to which the pull request was sent. +After your pull request passes the review code, the project maintainers will merge the changes +into the branch to which the pull request was sent. ## Issues Feel free to report any issues and bugs. -1. To report about the problem, create - an [Issues](https://github.com/surfstudio/flutter-otp-autofill/issues) on GitHub. -2. In the issue add the description of the problem. -3. Do not forget to mention your development environment, Flutter version, libraries required for - illustration of the problem. -4. It is necessary to attach the code part that causes an issue or to make a small demo project that - shows the issue. -5. Attach stack trace so it helps us to deal with the issue. -6. If the issue is related to graphics, screen recording is required. +1. To report about the problem, create an issue on GitHub. +2. In the issue add the description of the problem. +3. Do not forget to mention your development environment, Flutter version, libraries required for + illustration of the problem. +4. It is necessary to attach the code part that causes an issue or to make a small demo project + that shows the issue. +5. Attach stack trace so it helps us to deal with the issue. +6. If the issue is related to graphics, screen recording is required. From 3d59e1fdcbf8768a72fd7a750afd572d082a520b Mon Sep 17 00:00:00 2001 From: zhukeev Date: Tue, 19 Oct 2021 14:51:30 +0600 Subject: [PATCH 12/69] repo update --- pubspec.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index aa1b419..839f9b8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,8 +1,8 @@ name: swipe_refresh version: 1.0.1 -description: Widget for refresh by swipe. -repository: "https://github.com/surfstudio/SurfGear/tree/main/packages/swipe_refresh" -issue_tracker: "https://github.com/surfstudio/SurfGear/issues" +description: A widget provided to the flutter scroll component drop-down refresh and pull up load. +repository: "https://github.com/surfstudio/flutter-swipe-refresh" +issue_tracker: "https://github.com/surfstudio/flutter-swipe-refresh/issues" dependencies: flutter: From 66a695cabe92650e0cac5632eeac6a19040b6b90 Mon Sep 17 00:00:00 2001 From: zhukeev Date: Tue, 19 Oct 2021 14:56:33 +0600 Subject: [PATCH 13/69] mainkt updated --- .../src/main/kotlin/com/example/example/MainActivity.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt index e793a00..e2c0fd3 100644 --- a/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt +++ b/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt @@ -1,6 +1,13 @@ package com.example.example -import io.flutter.embedding.android.FlutterActivity +import android.os.Bundle + +import io.flutter.app.FlutterActivity +import io.flutter.plugins.GeneratedPluginRegistrant class MainActivity: FlutterActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + GeneratedPluginRegistrant.registerWith(this) + } } From 6d7b0b417f098c9068791e16504e3bb703d7c339 Mon Sep 17 00:00:00 2001 From: zhukeev Date: Tue, 19 Oct 2021 14:59:37 +0600 Subject: [PATCH 14/69] readme fix --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8679172..0e3c20a 100644 --- a/README.md +++ b/README.md @@ -9,14 +9,14 @@ This package is part of the [SurfGear](https://github.com/surfstudio/SurfGear) toolkit made by [Surf](https://surf.ru). -## About +## Description Widget for refresh by swipe. ![](media/material.gif) ![](media/cupertino.gif) -## Usage +## Example Main classes: From cc80c94266b16221731d6c827ce63eff95be25c8 Mon Sep 17 00:00:00 2001 From: zhukeev Date: Tue, 19 Oct 2021 15:11:01 +0600 Subject: [PATCH 15/69] gradle version updated --- example/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/android/build.gradle b/example/android/build.gradle index c505a86..5588645 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } From 3e6819c66c6ce6888dabaec2760c02275b8772b3 Mon Sep 17 00:00:00 2001 From: zhukeev Date: Tue, 19 Oct 2021 15:24:10 +0600 Subject: [PATCH 16/69] gradle wapper version changed --- example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index bc6a58a..939efa2 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip From 5296d3e5ec1cf24bafbce845d18c40dfa9a8b025 Mon Sep 17 00:00:00 2001 From: zhukeev Date: Tue, 19 Oct 2021 15:37:27 +0600 Subject: [PATCH 17/69] main cleared --- .../app/src/main/kotlin/com/example/example/MainActivity.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt index e2c0fd3..61a97be 100644 --- a/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt +++ b/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt @@ -6,8 +6,5 @@ import io.flutter.app.FlutterActivity import io.flutter.plugins.GeneratedPluginRegistrant class MainActivity: FlutterActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - GeneratedPluginRegistrant.registerWith(this) - } + } From 042ca275722ed5335b898ded3be6b4c865aaaa06 Mon Sep 17 00:00:00 2001 From: KristinaZoteva Date: Thu, 21 Oct 2021 11:13:32 +0300 Subject: [PATCH 18/69] Updated gitignore. --- .gitignore | 16 ++- example/.gitignore | 20 +-- example/pubspec.lock | 253 ------------------------------------ pubspec.lock | 300 ------------------------------------------- 4 files changed, 23 insertions(+), 566 deletions(-) delete mode 100644 example/pubspec.lock delete mode 100644 pubspec.lock diff --git a/.gitignore b/.gitignore index 9f87252..761d64c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Miscellaneous *.class +*.lock *.log *.pyc *.swp @@ -15,15 +16,17 @@ *.iws .idea/ -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ +# Visual Studio Code related +.classpath +.project +.settings/ +.vscode/ # Flutter/Dart/Pub related **/doc/api/ .dart_tool/ .flutter-plugins +.flutter-plugins-dependencies .packages .pub-cache/ .pub/ @@ -58,15 +61,18 @@ build/ **/ios/Flutter/App.framework **/ios/Flutter/Flutter.framework **/ios/Flutter/Generated.xcconfig +**/ios/Flutter/flutter_export_environment.sh **/ios/Flutter/app.flx **/ios/Flutter/app.zip **/ios/Flutter/flutter_assets/ **/ios/ServiceDefinitions.json **/ios/Runner/GeneratedPluginRegistrant.* +# Coverage +coverage/ + # Exceptions to above rules. !**/ios/**/default.mode1v3 !**/ios/**/default.mode2v3 !**/ios/**/default.pbxuser !**/ios/**/default.perspectivev3 -!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages diff --git a/example/.gitignore b/example/.gitignore index 10c16ab..761d64c 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -1,5 +1,6 @@ # Miscellaneous *.class +*.lock *.log *.pyc *.swp @@ -15,19 +16,21 @@ *.iws .idea/ -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ +# Visual Studio Code related +.classpath +.project +.settings/ +.vscode/ # Flutter/Dart/Pub related **/doc/api/ .dart_tool/ .flutter-plugins +.flutter-plugins-dependencies .packages .pub-cache/ .pub/ -/build/ +build/ # Android related **/android/**/gradle-wrapper.jar @@ -58,17 +61,18 @@ **/ios/Flutter/App.framework **/ios/Flutter/Flutter.framework **/ios/Flutter/Generated.xcconfig +**/ios/Flutter/flutter_export_environment.sh **/ios/Flutter/app.flx **/ios/Flutter/app.zip **/ios/Flutter/flutter_assets/ -**/ios/Flutter/flutter_export_environment.sh **/ios/ServiceDefinitions.json **/ios/Runner/GeneratedPluginRegistrant.* -**/ios/Podfile + +# Coverage +coverage/ # Exceptions to above rules. !**/ios/**/default.mode1v3 !**/ios/**/default.mode2v3 !**/ios/**/default.pbxuser !**/ios/**/default.perspectivev3 -!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages diff --git a/example/pubspec.lock b/example/pubspec.lock deleted file mode 100644 index 5c68e85..0000000 --- a/example/pubspec.lock +++ /dev/null @@ -1,253 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - _fe_analyzer_shared: - dependency: transitive - description: - name: _fe_analyzer_shared - url: "https://pub.dartlang.org" - source: hosted - version: "26.0.0" - analyzer: - dependency: transitive - description: - name: analyzer - url: "https://pub.dartlang.org" - source: hosted - version: "2.3.0" - analyzer_plugin: - dependency: transitive - description: - name: analyzer_plugin - url: "https://pub.dartlang.org" - source: hosted - version: "0.7.0" - ansicolor: - dependency: transitive - description: - name: ansicolor - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "2.3.0" - async: - dependency: transitive - description: - name: async - url: "https://pub.dartlang.org" - source: hosted - version: "2.8.2" - characters: - dependency: transitive - description: - name: characters - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.5" - collection: - dependency: transitive - description: - name: collection - url: "https://pub.dartlang.org" - source: hosted - version: "1.15.0" - convert: - dependency: transitive - description: - name: convert - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.1" - crypto: - dependency: transitive - description: - name: crypto - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.1" - csslib: - dependency: transitive - description: - name: csslib - url: "https://pub.dartlang.org" - source: hosted - version: "0.17.1" - dart_code_metrics: - dependency: transitive - description: - name: dart_code_metrics - url: "https://pub.dartlang.org" - source: hosted - version: "4.4.0" - dart_style: - dependency: transitive - description: - name: dart_style - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.0" - file: - dependency: transitive - description: - name: file - url: "https://pub.dartlang.org" - source: hosted - version: "6.1.2" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_lints: - dependency: transitive - description: - name: flutter_lints - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.4" - glob: - dependency: transitive - description: - name: glob - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.2" - html: - dependency: transitive - description: - name: html - url: "https://pub.dartlang.org" - source: hosted - version: "0.15.0" - lints: - dependency: transitive - description: - name: lints - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" - meta: - dependency: transitive - description: - name: meta - url: "https://pub.dartlang.org" - source: hosted - version: "1.7.0" - package_config: - dependency: transitive - description: - name: package_config - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.2" - path: - dependency: transitive - description: - name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.11.1" - pub_semver: - dependency: transitive - description: - name: pub_semver - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - surf_lint_rules: - dependency: "direct dev" - description: - name: surf_lint_rules - url: "https://pub.dartlang.org" - source: hosted - version: "1.4.0" - swipe_refresh: - dependency: "direct main" - description: - path: ".." - relative: true - source: path - version: "1.0.1" - term_glyph: - dependency: transitive - description: - name: term_glyph - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" - vector_math: - dependency: transitive - description: - name: vector_math - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - watcher: - dependency: transitive - description: - name: watcher - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" - yaml: - dependency: transitive - description: - name: yaml - url: "https://pub.dartlang.org" - source: hosted - version: "3.1.0" -sdks: - dart: ">=2.14.0 <3.0.0" diff --git a/pubspec.lock b/pubspec.lock deleted file mode 100644 index 0f5d9c0..0000000 --- a/pubspec.lock +++ /dev/null @@ -1,300 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - _fe_analyzer_shared: - dependency: transitive - description: - name: _fe_analyzer_shared - url: "https://pub.dartlang.org" - source: hosted - version: "26.0.0" - analyzer: - dependency: transitive - description: - name: analyzer - url: "https://pub.dartlang.org" - source: hosted - version: "2.3.0" - analyzer_plugin: - dependency: transitive - description: - name: analyzer_plugin - url: "https://pub.dartlang.org" - source: hosted - version: "0.7.0" - ansicolor: - dependency: transitive - description: - name: ansicolor - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "2.3.0" - async: - dependency: transitive - description: - name: async - url: "https://pub.dartlang.org" - source: hosted - version: "2.8.1" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - characters: - dependency: transitive - description: - name: characters - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.5" - clock: - dependency: transitive - description: - name: clock - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - collection: - dependency: transitive - description: - name: collection - url: "https://pub.dartlang.org" - source: hosted - version: "1.15.0" - convert: - dependency: transitive - description: - name: convert - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.1" - crypto: - dependency: transitive - description: - name: crypto - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.1" - csslib: - dependency: transitive - description: - name: csslib - url: "https://pub.dartlang.org" - source: hosted - version: "0.17.1" - dart_code_metrics: - dependency: transitive - description: - name: dart_code_metrics - url: "https://pub.dartlang.org" - source: hosted - version: "4.4.0" - dart_style: - dependency: transitive - description: - name: dart_style - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.0" - fake_async: - dependency: transitive - description: - name: fake_async - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - file: - dependency: transitive - description: - name: file - url: "https://pub.dartlang.org" - source: hosted - version: "6.1.2" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_lints: - dependency: transitive - description: - name: flutter_lints - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.4" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - glob: - dependency: transitive - description: - name: glob - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.2" - html: - dependency: transitive - description: - name: html - url: "https://pub.dartlang.org" - source: hosted - version: "0.15.0" - lints: - dependency: transitive - description: - name: lints - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" - matcher: - dependency: transitive - description: - name: matcher - url: "https://pub.dartlang.org" - source: hosted - version: "0.12.10" - meta: - dependency: transitive - description: - name: meta - url: "https://pub.dartlang.org" - source: hosted - version: "1.7.0" - package_config: - dependency: transitive - description: - name: package_config - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.2" - path: - dependency: transitive - description: - name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.11.1" - pub_semver: - dependency: transitive - description: - name: pub_semver - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - url: "https://pub.dartlang.org" - source: hosted - version: "1.10.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - string_scanner: - dependency: transitive - description: - name: string_scanner - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - surf_lint_rules: - dependency: "direct dev" - description: - name: surf_lint_rules - url: "https://pub.dartlang.org" - source: hosted - version: "1.4.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - test_api: - dependency: transitive - description: - name: test_api - url: "https://pub.dartlang.org" - source: hosted - version: "0.4.2" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" - vector_math: - dependency: transitive - description: - name: vector_math - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - watcher: - dependency: transitive - description: - name: watcher - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" - yaml: - dependency: transitive - description: - name: yaml - url: "https://pub.dartlang.org" - source: hosted - version: "3.1.0" -sdks: - dart: ">=2.14.0 <3.0.0" From eaf4f7018963beba601beef2018932b66f0aecc8 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Fri, 22 Oct 2021 23:30:05 +0300 Subject: [PATCH 19/69] =?UTF-8?q?=D0=A1hanged=20imports=20for=20TargetPlat?= =?UTF-8?q?form.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/src/swipe_refresh.dart | 1 + lib/utills/platform_wrapper.dart | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/src/swipe_refresh.dart b/lib/src/swipe_refresh.dart index f960507..95ec236 100644 --- a/lib/src/swipe_refresh.dart +++ b/lib/src/swipe_refresh.dart @@ -13,6 +13,7 @@ // limitations under the License. import 'package:flutter/cupertino.dart'; +import 'package:flutter/foundation.dart'; import 'package:swipe_refresh/src/cupertino_swipe_refresh.dart'; import 'package:swipe_refresh/src/material_swipe_refresh.dart'; import 'package:swipe_refresh/src/swipe_refresh_state.dart'; diff --git a/lib/utills/platform_wrapper.dart b/lib/utills/platform_wrapper.dart index 9e93bf7..bf37fa7 100644 --- a/lib/utills/platform_wrapper.dart +++ b/lib/utills/platform_wrapper.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:flutter/cupertino.dart'; +import 'package:flutter/foundation.dart'; /// Wrapper for Platform io. class PlatformWrapper { From 9dcee2e9c89243ec17cc40ddd1bcad3994d904b6 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Tue, 26 Oct 2021 16:37:57 +0300 Subject: [PATCH 20/69] Remove date from CHANGELOG.md. --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfd9117..f8d23de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,11 @@ *Refactoring. -## 1.0.1 - 2021-05-30 +## 1.0.1 * Stable release -## 1.0.1-dev.1 - 2021-05-25 +## 1.0.1-dev.1 * Apply new lint rules. From c7dbcb78a12332cad7eaf38bafc3c98e95f61aa4 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Wed, 27 Oct 2021 11:20:56 +0300 Subject: [PATCH 21/69] Connection coverage and fix README.md(remove installation section). --- .github/workflows/build.yaml | 7 ++++++- README.md | 15 ++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 40df31d..346f322 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,7 +33,12 @@ jobs: run: flutter format --set-exit-if-changed . - name: Run tests ⚙️ - run: flutter test + env: + CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}} + if: success() + run: | + flutter test --coverage + bash <(curl -s https://codecov.io/bash) -f coverage/lcov.info package-analysis: runs-on: ubuntu-latest diff --git a/README.md b/README.md index 162ac6b..8856347 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Swipe Refresh -[![Build Status](https://shields.io/github/workflow/status/surfstudio/SurfGear/build?logo=github&logoColor=white)](https://github.com/surfstudio/flutter-swipe-refresh) -[![Coverage Status](https://img.shields.io/codecov/c/github/surfstudio/SurfGear?flag=swipe_refresh&logo=codecov&logoColor=white)](https://app.codecov.io/gh/surfstudio/flutter-swipe-refresh) +[![Build Status](https://shields.io/github/workflow/status/surfstudio/flutter-swipe-refresh/build?logo=github&logoColor=white)](https://github.com/surfstudio/flutter-swipe-refresh) +[![Coverage Status](https://img.shields.io/codecov/c/github/surfstudio/flutter-swipe-refresh?logo=codecov&logoColor=white)](https://app.codecov.io/gh/surfstudio/flutter-swipe-refresh) [![Pub Version](https://img.shields.io/pub/v/swipe_refresh?logo=dart&logoColor=white)](https://pub.dev/packages/swipe_refresh) [![Pub Likes](https://badgen.net/pub/likes/swipe_refresh)](https://pub.dev/packages/swipe_refresh) [![Pub popularity](https://badgen.net/pub/popularity/swipe_refresh)](https://pub.dev/packages/swipe_refresh/score) @@ -25,17 +25,6 @@ Main classes: 3. [Widget for indicate swipe refresh Material style](lib/src/material_swipe_refresh.dart) 4. [Widget for indicate swipe refresh Cupertino style](lib/src/cupertino_swipe_refresh.dart) -## Installation - -Add `swipe_refresh` to your `pubspec.yaml` file: - -```yaml -dependencies: - swipe_refresh: ^1.0.1 -``` - -You can use both `stable` and `dev` versions of the package listed above in the badges bar. - ## Changelog All notable changes to this project will be documented in [this file](./CHANGELOG.md). From 97e7b09d3cfb4ea95c4044a33915eaacc0f6cdc8 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Wed, 27 Oct 2021 14:15:28 +0300 Subject: [PATCH 22/69] Improved PlatformWrapper, add test for PlatformWrapper. --- lib/src/swipe_refresh.dart | 66 +++++++++++++-------------- lib/utills/platform_wrapper.dart | 30 ++++++++---- test/platform_wrapper_test.dart | 42 +++++++++++++++++ test/swipe_refresh_adaptive_test.dart | 24 +++++----- test/swipe_refresh_with_builder.dart | 17 ++++++- 5 files changed, 124 insertions(+), 55 deletions(-) create mode 100644 test/platform_wrapper_test.dart diff --git a/lib/src/swipe_refresh.dart b/lib/src/swipe_refresh.dart index 95ec236..b2a12be 100644 --- a/lib/src/swipe_refresh.dart +++ b/lib/src/swipe_refresh.dart @@ -258,39 +258,39 @@ class SwipeRefresh extends StatelessWidget { ); case SwipeRefreshStyle.builder: case SwipeRefreshStyle.adaptive: - if (_platform.getPlatform() == TargetPlatform.android) { - return MaterialSwipeRefresh( - key: key, - childrenDelegate: childrenDelegate, - stateStream: stateStream, - initState: initState, - onRefresh: onRefresh, - scrollController: scrollController, - backgroundColor: backgroundColor, - indicatorColor: indicatorColor, - shrinkWrap: shrinkWrap, - padding: padding, - keyboardDismissBehavior: keyboardDismissBehavior, - physics: physics, - children: children, - ); - } else if (_platform.getPlatform() == TargetPlatform.iOS) { - return CupertinoSwipeRefresh( - key: key, - childrenDelegate: childrenDelegate, - stateStream: stateStream, - initState: initState, - onRefresh: onRefresh, - scrollController: scrollController, - refreshIndicatorExtent: refreshIndicatorExtent, - refreshTriggerPullDistance: refreshTriggerPullDistance, - indicatorBuilder: indicatorBuilder, - shrinkWrap: shrinkWrap, - padding: padding, - physics: physics, - children: children, - ); - } + if (_platform.isAndroid()) { + return MaterialSwipeRefresh( + key: key, + childrenDelegate: childrenDelegate, + stateStream: stateStream, + initState: initState, + onRefresh: onRefresh, + scrollController: scrollController, + backgroundColor: backgroundColor, + indicatorColor: indicatorColor, + shrinkWrap: shrinkWrap, + padding: padding, + keyboardDismissBehavior: keyboardDismissBehavior, + physics: physics, + children: children, + ); + } else if (_platform.isIOS()) { + return CupertinoSwipeRefresh( + key: key, + childrenDelegate: childrenDelegate, + stateStream: stateStream, + initState: initState, + onRefresh: onRefresh, + scrollController: scrollController, + refreshIndicatorExtent: refreshIndicatorExtent, + refreshTriggerPullDistance: refreshTriggerPullDistance, + indicatorBuilder: indicatorBuilder, + shrinkWrap: shrinkWrap, + padding: padding, + physics: physics, + children: children, + ); + } } return Container(); diff --git a/lib/utills/platform_wrapper.dart b/lib/utills/platform_wrapper.dart index bf37fa7..a3cf12b 100644 --- a/lib/utills/platform_wrapper.dart +++ b/lib/utills/platform_wrapper.dart @@ -1,16 +1,26 @@ -import 'dart:io'; +// Copyright (c) 2019-present, SurfStudio LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. -import 'package:flutter/foundation.dart'; +import 'dart:io'; /// Wrapper for Platform io. class PlatformWrapper { - TargetPlatform? getPlatform() { - if (Platform.isAndroid) { - return TargetPlatform.android; - } else { - if (Platform.isIOS) { - return TargetPlatform.iOS; - } - } + bool isIOS() { + return Platform.isIOS; + } + + bool isAndroid() { + return Platform.isAndroid; } } diff --git a/test/platform_wrapper_test.dart b/test/platform_wrapper_test.dart new file mode 100644 index 0000000..a817239 --- /dev/null +++ b/test/platform_wrapper_test.dart @@ -0,0 +1,42 @@ +// Copyright (c) 2019-present, SurfStudio LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import 'package:flutter_test/flutter_test.dart'; +import 'package:swipe_refresh/utills/platform_wrapper.dart'; + +void main() { + late PlatformWrapper platformWrapper; + + setUp(() { + platformWrapper = PlatformWrapper(); + }); + + test( + 'Method isAndroid should return false', + () { + final platform = platformWrapper.isAndroid(); + + expect(platform, false); + }, + ); + + test( + 'Method isIOS should return false', + () { + final platform = platformWrapper.isIOS(); + + expect(platform, false); + }, + ); +} diff --git a/test/swipe_refresh_adaptive_test.dart b/test/swipe_refresh_adaptive_test.dart index f9cb9d1..8ae6dd5 100644 --- a/test/swipe_refresh_adaptive_test.dart +++ b/test/swipe_refresh_adaptive_test.dart @@ -52,8 +52,11 @@ void main() { ]; testWidgets( - 'When call SwipeRefresh.adaptive not on android or iOS platform should build normally with one Container', + 'When call SwipeRefresh.adaptive not on Android or iOS platform should build normally with one Container', (tester) async { + when(() => platformWrapper.isAndroid()).thenReturn(false); + when(() => platformWrapper.isIOS()).thenReturn(false); + final adaptiveSwipeRefresh = makeTestableWidget( SwipeRefresh.adaptive( stateStream: stream, @@ -79,10 +82,9 @@ void main() { ); testWidgets( - 'When call SwipeRefresh.adaptive on android platform should build MaterialSwipeRefresh', + 'When call SwipeRefresh.adaptive on Android platform should build MaterialSwipeRefresh', (tester) async { - when(() => platformWrapper.getPlatform()) - .thenReturn(TargetPlatform.android); + when(() => platformWrapper.isAndroid()).thenReturn(true); final adaptiveSwipeRefresh = makeTestableWidget( SwipeRefresh.adaptive( @@ -110,9 +112,9 @@ void main() { testWidgets( 'When call SwipeRefresh.adaptive on iOS platform should build CupertinoSwipeRefresh', - (tester) async { - when(() => platformWrapper.getPlatform()) - .thenReturn(TargetPlatform.iOS); + (tester) async { + when(() => platformWrapper.isAndroid()).thenReturn(false); + when(() => platformWrapper.isIOS()).thenReturn(true); final adaptiveSwipeRefresh = makeTestableWidget( SwipeRefresh.adaptive( @@ -121,10 +123,10 @@ void main() { children: listColors .map( (e) => Container( - color: e, - height: 100, - ), - ) + color: e, + height: 100, + ), + ) .toList(), platform: platformWrapper, ), diff --git a/test/swipe_refresh_with_builder.dart b/test/swipe_refresh_with_builder.dart index b4c5c83..268e90f 100644 --- a/test/swipe_refresh_with_builder.dart +++ b/test/swipe_refresh_with_builder.dart @@ -1,3 +1,17 @@ +// Copyright (c) 2019-present, SurfStudio LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + import 'dart:async'; import 'package:flutter/material.dart'; @@ -41,7 +55,8 @@ void main() { testWidgets( 'SwipeRefresh.builder with itemBuilder as argument builds normally(iOS platform as example)', (tester) async { - when(() => platformWrapper.getPlatform()).thenReturn(TargetPlatform.iOS); + when(() => platformWrapper.isAndroid()).thenReturn(false); + when(() => platformWrapper.isIOS()).thenReturn(true); final testWidget = makeTestableWidget( SwipeRefresh.builder( From 285d3d1b473a1bf5ba2d32d7bab0840395b7e781 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Wed, 27 Oct 2021 14:51:58 +0300 Subject: [PATCH 23/69] Improved PlatformWrapper. --- lib/src/swipe_refresh.dart | 4 ++-- lib/utills/platform_wrapper.dart | 8 ++------ test/platform_wrapper_test.dart | 4 ++-- test/swipe_refresh_adaptive_test.dart | 10 +++++----- test/swipe_refresh_with_builder.dart | 4 ++-- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/lib/src/swipe_refresh.dart b/lib/src/swipe_refresh.dart index b2a12be..62bb058 100644 --- a/lib/src/swipe_refresh.dart +++ b/lib/src/swipe_refresh.dart @@ -258,7 +258,7 @@ class SwipeRefresh extends StatelessWidget { ); case SwipeRefreshStyle.builder: case SwipeRefreshStyle.adaptive: - if (_platform.isAndroid()) { + if (_platform.isAndroid) { return MaterialSwipeRefresh( key: key, childrenDelegate: childrenDelegate, @@ -274,7 +274,7 @@ class SwipeRefresh extends StatelessWidget { physics: physics, children: children, ); - } else if (_platform.isIOS()) { + } else if (_platform.isIOS) { return CupertinoSwipeRefresh( key: key, childrenDelegate: childrenDelegate, diff --git a/lib/utills/platform_wrapper.dart b/lib/utills/platform_wrapper.dart index a3cf12b..b18879c 100644 --- a/lib/utills/platform_wrapper.dart +++ b/lib/utills/platform_wrapper.dart @@ -16,11 +16,7 @@ import 'dart:io'; /// Wrapper for Platform io. class PlatformWrapper { - bool isIOS() { - return Platform.isIOS; - } + bool get isIOS => Platform.isIOS; - bool isAndroid() { - return Platform.isAndroid; - } + bool get isAndroid => Platform.isAndroid; } diff --git a/test/platform_wrapper_test.dart b/test/platform_wrapper_test.dart index a817239..9a11c20 100644 --- a/test/platform_wrapper_test.dart +++ b/test/platform_wrapper_test.dart @@ -25,7 +25,7 @@ void main() { test( 'Method isAndroid should return false', () { - final platform = platformWrapper.isAndroid(); + final platform = platformWrapper.isAndroid; expect(platform, false); }, @@ -34,7 +34,7 @@ void main() { test( 'Method isIOS should return false', () { - final platform = platformWrapper.isIOS(); + final platform = platformWrapper.isIOS; expect(platform, false); }, diff --git a/test/swipe_refresh_adaptive_test.dart b/test/swipe_refresh_adaptive_test.dart index 8ae6dd5..572886c 100644 --- a/test/swipe_refresh_adaptive_test.dart +++ b/test/swipe_refresh_adaptive_test.dart @@ -54,8 +54,8 @@ void main() { testWidgets( 'When call SwipeRefresh.adaptive not on Android or iOS platform should build normally with one Container', (tester) async { - when(() => platformWrapper.isAndroid()).thenReturn(false); - when(() => platformWrapper.isIOS()).thenReturn(false); + when(() => platformWrapper.isAndroid).thenReturn(false); + when(() => platformWrapper.isIOS).thenReturn(false); final adaptiveSwipeRefresh = makeTestableWidget( SwipeRefresh.adaptive( @@ -84,7 +84,7 @@ void main() { testWidgets( 'When call SwipeRefresh.adaptive on Android platform should build MaterialSwipeRefresh', (tester) async { - when(() => platformWrapper.isAndroid()).thenReturn(true); + when(() => platformWrapper.isAndroid).thenReturn(true); final adaptiveSwipeRefresh = makeTestableWidget( SwipeRefresh.adaptive( @@ -113,8 +113,8 @@ void main() { testWidgets( 'When call SwipeRefresh.adaptive on iOS platform should build CupertinoSwipeRefresh', (tester) async { - when(() => platformWrapper.isAndroid()).thenReturn(false); - when(() => platformWrapper.isIOS()).thenReturn(true); + when(() => platformWrapper.isAndroid).thenReturn(false); + when(() => platformWrapper.isIOS).thenReturn(true); final adaptiveSwipeRefresh = makeTestableWidget( SwipeRefresh.adaptive( diff --git a/test/swipe_refresh_with_builder.dart b/test/swipe_refresh_with_builder.dart index 268e90f..78bafd3 100644 --- a/test/swipe_refresh_with_builder.dart +++ b/test/swipe_refresh_with_builder.dart @@ -55,8 +55,8 @@ void main() { testWidgets( 'SwipeRefresh.builder with itemBuilder as argument builds normally(iOS platform as example)', (tester) async { - when(() => platformWrapper.isAndroid()).thenReturn(false); - when(() => platformWrapper.isIOS()).thenReturn(true); + when(() => platformWrapper.isAndroid).thenReturn(false); + when(() => platformWrapper.isIOS).thenReturn(true); final testWidget = makeTestableWidget( SwipeRefresh.builder( From 357f54dd0fe83e45d09000a7d4e17eb83e55f7e0 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Wed, 27 Oct 2021 15:21:31 +0300 Subject: [PATCH 24/69] Improved PlatformWrapper. --- test/platform_wrapper_test.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/platform_wrapper_test.dart b/test/platform_wrapper_test.dart index 9a11c20..779f61b 100644 --- a/test/platform_wrapper_test.dart +++ b/test/platform_wrapper_test.dart @@ -25,18 +25,18 @@ void main() { test( 'Method isAndroid should return false', () { - final platform = platformWrapper.isAndroid; + final isAndroid = platformWrapper.isAndroid; - expect(platform, false); + expect(isAndroid, false); }, ); test( 'Method isIOS should return false', () { - final platform = platformWrapper.isIOS; + final isIOS = platformWrapper.isIOS; - expect(platform, false); + expect(isIOS, false); }, ); } From 4ea17abd1032f6a47e044d842961bcc18e77d0d1 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Tue, 9 Nov 2021 15:19:01 +0300 Subject: [PATCH 25/69] Improved tests. Removed extra code in CupertinoSwipeRefresh and MaterialSwipeRefresh. Childrendelegate added to constructors SwipeRefresh. In SwipeRegreshBase in the _updateState method, the transfer of the loading status is added. --- README.md | 4 +- coverage/html/amber.png | Bin 0 -> 141 bytes coverage/html/emerald.png | Bin 0 -> 141 bytes coverage/html/gcov.css | 519 ++++++++++++++++++ coverage/html/glass.png | Bin 0 -> 167 bytes coverage/html/index-sort-f.html | 103 ++++ coverage/html/index-sort-l.html | 103 ++++ coverage/html/index.html | 103 ++++ coverage/html/ruby.png | Bin 0 -> 141 bytes coverage/html/snow.png | Bin 0 -> 141 bytes ...ertino_swipe_refresh.dart.func-sort-c.html | 72 +++ .../cupertino_swipe_refresh.dart.func.html | 72 +++ .../cupertino_swipe_refresh.dart.gcov.html | 236 ++++++++ coverage/html/src/index-sort-f.html | 143 +++++ coverage/html/src/index-sort-l.html | 143 +++++ coverage/html/src/index.html | 143 +++++ ...terial_swipe_refresh.dart.func-sort-c.html | 72 +++ .../src/material_swipe_refresh.dart.func.html | 72 +++ .../src/material_swipe_refresh.dart.gcov.html | 180 ++++++ .../src/swipe_refresh.dart.func-sort-c.html | 72 +++ .../html/src/swipe_refresh.dart.func.html | 72 +++ .../html/src/swipe_refresh.dart.gcov.html | 380 +++++++++++++ .../swipe_refresh_base.dart.func-sort-c.html | 72 +++ .../src/swipe_refresh_base.dart.func.html | 72 +++ .../src/swipe_refresh_base.dart.gcov.html | 198 +++++++ .../swipe_refresh_state.dart.func-sort-c.html | 72 +++ .../src/swipe_refresh_state.dart.func.html | 72 +++ .../src/swipe_refresh_state.dart.gcov.html | 98 ++++ .../swipe_refresh_style.dart.func-sort-c.html | 72 +++ .../src/swipe_refresh_style.dart.func.html | 72 +++ .../src/swipe_refresh_style.dart.gcov.html | 104 ++++ coverage/html/updown.png | Bin 0 -> 117 bytes coverage/html/utills/index-sort-f.html | 93 ++++ coverage/html/utills/index-sort-l.html | 93 ++++ coverage/html/utills/index.html | 93 ++++ .../platform_wrapper.dart.func-sort-c.html | 72 +++ .../utills/platform_wrapper.dart.func.html | 72 +++ .../utills/platform_wrapper.dart.gcov.html | 98 ++++ coverage/lcov.info | 206 +++++++ lib/src/cupertino_swipe_refresh.dart | 4 - lib/src/material_swipe_refresh.dart | 4 - lib/src/swipe_refresh.dart | 78 +-- lib/src/swipe_refresh_base.dart | 16 +- test/swipe_refresh_adaptive_test.dart | 3 - ...r.dart => swipe_refresh_builder_test.dart} | 11 +- test/swipe_refresh_cupertino_test.dart | 243 ++++++-- test/swipe_refresh_material_test.dart | 164 ++++-- 47 files changed, 4446 insertions(+), 125 deletions(-) create mode 100644 coverage/html/amber.png create mode 100644 coverage/html/emerald.png create mode 100644 coverage/html/gcov.css create mode 100644 coverage/html/glass.png create mode 100644 coverage/html/index-sort-f.html create mode 100644 coverage/html/index-sort-l.html create mode 100644 coverage/html/index.html create mode 100644 coverage/html/ruby.png create mode 100644 coverage/html/snow.png create mode 100644 coverage/html/src/cupertino_swipe_refresh.dart.func-sort-c.html create mode 100644 coverage/html/src/cupertino_swipe_refresh.dart.func.html create mode 100644 coverage/html/src/cupertino_swipe_refresh.dart.gcov.html create mode 100644 coverage/html/src/index-sort-f.html create mode 100644 coverage/html/src/index-sort-l.html create mode 100644 coverage/html/src/index.html create mode 100644 coverage/html/src/material_swipe_refresh.dart.func-sort-c.html create mode 100644 coverage/html/src/material_swipe_refresh.dart.func.html create mode 100644 coverage/html/src/material_swipe_refresh.dart.gcov.html create mode 100644 coverage/html/src/swipe_refresh.dart.func-sort-c.html create mode 100644 coverage/html/src/swipe_refresh.dart.func.html create mode 100644 coverage/html/src/swipe_refresh.dart.gcov.html create mode 100644 coverage/html/src/swipe_refresh_base.dart.func-sort-c.html create mode 100644 coverage/html/src/swipe_refresh_base.dart.func.html create mode 100644 coverage/html/src/swipe_refresh_base.dart.gcov.html create mode 100644 coverage/html/src/swipe_refresh_state.dart.func-sort-c.html create mode 100644 coverage/html/src/swipe_refresh_state.dart.func.html create mode 100644 coverage/html/src/swipe_refresh_state.dart.gcov.html create mode 100644 coverage/html/src/swipe_refresh_style.dart.func-sort-c.html create mode 100644 coverage/html/src/swipe_refresh_style.dart.func.html create mode 100644 coverage/html/src/swipe_refresh_style.dart.gcov.html create mode 100644 coverage/html/updown.png create mode 100644 coverage/html/utills/index-sort-f.html create mode 100644 coverage/html/utills/index-sort-l.html create mode 100644 coverage/html/utills/index.html create mode 100644 coverage/html/utills/platform_wrapper.dart.func-sort-c.html create mode 100644 coverage/html/utills/platform_wrapper.dart.func.html create mode 100644 coverage/html/utills/platform_wrapper.dart.gcov.html create mode 100644 coverage/lcov.info rename test/{swipe_refresh_with_builder.dart => swipe_refresh_builder_test.dart} (89%) diff --git a/README.md b/README.md index 162ac6b..732c400 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Swipe Refresh -[![Build Status](https://shields.io/github/workflow/status/surfstudio/SurfGear/build?logo=github&logoColor=white)](https://github.com/surfstudio/flutter-swipe-refresh) -[![Coverage Status](https://img.shields.io/codecov/c/github/surfstudio/SurfGear?flag=swipe_refresh&logo=codecov&logoColor=white)](https://app.codecov.io/gh/surfstudio/flutter-swipe-refresh) +[![Build Status](https://shields.io/github/workflow/status/surfstudio/flutter-swipe-refresh/build?logo=github&logoColor=white)](https://github.com/surfstudio/flutter-swipe-refresh) +[![Coverage Status](https://img.shields.io/codecov/c/github/surfstudio/flutter-swipe-refresh?flag=swipe_refresh&logo=codecov&logoColor=white)](https://app.codecov.io/gh/surfstudio/flutter-swipe-refresh) [![Pub Version](https://img.shields.io/pub/v/swipe_refresh?logo=dart&logoColor=white)](https://pub.dev/packages/swipe_refresh) [![Pub Likes](https://badgen.net/pub/likes/swipe_refresh)](https://pub.dev/packages/swipe_refresh) [![Pub popularity](https://badgen.net/pub/popularity/swipe_refresh)](https://pub.dev/packages/swipe_refresh/score) diff --git a/coverage/html/amber.png b/coverage/html/amber.png new file mode 100644 index 0000000000000000000000000000000000000000..2cab170d8359081983a4e343848dfe06bc490f12 GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga>?NMQuI!iC1^G2tW}LqE04T&+ z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O`1M1^9%x{(levWG?NMQuI!iC1^Jb!lvI6;R0X`wF(yt=9xVZRt1vCRixIA4P dLn>}1Cji+@42)0J?}79&c)I$ztaD0e0sy@GAL0N2 literal 0 HcmV?d00001 diff --git a/coverage/html/gcov.css b/coverage/html/gcov.css new file mode 100644 index 0000000..bfd0a83 --- /dev/null +++ b/coverage/html/gcov.css @@ -0,0 +1,519 @@ +/* All views: initial background and text color */ +body +{ + color: #000000; + background-color: #FFFFFF; +} + +/* All views: standard link format*/ +a:link +{ + color: #284FA8; + text-decoration: underline; +} + +/* All views: standard link - visited format */ +a:visited +{ + color: #00CB40; + text-decoration: underline; +} + +/* All views: standard link - activated format */ +a:active +{ + color: #FF0040; + text-decoration: underline; +} + +/* All views: main title format */ +td.title +{ + text-align: center; + padding-bottom: 10px; + font-family: sans-serif; + font-size: 20pt; + font-style: italic; + font-weight: bold; +} + +/* All views: header item format */ +td.headerItem +{ + text-align: right; + padding-right: 6px; + font-family: sans-serif; + font-weight: bold; + vertical-align: top; + white-space: nowrap; +} + +/* All views: header item value format */ +td.headerValue +{ + text-align: left; + color: #284FA8; + font-family: sans-serif; + font-weight: bold; + white-space: nowrap; +} + +/* All views: header item coverage table heading */ +td.headerCovTableHead +{ + text-align: center; + padding-right: 6px; + padding-left: 6px; + padding-bottom: 0px; + font-family: sans-serif; + font-size: 80%; + white-space: nowrap; +} + +/* All views: header item coverage table entry */ +td.headerCovTableEntry +{ + text-align: right; + color: #284FA8; + font-family: sans-serif; + font-weight: bold; + white-space: nowrap; + padding-left: 12px; + padding-right: 4px; + background-color: #DAE7FE; +} + +/* All views: header item coverage table entry for high coverage rate */ +td.headerCovTableEntryHi +{ + text-align: right; + color: #000000; + font-family: sans-serif; + font-weight: bold; + white-space: nowrap; + padding-left: 12px; + padding-right: 4px; + background-color: #A7FC9D; +} + +/* All views: header item coverage table entry for medium coverage rate */ +td.headerCovTableEntryMed +{ + text-align: right; + color: #000000; + font-family: sans-serif; + font-weight: bold; + white-space: nowrap; + padding-left: 12px; + padding-right: 4px; + background-color: #FFEA20; +} + +/* All views: header item coverage table entry for ow coverage rate */ +td.headerCovTableEntryLo +{ + text-align: right; + color: #000000; + font-family: sans-serif; + font-weight: bold; + white-space: nowrap; + padding-left: 12px; + padding-right: 4px; + background-color: #FF0000; +} + +/* All views: header legend value for legend entry */ +td.headerValueLeg +{ + text-align: left; + color: #000000; + font-family: sans-serif; + font-size: 80%; + white-space: nowrap; + padding-top: 4px; +} + +/* All views: color of horizontal ruler */ +td.ruler +{ + background-color: #6688D4; +} + +/* All views: version string format */ +td.versionInfo +{ + text-align: center; + padding-top: 2px; + font-family: sans-serif; + font-style: italic; +} + +/* Directory view/File view (all)/Test case descriptions: + table headline format */ +td.tableHead +{ + text-align: center; + color: #FFFFFF; + background-color: #6688D4; + font-family: sans-serif; + font-size: 120%; + font-weight: bold; + white-space: nowrap; + padding-left: 4px; + padding-right: 4px; +} + +span.tableHeadSort +{ + padding-right: 4px; +} + +/* Directory view/File view (all): filename entry format */ +td.coverFile +{ + text-align: left; + padding-left: 10px; + padding-right: 20px; + color: #284FA8; + background-color: #DAE7FE; + font-family: monospace; +} + +/* Directory view/File view (all): bar-graph entry format*/ +td.coverBar +{ + padding-left: 10px; + padding-right: 10px; + background-color: #DAE7FE; +} + +/* Directory view/File view (all): bar-graph outline color */ +td.coverBarOutline +{ + background-color: #000000; +} + +/* Directory view/File view (all): percentage entry for files with + high coverage rate */ +td.coverPerHi +{ + text-align: right; + padding-left: 10px; + padding-right: 10px; + background-color: #A7FC9D; + font-weight: bold; + font-family: sans-serif; +} + +/* Directory view/File view (all): line count entry for files with + high coverage rate */ +td.coverNumHi +{ + text-align: right; + padding-left: 10px; + padding-right: 10px; + background-color: #A7FC9D; + white-space: nowrap; + font-family: sans-serif; +} + +/* Directory view/File view (all): percentage entry for files with + medium coverage rate */ +td.coverPerMed +{ + text-align: right; + padding-left: 10px; + padding-right: 10px; + background-color: #FFEA20; + font-weight: bold; + font-family: sans-serif; +} + +/* Directory view/File view (all): line count entry for files with + medium coverage rate */ +td.coverNumMed +{ + text-align: right; + padding-left: 10px; + padding-right: 10px; + background-color: #FFEA20; + white-space: nowrap; + font-family: sans-serif; +} + +/* Directory view/File view (all): percentage entry for files with + low coverage rate */ +td.coverPerLo +{ + text-align: right; + padding-left: 10px; + padding-right: 10px; + background-color: #FF0000; + font-weight: bold; + font-family: sans-serif; +} + +/* Directory view/File view (all): line count entry for files with + low coverage rate */ +td.coverNumLo +{ + text-align: right; + padding-left: 10px; + padding-right: 10px; + background-color: #FF0000; + white-space: nowrap; + font-family: sans-serif; +} + +/* File view (all): "show/hide details" link format */ +a.detail:link +{ + color: #B8D0FF; + font-size:80%; +} + +/* File view (all): "show/hide details" link - visited format */ +a.detail:visited +{ + color: #B8D0FF; + font-size:80%; +} + +/* File view (all): "show/hide details" link - activated format */ +a.detail:active +{ + color: #FFFFFF; + font-size:80%; +} + +/* File view (detail): test name entry */ +td.testName +{ + text-align: right; + padding-right: 10px; + background-color: #DAE7FE; + font-family: sans-serif; +} + +/* File view (detail): test percentage entry */ +td.testPer +{ + text-align: right; + padding-left: 10px; + padding-right: 10px; + background-color: #DAE7FE; + font-family: sans-serif; +} + +/* File view (detail): test lines count entry */ +td.testNum +{ + text-align: right; + padding-left: 10px; + padding-right: 10px; + background-color: #DAE7FE; + font-family: sans-serif; +} + +/* Test case descriptions: test name format*/ +dt +{ + font-family: sans-serif; + font-weight: bold; +} + +/* Test case descriptions: description table body */ +td.testDescription +{ + padding-top: 10px; + padding-left: 30px; + padding-bottom: 10px; + padding-right: 30px; + background-color: #DAE7FE; +} + +/* Source code view: function entry */ +td.coverFn +{ + text-align: left; + padding-left: 10px; + padding-right: 20px; + color: #284FA8; + background-color: #DAE7FE; + font-family: monospace; +} + +/* Source code view: function entry zero count*/ +td.coverFnLo +{ + text-align: right; + padding-left: 10px; + padding-right: 10px; + background-color: #FF0000; + font-weight: bold; + font-family: sans-serif; +} + +/* Source code view: function entry nonzero count*/ +td.coverFnHi +{ + text-align: right; + padding-left: 10px; + padding-right: 10px; + background-color: #DAE7FE; + font-weight: bold; + font-family: sans-serif; +} + +/* Source code view: source code format */ +pre.source +{ + font-family: monospace; + white-space: pre; + margin-top: 2px; +} + +/* Source code view: line number format */ +span.lineNum +{ + background-color: #EFE383; +} + +/* Source code view: format for lines which were executed */ +td.lineCov, +span.lineCov +{ + background-color: #CAD7FE; +} + +/* Source code view: format for Cov legend */ +span.coverLegendCov +{ + padding-left: 10px; + padding-right: 10px; + padding-bottom: 2px; + background-color: #CAD7FE; +} + +/* Source code view: format for lines which were not executed */ +td.lineNoCov, +span.lineNoCov +{ + background-color: #FF6230; +} + +/* Source code view: format for NoCov legend */ +span.coverLegendNoCov +{ + padding-left: 10px; + padding-right: 10px; + padding-bottom: 2px; + background-color: #FF6230; +} + +/* Source code view (function table): standard link - visited format */ +td.lineNoCov > a:visited, +td.lineCov > a:visited +{ + color: black; + text-decoration: underline; +} + +/* Source code view: format for lines which were executed only in a + previous version */ +span.lineDiffCov +{ + background-color: #B5F7AF; +} + +/* Source code view: format for branches which were executed + * and taken */ +span.branchCov +{ + background-color: #CAD7FE; +} + +/* Source code view: format for branches which were executed + * but not taken */ +span.branchNoCov +{ + background-color: #FF6230; +} + +/* Source code view: format for branches which were not executed */ +span.branchNoExec +{ + background-color: #FF6230; +} + +/* Source code view: format for the source code heading line */ +pre.sourceHeading +{ + white-space: pre; + font-family: monospace; + font-weight: bold; + margin: 0px; +} + +/* All views: header legend value for low rate */ +td.headerValueLegL +{ + font-family: sans-serif; + text-align: center; + white-space: nowrap; + padding-left: 4px; + padding-right: 2px; + background-color: #FF0000; + font-size: 80%; +} + +/* All views: header legend value for med rate */ +td.headerValueLegM +{ + font-family: sans-serif; + text-align: center; + white-space: nowrap; + padding-left: 2px; + padding-right: 2px; + background-color: #FFEA20; + font-size: 80%; +} + +/* All views: header legend value for hi rate */ +td.headerValueLegH +{ + font-family: sans-serif; + text-align: center; + white-space: nowrap; + padding-left: 2px; + padding-right: 4px; + background-color: #A7FC9D; + font-size: 80%; +} + +/* All views except source code view: legend format for low coverage */ +span.coverLegendCovLo +{ + padding-left: 10px; + padding-right: 10px; + padding-top: 2px; + background-color: #FF0000; +} + +/* All views except source code view: legend format for med coverage */ +span.coverLegendCovMed +{ + padding-left: 10px; + padding-right: 10px; + padding-top: 2px; + background-color: #FFEA20; +} + +/* All views except source code view: legend format for hi coverage */ +span.coverLegendCovHi +{ + padding-left: 10px; + padding-right: 10px; + padding-top: 2px; + background-color: #A7FC9D; +} diff --git a/coverage/html/glass.png b/coverage/html/glass.png new file mode 100644 index 0000000000000000000000000000000000000000..e1abc00680a3093c49fdb775ae6bdb6764c95af2 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)gaEa{HEjtmSN`?>!lvI6;R0X`wF z|Ns97GD8ntt^-nxB|(0{3=Yq3q=7g|-tI089jvk*Kn`btM`SSr1Gf+eGhVt|_XjA* zUgGKN%6^Gmn4d%Ph(nkFP>9RZ#WAE}PI3Z}&BVayv3^M*kj3EX>gTe~DWM4f=_Dpv literal 0 HcmV?d00001 diff --git a/coverage/html/index-sort-f.html b/coverage/html/index-sort-f.html new file mode 100644 index 0000000..5902fd2 --- /dev/null +++ b/coverage/html/index-sort-f.html @@ -0,0 +1,103 @@ + + + + + + + LCOV - lcov.info + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top levelHitTotalCoverage
Test:lcov.infoLines:178178100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Directory Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
src +
100.0%
+ 		100.0 %176 / 176-0 / 0
utills +
100.0%
+ 		100.0 %2 / 2-0 / 0
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/index-sort-l.html b/coverage/html/index-sort-l.html new file mode 100644 index 0000000..82bc632 --- /dev/null +++ b/coverage/html/index-sort-l.html @@ -0,0 +1,103 @@ + + + + + + + LCOV - lcov.info + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top levelHitTotalCoverage
Test:lcov.infoLines:178178100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Directory Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
utills +
100.0%
+ 		100.0 %2 / 2-0 / 0
src +
100.0%
+ 		100.0 %176 / 176-0 / 0
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/index.html b/coverage/html/index.html new file mode 100644 index 0000000..b9d1145 --- /dev/null +++ b/coverage/html/index.html @@ -0,0 +1,103 @@ + + + + + + + LCOV - lcov.info + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top levelHitTotalCoverage
Test:lcov.infoLines:178178100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Directory Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
src +
100.0%
+ 		100.0 %176 / 176-0 / 0
utills +
100.0%
+ 		100.0 %2 / 2-0 / 0
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/ruby.png b/coverage/html/ruby.png new file mode 100644 index 0000000000000000000000000000000000000000..991b6d4ec9e78be165e3ef757eed1aada287364d GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga>?NMQuI!iC1^FceV#7`HfI^%F z9+AZi4BSE>%y{W;-5;PJOS+@4BLl<6e(pbstUx|nfKQ0)e^Y%R^MdiLxj>4`)5S5Q b;#P73kj=!v_*DHKNFRfztDnm{r-UW|iOwIS literal 0 HcmV?d00001 diff --git a/coverage/html/snow.png b/coverage/html/snow.png new file mode 100644 index 0000000000000000000000000000000000000000..2cdae107fceec6e7f02ac7acb4a34a82a540caa5 GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga>?NMQuI!iC1^MM!lvI6;R0X`wF|Ns97GD8ntt^-nBo-U3d c6}OTTfNUlP#;5A{K>8RwUHx3vIVCg!071?oo&W#< literal 0 HcmV?d00001 diff --git a/coverage/html/src/cupertino_swipe_refresh.dart.func-sort-c.html b/coverage/html/src/cupertino_swipe_refresh.dart.func-sort-c.html new file mode 100644 index 0000000..56710b5 --- /dev/null +++ b/coverage/html/src/cupertino_swipe_refresh.dart.func-sort-c.html @@ -0,0 +1,72 @@ + + + + + + + LCOV - lcov.info - src\cupertino_swipe_refresh.dart - functions + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\cupertino_swipe_refresh.dart - cupertino_swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:4646100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + +

Function Name Sort by function nameHit count Sort by hit count
+
+
+ + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/cupertino_swipe_refresh.dart.func.html b/coverage/html/src/cupertino_swipe_refresh.dart.func.html new file mode 100644 index 0000000..983353d --- /dev/null +++ b/coverage/html/src/cupertino_swipe_refresh.dart.func.html @@ -0,0 +1,72 @@ + + + + + + + LCOV - lcov.info - src\cupertino_swipe_refresh.dart - functions + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\cupertino_swipe_refresh.dart - cupertino_swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:4646100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + +

Function Name Sort by function nameHit count Sort by hit count
+
+
+ + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/cupertino_swipe_refresh.dart.gcov.html b/coverage/html/src/cupertino_swipe_refresh.dart.gcov.html new file mode 100644 index 0000000..fc061e1 --- /dev/null +++ b/coverage/html/src/cupertino_swipe_refresh.dart.gcov.html @@ -0,0 +1,236 @@ + + + + + + + LCOV - lcov.info - src\cupertino_swipe_refresh.dart + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\cupertino_swipe_refresh.dart - cupertino_swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:4646100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ + + + + + + + +

+
          Line data    Source code
+
+       1             : // Copyright (c) 2019-present,  SurfStudio LLC
+       2             : //
+       3             : // Licensed under the Apache License, Version 2.0 (the "License");
+       4             : // you may not use this file except in compliance with the License.
+       5             : // You may obtain a copy of the License at
+       6             : //
+       7             : //     http://www.apache.org/licenses/LICENSE-2.0
+       8             : //
+       9             : // Unless required by applicable law or agreed to in writing, software
+      10             : // distributed under the License is distributed on an "AS IS" BASIS,
+      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      12             : // See the License for the specific language governing permissions and
+      13             : // limitations under the License.
+      14             : 
+      15             : import 'dart:async';
+      16             : 
+      17             : import 'package:flutter/cupertino.dart';
+      18             : import 'package:swipe_refresh/src/swipe_refresh_base.dart';
+      19             : import 'package:swipe_refresh/src/swipe_refresh_state.dart';
+      20             : 
+      21             : /// Refresh indicator widget with Cupertino style.
+      22             : class CupertinoSwipeRefresh extends SwipeRefreshBase {
+      23             :   static const double defaultRefreshTriggerPullDistance = 100.0;
+      24             :   static const double defaultRefreshIndicatorExtent = 60.0;
+      25             : 
+      26             :   final double refreshTriggerPullDistance;
+      27             :   final double refreshIndicatorExtent;
+      28             :   final RefreshControlIndicatorBuilder indicatorBuilder;
+      29             : 
+      30           3 :   const CupertinoSwipeRefresh({
+      31             :     required Stream<SwipeRefreshState> stateStream,
+      32             :     required VoidCallback onRefresh,
+      33             :     Key? key,
+      34             :     SliverChildDelegate? childrenDelegate,
+      35             :     List<Widget>? children,
+      36             :     SwipeRefreshState? initState,
+      37             :     EdgeInsets? padding,
+      38             :     ScrollController? scrollController,
+      39             :     bool shrinkWrap = false,
+      40             :     this.refreshTriggerPullDistance = defaultRefreshTriggerPullDistance,
+      41             :     this.refreshIndicatorExtent = defaultRefreshIndicatorExtent,
+      42             :     this.indicatorBuilder = CupertinoSliverRefreshControl.buildRefreshIndicator,
+      43             :     ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior,
+      44             :     ScrollPhysics? physics,
+      45           3 :   }) : super(
+      46             :           key: key,
+      47             :           children: children,
+      48             :           childrenDelegate: childrenDelegate,
+      49             :           stateStream: stateStream,
+      50             :           initState: initState,
+      51             :           onRefresh: onRefresh,
+      52             :           padding: padding,
+      53             :           scrollController: scrollController,
+      54             :           shrinkWrap: shrinkWrap,
+      55             :           keyboardDismissBehavior: keyboardDismissBehavior,
+      56             :           physics: physics,
+      57             :         );
+      58             : 
+      59           3 :   @override
+      60             :   // ignore: no_logic_in_create_state
+      61           3 :   SwipeRefreshBaseState createState() => _CupertinoSwipeRefreshState(
+      62           3 :         scrollController,
+      63             :       );
+      64             : }
+      65             : 
+      66             : class _CupertinoSwipeRefreshState
+      67             :     extends SwipeRefreshBaseState<CupertinoSwipeRefresh> {
+      68             :   final ScrollController _scrollController;
+      69             : 
+      70           3 :   _CupertinoSwipeRefreshState(
+      71             :     ScrollController? scrollController,
+      72           3 :   ) : _scrollController = scrollController ?? ScrollController();
+      73             : 
+      74           3 :   @override
+      75             :   Widget buildRefresher(
+      76             :     Key key,
+      77             :     List<Widget> children,
+      78             :     Future<void> Function() onRefresh,
+      79             :   ) {
+      80           3 :     return CustomScrollView(
+      81           6 :       shrinkWrap: widget.shrinkWrap,
+      82           3 :       controller: _scrollController,
+      83           6 :       keyboardDismissBehavior: widget.keyboardDismissBehavior ??
+      84             :           ScrollViewKeyboardDismissBehavior.onDrag,
+      85           6 :       physics: widget.physics == null
+      86             :           ? const BouncingScrollPhysics(
+      87             :               parent: AlwaysScrollableScrollPhysics(),
+      88             :             )
+      89           3 :           : AlwaysScrollableScrollPhysics(parent: widget.physics),
+      90           3 :       slivers: <Widget>[
+      91           3 :         CupertinoSliverRefreshControl(
+      92             :           key: key,
+      93             :           onRefresh: onRefresh,
+      94           6 :           refreshTriggerPullDistance: widget.refreshTriggerPullDistance,
+      95           6 :           refreshIndicatorExtent: widget.refreshIndicatorExtent,
+      96           6 :           builder: widget.indicatorBuilder,
+      97             :         ),
+      98           3 :         SliverSafeArea(
+      99           6 :           bottom: widget.padding == null,
+     100           6 :           left: widget.padding == null,
+     101           6 :           right: widget.padding == null,
+     102           6 :           top: widget.padding == null,
+     103           3 :           sliver: _ListChildrenWidget(
+     104             :             children: children,
+     105           6 :             padding: widget.padding,
+     106           6 :             childrenDelegate: widget.childrenDelegate,
+     107             :           ),
+     108             :         ),
+     109             :       ],
+     110             :     );
+     111             :   }
+     112             : 
+     113           1 :   @override
+     114             :   void onUpdateState(SwipeRefreshState state) {
+     115             :    // if (state == SwipeRefreshState.loading) {
+     116             :    //   _scrollController.jumpTo(-(widget.refreshIndicatorExtent + 5));
+     117             :    // }
+     118             : 
+     119           1 :     if (state == SwipeRefreshState.hidden) {
+     120           1 :       if (completer != null) {
+     121           2 :         completer!.complete();
+     122           1 :         completer = null;
+     123             :       }
+     124             :     }
+     125             :   }
+     126             : }
+     127             : 
+     128             : class _ListChildrenWidget extends StatelessWidget {
+     129             :   final List<Widget> children;
+     130             :   final EdgeInsets? padding;
+     131             :   final SliverChildDelegate? childrenDelegate;
+     132             : 
+     133           3 :   const _ListChildrenWidget({
+     134             :     required this.children,
+     135             :     Key? key,
+     136             :     this.padding,
+     137             :     this.childrenDelegate,
+     138           3 :   }) : super(key: key);
+     139             : 
+     140           3 :   @override
+     141             :   Widget build(BuildContext context) {
+     142           3 :     if (padding != null) {
+     143           1 :       return SliverPadding(
+     144           1 :         padding: padding!,
+     145           1 :         sliver: SliverList(
+     146           1 :           delegate: childrenDelegate ??
+     147           1 :               SliverChildListDelegate(
+     148           1 :                 children,
+     149             :               ),
+     150             :         ),
+     151             :       );
+     152             :     }
+     153           3 :     return SliverList(
+     154           3 :       delegate: childrenDelegate ??
+     155           2 :           SliverChildListDelegate(
+     156           2 :             children,
+     157             :           ),
+     158             :     );
+     159             :   }
+     160             : }
+
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/index-sort-f.html b/coverage/html/src/index-sort-f.html new file mode 100644 index 0000000..2bb7908 --- /dev/null +++ b/coverage/html/src/index-sort-f.html @@ -0,0 +1,143 @@ + + + + + + + LCOV - lcov.info - src + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - srcHitTotalCoverage
Test:lcov.infoLines:176176100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Filename Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
swipe_refresh_state.dart +
100.0%
+ 		100.0 %1 / 1-0 / 0
material_swipe_refresh.dart +
100.0%
+ 		100.0 %27 / 27-0 / 0
swipe_refresh_base.dart +
100.0%
+ 		100.0 %24 / 24-0 / 0
swipe_refresh_style.dart +
100.0%
+ 		100.0 %1 / 1-0 / 0
swipe_refresh.dart +
100.0%
+ 		100.0 %77 / 77-0 / 0
cupertino_swipe_refresh.dart +
100.0%
+ 		100.0 %46 / 46-0 / 0
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/index-sort-l.html b/coverage/html/src/index-sort-l.html new file mode 100644 index 0000000..615dbb3 --- /dev/null +++ b/coverage/html/src/index-sort-l.html @@ -0,0 +1,143 @@ + + + + + + + LCOV - lcov.info - src + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - srcHitTotalCoverage
Test:lcov.infoLines:176176100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Filename Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
swipe_refresh_state.dart +
100.0%
+ 		100.0 %1 / 1-0 / 0
swipe_refresh_style.dart +
100.0%
+ 		100.0 %1 / 1-0 / 0
swipe_refresh_base.dart +
100.0%
+ 		100.0 %24 / 24-0 / 0
material_swipe_refresh.dart +
100.0%
+ 		100.0 %27 / 27-0 / 0
cupertino_swipe_refresh.dart +
100.0%
+ 		100.0 %46 / 46-0 / 0
swipe_refresh.dart +
100.0%
+ 		100.0 %77 / 77-0 / 0
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/index.html b/coverage/html/src/index.html new file mode 100644 index 0000000..6aeea70 --- /dev/null +++ b/coverage/html/src/index.html @@ -0,0 +1,143 @@ + + + + + + + LCOV - lcov.info - src + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - srcHitTotalCoverage
Test:lcov.infoLines:176176100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Filename Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
cupertino_swipe_refresh.dart +
100.0%
+ 		100.0 %46 / 46-0 / 0
material_swipe_refresh.dart +
100.0%
+ 		100.0 %27 / 27-0 / 0
swipe_refresh.dart +
100.0%
+ 		100.0 %77 / 77-0 / 0
swipe_refresh_base.dart +
100.0%
+ 		100.0 %24 / 24-0 / 0
swipe_refresh_state.dart +
100.0%
+ 		100.0 %1 / 1-0 / 0
swipe_refresh_style.dart +
100.0%
+ 		100.0 %1 / 1-0 / 0
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/material_swipe_refresh.dart.func-sort-c.html b/coverage/html/src/material_swipe_refresh.dart.func-sort-c.html new file mode 100644 index 0000000..00eefdb --- /dev/null +++ b/coverage/html/src/material_swipe_refresh.dart.func-sort-c.html @@ -0,0 +1,72 @@ + + + + + + + LCOV - lcov.info - src\material_swipe_refresh.dart - functions + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\material_swipe_refresh.dart - material_swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:2727100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + +

Function Name Sort by function nameHit count Sort by hit count
+
+
+ + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/material_swipe_refresh.dart.func.html b/coverage/html/src/material_swipe_refresh.dart.func.html new file mode 100644 index 0000000..1a99998 --- /dev/null +++ b/coverage/html/src/material_swipe_refresh.dart.func.html @@ -0,0 +1,72 @@ + + + + + + + LCOV - lcov.info - src\material_swipe_refresh.dart - functions + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\material_swipe_refresh.dart - material_swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:2727100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + +

Function Name Sort by function nameHit count Sort by hit count
+
+
+ + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/material_swipe_refresh.dart.gcov.html b/coverage/html/src/material_swipe_refresh.dart.gcov.html new file mode 100644 index 0000000..699dcd1 --- /dev/null +++ b/coverage/html/src/material_swipe_refresh.dart.gcov.html @@ -0,0 +1,180 @@ + + + + + + + LCOV - lcov.info - src\material_swipe_refresh.dart + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\material_swipe_refresh.dart - material_swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:2727100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ + + + + + + + +

+
          Line data    Source code
+
+       1             : // Copyright (c) 2019-present,  SurfStudio LLC
+       2             : //
+       3             : // Licensed under the Apache License, Version 2.0 (the "License");
+       4             : // you may not use this file except in compliance with the License.
+       5             : // You may obtain a copy of the License at
+       6             : //
+       7             : //     http://www.apache.org/licenses/LICENSE-2.0
+       8             : //
+       9             : // Unless required by applicable law or agreed to in writing, software
+      10             : // distributed under the License is distributed on an "AS IS" BASIS,
+      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      12             : // See the License for the specific language governing permissions and
+      13             : // limitations under the License.
+      14             : 
+      15             : import 'dart:async';
+      16             : 
+      17             : import 'package:flutter/material.dart';
+      18             : import 'package:flutter/widgets.dart';
+      19             : import 'package:swipe_refresh/src/swipe_refresh_base.dart';
+      20             : import 'package:swipe_refresh/src/swipe_refresh_state.dart';
+      21             : 
+      22             : /// Refresh indicator widget with Material Design style.
+      23             : class MaterialSwipeRefresh extends SwipeRefreshBase {
+      24             :   final Color? indicatorColor;
+      25             :   final Color backgroundColor;
+      26             : 
+      27           2 :   const MaterialSwipeRefresh({
+      28             :     required Stream<SwipeRefreshState> stateStream,
+      29             :     required VoidCallback onRefresh,
+      30             :     Key? key,
+      31             :     this.indicatorColor,
+      32             :     List<Widget>? children,
+      33             :     SliverChildDelegate? childrenDelegate,
+      34             :     SwipeRefreshState? initState,
+      35             :     Color? backgroundColor,
+      36             :     ScrollController? scrollController,
+      37             :     EdgeInsets? padding,
+      38             :     bool shrinkWrap = false,
+      39             :     ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior,
+      40             :     ScrollPhysics? physics,
+      41             :   })  : backgroundColor = backgroundColor ?? const Color(0xFFFFFFFF),
+      42           2 :         super(
+      43             :           key: key,
+      44             :           children: children,
+      45             :           childrenDelegate: childrenDelegate,
+      46             :           stateStream: stateStream,
+      47             :           initState: initState,
+      48             :           onRefresh: onRefresh,
+      49             :           scrollController: scrollController,
+      50             :           padding: padding,
+      51             :           shrinkWrap: shrinkWrap,
+      52             :           keyboardDismissBehavior: keyboardDismissBehavior,
+      53             :           physics: physics,
+      54             :         );
+      55             : 
+      56           2 :   @override
+      57           2 :   _MaterialSwipeRefreshState createState() => _MaterialSwipeRefreshState();
+      58             : }
+      59             : 
+      60             : class _MaterialSwipeRefreshState
+      61             :     extends SwipeRefreshBaseState<MaterialSwipeRefresh> {
+      62           2 :   @override
+      63             :   Widget buildRefresher(
+      64             :     Key key,
+      65             :     List<Widget> children,
+      66             :     Future<void> Function() onRefresh,
+      67             :   ) {
+      68           2 :     return RefreshIndicator(
+      69             :       key: key,
+      70             :       onRefresh: onRefresh,
+      71           4 :       color: widget.indicatorColor,
+      72           4 :       backgroundColor: widget.backgroundColor,
+      73           4 :       child: widget.childrenDelegate == null
+      74           2 :           ? ListView(
+      75           4 :               shrinkWrap: widget.shrinkWrap,
+      76           4 :               padding: widget.padding,
+      77           6 :               controller: widget.scrollController ?? ScrollController(),
+      78           6 :               physics: AlwaysScrollableScrollPhysics(parent: widget.physics),
+      79           4 :               keyboardDismissBehavior: widget.keyboardDismissBehavior ??
+      80             :                   ScrollViewKeyboardDismissBehavior.manual,
+      81             :               children: children,
+      82             :             )
+      83           1 :           : ListView.custom(
+      84           2 :               shrinkWrap: widget.shrinkWrap,
+      85           2 :               padding: widget.padding,
+      86           2 :               childrenDelegate: widget.childrenDelegate!,
+      87           2 :               controller: widget.scrollController ?? ScrollController(),
+      88           2 :               keyboardDismissBehavior: widget.keyboardDismissBehavior ??
+      89             :                   ScrollViewKeyboardDismissBehavior.manual,
+      90           3 :               physics: AlwaysScrollableScrollPhysics(parent: widget.physics),
+      91             :             ),
+      92             :     );
+      93             :   }
+      94             : 
+      95           1 :   @override
+      96             :   void onUpdateState(SwipeRefreshState state) {
+      97           1 :     if (state == SwipeRefreshState.hidden) {
+      98           1 :       if (completer != null) {
+      99           2 :         completer!.complete();
+     100           1 :         completer = null;
+     101             :       }
+     102             :     }
+     103             :   }
+     104             : }
+
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/swipe_refresh.dart.func-sort-c.html b/coverage/html/src/swipe_refresh.dart.func-sort-c.html new file mode 100644 index 0000000..e3331db --- /dev/null +++ b/coverage/html/src/swipe_refresh.dart.func-sort-c.html @@ -0,0 +1,72 @@ + + + + + + + LCOV - lcov.info - src\swipe_refresh.dart - functions + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\swipe_refresh.dart - swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:7777100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + +

Function Name Sort by function nameHit count Sort by hit count
+
+
+ + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/swipe_refresh.dart.func.html b/coverage/html/src/swipe_refresh.dart.func.html new file mode 100644 index 0000000..42d1e03 --- /dev/null +++ b/coverage/html/src/swipe_refresh.dart.func.html @@ -0,0 +1,72 @@ + + + + + + + LCOV - lcov.info - src\swipe_refresh.dart - functions + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\swipe_refresh.dart - swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:7777100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + +

Function Name Sort by function nameHit count Sort by hit count
+
+
+ + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/swipe_refresh.dart.gcov.html b/coverage/html/src/swipe_refresh.dart.gcov.html new file mode 100644 index 0000000..69b6b42 --- /dev/null +++ b/coverage/html/src/swipe_refresh.dart.gcov.html @@ -0,0 +1,380 @@ + + + + + + + LCOV - lcov.info - src\swipe_refresh.dart + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\swipe_refresh.dart - swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:7777100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ + + + + + + + +

+
          Line data    Source code
+
+       1             : // Copyright (c) 2019-present,  SurfStudio LLC
+       2             : //
+       3             : // Licensed under the Apache License, Version 2.0 (the "License");
+       4             : // you may not use this file except in compliance with the License.
+       5             : // You may obtain a copy of the License at
+       6             : //
+       7             : //     http://www.apache.org/licenses/LICENSE-2.0
+       8             : //
+       9             : // Unless required by applicable law or agreed to in writing, software
+      10             : // distributed under the License is distributed on an "AS IS" BASIS,
+      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      12             : // See the License for the specific language governing permissions and
+      13             : // limitations under the License.
+      14             : 
+      15             : import 'package:flutter/cupertino.dart';
+      16             : import 'package:flutter/foundation.dart';
+      17             : import 'package:swipe_refresh/src/cupertino_swipe_refresh.dart';
+      18             : import 'package:swipe_refresh/src/material_swipe_refresh.dart';
+      19             : import 'package:swipe_refresh/src/swipe_refresh_state.dart';
+      20             : import 'package:swipe_refresh/src/swipe_refresh_style.dart';
+      21             : import 'package:swipe_refresh/utills/platform_wrapper.dart';
+      22             : 
+      23             : /// Refresh indicator widget.
+      24             : ///
+      25             : /// Params for Material Design style:
+      26             : /// [indicatorColor], [backgroundColor].
+      27             : ///
+      28             : /// Params for Cupertino style:
+      29             : /// [refreshTriggerPullDistance], [refreshIndicatorExtent], [indicatorBuilder].
+      30             : class SwipeRefresh extends StatelessWidget {
+      31             :   final List<Widget>? children;
+      32             :   final VoidCallback onRefresh;
+      33             :   final SwipeRefreshState? initState;
+      34             :   final Stream<SwipeRefreshState> stateStream;
+      35             :   final Color? indicatorColor;
+      36             :   final Color backgroundColor;
+      37             :   final double refreshTriggerPullDistance;
+      38             :   final double refreshIndicatorExtent;
+      39             :   final RefreshControlIndicatorBuilder indicatorBuilder;
+      40             :   final SwipeRefreshStyle style;
+      41             :   final ScrollController? scrollController;
+      42             :   final SliverChildDelegate? childrenDelegate;
+      43             :   final EdgeInsets? padding;
+      44             :   final bool shrinkWrap;
+      45             :   final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior;
+      46             :   final ScrollPhysics? physics;
+      47             :   final PlatformWrapper _platform;
+      48             : 
+      49           4 :   SwipeRefresh(
+      50             :     this.style, {
+      51             :     required this.stateStream,
+      52             :     required this.onRefresh,
+      53             :     Key? key,
+      54             :     this.children,
+      55             :     this.initState,
+      56             :     this.scrollController,
+      57             :     this.childrenDelegate,
+      58             :     this.padding,
+      59             :     this.indicatorColor,
+      60             :     this.shrinkWrap = false,
+      61             :     this.keyboardDismissBehavior,
+      62             :     this.physics,
+      63             :     Color? backgroundColor,
+      64             :     double? refreshTriggerPullDistance,
+      65             :     double? refreshIndicatorExtent,
+      66             :     RefreshControlIndicatorBuilder? indicatorBuilder,
+      67             :     PlatformWrapper? platform,
+      68             :   })  : backgroundColor = backgroundColor ?? const Color(0xFFFFFFFF),
+      69             :         refreshTriggerPullDistance = refreshTriggerPullDistance ??
+      70             :             CupertinoSwipeRefresh.defaultRefreshTriggerPullDistance,
+      71             :         refreshIndicatorExtent = refreshIndicatorExtent ??
+      72             :             CupertinoSwipeRefresh.defaultRefreshIndicatorExtent,
+      73             :         indicatorBuilder = indicatorBuilder ??
+      74             :             CupertinoSliverRefreshControl.buildRefreshIndicator,
+      75           2 :         _platform = platform ?? PlatformWrapper(),
+      76           4 :         super(key: key);
+      77             : 
+      78             :   /// Create refresh indicator adaptive to platform.
+      79           1 :   SwipeRefresh.adaptive({
+      80             :     required Stream<SwipeRefreshState> stateStream,
+      81             :     required VoidCallback onRefresh,
+      82             :     List<Widget>? children,
+      83             :     SliverChildDelegate? childrenDelegate,
+      84             :     Key? key,
+      85             :     SwipeRefreshState? initState,
+      86             :     Color? indicatorColor,
+      87             :     Color? backgroundColor,
+      88             :     double? refreshTriggerPullDistance,
+      89             :     double? refreshIndicatorExtent,
+      90             :     RefreshControlIndicatorBuilder? indicatorBuilder,
+      91             :     ScrollController? scrollController,
+      92             :     EdgeInsets? padding,
+      93             :     bool shrinkWrap = false,
+      94             :     ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior,
+      95             :     ScrollPhysics? physics,
+      96             :     PlatformWrapper? platform,
+      97           1 :   }) : this(
+      98             :           SwipeRefreshStyle.adaptive,
+      99             :           key: key,
+     100             :           children: children,
+     101             :           childrenDelegate: childrenDelegate,
+     102             :           stateStream: stateStream,
+     103             :           initState: initState,
+     104             :           onRefresh: onRefresh,
+     105             :           indicatorColor: indicatorColor,
+     106             :           backgroundColor: backgroundColor,
+     107             :           refreshTriggerPullDistance: refreshTriggerPullDistance,
+     108             :           refreshIndicatorExtent: refreshIndicatorExtent,
+     109             :           indicatorBuilder: indicatorBuilder,
+     110             :           scrollController: scrollController,
+     111             :           padding: padding,
+     112             :           shrinkWrap: shrinkWrap,
+     113             :           keyboardDismissBehavior: keyboardDismissBehavior,
+     114             :           physics: physics,
+     115             :           platform: platform,
+     116             :         );
+     117             : 
+     118             :   /// Create refresh indicator with Material Design style.
+     119           1 :   SwipeRefresh.material({
+     120             :     required Stream<SwipeRefreshState> stateStream,
+     121             :     required VoidCallback onRefresh,
+     122             :     List<Widget>? children,
+     123             :     SliverChildDelegate? childrenDelegate,
+     124             :     Key? key,
+     125             :     SwipeRefreshState? initState,
+     126             :     Color? indicatorColor,
+     127             :     Color? backgroundColor,
+     128             :     ScrollController? scrollController,
+     129             :     EdgeInsets? padding,
+     130             :     bool shrinkWrap = false,
+     131             :     ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior,
+     132             :     ScrollPhysics? physics,
+     133           1 :   }) : this(
+     134             :           SwipeRefreshStyle.material,
+     135             :           key: key,
+     136             :           children: children,
+     137             :           childrenDelegate: childrenDelegate,
+     138             :           stateStream: stateStream,
+     139             :           initState: initState,
+     140             :           onRefresh: onRefresh,
+     141             :           indicatorColor: indicatorColor,
+     142             :           backgroundColor: backgroundColor,
+     143             :           scrollController: scrollController,
+     144             :           padding: padding,
+     145             :           shrinkWrap: shrinkWrap,
+     146             :           keyboardDismissBehavior: keyboardDismissBehavior,
+     147             :           physics: physics,
+     148             :         );
+     149             : 
+     150             :   /// Create refresh indicator with Cupertino style.
+     151           1 :   SwipeRefresh.cupertino({
+     152             :     required Stream<SwipeRefreshState> stateStream,
+     153             :     required VoidCallback onRefresh,
+     154             :     List<Widget>? children,
+     155             :     SliverChildDelegate? childrenDelegate,
+     156             :     Key? key,
+     157             :     SwipeRefreshState? initState,
+     158             :     double? refreshTriggerPullDistance,
+     159             :     double? refreshIndicatorExtent,
+     160             :     RefreshControlIndicatorBuilder? indicatorBuilder,
+     161             :     ScrollController? scrollController,
+     162             :     EdgeInsets? padding,
+     163             :     bool shrinkWrap = false,
+     164             :     ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior,
+     165             :     ScrollPhysics? physics,
+     166           1 :   }) : this(
+     167             :           SwipeRefreshStyle.cupertino,
+     168             :           key: key,
+     169             :           children: children,
+     170             :           childrenDelegate: childrenDelegate,
+     171             :           stateStream: stateStream,
+     172             :           initState: initState,
+     173             :           onRefresh: onRefresh,
+     174             :           refreshTriggerPullDistance: refreshTriggerPullDistance,
+     175             :           refreshIndicatorExtent: refreshIndicatorExtent,
+     176             :           indicatorBuilder: indicatorBuilder,
+     177             :           scrollController: scrollController,
+     178             :           padding: padding,
+     179             :           shrinkWrap: shrinkWrap,
+     180             :           keyboardDismissBehavior: keyboardDismissBehavior,
+     181             :           physics: physics,
+     182             :         );
+     183             : 
+     184             :   /// Create SwipeRefresh as common link
+     185             :   /// remove some conflicts between ScrollControllers when ListView added into
+     186             :   /// SwipeRefresh (remove need to add extra ListView).
+     187           1 :   factory SwipeRefresh.builder({
+     188             :     required IndexedWidgetBuilder itemBuilder,
+     189             :     required int itemCount,
+     190             :     required Stream<SwipeRefreshState> stateStream,
+     191             :     required VoidCallback onRefresh,
+     192             :     Key? key,
+     193             :     SwipeRefreshState? initState,
+     194             :     Color? indicatorColor,
+     195             :     Color? backgroundColor,
+     196             :     double? refreshTriggerPullDistance,
+     197             :     double? refreshIndicatorExtent,
+     198             :     RefreshControlIndicatorBuilder? indicatorBuilder,
+     199             :     ScrollController? scrollController,
+     200             :     EdgeInsets? padding,
+     201             :     bool shrinkWrap = false,
+     202             :     ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior,
+     203             :     ScrollPhysics? physics,
+     204             :     PlatformWrapper? platform,
+     205             :   }) {
+     206           1 :     return SwipeRefresh(
+     207             :       SwipeRefreshStyle.adaptive,
+     208             :       key: key,
+     209             :       stateStream: stateStream,
+     210             :       initState: initState,
+     211             :       onRefresh: onRefresh,
+     212             :       indicatorColor: indicatorColor,
+     213             :       backgroundColor: backgroundColor,
+     214             :       refreshTriggerPullDistance: refreshTriggerPullDistance,
+     215             :       refreshIndicatorExtent: refreshIndicatorExtent,
+     216             :       indicatorBuilder: indicatorBuilder,
+     217             :       scrollController: scrollController,
+     218             :       padding: padding,
+     219             :       shrinkWrap: shrinkWrap,
+     220             :       keyboardDismissBehavior: keyboardDismissBehavior,
+     221             :       physics: physics,
+     222           1 :       childrenDelegate: SliverChildBuilderDelegate(
+     223             :         itemBuilder,
+     224             :         childCount: itemCount,
+     225             :       ),
+     226             :       platform: platform,
+     227             :     );
+     228             :   }
+     229             : 
+     230           4 :   @override
+     231             :   Widget build(BuildContext context) {
+     232           4 :     switch (style) {
+     233           4 :       case SwipeRefreshStyle.material:
+     234           1 :         return MaterialSwipeRefresh(
+     235           1 :           key: key,
+     236           1 :           childrenDelegate: childrenDelegate,
+     237           1 :           stateStream: stateStream,
+     238           1 :           initState: initState,
+     239           1 :           onRefresh: onRefresh,
+     240           1 :           scrollController: scrollController,
+     241           1 :           backgroundColor: backgroundColor,
+     242           1 :           indicatorColor: indicatorColor,
+     243           1 :           shrinkWrap: shrinkWrap,
+     244           1 :           padding: padding,
+     245           1 :           keyboardDismissBehavior: keyboardDismissBehavior,
+     246           1 :           physics: physics,
+     247           1 :           children: children,
+     248             :         );
+     249           3 :       case SwipeRefreshStyle.cupertino:
+     250           1 :         return CupertinoSwipeRefresh(
+     251           1 :           key: key,
+     252           1 :           childrenDelegate: childrenDelegate,
+     253           1 :           stateStream: stateStream,
+     254           1 :           initState: initState,
+     255           1 :           onRefresh: onRefresh,
+     256           1 :           scrollController: scrollController,
+     257           1 :           refreshIndicatorExtent: refreshIndicatorExtent,
+     258           1 :           refreshTriggerPullDistance: refreshTriggerPullDistance,
+     259           1 :           indicatorBuilder: indicatorBuilder,
+     260           1 :           shrinkWrap: shrinkWrap,
+     261           1 :           padding: padding,
+     262           1 :           physics: physics,
+     263           1 :           children: children,
+     264             :         );
+     265           2 :       case SwipeRefreshStyle.builder:
+     266           2 :       case SwipeRefreshStyle.adaptive:
+     267           4 :         if (_platform.isAndroid) {
+     268           1 :           return MaterialSwipeRefresh(
+     269           1 :             key: key,
+     270           1 :             childrenDelegate: childrenDelegate,
+     271           1 :             stateStream: stateStream,
+     272           1 :             initState: initState,
+     273           1 :             onRefresh: onRefresh,
+     274           1 :             scrollController: scrollController,
+     275           1 :             backgroundColor: backgroundColor,
+     276           1 :             indicatorColor: indicatorColor,
+     277           1 :             shrinkWrap: shrinkWrap,
+     278           1 :             padding: padding,
+     279           1 :             keyboardDismissBehavior: keyboardDismissBehavior,
+     280           1 :             physics: physics,
+     281           1 :             children: children,
+     282             :           );
+     283           4 :         } else if (_platform.isIOS) {
+     284           2 :           return CupertinoSwipeRefresh(
+     285           2 :             key: key,
+     286           2 :             childrenDelegate: childrenDelegate,
+     287           2 :             stateStream: stateStream,
+     288           2 :             initState: initState,
+     289           2 :             onRefresh: onRefresh,
+     290           2 :             scrollController: scrollController,
+     291           2 :             refreshIndicatorExtent: refreshIndicatorExtent,
+     292           2 :             refreshTriggerPullDistance: refreshTriggerPullDistance,
+     293           2 :             indicatorBuilder: indicatorBuilder,
+     294           2 :             shrinkWrap: shrinkWrap,
+     295           2 :             padding: padding,
+     296           2 :             physics: physics,
+     297           2 :             children: children,
+     298             :           );
+     299             :         }
+     300             :     }
+     301             : 
+     302           1 :     return Container();
+     303             :   }
+     304             : }
+
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/swipe_refresh_base.dart.func-sort-c.html b/coverage/html/src/swipe_refresh_base.dart.func-sort-c.html new file mode 100644 index 0000000..6bdee7c --- /dev/null +++ b/coverage/html/src/swipe_refresh_base.dart.func-sort-c.html @@ -0,0 +1,72 @@ + + + + + + + LCOV - lcov.info - src\swipe_refresh_base.dart - functions + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\swipe_refresh_base.dart - swipe_refresh_base.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:2424100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + +

Function Name Sort by function nameHit count Sort by hit count
+
+
+ + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/swipe_refresh_base.dart.func.html b/coverage/html/src/swipe_refresh_base.dart.func.html new file mode 100644 index 0000000..662259b --- /dev/null +++ b/coverage/html/src/swipe_refresh_base.dart.func.html @@ -0,0 +1,72 @@ + + + + + + + LCOV - lcov.info - src\swipe_refresh_base.dart - functions + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\swipe_refresh_base.dart - swipe_refresh_base.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:2424100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + +

Function Name Sort by function nameHit count Sort by hit count
+
+
+ + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/swipe_refresh_base.dart.gcov.html b/coverage/html/src/swipe_refresh_base.dart.gcov.html new file mode 100644 index 0000000..2a3f334 --- /dev/null +++ b/coverage/html/src/swipe_refresh_base.dart.gcov.html @@ -0,0 +1,198 @@ + + + + + + + LCOV - lcov.info - src\swipe_refresh_base.dart + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\swipe_refresh_base.dart - swipe_refresh_base.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:2424100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ + + + + + + + +

+
          Line data    Source code
+
+       1             : // Copyright (c) 2019-present,  SurfStudio LLC
+       2             : //
+       3             : // Licensed under the Apache License, Version 2.0 (the "License");
+       4             : // you may not use this file except in compliance with the License.
+       5             : // You may obtain a copy of the License at
+       6             : //
+       7             : //     http://www.apache.org/licenses/LICENSE-2.0
+       8             : //
+       9             : // Unless required by applicable law or agreed to in writing, software
+      10             : // distributed under the License is distributed on an "AS IS" BASIS,
+      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      12             : // See the License for the specific language governing permissions and
+      13             : // limitations under the License.
+      14             : 
+      15             : import 'dart:async';
+      16             : 
+      17             : import 'package:flutter/material.dart';
+      18             : import 'package:swipe_refresh/src/swipe_refresh_state.dart';
+      19             : 
+      20             : /// Base refresh indicator widget.
+      21             : abstract class SwipeRefreshBase extends StatefulWidget {
+      22             :   final List<Widget>? children;
+      23             :   final VoidCallback onRefresh;
+      24             :   final SwipeRefreshState? initState;
+      25             :   final Stream<SwipeRefreshState> stateStream;
+      26             :   final ScrollController? scrollController;
+      27             :   final SliverChildDelegate? childrenDelegate;
+      28             :   final EdgeInsets? padding;
+      29             :   final bool shrinkWrap;
+      30             :   final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior;
+      31             :   final ScrollPhysics? physics;
+      32             : 
+      33           4 :   const SwipeRefreshBase({
+      34             :     required this.stateStream,
+      35             :     required this.onRefresh,
+      36             :     Key? key,
+      37             :     this.initState,
+      38             :     this.scrollController,
+      39             :     this.childrenDelegate,
+      40             :     this.children,
+      41             :     this.padding,
+      42             :     this.shrinkWrap = false,
+      43             :     this.keyboardDismissBehavior,
+      44             :     this.physics,
+      45           2 :   })  : assert((children == null || childrenDelegate == null) &&
+      46             :             (children != null || childrenDelegate != null)),
+      47           4 :         super(key: key);
+      48             : 
+      49             :   @override
+      50             :   @protected
+      51             :   // ignore: no_logic_in_create_state
+      52             :   SwipeRefreshBaseState createState();
+      53             : }
+      54             : 
+      55             : abstract class SwipeRefreshBaseState<T extends SwipeRefreshBase>
+      56             :     extends State<T> {
+      57             :   @protected
+      58             :   final GlobalKey refreshKey = GlobalKey();
+      59             : 
+      60             :   @protected
+      61             :   Completer<void>? completer;
+      62             : 
+      63             :   @visibleForTesting
+      64             :   @protected
+      65             :   SwipeRefreshState currentState = SwipeRefreshState.hidden;
+      66             : 
+      67             :   StreamSubscription<SwipeRefreshState>? _stateSubscription;
+      68             : 
+      69           4 :   @override
+      70             :   void initState() {
+      71           4 :     super.initState();
+      72             : 
+      73           8 :     if (widget.initState != null) {
+      74           6 :       currentState = widget.initState!;
+      75             :     }
+      76             : 
+      77          20 :     _stateSubscription = widget.stateStream.listen(_updateState);
+      78             :   }
+      79             : 
+      80           4 :   @override
+      81             :   Widget build(BuildContext context) {
+      82             :     // ignore: avoid-returning-widgets
+      83          22 :     return buildRefresher(refreshKey, widget.children ?? [], _onRefresh);
+      84             :   }
+      85             : 
+      86           4 :   @override
+      87             :   void dispose() {
+      88           8 :     _stateSubscription?.cancel();
+      89             : 
+      90           4 :     super.dispose();
+      91             :   }
+      92             : 
+      93             :   @protected
+      94             :   Widget buildRefresher(
+      95             :     Key key,
+      96             :     List<Widget> children,
+      97             :     Future<void> Function() onRefresh,
+      98             :   );
+      99             : 
+     100             :   @protected
+     101             :   void onUpdateState(SwipeRefreshState state);
+     102             : 
+     103           2 :   @protected
+     104             :   Future<void> _onRefresh() {
+     105           2 :     _updateState(SwipeRefreshState.loading);
+     106           4 :     widget.onRefresh();
+     107           4 :     completer = Completer<void>();
+     108           4 :     return completer!.future;
+     109             :   }
+     110             : 
+     111           2 :   void _updateState(SwipeRefreshState newState) {
+     112           4 :     if (currentState != newState) {
+     113           2 :       setState(
+     114           2 :         () {
+     115           2 :           currentState = newState;
+     116             : 
+     117           4 :           onUpdateState(currentState);
+     118             :         },
+     119             :       );
+     120             :     }
+     121             :   }
+     122             : }
+
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/swipe_refresh_state.dart.func-sort-c.html b/coverage/html/src/swipe_refresh_state.dart.func-sort-c.html new file mode 100644 index 0000000..24ecdbe --- /dev/null +++ b/coverage/html/src/swipe_refresh_state.dart.func-sort-c.html @@ -0,0 +1,72 @@ + + + + + + + LCOV - lcov.info - src\swipe_refresh_state.dart - functions + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\swipe_refresh_state.dart - swipe_refresh_state.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:11100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + +

Function Name Sort by function nameHit count Sort by hit count
+
+
+ + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/swipe_refresh_state.dart.func.html b/coverage/html/src/swipe_refresh_state.dart.func.html new file mode 100644 index 0000000..5e9826e --- /dev/null +++ b/coverage/html/src/swipe_refresh_state.dart.func.html @@ -0,0 +1,72 @@ + + + + + + + LCOV - lcov.info - src\swipe_refresh_state.dart - functions + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\swipe_refresh_state.dart - swipe_refresh_state.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:11100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + +

Function Name Sort by function nameHit count Sort by hit count
+
+
+ + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/swipe_refresh_state.dart.gcov.html b/coverage/html/src/swipe_refresh_state.dart.gcov.html new file mode 100644 index 0000000..dfb046a --- /dev/null +++ b/coverage/html/src/swipe_refresh_state.dart.gcov.html @@ -0,0 +1,98 @@ + + + + + + + LCOV - lcov.info - src\swipe_refresh_state.dart + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\swipe_refresh_state.dart - swipe_refresh_state.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:11100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ + + + + + + + +

+
          Line data    Source code
+
+       1             : // Copyright (c) 2019-present,  SurfStudio LLC
+       2             : //
+       3             : // Licensed under the Apache License, Version 2.0 (the "License");
+       4             : // you may not use this file except in compliance with the License.
+       5             : // You may obtain a copy of the License at
+       6             : //
+       7             : //     http://www.apache.org/licenses/LICENSE-2.0
+       8             : //
+       9             : // Unless required by applicable law or agreed to in writing, software
+      10             : // distributed under the License is distributed on an "AS IS" BASIS,
+      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      12             : // See the License for the specific language governing permissions and
+      13             : // limitations under the License.
+      14             : 
+      15             : /// Refresh indicator states.
+      16           4 : enum SwipeRefreshState {
+      17             :   /// Indicator hidden.
+      18             :   hidden,
+      19             : 
+      20             :   /// Indicator shown.
+      21             :   loading,
+      22             : }
+
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/swipe_refresh_style.dart.func-sort-c.html b/coverage/html/src/swipe_refresh_style.dart.func-sort-c.html new file mode 100644 index 0000000..944cbc2 --- /dev/null +++ b/coverage/html/src/swipe_refresh_style.dart.func-sort-c.html @@ -0,0 +1,72 @@ + + + + + + + LCOV - lcov.info - src\swipe_refresh_style.dart - functions + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\swipe_refresh_style.dart - swipe_refresh_style.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:11100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + +

Function Name Sort by function nameHit count Sort by hit count
+
+
+ + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/swipe_refresh_style.dart.func.html b/coverage/html/src/swipe_refresh_style.dart.func.html new file mode 100644 index 0000000..ea66fb2 --- /dev/null +++ b/coverage/html/src/swipe_refresh_style.dart.func.html @@ -0,0 +1,72 @@ + + + + + + + LCOV - lcov.info - src\swipe_refresh_style.dart - functions + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\swipe_refresh_style.dart - swipe_refresh_style.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:11100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + +

Function Name Sort by function nameHit count Sort by hit count
+
+
+ + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/src/swipe_refresh_style.dart.gcov.html b/coverage/html/src/swipe_refresh_style.dart.gcov.html new file mode 100644 index 0000000..1f16e83 --- /dev/null +++ b/coverage/html/src/swipe_refresh_style.dart.gcov.html @@ -0,0 +1,104 @@ + + + + + + + LCOV - lcov.info - src\swipe_refresh_style.dart + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - src\swipe_refresh_style.dart - swipe_refresh_style.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:11100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ + + + + + + + +

+
          Line data    Source code
+
+       1             : // Copyright (c) 2019-present,  SurfStudio LLC
+       2             : //
+       3             : // Licensed under the Apache License, Version 2.0 (the "License");
+       4             : // you may not use this file except in compliance with the License.
+       5             : // You may obtain a copy of the License at
+       6             : //
+       7             : //     http://www.apache.org/licenses/LICENSE-2.0
+       8             : //
+       9             : // Unless required by applicable law or agreed to in writing, software
+      10             : // distributed under the License is distributed on an "AS IS" BASIS,
+      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      12             : // See the License for the specific language governing permissions and
+      13             : // limitations under the License.
+      14             : 
+      15             : /// Indicator style.
+      16           4 : enum SwipeRefreshStyle {
+      17             :   /// Material Design.
+      18             :   material,
+      19             : 
+      20             :   /// Cupertino.
+      21             :   cupertino,
+      22             : 
+      23             :   /// Adaptive.
+      24             :   adaptive,
+      25             : 
+      26             :   /// Builder.
+      27             :   builder,
+      28             : }
+
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/updown.png b/coverage/html/updown.png new file mode 100644 index 0000000000000000000000000000000000000000..aa56a238b3e6c435265250f9266cd1b8caba0f20 GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^AT}Qd8;}%R+`Ae`*?77*hG?8mPH5^{)z4*}Q$iB}huR`+ literal 0 HcmV?d00001 diff --git a/coverage/html/utills/index-sort-f.html b/coverage/html/utills/index-sort-f.html new file mode 100644 index 0000000..c06fa6e --- /dev/null +++ b/coverage/html/utills/index-sort-f.html @@ -0,0 +1,93 @@ + + + + + + + LCOV - lcov.info - utills + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - utillsHitTotalCoverage
Test:lcov.infoLines:22100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +

Filename Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
platform_wrapper.dart +
100.0%
+ 		100.0 %2 / 2-0 / 0
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/utills/index-sort-l.html b/coverage/html/utills/index-sort-l.html new file mode 100644 index 0000000..d425a7b --- /dev/null +++ b/coverage/html/utills/index-sort-l.html @@ -0,0 +1,93 @@ + + + + + + + LCOV - lcov.info - utills + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - utillsHitTotalCoverage
Test:lcov.infoLines:22100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +

Filename Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
platform_wrapper.dart +
100.0%
+ 		100.0 %2 / 2-0 / 0
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/utills/index.html b/coverage/html/utills/index.html new file mode 100644 index 0000000..8dcc6ca --- /dev/null +++ b/coverage/html/utills/index.html @@ -0,0 +1,93 @@ + + + + + + + LCOV - lcov.info - utills + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - utillsHitTotalCoverage
Test:lcov.infoLines:22100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +

Filename Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
platform_wrapper.dart +
100.0%
+ 		100.0 %2 / 2-0 / 0
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/utills/platform_wrapper.dart.func-sort-c.html b/coverage/html/utills/platform_wrapper.dart.func-sort-c.html new file mode 100644 index 0000000..d172493 --- /dev/null +++ b/coverage/html/utills/platform_wrapper.dart.func-sort-c.html @@ -0,0 +1,72 @@ + + + + + + + LCOV - lcov.info - utills\platform_wrapper.dart - functions + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - utills\platform_wrapper.dart - platform_wrapper.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:22100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + +

Function Name Sort by function nameHit count Sort by hit count
+
+
+ + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/utills/platform_wrapper.dart.func.html b/coverage/html/utills/platform_wrapper.dart.func.html new file mode 100644 index 0000000..4cf2985 --- /dev/null +++ b/coverage/html/utills/platform_wrapper.dart.func.html @@ -0,0 +1,72 @@ + + + + + + + LCOV - lcov.info - utills\platform_wrapper.dart - functions + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - utills\platform_wrapper.dart - platform_wrapper.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:22100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ +
+ + + + + + +

Function Name Sort by function nameHit count Sort by hit count
+
+
+ + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/html/utills/platform_wrapper.dart.gcov.html b/coverage/html/utills/platform_wrapper.dart.gcov.html new file mode 100644 index 0000000..98c8e3b --- /dev/null +++ b/coverage/html/utills/platform_wrapper.dart.gcov.html @@ -0,0 +1,98 @@ + + + + + + + LCOV - lcov.info - utills\platform_wrapper.dart + + + + + + + + + + + + + + +
LCOV - code coverage report
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current view:top level - utills\platform_wrapper.dart - platform_wrapper.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:22100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
+
+ + + + + + + + +

+
          Line data    Source code
+
+       1             : // Copyright (c) 2019-present,  SurfStudio LLC
+       2             : //
+       3             : // Licensed under the Apache License, Version 2.0 (the "License");
+       4             : // you may not use this file except in compliance with the License.
+       5             : // You may obtain a copy of the License at
+       6             : //
+       7             : //     http://www.apache.org/licenses/LICENSE-2.0
+       8             : //
+       9             : // Unless required by applicable law or agreed to in writing, software
+      10             : // distributed under the License is distributed on an "AS IS" BASIS,
+      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      12             : // See the License for the specific language governing permissions and
+      13             : // limitations under the License.
+      14             : 
+      15             : import 'dart:io';
+      16             : 
+      17             : /// Wrapper for Platform io.
+      18             : class PlatformWrapper {
+      19           2 :   bool get isIOS => Platform.isIOS;
+      20             : 
+      21           2 :   bool get isAndroid => Platform.isAndroid;
+      22             : }
+
+
+
+ + + + +
Generated by: LCOV version 1.15.alpha0w
+
+ + + diff --git a/coverage/lcov.info b/coverage/lcov.info new file mode 100644 index 0000000..9d987dc --- /dev/null +++ b/coverage/lcov.info @@ -0,0 +1,206 @@ +SF:lib\utills\platform_wrapper.dart +DA:19,2 +DA:21,2 +LF:2 +LH:2 +end_of_record +SF:lib\src\cupertino_swipe_refresh.dart +DA:30,3 +DA:45,3 +DA:59,3 +DA:61,3 +DA:62,3 +DA:70,3 +DA:72,3 +DA:74,3 +DA:80,3 +DA:81,6 +DA:82,3 +DA:83,6 +DA:85,6 +DA:89,3 +DA:90,3 +DA:91,3 +DA:94,6 +DA:95,6 +DA:96,6 +DA:98,3 +DA:99,6 +DA:100,6 +DA:101,6 +DA:102,6 +DA:103,3 +DA:105,6 +DA:106,6 +DA:113,1 +DA:119,1 +DA:120,1 +DA:121,2 +DA:122,1 +DA:133,3 +DA:138,3 +DA:140,3 +DA:142,3 +DA:143,1 +DA:144,1 +DA:145,1 +DA:146,1 +DA:147,1 +DA:148,1 +DA:153,3 +DA:154,3 +DA:155,2 +DA:156,2 +LF:46 +LH:46 +end_of_record +SF:lib\src\swipe_refresh_base.dart +DA:33,4 +DA:45,2 +DA:47,4 +DA:69,4 +DA:71,4 +DA:73,8 +DA:74,6 +DA:77,20 +DA:80,4 +DA:83,22 +DA:86,4 +DA:88,8 +DA:90,4 +DA:103,2 +DA:105,2 +DA:106,4 +DA:107,4 +DA:108,4 +DA:111,2 +DA:112,4 +DA:113,2 +DA:114,2 +DA:115,2 +DA:117,4 +LF:24 +LH:24 +end_of_record +SF:lib\src\swipe_refresh_state.dart +DA:16,4 +LF:1 +LH:1 +end_of_record +SF:lib\src\material_swipe_refresh.dart +DA:27,2 +DA:42,2 +DA:56,2 +DA:57,2 +DA:62,2 +DA:68,2 +DA:71,4 +DA:72,4 +DA:73,4 +DA:74,2 +DA:75,4 +DA:76,4 +DA:77,6 +DA:78,6 +DA:79,4 +DA:83,1 +DA:84,2 +DA:85,2 +DA:86,2 +DA:87,2 +DA:88,2 +DA:90,3 +DA:95,1 +DA:97,1 +DA:98,1 +DA:99,2 +DA:100,1 +LF:27 +LH:27 +end_of_record +SF:lib\src\swipe_refresh.dart +DA:49,4 +DA:75,2 +DA:76,4 +DA:79,1 +DA:97,1 +DA:119,1 +DA:133,1 +DA:151,1 +DA:166,1 +DA:187,1 +DA:206,1 +DA:222,1 +DA:230,4 +DA:232,4 +DA:233,4 +DA:234,1 +DA:235,1 +DA:236,1 +DA:237,1 +DA:238,1 +DA:239,1 +DA:240,1 +DA:241,1 +DA:242,1 +DA:243,1 +DA:244,1 +DA:245,1 +DA:246,1 +DA:247,1 +DA:249,3 +DA:250,1 +DA:251,1 +DA:252,1 +DA:253,1 +DA:254,1 +DA:255,1 +DA:256,1 +DA:257,1 +DA:258,1 +DA:259,1 +DA:260,1 +DA:261,1 +DA:262,1 +DA:263,1 +DA:265,2 +DA:266,2 +DA:267,4 +DA:268,1 +DA:269,1 +DA:270,1 +DA:271,1 +DA:272,1 +DA:273,1 +DA:274,1 +DA:275,1 +DA:276,1 +DA:277,1 +DA:278,1 +DA:279,1 +DA:280,1 +DA:281,1 +DA:283,4 +DA:284,2 +DA:285,2 +DA:286,2 +DA:287,2 +DA:288,2 +DA:289,2 +DA:290,2 +DA:291,2 +DA:292,2 +DA:293,2 +DA:294,2 +DA:295,2 +DA:296,2 +DA:297,2 +DA:302,1 +LF:77 +LH:77 +end_of_record +SF:lib\src\swipe_refresh_style.dart +DA:16,4 +LF:1 +LH:1 +end_of_record diff --git a/lib/src/cupertino_swipe_refresh.dart b/lib/src/cupertino_swipe_refresh.dart index fa2ae65..b261088 100644 --- a/lib/src/cupertino_swipe_refresh.dart +++ b/lib/src/cupertino_swipe_refresh.dart @@ -112,10 +112,6 @@ class _CupertinoSwipeRefreshState @override void onUpdateState(SwipeRefreshState state) { - if (state == SwipeRefreshState.loading) { - _scrollController.jumpTo(-(widget.refreshIndicatorExtent + 5)); - } - if (state == SwipeRefreshState.hidden) { if (completer != null) { completer!.complete(); diff --git a/lib/src/material_swipe_refresh.dart b/lib/src/material_swipe_refresh.dart index e75f869..19246fb 100644 --- a/lib/src/material_swipe_refresh.dart +++ b/lib/src/material_swipe_refresh.dart @@ -94,10 +94,6 @@ class _MaterialSwipeRefreshState @override void onUpdateState(SwipeRefreshState state) { - if (state == SwipeRefreshState.loading) { - (refreshKey.currentState as RefreshIndicatorState).show(); - } - if (state == SwipeRefreshState.hidden) { if (completer != null) { completer!.complete(); diff --git a/lib/src/swipe_refresh.dart b/lib/src/swipe_refresh.dart index 62bb058..dd4d607 100644 --- a/lib/src/swipe_refresh.dart +++ b/lib/src/swipe_refresh.dart @@ -79,7 +79,8 @@ class SwipeRefresh extends StatelessWidget { SwipeRefresh.adaptive({ required Stream stateStream, required VoidCallback onRefresh, - required List children, + List? children, + SliverChildDelegate? childrenDelegate, Key? key, SwipeRefreshState? initState, Color? indicatorColor, @@ -97,6 +98,7 @@ class SwipeRefresh extends StatelessWidget { SwipeRefreshStyle.adaptive, key: key, children: children, + childrenDelegate: childrenDelegate, stateStream: stateStream, initState: initState, onRefresh: onRefresh, @@ -117,7 +119,8 @@ class SwipeRefresh extends StatelessWidget { SwipeRefresh.material({ required Stream stateStream, required VoidCallback onRefresh, - required List children, + List? children, + SliverChildDelegate? childrenDelegate, Key? key, SwipeRefreshState? initState, Color? indicatorColor, @@ -131,6 +134,7 @@ class SwipeRefresh extends StatelessWidget { SwipeRefreshStyle.material, key: key, children: children, + childrenDelegate: childrenDelegate, stateStream: stateStream, initState: initState, onRefresh: onRefresh, @@ -147,7 +151,8 @@ class SwipeRefresh extends StatelessWidget { SwipeRefresh.cupertino({ required Stream stateStream, required VoidCallback onRefresh, - required List children, + List? children, + SliverChildDelegate? childrenDelegate, Key? key, SwipeRefreshState? initState, double? refreshTriggerPullDistance, @@ -162,6 +167,7 @@ class SwipeRefresh extends StatelessWidget { SwipeRefreshStyle.cupertino, key: key, children: children, + childrenDelegate: childrenDelegate, stateStream: stateStream, initState: initState, onRefresh: onRefresh, @@ -258,39 +264,39 @@ class SwipeRefresh extends StatelessWidget { ); case SwipeRefreshStyle.builder: case SwipeRefreshStyle.adaptive: - if (_platform.isAndroid) { - return MaterialSwipeRefresh( - key: key, - childrenDelegate: childrenDelegate, - stateStream: stateStream, - initState: initState, - onRefresh: onRefresh, - scrollController: scrollController, - backgroundColor: backgroundColor, - indicatorColor: indicatorColor, - shrinkWrap: shrinkWrap, - padding: padding, - keyboardDismissBehavior: keyboardDismissBehavior, - physics: physics, - children: children, - ); - } else if (_platform.isIOS) { - return CupertinoSwipeRefresh( - key: key, - childrenDelegate: childrenDelegate, - stateStream: stateStream, - initState: initState, - onRefresh: onRefresh, - scrollController: scrollController, - refreshIndicatorExtent: refreshIndicatorExtent, - refreshTriggerPullDistance: refreshTriggerPullDistance, - indicatorBuilder: indicatorBuilder, - shrinkWrap: shrinkWrap, - padding: padding, - physics: physics, - children: children, - ); - } + if (_platform.isAndroid) { + return MaterialSwipeRefresh( + key: key, + childrenDelegate: childrenDelegate, + stateStream: stateStream, + initState: initState, + onRefresh: onRefresh, + scrollController: scrollController, + backgroundColor: backgroundColor, + indicatorColor: indicatorColor, + shrinkWrap: shrinkWrap, + padding: padding, + keyboardDismissBehavior: keyboardDismissBehavior, + physics: physics, + children: children, + ); + } else if (_platform.isIOS) { + return CupertinoSwipeRefresh( + key: key, + childrenDelegate: childrenDelegate, + stateStream: stateStream, + initState: initState, + onRefresh: onRefresh, + scrollController: scrollController, + refreshIndicatorExtent: refreshIndicatorExtent, + refreshTriggerPullDistance: refreshTriggerPullDistance, + indicatorBuilder: indicatorBuilder, + shrinkWrap: shrinkWrap, + padding: padding, + physics: physics, + children: children, + ); + } } return Container(); diff --git a/lib/src/swipe_refresh_base.dart b/lib/src/swipe_refresh_base.dart index 6c97e7b..a0e88c8 100644 --- a/lib/src/swipe_refresh_base.dart +++ b/lib/src/swipe_refresh_base.dart @@ -60,16 +60,18 @@ abstract class SwipeRefreshBaseState @protected Completer? completer; - StreamSubscription? _stateSubscription; + @visibleForTesting + @protected + SwipeRefreshState currentState = SwipeRefreshState.hidden; - SwipeRefreshState _currentState = SwipeRefreshState.hidden; + StreamSubscription? _stateSubscription; @override void initState() { super.initState(); if (widget.initState != null) { - _currentState = widget.initState!; + currentState = widget.initState!; } _stateSubscription = widget.stateStream.listen(_updateState); @@ -100,19 +102,19 @@ abstract class SwipeRefreshBaseState @protected Future _onRefresh() { - _currentState = SwipeRefreshState.loading; + _updateState(SwipeRefreshState.loading); widget.onRefresh(); completer = Completer(); return completer!.future; } void _updateState(SwipeRefreshState newState) { - if (_currentState != newState) { + if (currentState != newState) { setState( () { - _currentState = newState; + currentState = newState; - onUpdateState(_currentState); + onUpdateState(currentState); }, ); } diff --git a/test/swipe_refresh_adaptive_test.dart b/test/swipe_refresh_adaptive_test.dart index 572886c..84b8fa3 100644 --- a/test/swipe_refresh_adaptive_test.dart +++ b/test/swipe_refresh_adaptive_test.dart @@ -76,7 +76,6 @@ void main() { await tester.pumpWidget(adaptiveSwipeRefresh); expect(() => adaptiveSwipeRefresh, returnsNormally); - expect(find.byType(Container), findsOneWidget); }, ); @@ -105,7 +104,6 @@ void main() { await tester.pumpWidget(adaptiveSwipeRefresh); expect(() => adaptiveSwipeRefresh, returnsNormally); - expect(find.byType(MaterialSwipeRefresh), findsOneWidget); }, ); @@ -135,7 +133,6 @@ void main() { await tester.pumpWidget(adaptiveSwipeRefresh); expect(() => adaptiveSwipeRefresh, returnsNormally); - expect(find.byType(CupertinoSwipeRefresh), findsOneWidget); }, ); diff --git a/test/swipe_refresh_with_builder.dart b/test/swipe_refresh_builder_test.dart similarity index 89% rename from test/swipe_refresh_with_builder.dart rename to test/swipe_refresh_builder_test.dart index 78bafd3..663840c 100644 --- a/test/swipe_refresh_with_builder.dart +++ b/test/swipe_refresh_builder_test.dart @@ -23,26 +23,26 @@ import 'package:swipe_refresh/utills/platform_wrapper.dart'; import 'test_utils.dart'; void main() { - late StreamController _controller; + late StreamController controller; late Stream stream; late MockPlatformWrapper platformWrapper; setUp(() { - _controller = StreamController.broadcast(); - stream = _controller.stream; + controller = StreamController.broadcast(); + stream = controller.stream; platformWrapper = MockPlatformWrapper(); }); tearDown(() async { - await _controller.close(); + await controller.close(); }); Future _onRefresh() async { await Future.delayed(const Duration(seconds: 3)); - _controller.sink.add(SwipeRefreshState.hidden); + controller.sink.add(SwipeRefreshState.hidden); } final listColors = [ @@ -74,7 +74,6 @@ void main() { await tester.pumpWidget(testWidget); expect(() => testWidget, returnsNormally); - expect(find.byType(Container), findsNWidgets(4)); }, ); diff --git a/test/swipe_refresh_cupertino_test.dart b/test/swipe_refresh_cupertino_test.dart index 680dffb..fa5a412 100644 --- a/test/swipe_refresh_cupertino_test.dart +++ b/test/swipe_refresh_cupertino_test.dart @@ -17,30 +17,37 @@ import 'dart:async'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:mocktail/mocktail.dart'; +import 'package:swipe_refresh/src/swipe_refresh_base.dart'; import 'package:swipe_refresh/swipe_refresh.dart'; import 'test_utils.dart'; void main() { - late StreamController _streamController; + late StreamController streamController; late Stream stream; + late MockOnRefreshFunction onRefreshFunction; + late ScrollPhysics scrollPhysics; setUp(() { - _streamController = StreamController.broadcast(); - stream = _streamController.stream; - }); - - tearDown(() async { - await _streamController.close(); - }); + streamController = StreamController.broadcast(); + stream = streamController.stream; - Future _onRefresh() async { - _streamController.sink.add(SwipeRefreshState.loading); + onRefreshFunction = MockOnRefreshFunction(); + when(() => onRefreshFunction.call()).thenAnswer( + (invocation) async { + return streamController.sink.add(SwipeRefreshState.hidden); + }, + ); - await Future.delayed(const Duration(seconds: 3)); + scrollPhysics = const ScrollPhysics(); + }); - _streamController.sink.add(SwipeRefreshState.hidden); - } + tearDown( + () async { + await streamController.close(); + }, + ); final listColors = [ Colors.blue, @@ -49,13 +56,31 @@ void main() { Colors.amber, ]; + testWidgets( + 'When trying to return a CupertinoSwipeRefresh with no children or ' + 'childrenDelegate passed, must be an assertion error', + (tester) async { + expect( + () { + return makeTestableWidget( + CupertinoSwipeRefresh( + stateStream: stream, + onRefresh: onRefreshFunction, + ), + ); + }, + throwsAssertionError, + ); + }, + ); + testWidgets( 'SwipeRefresh.cupertino widget with children as argument does not break', (tester) async { final cupertinoSwipeRefresh = makeTestableWidget( SwipeRefresh.cupertino( stateStream: stream, - onRefresh: _onRefresh, + onRefresh: onRefreshFunction, children: listColors .map( (e) => Container( @@ -70,24 +95,62 @@ void main() { await tester.pumpWidget(cupertinoSwipeRefresh); expect(() => cupertinoSwipeRefresh, returnsNormally); - - expect(find.byType(Container), findsNWidgets(4)); - expect(find.byType(CupertinoSwipeRefresh), findsOneWidget); + expect(find.byType(Container), findsNWidgets(4)); }, ); testWidgets( - 'When drag down enough, the refresh should start with the correct statuses', + 'When drag down enough, the refresh should start and should called ' + 'onRefreshFunction', (tester) async { - final events = []; + final cupertinoSwipeRefresh = makeTestableWidget( + SwipeRefresh.cupertino( + stateStream: stream, + onRefresh: onRefreshFunction, + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), + ), + ); - stream.listen(events.add); + await tester.pumpWidget(cupertinoSwipeRefresh); + await tester.drag( + find.byType(SwipeRefresh), + const Offset(0, 300), + touchSlopY: 0, + ); + await tester.pump(); + + verify(() => onRefreshFunction()).called(1); + }, + ); + + testWidgets( + 'When drag down enough, the refresh should start and end after 3 seconds', + (tester) async { + const key = Key('Test key'); final cupertinoSwipeRefresh = makeTestableWidget( SwipeRefresh.cupertino( stateStream: stream, - onRefresh: _onRefresh, + onRefresh: onRefreshFunction, + indicatorBuilder: ( + context, + refreshState, + pulledExtent, + refreshTriggerPullDistance, + refreshIndicatorExtent, + ) { + return Container( + key: key, + ); + }, children: listColors .map( (e) => Container( @@ -101,21 +164,20 @@ void main() { await tester.pumpWidget(cupertinoSwipeRefresh); - expect(events, isEmpty); - await tester.drag( find.byType(SwipeRefresh), const Offset(0, 300), touchSlopY: 0, ); - await tester.pump(const Duration(seconds: 1)); + await tester.pump(); - expect(events, equals([SwipeRefreshState.loading])); + expect(find.byKey(key), findsOneWidget); await tester.pump(const Duration(seconds: 3)); + await tester.pump(); - expect(events.last, equals(SwipeRefreshState.hidden)); + expect(find.byKey(key), findsNothing); }, ); @@ -129,7 +191,7 @@ void main() { final cupertinoSwipeRefresh = makeTestableWidget( SwipeRefresh.cupertino( stateStream: stream, - onRefresh: _onRefresh, + onRefresh: onRefreshFunction, children: listColors .map( (e) => Container( @@ -142,13 +204,132 @@ void main() { ); await tester.pumpWidget(cupertinoSwipeRefresh); - - expect(events, isEmpty); - await tester.drag(find.byType(SwipeRefresh), const Offset(0.0, 50.0)); await tester.pump(); - expect(events, isEmpty); + verifyNever(() => onRefreshFunction()); + }, + ); + + testWidgets( + 'If initState: SwipeRefreshState.loading passed to the SwipeRefresh.cupertino, ' + 'the currentState of the SwipeRefreshBase should be SwipeRefreshState.loading', + (tester) async { + final cupertinoWidget = SwipeRefresh.cupertino( + stateStream: stream, + onRefresh: onRefreshFunction, + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), + initState: SwipeRefreshState.loading, + ); + + final cupertinoSwipeRefresh = makeTestableWidget(cupertinoWidget); + + await tester.pumpWidget(cupertinoSwipeRefresh); + + final SwipeRefreshBaseState state = tester.state( + find.byType(CupertinoSwipeRefresh), + ) as SwipeRefreshBaseState; + + expect(state.currentState, cupertinoWidget.initState); + }, + ); + + testWidgets( + 'if pass the physics to the SwipeRefresh.cupertino, then SwipeRefreshBase ' + 'physics should be the same', + (tester) async { + final events = []; + + stream.listen(events.add); + + final cupertinoWidget = SwipeRefresh.cupertino( + stateStream: stream, + onRefresh: onRefreshFunction, + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), + initState: SwipeRefreshState.loading, + physics: scrollPhysics, + ); + + final cupertinoSwipeRefresh = makeTestableWidget(cupertinoWidget); + + await tester.pumpWidget(cupertinoSwipeRefresh); + + final baseWidget = tester.widget( + find.byType(SwipeRefresh), + ) as SwipeRefresh; + + expect(baseWidget.physics, scrollPhysics); + }, + ); + + testWidgets( + 'If padding passed to the SwipeRefresh.cupertino, ' + 'SliverList should be wrapped in SliverPadding', + (tester) async { + final events = []; + + stream.listen(events.add); + + final cupertinoWidgetWithoutPadding = makeTestableWidget( + SwipeRefresh.cupertino( + stateStream: stream, + onRefresh: onRefreshFunction, + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), + ), + ); + + final cupertinoWidgetWithPadding = makeTestableWidget( + SwipeRefresh.cupertino( + stateStream: stream, + onRefresh: onRefreshFunction, + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), + padding: const EdgeInsets.only(top: 16.0), + ), + ); + + await tester.pumpWidget(cupertinoWidgetWithoutPadding); + + expect(find.byType(SliverList), findsOneWidget); + // Must find one widget create by SliverSafeArea. + expect(find.byType(SliverPadding), findsOneWidget); + + await tester.pumpWidget(cupertinoWidgetWithPadding); + + expect(find.byType(SliverList), findsOneWidget); + // Must find two widgets(create by SliverSafeArea and create by SwipeRefresh.cupertino). + expect(find.byType(SliverPadding), findsNWidgets(2)); }, ); } + +class MockOnRefreshFunction extends Mock { + void call(); +} diff --git a/test/swipe_refresh_material_test.dart b/test/swipe_refresh_material_test.dart index c02d10a..ab81504 100644 --- a/test/swipe_refresh_material_test.dart +++ b/test/swipe_refresh_material_test.dart @@ -15,32 +15,37 @@ import 'dart:async'; import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:mocktail/mocktail.dart'; +import 'package:swipe_refresh/src/swipe_refresh_base.dart'; import 'package:swipe_refresh/swipe_refresh.dart'; import 'test_utils.dart'; void main() { - late StreamController _controller; + late StreamController controller; late Stream stream; + late MockOnRefreshFunction onRefreshFunction; + late TestSliverChildListDelegate sliverChildDelegate; setUp(() { - _controller = StreamController.broadcast(); - stream = _controller.stream; + controller = StreamController.broadcast(); + stream = controller.stream; + sliverChildDelegate = TestSliverChildListDelegate([const Text('Test')]); + + onRefreshFunction = MockOnRefreshFunction(); + when(() => onRefreshFunction.call()).thenAnswer( + (invocation) async { + return controller.sink.add(SwipeRefreshState.hidden); + }, + ); }); tearDown(() async { - await _controller.close(); + await controller.close(); }); - Future _onRefresh() async { - _controller.sink.add(SwipeRefreshState.loading); - - await Future.delayed(const Duration(seconds: 3)); - - _controller.sink.add(SwipeRefreshState.hidden); - } - final listColors = [ Colors.blue, Colors.green, @@ -48,13 +53,31 @@ void main() { Colors.amber, ]; + testWidgets( + 'When trying create MaterialSwipeRefresh without children or ' + 'childrenDelegate should be assertion error', + (tester) async { + expect( + () { + return makeTestableWidget( + MaterialSwipeRefresh( + stateStream: stream, + onRefresh: onRefreshFunction, + ), + ); + }, + throwsAssertionError, + ); + }, + ); + testWidgets( 'SwipeRefresh.material widget with children as argument does not break', (tester) async { final materialSwipeRefresh = makeTestableWidget( SwipeRefresh.material( stateStream: stream, - onRefresh: _onRefresh, + onRefresh: onRefreshFunction, children: listColors .map( (e) => Container( @@ -77,16 +100,44 @@ void main() { ); testWidgets( - 'When drag down enough, the refresh should start with the correct statuses', + 'When drag down enough, the refresh should start and should called ' + 'onRefreshFunction', (tester) async { - final events = []; + final materialSwipeRefresh = makeTestableWidget( + SwipeRefresh.material( + stateStream: stream, + onRefresh: onRefreshFunction, + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), + ), + ); - stream.listen(events.add); + await tester.pumpWidget(materialSwipeRefresh); + await tester.drag( + find.byType(SwipeRefresh), + const Offset(0, 300), + touchSlopY: 0, + ); + await tester.pump(); + await tester.pump(const Duration(seconds: 3)); + verify(() => onRefreshFunction()).called(1); + }, + ); + + testWidgets( + 'When drag down enough, the refresh should start and end after 3 seconds', + (tester) async { final materialSwipeRefresh = makeTestableWidget( SwipeRefresh.material( stateStream: stream, - onRefresh: _onRefresh, + onRefresh: onRefreshFunction, children: listColors .map( (e) => Container( @@ -99,34 +150,30 @@ void main() { ); await tester.pumpWidget(materialSwipeRefresh); - await tester.drag( find.byType(SwipeRefresh), const Offset(0, 300), touchSlopY: 0, ); await tester.pump(); - await tester.pump(const Duration(seconds: 1)); - expect(events, equals([SwipeRefreshState.loading])); + expect(find.byType(RefreshProgressIndicator), findsOneWidget); - await tester.pump(const Duration(seconds: 3)); + await tester.pump(); + await tester.pump(const Duration(seconds: 1)); + await tester.pump(const Duration(seconds: 2)); - expect(events.last, equals(SwipeRefreshState.hidden)); + expect(find.byType(RefreshProgressIndicator), findsNothing); }, ); testWidgets( 'When drag down is not enough to trigger an update the update should not be', (tester) async { - final events = []; - - stream.listen(events.add); - final materialSwipeRefresh = makeTestableWidget( SwipeRefresh.material( stateStream: stream, - onRefresh: _onRefresh, + onRefresh: onRefreshFunction, children: listColors .map( (e) => Container( @@ -138,18 +185,71 @@ void main() { ), ); await tester.pumpWidget(materialSwipeRefresh); - - expect(events, isEmpty); - await tester.drag( find.byType(SwipeRefresh), const Offset(0, 50), touchSlopY: 0, ); - await tester.pump(); - expect(events, isEmpty); + verifyNever(() => onRefreshFunction()); + }, + ); + + testWidgets( + 'If initState: SwipeRefreshState.loading passed to the SwipeRefresh.material, ' + 'currentState should be SwipeRefreshState.loading', + (tester) async { + final materialWidget = SwipeRefresh.material( + stateStream: stream, + onRefresh: onRefreshFunction, + children: listColors + .map( + (e) => Container( + color: e, + height: 100, + ), + ) + .toList(), + initState: SwipeRefreshState.loading, + ); + final materialSwipeRefresh = makeTestableWidget(materialWidget); + await tester.pumpWidget(materialSwipeRefresh); + final SwipeRefreshBaseState state = tester.state( + find.byType(MaterialSwipeRefresh), + ) as SwipeRefreshBaseState; + + expect(state.currentState, materialWidget.initState); }, ); + + testWidgets( + 'SwipeRefresh.material widget with childrenDelegate as argument does not break', + (tester) async { + final scrollController = ScrollController(); + + final materialWidget = MaterialSwipeRefresh( + stateStream: stream, + onRefresh: onRefreshFunction, + childrenDelegate: sliverChildDelegate, + scrollController: scrollController, + ); + + final materialSwipeRefresh = makeTestableWidget(materialWidget); + await tester.pumpWidget(materialSwipeRefresh); + + expect( + find.text('Test'), + findsOneWidget, + ); + }, + ); +} + +class MockOnRefreshFunction extends Mock { + void call(); +} + +class TestSliverChildListDelegate extends SliverChildListDelegate { + TestSliverChildListDelegate(List children) : super(children); } From f423dab42a18fb960432928bc3018e4bb5472825 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Thu, 11 Nov 2021 15:36:17 +0300 Subject: [PATCH 26/69] Fix installation section in README.md. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 367ccba..010ecbd 100644 --- a/README.md +++ b/README.md @@ -31,10 +31,10 @@ Add `swipe_refresh` to your `pubspec.yaml` file: ```yaml dependencies: - swipe_refresh: ^1.0.1 + swipe_refresh: $currentVersion$ ``` -You can use both `stable` and `dev` versions of the package listed above in the badges bar. +

At this moment, the current version of swipe_refresh is swipe_refresh version.

## Changelog From d305ce93335564e7f5a8a039102473cee935d911 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Wed, 17 Nov 2021 11:38:32 +0300 Subject: [PATCH 27/69] Fix test section in workflow.yaml, add gitignore. --- .gitignore | 21 ++++++++++----------- example/.gitignore | 22 +++++++++++++--------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index dd440d4..85c4ec3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,6 @@ -.idea - -build/ -ios/.generated/ -ios/Flutter/Generated.xcconfig -ios/Runner/GeneratedPluginRegistrant.* - # Miscellaneous *.class +*.lock *.log *.pyc *.swp @@ -23,17 +17,20 @@ ios/Runner/GeneratedPluginRegistrant.* .idea/ # Visual Studio Code related +.classpath +.project +.settings/ .vscode/ # Flutter/Dart/Pub related **/doc/api/ .dart_tool/ .flutter-plugins +.flutter-plugins-dependencies .packages .pub-cache/ .pub/ -/build/ -*.lock +build/ # Android related **/android/**/gradle-wrapper.jar @@ -71,9 +68,11 @@ ios/Runner/GeneratedPluginRegistrant.* **/ios/ServiceDefinitions.json **/ios/Runner/GeneratedPluginRegistrant.* +# Coverage +coverage/ + # Exceptions to above rules. !**/ios/**/default.mode1v3 !**/ios/**/default.mode2v3 !**/ios/**/default.pbxuser -!**/ios/**/default.perspectivev3 -!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages +!**/ios/**/default.perspectivev3 \ No newline at end of file diff --git a/example/.gitignore b/example/.gitignore index 10c16ab..85c4ec3 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -1,5 +1,6 @@ # Miscellaneous *.class +*.lock *.log *.pyc *.swp @@ -15,19 +16,21 @@ *.iws .idea/ -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ +# Visual Studio Code related +.classpath +.project +.settings/ +.vscode/ # Flutter/Dart/Pub related **/doc/api/ .dart_tool/ .flutter-plugins +.flutter-plugins-dependencies .packages .pub-cache/ .pub/ -/build/ +build/ # Android related **/android/**/gradle-wrapper.jar @@ -58,17 +61,18 @@ **/ios/Flutter/App.framework **/ios/Flutter/Flutter.framework **/ios/Flutter/Generated.xcconfig +**/ios/Flutter/flutter_export_environment.sh **/ios/Flutter/app.flx **/ios/Flutter/app.zip **/ios/Flutter/flutter_assets/ -**/ios/Flutter/flutter_export_environment.sh **/ios/ServiceDefinitions.json **/ios/Runner/GeneratedPluginRegistrant.* -**/ios/Podfile + +# Coverage +coverage/ # Exceptions to above rules. !**/ios/**/default.mode1v3 !**/ios/**/default.mode2v3 !**/ios/**/default.pbxuser -!**/ios/**/default.perspectivev3 -!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages +!**/ios/**/default.perspectivev3 \ No newline at end of file From 5cd9115bb560f88bb4f44691da05119bb864682c Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Wed, 17 Nov 2021 11:39:00 +0300 Subject: [PATCH 28/69] Fix test section in workflow.yaml. --- .github/workflows/workflow.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index a97dc12..0407903 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -74,8 +74,13 @@ jobs: - name: Install dependencies run: flutter pub get - - name: Run tests - run: flutter test + - name: Run tests + env: + CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}} + if: success() + run: | + flutter test --coverage + bash <(curl -s https://codecov.io/bash) -f coverage/lcov.info build_android_example: needs: analysis From 8c0bbdd98e16992cd1cdb93de8dab03a4e4e59f3 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Wed, 17 Nov 2021 11:40:14 +0300 Subject: [PATCH 29/69] Fix test section in workflow.yaml. --- .github/workflows/workflow.yaml | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 0407903..40c90c3 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout + - name: Checkout uses: actions/checkout@v2 - - name: Install Flutter + - name: Install Flutter uses: subosito/flutter-action@v1 with: channel: "stable" @@ -40,20 +40,20 @@ jobs: - name: Check Installation run: echo | grep -q Installation README.md ; echo $? - - name: Install dependencies + - name: Install dependencies run: flutter pub get - - name: Run dependency validator + - name: Run dependency validator run: | dart pub global activate dependency_validator dart pub global run dependency_validator:dependency_validator - - name: Run analyzer + - name: Run analyzer run: flutter analyze --fatal-warnings --fatal-infos . - - name: Run formatter + - name: Run formatter run: flutter format --set-exit-if-changed . - - name: Run package analyzer + - name: Run package analyzer uses: axel-op/dart-package-analyzer@v3 with: githubToken: ${{ secrets.GITHUB_TOKEN }} @@ -65,27 +65,27 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - - name: Install Flutter + + - name: Install Flutter uses: subosito/flutter-action@v1 with: channel: "stable" - - name: Install dependencies + - name: Install dependencies run: flutter pub get - name: Run tests - env: - CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}} - if: success() - run: | - flutter test --coverage - bash <(curl -s https://codecov.io/bash) -f coverage/lcov.info - + env: + CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}} + if: success() + run: | + flutter test --coverage + bash <(curl -s https://codecov.io/bash) -f coverage/lcov.info + build_android_example: needs: analysis runs-on: ubuntu-latest - + steps: # Setup Java environment in order to build the Android app. - uses: actions/checkout@v2 From 50fcddf358ba78f5ba56a7f6e03249d482e577ba Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Wed, 17 Nov 2021 15:44:29 +0300 Subject: [PATCH 30/69] Fix README.md. Add example in README.md. --- README.md | 95 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 86 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 0e3c20a..7c82fd5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Swipe Refresh -[![Build Status](https://shields.io/github/workflow/status/surfstudio/SurfGear/build?logo=github&logoColor=white)](https://github.com/surfstudio/SurfGear/tree/main/packages/swipe_refresh) -[![Coverage Status](https://img.shields.io/codecov/c/github/surfstudio/SurfGear?flag=swipe_refresh&logo=codecov&logoColor=white)](https://codecov.io/gh/surfstudio/SurfGear) +[![Build Status](https://shields.io/github/workflow/status/surfstudio/flutter-swipe-refresh/build?logo=github&logoColor=white)](https://github.com/surfstudio/flutter-swipe-refresh) +[![Coverage Status](https://img.shields.io/codecov/c/github/surfstudio/flutter-swipe-refresh?logo=codecov&logoColor=white)](https://app.codecov.io/gh/surfstudio/flutter-swipe-refresh) [![Pub Version](https://img.shields.io/pub/v/swipe_refresh?logo=dart&logoColor=white)](https://pub.dev/packages/swipe_refresh) [![Pub Likes](https://badgen.net/pub/likes/swipe_refresh)](https://pub.dev/packages/swipe_refresh) [![Pub popularity](https://badgen.net/pub/popularity/swipe_refresh)](https://pub.dev/packages/swipe_refresh/score) @@ -16,8 +16,6 @@ Widget for refresh by swipe. ![](media/material.gif) ![](media/cupertino.gif) -## Example - Main classes: 1. [Refresh state](lib/src/swipe_refresh_state.dart) @@ -25,16 +23,95 @@ Main classes: 3. [Widget for indicate swipe refresh Material style](lib/src/material_swipe_refresh.dart) 4. [Widget for indicate swipe refresh Cupertino style](lib/src/cupertino_swipe_refresh.dart) +## Example + +### Material + +Refresh indicator widget with Material Design style. + +```dart +SwipeRefresh.material( +stateStream: Stream(), +onRefresh: _refresh, +padding: const EdgeInsets.symmetric(vertical: 10), +children: [ ... ], +); + +Future _refresh() async { + // When all needed is done change state. + _controller.sink.add(SwipeRefreshState.hidden); +} +``` + +### Cupertino + +Refresh indicator widget with Cupertino Design style. + +```dart +SwipeRefresh.cupertino( +stateStream: Stream(), +onRefresh: _refresh, +padding: const EdgeInsets.symmetric(vertical: 10), +children: [ ... ], +); + +Future _refresh() async { + // When all needed is done change state. + _controller.sink.add(SwipeRefreshState.hidden); +} +``` + +### Adaptive + +Refresh indicator widget with adaptive to platform style. + +```dart +SwipeRefresh.adaptive( +stateStream: Stream(), +onRefresh: _refresh, +padding: const EdgeInsets.symmetric(vertical: 10), +children: [ ... ], +); + +Future _refresh() async { + // When all needed is done change state. + _controller.sink.add(SwipeRefreshState.hidden); +} +``` + +### Builder + +Refresh indicator widget with adaptive to platform style, with SliverChildBuilderDelegate in childDelegate. + +```dart +SwipeRefresh.builder( +stateStream: Stream(), +onRefresh: _refresh, +padding: const EdgeInsets.symmetric(vertical: 10), +itemCount: Colors.primaries.length, +itemBuilder: (context, index) { +return Container( + ... +); +}, +), + +Future _refresh() async { + // When all needed is done change state. + _controller.sink.add(SwipeRefreshState.hidden); +} +``` + ## Installation Add `swipe_refresh` to your `pubspec.yaml` file: ```yaml dependencies: - swipe_refresh: ^1.0.0 + swipe_refresh: $currentVersion$ ``` -You can use both `stable` and `dev` versions of the package listed above in the badges bar. +

At this moment, the current version of swipe_refresh is swipe_refresh version.

## Changelog @@ -42,11 +119,11 @@ All notable changes to this project will be documented in [this file](./CHANGELO ## Issues -For issues, file directly in the Issues section. +For issues, file directly in the [Issues](https://github.com/surfstudio/flutter-swipe-refresh/issues) section. ## Contribute -If you would like to contribute to the package (e.g. by improving the documentation, solving a bug or adding a cool new feature), please review our [contribution guide](../../CONTRIBUTING.md) first and send us your pull request. +If you would like to contribute to the package (e.g. by improving the documentation, solving a bug or adding a cool new feature), please review our [contribution guide](./CONTRIBUTING.md) first and send us your pull request. Your PRs are always welcome. @@ -58,4 +135,4 @@ Please feel free to ask any questions about this package. Join our community cha ## License -[Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0) +[Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0) \ No newline at end of file From dd948c23473ddcc3f8fa79a1db0932ffb2d3a5e8 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Wed, 17 Nov 2021 17:10:54 +0300 Subject: [PATCH 31/69] Fix README.md. Add example in README.md. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7c82fd5..d1787a0 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Future _refresh() async { ### Builder -Refresh indicator widget with adaptive to platform style, with SliverChildBuilderDelegate in childDelegate. +Refresh indicator widget with adaptive to platform style, and with SliverChildBuilderDelegate in childDelegate(so as not to create more child elements than are visible through Viewport). ```dart SwipeRefresh.builder( @@ -92,8 +92,8 @@ itemCount: Colors.primaries.length, itemBuilder: (context, index) { return Container( ... -); -}, + ); + }, ), Future _refresh() async { From 312c031106617da75b0afb4977f9beee564c243f Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Wed, 17 Nov 2021 18:49:17 +0300 Subject: [PATCH 32/69] Improved class documentation. --- lib/src/cupertino_swipe_refresh.dart | 1 + lib/src/swipe_refresh.dart | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/src/cupertino_swipe_refresh.dart b/lib/src/cupertino_swipe_refresh.dart index fa2ae65..a8d80e3 100644 --- a/lib/src/cupertino_swipe_refresh.dart +++ b/lib/src/cupertino_swipe_refresh.dart @@ -19,6 +19,7 @@ import 'package:swipe_refresh/src/swipe_refresh_base.dart'; import 'package:swipe_refresh/src/swipe_refresh_state.dart'; /// Refresh indicator widget with Cupertino style. +/// [children] - class CupertinoSwipeRefresh extends SwipeRefreshBase { static const double defaultRefreshTriggerPullDistance = 100.0; static const double defaultRefreshIndicatorExtent = 60.0; diff --git a/lib/src/swipe_refresh.dart b/lib/src/swipe_refresh.dart index 5979a0a..7dbb7ce 100644 --- a/lib/src/swipe_refresh.dart +++ b/lib/src/swipe_refresh.dart @@ -170,9 +170,9 @@ class SwipeRefresh extends StatelessWidget { physics: physics, ); - /// Create SwipeRefresh as common link - /// remove some conflicts between ScrollControllers when ListView added into - /// SwipeRefresh (remove need to add extra ListView). + /// Create refresh indicator with adaptive to platform style. + /// Uses SliverChildBuilderDelegate in childrenDelegate to avoid + /// creating more children than are visible through the [Viewport]. factory SwipeRefresh.builder({ required IndexedWidgetBuilder itemBuilder, required int itemCount, From e358f2b840960f7b5c940dad2916ce0b5c1bedf6 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Thu, 18 Nov 2021 10:58:08 +0300 Subject: [PATCH 33/69] Improved class documentation. --- lib/src/cupertino_swipe_refresh.dart | 24 +++++++++++++++++++++++- lib/src/material_swipe_refresh.dart | 24 ++++++++++++++++++++++++ lib/src/swipe_refresh.dart | 5 +++-- 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/lib/src/cupertino_swipe_refresh.dart b/lib/src/cupertino_swipe_refresh.dart index a8d80e3..a26d376 100644 --- a/lib/src/cupertino_swipe_refresh.dart +++ b/lib/src/cupertino_swipe_refresh.dart @@ -19,7 +19,29 @@ import 'package:swipe_refresh/src/swipe_refresh_base.dart'; import 'package:swipe_refresh/src/swipe_refresh_state.dart'; /// Refresh indicator widget with Cupertino style. -/// [children] - +/// [stateStream] - indicator state([SwipeRefreshState.loading] or +/// [SwipeRefreshState.hidden]). +/// [onRefresh] - callback invoked when pulled by [refreshTriggerPullDistance]. +/// [children] - list of any widgets. +/// [childrenDelegate] - pass the inheritor to SliverChildDelegate to avoid +/// creating more children than are visible through the [Viewport]. +/// [initState] - initialization state([SwipeRefreshState.loading] or +/// [SwipeRefreshState.hidden]). +/// [padding] - passed to add [SliverPadding]. +/// [scrollController] - ScrollController for [CustomScrollView]. +/// [shrinkWrap] - Whether the extent of the scroll view should be determined +/// by the contents being viewed(default - false). +/// [refreshTriggerPullDistance] - The amount of overscroll the scrollable +/// must be dragged to trigger a reload(default - [defaultRefreshTriggerPullDistance]). +/// [refreshIndicatorExtent] - amount of space the refresh indicator +/// sliver will keep holding while [onRefresh] is still running. +/// [indicatorBuilder] - builder that's called as this sliver's size changes, +/// and as the state changes(default - [CupertinoSliverRefreshControl.buildRefreshIndicator]). +/// [keyboardDismissBehavior] - [ScrollViewKeyboardDismissBehavior] +/// the defines how this [ScrollView] will dismiss the keyboard automatically. +/// (if == null it will be [ScrollViewKeyboardDismissBehavior.onDrag]). +/// [physics] - defines the physics of the scroll(if == null it will be +/// [AlwaysScrollableScrollPhysics]). class CupertinoSwipeRefresh extends SwipeRefreshBase { static const double defaultRefreshTriggerPullDistance = 100.0; static const double defaultRefreshIndicatorExtent = 60.0; diff --git a/lib/src/material_swipe_refresh.dart b/lib/src/material_swipe_refresh.dart index e75f869..48add0a 100644 --- a/lib/src/material_swipe_refresh.dart +++ b/lib/src/material_swipe_refresh.dart @@ -20,6 +20,30 @@ import 'package:swipe_refresh/src/swipe_refresh_base.dart'; import 'package:swipe_refresh/src/swipe_refresh_state.dart'; /// Refresh indicator widget with Material Design style. +/// [stateStream] - indicator state([SwipeRefreshState.loading] or +/// [SwipeRefreshState.hidden]). +/// [onRefresh] - function that's called when the user has dragged the +/// refresh indicator far enough to demonstrate that they want the app to refresh. +/// [indicatorColor] - progress indicator's foreground color +/// (default - [ColorScheme.primary]). +/// [children] - list of any widgets. +/// [childrenDelegate] - pass the inheritor to SliverChildDelegate +/// to avoid creating more children than are visible through the [Viewport]. +/// [initState] - initialization state([SwipeRefreshState.loading] or +/// [SwipeRefreshState.hidden]). +/// [backgroundColor] - progress indicator's background color +/// (default - Color(0xFFFFFFFF)). +/// [scrollController] - [ScrollController] for [ListView]. +/// [padding] - corresponds to having a [SliverPadding] in the +/// [CustomScrollView.slivers] property instead of the list itself, +/// and having the [SliverList] instead be a child of the [SliverPadding]. +/// [shrinkWrap] - Whether the extent of the scroll view should be determined +/// by the contents being viewed(default - false). +/// [keyboardDismissBehavior] - [ScrollViewKeyboardDismissBehavior] +/// the defines how this [ScrollView] will dismiss the keyboard automatically. +/// (if == null it will be [ScrollViewKeyboardDismissBehavior.manual]). +/// [physics] - defines the physics of the scroll(if == null it will be +/// [AlwaysScrollableScrollPhysics]). class MaterialSwipeRefresh extends SwipeRefreshBase { final Color? indicatorColor; final Color backgroundColor; diff --git a/lib/src/swipe_refresh.dart b/lib/src/swipe_refresh.dart index 7dbb7ce..66d5e6b 100644 --- a/lib/src/swipe_refresh.dart +++ b/lib/src/swipe_refresh.dart @@ -23,10 +23,11 @@ import 'package:swipe_refresh/src/swipe_refresh_style.dart'; /// Refresh indicator widget. /// /// Params for Material Design style: -/// [indicatorColor], [backgroundColor]. +/// [indicatorColor], [backgroundColor](more details [MaterialSwipeRefresh]). /// /// Params for Cupertino style: -/// [refreshTriggerPullDistance], [refreshIndicatorExtent], [indicatorBuilder]. +/// [refreshTriggerPullDistance], [refreshIndicatorExtent], [indicatorBuilder] +/// (more details [CupertinoSwipeRefresh]). class SwipeRefresh extends StatelessWidget { final List? children; final VoidCallback onRefresh; From ca6fe063e409e9080dae55a087c4d1fc5323609f Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Thu, 18 Nov 2021 11:07:43 +0300 Subject: [PATCH 34/69] Improved .gitignore. --- .gitignore | 2 +- example/.gitignore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 85c4ec3..761d64c 100644 --- a/.gitignore +++ b/.gitignore @@ -75,4 +75,4 @@ coverage/ !**/ios/**/default.mode1v3 !**/ios/**/default.mode2v3 !**/ios/**/default.pbxuser -!**/ios/**/default.perspectivev3 \ No newline at end of file +!**/ios/**/default.perspectivev3 diff --git a/example/.gitignore b/example/.gitignore index 85c4ec3..761d64c 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -75,4 +75,4 @@ coverage/ !**/ios/**/default.mode1v3 !**/ios/**/default.mode2v3 !**/ios/**/default.pbxuser -!**/ios/**/default.perspectivev3 \ No newline at end of file +!**/ios/**/default.perspectivev3 From 7ce9c2e8aeeb142f1836994c0b14fef271a990d4 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Tue, 30 Nov 2021 15:45:34 +0300 Subject: [PATCH 35/69] Change GIF image. Added image with packages name. --- README.md | 6 ++++-- media/cupertino.gif | Bin 71596 -> 0 bytes media/material.gif | Bin 56882 -> 0 bytes 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 media/cupertino.gif delete mode 100644 media/material.gif diff --git a/README.md b/README.md index d1787a0..6fa9f70 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,14 @@ This package is part of the [SurfGear](https://github.com/surfstudio/SurfGear) toolkit made by [Surf](https://surf.ru). +[![Swipe Refresh](https://i.ibb.co/wCbKCy6/Swipe-Refresh.png)](https://github.com/surfstudio/SurfGear) + ## Description Widget for refresh by swipe. -![](media/material.gif) -![](media/cupertino.gif) +![](https://i.ibb.co/7Kmy91f/material.gif) +![](https://i.ibb.co/smPxRp7/cupertino.gif) Main classes: diff --git a/media/cupertino.gif b/media/cupertino.gif deleted file mode 100644 index 66199672b0eb550fcc25300e5cda476397ecb237..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 71596 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 diff --git a/media/material.gif b/media/material.gif deleted file mode 100644 index 8c6d0182f3e304bfdae394914463f77d2de602ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56882 zcmdRW2UL^Ww(d_L385FIgET2pMCna}D1<74AktB!i4-YPHS~_5NH3vCF9AdEy+h~` zQL2c5NR=X*$KLy#efAyaym#+=sZ3;NZ>`4@S+F^06+i+ z2wnieYk)ui2*kN8K{y&99M2^Ifhs|q&%u@;umnc{a0Cn-c>zaW14jhlh%j(;JRc>F zjs!=Pfg`HK5k+vsmN=fz#FseY365t5j%Ot(06+l-C|&@?Yk)!kD8#ueK{*QwJ6t)C~C7|#nC_DjmW`H{X;TZu709e2P%L`z64X_9Ri#V4hSVse_V+j^z zfJL240v2n4#g<^P1T4M;izi^u46tV<*fRni0PuhTo)^IL8sHHC9&s*9@Qwy}#}Yis z0FNrcV-4`wb4kGCOYnFC{;ULlMmPh2Gr-`C7dYcJI70wuh;vzT=4f!{SaOCkI75}3 zVGYi(=aO)SFFC^#&dy5C&Io@%&qW~DxqVMxMOpXubx|>5qVsRLPDn_I0RkZW+l=3~ z34juiKwwaCNN89PIRm4-g1)_-y`O(#!s|r;q|}tO%nWX(>r5XVWLPUB(@}_5)lB0HA|ZdKfv_KJ3!~xDaQ6tX z5($JV?FQU>JRD=*@*?0&hMJ7!ioT8!so1#g+kokZ=IJLQnZs$)*F@|F-WHC%RCq@A z<{edhs^H$1V2^ZVL~NeJM9SR(aU|>t*4k`p(8J2G(*Nuyn`UiUG1{cVv)p}?mzj-+ z@Dfa3I~1C5#gO~ye3kezSYpeeLZ~Em-O@QEFXZ}AebqbL2p*_Y@^dmhKaE72th!s! zG{HFZ?o!-v2DqP0-{Mw^Sl&i-6#Gz?2(6IO3=^|cwEM)Pc@~~znTDnAVdjtTv=ZM3 zB&_4sa8Kp3nbT_zH8VSP)4G*K43}UNIG_so17Z+<$xWxiFuCfC*XbW%+9Y6NfnOPC<9*r36pd+|2d`4H_aJwR;fzCBox~Gf3rf(7cI$4N`pdO(Fz#?0h|gA|Vt`3O(u7vW zD;VDvlI3C2E{0f)XC4UQP)OnWLU}OtWm(D|Yulgma>f>PoxENX1?y#UQzpF4H;cBr z-&DPMO;$;&?DYjQ>SsjxuXU{|sTCCNc8U!*Y*oW-&~abQyx&w=Uec#94hMaT^%1=+ zpVqD-Fow1Y^aPAtKrO?EuFBVy0_7wwzVR=sk>N+!NJ_An>wbe(r7p%i_PeM;1bULJ z+c9@R;MvV|9si^!EbPR{ndiXO=R_20? zCF?aA8K7v_iunqu`z;LpE6)2~T#pLKze!RBL_w&LIYjMLcb;deOZ0}zXV#&PbjYk5 z$!8Fk6aNV;1rDhr5pTu>-v`}8!(yATeC&5*G8D1`VV@vwa|l#zun=b7qb07K4zh#9Mg ze$4hul{7NSFo>l;sXarkBW;ABOkil)i7Bb(4uyE4CF~)m&KD;xQn2Hy*)lhpC_+_+ z^}DjH$^1v~f=A%mq3)A`&WI13q%2as6)~ggR+X(*sk*vfFM2ie05q1&jhQ*rI$}n4 zBpqVk1s$%fJb_3+;vp}ELBP^`QYy*^tv7U+Kzs5lRhCr@iMP542~lUfTGm9dH*Iw%R=e@)WPxGTt?&EUzbFLY&?~q=x&t&sTi_;R2`==yJGysXxq+!qI|wg#p~48;3uW48#Cskhc{h&HqG8^%(iaSRCt%$N5oH%xPOFG69PdU zNtOYA=I&VxJ)af7GCvqJJg9!OxbQS;L6N;9IS*@MRCEi3-crs~0TyMUT_3i(&t z+d~gVHjdgdKV7vWZe9Qph;nULM7uVWY$3zastqPoLW z4`&~vD|qsOF5$R)`u47ecE&P8CBEU^PfD+)C*~)$$-NtyRk6;^kG`MEw93@(zIsAo z;k5duHANj0&)mGocQiXdY_pe8$o5!({CE&zz84r`l>ZU^okzOfC9F?)?fR3HVOy!U zVUxo)?|$8@|E_y2%3^C-_WgrVuL`%UFTx*~7LfglkY{M3k(Ha&vVEZp?zu33J1!v> zB!7d}>*DCgV12nEy)0~jQ28fK6Q9Wxj`*OML}JN2?~$S#H6_|38&Z{X(*j`Ei0^*3 zitp3LYI-HhpZjmhD?P!5JGrC6C>_sxliS~;>AvY_#XB-MH|%ci^Rsmp zHMzcoQFoEoXJ2@v8>Vtz?3HN#{3Lm4m?e#QzhcsKVQtT6=5yoWL8toK2t(s*k?XRG zQvzY~M-B7WXHj)Ab*Q8IXWo7jRKECbm4 zp}hD29Ln3)_9fSz8)*Raqne0^SWvh@&?6K9>Vt&3Swfxa{IAy=ORooc)A;J@LcPQw zp6$@uK2KN1$M#6jINUEOnBg8;>u$fVA`*m*g9zb#<39T~^ZN-Pk$3w8 zU{ky2RLMM3_q`32(klB-lYW>UT7$)Km0brmtC0v(dZAZdJfSz_LnV+C{Bh{sex_avDTKcb&MW&FNVac zh{oMVE{qe;K@Ill%|DGd&pjdh*~e^}#xKpNyC z!*f3z8TKHA6i;jvP5>#PAWlYLy%ToTo|hkXLhpv7rhvrg6Lx1N_sA5Qe*Ppw7x2{j zYd5<9f4eZ2qOkG^@GXo|H7x!P!Y4Wfh9XT62!uZ54C1#p^jPHeZcpb^f3dCh;$wes z%zAqG^GNMkeK;nhx$dPRj@XbUnv5B&4x@C!6T>kG@$O7rSsG1Qq{;ov$N0dpR4ayh zzah22*PlTF2ohc|?+XLaoI1aWdXKNNBp2<$KDIXXeHRbc`N12gdQVEDXE5`WS5nu| z--{T03SmF=Vf2kOC9^PGVGe(oXQJALLa)gA#SBi3fExy{fuq39i{4v1aO>n;4j*${ z^%s04fzpzMJbD?X;MAlLSemN<@05#+&U#+WNuJ`MC4*Y7RAgi)!iT;fUyJ32|HvGJQvK^}^!d7|rY#3FMa8W&jk6a-8^cVJ0VsmpWRC{S%Ia6K*1+sOBr z%lGmr^ht9!oh!WG_~zwC;e$xUYYqh=kp43YWb+S0yVP2+s4Il8pX+T z7T$7iJO_)@=Zev3g@I&6K`ccD#wA51Z$dYU${LHxuLNLD-&DyJz;6~lb107YDNQXY zZEz@UJuPl;EX=u5*0E7+eZ8dLrzF3zY{217%ti@LuC$b;yxO=NE9cp?QR>!MULRT9 zGFbkOg%H*wSJrD>vFcN?5~(*bST@*Lu{~EYEm=NMQnY_sc6eGcbET5Lv-IO!Wx{FY z85w47t~@cRqT2_v=753ux_?V6p&Y89BClkRtej1&JaDM`9$9svw9rDUach zuU<%VBa5majjASZsuuWx5f!SUVSRhGv}($@N@}P|#L8YjQBO6hxyo7|Op4I4=*1ULM_bZgq%L;7BSs$WVANHg^ z_z9stD7`+csXmsxA#$@mW~e^=NkjaP`b6J`xTc2SCz7g}Iv6{6BE8kRW(p2x;R96bRRF8GoY--oMa1{r-i34?+H1|De?k;WaZ)zU+ z(LBo9G9uqHY|?_$Y?*!1GEv%sZ))x_0ngxTUF2Kurq`|cwyvkQy8Wn=Os_${Z~bZ0 zXd&OYCttfSkL69T?I>-t{n7N(gz}SS>oRLQiI(~{dE1t6CFxl!*?haDNh6%KgW9x> zMxkS>w~cA5jk&qavGxU80Jcuj$-&ln$+VN#uahUEle@W-udGvKxKn_lOO&naswtsM z!mmp_qw9KemsDAo;&7J?MfVN1ZY9(1TYlXtWnJoM63zK;t+Q?&wjN!D9zD~ZdwxBJ z89heLJ;w7rre{6oY`vBWy$?-$t^Im!GJ5TrdmV&(9CvzM*!rF+^tqe%dHVHvW%T(p z_xa8Dy*TSbvh@cl^aq>vhx+x0XY@xl_ean7$DZ}0*aqSi1`)B8{ z+i<7CaJT7juitQg#_(YC@bLWb=-DuiZDc}WWXg18#%~0lF*4UYGCx1^@r*FC$TqsH zFuH0wy5={!o-w-7Ji0YMx_vgf!#1|3Fm_-%_T6vnIAiRzdF*U{?AO^Cz>Whc;z-PJ z5PuwLCa$dv>?#H|rRg)%g?es5yvx8&mQXh|_?hFlCwx3{80Wq?PWE+36%O^|gt+>} zJE6y)4TIUs`&@8fw=%FZ8mg{4KoJ9#R-E8fgs$h0Gf?t7&x76IQ0A|YeFW6Pa$NBk zBJ>qPsSPzm)JYLcj?(?lXKD;a?JQ(vmhThRMwv) zZY10tGh3(iPEc@K6$#ZwLrpC4PL?E+;Uwy4s2e-PixY2wgeJC3vt^D4l!GnMP*wD_ z`A#pxND!MDbW$Y9baC35%}|vF>Wv|}jtoX{5*Npi@WDRJu|qwyp<^SE@sann^Rv$} zByt~uG<5OCxFG%qP_;!c$w&O~0NC;=i6aj3dDw_hELq96ZN3-!uXtd$BB+Nx%<(fta)}yxn@gXBL!F4n>GTy=WkksQ5wc zdE@r*?{nhKW z1J=Mmop6wt%q7+vv)2*J=2SDlM=-I|N?h!+y6%LR3rR-IV(`y(gx7m3U3}=T9$Y?{C<}x5os#iGA>~gj(%vAlk<*knNz@Rt}b~05hAfy}B{Wd}9`YnPQ>b78b$N zj)K)O+YJ6IF2Zd4Ap3&4<%;w0jxlaqd;9CJvT-Jn z-R6-UhO0Q?%w4vHT@J!7=cPSvr9EDYJ-(NF0@-_4+V+GO_CyJLVwd)>EA2~I>`T4e zm&x9jYui^?*uO#8hhI9lsdRA5;z0G~0V4ZAqwPRz;XsFQpnK_1Z>*nnVcOmF@Z`mz zvC^bT+qjwYq3NaX=2yR4Dt))H_->bdXkGc;cI>NZrEQPO zqvvBsyg?+gTgom$MU?t&Uis z{e0}S)qHFFwfXz_kw*Cbr0s7*UY0P{!8Uw83jdgSF7@90`bteO`SJVwh1_H3^T~w2 z{owe3@cZlzKe^wY``hp{fKvQ@cH1uo$BsY8!9PzHHrQDB_2+6tBLA|Ks5}3>l=~ik zS-SH-p3I>2FDC!1b^p7TP5A$G-T$s-6aF9L{qI`$ziZiqzZuV;x_$n~e{=Ol;`s5& zQg%jm0^uq3UMWS#2&Q*32-u08V1(>I!%w8%yWW1r$VvLAzTtWkrr zeaWGvLrv*F-ji=>DmV&9vz3`6q$eVNMPd&-Bd9JL=C6-E zRE-8-^_f4e;^~ju01^GhIf04K=_X<5x!@sE1pw&wpPZ9lcvN&u>?>4Ud_v;uq~w&; zv_${(tZa17Upc3WN=#MtTWn2jU427iQ*%pepnY3sS9ecuU;n`1(D2CU7;b!Ga%y^J z7XNPU{rrcI3yVw3T?#8}pVz-^Y;Jws{{pk4Q^vBuHUj%@dj17T7cLb5r zUoq{+j;`p3*DKMI>A?8%#8Roog#_#es#2a@y0O!hy2k^W?Zn!0)u%9}qAB zAV7?$;2eTKX}9o*$iG4mtC^gZo{{+n1W|r~UHfA6ws;B z{wDl2a!=*}=2MUiks99#B{i{c!_h362MUiu9Jy?2T60_oGN!PjU@62MY5mMZtvdOO_rDq z)t0}nb0Mq@W@^?|d}#98-}o?8w=mv{Bz{%SonkoD8BTw-$vc-Pt~OXLhvvE4f>lp; zV1D!2b|v?DNM73&l=|+X>m-HpJ6I!jQ}qc|55wn^@hw#O*v}FF@T1MyI;+!P+RgR5 zEBy&V7NgA#`=4=nn%O!njfb1~w@(&ETbho(Ep|m+y3^WxvcEoAYBAQ@^5bY{WhncO zh0CX}A~!!lYm_FUP63F(B9er`ZZUwAuV^ulLTY_6h(=XlDfoh+-BJjXP0>;)o9Fsc z7-y)!ayW02-ExFLLD6!gaP9hXlvuC8O0>j`U0#&id|E3WVOND;Hx`8%XtkXfb5$8rY)oyx%Pb zTRd5)`-i$rmm2*;T}C^_#c2M90|*dS0+fM1p#OKX0sX;N{{x5kgmC}F-#o|vD;)k! zo`dY7t?hq?!#|l#)_*jc%7r#0F*%1;J!YvZoLq|&n+W-mD5xfst&1wS z^C?Fj5D+V2My?NL2ZTzE$lBRY7J~EF-q}iSjVoDn#r_n>f+iJkx&tDMB)}CuV2cLH zr@fzLFG`*Q;zT-1+_)@W*!dX*a8w8Bbm)8lJ>*cF}>PI6N zfD03L*K*%T8AuTw$bEU#+nc&%v#k5gnEzEWuMHZgM;2<{S0p;1Sfhj!8Qri4=E_#!9q#HatNr+awA|9~qz+PcT+5peB$2Q2-!P&H(&mZ91%_XaF(2UCmE+W z1Zg7SMZm-|Z%Vwojz(ESdOgpMnnIT~nBykR%7 z!{sKvnE?3f00IG_5K3l*-&~>(WaNSb5lz19ivFP`kyaN@EP=S4N-mIojP_ACf?fe2 zT~rrp5Ma!fIFRVa*hYWNR9!z%4>Bz0ftU7l# zF6YiB5pemJ&L-SG?vKba(je_`Vb%ZTbMk+~*~C=A&~IWHlwH=~)H*mTb@l@iKVnJtm2H>@{Ew}qtiF->X%NS$(F$th{`YsPJbHt;^8h`|y zTl%$?$Du0I!taz z<|d}9rs@{jkC@2-hN7;I3&Bq@0J*k~i(0D2LwRzb)ogLE!_1ACSo%(xx*H!c-JOra ztVLh6sYot()nDUwj9_{iL#mO#N(zU_A)4)7^YTcL>>&O~zkL!S82>&B*8o`RD8wyd zDXw4tY?cwdXYF|lO}*AG#v=fy<#a=9fXUY!cTdVwU?f(FTJuH39r0JST3mA`$*EN0 zw4D&})S4y6EUm{=613G@CH(Y+#Cgk-PcacBZmo^e*jvv1?OrfzH64-PYaTazV?d2%@m1bGVOiPPp8woG9kS@1t7_8oxZbT;};O?V4|wf z8&lLND=y;NwA&A1>bKHM6oLw(b;Bd|UK0akG7}6>%Br~9S>0CQMDbRM-h!7+yQ_#b z$px0WuYwTVa8{>gT2&_5djOpHk(lcyA7a?`=4)b3-A+m?;W!atX#ju&%o4Pa;<06x zK6)K%cssBOX%}tcE5h{$f2w#G%z7x{7E>SV-f_Ey*uLsQ!zajJjwsV}SJVTXJE!vu z@1H`|DBnLrc93%BUy|JX`=$R^LiYa+SM*zwJHeKIp5%5qo*)Xe(JXcp6RihWw%##A_ObxL1Ry&CAtX!`mSu~*DKY^y)|n?& z7_^kzvXRj|IwGObqs3>sQ_*iSGeKI$Z9Ytu(cCvlRB>p1sJ+J!2V1bn~%pXulj3B#Z4Br<3eAbmVbtCv`IXdDn#~ne~HZ z7pb=U=2LD>QN%qj)$Y5>FlW-jaXKDcJ4r~Cu<}fHt^uHy%qZgOOrWRW$%PjFnyAZb z=S}q5q1>QLA*J*NTmm>ObnUFzE+mTWs!9rTbufWa*eU?Ybs_*@+e|OiR%>KhyWOFI zu^5$O47|k=T|E4(O8U0^);Pn(%r0c@;o1I}vYVn2-O96}yX`rn!|szHG~3~rP+i%D z#tXtNck?du+V8Z8Z7!YArq*t(E|JJMkqV0HsRL#W`-9Y>v#i+`>^@ zQD=GmaG03IMypQcO*Og8BB@Q#RPRd-dS8Kh?pst z5?ap1aRAUkDeux%P(BA`NRMnTp7t9u;{Kq6L$BIG&Ifr6}=NO zi>4%BNszQ1vj*=_ZO#$J4A5#P>4u%e2~oMy05kJANFx^U_zv!p=A303IjO7m!xR-J zH0f=@50)gDDu8+!EtH+oPpQeI0%4*726>SnGF^&COqL)4>}X8a(oHt41Q4b5B8VB+ zPNhQw5v%7yBJbVuja>{8?am=LUj#7<7sbQ>UiA7sBDi_(6082TON>tl{r@0p@3mHW zYonbS;kYp$p^qEQhWpo&Xh;YQ<%Z%(IUDy1dGh!&RRgcYf4*GGQ)NEQtS7`*$yR>l z=>;`_@s_D#!69~kYa-f`z!jr-%Qlul+PbqML?Y~Nrh;qj)VL;n0=s-*EN^uXZv-I1 z@-(f)ty`0$-dANQ=Mis2mI%{|QzMVSd2pz~y+H9epN3sj6%uAHLN>rD?TEEon)u|} zGn|XmOcb`?<{76B5#s(OA^kLR_?41v@VwQ*+N|4^J2zVHdfZ%Kc2X1a@czE^p*VRq z>&EiQZNxjqRwfPw{gaf1gjd3A9j5_uci@_ykf#?Si|9W zt)zD{hVwgt}K z=RiyQc-CjD$aa8IV(Au}nM=<5qGoT}UMj|Z=1?Xfd!jIUZU7ZPue~0c+&dST4?9GL z3-Y%_RQ*$E;JgZVCY(lSGs_~uJhtvc=lz;dSZ?ko?g8Mt`*FQg31a1OuwxxF(guL- ztiOglg|k+Le@h6)LYFK8)I=X}?T%e*(h?sB%@^;@1(G&j$L;I^UX8{-M4t1Au28ry zaH{2cy?Y3y1TKY%TX%rml|Xf%1h;b1O9sxXdyB7%Oz9S*a_*VvHjq zc^j0(aPZ<(u9g3MEbGH-J)FC=NKhP3#EI)HFtz~!Y8vU^1tHUCNPu?tfQsj5^!I+y z(B5d&CJNA(S=icwd_{yGXf8rCxTq*t{~rGD)z{>n$azp-;O^IRz9M-1%fG8_TP*3sybkB%TQgVMWYNw$PZ1XS@oN?LrGL2L?dLJ{H4ZB6M(h`ZxI3lhBaJnivzSLiS=vptU*Ffe zZGIeSs{6Lk9u#Ie8CmaA2Wr27A@M+5$_w((9wE6tWtDoM8rm{WP^(0xO#hK>s zzA&IkZCn;W+^t)A7t!+IBY(Dd`p!$n#1}LSnh$p9&AEIzg9kWvPgcx$4u2+b^1O!u z7rEYD?(X8uQ@lB^LtE7s9`^O#Iw^Y$g%K_=1TCXSk(I%i5dQT*_hNJy&MxK|C?kxA zyT3sOq0ukt6&sUH(-4h{;DpW)Vt>)tTO;mFbY+I$T{BvF5quo}Daq9H%co?^P{Fkn z>m>WNRJ(%WwKT`tFKg*8y@H=J+-K}RXL_v_f6nsz{^fHv5^`l79n9dco)gYjvYs0) zwXvRusy+nqCXjIlbHA30|MDindal19WhT%%e>1;>QnEisZiKU>ps}Ph|JMZD>-#Jd zVZ~LadlY4*WSyIptG81&g{a3JHecIC%Q*^_SD%)=EjgVN@*a{3DXj`&N>{C(h7gxw z7j=Yyx|H4VzJ|42U#Cl7s+*jec3Ooh8xI;yoSTnEpL}aQ-Ya!(0|-Jct%phXzBT^f zp5JbKud{NsgIbMEteaj_0Ym7yU}3u3yI0^U)OE?%ucD7P$aJrtEB)-+Ab+87_0W|z z)9PWtx6Rjwr6%Y1hOZqBU%zyfNB97D(|PFasPulu+c6pGa_pp}N{idno%`B{)B4cz z%FbI?n-6E9L75o5dDzqMc-!Qd?{f}y>B8eK)K9SuPoFu$K3aZ)V`ffOlgYz z+~+E^Dwz>(^OyKO9Q4wkaEQC(+;Z|M%K63I%Y+X%egrpNQaTG|bZR>bC8l)$b~g6) z$B(9T3t%&>?Z@~SlK7V80!?k>xGaqawIe49zd#3BwUZ6J$(ZCpT?dsOD(KPy8hqEY znU3XKaF6EFj&A);_ml0HS0t<`9td zA#F&1_hmWPFp#MwQK1+73Lh>~uPm3Lvc5<7*>03M1rN|8P){4W6K$i#Lpm+cDcM*R z<8o_-^%GOy^z=@w#PABmk(Y|%_qbPHB>9(!-!<}Ip^Z>-AjBmNtrA6MtGesOPz# zxS(}e=&tObOOjj0n&V}e@qy9Kuh)~Cg9{ZF)bE(hiDw;l^Y_Pl4_of-XZKSSDS_w4 z0u6=J@s0&I^VCP4O5IDR(H2mlJ=Kla)6Mwk_*qVTa6HE6Lf$1sTQy}3y|~Dyl>YEy z4gJB1*NxaW|KS~(VjZ`^$;?x1A^c~tZji=Q4ogiDLUBX0i!)R%JfK)7WJ5n)Zn{X% zpu~vKQes#>I9=i+S!xE}yk93bgNZjNvr{ZJ9vPgeZj>y48nS6JD>qv|VNl`KQfmIy zVcO~Buo6jGW(n2Acd~rPglm^QWE{fx%FS>(h6}Tj(!RT;$>#A`*PS4y* zKkf(C)ouT*a9N2m{lwu=J=0U^xgTZzL$$62f6)o~KHcKS24ih4c;}IA&H`9m;4N+plu&t*`){*09HhI}mJJJ0d zYg07aSPsq!P0YbCVk3S)L~Vt?#&KW?y^3I=_FM$98!CjUuPFDchVF4TBEuBct*A^n z55vFcLe)2yCXHS8a(8z^^!mc6JUNNqwBc5@zTu}{t0v};a9WGvtth-X-Pq#^aANtX z4pL2g5M%UCh=NxR!~;Y8`f!m%)G=TtjY@^G69pA*X2u1!OVB03pYX^u&8U+e)eo^l zouo~uHPOl(YnCJm2zi)CyGq%vOR&tUG7K+uH^ioSc1~^-o@p~eeIy{`= z0(+QjxH7eRN>@(}V9k{vOLa*pFfLBZT6#5yioH)_fS(;Iiae$im{m#GMUsRbHB-66 z1K%oV>;_uQQ+cf)_l0PO$xk6?;A%G;7PcG}rj|%8K0aeN*9nuwDNl|`?X$O9I%@rp zpLQADWfh=2kexCD9^-(B>xcOC{g===1)I*h7NKi77?YubXsU zSzog)6jqFJH|X-c z{VL;dU-}uD@8099r=yV|7R8xRTNib4WQiPB@mP(A&q|fPLTz7VQ+jXv4b%^#4PD~N z-1=eehqH)1P;^-uYfuVos@(qOxT#DbuhhA_3x{Ztvr=7-J!Iu>dr0J$LuGLcN{<1; zWSjBlwHY@l=*vgFHn(Ry%q*X|>Uss@tjlJ=#wa9b5>gdqci!eIv<4wJvfhQh^a*%^gK!V1;~t%PPWcId+iC2hKN{E3> zXwKtMOQTQ+fzT(2P{-p?C#Eo4e5e~~n8$kP!Rs)e`Y=Cy*o)&ZBvW{xOn9(Sc&Jx+ zcuII=eRwoJJoY#o#S{@Q6Om{Xk>nMTk`j?tACZBN$U2TdGezdgMCKbs7I;M#r9_t0 zN0#9uD~=;EOi|S`QCOp>TCb@3l&Hq~sAhar>v2>&Q*@_HbhlA-uUB+`O7viT^e{ep z^f(&F6f+?cGi4Mr;}wHXiJ7a9na9UW$~;+Qid~i=#I72}u6f0-r^Ig5$8O`PwEsP z0|=6e3kH9iAe};9RiI0_eS9rWH=!0(j^0AS=4ma5Op z-pN$SNmv-jM5D59%YYZXGg3G+0W`O)9T5>G9gTz#;pi3CvxWr8{C6_-ahderQ#)m0 z_KT_V>)EB8XgNC&fXvQALI6vUoKX&m28_lb$R7>{&{>pn*^+qZwqQ;k4thZjE$NjB zb%5Ce06!`xY8uLi0V-(-0E2N5V|#YFCDG?ER*aT;2Hbf;7(i*xN?r~&P))2N2;7j% zm5fA#baUb{fb52qe|v5mMls#{4FxEV=QNXVgEZsI8!q)6d3b*0ryRlw=>RCrY=d+` z9qdqI#MJmkpC!#El9V+qh|eV()&3?&{ml+CPp%&wi)0Hj&iDuenCXJZ+w)>~3Nm3? zs(GYjjp$gGB7FxCj0~82OFow%vR#}jzn;2$!UKPlG21|&>_D0=7`$ztGu=Rbp#+Eo za$cnc&Auy$)TL|TN!KzKUKrrIU6k77Kw5r6(fy?~a4}12F4zuPcDaFa%%%JSsQgi5 zP#q|Z@g}b*mwibSH?YtEhzwd4!t#nE6I#ScXTM~O3j#DOz(6CZK9J^XoOBOJW6({F z!XkvuQxROwddtG9xcZAFWKjxH#GcrAQJvXw;aF7jT;s^ zFpYyZS&s}N&%5QY#Y3F(V=|d@Rn-5X_vc?WQ2eD;?4NsHuFWy#a0bPj7WW91#wH(j zWI*7ynwcuL<{|Isb#J6Us({t7+}kuURB}Ew^*Jb>%b3WoEvJzFcDLygk@l4Bv9o@r zKfkf|Cy$(w!B;PH*?;P?2*GhoS2#>gi_UokCF7tE4aXZFWnWW`+G$@D3PPKFP3ZMH z)!pw>s(yIc+u`8Iird6*>vEu(R}oB)g@qVWKj3pZP?%w0*vz;TLMgXC;6vw$&j}2% zD_r8I2~1h=J`E^Z4$s1QBA%vPOnDg2T+I~Wc#= z?=0dAztQz@JOBJh2m9QM0fi+mN+SH(rY-EKs_$j@qNhnB&*vU)KCN4PCbV6<`a-^<;Ztb(cEd*Q z=6Uv6E%dF?Xr}ai^S5Qzt1TycO}}TKm{yX!g7+;4m!o$&V9vceon$IUm~L8mQ&&Pa zjkse~FO&Z8Za1s+ylX#m6vbXY`yJE0L5_64-2t&S;r%}GCawJusn5gL2Sk$RmumNj zo;u+;$k;{4l^Dz2C$u!}u=NP}7VMO^+E=b=BNN4g88tV`n%O&HiZwH4$vzQaaJDmOUDzk`hmzT z8NML66F?PhNz6~$3}(Ot(&WG6DCtxDe9hUHjbiCgE?ki&RyX*aN)AlltCOL6C*-c1 z#i@-z7fbJ}P-*Pa56^HFjtxv$=zca0k<2Y3y4`S9t%pFe(Jemi@j%^SPRM1M+hp9B zNTcRl2IiF8qE6@0XLRm21w=31i=F7lyg4ie;i}>VaWT&BOJtw%s&v10Vr7T(s1HeR zDQxe)@?XunG&b9P^Ts$z<5oUBy?4Lr^}V>y)wzuPFjbAnyYa7wS1&gesSAdV6B3e0 zK7l_OsmV0%CO+YP%w}bzVURnKSZw|2%6*xBW3s&@B=)hWD|5fuX>~G8KVOW!q5mNj zeSDt;-?fB>a>;{^RGeRd#CgJKZ~Qh5-&`Q|c3|YG&)f9HvjUke^-sVv zqaKZKGe_qsI7Tf)eJ1v^Y}!9FuRR#^JJruVSuIo~sN?)6+|WQvA)MS87s7XtP4&3w zCiRuO;d%!-^k4Z^iG9W+S?=X=#0aR~zH&F7Zz`Yi>pH@~ST8AS>Wv`yi(*VWIPLcv z8vb?mS)!LPIQ2%Z=Jy*K@-(K4w-5A<2qPtib%WCtK8K~2l%+;}8Z*^;!IXhk#Kz=R zhMGl(G!9RNt}K(K)DIq(2iXak!?^AP_?k-3H^JtNIrkgaJgx?e2$>zF8TFEZ%A-Td ztWFvY`)+*4yeKcT`FU#8wJmuy#%#+%O>=G{DXBVtq|9EwbZ%PbyJ$sBx#Rt)xp#A( zwLTF~pWOB}nVIvftDhFJ^JO(%%3`SR{#y3rJQ01zeN;K<|HMt3^~1{YH?lRd6fS!9gut8*tRQbs!wEgt7x_?0wwI%b^7sS?x^*6r1Hhl&_b1+6)oY- zZREvCh*mupE!5_AAmL%K48DUr_!vaspd*5wvtE>5DP2f#&UqRcKwg3i3{oDplsizS z2yXAMP5{@4A(ef zkzeExDO5hYRqVY4OQ;Ah5%qbN7(&#(e1(+@Heo1H(}oV?iDrf|)&_-AZ$X@%A9u0! z?ywd4uR>Oosohc68ydbkUG7JYB2WSKw?8-nw|mt1xcx47ZI2Q2^{E2BY0$LYGxtPmlAKs^-Xh%de{lC!VQu&Owr|h` z3n?w`Qmj}h5~M9wth7+W9f}n9U@Z_JIKiDF#oe9aP&827-QBHar|-MwdiLCF&b7`y z&$&AHT;+oQ7~e6*=U0%~ghLF!YI6li|I`REU>DOOem4Pcun4kY9`y#7{pM|=rLh&a zd^+V=3%?gFaYSj$NNjb7S^Ol-S6p3l$w9xCmd_gd4p8a6;uzi@DmjnybQL-V^J)+K z-hyLiBsTha;c<^kvaeL14#A%4V;XBqpbI_5p^vgNO@`$;lqF@rgSDMPyTr1n+ndl0 zW((K3TM%h!?KUQpu9$<^NHL_3!fZXs6N~(KB|Q3JAgqoh$N_G}XK-;1oYt1!Mr1+& zY~m#xf5X2BU=tnomH3V{pEU$KzzDXP3pxDX5u{o8$tPr{#F!X+qtrJ%kt>b|ltU-@`n#adsb zN#EC(zA6-cZ=rtg)%{dqe(Ldlnzeq~lYY9Fe)<&thERWFb$=6>zgfKhr&@o@Nq_50 ze_INKJrv=nj&RQP(S)eE=Bm2);Cfyn+$aJ(*aJSx2Y5jP0@MQnVF5vt0U?(G{uF`1 z?15qOfkb3c)TZc1Qt5C8M3f>7dizBvts}y>XRm>G4Fr?Tbp4|Gs579VSDlPd-CB&pzzIH z`m>(!lg;qm%kX0g%ZVhYoXPD7~_=@4LtcUjY-4r^8rs9 zpP>DNx&ppR-UppPn)eAGrtI-;@;_$@{ z&p?hSg#`K$koQ)c)fOnx{BiMAyykI?Bpz?128~u#Y_0;s{Y+4^d3=fji&iEm(>y+$ zBk3ijupcr}lQb@5ksHKM|09o~lafsn508mCxy(FvA`ld_CGhSz!9Xys0goyEie_Q! zgRDr(Bp&O8Pm;lhSS>teI3-n%g6bku(y=5%?AC|J2`ODusV0Iv!F;JM=6b&w>EQ{? zbdg?XZ)omo@;(TnGLH0OMf=NAEVh<(F?~$B?R19vblrRZXpjG8ex%UmXZ)|qz<=QB z{!jB0_2J)}AB215Kc+(8Tk1Vq|A(p2|1^B~zid&V&Cf@3Kt~9NS$4mq5Dt<16>^C2 ztG^d``iBGKK$4&x=PShkvthUt-V0iR4-onsWxQ$e`VZ!VNpcmqESjVe8ZuHh`lJmu z6cbtUcQ*N+ebIa0Q$C*L?=e?yYc`zE`kYa@?93NCVI1_`ROD$keIcF6)S|Gas)~7d zqSXgwH_3a?Y~g=#{>ZS@Q?ZYBpu~Z3LR4cTQ)z}@d&;{=2wZS7KBS>>7%cv?)|TEuW0$RNL8H!yAnQr zidsg>cHv?ZsOH8qCfga_CkuO%-D;Ew{W!%Ir0r(@($eDnuw<$c9o1myn_>eTh<`S& z3{XaicW&H$|!5fw$pogKnf!yDgwis;^p^pS` zoJ9yDHPk4>dmBmANXGKmdTZ6(@(FL2etk!kGQ@M`%iykXeChsH`?I#m9{WDJ&b>Kzl8Pi zogI~K;gLQmdF|s)3YX-^-HdU!Wt}YKz+xpcm0?>u)*P-UJ#6mcPkIFwEFA{LS9VVZ zpNHR$88JKqEq{)uK6IP&8yX*>!N^cj9-KE5SpJ zS3`)B&sRHN7d~I_wku!E+6~bQ{<5AZ`SSaA<>2lY;K9uA-)t?vacr%C(OQ^$Y7&@C zrQQS~GaIavA}9@{Pig@JE^lrt*yIpSgS~_+x7i9wMA^6A%pJb%ky@;?_2Ye?PN)TH zr$RHp1RB$c9L&TnI)@MvzIu=xxn@SU1B8?k)4k!Ejtjwifyx4g_hMi&9Q!hW&50T;m#!Li155xgJGm21#h1Ua$Jd+t}*lES{-#xo5x2;=FIs8J9x8KH2^Fp2ig> zT1o|Z{*#2hknAT}Q~jT$ekQ1LWwBR?D86%cNQxfKhJF`$ZJqcec~xmc7Oa+=7J&l-FN)y3K`L*H;$&r|CaKa-|cl-H`YQU67O?2pUer49NN1oCZ<-5fBs4Pusb_o|v zmDKIOqc_t0nqbZ74B1zlZ{tLVv+2h2*w@SyUR)37Mpov(zk6z~`YwMg&+UWlwPW6^ zcFlKXiB*MWO&m&NqCYE0oN}Le7HF?1PNWTv6^Fmee|L60+I)OgqI71VUvfNFY*gp=O2P7GM~;ab{jWN~#rba?Dj zEM~V9Yw9LK_Z^BFbatK98ph77VXXu@+p)q8>udY4pO5BGKF2k!ekgID2%f)go@hR8 zD*1fUw{Uf>)(o(=@mkr@;Rdv{fS#55-0xq+5vy&5d@jB7Wma0k)2eNwXfE}C(!WIH zUfa&_yEH&rY587KZ3mHRe2`lIGFiiACm$I$HQ8e$%~5DqY^~ixM{N*YW?MH@2%Fl! zaD|Z#v*#%*e|StGJ}dC5M~2lmDvRbL)eWpSr{y>*%F-AB)%c+gu88jr`N-#9*Jb?r zB;jY_N1BSO0bA7*hGnG+15jyMbL3v70GWSaoI2tG!QJH`9}Y z=Pw8gt(4I}k5!8d&Ae@ZPz&R1J`9T{(#lt4b&0??9!>{p-NPDcg`AQ3lFjO)BlL!O zO)o6E#+CpNV$8+h+?spK`amAk%!F(j7JZKd=;>}N5w3N64bGCEcrC^pfWd|FS+kvF znihdgi!=%0(UGJV%_#D8W0UU#&Y-qS1TY9T?RM!|@k;B0ZLS;L zq1Sm`!5r8)pq`v;-Zn>CXFG2klQv}E=I*Z$a#4zWyA+#+W&)%)2_F~R_hX?DUUswf zp{|y2=^kRl+h3RJReJ_nVZzwc<7=}UPQ@OAKRdERdrF!T#6xyQVh27| zGayX1OYb=(LezEv+~R_T4p^NfZ5M6`y0J(izu$?XT8}J&fFT!bLIgIv+f#4yoQfFBPkfSLKCV|_K0~2=9M?-LWtK584faEzi z{y9D_0C!F{n3F!X=HVUskAO6C@YspZgD)JQU0)3K9b`IA61VdBx^PVd|jj;*83{!7_8u=JS(X{1O)D3_$vMAh2J@dtx9w z;4au`?h1?#OFQk0hPt-9EnFV;S%)vcg%9Qou_FWd=p%7nd z;9*dhdkc?$5fnGh+G5WN*W z=A<3(nvj@~kX)CLI+c)im5@Q1_)R1+TO%>oH8DRSv9K<&cq*~ zRWsby{|8o3-vytU`U5KnjUEK7ZPW}cqhSRLb9soveKf2fZF6}0di_`R=mjP|%_S&R z@*VblP8xY0o###vdd1tC(u^1GK%$S0Xjnmw*%j+`lx%P2kEm`T5~_#&6r9m~M)gwU z_vZ2hvdnsCe?-0Gh{?VLtd3XYzL6uk@@Bc>&FRTh$z;M7B~+tNr@|nN>8;8cL^8bD z+EpB97tGJIU1##IDx8Vezw18J5Zx=9i?U!$xuy&s9dGcuAI7aGS`n^jX^|9r!ovy0b22wBjlKX8psL8STkI# z7Ajp?6&wLo0EQ&CdEw*tRA*UrOfQ6r@mdJzA3!kNeX3QmEmv3ba)M@5D*Pebm4~gw z60A~zF~KHO#;$CtW+n=i-*P!JVfLDn#<_{`mE6qKA6v-e^+^BR!u4DRiP~py^P-~E zT609!Zm&fmMR_zQPkpRtVd_-fHYaHtPlH)Zg=fJ?;$Do$qQYL)%G-j? z8ne%S`}JVgzWs*7u15!rr{fj}O_%Eh2hF$VI|ttZKyADi*ruws(x8i|!&ZFZ{=;@$ zxyI5C@H@hzyABGqGeqoPGwr|bT!C8XyHPATp37|8W0l^`( z1A!jwRt!p9&k|i|)PiS(}Z}i+S@CZkGkGJMPOl@B7bc=K>~*Y7Mxb zSZl5bi49V&K7QFuxhAajCw@`;6TcYoT(5jn*1cZKvDv@cPOErUzg3z^*RWkQ5q3UV zdq4GNul{22=0NX&uJNE9i}&`ZgW1O8xS#jH;|TSL-t*+=bKYNPqwjuIj?P*^Q;u{Pz6D>hkyL!qAu7>m5A+2J|`R^3WGd zF8$vR;)SN0UOPh^^|z&jB_}?VIul1P?y}cP5;#NP*=fM-l-#V0SGLE;xLlS*Xk4fJ5bB)WXg zu4)&gs-*vblD(4$UH;P|Tp?{T6MB$%81hgllX48yMjT`tYHPWIw-(R^ZH@@DY-C<{ zM(=5_-ypuM8qi}X$V=kdBmKEpnC#j*9#WM>AU(dZBtaGA{*?c2(u&IeCKB|B0Tk4U;wUOJcJ~9&P)R9SRmmsIRZy(F5y~>EllQ(2N zj&I}2=8rJ%Hy+`OjQ2HR%~BXpRDF^--p?xZ>c_x)xAK^I?2p19@Lt=ejwG+#u8WK% z^l4&N#2wtOaj)d{xz#(QURvhx?$r%F6*~Fa=a?;l(cAAu;)n)hZ;ls>ys{E^W-02)8u3YEtf zahb4*X$;t(m#5$qnQ<3rj98zSr_x%Pe7Kn!Ngc1u6SOk>STH@=OjcEsVr6ajQfsoj zy88Q>m5rL1_FQ#rZ3Ah%eOwYnAOA%iDzw-!=jGhC=0*MFK(TX8-`qYYoM`?99*p3z zu2N}wqc4=#&A@K{uve;S)9Qes_tC;>Bzg0hA20LxBhWRE51Q#+;x3)OaD@x~j)Cl_Ckc~IMo^}EB5IAj6re%Vg%Z;QAgScZtzc3cjW`oBRt5V(2= zPgq&-hh03fuj*ZoS<6CgxQyr!@!tiCvBMm8jfi)koiFH)BlKvDUlCq)bIjXCf3;ku z6&AVwK9)boAbE{TZ|cXx*Y?4kA*&B}YWkl1E`QWQV2rjt1FOFdd>3x@@e2~TEd5VX zF8Vi~-CPZMp=}57)ut5nH7ekBWrp<1>gBXRQI%73d{Q)rEjUu6qQie#0=@vDO#@Vy1vIZ#K{H#kwYh}ou%7!HIDl43>zr{vaDV-Q*=5ue`7FS@=0GvJ#r`z?y z7L)J*6AekzRzh}ki4E~!@ogP-NbJuJtzajRQ~Ocr5p)%U7@G~N|B478<~zG&fU2Uc zO~dgQyB)hkJB33De-X2#Rihp(@_If53kAlS?4cB0d~iKUj#J77AYDd9Am$-iYY&oLTR`k8c3V_{}WLd&4$>!O~>hDU_feKdbMC*lOw-{v` zz$uSy=F9;JSF4jiL<`^S$fIiSqhsi-FE?d2XggC*jNtj^No)%hrCX%)-~6Jr$uWUB zI>rOab67f3@ba7nI)1HoN4o%68n%L$Q?e=c7gN{UY#gAv6?u(Ax~W~ngp&c8z(>cY*+}O*oqY0k012dE>C(Zs5q-0v|*D*5qt1 zU9ewWy71Q6Xv@JA*k1T<;!)&7p-D1w>a47&sBgmTo!4`tQnrI%dxQ z@5_Jlm!W@^|H}Wn^55SM6L@e1XaVXtI97#3!m-L1?gU)$~VE83qdN1KzEaEE_*vrWr2l9gVa)s{$f zd+>n4I=<4v{Mr4FTL4DPM8TKs z<(>oX1_a=H&%U{j*4G>v#@$G6mUbz!gq!Qqef=CVnMe=zrO}N}u6Hr2;v~?l@R25a zF|fle`{cCYMzx(IrZ+>Xlj?=kTQyAW+on5}!(F)_mRz%O0TAN%b_?p!X^)4#K&qMO z0qy`K4gnQKK#$Gfn=w6K2I~=BdJ90Sw{su>F=LojO1>PN$)Y+&Wg&iuA&@1o(Lz9= zDrn%&ha0Hi_}TTW4U1D9Bk>MG9nWU;d<2hUjk#TtS)NQn9EAbF#cY+rpof}%)PM8Z zJex@-2*(Rj`2s+L4J<`=M$H0T*HdO63oUs{fsR@UB#hISeCe0XbM=kDnFbNRYGIq1 z0f!%q{ftKNyfTp{p8_&Jsk(u(6a7Vl`R*_0=7fg?<$qEFTW@?~+>Oc0PnRK6*x*hZ z6t$pA)?6bmsoLhWEX|4KlrLyweF-XU8tmYTDCc}>k@>z9AzRhR#9356{FJ(&dd8ms zS-To*v0t~DU9exjTfOt|WIWel3pTmsVJpbAEkfwjam|*Iz~Lu)!}H|!uMH1ZS(l65 zt$r7S5!Z1SW0bgk_rpw&eu5MW;Vs@$NZ}swi7kjlP7(%#4TG6**1lf8ln1Yvlgwe99z;R%qIyK*xE; z_B*%mj6=h#i#g{FTH$&39i6{qJnZc=($_HM0BJ<6auD@AY&lrk8oCnk?%CB+m|9rf zYQ%GE*NsH?=BteaJ)Y~W^c?H@?X;48x1G{BI6S>|g z_yWB-Xdu43J)T(j{p)B&`TOtljf1=2cRTa|AbShu@qq*UgnEI5q83L~#T#O&k4-7x z3RFDwAx%!hc@oe%wYCq>Bw*auH5G$|q2Nr$I(YBorRGx5L4spC{>MqF`-3QdLF1*} zo}8xrGbCd9!~o(=(aaR4?Dkw{84_bA!zdIHAjhTmAd3A3+vhzmj1DG@Dzg?YH#_uG zAWRh9>|Ol!M%#>w4twPp^p;RG8z_m?T(KfpcFm*6*nXD#Ir0jeZsm7TX&%e0k3|$;sg_4OzR9Hg z+0!dnZ68zoXTy`%tJypfTYefy=klXlcls#K9h;TcZ>vwAs=~)N+L)j5NB>9B6XX!K zu>cXrE3-c>s&Cms)JNq+g)AZSQ?+#&V6 zpY7QN$IxfDBby#~Er}?06#}qhAkNr~jB0ezpGV*hhR;yx;=u4aJH2>9b??m(Uf8FpD@Cfm#@>tq(F*5bx^-?jFM_S>S z(C>iy701hBNo7o=#R7&gTPiZR_e_W*G-Tpc?`7&(eG=)@oN^aFqVpx{D=DHAh z{TOYD^G~t4L$`^h$+>-_v4;7xwz%3;Zfo}ecirpqi>9Tfk}o)1TEEvP>hC(OzYrJd z{uXkn9UI`eb6;xE$5Eze136p6X)W(<*vGTi{wfWSQ(7iTy6j+Q^(6zB8A?_{J1=1E zG}RIyD9YfzRjo7yVftT6w|LWz*2~iHPoYW-wdq z6Tq=JLg*AdTM3Y+-PHdm+(8KlBg0Ogk@)z0h;cCJvt!yxqbYX>#xVbQML=i>@ab&A zsGHdny2C~6rybq|Dw|lejkeh0@!o{6czDExm%j)@E4aQGPMKQziCKRN-68X#OS{v@ zMR&dMir1xzL-m1ALJY<bxJ<*_ll{#Gkg#7^puDKGUmEuYhFQEd1ObT)75 znbHDKCa&>6JRP5^Ot&6%wG)zsBGSZY=3g%QbcG(;2~99AejpR372*lF^L^w!r=u>? z5jbn~)T@=~L$*NM1q8_L;Q8nLZVq1Vd(qed7 zUtnE+`=5llT1Ug4xokzWobt^!_pUx`E7RHa&yh|9+wnz!_&GoZ3OQF8X{A^c1mMq zV@dW_@a|({-9^h@a+6^fTqAv4E@5L$z-QS*>-y?X?~u5MY{m+7PYzdO7050y4A zv$=6(c<2w6Ht>hu~t{kDMw1~02vAf-DoLMp5!()jFvn)fgpRiP-C|c8v6p4aY0_-ybWCnibceIQE8hm{uPR6b^zxGx z-rX0D3$yMm{87P{smFb@I~54Z9m#CQ9*zf}Orfq+;21QZFgTLt8bD z42||vrt(;`hWr$~=(j%wiSM9=>PE^IB~>s}d&i_wF zHFa;;DsE9oKi-}3=BTLq-FB~lq>g)n^*vg3P8QY#AKyGyOJIETyzl|Pdy_}STf|2Z zHOX2Pen#Sa8DS^<0mG9^D@yuk9FW}$`eY$G&5JeD#Yb64U<=jXCs_%Uq`~%kmqov8 zohk+ZtpvlA3zxVGw&#?A851{NqP;p9ZFNhM+j~cdB*gKJ>QW%IJ~Bna0!r?U#Z`!s z!iLB&U>lCJ5^*b%#BrpKGlm#dYzGtRMV7712;dHNylv?C$4w2Zu1+G zhI202S5t8-JL5D@DbV~w9BWR}v3Ksbcq&8s*l*R>QMuvZw)}!h9{bJwn)O7pqDF9s z7FEDGr)5_5zUXdQ4{O10dB4!kZUsvA(O%`Ks>NQ_q)EYE^{n&GUd^Kaqy2xc5c5NV z(1+eZLrdZC+nZM{*cuxsIz|1dnv5uZ zv81-PtH<7ufA<~FX-s*=-)Z!{-d@$X-b-5N3H>M7%|Mb6WfTA|f57VUG+<90uv z3QyQ?Sk=r+2k)X4V&84eqIZdS?UEmTF>E>H{yua$oR`jZ1*yhUw-$}=*{>%n^E^pT zYo`^R%aqf(-pa^%UH_+Qa=l$zLwB?DmqIMwc-F9AeG+!F-*S;!Iq>SfjmJRGj?(E- zFY#A#l+qJo&!Zt;y{3}^xi3xUQ|}gu@3zeoG3IB3= zlYZkf`JHipC_q9y<2JHKhDFpaP`O|4{sCDluGC==Nk;~0MNcQUTUn6)s3ApzeD?jY z!w^;(BfJT-E`j=p&`*}kGz;u<&^+8vDhTJiXCWGu@n%i|vkvmqFF_+JShvZo*Vz6m;x&g6Q?sivU#uAU?& zAARUG`l0ydPt~Mjjmrt|rEdLkY?b9lJ_nKh_t%l}-49Ioz4Kn0l#e7daILeY2P&d_ z41e|Pt6I=K`zJ}W*c-w%Q?LH?>{qbaLCmTYkxHV@mvWZ34{K(+xWO}m$dgQp9hArB` z*aqV}qG<~T@*_yMV=3h9=$t#d;!#-J z#!V$-KebHng~6n0*3%Fy-zf0LE89at34p>5l8t*~KGcUQ2;qPlu$()!cqBpKINeKx!EHT&$~&5ZxWA1K8o&3b{S0BF-TL!@>v+(H>^kUHWmc_HiJr}p0t{v zWsDA@Lv5ZYM%Z&TM|{TKtaYynf#deZU_hk*Qs$rcj9F-%h4|Mx>t6)wK4_(t^^ZWk zG~dS@UhP|1{ulbbB`(LWz4b5jeOxV|dZ=b_r0);?zqJ!SJ^6?JA3m@$T(!1@rvFdQ z0z3w0cF^?y(p8i{>KagghNk~BlI}>Cer@nV)Bjlnix~5KaH*$*YSEWC>uClu8Q+4r z&TxjP)|H%yj5-rm>3r?Ff^V7cur+#Pl5zz!{a-Pw)@l`)w}RGLY$6^M z?@&~vsx(JRiliJ_&JY|83{1whaKRAStwKfThsps`>JI{J8QSnmS?-8lbHBVW%YSB3 zD{IE++YYR?TRW!Is+AZ4G1}c=}3gwnJLueJ*I1UubE%r6{m-&bu=)Qsbxo9(-N@aAVVP4+H6k z1FWS2Vk|+%P&S*3;d5bead60cgt$zP5(yx2YH5Y~oCJn4y?(nm&=s;Ka(A$D*hz8p3I3x1dSUDI=8tp$U zf8VikM1g$Z^yh22KYK=HE2lAaY0s*0jdufQ6S|0|s!5%2E9WUQxM%gWdDOu9jP<); zYqP>Pmcnx)E1oWMZWri1qbpXk%c3u_b?t&5^XJ;dAmPEwl|boc*lM)0_2qCpbBf5% zB=R}eb+s@1b?fhgt=+bA5vihE`89*rJIN(<4LcR>&qViXX2A9PnG^f&``-`fJPukW zbe;@%v)SApi#%EoKXDeLe|jqYQt#=Rlqvn`d5_Uh)7i8Oy3&hI_jP_>S!F7t+q@+Q z%~yNvcg@$w6UukL%*1r-e#f31d|yTH8UMP(orik?1@r;;dnCT6fL+=i>0-0Vi{n2- zx{%Z8;yy&{ENhfc`N|^jDTNe73hB#6la3$J-bPk`=*Jh5PG~CMPBne#4@G~STzcB+ zu1ksE<+eRQK{}Z5BLbw9mLZ|)GA#VVfr`F{_Y+_;oIGy=KXfdUel>f+VGuy#91S|r?%nzRMkQ?(_BO0Y5Zok zDt^K--$k$2Oi}xhXrczE9oQ-C*dyLIqMi$ndi@letM43Z{FK z&Y+Vk@keLHMyE6X%280uABo96P2l+xs0WQCpaXT3W8MoJ&XLsS(QKME4zZ8;@6s^^ zb6Ks-6+_+Lek-p`PF{_9gCcWZkzE5qpUVQy zS&0Ca%~qmlQeRy`t$=<^hKj$+o)Q5~)Oed|B09N(LMcXgdz|c^1?0YUdu2ZyxINvebdMaazca zy|7Q|Bq5!&GSu1qemrJs1Xexv@mt8bRVoaC6$Cr(yNWuq`qY3Ew2gLp$Cw9o210j| zC?aQ-sN`F4A3|D*WcYljRnqVP5J^0HTa5dJZkPe80-3K+o6i^YA;Ju;Utj9`ym%>r zVgh&(VjEy8y3}L)uuFb>Xp8llmkJq8A)x>7*FFF8A)x;!&zk(-qYco{c_5k5V7D@?it5}lnaNgNj#m4r*kS7 za|=1a-Oo~Q(hus}O@V2;kn5R)xo)}dDOK0UeqB2V;@Bvf3}a%`-jb(~ipr|INbv*Ielz`Pjy}84JKCnD;n=#F zGnubmO*saz;+auNp(}YnZV)4F2y9s{G5-ZjIcHl@hbr;#O_Axq znDDx*@h1eEzt%bIW5vnCN5y$F8B}`>&TV;*(st_OsM0(Du;SwBHcI_wnCKLb*_><= zZ~emf&92$p3!p9hl*GrhWgmU>zjL1p)3WtHczdt35(|EA-ZCSH-K4aU>eKG4eVRbPFTi~3Fb{89xyo|ZRoma z3QBlzcS;-R#CA(+Uf=AN&!pb$qSrk)G)*&fw|n(icQ=O(1Yd5CJJAKZll~jMQs8_e{O5({P1*TET9Ia0bG3keqxQN#da| zyHYy7TF<|g0*43*!VCyPzJrPCC_r8*gCwq}gH`k>P$eYeL5_SUr{+4P>QHYsRCe=hwmr(stsBK6l&4zrp==4z-tUr_PqNn@Wb(t?fU!Q>- zDlhcl80n+L!boZ^FUw>ffwVMcq38Iai0;;f^`oVLxx#Bhbhj>T*O>h|NAKIn8ts%>!C} zGDxBQXhM6Oh7hk!Con;7kmLsXKS9@u7zVKD&~Lm$y+*SPQEk-I3LxG|3}uH&AM(S} z0ny2&Y*^3M>phhb5x%i+n&_v9Mh-`umX|;@cTVQylbFi=wREm)MNr8qWjtsv(# zEb_<}W$xVy0&O(bZLto)$Nm%Sz$Zn!NQL{9VhR1PszYb*P)&SwEZ3l=UBjZ+&r`Fq zSfE9kE*6O`j$$ly^D3ZScN^|n#wfP8GSkd;MLb-T%!R3Az7O3R6{TqwtP2; zrR6&B`*Q+FF+5%?1o*u?ia@Qo^j=Hj)UC7gPBHA9fh)J;*l6Vi&t8DwK8Ces2dnK95Su~?8oYw z$+2YEIZMcyP_nj!Q?5-0&pX`C zho{xtRds%c%T)y2Rskd0`o@FUecR^9p-tK)OE7Hj0MkR5N9nwK3V=v$T=vYDqwrB83G|H9li zJ;Im70<9KJL$@QbdR=(8ps-CvF|}qZTQ?u!d$g6+@?UH?Y}1kjT}U- z9qc_+QXY_23?K~U<135_LEOVsvpl-%q>#4gpt-~!N%K`L#Q3UhX4d+mi#@0CxHslg z8BSGLV{A_?*M#NC0Qo{1khO2vTc#We znzE;hOJA%@!I{&12$2qNB5Md1{pO*Ra7Q}WMju{;-tb*DF@6zF*1J7KO3=1>gB|oA z5XY#uGbp0`X=D9LgOGqN43M>+Rbmt??)qiTGS%l8SXRr;aEq=HZ-v3 z9rI|bspXwgEO&&&pxk;T!PPtSN%VssVib&otV)<@$L?Dm6d5Ud=tJ$GAS*;uT6Avw zK=Nn{7s~30ywhT)o>l>J#8%-2t`_LYeG(N#j)LgszEOjA`a!QN$vKE(e$)rs?kPkOt`v2LuUGN$D;rY307S_Fl`i z@7ZgwbMCq4p8Glf@)@2tp7;6n_xrVrrdBy6@F~@-)ll5>ICr!$9eL27;oRm^j?4(U zt2|!|Wcr8LGb146M_ml|8rZ~59bJ)?JO+4H{o(IMeZqWHMcUE0d#b7(!V+0bS&Alx zy`SjdOrOd=Ug+hrRIRQ{zD?5GtfMWsEURQ?;KNy{r3T@sUV9U8J5N}TPNbW-{Nx@f zmG*SUNrp$u*7jv{>TF=JK0H%ZTtj~|7t7u{Om}&+mc<7IG5-U9FbE;wVaoe$_UPs^ zj;e-^t-Pf1taF~%)9Yi$`b$8>N*;)rAA|3dP-MU7`QfgQ^Kz9osYvGs1cKCH{hKlx zKKVhZ*C&J?Y`xWK%MU4Toe*`}YI$6QXQLB)As2KEFuZv_yxa7JL}Kqd6Z3+op(|5T zU0ZGTZRevl^bEl!W4q&GLEPSzY1t#&9mJdBaqJI`l=%BP^SsuWPl?Q^-Q9j4(k7lF znKg6MX1gnf=|Y;a$n2fK?GGt8FJ#=yn$<4Y{+JEsTH9ymbi1}c6}4T+ewj7*Xmz{0 zib*1u1cI24?DV|3DFK3*v*ur%-|21hktj?RF?+bmYuv4*TeOqAVE%NczmHC`xN%{@ zGSX>aN>s9}J8RKCaOd+3QL=nuVG-5uG`Nv1S+$Y%#kp(e2Reh+c|m-wc39zLAa4Kq)y;!P|-)GtT-tNdTNGau7o0YeE)HwH<(xzL|D*^H*nLqhklkf!QpFhmt*zzAr*X)hhxZslx8?_BwsWQdv9A9C#Ka$e8X|F&Qk>(sq5xSn3U-P?F`H=jXf z{!RO(l`fz4F-iTcc5dgDzuaJgU3d4h{jBL}c?DT}YDsEaF zgo7x8t^h$VjPS6>^$`d0F$eZp8dd~Fgp-M|5+Yw1(Y%THya{X3L$ov^Dnam9!bmb{ zB1& zLz>(*bx77K9%rOTRw$2@G@@;fM|zV-4%x%LiHO(n#GyRhj66%pp4bx4svb{fh`Yx$ zxt_!QjgD87fY)0Uui16?1P+g&X|Klu9E_(pqBp(51-!dCygN#~2X#EMr94OI_k8kt z&;Z~$s^c@3<}pY18BfEO(R(dR`Btd-RvY=Q==eI6cu|^so146VUSFy$5X5ZJ+vD9A zwhv#1^!i0Mc{3gKfVz9lc`28bRDq*e73KN#qj>UZRzKl6;YRB7N@Afy^B>=2+G9;{OuY;PENK`>DNV&J2TA&;BM3R{7{91JoE4>3&-M9zem zH3!NI26Gw**&YnI(d(m;9{SQ4#4&s5-VfGu2*%zI!#ji>R}Fb`Kg6qaFU;pyh@Uap z=wN7&V5p&BkcDyhwbJnLi{Yr!P`mIT5XX!Wj7Sa-ji2#%a}UG)3Su@6!=;A#_lCXR z3M&kc^l}KVXb!iU39oSvuNI67J{H9k8j&~?+T;+?Y#iZI8r7~E(Xg?Pd(ONc-Qy75 z*Bek`99h;IJ?s!UIuop86ZP_5%*(JC*QYUNq?oz%7~A?7zNwhygRyH4u~Xr(3+b_| z&9N(6vFkIjRAsR=eX+EM;=Y8(eNB&Bb1?H6iOa4vgKo#M9*SqvjptB{=e!gTbByPj zjfY3X^KQrU9ZEQ*Q$ zyOi=kH|4QfilIr0hDQoABjsL1ie+Dl)pm-tZt9iagol62y2}1E>-rPwsQ=%J%aQ4- z^{3u_%GR$;q2gf^?#_SGOnm5M|EjOZa_?Q$1$9Xg-6HERZ(e)e`=VFru#^AoG)nk! zH3@QxsE*3%Z*+s7C$`?R9xwA?ICVSVS@R@k%taDi<-TZoO0XXrrfkjVL(aqE7g?O^ z^B-PW^=FGjN-hlKxqP8>zFe|6*nr_?_d%DePIiQ=>)-rb@^!Q)SbyVP%0HJ_ude#G zv$;Aq)Lvb^xA(6k)>UHJIR7ZIZdN0w47VRPfOuL}SdD@b>tQi$LbG`g0J$_h=40P# zFy^Q5ev=Mynd!aq9v`aX_IRL%{U!ks&{L}zr1N5ihuu~)pTq?-0aaTL1dJpezdE|C z81}4a<^@LA_I`5!fNq|Q1XWuGS1DUd1>7Yx|fMu$6c}hIl$)JpY>CWSPj{DQ!*1_36oJbCOc4fhzYj zUxISUSdmja)LLj%kZ(E#slqv2_Ua6A;?R>hzRph!3p~y%@wDYTCkNu7R>$8{@oRnP zTj1H`%Us%Pq+fSZVGGOjTt;7lM}2J4`lg2GUL%w_cf z3JLSNc9qg=$FQOV^R{TogD5voWRmqx?}iSCi?NZ z-e*NLSI-JFtNY2pEl=Q1^2RGFkz=XHYDzD*-eUO55X(DiOWJ$)j!8}B;o|(+iv0{j z$P12GI(tR*V=X;kR1dELTqSeqRaK_pyiKljr?0y~YA@@|7f#l*Ex0ilsmn*1rxDl% zZ{0kLf6|wteC@KkCCkL2%tj>HA8ZB(5_#k(oFQcnRj zbbuulMs?``yXz#~`RQ8oFGuRxIZ-r)R=i%mnbdGmDRH2J`5>$!j;nl_aK_`yo~^P` z9pe2P!WAB>AeV}G)(nXJdn&*r)i$2zLy){=A+NojPITXPDlPlh4y(K3@$6MJfSwW* zrTjRC;kIGRLGv&41}bo1dQ$c5d&Yy}xsSh;ksw#mU;IT5)qhJk)rRC-VDO3HJ+@{^ zbJa247d!n>@>FlRsAe7$>-^+`1PO0_B5Z!SFe}yTlK#x8Bak3~#8dh?96m5D$f16I6N~(g{PfVjnJXs)z{XHEub!tJY5z6r`9~ow3O{|B_3O-MSxD}WiQOgJ7qSlC z(9nX8Yu5#6<+^=rH(=(9DSvC1y)g62A)}f5P2WeEkfXN@CIas__u1u9zdfz3NY-g* zRY`UFY+}O2&|6~uIy>ND=F^P`?Xoia*WO3X9wZAf^!bDo*MmCMB=vz&&W)0$8;iWp zl*A{`X|lALiC#;d)0@6|FRA;rxm}L>=P7IU@_uhoRORVM3jvblLl-Pwc3*z9o>5%6 zgvmj7sSmAuVy|3(cgA^x>(Td^;_7n`VqFg^4^wfK{3YtBCG42esC3X~!^xXs9``aw z*$OrrMSaA)428!yyEflQw2Aq=%p3zn=qb`n=ln>*<7}((k5r`31#~8lpOC!Rtp36} zXlH5MQS1KO+g0a+Q!^(-ZMItO(-j0Z9-cTG>CkE@dOo5%b5i0#c&o)to2cF^hLTUi z+g@thaBk;LT}^z|j?QL}`vx zvAXj1`+&j1v}-p^G$OaV(mvUy-(4`)itYQDxmcLFQ1SfYRB2mD)$44ex8b9%zLuhO zyKF)w^6^GrPc_jdFL>|9{0n}kp7uxfxvx!Uu081g*qtp=RGhV7e(F;H(4>7yCF7#C zXaB&sba7eNyG5&VuFqc{y{zbG{NmVB-n_pCnSaf+!OT4>UTZuZvz! z1^KzcS2154_Aa-6Lu~HVjeT3fE2D?lnKw1moo19Jx5vT}4o$bJR)VT4CLKf_+8zw9 zhC{yP)(?JtkNdo)f9vYZt#-$ciOyfMEw0XQn7%CSuUaflEnh_X?hJmB-l*8C{DO0N z_J(_|I$oI!f4!=-ACacFnqa_n~c;%-~9uWhT7%j!V4^G2t44DkmlrJh@nqIAL79Dgt{IE zvo0wN%cko`b~nap>!}TgkyN*dVz>Ayw;@AkK6>o2O*goX^F}Cky%@WeiWO}ZRlylZ5zngZOSTwoVlPkQOiPI7Jva+`yj2hJsuccK51!44 z>)Xo;2oMkCS3x4lkgBlzDp)Qm?miVkoCgIg%WJ)eD2T0&IX~}L&Dqx)7*ng z++%v&A?nz+E73Ptc=8;_Dk=^5wOZLbS@XTxSC`5S{g?SdFdA=_3_~R7i z{^-P?szSJ%{5yII`NoY+`fb9X8cfv&@z1fsvCc|TJ+M%qRieK$hM4!Ek#-V#g=`dU zO^eYQ0>7lRp495Z+i2x8(pR^vX1dc2iwE_bUM_YN%TT^!DmIoTUPVG~Au4y)m)a?Y zXR4*Y?aZyd8agBG$a>;}@Up%u^&$E=HyVV_F!qo{*f5S>sfh=FL~S~b@XI5e5hAC3 z*a(S(*u+cb_n3}%KOUnq>LFAV_5^F%ATS0-w?<>$Qj=+8K3CSK$9!e!1jqdp*o?>h zRZgal?*&|!m;s|(CBX?$OVxNHSm#ChKhq?12jk6up-IR&ZvJaeVepO8kDdZg=0l-F z+!4;KZ}^SvINjM2LQH1U(5GqmKV<(#&a`%Y)B} zN_u`e&)3pp{1Y5Cqm}q>t$N&O0P_y0SgDh-7zyD}h!jO!c zY{S&g^KGytD0LamXEt(yA>?YCTzx!kn_W-5@_VacD}_$wu917y_C0bCcBSD?JmNtK zZyxj^zds(KYXqf3Bsse&SEB|VAB0fY-Zy+!YVfD9p8MbiVLiv=jfcC;Whsveb=67& z&O6T+;p)Q%xp1`)!Ugb`^cXyQ3Z!ziOt0fM>2Sgt^eaLSAB``y=}{H9^GVhgh3_xSqd=* zyb2%VgBj%y8|WP13=LP|t+iH0H?u~;R5L2J-utTtob-vhf80)~D_UZEGN~s0xKaMy zDBSSL5C!A6&i3b(7uQY+PYB*n_+IcJbv{Mrmhmmli!CgxdgIr4m)qR`1g#=?X5e+j zwOm{1nTe;;2AA%J(|M&xzBWE;*LUYygE&-1Q9(l0+Z z(bT#ml*XEndUx-}?A_uBt?VaXUul0dxkovq9ZUT9%J2kIw?&t}=#gEP<%L&zAoQc` zki0o6IPB5t+wRKk*Ez1=UOlE(@2Tbdm6qs8OHbpaqC7uL<}-fv-e%pRe76%lh|RcO zY1{RJ7*KLhnL+oRM^RxCqlk&RQ{RVt``6iKBBqj;AH0A2>2*<7ma*L{-GQo4#d#AV zW^OyZ{n?*NsuUM3>|PBFr-U#gF)Dkx@$@y-TgW4s;T&!Tl$YGn!x})Yxqzi{fnLK;y1*G#l#41Kvenhu0#xk4ys*u={CUb=Jdyjx z7l(eQ&drb?^?9ecouOU2l4|OkmKQ189}A>Q>I~j3;U!@sEczw&rx42|^@`D7s!LL0 z&E^dx%g0(LQTcLAX1<=gVEz8$+k4I{A|V zJpW9lysxWmJ+B^=o0MDMS0eXzr*Bnncke-$3--P(4K->0aROvt!>jGjYLWlH zYk1uaFpN?A++&z=;)ZsC$vZ8(SKT>}>;Geeu8EcO7mjI8sEP0)2TiSR2(-t^+WdXc z6*8|&zQEg!d(05P=vuUJt(bAb+`GKke5k^Of%)d{18m>%i(`qgLow3mot3${>S`GoaLSOD9P6Ma zZ1C6(!dXItWe{o_#xW^{4dWT_(8m*4wbMojTrZkNNC+Z%gbWX$PjKf8NgH)PozgVw zDf)&y>cyCE@ShT`Wu*80O+lJiuk^1Jq?L3%j`pgW7>h!$0J5BpRbmu2d;XF!c6$~1NZ$Lvh$~A-p$QpkHS9*iTetX}296FBo8xkv zA0e_Ov@O#CW?p#|u*$~@fp;BPBBljr*49GYlc-2MW;G)-X)%u&T)8Z2#7JC#(QQ*! zY%7&{zC)!43DI2@K|*}!0|PFaaydF~`vwCAI7;&hW$%>}jL^jFrIV+Wku!3eROKL? zNvbObbW(iILd!dZ0=Ob6Y3{s?>9v1XTmf&a%_-%aITo zJOQ+T5b${J_>J*eMVO;7FLnKe4xW7I(evL{KcQe?taQEIU%AS$(uBfl>f%OWbu6T+ zVYl)X$EtWO(Y&=t$)y7ZkjR0ozhH$?%znB}!(ffs zh9~|)_Y(nwLg=FkMxaq2J)+32=Os!fct0_^;hl00x^Nm>*w)C7tr5MvjA`_eM5rBi zQ)ad6sa>m6p~+rhcNlV5hDrM-D04VoX%pWA-m~AhST8YZ+Q8G(PhZpaw#pnoV+X6H z?Z;{gyG)?aR+$JC;L7nxi*!OWfw`Pjf%A=J*%Z{zDDiw9TuA#I^?_j~U~{O(yqMj@ z*o_fEGg8>&T5{adjj`(xC%beQ{%nVj?t|e2Cs@d`3Tq<=m2?aaU7N1ee#d)Ie;CVj ztptD8ltFpHJj-I8MJo zyK-Co3JuShV6w`|I!sV&(n-nY=9`Wy;GpZ_WC3N>w|62|g3_)h3*Bpet6jG8`=IOl z6Ps@*D(ur+9<8i|RvkWhmL%BvgmpFS&GnP#LepDcfHd}PUMIy<1>c$6S&jH~_(fq+ zc%HfSYUJSIQ&JScHtT>@kbUOVrS5c)z+*Lf(d*QeDZ%!A4X=Inndat3=k?lH;9IIJ zwOWT8XJH)u)in7dZ#xK=3gcNYX$t&mo$k7Y2^^JaO8W}ZoWFR`)65((7I?qUKEtax zqw+&R`a_ZkVMbj`sB52nMyzq>`VR%^4=Gn^XK&dFeb{H8kyD)2aEc&Gi@#2%M`zqM z7SKw&sg-eiuTn_sb%a)?$;S+>&l&gX`#z?J9L?1GmZ9@5<5NNQ(X6L8PT%iW>n`mB z6{NjiJ?aGsUh0B#9B4E3htza9%Rc1tDP|gIW%M*6Lh}5~jGwYc_B2Ur=ZAnKl9Eon zZ6==zd}yIjr+)uqQON5+ZxJoznC84?hEVb6U(9S;9`rAMDlVZl zH^ZsxeO5YJ^5(*#Wnh2*7+Y~^i&?gHGDui|sJpDeTh!X()#s`2pUQh17j2839HL?4r7w$f zU!Sb4Y_4ywt}L(bt!$M``svqTXpbB?UedvH&5iM>d=&X?f}+PaQSAoQS$+zM>zd;) zz5d?KfdY3k^qT(-ZOhd5SXtcP03h<7g8SN*U8x$0YSC)1f30GCe*5}2zi6r@@}lcM zT*des0Awfn_#XfuH63qRvVH!xy&fN%=oAfiE7;DP62eG5Ws(fj?Yw2%ezjP)x-mt!c zDjA_eV1~sYR;XzM3cGHr0mO|kzpToAs4borW`8A(!VZkq(gDnU@jNgr*k;2W>>Fvs z+>9qc05+_Y5(22Wt;{OkbDIL1@!>}3qw!@$MmvR2*e^kTN-BF0PYux2>ovraj))&G z!81C*$P|Ry2UmzU7I0S%Rm|TEf*XYO&?3|U%R4ZbQYao_X2kmhW^gWK!cV>veCUoEPB-LwaVeMvp)Y=Eh6^=KKj{G&bq;_HEm;UV z@PU^o2IO{tY;)JGym+0&Pc@-+JFGyDljPU{w+&O6<*|DfZjuo$K~UfToaOXc75NPC zaNzoOJO|3ifE7l3(&BzpmVWjWuVdjccM^c6a*fBz&SkMtFg=-flmzl9@N=1DeEB6c z6y7$9^*UH|sEHgri5YNgLY(2Wrj+By)#&!(+YdfDTerd1HN<6p1#+%(Q1mv1{ZU0N z5o*~ARd#vO1Esi|+loPiR4e9{U<1o<9>OegbxFdZC)kteOb@v1$t$hzZ_qN4L!O|SeIrRDU&1NNUBmODv&YA^CH4B(T+HU?wR zS>l6kS$S^;?Wkjp4G}%HLCy`y#mzB4WzntipnK+9;ACX>)@0Pn#jUA0lIZqyQmFa% zOj>I8_H1VH;`UrF<=4r`orRLAY;ZC%bD@0a+}~Ame>>0w($apx&{c3BIA~N&yY1`Df{p`@amWFPTr9IK5AB68xx=h}IPSG! z+P&`DgRJJ})|U;q@1W$_Slb9rINn2ACGwnabBRI~@l0k-^|19^f(+V#<*8J|vF#<$ zWhSr$t0)Dk=&aS36 zVr5Wo3%#eXetOC!kdDH(A`!9LM7g*P^>qQ$${qS9`9rK;f2`f^TfN7BuzJXUW%c5n zaG7!0KyFNKestlhtPhiL@j2~Q-VC^g;7cAyzV!2fRb zR02Uo-(L(1{;Ac=>@6_*Kel>*1@?B?zW$9L*Hdi|W2@E4lBHtZ(cu|+qnijx-NRPy zV^JThyh{6=%^#{!7c+AInjF|YySF$(+0 z1lWb{{Ad8-j+Ql|=Qf0;HF7Z>+9bdo52q=@ZHMD|?65HZVeEGDb2@|-{S(MBz?8}r zZtwvB;Ccgb6n2&4@f21y4kHEOXGyo493!vu688{F4S5uf3uF$WkJYn{F;+U(_l>@C zeg1s9FUf8cs2*5wVTH8aCVA`D7?4~YJH(!O;W`XR@v)O*D%{$5oC^0NrE|*mST9MH z)WlD>!BQ>UpEpLYgR15*fiHmoZLKX+;cnvVS2;>fvO39|%=85Biv4hp9#MY|Qj=BU z6HLQx&m-0ZL$&55@ksQI5Pa=h#e|MG^Qn?SUVW>ii)Y!a(|Dr;%FiJ5a_1JSJ`=yv z!E{YYmN~jcVi3Rv4R-Yz4_LUH^qCIVWF^{<;%cY#~m9_8-wL@ z0R)zq*3Qw70p9%UovGrC_RrDJFzaT^&J{&wW-U7srq9~?VPnV@BDy(@ zXE)y*A)m_L{3}+^(cL6%mgm#k?YV49RoQ%2ySdXsNxgIVVrdshDPIMtE?=r-wm>g8 zQM**EG#~lFMOj_3_KrDLBENgX|J!=AwJ&A^RP?P%TOSFOsoI#_hrLY{xa=$Xf`f_6 zT{6`>KVWZPS6y88fZbT2+3+~OV1g@fHh_o4sD=jQqGYxmrs4-Xy*F9hjw%e(!o%ba zDzRV>)6~$(8Pzf~@!|Qe7#zF?R><-@@PelC^fv_RIqLj~V4dWURmnAYwjcH)%@gK} z90yC`b!4LKXr(~Bg1opGd?};h$P`rZq}sBFcIy*pUWuXzA0NxlA=|zp-#;PJ{nua? zlJU=qe8~TLMZUjbc3-@b#+h2x393w;i~-P34hXHWcHUHeIjK;lX?!c?mYLdB@xz)Q zZ{554e4#M-Zubp+F+!#Ir#ro%64z31puO3HB9pz5GVh%t(a+^Jt8YIe?^)mYJTld>disXUd)a5V`TPfpo9v8o6CxCBw>aZDer>lvaO56?gEt{7Zai2(fSy;-G*6742!Ig= z+{S2x4jkQCCV1NPEEBmz-#{V9co8cjzC0%bAjhnRr-?qo>&nV|Fly3l52pp)67y5A6KpF1Pkk`loeCVWQ=L~S8;B2PdNPOI^*2A2#^n3|C8bBN` z;FuIniL#rgf&luT3`huOrn<%`a|x4JxP1o|58}pQ>qMvrpFchb9M~bTnWCWr3F;jV zJbW?&`4o=WLjiy9v{bm$Bq-q>g#ZMXm>Xs8M61tBpNZ+51-WF9B-ebb1%zVuX* zqZ+Fj?_H*}WFF@H5!z6FU}+}K{<;%4>(f3lW!B<0H)W0syMj$Y=AUvESRb9O8;S9W z^EctAX3C%AK~1-ODPAYkK4t|F=!QhBfPugsFi}_g#v|<)wWc5&llT$ngR)Ly))3L3 z#KonqJA_lI5Tr*Op^nH-jv5ssL08@$Bk~;8eICzdxm(KT3bcx?CU7t$@V299w$F#G zT8lc)^VHW^xq}T~~Oj+#(F4~X< zLH5I4hJ1WF?B}FDlRb|%kC2YsDdF)tCH+L$ShmBB&y9ani9L`ykd}do-k^DmBtCdi z7+JVfe?L{`{NcH*%k|3pV3xm!Y<~gFf(tASBAI>xjThHS<=*Cq&4cfhDduxkTjTqf z-RW{}ncdk`mz-|{E&A2pH&$b1zI~$}-W#w?Jg|@1z0PxhJ*|fB+`b$+56vlo+Cz7i zuxy}$xFo2^XT5|&9Ok807O10JjAuS|o%hhav>$Thq9BCQ5R@Z-zeJR1p#(rog+n8V}T-;6}$*g!oD7!41!x#`-a zJN|h5Grocg&6g$a1cW9%J1MfIa>G9V9JIhjK|pSceEVEokf&@ipJq6{HeX#Z$u*hx z*?oFl*18Z}O)`(|K>#FV4XV*p-~oO&qs~Aia0`HfF`%XELjZ>-5J|rYn-b9eL4LNu zUYIa zoba}t43q8nfYSz;KXzcWVbHz~c^LDV;dZ2~F>>0S_v81Ru1GCekmLJ4 zTZ)t?eJkJJe z4~8L;>;!G`OSg>`Qkjz_3d=N*@;Q)3HgPW5g??Yl%kMvvH>UpR$ejHd|G6XEExa(< zb)@SYxzbU3cB~$IMqeXBTszY!BbNRL1%$bxZ``MY)IHJ&OTGEdRia(+<|1BOW!W}h`hf4mr!Owi3+0RWuzR#A< z{Jx*~K3~0iJ(==K^y)zN?~L#}r_0tsVW;y8i$8>&elWuCvRBca%FGoqraADt6<`Jr z!ZE4@@JQ|b-3t6>iuR9Ra7eII=)a=~_g{Pv)UoJC5>b2wlb5biGJ5vY(OWihzr<{* zia&@=_>qqOSrP6J2ci0>QKE%)K23cMm(#C%)Jv9fF2u9o?wI~>qeOp&g~j{Msf4ib zW0JE=af+PHcC4ve8pEWe4&`IdsYYd0OduYgET>&L=}8LY2bQ@{%Gx8Qi1;gM*zY#6 z8=VKAvmVD&vjD5gBmN9B-+6hNav@Ph%3Cj+AY<=B=x7G~U-0lDcQxQ<#<`SRJiqU0 z6c7!t0xaO3-utnqfHr|3&qW51UVyx?FCK%%V0?gJFK9?;WMEKid{RhqYFauD78s7x z7G@4a<1pIXP?M+zJ~045095iysF>0Zc!xrT*)+kQe}i zk%vJEcn^#*5^oGJWBq*zXmVt%Z%o{N5f`f^n+#{sbdOcM4~K~u;ez1BNGOy^1nUEp z$0Oyrp$1}JI129iuX_$S;f!(MIY!C~X?ytL zjG$2XeSd#A%bBofEG7nsi%&|%g$e`cFicirOip$}N=9}LNYGX40Vfg2MSe)_tXEic zQ8BK$H7ojEd3$YPi~m1dixJ#)0CEL<8UTX>j5Upoi9{GP3l!}|JR_^^g*+XI$03oC zI1HK)he=6_Oif8njl*YUzRJ!mc$Marh%NqU!8q{sGyDhx_tGE&H~pW z1Y(Q@D>vGHmF(^2OH(0G+yrL_KPysWf1bi>mo zr(~j(_G@W>*?779WV}8ja}))t zQaX8+CvRBXL1oka8xP?&a+Rx{m{=`n0L5?enTFIF%|~R zIZ_)Am5IPc?3?t{B2bpJq6B&F(tZC?M}Dh~O!C8_!Fu>_O~5G7fBfpJ%=V8y82W4C z+&!>JBW9SkXMj8$b|wI~ZxsE*umnJpMIWfn2^bw?U=)5`dS5bnz|kz&Y5 z7@Q!S1c<=2-7z8Z%u%oK+A=v#MR{b-B9P;bT=_~C)70phD15)!^DSVEDX;4!{KJ#{ z>Sg4?^az9fkyc{CcB+pzvu{8k0U87#$@fFGLIHW0Y|M}C4+sZ8fEZ*}OkN--(kn>j zKBmaSiCBgM$IXA+qF-OozH3q3e?eGn{C>8IhkN??`k}#IE!d~U1>l&%Fn-3cAiNXl z$H#D58yNw_h%n0_K?c$ykne+39OGG)6XqWC)5-xr03ZUK{M~+=f-9R6z|V~6;qUGn zSYm0r`+lO^B*X{7NvDLE}%(Z(4^v(673`iC>IeETl2OCwCm6AQm z9zC0XP(F|dcfD#^G#p>g?8~91f^Wt>ea3X|IiQ<6-SLDFYzFLJ>|&kj2vAn)DXd*3 zyo(g8*j}0`prdEtMds7bxGKHimUAq_bUi1rhFa7IOuHT62|vdx{Qj`+Q$<2otkYUU zXM$#{s*(~7{9?m<^_Y`Rg?T{Tbc)0k$;~BOvAL8R(eegV9q!X_+SvK+l0@g85_&ZO z1Z`iuT&j=PCDd9HvSISUgoUnk(or39iidA63^|ja=oxxkw@4#I^IE%>5;7wbbrl@Z z(FpMSW#Wp!4NoTHs6z?#Om~tzWC;AL3*yIstH~B)+M1k90upuLk_=x`iI8YuZ|=A_mAPHqR8Jek^dpi{12dp{|smD)O+~7cmKJ_p&FNZ zrki>t#v+75Fr7(3Eq$ndUC|lXaB=y)KG0y5NXvvcUR&OkzPj@ccCB~ACtiWh7e0f^ zppFeR^nzb`STgQ@P1iHzj3dWLG<#>M8wK{Z7o5zR8WE$1MSiAoWwZKVHH6T!h3eaO zjf}(~p5?|9@QH-H23AMQ5jZ>TEL4e6eLOV^7tU)%W_2p*RDyGugwYTj2Mi%x79XG_ zwlR_0O{Q!_o_l1duS3rxtX|V&5|2764FXqr)=LP~z*;}o(>v}TPc}EDisew^7*Vv- zjcTT2$35!_x6{ovz`J}}X48#zJs_zY*DxU%6&nXVWMu5YW~iIke)SNL6qxX7+N6w@ zv)?X%%Y9nre~(;Z|Lg<&9}>AZ{a=Y(%8M-m?VK67vyE;A_L>GD-OZk9tc`dCL9& Date: Wed, 8 Dec 2021 15:23:56 +0300 Subject: [PATCH 36/69] Remove from tracking coverage folder. --- coverage/html/amber.png | Bin 141 -> 0 bytes coverage/html/emerald.png | Bin 141 -> 0 bytes coverage/html/gcov.css | 519 ------------------ coverage/html/glass.png | Bin 167 -> 0 bytes coverage/html/index-sort-f.html | 103 ---- coverage/html/index-sort-l.html | 103 ---- coverage/html/index.html | 103 ---- coverage/html/ruby.png | Bin 141 -> 0 bytes coverage/html/snow.png | Bin 141 -> 0 bytes ...ertino_swipe_refresh.dart.func-sort-c.html | 72 --- .../cupertino_swipe_refresh.dart.func.html | 72 --- .../cupertino_swipe_refresh.dart.gcov.html | 236 -------- coverage/html/src/index-sort-f.html | 143 ----- coverage/html/src/index-sort-l.html | 143 ----- coverage/html/src/index.html | 143 ----- ...terial_swipe_refresh.dart.func-sort-c.html | 72 --- .../src/material_swipe_refresh.dart.func.html | 72 --- .../src/material_swipe_refresh.dart.gcov.html | 180 ------ .../src/swipe_refresh.dart.func-sort-c.html | 72 --- .../html/src/swipe_refresh.dart.func.html | 72 --- .../html/src/swipe_refresh.dart.gcov.html | 380 ------------- .../swipe_refresh_base.dart.func-sort-c.html | 72 --- .../src/swipe_refresh_base.dart.func.html | 72 --- .../src/swipe_refresh_base.dart.gcov.html | 198 ------- .../swipe_refresh_state.dart.func-sort-c.html | 72 --- .../src/swipe_refresh_state.dart.func.html | 72 --- .../src/swipe_refresh_state.dart.gcov.html | 98 ---- .../swipe_refresh_style.dart.func-sort-c.html | 72 --- .../src/swipe_refresh_style.dart.func.html | 72 --- .../src/swipe_refresh_style.dart.gcov.html | 104 ---- coverage/html/updown.png | Bin 117 -> 0 bytes coverage/html/utills/index-sort-f.html | 93 ---- coverage/html/utills/index-sort-l.html | 93 ---- coverage/html/utills/index.html | 93 ---- .../platform_wrapper.dart.func-sort-c.html | 72 --- .../utills/platform_wrapper.dart.func.html | 72 --- .../utills/platform_wrapper.dart.gcov.html | 98 ---- coverage/lcov.info | 206 ------- 38 files changed, 4044 deletions(-) delete mode 100644 coverage/html/amber.png delete mode 100644 coverage/html/emerald.png delete mode 100644 coverage/html/gcov.css delete mode 100644 coverage/html/glass.png delete mode 100644 coverage/html/index-sort-f.html delete mode 100644 coverage/html/index-sort-l.html delete mode 100644 coverage/html/index.html delete mode 100644 coverage/html/ruby.png delete mode 100644 coverage/html/snow.png delete mode 100644 coverage/html/src/cupertino_swipe_refresh.dart.func-sort-c.html delete mode 100644 coverage/html/src/cupertino_swipe_refresh.dart.func.html delete mode 100644 coverage/html/src/cupertino_swipe_refresh.dart.gcov.html delete mode 100644 coverage/html/src/index-sort-f.html delete mode 100644 coverage/html/src/index-sort-l.html delete mode 100644 coverage/html/src/index.html delete mode 100644 coverage/html/src/material_swipe_refresh.dart.func-sort-c.html delete mode 100644 coverage/html/src/material_swipe_refresh.dart.func.html delete mode 100644 coverage/html/src/material_swipe_refresh.dart.gcov.html delete mode 100644 coverage/html/src/swipe_refresh.dart.func-sort-c.html delete mode 100644 coverage/html/src/swipe_refresh.dart.func.html delete mode 100644 coverage/html/src/swipe_refresh.dart.gcov.html delete mode 100644 coverage/html/src/swipe_refresh_base.dart.func-sort-c.html delete mode 100644 coverage/html/src/swipe_refresh_base.dart.func.html delete mode 100644 coverage/html/src/swipe_refresh_base.dart.gcov.html delete mode 100644 coverage/html/src/swipe_refresh_state.dart.func-sort-c.html delete mode 100644 coverage/html/src/swipe_refresh_state.dart.func.html delete mode 100644 coverage/html/src/swipe_refresh_state.dart.gcov.html delete mode 100644 coverage/html/src/swipe_refresh_style.dart.func-sort-c.html delete mode 100644 coverage/html/src/swipe_refresh_style.dart.func.html delete mode 100644 coverage/html/src/swipe_refresh_style.dart.gcov.html delete mode 100644 coverage/html/updown.png delete mode 100644 coverage/html/utills/index-sort-f.html delete mode 100644 coverage/html/utills/index-sort-l.html delete mode 100644 coverage/html/utills/index.html delete mode 100644 coverage/html/utills/platform_wrapper.dart.func-sort-c.html delete mode 100644 coverage/html/utills/platform_wrapper.dart.func.html delete mode 100644 coverage/html/utills/platform_wrapper.dart.gcov.html delete mode 100644 coverage/lcov.info diff --git a/coverage/html/amber.png b/coverage/html/amber.png deleted file mode 100644 index 2cab170d8359081983a4e343848dfe06bc490f12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga>?NMQuI!iC1^G2tW}LqE04T&+ z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O`1M1^9%x{(levWG?NMQuI!iC1^Jb!lvI6;R0X`wF(yt=9xVZRt1vCRixIA4P dLn>}1Cji+@42)0J?}79&c)I$ztaD0e0sy@GAL0N2 diff --git a/coverage/html/gcov.css b/coverage/html/gcov.css deleted file mode 100644 index bfd0a83..0000000 --- a/coverage/html/gcov.css +++ /dev/null @@ -1,519 +0,0 @@ -/* All views: initial background and text color */ -body -{ - color: #000000; - background-color: #FFFFFF; -} - -/* All views: standard link format*/ -a:link -{ - color: #284FA8; - text-decoration: underline; -} - -/* All views: standard link - visited format */ -a:visited -{ - color: #00CB40; - text-decoration: underline; -} - -/* All views: standard link - activated format */ -a:active -{ - color: #FF0040; - text-decoration: underline; -} - -/* All views: main title format */ -td.title -{ - text-align: center; - padding-bottom: 10px; - font-family: sans-serif; - font-size: 20pt; - font-style: italic; - font-weight: bold; -} - -/* All views: header item format */ -td.headerItem -{ - text-align: right; - padding-right: 6px; - font-family: sans-serif; - font-weight: bold; - vertical-align: top; - white-space: nowrap; -} - -/* All views: header item value format */ -td.headerValue -{ - text-align: left; - color: #284FA8; - font-family: sans-serif; - font-weight: bold; - white-space: nowrap; -} - -/* All views: header item coverage table heading */ -td.headerCovTableHead -{ - text-align: center; - padding-right: 6px; - padding-left: 6px; - padding-bottom: 0px; - font-family: sans-serif; - font-size: 80%; - white-space: nowrap; -} - -/* All views: header item coverage table entry */ -td.headerCovTableEntry -{ - text-align: right; - color: #284FA8; - font-family: sans-serif; - font-weight: bold; - white-space: nowrap; - padding-left: 12px; - padding-right: 4px; - background-color: #DAE7FE; -} - -/* All views: header item coverage table entry for high coverage rate */ -td.headerCovTableEntryHi -{ - text-align: right; - color: #000000; - font-family: sans-serif; - font-weight: bold; - white-space: nowrap; - padding-left: 12px; - padding-right: 4px; - background-color: #A7FC9D; -} - -/* All views: header item coverage table entry for medium coverage rate */ -td.headerCovTableEntryMed -{ - text-align: right; - color: #000000; - font-family: sans-serif; - font-weight: bold; - white-space: nowrap; - padding-left: 12px; - padding-right: 4px; - background-color: #FFEA20; -} - -/* All views: header item coverage table entry for ow coverage rate */ -td.headerCovTableEntryLo -{ - text-align: right; - color: #000000; - font-family: sans-serif; - font-weight: bold; - white-space: nowrap; - padding-left: 12px; - padding-right: 4px; - background-color: #FF0000; -} - -/* All views: header legend value for legend entry */ -td.headerValueLeg -{ - text-align: left; - color: #000000; - font-family: sans-serif; - font-size: 80%; - white-space: nowrap; - padding-top: 4px; -} - -/* All views: color of horizontal ruler */ -td.ruler -{ - background-color: #6688D4; -} - -/* All views: version string format */ -td.versionInfo -{ - text-align: center; - padding-top: 2px; - font-family: sans-serif; - font-style: italic; -} - -/* Directory view/File view (all)/Test case descriptions: - table headline format */ -td.tableHead -{ - text-align: center; - color: #FFFFFF; - background-color: #6688D4; - font-family: sans-serif; - font-size: 120%; - font-weight: bold; - white-space: nowrap; - padding-left: 4px; - padding-right: 4px; -} - -span.tableHeadSort -{ - padding-right: 4px; -} - -/* Directory view/File view (all): filename entry format */ -td.coverFile -{ - text-align: left; - padding-left: 10px; - padding-right: 20px; - color: #284FA8; - background-color: #DAE7FE; - font-family: monospace; -} - -/* Directory view/File view (all): bar-graph entry format*/ -td.coverBar -{ - padding-left: 10px; - padding-right: 10px; - background-color: #DAE7FE; -} - -/* Directory view/File view (all): bar-graph outline color */ -td.coverBarOutline -{ - background-color: #000000; -} - -/* Directory view/File view (all): percentage entry for files with - high coverage rate */ -td.coverPerHi -{ - text-align: right; - padding-left: 10px; - padding-right: 10px; - background-color: #A7FC9D; - font-weight: bold; - font-family: sans-serif; -} - -/* Directory view/File view (all): line count entry for files with - high coverage rate */ -td.coverNumHi -{ - text-align: right; - padding-left: 10px; - padding-right: 10px; - background-color: #A7FC9D; - white-space: nowrap; - font-family: sans-serif; -} - -/* Directory view/File view (all): percentage entry for files with - medium coverage rate */ -td.coverPerMed -{ - text-align: right; - padding-left: 10px; - padding-right: 10px; - background-color: #FFEA20; - font-weight: bold; - font-family: sans-serif; -} - -/* Directory view/File view (all): line count entry for files with - medium coverage rate */ -td.coverNumMed -{ - text-align: right; - padding-left: 10px; - padding-right: 10px; - background-color: #FFEA20; - white-space: nowrap; - font-family: sans-serif; -} - -/* Directory view/File view (all): percentage entry for files with - low coverage rate */ -td.coverPerLo -{ - text-align: right; - padding-left: 10px; - padding-right: 10px; - background-color: #FF0000; - font-weight: bold; - font-family: sans-serif; -} - -/* Directory view/File view (all): line count entry for files with - low coverage rate */ -td.coverNumLo -{ - text-align: right; - padding-left: 10px; - padding-right: 10px; - background-color: #FF0000; - white-space: nowrap; - font-family: sans-serif; -} - -/* File view (all): "show/hide details" link format */ -a.detail:link -{ - color: #B8D0FF; - font-size:80%; -} - -/* File view (all): "show/hide details" link - visited format */ -a.detail:visited -{ - color: #B8D0FF; - font-size:80%; -} - -/* File view (all): "show/hide details" link - activated format */ -a.detail:active -{ - color: #FFFFFF; - font-size:80%; -} - -/* File view (detail): test name entry */ -td.testName -{ - text-align: right; - padding-right: 10px; - background-color: #DAE7FE; - font-family: sans-serif; -} - -/* File view (detail): test percentage entry */ -td.testPer -{ - text-align: right; - padding-left: 10px; - padding-right: 10px; - background-color: #DAE7FE; - font-family: sans-serif; -} - -/* File view (detail): test lines count entry */ -td.testNum -{ - text-align: right; - padding-left: 10px; - padding-right: 10px; - background-color: #DAE7FE; - font-family: sans-serif; -} - -/* Test case descriptions: test name format*/ -dt -{ - font-family: sans-serif; - font-weight: bold; -} - -/* Test case descriptions: description table body */ -td.testDescription -{ - padding-top: 10px; - padding-left: 30px; - padding-bottom: 10px; - padding-right: 30px; - background-color: #DAE7FE; -} - -/* Source code view: function entry */ -td.coverFn -{ - text-align: left; - padding-left: 10px; - padding-right: 20px; - color: #284FA8; - background-color: #DAE7FE; - font-family: monospace; -} - -/* Source code view: function entry zero count*/ -td.coverFnLo -{ - text-align: right; - padding-left: 10px; - padding-right: 10px; - background-color: #FF0000; - font-weight: bold; - font-family: sans-serif; -} - -/* Source code view: function entry nonzero count*/ -td.coverFnHi -{ - text-align: right; - padding-left: 10px; - padding-right: 10px; - background-color: #DAE7FE; - font-weight: bold; - font-family: sans-serif; -} - -/* Source code view: source code format */ -pre.source -{ - font-family: monospace; - white-space: pre; - margin-top: 2px; -} - -/* Source code view: line number format */ -span.lineNum -{ - background-color: #EFE383; -} - -/* Source code view: format for lines which were executed */ -td.lineCov, -span.lineCov -{ - background-color: #CAD7FE; -} - -/* Source code view: format for Cov legend */ -span.coverLegendCov -{ - padding-left: 10px; - padding-right: 10px; - padding-bottom: 2px; - background-color: #CAD7FE; -} - -/* Source code view: format for lines which were not executed */ -td.lineNoCov, -span.lineNoCov -{ - background-color: #FF6230; -} - -/* Source code view: format for NoCov legend */ -span.coverLegendNoCov -{ - padding-left: 10px; - padding-right: 10px; - padding-bottom: 2px; - background-color: #FF6230; -} - -/* Source code view (function table): standard link - visited format */ -td.lineNoCov > a:visited, -td.lineCov > a:visited -{ - color: black; - text-decoration: underline; -} - -/* Source code view: format for lines which were executed only in a - previous version */ -span.lineDiffCov -{ - background-color: #B5F7AF; -} - -/* Source code view: format for branches which were executed - * and taken */ -span.branchCov -{ - background-color: #CAD7FE; -} - -/* Source code view: format for branches which were executed - * but not taken */ -span.branchNoCov -{ - background-color: #FF6230; -} - -/* Source code view: format for branches which were not executed */ -span.branchNoExec -{ - background-color: #FF6230; -} - -/* Source code view: format for the source code heading line */ -pre.sourceHeading -{ - white-space: pre; - font-family: monospace; - font-weight: bold; - margin: 0px; -} - -/* All views: header legend value for low rate */ -td.headerValueLegL -{ - font-family: sans-serif; - text-align: center; - white-space: nowrap; - padding-left: 4px; - padding-right: 2px; - background-color: #FF0000; - font-size: 80%; -} - -/* All views: header legend value for med rate */ -td.headerValueLegM -{ - font-family: sans-serif; - text-align: center; - white-space: nowrap; - padding-left: 2px; - padding-right: 2px; - background-color: #FFEA20; - font-size: 80%; -} - -/* All views: header legend value for hi rate */ -td.headerValueLegH -{ - font-family: sans-serif; - text-align: center; - white-space: nowrap; - padding-left: 2px; - padding-right: 4px; - background-color: #A7FC9D; - font-size: 80%; -} - -/* All views except source code view: legend format for low coverage */ -span.coverLegendCovLo -{ - padding-left: 10px; - padding-right: 10px; - padding-top: 2px; - background-color: #FF0000; -} - -/* All views except source code view: legend format for med coverage */ -span.coverLegendCovMed -{ - padding-left: 10px; - padding-right: 10px; - padding-top: 2px; - background-color: #FFEA20; -} - -/* All views except source code view: legend format for hi coverage */ -span.coverLegendCovHi -{ - padding-left: 10px; - padding-right: 10px; - padding-top: 2px; - background-color: #A7FC9D; -} diff --git a/coverage/html/glass.png b/coverage/html/glass.png deleted file mode 100644 index e1abc00680a3093c49fdb775ae6bdb6764c95af2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)gaEa{HEjtmSN`?>!lvI6;R0X`wF z|Ns97GD8ntt^-nxB|(0{3=Yq3q=7g|-tI089jvk*Kn`btM`SSr1Gf+eGhVt|_XjA* zUgGKN%6^Gmn4d%Ph(nkFP>9RZ#WAE}PI3Z}&BVayv3^M*kj3EX>gTe~DWM4f=_Dpv diff --git a/coverage/html/index-sort-f.html b/coverage/html/index-sort-f.html deleted file mode 100644 index 5902fd2..0000000 --- a/coverage/html/index-sort-f.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - LCOV - lcov.info - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top levelHitTotalCoverage
Test:lcov.infoLines:178178100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Directory Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
src -
100.0%
- 		100.0 %176 / 176-0 / 0
utills -
100.0%
- 		100.0 %2 / 2-0 / 0
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/index-sort-l.html b/coverage/html/index-sort-l.html deleted file mode 100644 index 82bc632..0000000 --- a/coverage/html/index-sort-l.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - LCOV - lcov.info - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top levelHitTotalCoverage
Test:lcov.infoLines:178178100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Directory Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
utills -
100.0%
- 		100.0 %2 / 2-0 / 0
src -
100.0%
- 		100.0 %176 / 176-0 / 0
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/index.html b/coverage/html/index.html deleted file mode 100644 index b9d1145..0000000 --- a/coverage/html/index.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - LCOV - lcov.info - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top levelHitTotalCoverage
Test:lcov.infoLines:178178100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Directory Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
src -
100.0%
- 		100.0 %176 / 176-0 / 0
utills -
100.0%
- 		100.0 %2 / 2-0 / 0
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/ruby.png b/coverage/html/ruby.png deleted file mode 100644 index 991b6d4ec9e78be165e3ef757eed1aada287364d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga>?NMQuI!iC1^FceV#7`HfI^%F z9+AZi4BSE>%y{W;-5;PJOS+@4BLl<6e(pbstUx|nfKQ0)e^Y%R^MdiLxj>4`)5S5Q b;#P73kj=!v_*DHKNFRfztDnm{r-UW|iOwIS diff --git a/coverage/html/snow.png b/coverage/html/snow.png deleted file mode 100644 index 2cdae107fceec6e7f02ac7acb4a34a82a540caa5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga>?NMQuI!iC1^MM!lvI6;R0X`wF|Ns97GD8ntt^-nBo-U3d c6}OTTfNUlP#;5A{K>8RwUHx3vIVCg!071?oo&W#< diff --git a/coverage/html/src/cupertino_swipe_refresh.dart.func-sort-c.html b/coverage/html/src/cupertino_swipe_refresh.dart.func-sort-c.html deleted file mode 100644 index 56710b5..0000000 --- a/coverage/html/src/cupertino_swipe_refresh.dart.func-sort-c.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - LCOV - lcov.info - src\cupertino_swipe_refresh.dart - functions - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\cupertino_swipe_refresh.dart - cupertino_swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:4646100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - -

Function Name Sort by function nameHit count Sort by hit count
-
-
- - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/cupertino_swipe_refresh.dart.func.html b/coverage/html/src/cupertino_swipe_refresh.dart.func.html deleted file mode 100644 index 983353d..0000000 --- a/coverage/html/src/cupertino_swipe_refresh.dart.func.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - LCOV - lcov.info - src\cupertino_swipe_refresh.dart - functions - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\cupertino_swipe_refresh.dart - cupertino_swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:4646100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - -

Function Name Sort by function nameHit count Sort by hit count
-
-
- - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/cupertino_swipe_refresh.dart.gcov.html b/coverage/html/src/cupertino_swipe_refresh.dart.gcov.html deleted file mode 100644 index fc061e1..0000000 --- a/coverage/html/src/cupertino_swipe_refresh.dart.gcov.html +++ /dev/null @@ -1,236 +0,0 @@ - - - - - - - LCOV - lcov.info - src\cupertino_swipe_refresh.dart - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\cupertino_swipe_refresh.dart - cupertino_swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:4646100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- - - - - - - - -

-
          Line data    Source code
-
-       1             : // Copyright (c) 2019-present,  SurfStudio LLC
-       2             : //
-       3             : // Licensed under the Apache License, Version 2.0 (the "License");
-       4             : // you may not use this file except in compliance with the License.
-       5             : // You may obtain a copy of the License at
-       6             : //
-       7             : //     http://www.apache.org/licenses/LICENSE-2.0
-       8             : //
-       9             : // Unless required by applicable law or agreed to in writing, software
-      10             : // distributed under the License is distributed on an "AS IS" BASIS,
-      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      12             : // See the License for the specific language governing permissions and
-      13             : // limitations under the License.
-      14             : 
-      15             : import 'dart:async';
-      16             : 
-      17             : import 'package:flutter/cupertino.dart';
-      18             : import 'package:swipe_refresh/src/swipe_refresh_base.dart';
-      19             : import 'package:swipe_refresh/src/swipe_refresh_state.dart';
-      20             : 
-      21             : /// Refresh indicator widget with Cupertino style.
-      22             : class CupertinoSwipeRefresh extends SwipeRefreshBase {
-      23             :   static const double defaultRefreshTriggerPullDistance = 100.0;
-      24             :   static const double defaultRefreshIndicatorExtent = 60.0;
-      25             : 
-      26             :   final double refreshTriggerPullDistance;
-      27             :   final double refreshIndicatorExtent;
-      28             :   final RefreshControlIndicatorBuilder indicatorBuilder;
-      29             : 
-      30           3 :   const CupertinoSwipeRefresh({
-      31             :     required Stream<SwipeRefreshState> stateStream,
-      32             :     required VoidCallback onRefresh,
-      33             :     Key? key,
-      34             :     SliverChildDelegate? childrenDelegate,
-      35             :     List<Widget>? children,
-      36             :     SwipeRefreshState? initState,
-      37             :     EdgeInsets? padding,
-      38             :     ScrollController? scrollController,
-      39             :     bool shrinkWrap = false,
-      40             :     this.refreshTriggerPullDistance = defaultRefreshTriggerPullDistance,
-      41             :     this.refreshIndicatorExtent = defaultRefreshIndicatorExtent,
-      42             :     this.indicatorBuilder = CupertinoSliverRefreshControl.buildRefreshIndicator,
-      43             :     ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior,
-      44             :     ScrollPhysics? physics,
-      45           3 :   }) : super(
-      46             :           key: key,
-      47             :           children: children,
-      48             :           childrenDelegate: childrenDelegate,
-      49             :           stateStream: stateStream,
-      50             :           initState: initState,
-      51             :           onRefresh: onRefresh,
-      52             :           padding: padding,
-      53             :           scrollController: scrollController,
-      54             :           shrinkWrap: shrinkWrap,
-      55             :           keyboardDismissBehavior: keyboardDismissBehavior,
-      56             :           physics: physics,
-      57             :         );
-      58             : 
-      59           3 :   @override
-      60             :   // ignore: no_logic_in_create_state
-      61           3 :   SwipeRefreshBaseState createState() => _CupertinoSwipeRefreshState(
-      62           3 :         scrollController,
-      63             :       );
-      64             : }
-      65             : 
-      66             : class _CupertinoSwipeRefreshState
-      67             :     extends SwipeRefreshBaseState<CupertinoSwipeRefresh> {
-      68             :   final ScrollController _scrollController;
-      69             : 
-      70           3 :   _CupertinoSwipeRefreshState(
-      71             :     ScrollController? scrollController,
-      72           3 :   ) : _scrollController = scrollController ?? ScrollController();
-      73             : 
-      74           3 :   @override
-      75             :   Widget buildRefresher(
-      76             :     Key key,
-      77             :     List<Widget> children,
-      78             :     Future<void> Function() onRefresh,
-      79             :   ) {
-      80           3 :     return CustomScrollView(
-      81           6 :       shrinkWrap: widget.shrinkWrap,
-      82           3 :       controller: _scrollController,
-      83           6 :       keyboardDismissBehavior: widget.keyboardDismissBehavior ??
-      84             :           ScrollViewKeyboardDismissBehavior.onDrag,
-      85           6 :       physics: widget.physics == null
-      86             :           ? const BouncingScrollPhysics(
-      87             :               parent: AlwaysScrollableScrollPhysics(),
-      88             :             )
-      89           3 :           : AlwaysScrollableScrollPhysics(parent: widget.physics),
-      90           3 :       slivers: <Widget>[
-      91           3 :         CupertinoSliverRefreshControl(
-      92             :           key: key,
-      93             :           onRefresh: onRefresh,
-      94           6 :           refreshTriggerPullDistance: widget.refreshTriggerPullDistance,
-      95           6 :           refreshIndicatorExtent: widget.refreshIndicatorExtent,
-      96           6 :           builder: widget.indicatorBuilder,
-      97             :         ),
-      98           3 :         SliverSafeArea(
-      99           6 :           bottom: widget.padding == null,
-     100           6 :           left: widget.padding == null,
-     101           6 :           right: widget.padding == null,
-     102           6 :           top: widget.padding == null,
-     103           3 :           sliver: _ListChildrenWidget(
-     104             :             children: children,
-     105           6 :             padding: widget.padding,
-     106           6 :             childrenDelegate: widget.childrenDelegate,
-     107             :           ),
-     108             :         ),
-     109             :       ],
-     110             :     );
-     111             :   }
-     112             : 
-     113           1 :   @override
-     114             :   void onUpdateState(SwipeRefreshState state) {
-     115             :    // if (state == SwipeRefreshState.loading) {
-     116             :    //   _scrollController.jumpTo(-(widget.refreshIndicatorExtent + 5));
-     117             :    // }
-     118             : 
-     119           1 :     if (state == SwipeRefreshState.hidden) {
-     120           1 :       if (completer != null) {
-     121           2 :         completer!.complete();
-     122           1 :         completer = null;
-     123             :       }
-     124             :     }
-     125             :   }
-     126             : }
-     127             : 
-     128             : class _ListChildrenWidget extends StatelessWidget {
-     129             :   final List<Widget> children;
-     130             :   final EdgeInsets? padding;
-     131             :   final SliverChildDelegate? childrenDelegate;
-     132             : 
-     133           3 :   const _ListChildrenWidget({
-     134             :     required this.children,
-     135             :     Key? key,
-     136             :     this.padding,
-     137             :     this.childrenDelegate,
-     138           3 :   }) : super(key: key);
-     139             : 
-     140           3 :   @override
-     141             :   Widget build(BuildContext context) {
-     142           3 :     if (padding != null) {
-     143           1 :       return SliverPadding(
-     144           1 :         padding: padding!,
-     145           1 :         sliver: SliverList(
-     146           1 :           delegate: childrenDelegate ??
-     147           1 :               SliverChildListDelegate(
-     148           1 :                 children,
-     149             :               ),
-     150             :         ),
-     151             :       );
-     152             :     }
-     153           3 :     return SliverList(
-     154           3 :       delegate: childrenDelegate ??
-     155           2 :           SliverChildListDelegate(
-     156           2 :             children,
-     157             :           ),
-     158             :     );
-     159             :   }
-     160             : }
-
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/index-sort-f.html b/coverage/html/src/index-sort-f.html deleted file mode 100644 index 2bb7908..0000000 --- a/coverage/html/src/index-sort-f.html +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - LCOV - lcov.info - src - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - srcHitTotalCoverage
Test:lcov.infoLines:176176100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Filename Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
swipe_refresh_state.dart -
100.0%
- 		100.0 %1 / 1-0 / 0
material_swipe_refresh.dart -
100.0%
- 		100.0 %27 / 27-0 / 0
swipe_refresh_base.dart -
100.0%
- 		100.0 %24 / 24-0 / 0
swipe_refresh_style.dart -
100.0%
- 		100.0 %1 / 1-0 / 0
swipe_refresh.dart -
100.0%
- 		100.0 %77 / 77-0 / 0
cupertino_swipe_refresh.dart -
100.0%
- 		100.0 %46 / 46-0 / 0
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/index-sort-l.html b/coverage/html/src/index-sort-l.html deleted file mode 100644 index 615dbb3..0000000 --- a/coverage/html/src/index-sort-l.html +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - LCOV - lcov.info - src - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - srcHitTotalCoverage
Test:lcov.infoLines:176176100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Filename Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
swipe_refresh_state.dart -
100.0%
- 		100.0 %1 / 1-0 / 0
swipe_refresh_style.dart -
100.0%
- 		100.0 %1 / 1-0 / 0
swipe_refresh_base.dart -
100.0%
- 		100.0 %24 / 24-0 / 0
material_swipe_refresh.dart -
100.0%
- 		100.0 %27 / 27-0 / 0
cupertino_swipe_refresh.dart -
100.0%
- 		100.0 %46 / 46-0 / 0
swipe_refresh.dart -
100.0%
- 		100.0 %77 / 77-0 / 0
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/index.html b/coverage/html/src/index.html deleted file mode 100644 index 6aeea70..0000000 --- a/coverage/html/src/index.html +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - LCOV - lcov.info - src - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - srcHitTotalCoverage
Test:lcov.infoLines:176176100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Filename Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
cupertino_swipe_refresh.dart -
100.0%
- 		100.0 %46 / 46-0 / 0
material_swipe_refresh.dart -
100.0%
- 		100.0 %27 / 27-0 / 0
swipe_refresh.dart -
100.0%
- 		100.0 %77 / 77-0 / 0
swipe_refresh_base.dart -
100.0%
- 		100.0 %24 / 24-0 / 0
swipe_refresh_state.dart -
100.0%
- 		100.0 %1 / 1-0 / 0
swipe_refresh_style.dart -
100.0%
- 		100.0 %1 / 1-0 / 0
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/material_swipe_refresh.dart.func-sort-c.html b/coverage/html/src/material_swipe_refresh.dart.func-sort-c.html deleted file mode 100644 index 00eefdb..0000000 --- a/coverage/html/src/material_swipe_refresh.dart.func-sort-c.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - LCOV - lcov.info - src\material_swipe_refresh.dart - functions - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\material_swipe_refresh.dart - material_swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:2727100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - -

Function Name Sort by function nameHit count Sort by hit count
-
-
- - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/material_swipe_refresh.dart.func.html b/coverage/html/src/material_swipe_refresh.dart.func.html deleted file mode 100644 index 1a99998..0000000 --- a/coverage/html/src/material_swipe_refresh.dart.func.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - LCOV - lcov.info - src\material_swipe_refresh.dart - functions - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\material_swipe_refresh.dart - material_swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:2727100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - -

Function Name Sort by function nameHit count Sort by hit count
-
-
- - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/material_swipe_refresh.dart.gcov.html b/coverage/html/src/material_swipe_refresh.dart.gcov.html deleted file mode 100644 index 699dcd1..0000000 --- a/coverage/html/src/material_swipe_refresh.dart.gcov.html +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - LCOV - lcov.info - src\material_swipe_refresh.dart - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\material_swipe_refresh.dart - material_swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:2727100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- - - - - - - - -

-
          Line data    Source code
-
-       1             : // Copyright (c) 2019-present,  SurfStudio LLC
-       2             : //
-       3             : // Licensed under the Apache License, Version 2.0 (the "License");
-       4             : // you may not use this file except in compliance with the License.
-       5             : // You may obtain a copy of the License at
-       6             : //
-       7             : //     http://www.apache.org/licenses/LICENSE-2.0
-       8             : //
-       9             : // Unless required by applicable law or agreed to in writing, software
-      10             : // distributed under the License is distributed on an "AS IS" BASIS,
-      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      12             : // See the License for the specific language governing permissions and
-      13             : // limitations under the License.
-      14             : 
-      15             : import 'dart:async';
-      16             : 
-      17             : import 'package:flutter/material.dart';
-      18             : import 'package:flutter/widgets.dart';
-      19             : import 'package:swipe_refresh/src/swipe_refresh_base.dart';
-      20             : import 'package:swipe_refresh/src/swipe_refresh_state.dart';
-      21             : 
-      22             : /// Refresh indicator widget with Material Design style.
-      23             : class MaterialSwipeRefresh extends SwipeRefreshBase {
-      24             :   final Color? indicatorColor;
-      25             :   final Color backgroundColor;
-      26             : 
-      27           2 :   const MaterialSwipeRefresh({
-      28             :     required Stream<SwipeRefreshState> stateStream,
-      29             :     required VoidCallback onRefresh,
-      30             :     Key? key,
-      31             :     this.indicatorColor,
-      32             :     List<Widget>? children,
-      33             :     SliverChildDelegate? childrenDelegate,
-      34             :     SwipeRefreshState? initState,
-      35             :     Color? backgroundColor,
-      36             :     ScrollController? scrollController,
-      37             :     EdgeInsets? padding,
-      38             :     bool shrinkWrap = false,
-      39             :     ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior,
-      40             :     ScrollPhysics? physics,
-      41             :   })  : backgroundColor = backgroundColor ?? const Color(0xFFFFFFFF),
-      42           2 :         super(
-      43             :           key: key,
-      44             :           children: children,
-      45             :           childrenDelegate: childrenDelegate,
-      46             :           stateStream: stateStream,
-      47             :           initState: initState,
-      48             :           onRefresh: onRefresh,
-      49             :           scrollController: scrollController,
-      50             :           padding: padding,
-      51             :           shrinkWrap: shrinkWrap,
-      52             :           keyboardDismissBehavior: keyboardDismissBehavior,
-      53             :           physics: physics,
-      54             :         );
-      55             : 
-      56           2 :   @override
-      57           2 :   _MaterialSwipeRefreshState createState() => _MaterialSwipeRefreshState();
-      58             : }
-      59             : 
-      60             : class _MaterialSwipeRefreshState
-      61             :     extends SwipeRefreshBaseState<MaterialSwipeRefresh> {
-      62           2 :   @override
-      63             :   Widget buildRefresher(
-      64             :     Key key,
-      65             :     List<Widget> children,
-      66             :     Future<void> Function() onRefresh,
-      67             :   ) {
-      68           2 :     return RefreshIndicator(
-      69             :       key: key,
-      70             :       onRefresh: onRefresh,
-      71           4 :       color: widget.indicatorColor,
-      72           4 :       backgroundColor: widget.backgroundColor,
-      73           4 :       child: widget.childrenDelegate == null
-      74           2 :           ? ListView(
-      75           4 :               shrinkWrap: widget.shrinkWrap,
-      76           4 :               padding: widget.padding,
-      77           6 :               controller: widget.scrollController ?? ScrollController(),
-      78           6 :               physics: AlwaysScrollableScrollPhysics(parent: widget.physics),
-      79           4 :               keyboardDismissBehavior: widget.keyboardDismissBehavior ??
-      80             :                   ScrollViewKeyboardDismissBehavior.manual,
-      81             :               children: children,
-      82             :             )
-      83           1 :           : ListView.custom(
-      84           2 :               shrinkWrap: widget.shrinkWrap,
-      85           2 :               padding: widget.padding,
-      86           2 :               childrenDelegate: widget.childrenDelegate!,
-      87           2 :               controller: widget.scrollController ?? ScrollController(),
-      88           2 :               keyboardDismissBehavior: widget.keyboardDismissBehavior ??
-      89             :                   ScrollViewKeyboardDismissBehavior.manual,
-      90           3 :               physics: AlwaysScrollableScrollPhysics(parent: widget.physics),
-      91             :             ),
-      92             :     );
-      93             :   }
-      94             : 
-      95           1 :   @override
-      96             :   void onUpdateState(SwipeRefreshState state) {
-      97           1 :     if (state == SwipeRefreshState.hidden) {
-      98           1 :       if (completer != null) {
-      99           2 :         completer!.complete();
-     100           1 :         completer = null;
-     101             :       }
-     102             :     }
-     103             :   }
-     104             : }
-
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/swipe_refresh.dart.func-sort-c.html b/coverage/html/src/swipe_refresh.dart.func-sort-c.html deleted file mode 100644 index e3331db..0000000 --- a/coverage/html/src/swipe_refresh.dart.func-sort-c.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - LCOV - lcov.info - src\swipe_refresh.dart - functions - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\swipe_refresh.dart - swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:7777100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - -

Function Name Sort by function nameHit count Sort by hit count
-
-
- - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/swipe_refresh.dart.func.html b/coverage/html/src/swipe_refresh.dart.func.html deleted file mode 100644 index 42d1e03..0000000 --- a/coverage/html/src/swipe_refresh.dart.func.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - LCOV - lcov.info - src\swipe_refresh.dart - functions - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\swipe_refresh.dart - swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:7777100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - -

Function Name Sort by function nameHit count Sort by hit count
-
-
- - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/swipe_refresh.dart.gcov.html b/coverage/html/src/swipe_refresh.dart.gcov.html deleted file mode 100644 index 69b6b42..0000000 --- a/coverage/html/src/swipe_refresh.dart.gcov.html +++ /dev/null @@ -1,380 +0,0 @@ - - - - - - - LCOV - lcov.info - src\swipe_refresh.dart - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\swipe_refresh.dart - swipe_refresh.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:7777100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- - - - - - - - -

-
          Line data    Source code
-
-       1             : // Copyright (c) 2019-present,  SurfStudio LLC
-       2             : //
-       3             : // Licensed under the Apache License, Version 2.0 (the "License");
-       4             : // you may not use this file except in compliance with the License.
-       5             : // You may obtain a copy of the License at
-       6             : //
-       7             : //     http://www.apache.org/licenses/LICENSE-2.0
-       8             : //
-       9             : // Unless required by applicable law or agreed to in writing, software
-      10             : // distributed under the License is distributed on an "AS IS" BASIS,
-      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      12             : // See the License for the specific language governing permissions and
-      13             : // limitations under the License.
-      14             : 
-      15             : import 'package:flutter/cupertino.dart';
-      16             : import 'package:flutter/foundation.dart';
-      17             : import 'package:swipe_refresh/src/cupertino_swipe_refresh.dart';
-      18             : import 'package:swipe_refresh/src/material_swipe_refresh.dart';
-      19             : import 'package:swipe_refresh/src/swipe_refresh_state.dart';
-      20             : import 'package:swipe_refresh/src/swipe_refresh_style.dart';
-      21             : import 'package:swipe_refresh/utills/platform_wrapper.dart';
-      22             : 
-      23             : /// Refresh indicator widget.
-      24             : ///
-      25             : /// Params for Material Design style:
-      26             : /// [indicatorColor], [backgroundColor].
-      27             : ///
-      28             : /// Params for Cupertino style:
-      29             : /// [refreshTriggerPullDistance], [refreshIndicatorExtent], [indicatorBuilder].
-      30             : class SwipeRefresh extends StatelessWidget {
-      31             :   final List<Widget>? children;
-      32             :   final VoidCallback onRefresh;
-      33             :   final SwipeRefreshState? initState;
-      34             :   final Stream<SwipeRefreshState> stateStream;
-      35             :   final Color? indicatorColor;
-      36             :   final Color backgroundColor;
-      37             :   final double refreshTriggerPullDistance;
-      38             :   final double refreshIndicatorExtent;
-      39             :   final RefreshControlIndicatorBuilder indicatorBuilder;
-      40             :   final SwipeRefreshStyle style;
-      41             :   final ScrollController? scrollController;
-      42             :   final SliverChildDelegate? childrenDelegate;
-      43             :   final EdgeInsets? padding;
-      44             :   final bool shrinkWrap;
-      45             :   final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior;
-      46             :   final ScrollPhysics? physics;
-      47             :   final PlatformWrapper _platform;
-      48             : 
-      49           4 :   SwipeRefresh(
-      50             :     this.style, {
-      51             :     required this.stateStream,
-      52             :     required this.onRefresh,
-      53             :     Key? key,
-      54             :     this.children,
-      55             :     this.initState,
-      56             :     this.scrollController,
-      57             :     this.childrenDelegate,
-      58             :     this.padding,
-      59             :     this.indicatorColor,
-      60             :     this.shrinkWrap = false,
-      61             :     this.keyboardDismissBehavior,
-      62             :     this.physics,
-      63             :     Color? backgroundColor,
-      64             :     double? refreshTriggerPullDistance,
-      65             :     double? refreshIndicatorExtent,
-      66             :     RefreshControlIndicatorBuilder? indicatorBuilder,
-      67             :     PlatformWrapper? platform,
-      68             :   })  : backgroundColor = backgroundColor ?? const Color(0xFFFFFFFF),
-      69             :         refreshTriggerPullDistance = refreshTriggerPullDistance ??
-      70             :             CupertinoSwipeRefresh.defaultRefreshTriggerPullDistance,
-      71             :         refreshIndicatorExtent = refreshIndicatorExtent ??
-      72             :             CupertinoSwipeRefresh.defaultRefreshIndicatorExtent,
-      73             :         indicatorBuilder = indicatorBuilder ??
-      74             :             CupertinoSliverRefreshControl.buildRefreshIndicator,
-      75           2 :         _platform = platform ?? PlatformWrapper(),
-      76           4 :         super(key: key);
-      77             : 
-      78             :   /// Create refresh indicator adaptive to platform.
-      79           1 :   SwipeRefresh.adaptive({
-      80             :     required Stream<SwipeRefreshState> stateStream,
-      81             :     required VoidCallback onRefresh,
-      82             :     List<Widget>? children,
-      83             :     SliverChildDelegate? childrenDelegate,
-      84             :     Key? key,
-      85             :     SwipeRefreshState? initState,
-      86             :     Color? indicatorColor,
-      87             :     Color? backgroundColor,
-      88             :     double? refreshTriggerPullDistance,
-      89             :     double? refreshIndicatorExtent,
-      90             :     RefreshControlIndicatorBuilder? indicatorBuilder,
-      91             :     ScrollController? scrollController,
-      92             :     EdgeInsets? padding,
-      93             :     bool shrinkWrap = false,
-      94             :     ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior,
-      95             :     ScrollPhysics? physics,
-      96             :     PlatformWrapper? platform,
-      97           1 :   }) : this(
-      98             :           SwipeRefreshStyle.adaptive,
-      99             :           key: key,
-     100             :           children: children,
-     101             :           childrenDelegate: childrenDelegate,
-     102             :           stateStream: stateStream,
-     103             :           initState: initState,
-     104             :           onRefresh: onRefresh,
-     105             :           indicatorColor: indicatorColor,
-     106             :           backgroundColor: backgroundColor,
-     107             :           refreshTriggerPullDistance: refreshTriggerPullDistance,
-     108             :           refreshIndicatorExtent: refreshIndicatorExtent,
-     109             :           indicatorBuilder: indicatorBuilder,
-     110             :           scrollController: scrollController,
-     111             :           padding: padding,
-     112             :           shrinkWrap: shrinkWrap,
-     113             :           keyboardDismissBehavior: keyboardDismissBehavior,
-     114             :           physics: physics,
-     115             :           platform: platform,
-     116             :         );
-     117             : 
-     118             :   /// Create refresh indicator with Material Design style.
-     119           1 :   SwipeRefresh.material({
-     120             :     required Stream<SwipeRefreshState> stateStream,
-     121             :     required VoidCallback onRefresh,
-     122             :     List<Widget>? children,
-     123             :     SliverChildDelegate? childrenDelegate,
-     124             :     Key? key,
-     125             :     SwipeRefreshState? initState,
-     126             :     Color? indicatorColor,
-     127             :     Color? backgroundColor,
-     128             :     ScrollController? scrollController,
-     129             :     EdgeInsets? padding,
-     130             :     bool shrinkWrap = false,
-     131             :     ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior,
-     132             :     ScrollPhysics? physics,
-     133           1 :   }) : this(
-     134             :           SwipeRefreshStyle.material,
-     135             :           key: key,
-     136             :           children: children,
-     137             :           childrenDelegate: childrenDelegate,
-     138             :           stateStream: stateStream,
-     139             :           initState: initState,
-     140             :           onRefresh: onRefresh,
-     141             :           indicatorColor: indicatorColor,
-     142             :           backgroundColor: backgroundColor,
-     143             :           scrollController: scrollController,
-     144             :           padding: padding,
-     145             :           shrinkWrap: shrinkWrap,
-     146             :           keyboardDismissBehavior: keyboardDismissBehavior,
-     147             :           physics: physics,
-     148             :         );
-     149             : 
-     150             :   /// Create refresh indicator with Cupertino style.
-     151           1 :   SwipeRefresh.cupertino({
-     152             :     required Stream<SwipeRefreshState> stateStream,
-     153             :     required VoidCallback onRefresh,
-     154             :     List<Widget>? children,
-     155             :     SliverChildDelegate? childrenDelegate,
-     156             :     Key? key,
-     157             :     SwipeRefreshState? initState,
-     158             :     double? refreshTriggerPullDistance,
-     159             :     double? refreshIndicatorExtent,
-     160             :     RefreshControlIndicatorBuilder? indicatorBuilder,
-     161             :     ScrollController? scrollController,
-     162             :     EdgeInsets? padding,
-     163             :     bool shrinkWrap = false,
-     164             :     ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior,
-     165             :     ScrollPhysics? physics,
-     166           1 :   }) : this(
-     167             :           SwipeRefreshStyle.cupertino,
-     168             :           key: key,
-     169             :           children: children,
-     170             :           childrenDelegate: childrenDelegate,
-     171             :           stateStream: stateStream,
-     172             :           initState: initState,
-     173             :           onRefresh: onRefresh,
-     174             :           refreshTriggerPullDistance: refreshTriggerPullDistance,
-     175             :           refreshIndicatorExtent: refreshIndicatorExtent,
-     176             :           indicatorBuilder: indicatorBuilder,
-     177             :           scrollController: scrollController,
-     178             :           padding: padding,
-     179             :           shrinkWrap: shrinkWrap,
-     180             :           keyboardDismissBehavior: keyboardDismissBehavior,
-     181             :           physics: physics,
-     182             :         );
-     183             : 
-     184             :   /// Create SwipeRefresh as common link
-     185             :   /// remove some conflicts between ScrollControllers when ListView added into
-     186             :   /// SwipeRefresh (remove need to add extra ListView).
-     187           1 :   factory SwipeRefresh.builder({
-     188             :     required IndexedWidgetBuilder itemBuilder,
-     189             :     required int itemCount,
-     190             :     required Stream<SwipeRefreshState> stateStream,
-     191             :     required VoidCallback onRefresh,
-     192             :     Key? key,
-     193             :     SwipeRefreshState? initState,
-     194             :     Color? indicatorColor,
-     195             :     Color? backgroundColor,
-     196             :     double? refreshTriggerPullDistance,
-     197             :     double? refreshIndicatorExtent,
-     198             :     RefreshControlIndicatorBuilder? indicatorBuilder,
-     199             :     ScrollController? scrollController,
-     200             :     EdgeInsets? padding,
-     201             :     bool shrinkWrap = false,
-     202             :     ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior,
-     203             :     ScrollPhysics? physics,
-     204             :     PlatformWrapper? platform,
-     205             :   }) {
-     206           1 :     return SwipeRefresh(
-     207             :       SwipeRefreshStyle.adaptive,
-     208             :       key: key,
-     209             :       stateStream: stateStream,
-     210             :       initState: initState,
-     211             :       onRefresh: onRefresh,
-     212             :       indicatorColor: indicatorColor,
-     213             :       backgroundColor: backgroundColor,
-     214             :       refreshTriggerPullDistance: refreshTriggerPullDistance,
-     215             :       refreshIndicatorExtent: refreshIndicatorExtent,
-     216             :       indicatorBuilder: indicatorBuilder,
-     217             :       scrollController: scrollController,
-     218             :       padding: padding,
-     219             :       shrinkWrap: shrinkWrap,
-     220             :       keyboardDismissBehavior: keyboardDismissBehavior,
-     221             :       physics: physics,
-     222           1 :       childrenDelegate: SliverChildBuilderDelegate(
-     223             :         itemBuilder,
-     224             :         childCount: itemCount,
-     225             :       ),
-     226             :       platform: platform,
-     227             :     );
-     228             :   }
-     229             : 
-     230           4 :   @override
-     231             :   Widget build(BuildContext context) {
-     232           4 :     switch (style) {
-     233           4 :       case SwipeRefreshStyle.material:
-     234           1 :         return MaterialSwipeRefresh(
-     235           1 :           key: key,
-     236           1 :           childrenDelegate: childrenDelegate,
-     237           1 :           stateStream: stateStream,
-     238           1 :           initState: initState,
-     239           1 :           onRefresh: onRefresh,
-     240           1 :           scrollController: scrollController,
-     241           1 :           backgroundColor: backgroundColor,
-     242           1 :           indicatorColor: indicatorColor,
-     243           1 :           shrinkWrap: shrinkWrap,
-     244           1 :           padding: padding,
-     245           1 :           keyboardDismissBehavior: keyboardDismissBehavior,
-     246           1 :           physics: physics,
-     247           1 :           children: children,
-     248             :         );
-     249           3 :       case SwipeRefreshStyle.cupertino:
-     250           1 :         return CupertinoSwipeRefresh(
-     251           1 :           key: key,
-     252           1 :           childrenDelegate: childrenDelegate,
-     253           1 :           stateStream: stateStream,
-     254           1 :           initState: initState,
-     255           1 :           onRefresh: onRefresh,
-     256           1 :           scrollController: scrollController,
-     257           1 :           refreshIndicatorExtent: refreshIndicatorExtent,
-     258           1 :           refreshTriggerPullDistance: refreshTriggerPullDistance,
-     259           1 :           indicatorBuilder: indicatorBuilder,
-     260           1 :           shrinkWrap: shrinkWrap,
-     261           1 :           padding: padding,
-     262           1 :           physics: physics,
-     263           1 :           children: children,
-     264             :         );
-     265           2 :       case SwipeRefreshStyle.builder:
-     266           2 :       case SwipeRefreshStyle.adaptive:
-     267           4 :         if (_platform.isAndroid) {
-     268           1 :           return MaterialSwipeRefresh(
-     269           1 :             key: key,
-     270           1 :             childrenDelegate: childrenDelegate,
-     271           1 :             stateStream: stateStream,
-     272           1 :             initState: initState,
-     273           1 :             onRefresh: onRefresh,
-     274           1 :             scrollController: scrollController,
-     275           1 :             backgroundColor: backgroundColor,
-     276           1 :             indicatorColor: indicatorColor,
-     277           1 :             shrinkWrap: shrinkWrap,
-     278           1 :             padding: padding,
-     279           1 :             keyboardDismissBehavior: keyboardDismissBehavior,
-     280           1 :             physics: physics,
-     281           1 :             children: children,
-     282             :           );
-     283           4 :         } else if (_platform.isIOS) {
-     284           2 :           return CupertinoSwipeRefresh(
-     285           2 :             key: key,
-     286           2 :             childrenDelegate: childrenDelegate,
-     287           2 :             stateStream: stateStream,
-     288           2 :             initState: initState,
-     289           2 :             onRefresh: onRefresh,
-     290           2 :             scrollController: scrollController,
-     291           2 :             refreshIndicatorExtent: refreshIndicatorExtent,
-     292           2 :             refreshTriggerPullDistance: refreshTriggerPullDistance,
-     293           2 :             indicatorBuilder: indicatorBuilder,
-     294           2 :             shrinkWrap: shrinkWrap,
-     295           2 :             padding: padding,
-     296           2 :             physics: physics,
-     297           2 :             children: children,
-     298             :           );
-     299             :         }
-     300             :     }
-     301             : 
-     302           1 :     return Container();
-     303             :   }
-     304             : }
-
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/swipe_refresh_base.dart.func-sort-c.html b/coverage/html/src/swipe_refresh_base.dart.func-sort-c.html deleted file mode 100644 index 6bdee7c..0000000 --- a/coverage/html/src/swipe_refresh_base.dart.func-sort-c.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - LCOV - lcov.info - src\swipe_refresh_base.dart - functions - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\swipe_refresh_base.dart - swipe_refresh_base.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:2424100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - -

Function Name Sort by function nameHit count Sort by hit count
-
-
- - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/swipe_refresh_base.dart.func.html b/coverage/html/src/swipe_refresh_base.dart.func.html deleted file mode 100644 index 662259b..0000000 --- a/coverage/html/src/swipe_refresh_base.dart.func.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - LCOV - lcov.info - src\swipe_refresh_base.dart - functions - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\swipe_refresh_base.dart - swipe_refresh_base.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:2424100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - -

Function Name Sort by function nameHit count Sort by hit count
-
-
- - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/swipe_refresh_base.dart.gcov.html b/coverage/html/src/swipe_refresh_base.dart.gcov.html deleted file mode 100644 index 2a3f334..0000000 --- a/coverage/html/src/swipe_refresh_base.dart.gcov.html +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - LCOV - lcov.info - src\swipe_refresh_base.dart - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\swipe_refresh_base.dart - swipe_refresh_base.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:2424100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- - - - - - - - -

-
          Line data    Source code
-
-       1             : // Copyright (c) 2019-present,  SurfStudio LLC
-       2             : //
-       3             : // Licensed under the Apache License, Version 2.0 (the "License");
-       4             : // you may not use this file except in compliance with the License.
-       5             : // You may obtain a copy of the License at
-       6             : //
-       7             : //     http://www.apache.org/licenses/LICENSE-2.0
-       8             : //
-       9             : // Unless required by applicable law or agreed to in writing, software
-      10             : // distributed under the License is distributed on an "AS IS" BASIS,
-      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      12             : // See the License for the specific language governing permissions and
-      13             : // limitations under the License.
-      14             : 
-      15             : import 'dart:async';
-      16             : 
-      17             : import 'package:flutter/material.dart';
-      18             : import 'package:swipe_refresh/src/swipe_refresh_state.dart';
-      19             : 
-      20             : /// Base refresh indicator widget.
-      21             : abstract class SwipeRefreshBase extends StatefulWidget {
-      22             :   final List<Widget>? children;
-      23             :   final VoidCallback onRefresh;
-      24             :   final SwipeRefreshState? initState;
-      25             :   final Stream<SwipeRefreshState> stateStream;
-      26             :   final ScrollController? scrollController;
-      27             :   final SliverChildDelegate? childrenDelegate;
-      28             :   final EdgeInsets? padding;
-      29             :   final bool shrinkWrap;
-      30             :   final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior;
-      31             :   final ScrollPhysics? physics;
-      32             : 
-      33           4 :   const SwipeRefreshBase({
-      34             :     required this.stateStream,
-      35             :     required this.onRefresh,
-      36             :     Key? key,
-      37             :     this.initState,
-      38             :     this.scrollController,
-      39             :     this.childrenDelegate,
-      40             :     this.children,
-      41             :     this.padding,
-      42             :     this.shrinkWrap = false,
-      43             :     this.keyboardDismissBehavior,
-      44             :     this.physics,
-      45           2 :   })  : assert((children == null || childrenDelegate == null) &&
-      46             :             (children != null || childrenDelegate != null)),
-      47           4 :         super(key: key);
-      48             : 
-      49             :   @override
-      50             :   @protected
-      51             :   // ignore: no_logic_in_create_state
-      52             :   SwipeRefreshBaseState createState();
-      53             : }
-      54             : 
-      55             : abstract class SwipeRefreshBaseState<T extends SwipeRefreshBase>
-      56             :     extends State<T> {
-      57             :   @protected
-      58             :   final GlobalKey refreshKey = GlobalKey();
-      59             : 
-      60             :   @protected
-      61             :   Completer<void>? completer;
-      62             : 
-      63             :   @visibleForTesting
-      64             :   @protected
-      65             :   SwipeRefreshState currentState = SwipeRefreshState.hidden;
-      66             : 
-      67             :   StreamSubscription<SwipeRefreshState>? _stateSubscription;
-      68             : 
-      69           4 :   @override
-      70             :   void initState() {
-      71           4 :     super.initState();
-      72             : 
-      73           8 :     if (widget.initState != null) {
-      74           6 :       currentState = widget.initState!;
-      75             :     }
-      76             : 
-      77          20 :     _stateSubscription = widget.stateStream.listen(_updateState);
-      78             :   }
-      79             : 
-      80           4 :   @override
-      81             :   Widget build(BuildContext context) {
-      82             :     // ignore: avoid-returning-widgets
-      83          22 :     return buildRefresher(refreshKey, widget.children ?? [], _onRefresh);
-      84             :   }
-      85             : 
-      86           4 :   @override
-      87             :   void dispose() {
-      88           8 :     _stateSubscription?.cancel();
-      89             : 
-      90           4 :     super.dispose();
-      91             :   }
-      92             : 
-      93             :   @protected
-      94             :   Widget buildRefresher(
-      95             :     Key key,
-      96             :     List<Widget> children,
-      97             :     Future<void> Function() onRefresh,
-      98             :   );
-      99             : 
-     100             :   @protected
-     101             :   void onUpdateState(SwipeRefreshState state);
-     102             : 
-     103           2 :   @protected
-     104             :   Future<void> _onRefresh() {
-     105           2 :     _updateState(SwipeRefreshState.loading);
-     106           4 :     widget.onRefresh();
-     107           4 :     completer = Completer<void>();
-     108           4 :     return completer!.future;
-     109             :   }
-     110             : 
-     111           2 :   void _updateState(SwipeRefreshState newState) {
-     112           4 :     if (currentState != newState) {
-     113           2 :       setState(
-     114           2 :         () {
-     115           2 :           currentState = newState;
-     116             : 
-     117           4 :           onUpdateState(currentState);
-     118             :         },
-     119             :       );
-     120             :     }
-     121             :   }
-     122             : }
-
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/swipe_refresh_state.dart.func-sort-c.html b/coverage/html/src/swipe_refresh_state.dart.func-sort-c.html deleted file mode 100644 index 24ecdbe..0000000 --- a/coverage/html/src/swipe_refresh_state.dart.func-sort-c.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - LCOV - lcov.info - src\swipe_refresh_state.dart - functions - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\swipe_refresh_state.dart - swipe_refresh_state.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:11100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - -

Function Name Sort by function nameHit count Sort by hit count
-
-
- - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/swipe_refresh_state.dart.func.html b/coverage/html/src/swipe_refresh_state.dart.func.html deleted file mode 100644 index 5e9826e..0000000 --- a/coverage/html/src/swipe_refresh_state.dart.func.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - LCOV - lcov.info - src\swipe_refresh_state.dart - functions - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\swipe_refresh_state.dart - swipe_refresh_state.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:11100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - -

Function Name Sort by function nameHit count Sort by hit count
-
-
- - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/swipe_refresh_state.dart.gcov.html b/coverage/html/src/swipe_refresh_state.dart.gcov.html deleted file mode 100644 index dfb046a..0000000 --- a/coverage/html/src/swipe_refresh_state.dart.gcov.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - LCOV - lcov.info - src\swipe_refresh_state.dart - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\swipe_refresh_state.dart - swipe_refresh_state.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:11100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- - - - - - - - -

-
          Line data    Source code
-
-       1             : // Copyright (c) 2019-present,  SurfStudio LLC
-       2             : //
-       3             : // Licensed under the Apache License, Version 2.0 (the "License");
-       4             : // you may not use this file except in compliance with the License.
-       5             : // You may obtain a copy of the License at
-       6             : //
-       7             : //     http://www.apache.org/licenses/LICENSE-2.0
-       8             : //
-       9             : // Unless required by applicable law or agreed to in writing, software
-      10             : // distributed under the License is distributed on an "AS IS" BASIS,
-      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      12             : // See the License for the specific language governing permissions and
-      13             : // limitations under the License.
-      14             : 
-      15             : /// Refresh indicator states.
-      16           4 : enum SwipeRefreshState {
-      17             :   /// Indicator hidden.
-      18             :   hidden,
-      19             : 
-      20             :   /// Indicator shown.
-      21             :   loading,
-      22             : }
-
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/swipe_refresh_style.dart.func-sort-c.html b/coverage/html/src/swipe_refresh_style.dart.func-sort-c.html deleted file mode 100644 index 944cbc2..0000000 --- a/coverage/html/src/swipe_refresh_style.dart.func-sort-c.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - LCOV - lcov.info - src\swipe_refresh_style.dart - functions - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\swipe_refresh_style.dart - swipe_refresh_style.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:11100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - -

Function Name Sort by function nameHit count Sort by hit count
-
-
- - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/swipe_refresh_style.dart.func.html b/coverage/html/src/swipe_refresh_style.dart.func.html deleted file mode 100644 index ea66fb2..0000000 --- a/coverage/html/src/swipe_refresh_style.dart.func.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - LCOV - lcov.info - src\swipe_refresh_style.dart - functions - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\swipe_refresh_style.dart - swipe_refresh_style.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:11100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - -

Function Name Sort by function nameHit count Sort by hit count
-
-
- - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/src/swipe_refresh_style.dart.gcov.html b/coverage/html/src/swipe_refresh_style.dart.gcov.html deleted file mode 100644 index 1f16e83..0000000 --- a/coverage/html/src/swipe_refresh_style.dart.gcov.html +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - LCOV - lcov.info - src\swipe_refresh_style.dart - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - src\swipe_refresh_style.dart - swipe_refresh_style.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:11100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- - - - - - - - -

-
          Line data    Source code
-
-       1             : // Copyright (c) 2019-present,  SurfStudio LLC
-       2             : //
-       3             : // Licensed under the Apache License, Version 2.0 (the "License");
-       4             : // you may not use this file except in compliance with the License.
-       5             : // You may obtain a copy of the License at
-       6             : //
-       7             : //     http://www.apache.org/licenses/LICENSE-2.0
-       8             : //
-       9             : // Unless required by applicable law or agreed to in writing, software
-      10             : // distributed under the License is distributed on an "AS IS" BASIS,
-      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      12             : // See the License for the specific language governing permissions and
-      13             : // limitations under the License.
-      14             : 
-      15             : /// Indicator style.
-      16           4 : enum SwipeRefreshStyle {
-      17             :   /// Material Design.
-      18             :   material,
-      19             : 
-      20             :   /// Cupertino.
-      21             :   cupertino,
-      22             : 
-      23             :   /// Adaptive.
-      24             :   adaptive,
-      25             : 
-      26             :   /// Builder.
-      27             :   builder,
-      28             : }
-
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/updown.png b/coverage/html/updown.png deleted file mode 100644 index aa56a238b3e6c435265250f9266cd1b8caba0f20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^AT}Qd8;}%R+`Ae`*?77*hG?8mPH5^{)z4*}Q$iB}huR`+ diff --git a/coverage/html/utills/index-sort-f.html b/coverage/html/utills/index-sort-f.html deleted file mode 100644 index c06fa6e..0000000 --- a/coverage/html/utills/index-sort-f.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - LCOV - lcov.info - utills - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - utillsHitTotalCoverage
Test:lcov.infoLines:22100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - -

Filename Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
platform_wrapper.dart -
100.0%
- 		100.0 %2 / 2-0 / 0
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/utills/index-sort-l.html b/coverage/html/utills/index-sort-l.html deleted file mode 100644 index d425a7b..0000000 --- a/coverage/html/utills/index-sort-l.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - LCOV - lcov.info - utills - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - utillsHitTotalCoverage
Test:lcov.infoLines:22100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - -

Filename Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
platform_wrapper.dart -
100.0%
- 		100.0 %2 / 2-0 / 0
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/utills/index.html b/coverage/html/utills/index.html deleted file mode 100644 index 8dcc6ca..0000000 --- a/coverage/html/utills/index.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - LCOV - lcov.info - utills - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - utillsHitTotalCoverage
Test:lcov.infoLines:22100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - -

Filename Sort by nameLine Coverage Sort by line coverageFunctions Sort by function coverage
platform_wrapper.dart -
100.0%
- 		100.0 %2 / 2-0 / 0
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/utills/platform_wrapper.dart.func-sort-c.html b/coverage/html/utills/platform_wrapper.dart.func-sort-c.html deleted file mode 100644 index d172493..0000000 --- a/coverage/html/utills/platform_wrapper.dart.func-sort-c.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - LCOV - lcov.info - utills\platform_wrapper.dart - functions - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - utills\platform_wrapper.dart - platform_wrapper.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:22100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - -

Function Name Sort by function nameHit count Sort by hit count
-
-
- - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/utills/platform_wrapper.dart.func.html b/coverage/html/utills/platform_wrapper.dart.func.html deleted file mode 100644 index 4cf2985..0000000 --- a/coverage/html/utills/platform_wrapper.dart.func.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - LCOV - lcov.info - utills\platform_wrapper.dart - functions - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - utills\platform_wrapper.dart - platform_wrapper.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:22100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- -
- - - - - - -

Function Name Sort by function nameHit count Sort by hit count
-
-
- - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/html/utills/platform_wrapper.dart.gcov.html b/coverage/html/utills/platform_wrapper.dart.gcov.html deleted file mode 100644 index 98c8e3b..0000000 --- a/coverage/html/utills/platform_wrapper.dart.gcov.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - LCOV - lcov.info - utills\platform_wrapper.dart - - - - - - - - - - - - - - -
LCOV - code coverage report
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Current view:top level - utills\platform_wrapper.dart - platform_wrapper.dart (source / functions)HitTotalCoverage
Test:lcov.infoLines:22100.0 %
Date:Mon Nov 8 15:51:46 2021Functions:00-
-
- - - - - - - - -

-
          Line data    Source code
-
-       1             : // Copyright (c) 2019-present,  SurfStudio LLC
-       2             : //
-       3             : // Licensed under the Apache License, Version 2.0 (the "License");
-       4             : // you may not use this file except in compliance with the License.
-       5             : // You may obtain a copy of the License at
-       6             : //
-       7             : //     http://www.apache.org/licenses/LICENSE-2.0
-       8             : //
-       9             : // Unless required by applicable law or agreed to in writing, software
-      10             : // distributed under the License is distributed on an "AS IS" BASIS,
-      11             : // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      12             : // See the License for the specific language governing permissions and
-      13             : // limitations under the License.
-      14             : 
-      15             : import 'dart:io';
-      16             : 
-      17             : /// Wrapper for Platform io.
-      18             : class PlatformWrapper {
-      19           2 :   bool get isIOS => Platform.isIOS;
-      20             : 
-      21           2 :   bool get isAndroid => Platform.isAndroid;
-      22             : }
-
-
-
- - - - -
Generated by: LCOV version 1.15.alpha0w
-
- - - diff --git a/coverage/lcov.info b/coverage/lcov.info deleted file mode 100644 index 9d987dc..0000000 --- a/coverage/lcov.info +++ /dev/null @@ -1,206 +0,0 @@ -SF:lib\utills\platform_wrapper.dart -DA:19,2 -DA:21,2 -LF:2 -LH:2 -end_of_record -SF:lib\src\cupertino_swipe_refresh.dart -DA:30,3 -DA:45,3 -DA:59,3 -DA:61,3 -DA:62,3 -DA:70,3 -DA:72,3 -DA:74,3 -DA:80,3 -DA:81,6 -DA:82,3 -DA:83,6 -DA:85,6 -DA:89,3 -DA:90,3 -DA:91,3 -DA:94,6 -DA:95,6 -DA:96,6 -DA:98,3 -DA:99,6 -DA:100,6 -DA:101,6 -DA:102,6 -DA:103,3 -DA:105,6 -DA:106,6 -DA:113,1 -DA:119,1 -DA:120,1 -DA:121,2 -DA:122,1 -DA:133,3 -DA:138,3 -DA:140,3 -DA:142,3 -DA:143,1 -DA:144,1 -DA:145,1 -DA:146,1 -DA:147,1 -DA:148,1 -DA:153,3 -DA:154,3 -DA:155,2 -DA:156,2 -LF:46 -LH:46 -end_of_record -SF:lib\src\swipe_refresh_base.dart -DA:33,4 -DA:45,2 -DA:47,4 -DA:69,4 -DA:71,4 -DA:73,8 -DA:74,6 -DA:77,20 -DA:80,4 -DA:83,22 -DA:86,4 -DA:88,8 -DA:90,4 -DA:103,2 -DA:105,2 -DA:106,4 -DA:107,4 -DA:108,4 -DA:111,2 -DA:112,4 -DA:113,2 -DA:114,2 -DA:115,2 -DA:117,4 -LF:24 -LH:24 -end_of_record -SF:lib\src\swipe_refresh_state.dart -DA:16,4 -LF:1 -LH:1 -end_of_record -SF:lib\src\material_swipe_refresh.dart -DA:27,2 -DA:42,2 -DA:56,2 -DA:57,2 -DA:62,2 -DA:68,2 -DA:71,4 -DA:72,4 -DA:73,4 -DA:74,2 -DA:75,4 -DA:76,4 -DA:77,6 -DA:78,6 -DA:79,4 -DA:83,1 -DA:84,2 -DA:85,2 -DA:86,2 -DA:87,2 -DA:88,2 -DA:90,3 -DA:95,1 -DA:97,1 -DA:98,1 -DA:99,2 -DA:100,1 -LF:27 -LH:27 -end_of_record -SF:lib\src\swipe_refresh.dart -DA:49,4 -DA:75,2 -DA:76,4 -DA:79,1 -DA:97,1 -DA:119,1 -DA:133,1 -DA:151,1 -DA:166,1 -DA:187,1 -DA:206,1 -DA:222,1 -DA:230,4 -DA:232,4 -DA:233,4 -DA:234,1 -DA:235,1 -DA:236,1 -DA:237,1 -DA:238,1 -DA:239,1 -DA:240,1 -DA:241,1 -DA:242,1 -DA:243,1 -DA:244,1 -DA:245,1 -DA:246,1 -DA:247,1 -DA:249,3 -DA:250,1 -DA:251,1 -DA:252,1 -DA:253,1 -DA:254,1 -DA:255,1 -DA:256,1 -DA:257,1 -DA:258,1 -DA:259,1 -DA:260,1 -DA:261,1 -DA:262,1 -DA:263,1 -DA:265,2 -DA:266,2 -DA:267,4 -DA:268,1 -DA:269,1 -DA:270,1 -DA:271,1 -DA:272,1 -DA:273,1 -DA:274,1 -DA:275,1 -DA:276,1 -DA:277,1 -DA:278,1 -DA:279,1 -DA:280,1 -DA:281,1 -DA:283,4 -DA:284,2 -DA:285,2 -DA:286,2 -DA:287,2 -DA:288,2 -DA:289,2 -DA:290,2 -DA:291,2 -DA:292,2 -DA:293,2 -DA:294,2 -DA:295,2 -DA:296,2 -DA:297,2 -DA:302,1 -LF:77 -LH:77 -end_of_record -SF:lib\src\swipe_refresh_style.dart -DA:16,4 -LF:1 -LH:1 -end_of_record From b7ceb46265d9f9942582be879a21e66aad56f6e9 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Wed, 8 Dec 2021 15:32:16 +0300 Subject: [PATCH 37/69] Return const constructors. --- lib/src/swipe_refresh.dart | 10 +++++----- lib/utills/platform_wrapper.dart | 2 ++ test/platform_wrapper_test.dart | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/src/swipe_refresh.dart b/lib/src/swipe_refresh.dart index d1655c4..b9c87ef 100644 --- a/lib/src/swipe_refresh.dart +++ b/lib/src/swipe_refresh.dart @@ -47,7 +47,7 @@ class SwipeRefresh extends StatelessWidget { final ScrollPhysics? physics; final PlatformWrapper _platform; - SwipeRefresh( + const SwipeRefresh( this.style, { required this.stateStream, required this.onRefresh, @@ -73,11 +73,11 @@ class SwipeRefresh extends StatelessWidget { CupertinoSwipeRefresh.defaultRefreshIndicatorExtent, indicatorBuilder = indicatorBuilder ?? CupertinoSliverRefreshControl.buildRefreshIndicator, - _platform = platform ?? PlatformWrapper(), + _platform = platform ?? const PlatformWrapper(), super(key: key); /// Create refresh indicator adaptive to platform. - SwipeRefresh.adaptive({ + const SwipeRefresh.adaptive({ required Stream stateStream, required VoidCallback onRefresh, List? children, @@ -117,7 +117,7 @@ class SwipeRefresh extends StatelessWidget { ); /// Create refresh indicator with Material Design style. - SwipeRefresh.material({ + const SwipeRefresh.material({ required Stream stateStream, required VoidCallback onRefresh, List? children, @@ -149,7 +149,7 @@ class SwipeRefresh extends StatelessWidget { ); /// Create refresh indicator with Cupertino style. - SwipeRefresh.cupertino({ + const SwipeRefresh.cupertino({ required Stream stateStream, required VoidCallback onRefresh, List? children, diff --git a/lib/utills/platform_wrapper.dart b/lib/utills/platform_wrapper.dart index b18879c..7e4975a 100644 --- a/lib/utills/platform_wrapper.dart +++ b/lib/utills/platform_wrapper.dart @@ -19,4 +19,6 @@ class PlatformWrapper { bool get isIOS => Platform.isIOS; bool get isAndroid => Platform.isAndroid; + + const PlatformWrapper(); } diff --git a/test/platform_wrapper_test.dart b/test/platform_wrapper_test.dart index 779f61b..c24a945 100644 --- a/test/platform_wrapper_test.dart +++ b/test/platform_wrapper_test.dart @@ -19,7 +19,7 @@ void main() { late PlatformWrapper platformWrapper; setUp(() { - platformWrapper = PlatformWrapper(); + platformWrapper = const PlatformWrapper(); }); test( @@ -33,7 +33,7 @@ void main() { test( 'Method isIOS should return false', - () { + () { final isIOS = platformWrapper.isIOS; expect(isIOS, false); From d52cd5a2b4d25d776365e95a56117244dcffc008 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Wed, 8 Dec 2021 15:39:20 +0300 Subject: [PATCH 38/69] Run flutter format . --- test/swipe_refresh_cupertino_test.dart | 2 +- test/swipe_refresh_material_test.dart | 2 +- test/test_utils.dart | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/swipe_refresh_cupertino_test.dart b/test/swipe_refresh_cupertino_test.dart index fa5a412..962aee5 100644 --- a/test/swipe_refresh_cupertino_test.dart +++ b/test/swipe_refresh_cupertino_test.dart @@ -278,7 +278,7 @@ void main() { testWidgets( 'If padding passed to the SwipeRefresh.cupertino, ' - 'SliverList should be wrapped in SliverPadding', + 'SliverList should be wrapped in SliverPadding', (tester) async { final events = []; diff --git a/test/swipe_refresh_material_test.dart b/test/swipe_refresh_material_test.dart index ab81504..ccda728 100644 --- a/test/swipe_refresh_material_test.dart +++ b/test/swipe_refresh_material_test.dart @@ -251,5 +251,5 @@ class MockOnRefreshFunction extends Mock { } class TestSliverChildListDelegate extends SliverChildListDelegate { - TestSliverChildListDelegate(List children) : super(children); + TestSliverChildListDelegate(List children) : super(children); } diff --git a/test/test_utils.dart b/test/test_utils.dart index 2ecff09..76e1fbe 100644 --- a/test/test_utils.dart +++ b/test/test_utils.dart @@ -13,5 +13,6 @@ // limitations under the License. import 'package:flutter/material.dart'; + // ignore: avoid-returning-widgets Widget makeTestableWidget(Widget widget) => MaterialApp(home: widget); From 8036a469f0c98da51da5cc78d5214cdf46ca5ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=97=D0=BE=D1=82?= =?UTF-8?q?=D1=8C=D0=B5=D0=B2?= Date: Wed, 8 Dec 2021 15:52:02 +0300 Subject: [PATCH 39/69] Release 1.0.2 --- CHANGELOG.md | 4 ++-- README.md | 34 +++++++++++++++++----------------- pubspec.yaml | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8d23de..823703b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # Changelog -## next +## 1.0.2 -*Refactoring. +* Internal improvements. ## 1.0.1 diff --git a/README.md b/README.md index c3d6f9e..4341cf8 100644 --- a/README.md +++ b/README.md @@ -33,10 +33,10 @@ Refresh indicator widget with Material Design style. ```dart SwipeRefresh.material( -stateStream: Stream(), -onRefresh: _refresh, -padding: const EdgeInsets.symmetric(vertical: 10), -children: [ ... ], + stateStream: Stream(), + onRefresh: _refresh, + padding: const EdgeInsets.symmetric(vertical: 10), + children: [ ... ], ); Future _refresh() async { @@ -51,10 +51,10 @@ Refresh indicator widget with Cupertino Design style. ```dart SwipeRefresh.cupertino( -stateStream: Stream(), -onRefresh: _refresh, -padding: const EdgeInsets.symmetric(vertical: 10), -children: [ ... ], + stateStream: Stream(), + onRefresh: _refresh, + padding: const EdgeInsets.symmetric(vertical: 10), + children: [ ... ], ); Future _refresh() async { @@ -69,10 +69,10 @@ Refresh indicator widget with adaptive to platform style. ```dart SwipeRefresh.adaptive( -stateStream: Stream(), -onRefresh: _refresh, -padding: const EdgeInsets.symmetric(vertical: 10), -children: [ ... ], + stateStream: Stream(), + onRefresh: _refresh, + padding: const EdgeInsets.symmetric(vertical: 10), + children: [ ... ], ); Future _refresh() async { @@ -87,11 +87,11 @@ Refresh indicator widget with adaptive to platform style, and with SliverChildBu ```dart SwipeRefresh.builder( -stateStream: Stream(), -onRefresh: _refresh, -padding: const EdgeInsets.symmetric(vertical: 10), -itemCount: Colors.primaries.length, -itemBuilder: (context, index) { + stateStream: Stream(), + onRefresh: _refresh, + padding: const EdgeInsets.symmetric(vertical: 10), + itemCount: Colors.primaries.length, + itemBuilder: (context, index) { return Container( ... ); diff --git a/pubspec.yaml b/pubspec.yaml index f80ed67..f0d7b50 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: swipe_refresh version: 1.0.1 -description: Widget for refresh by swipe. +description: Set of widgets provides make refresh by using pull down gesture. repository: "https://github.com/surfstudio/flutter-swipe-refresh" issue_tracker: "https://github.com/surfstudio/flutter-swipe-refresh/issues" From 5a704017fcd59037600a756fdb69390cbb68a5bf Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Thu, 9 Dec 2021 12:24:46 +0300 Subject: [PATCH 40/69] Update build badge. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4341cf8..ac30c25 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Swipe Refresh -[![Build Status](https://shields.io/github/workflow/status/surfstudio/flutter-swipe-refresh/build?logo=github&logoColor=white)](https://github.com/surfstudio/flutter-swipe-refresh) +[![Build Status](https://shields.io/github/workflow/status/surfstudio/flutter-swipe-refresh/Analysis?logo=github&logoColor=white)](https://github.com/surfstudio/flutter-swipe-refresh) [![Coverage Status](https://img.shields.io/codecov/c/github/surfstudio/flutter-swipe-refresh?logo=codecov&logoColor=white)](https://app.codecov.io/gh/surfstudio/flutter-swipe-refresh) [![Pub Version](https://img.shields.io/pub/v/swipe_refresh?logo=dart&logoColor=white)](https://pub.dev/packages/swipe_refresh) [![Pub Likes](https://badgen.net/pub/likes/swipe_refresh)](https://pub.dev/packages/swipe_refresh) From 84697ab4e4126ebd64fccacb8f895fd2f1d43a09 Mon Sep 17 00:00:00 2001 From: Kristina Zotyeva Date: Mon, 13 Dec 2021 10:44:05 +0300 Subject: [PATCH 41/69] Removed unnecessary imports. --- lib/src/material_swipe_refresh.dart | 1 - lib/src/swipe_refresh.dart | 1 - test/swipe_refresh_cupertino_test.dart | 1 - test/swipe_refresh_material_test.dart | 1 - 4 files changed, 4 deletions(-) diff --git a/lib/src/material_swipe_refresh.dart b/lib/src/material_swipe_refresh.dart index b662a22..f82bec6 100644 --- a/lib/src/material_swipe_refresh.dart +++ b/lib/src/material_swipe_refresh.dart @@ -15,7 +15,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:swipe_refresh/src/swipe_refresh_base.dart'; import 'package:swipe_refresh/src/swipe_refresh_state.dart'; diff --git a/lib/src/swipe_refresh.dart b/lib/src/swipe_refresh.dart index b9c87ef..229afb0 100644 --- a/lib/src/swipe_refresh.dart +++ b/lib/src/swipe_refresh.dart @@ -13,7 +13,6 @@ // limitations under the License. import 'package:flutter/cupertino.dart'; -import 'package:flutter/foundation.dart'; import 'package:swipe_refresh/src/cupertino_swipe_refresh.dart'; import 'package:swipe_refresh/src/material_swipe_refresh.dart'; import 'package:swipe_refresh/src/swipe_refresh_state.dart'; diff --git a/test/swipe_refresh_cupertino_test.dart b/test/swipe_refresh_cupertino_test.dart index 962aee5..9ec5d64 100644 --- a/test/swipe_refresh_cupertino_test.dart +++ b/test/swipe_refresh_cupertino_test.dart @@ -14,7 +14,6 @@ import 'dart:async'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; diff --git a/test/swipe_refresh_material_test.dart b/test/swipe_refresh_material_test.dart index ccda728..c04ef6f 100644 --- a/test/swipe_refresh_material_test.dart +++ b/test/swipe_refresh_material_test.dart @@ -15,7 +15,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:swipe_refresh/src/swipe_refresh_base.dart'; From 6e54c4dc6e18c2fd3032d0d2d2f53c43b9d929e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=97=D0=BE=D1=82?= =?UTF-8?q?=D1=8C=D0=B5=D0=B2?= Date: Mon, 13 Dec 2021 11:30:16 +0300 Subject: [PATCH 42/69] Release 1.0.2 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index f0d7b50..c67de5b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: swipe_refresh -version: 1.0.1 +version: 1.0.2 description: Set of widgets provides make refresh by using pull down gesture. repository: "https://github.com/surfstudio/flutter-swipe-refresh" issue_tracker: "https://github.com/surfstudio/flutter-swipe-refresh/issues" From 332b136a85ce05739b33222c505dcb34b3fa965c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=A1=D1=83?= =?UTF-8?q?=D0=B3=D0=B8=D0=BD=D0=B0?= <39735343+internetova@users.noreply.github.com> Date: Fri, 11 Feb 2022 18:09:59 +0300 Subject: [PATCH 43/69] Ci: Workflow which add label for a new issue. --- .github/workflows/new_issues_label.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/new_issues_label.yml diff --git a/.github/workflows/new_issues_label.yml b/.github/workflows/new_issues_label.yml new file mode 100644 index 0000000..681df4b --- /dev/null +++ b/.github/workflows/new_issues_label.yml @@ -0,0 +1,22 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +name: Label issues +on: + issues: + types: + - reopened + - opened +jobs: + label_issues: + runs-on: ubuntu-latest + permissions: + issues: write + steps: + - name: Label issues + uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 + with: + add-labels: "new issues" + repo-token: ${{ secrets.SECRET_ISSUES }} From 29fb411869db0316864cd48243f8ce82ebcdb934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=A1=D1=83?= =?UTF-8?q?=D0=B3=D0=B8=D0=BD=D0=B0?= <39735343+internetova@users.noreply.github.com> Date: Tue, 15 Feb 2022 11:25:42 +0300 Subject: [PATCH 44/69] Chore: Bump android compileSdkVersion to 31, kotlin_version to 1.6.10 (#18) --- example/android/app/build.gradle | 2 +- example/android/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 28b9bf9..5ed0bd5 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion 31 sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/example/android/build.gradle b/example/android/build.gradle index 5588645..8c40237 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.6.10' repositories { google() jcenter() From 1b818d2eb23f5487138db892c5417f63f645051d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D1=81=D1=82=D0=B8=D0=BD=D0=B0=20=D0=97?= =?UTF-8?q?=D0=BE=D1=82=D1=8C=D0=B5=D0=B2=D0=B0?= Date: Tue, 29 Mar 2022 10:58:47 +0400 Subject: [PATCH 45/69] Chore: add github action to add "new pull request" label for pull_request. --- .github/workflows/new_pull_request_label.yml | 31 ++++++++++++++++ .../new_pull_request_main_actions.yml | 36 +++++++++++++++++++ pubspec.yaml | 2 +- test/swipe_refresh_adaptive_test.dart | 10 +++--- 4 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/new_pull_request_label.yml create mode 100644 .github/workflows/new_pull_request_main_actions.yml diff --git a/.github/workflows/new_pull_request_label.yml b/.github/workflows/new_pull_request_label.yml new file mode 100644 index 0000000..5b52872 --- /dev/null +++ b/.github/workflows/new_pull_request_label.yml @@ -0,0 +1,31 @@ +# This workflow is triggered when a WIP label is added to an open pull request. +# When deleting the WIP label, the new_pull_request label is added. +# When adding a WIP label, the new_pull_request label is removed if there is one. + +name: Pull-request label tracking +on: + pull_request_target: + types: + - labeled + - unlabeled + +jobs: + label_pull_request: + if: ${{ github.event.label.name == 'WIP' }} + runs-on: ubuntu-latest + permissions: + pull-requests: write + steps: + - name: Add label pull request + if: "!contains(github.event.pull_request.title, 'WIP') && !contains(github.event.pull_request.labels.*.name, 'WIP') && (github.event.pull_request.draft == false)" + uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 + with: + add-labels: "new pull request" + repo-token: ${{ secrets.SECRET_ISSUES }} + + - name: Remove label pull request + if: "contains(github.event.pull_request.title, 'WIP') || contains(github.event.pull_request.labels.*.name, 'WIP') || (github.event.pull_request.draft == true)" + uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 + with: + remove-labels: "new pull request" + repo-token: ${{ secrets.SECRET_ISSUES }} diff --git a/.github/workflows/new_pull_request_main_actions.yml b/.github/workflows/new_pull_request_main_actions.yml new file mode 100644 index 0000000..bd6b24f --- /dev/null +++ b/.github/workflows/new_pull_request_main_actions.yml @@ -0,0 +1,36 @@ +# This workflow is triggered when when a pull request opened, edited, reopened, +# converted_to_draft and ready_for_review. +# +# There is no WIP in the title, there is no WIP label and the pull request is not a draft the +# new pull request label is added. +# If either of these is true then remove the label new pull request if there is one. + +name: Pull-request tracking +on: + pull_request_target: + types: + - opened + - edited + - reopened + - converted_to_draft + - ready_for_review + +jobs: + pull_request: + runs-on: ubuntu-latest + permissions: + pull-requests: write + steps: + - name: Add label pull request + if: "!contains(github.event.pull_request.title, 'WIP') && !contains(github.event.pull_request.labels.*.name, 'WIP') && (github.event.pull_request.draft == false)" + uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 + with: + add-labels: "new pull request" + repo-token: ${{ secrets.SECRET_ISSUES }} + + - name: Remove label pull request + if: "contains(github.event.pull_request.title, 'WIP') || contains(github.event.pull_request.labels.*.name, 'WIP') || (github.event.pull_request.draft == true)" + uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 + with: + remove-labels: "new pull request" + repo-token: ${{ secrets.SECRET_ISSUES }} \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index c67de5b..d120fc6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,7 +12,7 @@ dev_dependencies: flutter_test: sdk: flutter mocktail: ^0.2.0 - surf_lint_rules: ^1.0.0 + surf_lint_rules: ^1.5.0 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/test/swipe_refresh_adaptive_test.dart b/test/swipe_refresh_adaptive_test.dart index 84b8fa3..a2931ce 100644 --- a/test/swipe_refresh_adaptive_test.dart +++ b/test/swipe_refresh_adaptive_test.dart @@ -23,25 +23,25 @@ import 'package:swipe_refresh/utills/platform_wrapper.dart'; import 'test_utils.dart'; void main() { - late StreamController _controller; + late StreamController controller; late Stream stream; late MockPlatformWrapper platformWrapper; setUp(() { - _controller = StreamController.broadcast(); - stream = _controller.stream; + controller = StreamController.broadcast(); + stream = controller.stream; platformWrapper = MockPlatformWrapper(); }); tearDown(() async { - await _controller.close(); + await controller.close(); }); Future _onRefresh() async { await Future.delayed(const Duration(seconds: 3)); - _controller.sink.add(SwipeRefreshState.hidden); + controller.sink.add(SwipeRefreshState.hidden); } final listColors = [ From f4705e2ffe1f60de7ec502695eae9dde59d480af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=A1=D1=83?= =?UTF-8?q?=D0=B3=D0=B8=D0=BD=D0=B0?= <39735343+internetova@users.noreply.github.com> Date: Mon, 25 Apr 2022 14:28:44 +0300 Subject: [PATCH 46/69] Chore: Publishing GitHub action flow * refactor: workflow -> main * refactor: Label issues * refactor: Pull-request label tracking * refactor: Pull-request tracking * feat: Publishing to pub.dev * refactor: analysis --- .github/workflows/main.yml | 29 ++++ .github/workflows/new_issues_label.yml | 12 +- .github/workflows/new_pull_request_label.yml | 20 +-- .../new_pull_request_main_actions.yml | 22 +-- .github/workflows/publish_to_pub.yml | 26 ++++ .github/workflows/workflow.yaml | 129 ------------------ 6 files changed, 65 insertions(+), 173 deletions(-) create mode 100644 .github/workflows/main.yml create mode 100644 .github/workflows/publish_to_pub.yml delete mode 100644 .github/workflows/workflow.yaml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..42a8222 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,29 @@ +name: "Main" + +on: + pull_request: + branches: + - main + push: + branches: + - main + tags-ignore: + - '**' + +jobs: + analysis: + uses: surfstudio/flutter-ci-workflows/.github/workflows/analysis.yml@main + + testing: + needs: analysis + uses: surfstudio/flutter-ci-workflows/.github/workflows/testing.yml@main + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + + build_android_example: + needs: analysis + uses: surfstudio/flutter-ci-workflows/.github/workflows/build_android_example.yml@main + + build_ios_example: + needs: analysis + uses: surfstudio/flutter-ci-workflows/.github/workflows/build_ios_example.yml@main diff --git a/.github/workflows/new_issues_label.yml b/.github/workflows/new_issues_label.yml index 681df4b..5319ce7 100644 --- a/.github/workflows/new_issues_label.yml +++ b/.github/workflows/new_issues_label.yml @@ -11,12 +11,6 @@ on: - opened jobs: label_issues: - runs-on: ubuntu-latest - permissions: - issues: write - steps: - - name: Label issues - uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 - with: - add-labels: "new issues" - repo-token: ${{ secrets.SECRET_ISSUES }} + uses: surfstudio/flutter-ci-workflows/.github/workflows/new_issues_label.yml@main + secrets: + SECRET_ISSUES: ${{ secrets.SECRET_ISSUES }} diff --git a/.github/workflows/new_pull_request_label.yml b/.github/workflows/new_pull_request_label.yml index 5b52872..fb21084 100644 --- a/.github/workflows/new_pull_request_label.yml +++ b/.github/workflows/new_pull_request_label.yml @@ -12,20 +12,6 @@ on: jobs: label_pull_request: if: ${{ github.event.label.name == 'WIP' }} - runs-on: ubuntu-latest - permissions: - pull-requests: write - steps: - - name: Add label pull request - if: "!contains(github.event.pull_request.title, 'WIP') && !contains(github.event.pull_request.labels.*.name, 'WIP') && (github.event.pull_request.draft == false)" - uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 - with: - add-labels: "new pull request" - repo-token: ${{ secrets.SECRET_ISSUES }} - - - name: Remove label pull request - if: "contains(github.event.pull_request.title, 'WIP') || contains(github.event.pull_request.labels.*.name, 'WIP') || (github.event.pull_request.draft == true)" - uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 - with: - remove-labels: "new pull request" - repo-token: ${{ secrets.SECRET_ISSUES }} + uses: surfstudio/flutter-ci-workflows/.github/workflows/new_pull_request_label.yml@main + secrets: + SECRET_ISSUES: ${{ secrets.SECRET_ISSUES }} diff --git a/.github/workflows/new_pull_request_main_actions.yml b/.github/workflows/new_pull_request_main_actions.yml index bd6b24f..ccf208e 100644 --- a/.github/workflows/new_pull_request_main_actions.yml +++ b/.github/workflows/new_pull_request_main_actions.yml @@ -1,4 +1,4 @@ -# This workflow is triggered when when a pull request opened, edited, reopened, +# This workflow is triggered when a pull request opened, edited, reopened, # converted_to_draft and ready_for_review. # # There is no WIP in the title, there is no WIP label and the pull request is not a draft the @@ -17,20 +17,6 @@ on: jobs: pull_request: - runs-on: ubuntu-latest - permissions: - pull-requests: write - steps: - - name: Add label pull request - if: "!contains(github.event.pull_request.title, 'WIP') && !contains(github.event.pull_request.labels.*.name, 'WIP') && (github.event.pull_request.draft == false)" - uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 - with: - add-labels: "new pull request" - repo-token: ${{ secrets.SECRET_ISSUES }} - - - name: Remove label pull request - if: "contains(github.event.pull_request.title, 'WIP') || contains(github.event.pull_request.labels.*.name, 'WIP') || (github.event.pull_request.draft == true)" - uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 - with: - remove-labels: "new pull request" - repo-token: ${{ secrets.SECRET_ISSUES }} \ No newline at end of file + uses: surfstudio/flutter-ci-workflows/.github/workflows/new_pull_request_label.yml@main + secrets: + SECRET_ISSUES: ${{ secrets.SECRET_ISSUES }} \ No newline at end of file diff --git a/.github/workflows/publish_to_pub.yml b/.github/workflows/publish_to_pub.yml new file mode 100644 index 0000000..f4a0247 --- /dev/null +++ b/.github/workflows/publish_to_pub.yml @@ -0,0 +1,26 @@ +name: "Publishing" + +on: + push: + tags: + - v* + +jobs: + analysis: + uses: surfstudio/flutter-ci-workflows/.github/workflows/analysis.yml@main + + testing: + needs: analysis + uses: surfstudio/flutter-ci-workflows/.github/workflows/testing.yml@main + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + + package-publishing: + needs: [ analysis, testing ] + uses: surfstudio/flutter-ci-workflows/.github/workflows/publish_to_pub.yml@main + with: + PANA_TOTAL: '100' + secrets: + PUB_CREDENTIAL_JSON: ${{ secrets.PUB_CREDENTIAL_JSON }} + PUB_OAUTH_ACCESS_TOKEN: ${{ secrets.PUB_OAUTH_ACCESS_TOKEN }} + PUB_OAUTH_REFRESH_TOKEN: ${{ secrets.PUB_OAUTH_REFRESH_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml deleted file mode 100644 index 40c90c3..0000000 --- a/.github/workflows/workflow.yaml +++ /dev/null @@ -1,129 +0,0 @@ -name: "Analysis" - -on: - pull_request: - branches: - - main - push: - branches: - - main - -jobs: - analysis: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Install Flutter - uses: subosito/flutter-action@v1 - with: - channel: "stable" - - - name: Content - id: check_license - uses: andstor/file-existence-action@v1 - with: - files: "LICENSE, README.md, example, CHANGELOG.md, CONTRIBUTING.md" - - - name: File exists - if: steps.check_files.outputs.files_exists == 'true' - run: echo Content is ok! - - - name: Check Description - run: echo | grep -q Description README.md ; echo $? - - - name: Check Example - run: echo | grep -q Example README.md ; echo $? - - - name: Check Installation - run: echo | grep -q Installation README.md ; echo $? - - - name: Install dependencies - run: flutter pub get - - - name: Run dependency validator - run: | - dart pub global activate dependency_validator - dart pub global run dependency_validator:dependency_validator - - name: Run analyzer - run: flutter analyze --fatal-warnings --fatal-infos . - - - name: Run formatter - run: flutter format --set-exit-if-changed . - - - name: Run package analyzer - uses: axel-op/dart-package-analyzer@v3 - with: - githubToken: ${{ secrets.GITHUB_TOKEN }} - - testing: - needs: analysis - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Install Flutter - uses: subosito/flutter-action@v1 - with: - channel: "stable" - - - name: Install dependencies - run: flutter pub get - - - name: Run tests - env: - CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}} - if: success() - run: | - flutter test --coverage - bash <(curl -s https://codecov.io/bash) -f coverage/lcov.info - - build_android_example: - needs: analysis - runs-on: ubuntu-latest - - steps: - # Setup Java environment in order to build the Android app. - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: "12.x" - - - name: Install Flutter - uses: subosito/flutter-action@v1 - with: - channel: "stable" - - - name: Install dependencies - run: flutter pub get - - - name: Build Android - run: | - cd example - flutter pub get - flutter build apk - - build_ios_example: - needs: analysis - runs-on: macos-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Install Flutter - uses: subosito/flutter-action@v1 - with: - channel: "stable" - - - name: Install dependencies - run: flutter pub get - - - name: Build iOS - run: | - cd example - flutter pub get - flutter build ios --release --no-codesign From f83c222d1d75b521877e045464e3fb252e513463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D0=B8=D1=81=D1=82=D0=B8=D0=BD=D0=B0=20=D0=97?= =?UTF-8?q?=D0=BE=D1=82=D1=8C=D0=B5=D0=B2=D0=B0?= Date: Thu, 12 May 2022 14:00:20 +0300 Subject: [PATCH 47/69] Chore: add github action to monitors the correctness of the issue. (#23) --- .github/workflows/check_issue.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/check_issue.yaml diff --git a/.github/workflows/check_issue.yaml b/.github/workflows/check_issue.yaml new file mode 100644 index 0000000..a2b5746 --- /dev/null +++ b/.github/workflows/check_issue.yaml @@ -0,0 +1,15 @@ +name: "Checking issue for correctness of described" + +on: + issues: + types: + - reopened + - opened + +jobs: + check-issue: + uses: surfstudio/flutter-ci-workflows/.github/workflows/check_issues.yaml@main + with: + REPO_PATH: 'https://github.com/surfstudio/flutter-swipe-refresh/issues/new/choose' + ISSUE_TITLE: ${{ github.event.issue.title }} + ISSUE_BODY: ${{ github.event.issue.body }} From 514dd46d6cfd88589fe11b19c6633f010db3f7ab Mon Sep 17 00:00:00 2001 From: Dmitry Shevchenko Date: Fri, 12 Aug 2022 16:19:30 +0300 Subject: [PATCH 48/69] feat(platform_wrapper): add web support Platform -> TargetPlatform (#24) * feat(platform_wrapper): add web support Platform -> TargetPlatform * chore(test): update test --- example/web/favicon.png | Bin 0 -> 917 bytes example/web/icons/Icon-192.png | Bin 0 -> 5292 bytes example/web/icons/Icon-512.png | Bin 0 -> 8252 bytes example/web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes example/web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes example/web/index.html | 58 ++++++++++++++++++++++++ example/web/manifest.json | 35 ++++++++++++++ lib/utills/platform_wrapper.dart | 6 +-- test/platform_wrapper_test.dart | 11 ++++- 9 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 example/web/favicon.png create mode 100644 example/web/icons/Icon-192.png create mode 100644 example/web/icons/Icon-512.png create mode 100644 example/web/icons/Icon-maskable-192.png create mode 100644 example/web/icons/Icon-maskable-512.png create mode 100644 example/web/index.html create mode 100644 example/web/manifest.json diff --git a/example/web/favicon.png b/example/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/example/web/icons/Icon-192.png b/example/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 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 literal 0 HcmV?d00001 diff --git a/example/web/icons/Icon-512.png b/example/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/example/web/icons/Icon-maskable-192.png b/example/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/example/web/icons/Icon-maskable-512.png b/example/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 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 MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/example/web/index.html b/example/web/index.html new file mode 100644 index 0000000..41b3bc3 --- /dev/null +++ b/example/web/index.html @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + example + + + + + + + + + + diff --git a/example/web/manifest.json b/example/web/manifest.json new file mode 100644 index 0000000..096edf8 --- /dev/null +++ b/example/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "example", + "short_name": "example", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/lib/utills/platform_wrapper.dart b/lib/utills/platform_wrapper.dart index 7e4975a..3530af4 100644 --- a/lib/utills/platform_wrapper.dart +++ b/lib/utills/platform_wrapper.dart @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -import 'dart:io'; +import 'package:flutter/foundation.dart'; /// Wrapper for Platform io. class PlatformWrapper { - bool get isIOS => Platform.isIOS; + bool get isIOS => defaultTargetPlatform == TargetPlatform.iOS; - bool get isAndroid => Platform.isAndroid; + bool get isAndroid => defaultTargetPlatform == TargetPlatform.android; const PlatformWrapper(); } diff --git a/test/platform_wrapper_test.dart b/test/platform_wrapper_test.dart index c24a945..ce3d22a 100644 --- a/test/platform_wrapper_test.dart +++ b/test/platform_wrapper_test.dart @@ -23,11 +23,18 @@ void main() { }); test( - 'Method isAndroid should return false', + 'Method isAndroid should return true', () { final isAndroid = platformWrapper.isAndroid; - expect(isAndroid, false); + // because the target flutter checks the test environment + // and by default outputs the platform android + // assert(() { + // if (Platform.environment.containsKey('FLUTTER_TEST')) + // result = platform.TargetPlatform.android; + // return true; + // }()); + expect(isAndroid, true); }, ); From 36fd61b780696577e11d527333ded7c41845ef57 Mon Sep 17 00:00:00 2001 From: Vitaliy Podushkin Date: Fri, 21 Jul 2023 13:31:37 +0700 Subject: [PATCH 49/69] feat: Added modern workflow for SurfGear packages (#27) * feat(fvm): added fvm * fix(fvm): fix gitgnore * feat(analyze): updated lint rules & fixed some lints * feat(workflow): updated workflow * fix(ci): added fvm dependency for step * fix(workflow): Fix publish workflow --------- Co-authored-by: Maxim Sysoev --- .fvm/fvm_config.json | 4 ++++ .github/workflows/main.yml | 33 +++++++++++++++++++++++---- .github/workflows/publish_to_pub.yml | 20 +++++++++++++++- .gitignore | 1 + example/.fvm/fvm_config.json | 4 ++++ example/.gitignore | 1 + example/lib/main.dart | 2 ++ example/pubspec.yaml | 2 +- lib/src/material_swipe_refresh.dart | 2 ++ pubspec.yaml | 2 +- test/swipe_refresh_adaptive_test.dart | 8 +++---- test/swipe_refresh_builder_test.dart | 4 ++-- 12 files changed, 70 insertions(+), 13 deletions(-) create mode 100644 .fvm/fvm_config.json create mode 100644 example/.fvm/fvm_config.json diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json new file mode 100644 index 0000000..6e3d57e --- /dev/null +++ b/.fvm/fvm_config.json @@ -0,0 +1,4 @@ +{ + "flutterSdkVersion": "3.7.6", + "flavors": {} +} \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 42a8222..0953778 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,26 +4,51 @@ on: pull_request: branches: - main + - dev push: branches: - main + - dev tags-ignore: - - '**' + - "**" jobs: + get_fvm_version: + outputs: + flutter_version: ${{ steps.fvm_version.outputs.flutterSdkVersion }} + name: "Get Flutter version from FVM" + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - id: fvm_version + uses: zoexx/github-action-json-file-properties@release + with: + file_path: ".fvm/fvm_config.json" + analysis: + needs: get_fvm_version uses: surfstudio/flutter-ci-workflows/.github/workflows/analysis.yml@main + with: + flutter-version: ${{ needs.get_fvm_version.outputs.flutter_version }} testing: - needs: analysis + needs: [analysis, get_fvm_version] uses: surfstudio/flutter-ci-workflows/.github/workflows/testing.yml@main + with: + flutter-version: ${{ needs.get_fvm_version.outputs.flutter_version }} secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} build_android_example: - needs: analysis + needs: [analysis, get_fvm_version] uses: surfstudio/flutter-ci-workflows/.github/workflows/build_android_example.yml@main + with: + flutter-version: ${{ needs.get_fvm_version.outputs.flutter_version }} build_ios_example: - needs: analysis + needs: [analysis, get_fvm_version] uses: surfstudio/flutter-ci-workflows/.github/workflows/build_ios_example.yml@main + with: + flutter-version: ${{ needs.get_fvm_version.outputs.flutter_version }} diff --git a/.github/workflows/publish_to_pub.yml b/.github/workflows/publish_to_pub.yml index f4a0247..6385757 100644 --- a/.github/workflows/publish_to_pub.yml +++ b/.github/workflows/publish_to_pub.yml @@ -6,13 +6,31 @@ on: - v* jobs: + get_fvm_version: + outputs: + flutter_version: ${{ steps.fvm_version.outputs.flutterSdkVersion }} + name: "Get Flutter version from FVM" + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - id: fvm_version + uses: zoexx/github-action-json-file-properties@release + with: + file_path: ".fvm/fvm_config.json" + analysis: + needs: get_fvm_version uses: surfstudio/flutter-ci-workflows/.github/workflows/analysis.yml@main + with: + flutter-version: ${{ needs.get_fvm_version.outputs.flutter_version }} testing: - needs: analysis + needs: [get_fvm_version, analysis] uses: surfstudio/flutter-ci-workflows/.github/workflows/testing.yml@main secrets: + flutter-version: ${{ needs.get_fvm_version.outputs.flutter_version }} CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} package-publishing: diff --git a/.gitignore b/.gitignore index 761d64c..99ddad1 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ .pub-cache/ .pub/ build/ +.fvm/flutter_sdk # Android related **/android/**/gradle-wrapper.jar diff --git a/example/.fvm/fvm_config.json b/example/.fvm/fvm_config.json new file mode 100644 index 0000000..6e3d57e --- /dev/null +++ b/example/.fvm/fvm_config.json @@ -0,0 +1,4 @@ +{ + "flutterSdkVersion": "3.7.6", + "flavors": {} +} \ No newline at end of file diff --git a/example/.gitignore b/example/.gitignore index 761d64c..99ddad1 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -31,6 +31,7 @@ .pub-cache/ .pub/ build/ +.fvm/flutter_sdk # Android related **/android/**/gradle-wrapper.jar diff --git a/example/lib/main.dart b/example/lib/main.dart index b97a979..949575b 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +// ignore_for_file: library_private_types_in_public_api + import 'dart:async'; import 'package:flutter/material.dart'; diff --git a/example/pubspec.yaml b/example/pubspec.yaml index d54adee..9978d26 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: path: ../ dev_dependencies: - surf_lint_rules: ^1.0.0 + surf_lint_rules: ^2.0.0 flutter: uses-material-design: true diff --git a/lib/src/material_swipe_refresh.dart b/lib/src/material_swipe_refresh.dart index f82bec6..4a9fae5 100644 --- a/lib/src/material_swipe_refresh.dart +++ b/lib/src/material_swipe_refresh.dart @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +// ignore_for_file: library_private_types_in_public_api + import 'dart:async'; import 'package:flutter/material.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index d120fc6..e35cb6c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,7 +12,7 @@ dev_dependencies: flutter_test: sdk: flutter mocktail: ^0.2.0 - surf_lint_rules: ^1.5.0 + surf_lint_rules: ^2.0.0 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/test/swipe_refresh_adaptive_test.dart b/test/swipe_refresh_adaptive_test.dart index a2931ce..3ce3709 100644 --- a/test/swipe_refresh_adaptive_test.dart +++ b/test/swipe_refresh_adaptive_test.dart @@ -38,7 +38,7 @@ void main() { await controller.close(); }); - Future _onRefresh() async { + Future onRefresh() async { await Future.delayed(const Duration(seconds: 3)); controller.sink.add(SwipeRefreshState.hidden); @@ -60,7 +60,7 @@ void main() { final adaptiveSwipeRefresh = makeTestableWidget( SwipeRefresh.adaptive( stateStream: stream, - onRefresh: _onRefresh, + onRefresh: onRefresh, children: listColors .map( (e) => Container( @@ -88,7 +88,7 @@ void main() { final adaptiveSwipeRefresh = makeTestableWidget( SwipeRefresh.adaptive( stateStream: stream, - onRefresh: _onRefresh, + onRefresh: onRefresh, children: listColors .map( (e) => Container( @@ -117,7 +117,7 @@ void main() { final adaptiveSwipeRefresh = makeTestableWidget( SwipeRefresh.adaptive( stateStream: stream, - onRefresh: _onRefresh, + onRefresh: onRefresh, children: listColors .map( (e) => Container( diff --git a/test/swipe_refresh_builder_test.dart b/test/swipe_refresh_builder_test.dart index 663840c..cf8bbee 100644 --- a/test/swipe_refresh_builder_test.dart +++ b/test/swipe_refresh_builder_test.dart @@ -39,7 +39,7 @@ void main() { await controller.close(); }); - Future _onRefresh() async { + Future onRefresh() async { await Future.delayed(const Duration(seconds: 3)); controller.sink.add(SwipeRefreshState.hidden); @@ -61,7 +61,7 @@ void main() { final testWidget = makeTestableWidget( SwipeRefresh.builder( stateStream: stream, - onRefresh: _onRefresh, + onRefresh: onRefresh, itemCount: listColors.length, itemBuilder: (_, index) => Container( color: listColors[index], From b215b2baf7db0be511987e57b3b5b6b671259e4e Mon Sep 17 00:00:00 2001 From: DmitrDomrachev Date: Tue, 13 Feb 2024 10:10:03 +0300 Subject: [PATCH 50/69] chore: added a list of supported platforms --- pubspec.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pubspec.yaml b/pubspec.yaml index e35cb6c..ec4bb54 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,3 +18,7 @@ environment: sdk: ">=2.12.0 <3.0.0" flutter: + +platforms: + android: + ios: From 69ed7eed6abfaf67273463125165b0daf9c63409 Mon Sep 17 00:00:00 2001 From: DmitrDomrachev Date: Tue, 13 Feb 2024 22:45:12 +0300 Subject: [PATCH 51/69] fix: ScrollController initializations moved form constructor --- lib/src/cupertino_swipe_refresh.dart | 34 +++++++++--------- lib/src/material_swipe_refresh.dart | 19 +++++----- lib/src/swipe_refresh_base.dart | 52 +++++++++++++--------------- 3 files changed, 50 insertions(+), 55 deletions(-) diff --git a/lib/src/cupertino_swipe_refresh.dart b/lib/src/cupertino_swipe_refresh.dart index f4e382e..30776a3 100644 --- a/lib/src/cupertino_swipe_refresh.dart +++ b/lib/src/cupertino_swipe_refresh.dart @@ -53,18 +53,18 @@ class CupertinoSwipeRefresh extends SwipeRefreshBase { const CupertinoSwipeRefresh({ required Stream stateStream, required VoidCallback onRefresh, - Key? key, - SliverChildDelegate? childrenDelegate, + this.refreshTriggerPullDistance = defaultRefreshTriggerPullDistance, + this.refreshIndicatorExtent = defaultRefreshIndicatorExtent, + this.indicatorBuilder = CupertinoSliverRefreshControl.buildRefreshIndicator, List? children, + SliverChildDelegate? childrenDelegate, SwipeRefreshState? initState, EdgeInsets? padding, ScrollController? scrollController, bool shrinkWrap = false, - this.refreshTriggerPullDistance = defaultRefreshTriggerPullDistance, - this.refreshIndicatorExtent = defaultRefreshIndicatorExtent, - this.indicatorBuilder = CupertinoSliverRefreshControl.buildRefreshIndicator, ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior, ScrollPhysics? physics, + Key? key, }) : super( key: key, children: children, @@ -72,27 +72,25 @@ class CupertinoSwipeRefresh extends SwipeRefreshBase { stateStream: stateStream, initState: initState, onRefresh: onRefresh, - padding: padding, scrollController: scrollController, + padding: padding, shrinkWrap: shrinkWrap, keyboardDismissBehavior: keyboardDismissBehavior, physics: physics, ); @override - // ignore: no_logic_in_create_state - SwipeRefreshBaseState createState() => _CupertinoSwipeRefreshState( - scrollController, - ); + SwipeRefreshBaseState createState() => _CupertinoSwipeRefreshState(); } -class _CupertinoSwipeRefreshState - extends SwipeRefreshBaseState { - final ScrollController _scrollController; +class _CupertinoSwipeRefreshState extends SwipeRefreshBaseState { + late final ScrollController _scrollController; - _CupertinoSwipeRefreshState( - ScrollController? scrollController, - ) : _scrollController = scrollController ?? ScrollController(); + @override + void initState() { + super.initState(); + _scrollController = widget.scrollController ?? ScrollController(); + } @override Widget buildRefresher( @@ -103,8 +101,8 @@ class _CupertinoSwipeRefreshState return CustomScrollView( shrinkWrap: widget.shrinkWrap, controller: _scrollController, - keyboardDismissBehavior: widget.keyboardDismissBehavior ?? - ScrollViewKeyboardDismissBehavior.onDrag, + keyboardDismissBehavior: + widget.keyboardDismissBehavior ?? ScrollViewKeyboardDismissBehavior.onDrag, physics: widget.physics == null ? const BouncingScrollPhysics( parent: AlwaysScrollableScrollPhysics(), diff --git a/lib/src/material_swipe_refresh.dart b/lib/src/material_swipe_refresh.dart index 4a9fae5..d32a7f1 100644 --- a/lib/src/material_swipe_refresh.dart +++ b/lib/src/material_swipe_refresh.dart @@ -52,18 +52,18 @@ class MaterialSwipeRefresh extends SwipeRefreshBase { const MaterialSwipeRefresh({ required Stream stateStream, required VoidCallback onRefresh, - Key? key, this.indicatorColor, List? children, SliverChildDelegate? childrenDelegate, SwipeRefreshState? initState, Color? backgroundColor, - ScrollController? scrollController, EdgeInsets? padding, + ScrollController? scrollController, bool shrinkWrap = false, ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior, ScrollPhysics? physics, - }) : backgroundColor = backgroundColor ?? const Color(0xFFFFFFFF), + Key? key, + }) : backgroundColor = backgroundColor ?? Colors.white, super( key: key, children: children, @@ -79,11 +79,10 @@ class MaterialSwipeRefresh extends SwipeRefreshBase { ); @override - _MaterialSwipeRefreshState createState() => _MaterialSwipeRefreshState(); + SwipeRefreshBaseState createState() => _MaterialSwipeRefreshState(); } -class _MaterialSwipeRefreshState - extends SwipeRefreshBaseState { +class _MaterialSwipeRefreshState extends SwipeRefreshBaseState { @override Widget buildRefresher( Key key, @@ -101,8 +100,8 @@ class _MaterialSwipeRefreshState padding: widget.padding, controller: widget.scrollController ?? ScrollController(), physics: AlwaysScrollableScrollPhysics(parent: widget.physics), - keyboardDismissBehavior: widget.keyboardDismissBehavior ?? - ScrollViewKeyboardDismissBehavior.manual, + keyboardDismissBehavior: + widget.keyboardDismissBehavior ?? ScrollViewKeyboardDismissBehavior.manual, children: children, ) : ListView.custom( @@ -110,8 +109,8 @@ class _MaterialSwipeRefreshState padding: widget.padding, childrenDelegate: widget.childrenDelegate!, controller: widget.scrollController ?? ScrollController(), - keyboardDismissBehavior: widget.keyboardDismissBehavior ?? - ScrollViewKeyboardDismissBehavior.manual, + keyboardDismissBehavior: + widget.keyboardDismissBehavior ?? ScrollViewKeyboardDismissBehavior.manual, physics: AlwaysScrollableScrollPhysics(parent: widget.physics), ), ); diff --git a/lib/src/swipe_refresh_base.dart b/lib/src/swipe_refresh_base.dart index a0e88c8..5a2e8f6 100644 --- a/lib/src/swipe_refresh_base.dart +++ b/lib/src/swipe_refresh_base.dart @@ -52,8 +52,7 @@ abstract class SwipeRefreshBase extends StatefulWidget { SwipeRefreshBaseState createState(); } -abstract class SwipeRefreshBaseState - extends State { +abstract class SwipeRefreshBaseState extends State { @protected final GlobalKey refreshKey = GlobalKey(); @@ -77,19 +76,38 @@ abstract class SwipeRefreshBaseState _stateSubscription = widget.stateStream.listen(_updateState); } - @override - Widget build(BuildContext context) { - // ignore: avoid-returning-widgets - return buildRefresher(refreshKey, widget.children ?? [], _onRefresh); + void _updateState(SwipeRefreshState newState) { + if (currentState != newState) { + setState( + () { + currentState = newState; + + onUpdateState(currentState); + }, + ); + } + } + + @protected + Future _onRefresh() { + _updateState(SwipeRefreshState.loading); + widget.onRefresh(); + completer = Completer(); + return completer!.future; } @override void dispose() { _stateSubscription?.cancel(); - super.dispose(); } + @override + Widget build(BuildContext context) { + // ignore: avoid-returning-widgets + return buildRefresher(refreshKey, widget.children ?? [], _onRefresh); + } + @protected Widget buildRefresher( Key key, @@ -99,24 +117,4 @@ abstract class SwipeRefreshBaseState @protected void onUpdateState(SwipeRefreshState state); - - @protected - Future _onRefresh() { - _updateState(SwipeRefreshState.loading); - widget.onRefresh(); - completer = Completer(); - return completer!.future; - } - - void _updateState(SwipeRefreshState newState) { - if (currentState != newState) { - setState( - () { - currentState = newState; - - onUpdateState(currentState); - }, - ); - } - } } From faf52bd6e4135bd046ef73b391c46d7cdf6409b0 Mon Sep 17 00:00:00 2001 From: DmitrDomrachev Date: Tue, 13 Feb 2024 23:01:06 +0300 Subject: [PATCH 52/69] style: dart format --- lib/src/cupertino_swipe_refresh.dart | 7 ++++--- lib/src/material_swipe_refresh.dart | 11 ++++++----- lib/src/swipe_refresh_base.dart | 3 ++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/src/cupertino_swipe_refresh.dart b/lib/src/cupertino_swipe_refresh.dart index 30776a3..50d6c65 100644 --- a/lib/src/cupertino_swipe_refresh.dart +++ b/lib/src/cupertino_swipe_refresh.dart @@ -83,7 +83,8 @@ class CupertinoSwipeRefresh extends SwipeRefreshBase { SwipeRefreshBaseState createState() => _CupertinoSwipeRefreshState(); } -class _CupertinoSwipeRefreshState extends SwipeRefreshBaseState { +class _CupertinoSwipeRefreshState + extends SwipeRefreshBaseState { late final ScrollController _scrollController; @override @@ -101,8 +102,8 @@ class _CupertinoSwipeRefreshState extends SwipeRefreshBaseState _MaterialSwipeRefreshState(); } -class _MaterialSwipeRefreshState extends SwipeRefreshBaseState { +class _MaterialSwipeRefreshState + extends SwipeRefreshBaseState { @override Widget buildRefresher( Key key, @@ -100,8 +101,8 @@ class _MaterialSwipeRefreshState extends SwipeRefreshBaseState extends State { +abstract class SwipeRefreshBaseState + extends State { @protected final GlobalKey refreshKey = GlobalKey(); From 3f76478114593409507e74f9b57896b3bd703d71 Mon Sep 17 00:00:00 2001 From: Alex Martynov Date: Tue, 27 Feb 2024 16:46:04 +0600 Subject: [PATCH 53/69] chore(SNP-903): FVM update --- .fvm/fvm_config.json | 4 ---- .fvmrc | 3 +++ .gitignore | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 .fvm/fvm_config.json create mode 100644 .fvmrc diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json deleted file mode 100644 index 6e3d57e..0000000 --- a/.fvm/fvm_config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "flutterSdkVersion": "3.7.6", - "flavors": {} -} \ No newline at end of file diff --git a/.fvmrc b/.fvmrc new file mode 100644 index 0000000..c112b65 --- /dev/null +++ b/.fvmrc @@ -0,0 +1,3 @@ +{ + "flutter": "3.7.6" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 99ddad1..c0ae71b 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,9 @@ .pub-cache/ .pub/ build/ -.fvm/flutter_sdk + +# FVM +.fvm/ # Android related **/android/**/gradle-wrapper.jar From 4eca6ff4faf9f999849a5099302c861d40c136e0 Mon Sep 17 00:00:00 2001 From: Alex Martynov Date: Tue, 27 Feb 2024 16:49:57 +0600 Subject: [PATCH 54/69] chore(SNP-903): update GitHub Action workflows --- .github/workflows/main.yml | 15 ++------ .github/workflows/new_issue_to_pyrus_task.yml | 35 +++++++++++++++++++ .github/workflows/new_issues_label.yml | 2 +- .github/workflows/new_pull_request_label.yml | 2 +- .../new_pull_request_main_actions.yml | 2 +- .github/workflows/publish_to_pub.yml | 22 ++++++------ 6 files changed, 53 insertions(+), 25 deletions(-) create mode 100644 .github/workflows/new_issue_to_pyrus_task.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0953778..db4dd38 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,30 +2,21 @@ name: "Main" on: pull_request: - branches: - - main - - dev - push: - branches: - - main - - dev - tags-ignore: - - "**" jobs: get_fvm_version: outputs: - flutter_version: ${{ steps.fvm_version.outputs.flutterSdkVersion }} + flutter_version: ${{ steps.fvm_version.outputs.flutter }} name: "Get Flutter version from FVM" runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - id: fvm_version uses: zoexx/github-action-json-file-properties@release with: - file_path: ".fvm/fvm_config.json" + file_path: ".fvmrc" analysis: needs: get_fvm_version diff --git a/.github/workflows/new_issue_to_pyrus_task.yml b/.github/workflows/new_issue_to_pyrus_task.yml new file mode 100644 index 0000000..36813f6 --- /dev/null +++ b/.github/workflows/new_issue_to_pyrus_task.yml @@ -0,0 +1,35 @@ +name: "Create Pyrus task from issue" + +on: + issues: + types: + - reopened + - opened + +jobs: + get_package_name: + name: Get package name + runs-on: ubuntu-latest + outputs: + package_name: ${{ steps.parse_pubspec.outputs.name }} + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Parsing pubspec.yaml + id: parse_pubspec + uses: actions-tools/yaml-outputs@v2 + with: + file-path: 'pubspec.yaml' + + call_create_pyrus_task_from_issue: + name: Create Pyrus task from issue + needs: get_package_name + uses: surfstudio/flutter-ci-workflows/.github/workflows/new_issue_to_pyrus_task.yml@main + with: + PACKAGE_NAME: ${{ needs.get_package_name.outputs.package_name }} + ISSUE_TITLE: ${{ github.event.issue.title }} + ISSUE_BODY: ${{ github.event.issue.body }} + ISSUE_LINK: ${{ github.event.issue.html_url }} + secrets: + LOGIN: ${{ secrets.PYRUS_BOT_LOGIN }} + SECURITY_KEY: ${{ secrets.PYRUS_BOT_SECRET_KEY }} diff --git a/.github/workflows/new_issues_label.yml b/.github/workflows/new_issues_label.yml index 5319ce7..58890cc 100644 --- a/.github/workflows/new_issues_label.yml +++ b/.github/workflows/new_issues_label.yml @@ -13,4 +13,4 @@ jobs: label_issues: uses: surfstudio/flutter-ci-workflows/.github/workflows/new_issues_label.yml@main secrets: - SECRET_ISSUES: ${{ secrets.SECRET_ISSUES }} + SECRET_ISSUES: ${{ secrets.ACCESS_TOKEN_FOR_SURFGEAR }} diff --git a/.github/workflows/new_pull_request_label.yml b/.github/workflows/new_pull_request_label.yml index fb21084..9fd27c2 100644 --- a/.github/workflows/new_pull_request_label.yml +++ b/.github/workflows/new_pull_request_label.yml @@ -14,4 +14,4 @@ jobs: if: ${{ github.event.label.name == 'WIP' }} uses: surfstudio/flutter-ci-workflows/.github/workflows/new_pull_request_label.yml@main secrets: - SECRET_ISSUES: ${{ secrets.SECRET_ISSUES }} + SECRET_ISSUES: ${{ secrets.ACCESS_TOKEN_FOR_SURFGEAR }} diff --git a/.github/workflows/new_pull_request_main_actions.yml b/.github/workflows/new_pull_request_main_actions.yml index ccf208e..e33b93a 100644 --- a/.github/workflows/new_pull_request_main_actions.yml +++ b/.github/workflows/new_pull_request_main_actions.yml @@ -19,4 +19,4 @@ jobs: pull_request: uses: surfstudio/flutter-ci-workflows/.github/workflows/new_pull_request_label.yml@main secrets: - SECRET_ISSUES: ${{ secrets.SECRET_ISSUES }} \ No newline at end of file + SECRET_ISSUES: ${{ secrets.ACCESS_TOKEN_FOR_SURFGEAR }} diff --git a/.github/workflows/publish_to_pub.yml b/.github/workflows/publish_to_pub.yml index 6385757..504a9be 100644 --- a/.github/workflows/publish_to_pub.yml +++ b/.github/workflows/publish_to_pub.yml @@ -8,17 +8,17 @@ on: jobs: get_fvm_version: outputs: - flutter_version: ${{ steps.fvm_version.outputs.flutterSdkVersion }} + flutter_version: ${{ steps.fvm_version.outputs.flutter }} name: "Get Flutter version from FVM" runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - id: fvm_version uses: zoexx/github-action-json-file-properties@release with: - file_path: ".fvm/fvm_config.json" + file_path: ".fvmrc" analysis: needs: get_fvm_version @@ -27,18 +27,20 @@ jobs: flutter-version: ${{ needs.get_fvm_version.outputs.flutter_version }} testing: - needs: [get_fvm_version, analysis] + needs: [analysis, get_fvm_version] uses: surfstudio/flutter-ci-workflows/.github/workflows/testing.yml@main - secrets: + with: flutter-version: ${{ needs.get_fvm_version.outputs.flutter_version }} + secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} package-publishing: - needs: [ analysis, testing ] + needs: [analysis, testing, get_fvm_version] uses: surfstudio/flutter-ci-workflows/.github/workflows/publish_to_pub.yml@main with: - PANA_TOTAL: '100' + flutter-version: ${{ needs.get_fvm_version.outputs.flutter_version }} + PANA_TOTAL: "100" secrets: - PUB_CREDENTIAL_JSON: ${{ secrets.PUB_CREDENTIAL_JSON }} - PUB_OAUTH_ACCESS_TOKEN: ${{ secrets.PUB_OAUTH_ACCESS_TOKEN }} - PUB_OAUTH_REFRESH_TOKEN: ${{ secrets.PUB_OAUTH_REFRESH_TOKEN }} \ No newline at end of file + PUB_CREDENTIAL_JSON: ${{ secrets.SURF_PUB_CREDENTIAL_JSON }} + PUB_OAUTH_ACCESS_TOKEN: ${{ secrets.SURF_PUB_OAUTH_ACCESS_TOKEN }} + PUB_OAUTH_REFRESH_TOKEN: ${{ secrets.SURF_PUB_OAUTH_REFRESH_TOKEN }} From 399fd0542ccea6c3b748d042b2877ee8d5575d85 Mon Sep 17 00:00:00 2001 From: Alex Martynov Date: Tue, 27 Feb 2024 16:50:41 +0600 Subject: [PATCH 55/69] chore(SNP-903): add new PR and issues templates --- .github/ISSUE_TEMPLATE/bug_report.md | 67 +++++++++++-------- .github/ISSUE_TEMPLATE/config.yml | 5 ++ .../ISSUE_TEMPLATE/documentation_update.md | 14 ++-- .github/ISSUE_TEMPLATE/feature_request.md | 20 +++--- .github/PULL_REQUEST_TEMPLATE.md | 6 ++ .github/PULL_REQUEST_TEMPLATE/bug_fix.md | 10 +-- .../documentation_update.md | 10 +-- .github/PULL_REQUEST_TEMPLATE/new_feature.md | 10 +-- 8 files changed, 70 insertions(+), 72 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 3a48652..9f615a5 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,45 +1,58 @@ --- name: Bug report -about: Something is wrong with Flutter Swipe Refresh. +about: Something is wrong. title: "[BUG] " labels: bug -assignees: MbIXjkee --- - +## Expected behavior + -## Prior Issues - -Are there any existing issues or PRs that relate to this problem? If so, link them here. - -## Describe the bug +## Actual behavior + -A clear and concise description of what the bug is. -Please show the code you wrote as completely as possible. +## Video/Screenshot + -```dart -/// your code here -``` +## Steps to reproduce + -## Steps to Reproduce +## Details +Flutter version: -If the current behavior is a bug, please provide the steps to reproduce. +Dart version: -## What is the expected behavior? +Platform: -A clear and concise description of what you expected to happen. +## Logs and stacktrace + -## Additional context +## Any possible solutions + -* What package and OS are affected by this issue? Did this work in previous versions of a package? - -* If applicable, add screenshots to help explain your problem. +## What did you try to solve + -* Please provide output from `flutter doctor -v` and `flutter analyze`. - -* Add any other context about the problem here. +## Checklist for self-check +- [ ] Added expected and actual behavior. +- [ ] Added video or screenshot of bug. +- [ ] Added isolated way to reproduce the bug. +- [ ] Specified Flutter, Dart version and platforms. +- [ ] Attached error code and logs. +- [ ] All unspecified fields in the Issue description are deleted. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..6689749 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: SurfGear telegram chat + url: https://t.me/SurfGear + about: Please ask and answer questions here. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/documentation_update.md b/.github/ISSUE_TEMPLATE/documentation_update.md index 0c7bf5b..3bb3aea 100644 --- a/.github/ISSUE_TEMPLATE/documentation_update.md +++ b/.github/ISSUE_TEMPLATE/documentation_update.md @@ -2,23 +2,19 @@ name: Documentation update about: Fixing a problem or improve in an existing docs page. labels: documentation -assignees: MbIXjkee --- - +## Specify package name + ## Describe what scenario you think is uncovered by the existing examples / articles - -A clear and concise description of the problem that you want explained. + ## Describe why existing examples / articles do not cover this case - -Explain which examples / articles you have seen before making this request, and -why they did not help you with your problem. + ## Additional context - -Add any other context or screenshots about the documentation request here. + diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index f5baad7..2c2f243 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,24 +1,22 @@ --- -name: Feature Request -about: I'd like Flutter Swipe Refresh to do something new. +name: Feature request +about: I'd like SurfGear team to do something new. labels: enhancement -assignees: MbIXjkee --- - +## Specify package name + ## What is the new or updated feature that you are suggesting? - -A clear and concise description of what you want to happen. + ## Why should this feature be included? - -Is your feature request related to a problem? Please describe a clear and concise description of what the problem is. If you investigated any alternative solutions please describe. + ## Additional context - -Please provide any other context or screenshots about the feature request here. + \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ba5f1df --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,6 @@ +Tap on "Preview" ⤴ + +And choose one of the templates: +* [Bugfix PR](?expand=1&template=bug_fix.md) +* [New feature PR](?expand=1&template=new_feature.md) +* [Documentation update PR](?expand=1&template=documentation_update.md) \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md b/.github/PULL_REQUEST_TEMPLATE/bug_fix.md index 66a216d..262175d 100644 --- a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md +++ b/.github/PULL_REQUEST_TEMPLATE/bug_fix.md @@ -1,23 +1,17 @@ ---- -name: Bug fix -about: Fixing a problem with Flutter Swipe Refresh. -assignees: MbIXjkee ---- - - ## Checklist - [ ] Have you added an explanation of what your changes do and why you'd like us to include them? - [ ] Is there an existing issue for this PR? - - _link issue here_ + - _link issue here_ (use keywords like `fix`, `close`, `resolve` etc. if necessary) - [ ] Have the files been linted and formatted? - [ ] Have the docs been updated to match the changes in the PR? - [ ] Have the tests been updated to match the changes in the PR? +- [ ] Attached videos/screenshots demonstrating the fix/feature. - [ ] Have you run the tests locally to confirm they pass? ## Changes diff --git a/.github/PULL_REQUEST_TEMPLATE/documentation_update.md b/.github/PULL_REQUEST_TEMPLATE/documentation_update.md index c9565ec..b4dd21d 100644 --- a/.github/PULL_REQUEST_TEMPLATE/documentation_update.md +++ b/.github/PULL_REQUEST_TEMPLATE/documentation_update.md @@ -1,20 +1,12 @@ ---- -name: Documentation update -about: Fixing a problem or improve in an existing docs page. -labels: documentation -assignees: MbIXjkee ---- - - ## Checklist - [ ] Is there an existing issue for this PR? - - _link issue here_ + - _link issue here_ (use keywords like `fix`, `close`, `resolve` etc. if necessary) - [ ] Have the files been linted and formatted? ## Changes diff --git a/.github/PULL_REQUEST_TEMPLATE/new_feature.md b/.github/PULL_REQUEST_TEMPLATE/new_feature.md index 7ebbb47..1625c60 100644 --- a/.github/PULL_REQUEST_TEMPLATE/new_feature.md +++ b/.github/PULL_REQUEST_TEMPLATE/new_feature.md @@ -1,23 +1,17 @@ ---- -name: New feature -labels: enhancement -assignees: MbIXjkee ---- - - ## Checklist - [ ] Have you added an explanation of what your changes do and why you'd like us to include them? - [ ] Is there an existing issue for this PR? - - _link issue here_ + - _link issue here_ (use keywords like `fix`, `close`, `resolve` etc. if necessary) - [ ] Have the files been linted and formatted? - [ ] Have the docs been updated to match the changes in the PR? - [ ] Have the tests been updated to match the changes in the PR? +- [ ] Attached videos/screenshots demonstrating the fix/feature. - [ ] Have you run the tests locally to confirm they pass? ## New Features From d56bc5e86f792ab08237ee3e56a3072ec2fdcd79 Mon Sep 17 00:00:00 2001 From: Tatiana Sugina Date: Wed, 27 Mar 2024 14:26:00 +0300 Subject: [PATCH 56/69] chore: up version --- .fvmrc | 2 +- example/.fvm/fvm_config.json | 4 ---- pubspec.yaml | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 example/.fvm/fvm_config.json diff --git a/.fvmrc b/.fvmrc index c112b65..37f94f6 100644 --- a/.fvmrc +++ b/.fvmrc @@ -1,3 +1,3 @@ { - "flutter": "3.7.6" + "flutter": "3.19.0" } \ No newline at end of file diff --git a/example/.fvm/fvm_config.json b/example/.fvm/fvm_config.json deleted file mode 100644 index 6e3d57e..0000000 --- a/example/.fvm/fvm_config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "flutterSdkVersion": "3.7.6", - "flavors": {} -} \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index ec4bb54..ab72500 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: swipe_refresh -version: 1.0.2 +version: 1.0.5 description: Set of widgets provides make refresh by using pull down gesture. repository: "https://github.com/surfstudio/flutter-swipe-refresh" issue_tracker: "https://github.com/surfstudio/flutter-swipe-refresh/issues" @@ -15,7 +15,7 @@ dev_dependencies: surf_lint_rules: ^2.0.0 environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=3.0.0 <4.0.0" flutter: From 38f407feaa541adc0a09ff09c46b38fcd4cfbc25 Mon Sep 17 00:00:00 2001 From: Tatiana Sugina Date: Wed, 27 Mar 2024 14:29:32 +0300 Subject: [PATCH 57/69] feat: pubspec --- pubspec.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index ab72500..24a6e99 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,4 @@ environment: sdk: ">=3.0.0 <4.0.0" flutter: - -platforms: - android: - ios: + uses-material-design: true From 14165fbfac7696fadcadbb3d450948226123e932 Mon Sep 17 00:00:00 2001 From: Tatiana Sugina Date: Wed, 27 Mar 2024 14:29:49 +0300 Subject: [PATCH 58/69] feat: add ConditionalWrapper --- lib/src/widgets/conditional_wrapper.dart | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 lib/src/widgets/conditional_wrapper.dart diff --git a/lib/src/widgets/conditional_wrapper.dart b/lib/src/widgets/conditional_wrapper.dart new file mode 100644 index 0000000..8e8d0c7 --- /dev/null +++ b/lib/src/widgets/conditional_wrapper.dart @@ -0,0 +1,26 @@ +import 'package:flutter/material.dart'; + +/// Wrap the child with a wrapper if the condition is true. +class ConditionalWrapper extends StatelessWidget { + /// Create an instance [ConditionalWrapper]. + const ConditionalWrapper({ + required this.condition, + required this.wrapper, + required this.child, + super.key, + }); + + /// Condition to wrap the child. + final bool condition; + + /// Wrapper for the child. + final Widget Function(Widget child) wrapper; + + /// Child to be wrapped. + final Widget child; + + @override + Widget build(BuildContext context) { + return condition ? wrapper(child) : child; + } +} From df03706901c4b5579a14b8b0fb9f425f244c51ef Mon Sep 17 00:00:00 2001 From: Tatiana Sugina Date: Wed, 27 Mar 2024 14:30:11 +0300 Subject: [PATCH 59/69] feat: add ScrollBehaviorInWeb --- lib/src/widgets/scroll_behavior_in_web.dart | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 lib/src/widgets/scroll_behavior_in_web.dart diff --git a/lib/src/widgets/scroll_behavior_in_web.dart b/lib/src/widgets/scroll_behavior_in_web.dart new file mode 100644 index 0000000..ddc6a2f --- /dev/null +++ b/lib/src/widgets/scroll_behavior_in_web.dart @@ -0,0 +1,12 @@ +import 'package:flutter/gestures.dart'; +import 'package:flutter/material.dart'; + +/// For websites to work on the web and desktop. +class ScrollBehaviorInWeb extends MaterialScrollBehavior { + @override + Set get dragDevices => { + PointerDeviceKind.touch, + PointerDeviceKind.mouse, + PointerDeviceKind.trackpad, + }; +} From 0ce4902ea4a7268f39b4f246a6e307f9cc2f09e0 Mon Sep 17 00:00:00 2001 From: Tatiana Sugina Date: Wed, 27 Mar 2024 14:35:33 +0300 Subject: [PATCH 60/69] feat: updated PlatformWrapper --- lib/utills/platform_wrapper.dart | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/utills/platform_wrapper.dart b/lib/utills/platform_wrapper.dart index 3530af4..69bf3b6 100644 --- a/lib/utills/platform_wrapper.dart +++ b/lib/utills/platform_wrapper.dart @@ -16,9 +16,21 @@ import 'package:flutter/foundation.dart'; /// Wrapper for Platform io. class PlatformWrapper { - bool get isIOS => defaultTargetPlatform == TargetPlatform.iOS; + bool get isCupertino => _cupertino.contains(defaultTargetPlatform); - bool get isAndroid => defaultTargetPlatform == TargetPlatform.android; + bool get isMaterial => _material.contains(defaultTargetPlatform); const PlatformWrapper(); } + +const _cupertino = [ + TargetPlatform.iOS, + TargetPlatform.macOS, +]; + +const _material = [ + TargetPlatform.android, + TargetPlatform.fuchsia, + TargetPlatform.linux, + TargetPlatform.windows, +]; From 8c13225660436654ae334fd703d9064c81dd51eb Mon Sep 17 00:00:00 2001 From: Tatiana Sugina Date: Wed, 27 Mar 2024 14:37:36 +0300 Subject: [PATCH 61/69] feat: updated SwipeRefreshBase --- lib/src/swipe_refresh_base.dart | 46 +++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/lib/src/swipe_refresh_base.dart b/lib/src/swipe_refresh_base.dart index a7c5523..47932bb 100644 --- a/lib/src/swipe_refresh_base.dart +++ b/lib/src/swipe_refresh_base.dart @@ -14,22 +14,13 @@ import 'dart:async'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:swipe_refresh/src/swipe_refresh_state.dart'; +import 'package:swipe_refresh/src/widgets/scroll_behavior_in_web.dart'; /// Base refresh indicator widget. abstract class SwipeRefreshBase extends StatefulWidget { - final List? children; - final VoidCallback onRefresh; - final SwipeRefreshState? initState; - final Stream stateStream; - final ScrollController? scrollController; - final SliverChildDelegate? childrenDelegate; - final EdgeInsets? padding; - final bool shrinkWrap; - final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior; - final ScrollPhysics? physics; - const SwipeRefreshBase({ required this.stateStream, required this.onRefresh, @@ -46,17 +37,30 @@ abstract class SwipeRefreshBase extends StatefulWidget { (children != null || childrenDelegate != null)), super(key: key); + final List? children; + final VoidCallback onRefresh; + final SwipeRefreshState? initState; + final Stream stateStream; + final ScrollController? scrollController; + final SliverChildDelegate? childrenDelegate; + final EdgeInsets? padding; + final bool shrinkWrap; + final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior; + final ScrollPhysics? physics; + @override @protected // ignore: no_logic_in_create_state SwipeRefreshBaseState createState(); } -abstract class SwipeRefreshBaseState - extends State { +abstract class SwipeRefreshBaseState extends State { @protected final GlobalKey refreshKey = GlobalKey(); + @protected + late final MaterialScrollBehavior? scrollBehavior; + @protected Completer? completer; @@ -75,6 +79,7 @@ abstract class SwipeRefreshBaseState } _stateSubscription = widget.stateStream.listen(_updateState); + scrollBehavior = _getScrollBehavior(); } void _updateState(SwipeRefreshState newState) { @@ -97,6 +102,21 @@ abstract class SwipeRefreshBaseState return completer!.future; } + MaterialScrollBehavior? _getScrollBehavior() { + final behaviorInWeb = ScrollBehaviorInWeb(); + + switch (defaultTargetPlatform) { + case TargetPlatform.android: + case TargetPlatform.iOS: + return null; + case TargetPlatform.fuchsia: + case TargetPlatform.linux: + case TargetPlatform.macOS: + case TargetPlatform.windows: + return behaviorInWeb; + } + } + @override void dispose() { _stateSubscription?.cancel(); From 35541e72f7b01619a8f68c99a1883524c53820ad Mon Sep 17 00:00:00 2001 From: Tatiana Sugina Date: Wed, 27 Mar 2024 14:37:54 +0300 Subject: [PATCH 62/69] feat: updated CupertinoSwipeRefresh --- lib/src/cupertino_swipe_refresh.dart | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/src/cupertino_swipe_refresh.dart b/lib/src/cupertino_swipe_refresh.dart index 50d6c65..3d6378d 100644 --- a/lib/src/cupertino_swipe_refresh.dart +++ b/lib/src/cupertino_swipe_refresh.dart @@ -43,13 +43,6 @@ import 'package:swipe_refresh/src/swipe_refresh_state.dart'; /// [physics] - defines the physics of the scroll(if == null it will be /// [AlwaysScrollableScrollPhysics]). class CupertinoSwipeRefresh extends SwipeRefreshBase { - static const double defaultRefreshTriggerPullDistance = 100.0; - static const double defaultRefreshIndicatorExtent = 60.0; - - final double refreshTriggerPullDistance; - final double refreshIndicatorExtent; - final RefreshControlIndicatorBuilder indicatorBuilder; - const CupertinoSwipeRefresh({ required Stream stateStream, required VoidCallback onRefresh, @@ -79,12 +72,18 @@ class CupertinoSwipeRefresh extends SwipeRefreshBase { physics: physics, ); + static const double defaultRefreshTriggerPullDistance = 100.0; + static const double defaultRefreshIndicatorExtent = 60.0; + + final double refreshTriggerPullDistance; + final double refreshIndicatorExtent; + final RefreshControlIndicatorBuilder indicatorBuilder; + @override SwipeRefreshBaseState createState() => _CupertinoSwipeRefreshState(); } -class _CupertinoSwipeRefreshState - extends SwipeRefreshBaseState { +class _CupertinoSwipeRefreshState extends SwipeRefreshBaseState { late final ScrollController _scrollController; @override @@ -102,8 +101,9 @@ class _CupertinoSwipeRefreshState return CustomScrollView( shrinkWrap: widget.shrinkWrap, controller: _scrollController, - keyboardDismissBehavior: widget.keyboardDismissBehavior ?? - ScrollViewKeyboardDismissBehavior.onDrag, + scrollBehavior: scrollBehavior, + keyboardDismissBehavior: + widget.keyboardDismissBehavior ?? ScrollViewKeyboardDismissBehavior.onDrag, physics: widget.physics == null ? const BouncingScrollPhysics( parent: AlwaysScrollableScrollPhysics(), @@ -144,10 +144,6 @@ class _CupertinoSwipeRefreshState } class _ListChildrenWidget extends StatelessWidget { - final List children; - final EdgeInsets? padding; - final SliverChildDelegate? childrenDelegate; - const _ListChildrenWidget({ required this.children, Key? key, @@ -155,6 +151,10 @@ class _ListChildrenWidget extends StatelessWidget { this.childrenDelegate, }) : super(key: key); + final List children; + final EdgeInsets? padding; + final SliverChildDelegate? childrenDelegate; + @override Widget build(BuildContext context) { if (padding != null) { From 512b70cd7b771100c60123ddf026bdfd35b17b5f Mon Sep 17 00:00:00 2001 From: Tatiana Sugina Date: Wed, 27 Mar 2024 14:38:11 +0300 Subject: [PATCH 63/69] feat: updated MaterialSwipeRefresh --- lib/src/material_swipe_refresh.dart | 55 ++++++++++++++++------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/lib/src/material_swipe_refresh.dart b/lib/src/material_swipe_refresh.dart index 868f28e..99aa019 100644 --- a/lib/src/material_swipe_refresh.dart +++ b/lib/src/material_swipe_refresh.dart @@ -19,6 +19,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:swipe_refresh/src/swipe_refresh_base.dart'; import 'package:swipe_refresh/src/swipe_refresh_state.dart'; +import 'package:swipe_refresh/src/widgets/conditional_wrapper.dart'; /// Refresh indicator widget with Material Design style. /// [stateStream] - indicator state([SwipeRefreshState.loading] or @@ -46,9 +47,6 @@ import 'package:swipe_refresh/src/swipe_refresh_state.dart'; /// [physics] - defines the physics of the scroll(if == null it will be /// [AlwaysScrollableScrollPhysics]). class MaterialSwipeRefresh extends SwipeRefreshBase { - final Color? indicatorColor; - final Color backgroundColor; - const MaterialSwipeRefresh({ required Stream stateStream, required VoidCallback onRefresh, @@ -78,12 +76,14 @@ class MaterialSwipeRefresh extends SwipeRefreshBase { physics: physics, ); + final Color? indicatorColor; + final Color backgroundColor; + @override SwipeRefreshBaseState createState() => _MaterialSwipeRefreshState(); } -class _MaterialSwipeRefreshState - extends SwipeRefreshBaseState { +class _MaterialSwipeRefreshState extends SwipeRefreshBaseState { @override Widget buildRefresher( Key key, @@ -95,25 +95,32 @@ class _MaterialSwipeRefreshState onRefresh: onRefresh, color: widget.indicatorColor, backgroundColor: widget.backgroundColor, - child: widget.childrenDelegate == null - ? ListView( - shrinkWrap: widget.shrinkWrap, - padding: widget.padding, - controller: widget.scrollController ?? ScrollController(), - physics: AlwaysScrollableScrollPhysics(parent: widget.physics), - keyboardDismissBehavior: widget.keyboardDismissBehavior ?? - ScrollViewKeyboardDismissBehavior.manual, - children: children, - ) - : ListView.custom( - shrinkWrap: widget.shrinkWrap, - padding: widget.padding, - childrenDelegate: widget.childrenDelegate!, - controller: widget.scrollController ?? ScrollController(), - keyboardDismissBehavior: widget.keyboardDismissBehavior ?? - ScrollViewKeyboardDismissBehavior.manual, - physics: AlwaysScrollableScrollPhysics(parent: widget.physics), - ), + child: ConditionalWrapper( + condition: scrollBehavior != null, + wrapper: (child) => ScrollConfiguration( + behavior: scrollBehavior ?? const MaterialScrollBehavior(), + child: child, + ), + child: widget.childrenDelegate == null + ? ListView( + shrinkWrap: widget.shrinkWrap, + padding: widget.padding, + controller: widget.scrollController ?? ScrollController(), + physics: AlwaysScrollableScrollPhysics(parent: widget.physics), + keyboardDismissBehavior: + widget.keyboardDismissBehavior ?? ScrollViewKeyboardDismissBehavior.manual, + children: children, + ) + : ListView.custom( + shrinkWrap: widget.shrinkWrap, + padding: widget.padding, + childrenDelegate: widget.childrenDelegate!, + controller: widget.scrollController ?? ScrollController(), + keyboardDismissBehavior: + widget.keyboardDismissBehavior ?? ScrollViewKeyboardDismissBehavior.manual, + physics: AlwaysScrollableScrollPhysics(parent: widget.physics), + ), + ), ); } From acdb5ea54d5cef2bb6b88d709c46aee82bc6d0ae Mon Sep 17 00:00:00 2001 From: Tatiana Sugina Date: Wed, 27 Mar 2024 14:38:22 +0300 Subject: [PATCH 64/69] feat: updated SwipeRefresh --- lib/src/swipe_refresh.dart | 69 ++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/lib/src/swipe_refresh.dart b/lib/src/swipe_refresh.dart index 229afb0..8e491cb 100644 --- a/lib/src/swipe_refresh.dart +++ b/lib/src/swipe_refresh.dart @@ -28,24 +28,6 @@ import 'package:swipe_refresh/utills/platform_wrapper.dart'; /// [refreshTriggerPullDistance], [refreshIndicatorExtent], [indicatorBuilder] /// (more details [CupertinoSwipeRefresh]). class SwipeRefresh extends StatelessWidget { - final List? children; - final VoidCallback onRefresh; - final SwipeRefreshState? initState; - final Stream stateStream; - final Color? indicatorColor; - final Color backgroundColor; - final double refreshTriggerPullDistance; - final double refreshIndicatorExtent; - final RefreshControlIndicatorBuilder indicatorBuilder; - final SwipeRefreshStyle style; - final ScrollController? scrollController; - final SliverChildDelegate? childrenDelegate; - final EdgeInsets? padding; - final bool shrinkWrap; - final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior; - final ScrollPhysics? physics; - final PlatformWrapper _platform; - const SwipeRefresh( this.style, { required this.stateStream, @@ -66,12 +48,11 @@ class SwipeRefresh extends StatelessWidget { RefreshControlIndicatorBuilder? indicatorBuilder, PlatformWrapper? platform, }) : backgroundColor = backgroundColor ?? const Color(0xFFFFFFFF), - refreshTriggerPullDistance = refreshTriggerPullDistance ?? - CupertinoSwipeRefresh.defaultRefreshTriggerPullDistance, - refreshIndicatorExtent = refreshIndicatorExtent ?? - CupertinoSwipeRefresh.defaultRefreshIndicatorExtent, - indicatorBuilder = indicatorBuilder ?? - CupertinoSliverRefreshControl.buildRefreshIndicator, + refreshTriggerPullDistance = + refreshTriggerPullDistance ?? CupertinoSwipeRefresh.defaultRefreshTriggerPullDistance, + refreshIndicatorExtent = + refreshIndicatorExtent ?? CupertinoSwipeRefresh.defaultRefreshIndicatorExtent, + indicatorBuilder = indicatorBuilder ?? CupertinoSliverRefreshControl.buildRefreshIndicator, _platform = platform ?? const PlatformWrapper(), super(key: key); @@ -227,6 +208,24 @@ class SwipeRefresh extends StatelessWidget { ); } + final List? children; + final VoidCallback onRefresh; + final SwipeRefreshState? initState; + final Stream stateStream; + final Color? indicatorColor; + final Color backgroundColor; + final double refreshTriggerPullDistance; + final double refreshIndicatorExtent; + final RefreshControlIndicatorBuilder indicatorBuilder; + final SwipeRefreshStyle style; + final ScrollController? scrollController; + final SliverChildDelegate? childrenDelegate; + final EdgeInsets? padding; + final bool shrinkWrap; + final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior; + final ScrollPhysics? physics; + final PlatformWrapper _platform; + @override Widget build(BuildContext context) { switch (style) { @@ -264,41 +263,39 @@ class SwipeRefresh extends StatelessWidget { ); case SwipeRefreshStyle.builder: case SwipeRefreshStyle.adaptive: - if (_platform.isAndroid) { - return MaterialSwipeRefresh( + if (_platform.isCupertino) { + return CupertinoSwipeRefresh( key: key, childrenDelegate: childrenDelegate, stateStream: stateStream, initState: initState, onRefresh: onRefresh, scrollController: scrollController, - backgroundColor: backgroundColor, - indicatorColor: indicatorColor, + refreshIndicatorExtent: refreshIndicatorExtent, + refreshTriggerPullDistance: refreshTriggerPullDistance, + indicatorBuilder: indicatorBuilder, shrinkWrap: shrinkWrap, padding: padding, - keyboardDismissBehavior: keyboardDismissBehavior, physics: physics, children: children, ); - } else if (_platform.isIOS) { - return CupertinoSwipeRefresh( + } else { + return MaterialSwipeRefresh( key: key, childrenDelegate: childrenDelegate, stateStream: stateStream, initState: initState, onRefresh: onRefresh, scrollController: scrollController, - refreshIndicatorExtent: refreshIndicatorExtent, - refreshTriggerPullDistance: refreshTriggerPullDistance, - indicatorBuilder: indicatorBuilder, + backgroundColor: backgroundColor, + indicatorColor: indicatorColor, shrinkWrap: shrinkWrap, padding: padding, + keyboardDismissBehavior: keyboardDismissBehavior, physics: physics, children: children, ); } } - - return Container(); } } From e618ccb39f46d831a03f3d0c0bb062d587678530 Mon Sep 17 00:00:00 2001 From: Tatiana Sugina Date: Wed, 27 Mar 2024 14:38:38 +0300 Subject: [PATCH 65/69] feat: updated tests --- test/platform_wrapper_test.dart | 20 +++-- test/swipe_refresh_adaptive_test.dart | 82 ++++++------------ test/swipe_refresh_builder_test.dart | 8 +- test/swipe_refresh_cupertino_test.dart | 110 +++++++------------------ test/swipe_refresh_material_test.dart | 76 ++++++----------- 5 files changed, 98 insertions(+), 198 deletions(-) diff --git a/test/platform_wrapper_test.dart b/test/platform_wrapper_test.dart index ce3d22a..3c1b651 100644 --- a/test/platform_wrapper_test.dart +++ b/test/platform_wrapper_test.dart @@ -25,15 +25,17 @@ void main() { test( 'Method isAndroid should return true', () { - final isAndroid = platformWrapper.isAndroid; + final isAndroid = platformWrapper.isMaterial; - // because the target flutter checks the test environment - // and by default outputs the platform android - // assert(() { - // if (Platform.environment.containsKey('FLUTTER_TEST')) - // result = platform.TargetPlatform.android; - // return true; - // }()); + /// Because the target flutter checks the test environment and by default outputs + /// the platform android. + /* + assert(() { + if (Platform.environment.containsKey('FLUTTER_TEST')) + result = platform.TargetPlatform.android; + return true; + }()); + */ expect(isAndroid, true); }, ); @@ -41,7 +43,7 @@ void main() { test( 'Method isIOS should return false', () { - final isIOS = platformWrapper.isIOS; + final isIOS = platformWrapper.isCupertino; expect(isIOS, false); }, diff --git a/test/swipe_refresh_adaptive_test.dart b/test/swipe_refresh_adaptive_test.dart index 3ce3709..3b197e6 100644 --- a/test/swipe_refresh_adaptive_test.dart +++ b/test/swipe_refresh_adaptive_test.dart @@ -26,6 +26,12 @@ void main() { late StreamController controller; late Stream stream; late MockPlatformWrapper platformWrapper; + final children = _listColors + .map((e) => Container( + color: e, + height: 100, + )) + .toList(); setUp(() { controller = StreamController.broadcast(); @@ -44,59 +50,19 @@ void main() { controller.sink.add(SwipeRefreshState.hidden); } - final listColors = [ - Colors.blue, - Colors.green, - Colors.red, - Colors.amber, - ]; - - testWidgets( - 'When call SwipeRefresh.adaptive not on Android or iOS platform should build normally with one Container', - (tester) async { - when(() => platformWrapper.isAndroid).thenReturn(false); - when(() => platformWrapper.isIOS).thenReturn(false); - - final adaptiveSwipeRefresh = makeTestableWidget( - SwipeRefresh.adaptive( - stateStream: stream, - onRefresh: onRefresh, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), - platform: platformWrapper, - ), - ); - - await tester.pumpWidget(adaptiveSwipeRefresh); - - expect(() => adaptiveSwipeRefresh, returnsNormally); - expect(find.byType(Container), findsOneWidget); - }, - ); - testWidgets( 'When call SwipeRefresh.adaptive on Android platform should build MaterialSwipeRefresh', (tester) async { - when(() => platformWrapper.isAndroid).thenReturn(true); + when(() => platformWrapper.isMaterial).thenReturn(true); + when(() => platformWrapper.isCupertino).thenReturn(false); final adaptiveSwipeRefresh = makeTestableWidget( SwipeRefresh.adaptive( stateStream: stream, - onRefresh: onRefresh, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + onRefresh: () { + onRefresh().ignore(); + }, + children: children, platform: platformWrapper, ), ); @@ -111,21 +77,16 @@ void main() { testWidgets( 'When call SwipeRefresh.adaptive on iOS platform should build CupertinoSwipeRefresh', (tester) async { - when(() => platformWrapper.isAndroid).thenReturn(false); - when(() => platformWrapper.isIOS).thenReturn(true); + when(() => platformWrapper.isMaterial).thenReturn(false); + when(() => platformWrapper.isCupertino).thenReturn(true); final adaptiveSwipeRefresh = makeTestableWidget( SwipeRefresh.adaptive( stateStream: stream, - onRefresh: onRefresh, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + onRefresh: () { + onRefresh().ignore(); + }, + children: children, platform: platformWrapper, ), ); @@ -139,3 +100,10 @@ void main() { } class MockPlatformWrapper extends Mock implements PlatformWrapper {} + +const _listColors = [ + Colors.blue, + Colors.green, + Colors.red, + Colors.amber, +]; diff --git a/test/swipe_refresh_builder_test.dart b/test/swipe_refresh_builder_test.dart index cf8bbee..df986d2 100644 --- a/test/swipe_refresh_builder_test.dart +++ b/test/swipe_refresh_builder_test.dart @@ -55,13 +55,15 @@ void main() { testWidgets( 'SwipeRefresh.builder with itemBuilder as argument builds normally(iOS platform as example)', (tester) async { - when(() => platformWrapper.isAndroid).thenReturn(false); - when(() => platformWrapper.isIOS).thenReturn(true); + when(() => platformWrapper.isMaterial).thenReturn(false); + when(() => platformWrapper.isCupertino).thenReturn(true); final testWidget = makeTestableWidget( SwipeRefresh.builder( stateStream: stream, - onRefresh: onRefresh, + onRefresh: () { + onRefresh().ignore(); + }, itemCount: listColors.length, itemBuilder: (_, index) => Container( color: listColors[index], diff --git a/test/swipe_refresh_cupertino_test.dart b/test/swipe_refresh_cupertino_test.dart index 9ec5d64..3c9029c 100644 --- a/test/swipe_refresh_cupertino_test.dart +++ b/test/swipe_refresh_cupertino_test.dart @@ -27,6 +27,12 @@ void main() { late Stream stream; late MockOnRefreshFunction onRefreshFunction; late ScrollPhysics scrollPhysics; + final children = _listColors + .map((e) => Container( + color: e, + height: 100, + )) + .toList(); setUp(() { streamController = StreamController.broadcast(); @@ -34,7 +40,7 @@ void main() { onRefreshFunction = MockOnRefreshFunction(); when(() => onRefreshFunction.call()).thenAnswer( - (invocation) async { + (invocation) { return streamController.sink.add(SwipeRefreshState.hidden); }, ); @@ -48,13 +54,6 @@ void main() { }, ); - final listColors = [ - Colors.blue, - Colors.green, - Colors.red, - Colors.amber, - ]; - testWidgets( 'When trying to return a CupertinoSwipeRefresh with no children or ' 'childrenDelegate passed, must be an assertion error', @@ -80,14 +79,7 @@ void main() { SwipeRefresh.cupertino( stateStream: stream, onRefresh: onRefreshFunction, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + children: children, ), ); @@ -107,14 +99,7 @@ void main() { SwipeRefresh.cupertino( stateStream: stream, onRefresh: onRefreshFunction, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + children: children, ), ); @@ -134,6 +119,7 @@ void main() { 'When drag down enough, the refresh should start and end after 3 seconds', (tester) async { const key = Key('Test key'); + final findKey = find.byKey(key); final cupertinoSwipeRefresh = makeTestableWidget( SwipeRefresh.cupertino( @@ -150,14 +136,7 @@ void main() { key: key, ); }, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + children: children, ), ); @@ -171,12 +150,12 @@ void main() { await tester.pump(); - expect(find.byKey(key), findsOneWidget); + expect(findKey, findsOneWidget); await tester.pump(const Duration(seconds: 3)); await tester.pump(); - expect(find.byKey(key), findsNothing); + expect(findKey, findsNothing); }, ); @@ -191,14 +170,7 @@ void main() { SwipeRefresh.cupertino( stateStream: stream, onRefresh: onRefreshFunction, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + children: children, ), ); @@ -217,14 +189,7 @@ void main() { final cupertinoWidget = SwipeRefresh.cupertino( stateStream: stream, onRefresh: onRefreshFunction, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + children: children, initState: SwipeRefreshState.loading, ); @@ -251,14 +216,7 @@ void main() { final cupertinoWidget = SwipeRefresh.cupertino( stateStream: stream, onRefresh: onRefreshFunction, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + children: children, initState: SwipeRefreshState.loading, physics: scrollPhysics, ); @@ -287,14 +245,7 @@ void main() { SwipeRefresh.cupertino( stateStream: stream, onRefresh: onRefreshFunction, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + children: children, ), ); @@ -302,29 +253,25 @@ void main() { SwipeRefresh.cupertino( stateStream: stream, onRefresh: onRefreshFunction, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + children: children, padding: const EdgeInsets.only(top: 16.0), ), ); + final findSliverList = find.byType(SliverList); + final findSliverPadding = find.byType(SliverPadding); + await tester.pumpWidget(cupertinoWidgetWithoutPadding); - expect(find.byType(SliverList), findsOneWidget); + expect(findSliverList, findsOneWidget); // Must find one widget create by SliverSafeArea. - expect(find.byType(SliverPadding), findsOneWidget); + expect(findSliverPadding, findsOneWidget); await tester.pumpWidget(cupertinoWidgetWithPadding); - expect(find.byType(SliverList), findsOneWidget); + expect(findSliverList, findsOneWidget); // Must find two widgets(create by SliverSafeArea and create by SwipeRefresh.cupertino). - expect(find.byType(SliverPadding), findsNWidgets(2)); + expect(findSliverPadding, findsNWidgets(2)); }, ); } @@ -332,3 +279,10 @@ void main() { class MockOnRefreshFunction extends Mock { void call(); } + +const _listColors = [ + Colors.blue, + Colors.green, + Colors.red, + Colors.amber, +]; diff --git a/test/swipe_refresh_material_test.dart b/test/swipe_refresh_material_test.dart index c04ef6f..87c37f6 100644 --- a/test/swipe_refresh_material_test.dart +++ b/test/swipe_refresh_material_test.dart @@ -27,6 +27,12 @@ void main() { late Stream stream; late MockOnRefreshFunction onRefreshFunction; late TestSliverChildListDelegate sliverChildDelegate; + final children = _listColors + .map((e) => Container( + color: e, + height: 100, + )) + .toList(); setUp(() { controller = StreamController.broadcast(); @@ -35,7 +41,7 @@ void main() { onRefreshFunction = MockOnRefreshFunction(); when(() => onRefreshFunction.call()).thenAnswer( - (invocation) async { + (invocation) { return controller.sink.add(SwipeRefreshState.hidden); }, ); @@ -45,13 +51,6 @@ void main() { await controller.close(); }); - final listColors = [ - Colors.blue, - Colors.green, - Colors.red, - Colors.amber, - ]; - testWidgets( 'When trying create MaterialSwipeRefresh without children or ' 'childrenDelegate should be assertion error', @@ -77,14 +76,7 @@ void main() { SwipeRefresh.material( stateStream: stream, onRefresh: onRefreshFunction, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + children: children, ), ); @@ -106,14 +98,7 @@ void main() { SwipeRefresh.material( stateStream: stream, onRefresh: onRefreshFunction, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + children: children, ), ); @@ -137,32 +122,28 @@ void main() { SwipeRefresh.material( stateStream: stream, onRefresh: onRefreshFunction, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + children: children, ), ); + final findSwipeRefresh = find.byType(SwipeRefresh); + final findRefreshProgressIndicator = find.byType(RefreshProgressIndicator); + await tester.pumpWidget(materialSwipeRefresh); await tester.drag( - find.byType(SwipeRefresh), + findSwipeRefresh, const Offset(0, 300), touchSlopY: 0, ); await tester.pump(); - expect(find.byType(RefreshProgressIndicator), findsOneWidget); + expect(findRefreshProgressIndicator, findsOneWidget); await tester.pump(); await tester.pump(const Duration(seconds: 1)); await tester.pump(const Duration(seconds: 2)); - expect(find.byType(RefreshProgressIndicator), findsNothing); + expect(findRefreshProgressIndicator, findsNothing); }, ); @@ -173,14 +154,7 @@ void main() { SwipeRefresh.material( stateStream: stream, onRefresh: onRefreshFunction, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + children: children, ), ); await tester.pumpWidget(materialSwipeRefresh); @@ -202,14 +176,7 @@ void main() { final materialWidget = SwipeRefresh.material( stateStream: stream, onRefresh: onRefreshFunction, - children: listColors - .map( - (e) => Container( - color: e, - height: 100, - ), - ) - .toList(), + children: children, initState: SwipeRefreshState.loading, ); final materialSwipeRefresh = makeTestableWidget(materialWidget); @@ -252,3 +219,10 @@ class MockOnRefreshFunction extends Mock { class TestSliverChildListDelegate extends SliverChildListDelegate { TestSliverChildListDelegate(List children) : super(children); } + +const _listColors = [ + Colors.blue, + Colors.green, + Colors.red, + Colors.amber, +]; From 715b4efd3aeb78f8a896c8abdd0fa2d3f80176f5 Mon Sep 17 00:00:00 2001 From: Tatiana Sugina Date: Wed, 27 Mar 2024 14:39:02 +0300 Subject: [PATCH 66/69] feat: updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 823703b..dd0b08a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.0.5 +* Added support for all TargetPlatform. +* SDK version is up. + ## 1.0.2 * Internal improvements. From e5b582cf6de843bc8285c0d7f1a428e1522342e6 Mon Sep 17 00:00:00 2001 From: Tatiana Sugina Date: Wed, 27 Mar 2024 14:39:22 +0300 Subject: [PATCH 67/69] feat: updated example --- example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Runner.xcodeproj/project.pbxproj | 13 +- .../contents.xcworkspacedata | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- example/ios/Runner/Info.plist | 4 + example/lib/main.dart | 189 +----------------- example/lib/screens/main_page.dart | 180 +++++++++++++++++ example/lib/screens/my_app.dart | 17 ++ example/pubspec.yaml | 2 +- 9 files changed, 214 insertions(+), 197 deletions(-) create mode 100644 example/lib/screens/main_page.dart create mode 100644 example/lib/screens/my_app.dart diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 6b4c0f7..8c6e561 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 12.0 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index ffec437..a0b84d0 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -140,7 +140,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = "The Chromium Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -184,10 +184,12 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( @@ -198,6 +200,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -286,7 +289,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -365,7 +368,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -414,7 +417,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 1d526a1..919434a 100644 --- a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140c..e67b280 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ UIViewControllerBasedStatusBarAppearance + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + diff --git a/example/lib/main.dart b/example/lib/main.dart index 949575b..2ac75ce 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -14,194 +14,7 @@ // ignore_for_file: library_private_types_in_public_api -import 'dart:async'; - +import 'package:example/screens/my_app.dart'; import 'package:flutter/material.dart'; -import 'package:swipe_refresh/swipe_refresh.dart'; void main() => runApp(const MyApp()); - -class MyApp extends StatelessWidget { - const MyApp({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return MaterialApp( - title: 'Refresher Example', - theme: ThemeData( - primarySwatch: Colors.blue, - ), - home: const MainPage(), - ); - } -} - -class MainPage extends StatefulWidget { - const MainPage({Key? key}) : super(key: key); - - @override - _MainPageState createState() => _MainPageState(); -} - -class _MainPageState extends State { - final _controller = StreamController.broadcast(); - - Stream get _stream => _controller.stream; - - @override - Widget build(BuildContext context) { - return DefaultTabController( - length: 3, - child: Scaffold( - body: Padding( - padding: const EdgeInsets.only(top: 25), - child: Column( - children: [ - const TabBar( - tabs: [ - _TabWidget(style: SwipeRefreshStyle.material), - _TabWidget(style: SwipeRefreshStyle.cupertino), - _TabWidget(style: SwipeRefreshStyle.builder), - ], - ), - Expanded( - child: TabBarView( - children: [ - SwipeRefresh.material( - stateStream: _stream, - onRefresh: _refresh, - padding: const EdgeInsets.symmetric(vertical: 10), - children: const [ - _ExampleBodyWidget(style: SwipeRefreshStyle.material), - ], - ), - SwipeRefresh.cupertino( - stateStream: _stream, - onRefresh: _refresh, - padding: const EdgeInsets.symmetric(vertical: 10), - children: const [ - _ExampleBodyWidget(style: SwipeRefreshStyle.cupertino), - ], - ), - SwipeRefresh.builder( - stateStream: _stream, - onRefresh: _refresh, - padding: const EdgeInsets.symmetric(vertical: 10), - itemCount: Colors.primaries.length, - itemBuilder: (context, index) { - return Container( - color: Colors.primaries[index], - height: 100, - child: const Center( - child: Text( - 'Builder example', - style: TextStyle(color: white), - ), - ), - ); - }, - ), - ], - ), - ), - ], - ), - ), - ), - ); - } - - @override - void dispose() { - _controller.close(); - - super.dispose(); - } - - Future _refresh() async { - await Future.delayed(const Duration(seconds: 3)); - // when all needed is done change state - _controller.sink.add(SwipeRefreshState.hidden); - } -} - -class _TabWidget extends StatelessWidget { - final SwipeRefreshStyle style; - - const _TabWidget({ - required this.style, - Key? key, - }) : super(key: key); - - @override - Widget build(BuildContext context) { - return InkWell( - child: SizedBox( - height: 100, - child: Center( - child: Text( - _getText(style), - style: TextStyle(color: _getColor(style).withOpacity(0.5)), - ), - ), - ), - ); - } -} - -class _ExampleBodyWidget extends StatelessWidget { - final SwipeRefreshStyle style; - - const _ExampleBodyWidget({ - required this.style, - Key? key, - }) : super(key: key); - - @override - Widget build(BuildContext context) { - return Container( - color: _getColor(style), - height: 100, - child: Center( - child: Text( - style == SwipeRefreshStyle.material - ? 'Material example' - : 'Cupertino example', - style: const TextStyle(color: white), - ), - ), - ); - } -} - -Color _getColor(SwipeRefreshStyle style) { - switch (style) { - case SwipeRefreshStyle.material: - return red; - case SwipeRefreshStyle.cupertino: - return blue; - case SwipeRefreshStyle.builder: - return green; - default: - return black; - } -} - -String _getText(SwipeRefreshStyle style) { - switch (style) { - case SwipeRefreshStyle.material: - return 'Material'; - case SwipeRefreshStyle.cupertino: - return 'Cupertino'; - case SwipeRefreshStyle.builder: - return 'Builder'; - default: - return 'SwipeRefresh'; - } -} - -const white = Color(0xFFFFFFFF); -const black = Color(0xFF000000); -const red = Color(0xFFFF0000); -const green = Color(0xFF00FF00); -const blue = Color(0xFF0000FF); diff --git a/example/lib/screens/main_page.dart b/example/lib/screens/main_page.dart new file mode 100644 index 0000000..4a7a05a --- /dev/null +++ b/example/lib/screens/main_page.dart @@ -0,0 +1,180 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; +import 'package:swipe_refresh/swipe_refresh.dart'; + +class MainPage extends StatefulWidget { + const MainPage({Key? key}) : super(key: key); + + @override + State createState() => _MainPageState(); +} + +class _MainPageState extends State { + final _controller = StreamController.broadcast(); + + Stream get _stream => _controller.stream; + + Future _refresh() async { + await Future.delayed(const Duration(seconds: 3)); + + /// When all needed is done change state. + _controller.sink.add(SwipeRefreshState.hidden); + } + + @override + void dispose() { + _controller.close(); + + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return DefaultTabController( + length: 3, + child: Scaffold( + body: Padding( + padding: const EdgeInsets.only(top: 25), + child: Column( + children: [ + const TabBar( + tabs: [ + _TabWidget(style: SwipeRefreshStyle.material), + _TabWidget(style: SwipeRefreshStyle.cupertino), + _TabWidget(style: SwipeRefreshStyle.builder), + ], + ), + Expanded( + child: TabBarView( + children: [ + SwipeRefresh.material( + stateStream: _stream, + onRefresh: () { + _refresh().ignore(); + }, + padding: const EdgeInsets.symmetric(vertical: 10), + children: const [ + _ExampleBodyWidget(style: SwipeRefreshStyle.material), + ], + ), + SwipeRefresh.cupertino( + stateStream: _stream, + onRefresh: () { + _refresh().ignore(); + }, + padding: const EdgeInsets.symmetric(vertical: 10), + children: const [ + _ExampleBodyWidget(style: SwipeRefreshStyle.cupertino), + ], + ), + SwipeRefresh.builder( + stateStream: _stream, + onRefresh: () { + _refresh().ignore(); + }, + padding: const EdgeInsets.symmetric(vertical: 10), + itemCount: Colors.primaries.length, + itemBuilder: (context, index) { + return Container( + color: Colors.primaries[index], + height: 100, + child: const Center( + child: Text( + 'Builder example', + style: TextStyle(color: white), + ), + ), + ); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ); + } +} + +class _TabWidget extends StatelessWidget { + const _TabWidget({ + required this.style, + Key? key, + }) : super(key: key); + + final SwipeRefreshStyle style; + + @override + Widget build(BuildContext context) { + return InkWell( + child: SizedBox( + height: 100, + child: Center( + child: Text( + _getText(style), + style: TextStyle(color: _getColor(style).withOpacity(0.5)), + ), + ), + ), + ); + } +} + +class _ExampleBodyWidget extends StatelessWidget { + const _ExampleBodyWidget({ + required this.style, + Key? key, + }) : super(key: key); + + final SwipeRefreshStyle style; + + + @override + Widget build(BuildContext context) { + return Container( + color: _getColor(style), + height: 100, + child: Center( + child: Text( + style == SwipeRefreshStyle.material ? 'Material example' : 'Cupertino example', + style: const TextStyle(color: white), + ), + ), + ); + } +} + +Color _getColor(SwipeRefreshStyle style) { + switch (style) { + case SwipeRefreshStyle.material: + return red; + case SwipeRefreshStyle.cupertino: + return blue; + case SwipeRefreshStyle.builder: + return green; + default: + return black; + } +} + +String _getText(SwipeRefreshStyle style) { + switch (style) { + case SwipeRefreshStyle.material: + return 'Material'; + case SwipeRefreshStyle.cupertino: + return 'Cupertino'; + case SwipeRefreshStyle.builder: + return 'Builder'; + default: + return 'SwipeRefresh'; + } +} + +const white = Color(0xFFFFFFFF); +const black = Color(0xFF000000); +const red = Color(0xFFFF0000); +const green = Color(0xFF00FF00); +const blue = Color(0xFF0000FF); diff --git a/example/lib/screens/my_app.dart b/example/lib/screens/my_app.dart new file mode 100644 index 0000000..c90e9fa --- /dev/null +++ b/example/lib/screens/my_app.dart @@ -0,0 +1,17 @@ +import 'package:example/screens/main_page.dart'; +import 'package:flutter/material.dart'; + +class MyApp extends StatelessWidget { + const MyApp({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'Refresher Example', + theme: ThemeData( + primarySwatch: Colors.blue, + ), + home: const MainPage(), + ); + } +} diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 9978d26..882d289 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0+1 publish_to: none environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: From 41ec3f6cfbb7a387e6c25139b9cfecf4ba96377b Mon Sep 17 00:00:00 2001 From: Tatiana Sugina Date: Wed, 27 Mar 2024 14:49:53 +0300 Subject: [PATCH 68/69] feat: dart_dependency_validator --- dart_dependency_validator.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 dart_dependency_validator.yaml diff --git a/dart_dependency_validator.yaml b/dart_dependency_validator.yaml new file mode 100644 index 0000000..8638769 --- /dev/null +++ b/dart_dependency_validator.yaml @@ -0,0 +1,5 @@ +exclude: + - "example/**" + +ignore: + - analyzer From 022036065098d3c79f75a4fe331e77dc6e236d40 Mon Sep 17 00:00:00 2001 From: Tatiana Sugina Date: Wed, 27 Mar 2024 14:53:07 +0300 Subject: [PATCH 69/69] feat: dart format --- example/lib/screens/main_page.dart | 5 +++-- lib/src/cupertino_swipe_refresh.dart | 7 ++++--- lib/src/material_swipe_refresh.dart | 11 ++++++----- lib/src/swipe_refresh.dart | 11 ++++++----- lib/src/swipe_refresh_base.dart | 5 +++-- test/swipe_refresh_builder_test.dart | 2 +- test/swipe_refresh_material_test.dart | 3 ++- 7 files changed, 25 insertions(+), 19 deletions(-) diff --git a/example/lib/screens/main_page.dart b/example/lib/screens/main_page.dart index 4a7a05a..711de08 100644 --- a/example/lib/screens/main_page.dart +++ b/example/lib/screens/main_page.dart @@ -131,7 +131,6 @@ class _ExampleBodyWidget extends StatelessWidget { final SwipeRefreshStyle style; - @override Widget build(BuildContext context) { return Container( @@ -139,7 +138,9 @@ class _ExampleBodyWidget extends StatelessWidget { height: 100, child: Center( child: Text( - style == SwipeRefreshStyle.material ? 'Material example' : 'Cupertino example', + style == SwipeRefreshStyle.material + ? 'Material example' + : 'Cupertino example', style: const TextStyle(color: white), ), ), diff --git a/lib/src/cupertino_swipe_refresh.dart b/lib/src/cupertino_swipe_refresh.dart index 3d6378d..2d843b9 100644 --- a/lib/src/cupertino_swipe_refresh.dart +++ b/lib/src/cupertino_swipe_refresh.dart @@ -83,7 +83,8 @@ class CupertinoSwipeRefresh extends SwipeRefreshBase { SwipeRefreshBaseState createState() => _CupertinoSwipeRefreshState(); } -class _CupertinoSwipeRefreshState extends SwipeRefreshBaseState { +class _CupertinoSwipeRefreshState + extends SwipeRefreshBaseState { late final ScrollController _scrollController; @override @@ -102,8 +103,8 @@ class _CupertinoSwipeRefreshState extends SwipeRefreshBaseState _MaterialSwipeRefreshState(); } -class _MaterialSwipeRefreshState extends SwipeRefreshBaseState { +class _MaterialSwipeRefreshState + extends SwipeRefreshBaseState { @override Widget buildRefresher( Key key, @@ -107,8 +108,8 @@ class _MaterialSwipeRefreshState extends SwipeRefreshBaseState extends State { +abstract class SwipeRefreshBaseState + extends State { @protected final GlobalKey refreshKey = GlobalKey(); @@ -79,7 +80,7 @@ abstract class SwipeRefreshBaseState extends State