Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ packages:
path: ".."
relative: true
source: path
version: "0.3.1"
version: "0.3.2"
sdks:
dart: ">=2.17.0 <3.0.0"
flutter: ">=1.17.0"
18 changes: 9 additions & 9 deletions lib/src/utils/clip.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class DotClipper extends CustomClipper<Rect> {
@override
Rect getClip(Size size) {
double radius = min(maxLoadingCircleSize,
min(size.width, size.height) - 2 * loadingCirclePadding) /
2 -
min(size.width, size.height) - 2 * loadingCirclePadding) /
2 -
dotRadius;
double x = size.width / 2;
double y = size.height / 2;
Expand Down Expand Up @@ -56,9 +56,9 @@ class PathDotClipper extends CustomClipper<Path> {
@override
bool operator ==(Object other) =>
identical(this, other) ||
other is InvertedDotClipper &&
runtimeType == other.runtimeType &&
radiusFactor == other.radiusFactor;
other is InvertedDotClipper &&
runtimeType == other.runtimeType &&
radiusFactor == other.radiusFactor;

@override
int get hashCode => radiusFactor.hashCode;
Expand Down Expand Up @@ -87,10 +87,10 @@ class InvertedDotClipper extends CustomClipper<Path> {
@override
bool operator ==(Object other) =>
identical(this, other) ||
other is InvertedDotClipper &&
runtimeType == other.runtimeType &&
radiusFactor == other.radiusFactor;
other is InvertedDotClipper &&
runtimeType == other.runtimeType &&
radiusFactor == other.radiusFactor;

@override
int get hashCode => radiusFactor.hashCode;
}
}
6 changes: 4 additions & 2 deletions lib/src/widgets/dot_widget_loading.dart
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,10 @@ class _DotWidgetLoadingState extends LoadingWidgetState<DotWidgetLoading>
: PathDotClipper(1.0 - _appearingAnimation.value),
child: DecoratedBox(
decoration: BoxDecoration(
color: appearing ? Colors.transparent : dotColor.withOpacity(dotColor.opacity *
(_appearingAnimation.value))),
color: appearing
? Colors.transparent
: dotColor.withOpacity(dotColor.opacity *
(_appearingAnimation.value))),
child: child),
),
),
Expand Down
23 changes: 8 additions & 15 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ packages:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0"
version: "1.16.0"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.0"
flutter:
dependency: "direct main"
description: flutter
Expand All @@ -73,7 +73,7 @@ packages:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
version: "0.1.4"
meta:
dependency: transitive
description:
Expand All @@ -87,7 +87,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.1"
sky_engine:
dependency: transitive
description: flutter
Expand All @@ -99,7 +99,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.1"
version: "1.8.2"
stack_trace:
dependency: transitive
description:
Expand Down Expand Up @@ -134,21 +134,14 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.8"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "0.4.9"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
version: "2.1.2"
sdks:
dart: ">=2.14.0 <3.0.0"
dart: ">=2.17.0-0 <3.0.0"
flutter: ">=1.17.0"