Skip to content

resolved the issue of indeterminate CircularProgressIndicator.adaptive on Darwin #140947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 38 commits into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c1b289b
Update progress_indicator.dart
nikkivirtuoso Jan 2, 2024
ec4a235
Merge pull request #1 from nikkivirtuoso/nikkivirtuoso-patch-1
nikkivirtuoso Jan 2, 2024
3d3ace1
Merge branch 'master' into master
nikkivirtuoso Jan 4, 2024
7aa45fa
Merge branch 'master' into master
nikkivirtuoso Jan 4, 2024
f4d7d1f
Merge branch 'master' into master
nikkivirtuoso Jan 4, 2024
045a1fc
Merge branch 'master' into master
nikkivirtuoso Jan 4, 2024
078b6d9
Update progress_indicator.dart
nikkivirtuoso Jan 4, 2024
8df261d
test cases updated
nikkivirtuoso Jan 5, 2024
faf408e
nit changes
nikkivirtuoso Jan 5, 2024
070d6b0
Merge branch 'master' into master
nikkivirtuoso Jan 5, 2024
e4cea6b
trying to correct the linux error
nikkivirtuoso Jan 5, 2024
254704e
change in test case #2
nikkivirtuoso Jan 5, 2024
d876048
Merge branch 'master' into master
nikkivirtuoso Jan 5, 2024
6ddfd0c
Merge branch 'master' into master
nikkivirtuoso Jan 5, 2024
729a256
Merge branch 'master' into master
nikkivirtuoso Jan 5, 2024
3fe42aa
Update packages/flutter/lib/src/material/progress_indicator.dart
nikkivirtuoso Jan 5, 2024
97e74e0
seperate test created
nikkivirtuoso Jan 5, 2024
230b0b4
Merge branch 'master' into master
nikkivirtuoso Jan 5, 2024
bb45ece
testwidgets
nikkivirtuoso Jan 5, 2024
ca7685b
commented
nikkivirtuoso Jan 5, 2024
09f37e4
again uncomment
nikkivirtuoso Jan 5, 2024
a815caa
Merge branch 'master' into master
nikkivirtuoso Jan 5, 2024
04c03da
removed trailing spaces
nikkivirtuoso Jan 6, 2024
31e4a0d
Merge branch 'master' into master
nikkivirtuoso Jan 6, 2024
db455e1
Merge branch 'master' into master
nikkivirtuoso Jan 6, 2024
9fbe89b
Merge branch 'master' into master
nikkivirtuoso Jan 8, 2024
5e72838
Merge branch 'master' into master
nikkivirtuoso Jan 8, 2024
837fb38
Update packages/flutter/test/material/progress_indicator_test.dart
nikkivirtuoso Jan 8, 2024
074969d
outstanding nits
nikkivirtuoso Jan 8, 2024
96a77ff
1113 line remove
nikkivirtuoso Jan 8, 2024
ffafcd2
Merge branch 'master' into master
nikkivirtuoso Jan 8, 2024
211a6e9
Merge branch 'master' into master
nikkivirtuoso Jan 9, 2024
a27019d
Merge branch 'master' into master
nikkivirtuoso Jan 9, 2024
af5afdc
nit changes
nikkivirtuoso Jan 9, 2024
c3f0fef
val->value
nikkivirtuoso Jan 9, 2024
941555c
minor_Change
nikkivirtuoso Jan 9, 2024
18d036a
another val -> value
nikkivirtuoso Jan 9, 2024
0bc2007
Merge branch 'master' into master
nikkivirtuoso Jan 9, 2024
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
13 changes: 12 additions & 1 deletion packages/flutter/lib/src/material/progress_indicator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,18 @@ class _CircularProgressIndicatorState extends State<CircularProgressIndicator> w

Widget _buildCupertinoIndicator(BuildContext context) {
final Color? tickColor = widget.backgroundColor;
return CupertinoActivityIndicator(key: widget.key, color: tickColor);
final double? value = widget.value;
if (value == null) {
return CupertinoActivityIndicator(
key: widget.key,
color: tickColor
);
}
return CupertinoActivityIndicator.partiallyRevealed(
key: widget.key,
color: tickColor,
progress: value
);
}

Widget _buildMaterialIndicator(BuildContext context, double headValue, double tailValue, double offsetValue, double rotationValue) {
Expand Down
28 changes: 28 additions & 0 deletions packages/flutter/test/material/progress_indicator_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1084,6 +1084,34 @@ void main() {
}),
);

testWidgets(
'Adaptive CircularProgressIndicator displays CupertinoActivityIndicator in iOS/macOS',
(WidgetTester tester) async {
await tester.pumpWidget(
MaterialApp(
theme: ThemeData(),
home: const Scaffold(
body: Material(
child: CircularProgressIndicator.adaptive(
value: 0.5,
),
),
),
),
);

expect(find.byType(CupertinoActivityIndicator), findsOneWidget);
final double actualProgress = tester.widget<CupertinoActivityIndicator>(
find.byType(CupertinoActivityIndicator),
).progress;
expect(actualProgress, 0.5);
},
variant: const TargetPlatformVariant(<TargetPlatform> {
TargetPlatform.iOS,
TargetPlatform.macOS,
}),
);

testWidgets(
'Adaptive CircularProgressIndicator can use backgroundColor to change tick color for iOS',
(WidgetTester tester) async {
Expand Down