From df78ec2b24c62516283470751884bbfa7129dfd9 Mon Sep 17 00:00:00 2001 From: Hixie Date: Fri, 15 Jan 2016 15:06:49 -0800 Subject: [PATCH] fix framework to match new mojo sdk The dart bindings changed semantics in a non-compatible way. --- examples/fitness/lib/measurement.dart | 2 +- examples/fitness/lib/settings.dart | 2 +- examples/mine_digger/lib/main.dart | 2 +- examples/raw/hello_world.dart | 4 ++-- examples/raw/spinning_image.dart | 2 +- examples/rendering/interactive_flex.dart | 2 +- .../flutter/lib/src/gestures/converter.dart | 18 +++++++++--------- .../flutter/lib/src/material/date_picker.dart | 6 +++--- packages/flutter/lib/src/material/input.dart | 2 +- .../flutter/lib/src/material/time_picker.dart | 2 +- packages/flutter/lib/src/services/shell.dart | 6 +++--- .../flutter/lib/src/widgets/drag_target.dart | 2 +- packages/flutter/pubspec.yaml | 4 ++-- .../flutter/test/services/mock_services.dart | 9 +++++---- packages/flutter/test/widget/input_test.dart | 2 +- 15 files changed, 33 insertions(+), 32 deletions(-) diff --git a/examples/fitness/lib/measurement.dart b/examples/fitness/lib/measurement.dart index 219286f22b..467c4ad2cd 100644 --- a/examples/fitness/lib/measurement.dart +++ b/examples/fitness/lib/measurement.dart @@ -142,7 +142,7 @@ class MeasurementFragmentState extends State { new Input( key: weightKey, placeholder: 'Enter weight', - keyboardType: KeyboardType.NUMBER, + keyboardType: KeyboardType.number, onChanged: _handleWeightChanged ), ], diff --git a/examples/fitness/lib/settings.dart b/examples/fitness/lib/settings.dart index f70c2f996b..26dc19661d 100644 --- a/examples/fitness/lib/settings.dart +++ b/examples/fitness/lib/settings.dart @@ -63,7 +63,7 @@ class SettingsFragmentState extends State { content: new Input( key: weightGoalKey, placeholder: 'Goal weight in lbs', - keyboardType: KeyboardType.NUMBER, + keyboardType: KeyboardType.number, onChanged: _handleGoalWeightChanged ), actions: [ diff --git a/examples/mine_digger/lib/main.dart b/examples/mine_digger/lib/main.dart index 04d8a1e448..b0599348a9 100644 --- a/examples/mine_digger/lib/main.dart +++ b/examples/mine_digger/lib/main.dart @@ -113,7 +113,7 @@ class MineDiggerState extends State { probe(ix, iy); }, onLongPress: () { - userFeedback.performHapticFeedback(HapticFeedbackType.LONG_PRESS); + userFeedback.performHapticFeedback(HapticFeedbackType.longPress); flag(ix, iy); }, child: new Listener( diff --git a/examples/raw/hello_world.dart b/examples/raw/hello_world.dart index 5d5911997e..413d7f4bc9 100644 --- a/examples/raw/hello_world.dart +++ b/examples/raw/hello_world.dart @@ -57,10 +57,10 @@ void handlePointerPacket(ByteData serializedPacket) { PointerPacket packet = PointerPacket.deserialize(message); for (Pointer pointer in packet.pointers) { - if (pointer.type == PointerType.DOWN) { + if (pointer.type == PointerType.down) { color = new ui.Color.fromARGB(255, 0, 0, 255); ui.window.scheduleFrame(); - } else if (pointer.type == PointerType.UP) { + } else if (pointer.type == PointerType.up) { color = new ui.Color.fromARGB(255, 0, 255, 0); ui.window.scheduleFrame(); } diff --git a/examples/raw/spinning_image.dart b/examples/raw/spinning_image.dart index 5457af5405..71d741df07 100644 --- a/examples/raw/spinning_image.dart +++ b/examples/raw/spinning_image.dart @@ -88,7 +88,7 @@ void handlePointerPacket(ByteData serializedPacket) { PointerPacket packet = PointerPacket.deserialize(message); for (Pointer pointer in packet.pointers) { - if (pointer.type == PointerType.UP) { + if (pointer.type == PointerType.up) { imageCache.load(url2).first.then(handleImageLoad); } } diff --git a/examples/rendering/interactive_flex.dart b/examples/rendering/interactive_flex.dart index 7944118a8b..176a755ffc 100644 --- a/examples/rendering/interactive_flex.dart +++ b/examples/rendering/interactive_flex.dart @@ -60,7 +60,7 @@ class DemoBinding extends BindingBase with Scheduler, Renderer { ); PointerPacket packet = PointerPacket.deserialize(message); for (Pointer pointer in packet.pointers) { - if (pointer.type == PointerType.MOVE) + if (pointer.type == PointerType.move) image.growth = math.max(0.0, image.growth + pointer.x - touches[pointer.pointer].x); touches[pointer.pointer] = new Touch(pointer.x, pointer.y); } diff --git a/packages/flutter/lib/src/gestures/converter.dart b/packages/flutter/lib/src/gestures/converter.dart index d573768db3..1a9c0e6575 100644 --- a/packages/flutter/lib/src/gestures/converter.dart +++ b/packages/flutter/lib/src/gestures/converter.dart @@ -42,7 +42,7 @@ class PointerEventConverter { assert(_pointerKindMap.containsKey(datum.kind)); PointerDeviceKind kind = _pointerKindMap[datum.kind]; switch (datum.type) { - case PointerType.DOWN: + case PointerType.down: assert(!_pointers.containsKey(datum.pointer)); _PointerState state = _pointers.putIfAbsent( datum.pointer, @@ -84,7 +84,7 @@ class PointerEventConverter { tilt: datum.tilt ); break; - case PointerType.MOVE: + case PointerType.move: // If the service starts supporting hover pointers, then it must also // start sending us ADDED and REMOVED data points. // See also: https://github.com/flutter/flutter/issues/720 @@ -114,14 +114,14 @@ class PointerEventConverter { tilt: datum.tilt ); break; - case PointerType.UP: - case PointerType.CANCEL: + case PointerType.up: + case PointerType.cancel: assert(_pointers.containsKey(datum.pointer)); _PointerState state = _pointers[datum.pointer]; assert(state.down); assert(position == state.lastPosition); state.setUp(); - if (datum.type == PointerType.UP) { + if (datum.type == PointerType.up) { yield new PointerUpEvent( timeStamp: timeStamp, pointer: state.pointer, @@ -175,9 +175,9 @@ class PointerEventConverter { } static const Map _pointerKindMap = const { - PointerKind.TOUCH: PointerDeviceKind.touch, - PointerKind.MOUSE: PointerDeviceKind.mouse, - PointerKind.STYLUS: PointerDeviceKind.stylus, - PointerKind.INVERTED_STYLUS: PointerDeviceKind.invertedStylus, + PointerKind.touch: PointerDeviceKind.touch, + PointerKind.mouse: PointerDeviceKind.mouse, + PointerKind.stylus: PointerDeviceKind.stylus, + PointerKind.invertedStylus: PointerDeviceKind.invertedStylus, }; } diff --git a/packages/flutter/lib/src/material/date_picker.dart b/packages/flutter/lib/src/material/date_picker.dart index a38daef95a..7204f2b1ef 100644 --- a/packages/flutter/lib/src/material/date_picker.dart +++ b/packages/flutter/lib/src/material/date_picker.dart @@ -40,14 +40,14 @@ class _DatePickerState extends State { _DatePickerMode _mode = _DatePickerMode.day; void _handleModeChanged(_DatePickerMode mode) { - userFeedback.performHapticFeedback(HapticFeedbackType.VIRTUAL_KEY); + userFeedback.performHapticFeedback(HapticFeedbackType.virtualKey); setState(() { _mode = mode; }); } void _handleYearChanged(DateTime dateTime) { - userFeedback.performHapticFeedback(HapticFeedbackType.VIRTUAL_KEY); + userFeedback.performHapticFeedback(HapticFeedbackType.virtualKey); setState(() { _mode = _DatePickerMode.day; }); @@ -56,7 +56,7 @@ class _DatePickerState extends State { } void _handleDayChanged(DateTime dateTime) { - userFeedback.performHapticFeedback(HapticFeedbackType.VIRTUAL_KEY); + userFeedback.performHapticFeedback(HapticFeedbackType.virtualKey); if (config.onChanged != null) config.onChanged(dateTime); } diff --git a/packages/flutter/lib/src/material/input.dart b/packages/flutter/lib/src/material/input.dart index f036f98729..f046d6d3e1 100644 --- a/packages/flutter/lib/src/material/input.dart +++ b/packages/flutter/lib/src/material/input.dart @@ -21,7 +21,7 @@ class Input extends Scrollable { this.hideText: false, this.isDense: false, this.onChanged, - this.keyboardType: KeyboardType.TEXT, + this.keyboardType: KeyboardType.text, this.onSubmitted }) : super( key: key, diff --git a/packages/flutter/lib/src/material/time_picker.dart b/packages/flutter/lib/src/material/time_picker.dart index 45a8a31dbb..95668bad5d 100644 --- a/packages/flutter/lib/src/material/time_picker.dart +++ b/packages/flutter/lib/src/material/time_picker.dart @@ -110,7 +110,7 @@ class _TimePickerState extends State { _TimePickerMode _mode = _TimePickerMode.hour; void _handleModeChanged(_TimePickerMode mode) { - userFeedback.performHapticFeedback(HapticFeedbackType.VIRTUAL_KEY); + userFeedback.performHapticFeedback(HapticFeedbackType.virtualKey); setState(() { _mode = mode; }); diff --git a/packages/flutter/lib/src/services/shell.dart b/packages/flutter/lib/src/services/shell.dart index cacd14eafd..93cb75393c 100644 --- a/packages/flutter/lib/src/services/shell.dart +++ b/packages/flutter/lib/src/services/shell.dart @@ -62,13 +62,13 @@ class _Shell { ServiceProviderProxy services = new ServiceProviderProxy.unbound(); _shell.connectToApplication(url, services, null); - var pipe = new core.MojoMessagePipe(); + core.MojoMessagePipe pipe = new core.MojoMessagePipe(); proxy.impl.bind(pipe.endpoints[0]); - services.ptr.connectToService(proxy.name, pipe.endpoints[1]); + services.ptr.connectToService(proxy.serviceName, pipe.endpoints[1]); services.close(); } - void connectToService(String url, Object proxy) { + void connectToService(String url, bindings.ProxyBase proxy) { if (overrideConnectToService != null && overrideConnectToService(url, proxy)) return; _connectToService(url, proxy); diff --git a/packages/flutter/lib/src/widgets/drag_target.dart b/packages/flutter/lib/src/widgets/drag_target.dart index a6ec13f2d2..cb58b8cf61 100644 --- a/packages/flutter/lib/src/widgets/drag_target.dart +++ b/packages/flutter/lib/src/widgets/drag_target.dart @@ -126,7 +126,7 @@ class LongPressDraggable extends DraggableBase { gestureArena: Gesturer.instance.gestureArena, longTapDelay: kLongPressTimeout, onLongTapDown: (Point position, int pointer) { - userFeedback.performHapticFeedback(HapticFeedbackType.VIRTUAL_KEY); + userFeedback.performHapticFeedback(HapticFeedbackType.virtualKey); starter(position, pointer); } ); diff --git a/packages/flutter/pubspec.yaml b/packages/flutter/pubspec.yaml index 44a6af941c..59bd8d0d56 100644 --- a/packages/flutter/pubspec.yaml +++ b/packages/flutter/pubspec.yaml @@ -8,8 +8,8 @@ dependencies: collection: '>=1.1.3 <2.0.0' intl: '>=0.12.4+2 <0.13.0' material_design_icons: '>=0.0.3 <0.1.0' - sky_engine: 0.0.83 - sky_services: 0.0.83 + sky_engine: 0.0.84 + sky_services: 0.0.84 vector_math: '>=1.4.5 <2.0.0' quiver: '>=0.21.4 <0.22.0' diff --git a/packages/flutter/test/services/mock_services.dart b/packages/flutter/test/services/mock_services.dart index 69537780ec..955cbe5cae 100644 --- a/packages/flutter/test/services/mock_services.dart +++ b/packages/flutter/test/services/mock_services.dart @@ -1,4 +1,5 @@ import 'package:flutter/src/services/shell.dart' as shell; +import 'package:mojo/bindings.dart' as bindings; // Tests can use ServiceMocker to register replacement implementations // of Mojo services. @@ -10,12 +11,12 @@ class _ServiceMocker { // Map of interface names to mock implementations. Map _interfaceMock = new Map(); - bool _connectToService(String url, dynamic proxy) { - Object mock = _interfaceMock[proxy.impl.name]; + bool _connectToService(String url, bindings.ProxyBase proxy) { + Object mock = _interfaceMock[proxy.serviceName]; if (mock != null) { // Replace the proxy's implementation of the service interface with the - // mock. - proxy.ptr = mock; + // mock. The mojom bindings put the "ptr" field on all proxies. + (proxy as dynamic).ptr = mock; return true; } else { return false; diff --git a/packages/flutter/test/widget/input_test.dart b/packages/flutter/test/widget/input_test.dart index 2e9c21bc66..6a82691f0f 100644 --- a/packages/flutter/test/widget/input_test.dart +++ b/packages/flutter/test/widget/input_test.dart @@ -29,7 +29,7 @@ class MockKeyboard implements KeyboardService { void main() { MockKeyboard mockKeyboard = new MockKeyboard(); - serviceMocker.registerMockService(KeyboardServiceName, mockKeyboard); + serviceMocker.registerMockService(KeyboardService.serviceName, mockKeyboard); test('Editable text has consistent width', () { testWidgets((WidgetTester tester) {