Skip to content

Commit 18825bc

Browse files
authored
Merge pull request #4 from SplashByte/dev
version 0.3.0
2 parents 15532b1 + 1599d8c commit 18825bc

17 files changed

Lines changed: 340 additions & 186 deletions

CHANGELOG.md

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,33 @@
1-
## [0.2.1] - (2021-04-02)
1+
## 0.3.0 (2022-03-18)
2+
3+
- Several minor Fixes
4+
- Performance improvements
5+
- BREAKING: Changes default value of `padding` to `EdgeInsets.zero`
6+
- BREAKING: Changes default color to `Theme.of(context).colorScheme.secondary`
7+
8+
## 0.2.1 (2021-04-02)
29

310
- Minor Changes/Fixes
4-
- Changes default values of CircularWidgetLoading
11+
- Changes default values of `CircularWidgetLoading`
512

6-
## [0.2.0] - (2021-03-04)
13+
## 0.2.0 (2021-03-04)
714

815
- Migrates to null safety
916

10-
## [0.1.2] - (2021-03-02)
17+
## 0.1.2 (2021-03-02)
1118

12-
- Fixes key handling if animatedSize is false
19+
- Fixes key handling if `animatedSize` is false
1320
- Removes warnings in code
1421
- Improves performance
1522

16-
## [0.1.1] - (2021-03-02)
23+
## 0.1.1 (2021-03-02)
1724

18-
- Fixes key handling in CircularWidgetLoading
25+
- Fixes key handling in `CircularWidgetLoading`
1926
- Adds some comments in the code
2027
- Adds GIF in README.md
2128

22-
## [0.1.0] - (2021-03-02)
29+
## 0.1.0 (2021-03-02)
2330

2431
- Initial release
25-
- WiperLoading
26-
- CircularWidgetLoading
32+
- `WiperLoading`
33+
- `CircularWidgetLoading`

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<a href="https://pub.dev/packages/widget_loading"><img src="https://img.shields.io/pub/v/widget_loading.svg?style=flat?logo=dart" alt="pub.dev"></a>
44
<a href="https://github.com/SplashByte/widget_loading"><img src="https://img.shields.io/static/v1?label=platform&message=flutter&color=1ebbfd" alt="github"></a>
55
[![likes](https://badges.bar/widget_loading/likes)](https://pub.dev/packages/widget_loading/score)
6+
[![popularity](https://badges.bar/widget_loading/popularity)](https://pub.dev/packages/widget_loading/score)
67
[![pub points](https://badges.bar/widget_loading/pub%20points)](https://pub.dev/packages/widget_loading/score)
78
<a href="https://github.com/SplashByte/widget_loading/blob/main/LICENSE"><img src="https://img.shields.io/github/license/SplashByte/widget_loading.svg" alt="license"></a>
89

example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>8.0</string>
24+
<string>9.0</string>
2525
</dict>
2626
</plist>

example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -127,7 +127,7 @@
127127
97C146E61CF9000F007C117D /* Project object */ = {
128128
isa = PBXProject;
129129
attributes = {
130-
LastUpgradeCheck = 1020;
130+
LastUpgradeCheck = 1300;
131131
ORGANIZATIONNAME = "";
132132
TargetAttributes = {
133133
97C146ED1CF9000F007C117D = {

example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

example/lib/main.dart

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,28 +92,43 @@ class _ExampleState extends State<Example> {
9292
),
9393
counterCard(Curves.easeInOutCirc),
9494
counterCard(Curves.easeInOutCirc,
95-
builder: (width, height) =>
96-
Container(width: width, height: height, decoration: BoxDecoration(color: Colors.purple, borderRadius: BorderRadius.circular(5.0))),
95+
builder: (width, height) => Container(
96+
width: width,
97+
height: height,
98+
decoration: BoxDecoration(
99+
color: Colors.purple,
100+
borderRadius: BorderRadius.circular(5.0))),
97101
wiperWidth: 50),
98102
counterCard(
99103
Curves.linear,
100-
builder: (width, height) =>
101-
Container(width: width, height: height, decoration: BoxDecoration(color: Colors.purple, borderRadius: BorderRadius.circular(5.0))),
104+
builder: (width, height) => Container(
105+
width: width,
106+
height: height,
107+
decoration: BoxDecoration(
108+
color: Colors.purple,
109+
borderRadius: BorderRadius.circular(5.0))),
102110
wiperWidth: 10,
103111
deformingFactor: 0.2,
104112
direction: WiperDirection.up,
105113
),
106-
counterCard(Curves.easeInOutCirc, padding: EdgeInsets.symmetric(horizontal: 15.0, vertical: 30.0)),
114+
counterCard(Curves.easeInOutCirc,
115+
padding: EdgeInsets.symmetric(
116+
horizontal: 15.0, vertical: 30.0)),
107117
counterCard(Curves.easeOutSine,
108118
builder: (width, height) => Container(
109119
width: width,
110120
height: height,
111-
decoration: BoxDecoration(color: Colors.red, shape: BoxShape.circle),
121+
decoration: BoxDecoration(
122+
color: Colors.red, shape: BoxShape.circle),
112123
),
113124
wiperWidth: 20),
114125
counterCard(Curves.easeOutSine,
115-
builder: (width, height) =>
116-
Container(width: width, height: height, decoration: BoxDecoration(color: Colors.purple, borderRadius: BorderRadius.circular(5.0))),
126+
builder: (width, height) => Container(
127+
width: width,
128+
height: height,
129+
decoration: BoxDecoration(
130+
color: Colors.purple,
131+
borderRadius: BorderRadius.circular(5.0))),
117132
wiperWidth: 20,
118133
direction: WiperDirection.left),
119134
counterCardCircle(Curves.linear),
@@ -171,7 +186,8 @@ class _ExampleState extends State<Example> {
171186
);
172187

173188
Widget counterCardCircle(Curve curve, {WiperBuilder? builder}) => InkWell(
174-
onTap: () => Navigator.of(context).push(MaterialPageRoute(builder: (c) => LoadingScaffold())),
189+
onTap: () => Navigator.of(context)
190+
.push(MaterialPageRoute(builder: (c) => LoadingScaffold())),
175191
child: Card(
176192
elevation: 5.0,
177193
child: CircularWidgetLoading(
@@ -180,7 +196,8 @@ class _ExampleState extends State<Example> {
180196
rollingFactor: 0.8,
181197
loading: loading,
182198
child: Padding(
183-
padding: const EdgeInsets.symmetric(horizontal: 15.0, vertical: 50.0),
199+
padding: const EdgeInsets.symmetric(
200+
horizontal: 15.0, vertical: 50.0),
184201
child: ListTile(
185202
leading: Text(
186203
'Counter',

example/pubspec.lock

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ packages:
77
name: async
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.5.0"
10+
version: "2.8.2"
1111
boolean_selector:
1212
dependency: transitive
1313
description:
@@ -21,14 +21,14 @@ packages:
2121
name: characters
2222
url: "https://pub.dartlang.org"
2323
source: hosted
24-
version: "1.1.0"
24+
version: "1.2.0"
2525
charcode:
2626
dependency: transitive
2727
description:
2828
name: charcode
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "1.2.0"
31+
version: "1.3.1"
3232
clock:
3333
dependency: transitive
3434
description:
@@ -73,14 +73,21 @@ packages:
7373
name: matcher
7474
url: "https://pub.dartlang.org"
7575
source: hosted
76-
version: "0.12.10"
76+
version: "0.12.11"
77+
material_color_utilities:
78+
dependency: transitive
79+
description:
80+
name: material_color_utilities
81+
url: "https://pub.dartlang.org"
82+
source: hosted
83+
version: "0.1.3"
7784
meta:
7885
dependency: transitive
7986
description:
8087
name: meta
8188
url: "https://pub.dartlang.org"
8289
source: hosted
83-
version: "1.3.0"
90+
version: "1.7.0"
8491
path:
8592
dependency: transitive
8693
description:
@@ -99,7 +106,7 @@ packages:
99106
name: source_span
100107
url: "https://pub.dartlang.org"
101108
source: hosted
102-
version: "1.8.0"
109+
version: "1.8.1"
103110
stack_trace:
104111
dependency: transitive
105112
description:
@@ -134,7 +141,7 @@ packages:
134141
name: test_api
135142
url: "https://pub.dartlang.org"
136143
source: hosted
137-
version: "0.2.19"
144+
version: "0.4.8"
138145
typed_data:
139146
dependency: transitive
140147
description:
@@ -148,14 +155,14 @@ packages:
148155
name: vector_math
149156
url: "https://pub.dartlang.org"
150157
source: hosted
151-
version: "2.1.0"
158+
version: "2.1.1"
152159
widget_loading:
153160
dependency: "direct main"
154161
description:
155162
path: ".."
156163
relative: true
157164
source: path
158-
version: "0.2.1"
165+
version: "0.3.0"
159166
sdks:
160-
dart: ">=2.12.0 <3.0.0"
167+
dart: ">=2.14.0 <3.0.0"
161168
flutter: ">=1.17.0"

example/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
name: example
22
description: Example Project for the package widget_loading.
33

4+
publish_to: 'none'
5+
46
version: 1.0.0+1
57

68
environment:
7-
sdk: ">=2.12.0-259.16.beta <3.0.0"
9+
sdk: ">=2.15.0 <3.0.0"
810

911
dependencies:
1012
flutter:
1113
sdk: flutter
1214

1315
widget_loading:
14-
path: ../
15-
16-
cupertino_icons: ^1.0.0
16+
path: '..'
1717

1818
dev_dependencies:
1919
flutter_test:

lib/src/utils/extensions.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ extension Derivation on CurvedAnimation {
1111
case AnimationStatus.forward:
1212
double value = max(this.parent.value - dif, 0.0);
1313
if (value == this.parent.value) return 0.0;
14-
return (this.value - this.curve.transform(value)) / (this.parent.value - value);
14+
return (this.value - this.curve.transform(value)) /
15+
(this.parent.value - value);
1516
case AnimationStatus.reverse:
1617
double value = min(this.parent.value + dif, 1.0);
1718
if (value == this.parent.value) return 0.0;
18-
return (this.value - this.curve.transform(value)) / (value - this.parent.value);
19+
return (this.value - this.curve.transform(value)) /
20+
(value - this.parent.value);
1921
case AnimationStatus.dismissed:
2022
case AnimationStatus.completed:
2123
break;

0 commit comments

Comments
 (0)