Skip to content

Commit e1a62d5

Browse files
gonuitKamil Klyta
andauthored
Version 1.2.0 (#30)
* Compatibility improvements * Updated flutter lints Co-authored-by: Kamil Klyta <kamil.klyta@htdevelopers.com>
1 parent 1ef856c commit e1a62d5

File tree

8 files changed

+35
-38
lines changed

8 files changed

+35
-38
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 1.2.0
2+
### Improvements:
3+
- Compatibility improvements for Flutter 3.0.
14
## 1.1.2
25
### Fixes:
36
- Fixed assertion issue reported and resolved by [ziqq](https://github.com/ziqq) in [#29](https://github.com/gonuit/flutter-custom-refresh-indicator/pull/29). For more information, please take a look at the following issue [#28](https://github.com/gonuit/flutter-custom-refresh-indicator/issues/28)

example/lib/indicators/warp_indicator.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ class _WarpIndicatorState extends State<WarpIndicator>
164164
if (shakeController.value == 1.0 &&
165165
_state == WarpAnimationState.playing) {
166166
SchedulerBinding.instance
167-
?.addPostFrameCallback((_) => _resetShakeAnimation());
167+
.addPostFrameCallback((_) => _resetShakeAnimation());
168168
}
169169
return Transform.rotate(
170170
angle: _angleTween.transform(shakeController.value),

example/pubspec.lock

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@ packages:
4242
name: collection
4343
url: "https://pub.dartlang.org"
4444
source: hosted
45-
version: "1.15.0"
45+
version: "1.16.0"
4646
custom_refresh_indicator:
4747
dependency: "direct main"
4848
description:
4949
path: ".."
5050
relative: true
5151
source: path
52-
version: "1.1.1"
52+
version: "1.2.0"
5353
fake_async:
5454
dependency: transitive
5555
description:
5656
name: fake_async
5757
url: "https://pub.dartlang.org"
5858
source: hosted
59-
version: "1.2.0"
59+
version: "1.3.0"
6060
flutter:
6161
dependency: "direct main"
6262
description: flutter
@@ -94,7 +94,7 @@ packages:
9494
name: material_color_utilities
9595
url: "https://pub.dartlang.org"
9696
source: hosted
97-
version: "0.1.3"
97+
version: "0.1.4"
9898
meta:
9999
dependency: transitive
100100
description:
@@ -108,7 +108,7 @@ packages:
108108
name: path
109109
url: "https://pub.dartlang.org"
110110
source: hosted
111-
version: "1.8.0"
111+
version: "1.8.1"
112112
sky_engine:
113113
dependency: transitive
114114
description: flutter
@@ -120,7 +120,7 @@ packages:
120120
name: source_span
121121
url: "https://pub.dartlang.org"
122122
source: hosted
123-
version: "1.8.1"
123+
version: "1.8.2"
124124
stack_trace:
125125
dependency: transitive
126126
description:
@@ -155,21 +155,14 @@ packages:
155155
name: test_api
156156
url: "https://pub.dartlang.org"
157157
source: hosted
158-
version: "0.4.8"
159-
typed_data:
160-
dependency: transitive
161-
description:
162-
name: typed_data
163-
url: "https://pub.dartlang.org"
164-
source: hosted
165-
version: "1.3.0"
158+
version: "0.4.9"
166159
vector_math:
167160
dependency: transitive
168161
description:
169162
name: vector_math
170163
url: "https://pub.dartlang.org"
171164
source: hosted
172-
version: "2.1.1"
165+
version: "2.1.2"
173166
sdks:
174-
dart: ">=2.14.0 <3.0.0"
167+
dart: ">=2.17.0-0 <3.0.0"
175168
flutter: ">=1.16.0"

example/windows/flutter/generated_plugins.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
list(APPEND FLUTTER_PLUGIN_LIST
66
)
77

8+
list(APPEND FLUTTER_FFI_PLUGIN_LIST
9+
)
10+
811
set(PLUGIN_BUNDLED_LIBRARIES)
912

1013
foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -13,3 +16,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
1316
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
1417
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
1518
endforeach(plugin)
19+
20+
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
21+
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
22+
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
23+
endforeach(ffi_plugin)

lib/src/custom_refresh_indicator.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ class CustomRefreshIndicatorState extends State<CustomRefreshIndicator>
206206

207207
if (_canStart) setIndicatorState(IndicatorState.dragging);
208208

209-
WidgetsBinding.instance!.addPostFrameCallback((_) {
209+
WidgetsBinding.instance.addPostFrameCallback((_) {
210210
controller.setAxisDirection(notification.metrics.axisDirection);
211211
});
212212

lib/src/helpers/positioned_indicator_container.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class PositionedIndicatorContainer extends StatelessWidget {
1616
@override
1717
Widget build(BuildContext context) {
1818
return AnimatedBuilder(
19-
child: child,
2019
animation: controller,
2120
builder: (BuildContext context, Widget? child) {
2221
final double positionFromSide = -50 + (controller.value * 110);
@@ -50,6 +49,7 @@ class PositionedIndicatorContainer extends StatelessWidget {
5049
),
5150
);
5251
},
52+
child: child,
5353
);
5454
}
5555
}

pubspec.lock

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ packages:
4242
name: collection
4343
url: "https://pub.dartlang.org"
4444
source: hosted
45-
version: "1.15.0"
45+
version: "1.16.0"
4646
fake_async:
4747
dependency: transitive
4848
description:
4949
name: fake_async
5050
url: "https://pub.dartlang.org"
5151
source: hosted
52-
version: "1.2.0"
52+
version: "1.3.0"
5353
flutter:
5454
dependency: "direct main"
5555
description: flutter
@@ -61,7 +61,7 @@ packages:
6161
name: flutter_lints
6262
url: "https://pub.dartlang.org"
6363
source: hosted
64-
version: "1.0.4"
64+
version: "2.0.1"
6565
flutter_test:
6666
dependency: "direct dev"
6767
description: flutter
@@ -73,7 +73,7 @@ packages:
7373
name: lints
7474
url: "https://pub.dartlang.org"
7575
source: hosted
76-
version: "1.0.1"
76+
version: "2.0.0"
7777
matcher:
7878
dependency: transitive
7979
description:
@@ -87,7 +87,7 @@ packages:
8787
name: material_color_utilities
8888
url: "https://pub.dartlang.org"
8989
source: hosted
90-
version: "0.1.3"
90+
version: "0.1.4"
9191
meta:
9292
dependency: transitive
9393
description:
@@ -101,7 +101,7 @@ packages:
101101
name: path
102102
url: "https://pub.dartlang.org"
103103
source: hosted
104-
version: "1.8.0"
104+
version: "1.8.1"
105105
sky_engine:
106106
dependency: transitive
107107
description: flutter
@@ -113,7 +113,7 @@ packages:
113113
name: source_span
114114
url: "https://pub.dartlang.org"
115115
source: hosted
116-
version: "1.8.1"
116+
version: "1.8.2"
117117
stack_trace:
118118
dependency: transitive
119119
description:
@@ -148,21 +148,14 @@ packages:
148148
name: test_api
149149
url: "https://pub.dartlang.org"
150150
source: hosted
151-
version: "0.4.8"
152-
typed_data:
153-
dependency: transitive
154-
description:
155-
name: typed_data
156-
url: "https://pub.dartlang.org"
157-
source: hosted
158-
version: "1.3.0"
151+
version: "0.4.9"
159152
vector_math:
160153
dependency: transitive
161154
description:
162155
name: vector_math
163156
url: "https://pub.dartlang.org"
164157
source: hosted
165-
version: "2.1.1"
158+
version: "2.1.2"
166159
sdks:
167-
dart: ">=2.14.0 <3.0.0"
160+
dart: ">=2.17.0-206.0.dev <3.0.0"
168161
flutter: ">=1.16.0"

pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: custom_refresh_indicator
22
description: Flutter Widget that make it easy to implement custom refresh indicator.
3-
version: 1.1.2
3+
version: 1.2.0
44
repository: https://github.com/gonuit/flutter-custom-refresh-indicator
55
issue_tracker: https://github.com/gonuit/flutter-custom-refresh-indicator/issues
66
homepage: https://github.com/gonuit/flutter-custom-refresh-indicator
@@ -14,7 +14,7 @@ dependencies:
1414
sdk: flutter
1515

1616
dev_dependencies:
17-
flutter_lints: ^1.0.4
17+
flutter_lints: ^2.0.1
1818
flutter_test:
1919
sdk: flutter
2020

0 commit comments

Comments
 (0)