Skip to content

Commit 8dfde8f

Browse files
authored
[material_ui and cupertino_ui] Remove workspaces and fix CI (#12351)
It was discovered in the latest cupertino_ui batch release that CI is not set up to handle workspaces yet, causing CI failures. This PR attempts to solve the problem by: * Removing workspaces from material_ui_examples and cupertino_ui_examples. * Making cupertino_ui depend on material_ui via Pub instead of path. * Refactoring away all cross imports in cupertino_ui_examples and removing material_ui as its dependency. See also flutter/flutter#190453 flutter/flutter#190305
1 parent 961eb80 commit 8dfde8f

11 files changed

Lines changed: 31 additions & 49 deletions

File tree

‎packages/cupertino_ui/example/lib/list_tile/cupertino_list_tile.0.dart‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
// #region body
66
import 'package:cupertino_ui/cupertino_ui.dart';
7-
import 'package:material_ui/material_ui.dart';
87

98
/// Flutter code sample for [CupertinoListTile].
109
@@ -37,25 +36,25 @@ class CupertinoListTileExample extends StatelessWidget {
3736
),
3837
CupertinoListTile(
3938
title: Text('One-line with trailing widget'),
40-
trailing: Icon(Icons.more_vert),
39+
trailing: Icon(CupertinoIcons.ellipsis_vertical),
4140
),
4241
CupertinoListTile(
4342
leading: FlutterLogo(),
4443
title: Text('One-line with both widgets'),
45-
trailing: Icon(Icons.more_vert),
44+
trailing: Icon(CupertinoIcons.ellipsis_vertical),
4645
),
4746
CupertinoListTile(
4847
leading: FlutterLogo(size: 56.0),
4948
title: Text('Two-line CupertinoListTile'),
5049
subtitle: Text('Here is a subtitle'),
51-
trailing: Icon(Icons.more_vert),
52-
additionalInfo: Icon(Icons.info),
50+
trailing: Icon(CupertinoIcons.ellipsis_vertical),
51+
additionalInfo: Icon(CupertinoIcons.info),
5352
),
5453
CupertinoListTile(
5554
key: Key('CupertinoListTile with background color'),
5655
leading: FlutterLogo(size: 56.0),
5756
title: Text('CupertinoListTile with background color'),
58-
backgroundColor: Colors.lightBlue,
57+
backgroundColor: CupertinoColors.activeBlue,
5958
),
6059
],
6160
),

‎packages/cupertino_ui/example/lib/magnifier/text_magnifier.0.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// found in the LICENSE file.
44

55
// #region body
6+
import 'package:cupertino_ui/cupertino_ui.dart';
67
import 'package:flutter/foundation.dart';
7-
import 'package:material_ui/material_ui.dart';
88

99
void main() => runApp(const TextMagnifierExampleApp(text: 'Hello world!'));
1010

@@ -20,12 +20,12 @@ class TextMagnifierExampleApp extends StatelessWidget {
2020

2121
@override
2222
Widget build(BuildContext context) {
23-
return MaterialApp(
24-
home: Scaffold(
25-
body: Padding(
23+
return CupertinoApp(
24+
home: CupertinoPageScaffold(
25+
child: Padding(
2626
padding: const .symmetric(horizontal: 48.0),
2727
child: Center(
28-
child: TextField(
28+
child: CupertinoTextField(
2929
textDirection: textDirection,
3030
// Create a custom magnifier configuration that
3131
// this `TextField` will use to build a magnifier with.
@@ -96,7 +96,7 @@ class CustomMagnifier extends StatelessWidget {
9696
// Decorate it however we'd like!
9797
decoration: const MagnifierDecoration(
9898
shape: StarBorder(
99-
side: BorderSide(color: Colors.green, width: 2),
99+
side: BorderSide(color: CupertinoColors.activeGreen, width: 2),
100100
),
101101
),
102102
size: magnifierSize,

‎packages/cupertino_ui/example/pubspec.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ version: 1.0.0
77
environment:
88
sdk: ^3.12.0
99

10-
resolution: workspace
11-
1210
dependencies:
1311
flutter:
1412
sdk: flutter
@@ -19,9 +17,6 @@ dependencies:
1917
web: ^1.1.1
2018
cupertino_ui:
2119
path: ..
22-
material_ui:
23-
# TODO(justinmc): Use the pub.dev package when published.
24-
path: ../../material_ui
2520

2621
dev_dependencies:
2722
integration_test:
@@ -37,6 +32,3 @@ dev_dependencies:
3732
flutter_web_plugins:
3833
sdk: flutter
3934
flutter_lints: ^6.0.0
40-
41-
flutter:
42-
uses-material-design: true

‎packages/cupertino_ui/example/test/context_menu/cupertino_context_menu.0_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:material_ui/material_ui.dart';
65
import 'package:cupertino_ui_examples/context_menu/cupertino_context_menu.0.dart'
76
as example;
7+
import 'package:flutter/widgets.dart';
88
import 'package:flutter_test/flutter_test.dart';
99

1010
void main() {

‎packages/cupertino_ui/example/test/context_menu/cupertino_context_menu.1_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:material_ui/material_ui.dart';
65
import 'package:cupertino_ui_examples/context_menu/cupertino_context_menu.1.dart'
76
as example;
7+
import 'package:flutter/widgets.dart';
88
import 'package:flutter_test/flutter_test.dart';
99

1010
void main() {

‎packages/cupertino_ui/example/test/list_tile/cupertino_list_tile.0_test.dart‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// found in the LICENSE file.
44

55
import 'package:cupertino_ui/cupertino_ui.dart';
6-
import 'package:material_ui/material_ui.dart';
76
import 'package:cupertino_ui_examples/list_tile/cupertino_list_tile.0.dart'
87
as example;
98
import 'package:flutter_test/flutter_test.dart';
@@ -26,8 +25,8 @@ void main() {
2625
expect(find.text('Two-line CupertinoListTile'), findsOne);
2726
expect(find.text('Here is a subtitle'), findsOne);
2827
expect(find.text('CupertinoListTile with background color'), findsOne);
29-
expect(find.byIcon(Icons.more_vert), findsNWidgets(3));
30-
expect(find.byIcon(Icons.info), findsOne);
28+
expect(find.byIcon(CupertinoIcons.ellipsis_vertical), findsNWidgets(3));
29+
expect(find.byIcon(CupertinoIcons.info), findsOne);
3130

3231
final Finder tileWithBackgroundFinder = find.byKey(
3332
const Key('CupertinoListTile with background color'),
@@ -36,7 +35,7 @@ void main() {
3635
tester
3736
.firstWidget<CupertinoListTile>(tileWithBackgroundFinder)
3837
.backgroundColor,
39-
Colors.lightBlue,
38+
CupertinoColors.activeBlue,
4039
);
4140
});
4241
}

‎packages/cupertino_ui/example/test/magnifier/text_magnifier.0_test.dart‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'package:cupertino_ui/cupertino_ui.dart';
56
import 'package:flutter/rendering.dart';
6-
import 'package:material_ui/material_ui.dart';
77
import 'package:cupertino_ui_examples/magnifier/text_magnifier.0.dart'
88
as example;
99
import 'package:flutter_test/flutter_test.dart';
@@ -20,7 +20,7 @@ List<TextSelectionPoint> _globalize(
2020
RenderEditable _findRenderEditable<T extends State<StatefulWidget>>(
2121
WidgetTester tester,
2222
) {
23-
return (tester.state(find.byType(TextField))
23+
return (tester.state(find.byType(CupertinoTextField))
2424
as TextSelectionGestureDetectorBuilderDelegate)
2525
.editableTextKey
2626
.currentState!
@@ -48,13 +48,12 @@ Offset _textOffsetToPosition<T extends State<StatefulWidget>>(
4848

4949
void main() {
5050
const Duration durationBetweenActions = Duration(milliseconds: 20);
51-
const String defaultText = 'I am a magnifier, fear me!';
5251

53-
Future<void> showMagnifier(WidgetTester tester, int textOffset) async {
54-
assert(textOffset >= 0);
55-
final Offset tapOffset = _textOffsetToPosition(tester, textOffset);
52+
Future<void> showMagnifier(WidgetTester tester, int textIndex) async {
53+
assert(textIndex >= 0);
54+
final Offset tapOffset = _textOffsetToPosition(tester, textIndex);
5655

57-
// Double tap 'Magnifier' word to show the selection handles.
56+
// Double tap to show the selection handles.
5857
final TestGesture testGesture = await tester.startGesture(tapOffset);
5958
await tester.pump(durationBetweenActions);
6059
await testGesture.up();
@@ -65,7 +64,7 @@ void main() {
6564
await tester.pumpAndSettle();
6665

6766
final TextEditingController controller = tester
68-
.firstWidget<TextField>(find.byType(TextField))
67+
.firstWidget<CupertinoTextField>(find.byType(CupertinoTextField))
6968
.controller!;
7069

7170
final TextSelection selection = controller.selection;
@@ -75,17 +74,17 @@ void main() {
7574
renderEditable,
7675
);
7776

78-
final Offset handlePos = endpoints.last.point + const Offset(10.0, 10.0);
79-
77+
final Offset handlePos = endpoints.last.point;
8078
final TestGesture gesture = await tester.startGesture(handlePos);
8179

82-
await gesture.moveTo(_textOffsetToPosition(tester, defaultText.length - 2));
80+
await gesture.moveTo(handlePos + Offset(50.0, 0.0));
8381
await tester.pump();
8482
}
8583

8684
testWidgets(
8785
'should show custom magnifier on drag',
8886
(WidgetTester tester) async {
87+
const String defaultText = 'I am a magnifier, fear me!';
8988
await tester.pumpWidget(
9089
const example.TextMagnifierExampleApp(text: defaultText),
9190
);
@@ -116,5 +115,5 @@ void main() {
116115
await showMagnifier(tester, text.indexOf(textToTapOn));
117116

118117
expect(find.byType(example.CustomMagnifier), findsOneWidget);
119-
});
118+
}, variant: TargetPlatformVariant.mobile());
120119
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
changelog: |
2+
- Refactors examples to not cross-import material_ui.
3+
version: patch

‎packages/cupertino_ui/pubspec.yaml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ environment:
88
sdk: ^3.12.0
99
flutter: ">=3.44.0"
1010

11-
workspace:
12-
- example
13-
1411
dependencies:
1512
collection: ^1.19.1
1613
flutter:
@@ -27,9 +24,7 @@ dev_dependencies:
2724
sdk: flutter
2825
# To track memory leaks.
2926
leak_tracker_flutter_testing: ^3.0.10
30-
material_ui:
31-
# TODO(justinmc): Use the pub.dev package when published.
32-
path: ../material_ui
27+
material_ui: ^0.0.2
3328
path: ^1.9.1
3429

3530
topics:

‎packages/material_ui/example/pubspec.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ version: 1.0.0
77
environment:
88
sdk: ^3.12.0
99

10-
resolution: workspace
11-
1210
dependencies:
1311
flutter:
1412
sdk: flutter

0 commit comments

Comments
 (0)