Commit 95a26ab0 authored by Adam Barth's avatar Adam Barth Committed by GitHub

Switch to SemanticAction (#4791)

This patch updates the framework to use the new SemanticAction in
semantics.mojom.
parent 639532bd
bb9865538b3daf2b452fdff9e767cee5139695e1 71ce354a447dc3384c4e8b0f031eaa9f313d29e9
...@@ -90,7 +90,7 @@ class DragEndDetails { ...@@ -90,7 +90,7 @@ class DragEndDetails {
/// Creates details for a [GestureDragEndCallback]. /// Creates details for a [GestureDragEndCallback].
/// ///
/// The [velocity] argument must not be null. /// The [velocity] argument must not be null.
DragEndDetails({ this.velocity }) { DragEndDetails({ this.velocity: Velocity.zero }) {
assert(velocity != null); assert(velocity != null);
} }
......
...@@ -268,29 +268,19 @@ abstract class RenderToggleable extends RenderConstrainedBox implements Semantic ...@@ -268,29 +268,19 @@ abstract class RenderToggleable extends RenderConstrainedBox implements Semantic
@override @override
Iterable<SemanticAnnotator> getSemanticAnnotators() sync* { Iterable<SemanticAnnotator> getSemanticAnnotators() sync* {
yield (SemanticsNode semantics) { yield (SemanticsNode semantics) {
semantics.hasCheckedState = true; semantics
semantics.isChecked = _value; ..hasCheckedState = true
semantics.canBeTapped = isInteractive; ..isChecked = _value;
if (isInteractive)
semantics.addAction(SemanticAction.tap);
}; };
} }
@override @override
void handleSemanticTap() => _handleTap(); void performAction(SemanticAction action) {
if (action == SemanticAction.tap)
@override _handleTap();
void handleSemanticLongPress() { } }
@override
void handleSemanticScrollLeft() { }
@override
void handleSemanticScrollRight() { }
@override
void handleSemanticScrollUp() { }
@override
void handleSemanticScrollDown() { }
@override @override
void debugFillDescription(List<String> description) { void debugFillDescription(List<String> description) {
......
...@@ -2119,64 +2119,66 @@ class RenderSemanticsGestureHandler extends RenderProxyBox implements SemanticAc ...@@ -2119,64 +2119,66 @@ class RenderSemanticsGestureHandler extends RenderProxyBox implements SemanticAc
Iterable<SemanticAnnotator> getSemanticAnnotators() sync* { Iterable<SemanticAnnotator> getSemanticAnnotators() sync* {
if (hasSemantics) { if (hasSemantics) {
yield (SemanticsNode semantics) { yield (SemanticsNode semantics) {
semantics.canBeTapped = onTap != null; if (onTap != null)
semantics.canBeLongPressed = onLongPress != null; semantics.addAction(SemanticAction.tap);
semantics.canBeScrolledHorizontally = onHorizontalDragUpdate != null; if (onLongPress != null)
semantics.canBeScrolledVertically = onVerticalDragUpdate != null; semantics.addAction(SemanticAction.longPress);
if (onHorizontalDragUpdate != null)
semantics.addHorizontalScrollingActions();
if (onVerticalDragUpdate != null)
semantics.addVerticalScrollingActions();
}; };
} }
} }
@override @override
void handleSemanticTap() { void performAction(SemanticAction action) {
switch (action) {
case SemanticAction.tap:
if (onTap != null) if (onTap != null)
onTap(); onTap();
} break;
case SemanticAction.longPress:
@override
void handleSemanticLongPress() {
if (onLongPress != null) if (onLongPress != null)
onLongPress(); onLongPress();
} break;
case SemanticAction.scrollLeft:
@override
void handleSemanticScrollLeft() {
if (onHorizontalDragUpdate != null) { if (onHorizontalDragUpdate != null) {
final double primaryDelta = size.width * -scrollFactor; final double primaryDelta = size.width * -scrollFactor;
onHorizontalDragUpdate(new DragUpdateDetails( onHorizontalDragUpdate(new DragUpdateDetails(
delta: new Offset(primaryDelta, 0.0), primaryDelta: primaryDelta delta: new Offset(primaryDelta, 0.0), primaryDelta: primaryDelta
)); ));
} }
} break;
case SemanticAction.scrollRight:
@override
void handleSemanticScrollRight() {
if (onHorizontalDragUpdate != null) { if (onHorizontalDragUpdate != null) {
final double primaryDelta = size.width * scrollFactor; final double primaryDelta = size.width * scrollFactor;
onHorizontalDragUpdate(new DragUpdateDetails( onHorizontalDragUpdate(new DragUpdateDetails(
delta: new Offset(primaryDelta, 0.0), primaryDelta: primaryDelta delta: new Offset(primaryDelta, 0.0), primaryDelta: primaryDelta
)); ));
} }
} break;
case SemanticAction.scrollUp:
@override
void handleSemanticScrollUp() {
if (onVerticalDragUpdate != null) { if (onVerticalDragUpdate != null) {
final double primaryDelta = size.height * -scrollFactor; final double primaryDelta = size.height * -scrollFactor;
onVerticalDragUpdate(new DragUpdateDetails( onVerticalDragUpdate(new DragUpdateDetails(
delta: new Offset(0.0, primaryDelta), primaryDelta: primaryDelta delta: new Offset(0.0, primaryDelta), primaryDelta: primaryDelta
)); ));
} }
} break;
case SemanticAction.scrollDown:
@override
void handleSemanticScrollDown() {
if (onVerticalDragUpdate != null) { if (onVerticalDragUpdate != null) {
final double primaryDelta = size.height * scrollFactor; final double primaryDelta = size.height * scrollFactor;
onVerticalDragUpdate(new DragUpdateDetails( onVerticalDragUpdate(new DragUpdateDetails(
delta: new Offset(0.0, primaryDelta), primaryDelta: primaryDelta delta: new Offset(0.0, primaryDelta), primaryDelta: primaryDelta
)); ));
} }
break;
case SemanticAction.increase:
case SemanticAction.decrease:
assert(false);
break;
}
} }
} }
......
...@@ -58,14 +58,14 @@ class _SemanticsDebuggerState extends State<SemanticsDebugger> { ...@@ -58,14 +58,14 @@ class _SemanticsDebuggerState extends State<SemanticsDebugger> {
void _handleTap() { void _handleTap() {
assert(_lastPointerDownLocation != null); assert(_lastPointerDownLocation != null);
_SemanticsDebuggerListener.instance.handleTap(_lastPointerDownLocation); _SemanticsDebuggerListener.instance._performAction(_lastPointerDownLocation, SemanticAction.tap);
setState(() { setState(() {
_lastPointerDownLocation = null; _lastPointerDownLocation = null;
}); });
} }
void _handleLongPress() { void _handleLongPress() {
assert(_lastPointerDownLocation != null); assert(_lastPointerDownLocation != null);
_SemanticsDebuggerListener.instance.handleLongPress(_lastPointerDownLocation); _SemanticsDebuggerListener.instance._performAction(_lastPointerDownLocation, SemanticAction.longPress);
setState(() { setState(() {
_lastPointerDownLocation = null; _lastPointerDownLocation = null;
}); });
...@@ -107,10 +107,7 @@ class _SemanticsDebuggerEntry { ...@@ -107,10 +107,7 @@ class _SemanticsDebuggerEntry {
_SemanticsDebuggerEntry(this.id); _SemanticsDebuggerEntry(this.id);
final int id; final int id;
bool canBeTapped = false; final Set<SemanticAction> actions = new Set<SemanticAction>();
bool canBeLongPressed = false;
bool canBeScrolledHorizontally = false;
bool canBeScrolledVertically = false;
bool hasCheckedState = false; bool hasCheckedState = false;
bool isChecked = false; bool isChecked = false;
String label; String label;
...@@ -120,13 +117,14 @@ class _SemanticsDebuggerEntry { ...@@ -120,13 +117,14 @@ class _SemanticsDebuggerEntry {
@override @override
String toString() { String toString() {
return '_SemanticsDebuggerEntry($id; $rect; "$label"' StringBuffer buffer = new StringBuffer();
'${canBeTapped ? "; canBeTapped" : ""}' buffer.write('_SemanticsDebuggerEntry($id; $rect; "$label"');
'${canBeLongPressed ? "; canBeLongPressed" : ""}' for (SemanticAction action in actions)
'${canBeScrolledHorizontally ? "; canBeScrolledHorizontally" : ""}' buffer.write('; $action');
'${canBeScrolledVertically ? "; canBeScrolledVertically" : ""}' buffer
'${hasCheckedState ? isChecked ? "; checked" : "; unchecked" : ""}' ..write('${hasCheckedState ? isChecked ? "; checked" : "; unchecked" : ""}')
')'; ..write(')');
return buffer.toString();
} }
String toStringDeep([ String prefix = '']) { String toStringDeep([ String prefix = '']) {
...@@ -142,13 +140,14 @@ class _SemanticsDebuggerEntry { ...@@ -142,13 +140,14 @@ class _SemanticsDebuggerEntry {
void updateWith(mojom.SemanticsNode node) { void updateWith(mojom.SemanticsNode node) {
if (node.flags != null) { if (node.flags != null) {
canBeTapped = node.flags.canBeTapped;
canBeLongPressed = node.flags.canBeLongPressed;
canBeScrolledHorizontally = node.flags.canBeScrolledHorizontally;
canBeScrolledVertically = node.flags.canBeScrolledVertically;
hasCheckedState = node.flags.hasCheckedState; hasCheckedState = node.flags.hasCheckedState;
isChecked = node.flags.isChecked; isChecked = node.flags.isChecked;
} }
if (node.actions != null) {
actions.clear();
for (int encodedAction in node.actions)
actions.add(SemanticAction.values[encodedAction]);
}
if (node.strings != null) { if (node.strings != null) {
assert(node.strings.label != null); assert(node.strings.label != null);
label = node.strings.label; label = node.strings.label;
...@@ -190,6 +189,13 @@ class _SemanticsDebuggerEntry { ...@@ -190,6 +189,13 @@ class _SemanticsDebuggerEntry {
height: 0.8 height: 0.8
); );
bool get _isScrollable {
return actions.contains(SemanticAction.scrollLeft)
|| actions.contains(SemanticAction.scrollRight)
|| actions.contains(SemanticAction.scrollUp)
|| actions.contains(SemanticAction.scrollDown);
}
TextPainter textPainter; TextPainter textPainter;
void _updateMessage() { void _updateMessage() {
List<String> annotations = <String>[]; List<String> annotations = <String>[];
...@@ -198,16 +204,16 @@ class _SemanticsDebuggerEntry { ...@@ -198,16 +204,16 @@ class _SemanticsDebuggerEntry {
annotations.add(isChecked ? 'checked' : 'unchecked'); annotations.add(isChecked ? 'checked' : 'unchecked');
wantsTap = true; wantsTap = true;
} }
if (canBeTapped) { if (actions.contains(SemanticAction.tap)) {
if (!wantsTap) if (!wantsTap)
annotations.add('button'); annotations.add('button');
} else { } else {
if (wantsTap) if (wantsTap)
annotations.add('disabled'); annotations.add('disabled');
} }
if (canBeLongPressed) if (actions.contains(SemanticAction.longPress))
annotations.add('long-pressable'); annotations.add('long-pressable');
if (canBeScrolledHorizontally || canBeScrolledVertically) if (_isScrollable)
annotations.add('scrollable'); annotations.add('scrollable');
String message; String message;
if (annotations.isEmpty) { if (annotations.isEmpty) {
...@@ -349,12 +355,11 @@ class _SemanticsDebuggerListener extends ChangeNotifier implements mojom.Semanti ...@@ -349,12 +355,11 @@ class _SemanticsDebuggerListener extends ChangeNotifier implements mojom.Semanti
return rootNode?.hitTest(position, filter); return rootNode?.hitTest(position, filter);
} }
void handleTap(Point position) { void _performAction(Point position, SemanticAction action) {
_server.tap(_hitTest(position, (_SemanticsDebuggerEntry entry) => entry.canBeTapped)?.id ?? 0); _SemanticsDebuggerEntry entry = _hitTest(position, (_SemanticsDebuggerEntry entry) => entry.actions.contains(action));
} _server.performAction(entry?.id ?? 0, mojom.SemanticAction.values[action.index]);
void handleLongPress(Point position) {
_server.longPress(_hitTest(position, (_SemanticsDebuggerEntry entry) => entry.canBeLongPressed)?.id ?? 0);
} }
void handlePanEnd(Point position, Velocity velocity) { void handlePanEnd(Point position, Velocity velocity) {
double vx = velocity.pixelsPerSecond.dx; double vx = velocity.pixelsPerSecond.dx;
double vy = velocity.pixelsPerSecond.dy; double vy = velocity.pixelsPerSecond.dy;
...@@ -362,14 +367,14 @@ class _SemanticsDebuggerListener extends ChangeNotifier implements mojom.Semanti ...@@ -362,14 +367,14 @@ class _SemanticsDebuggerListener extends ChangeNotifier implements mojom.Semanti
return; return;
if (vx.abs() > vy.abs()) { if (vx.abs() > vy.abs()) {
if (vx.sign < 0) if (vx.sign < 0)
_server.scrollLeft(_hitTest(position, (_SemanticsDebuggerEntry entry) => entry.canBeScrolledHorizontally)?.id ?? 0); _performAction(position, SemanticAction.scrollLeft);
else else
_server.scrollRight(_hitTest(position, (_SemanticsDebuggerEntry entry) => entry.canBeScrolledHorizontally)?.id ?? 0); _performAction(position, SemanticAction.scrollRight);
} else { } else {
if (vy.sign < 0) if (vy.sign < 0)
_server.scrollUp(_hitTest(position, (_SemanticsDebuggerEntry entry) => entry.canBeScrolledVertically)?.id ?? 0); _performAction(position, SemanticAction.scrollUp);
else else
_server.scrollDown(_hitTest(position, (_SemanticsDebuggerEntry entry) => entry.canBeScrolledVertically)?.id ?? 0); _performAction(position, SemanticAction.scrollDown);
} }
} }
} }
......
...@@ -421,10 +421,7 @@ void main() { ...@@ -421,10 +421,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isFalse); expect(client.updates[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].flags.isChecked, isFalse); expect(client.updates[0].flags.isChecked, isFalse);
expect(client.updates[0].strings.label, equals('TIP')); expect(client.updates[0].strings.label, equals('TIP'));
...@@ -443,10 +440,7 @@ void main() { ...@@ -443,10 +440,7 @@ void main() {
await tester.pump(const Duration(seconds: 2)); // faded in, show timer started (and at 0.0) await tester.pump(const Duration(seconds: 2)); // faded in, show timer started (and at 0.0)
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isFalse); expect(client.updates[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].flags.isChecked, isFalse); expect(client.updates[0].flags.isChecked, isFalse);
expect(client.updates[0].strings.label, equals('TIP')); expect(client.updates[0].strings.label, equals('TIP'));
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:sky_services/semantics/semantics.mojom.dart' as mojom;
import 'test_semantics.dart'; import 'test_semantics.dart';
...@@ -23,10 +24,7 @@ void main() { ...@@ -23,10 +24,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isFalse); expect(client.updates[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].flags.isChecked, isFalse); expect(client.updates[0].flags.isChecked, isFalse);
expect(client.updates[0].strings.label, equals('')); expect(client.updates[0].strings.label, equals(''));
...@@ -37,10 +35,7 @@ void main() { ...@@ -37,10 +35,7 @@ void main() {
expect(client.updates[0].geometry.height, equals(600.0)); expect(client.updates[0].geometry.height, equals(600.0));
expect(client.updates[0].children.length, equals(1)); expect(client.updates[0].children.length, equals(1));
expect(client.updates[0].children[0].id, equals(1)); expect(client.updates[0].children[0].id, equals(1));
expect(client.updates[0].children[0].flags.canBeTapped, isTrue); expect(client.updates[0].children[0].actions, equals(<int>[mojom.SemanticAction.tap.mojoEnumValue]));
expect(client.updates[0].children[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].children[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].children[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].children[0].flags.hasCheckedState, isFalse); expect(client.updates[0].children[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].children[0].flags.isChecked, isFalse); expect(client.updates[0].children[0].flags.isChecked, isFalse);
expect(client.updates[0].children[0].strings.label, equals('Hello')); expect(client.updates[0].children[0].strings.label, equals('Hello'));
......
...@@ -24,10 +24,7 @@ void main() { ...@@ -24,10 +24,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isFalse); expect(client.updates[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].flags.isChecked, isFalse); expect(client.updates[0].flags.isChecked, isFalse);
expect(client.updates[0].strings.label, equals('test1')); expect(client.updates[0].strings.label, equals('test1'));
...@@ -61,10 +58,7 @@ void main() { ...@@ -61,10 +58,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isFalse); expect(client.updates[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].flags.isChecked, isFalse); expect(client.updates[0].flags.isChecked, isFalse);
expect(client.updates[0].strings.label, equals('child1')); expect(client.updates[0].strings.label, equals('child1'));
...@@ -98,10 +92,7 @@ void main() { ...@@ -98,10 +92,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isFalse); expect(client.updates[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].flags.isChecked, isFalse); expect(client.updates[0].flags.isChecked, isFalse);
expect(client.updates[0].strings.label, equals('')); expect(client.updates[0].strings.label, equals(''));
...@@ -112,10 +103,7 @@ void main() { ...@@ -112,10 +103,7 @@ void main() {
expect(client.updates[0].geometry.height, equals(600.0)); expect(client.updates[0].geometry.height, equals(600.0));
expect(client.updates[0].children.length, equals(2)); expect(client.updates[0].children.length, equals(2));
expect(client.updates[0].children[0].id, equals(1)); expect(client.updates[0].children[0].id, equals(1));
expect(client.updates[0].children[0].flags.canBeTapped, isFalse); expect(client.updates[0].children[0].actions, isEmpty);
expect(client.updates[0].children[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].children[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].children[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].children[0].flags.hasCheckedState, isFalse); expect(client.updates[0].children[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].children[0].flags.isChecked, isFalse); expect(client.updates[0].children[0].flags.isChecked, isFalse);
expect(client.updates[0].children[0].strings.label, equals('child1')); expect(client.updates[0].children[0].strings.label, equals('child1'));
...@@ -126,10 +114,7 @@ void main() { ...@@ -126,10 +114,7 @@ void main() {
expect(client.updates[0].children[0].geometry.height, equals(10.0)); expect(client.updates[0].children[0].geometry.height, equals(10.0));
expect(client.updates[0].children[0].children.length, equals(0)); expect(client.updates[0].children[0].children.length, equals(0));
expect(client.updates[0].children[1].id, equals(2)); expect(client.updates[0].children[1].id, equals(2));
expect(client.updates[0].children[1].flags.canBeTapped, isFalse); expect(client.updates[0].children[1].actions, isEmpty);
expect(client.updates[0].children[1].flags.canBeLongPressed, isFalse);
expect(client.updates[0].children[1].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].children[1].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].children[1].flags.hasCheckedState, isFalse); expect(client.updates[0].children[1].flags.hasCheckedState, isFalse);
expect(client.updates[0].children[1].flags.isChecked, isFalse); expect(client.updates[0].children[1].flags.isChecked, isFalse);
expect(client.updates[0].children[1].strings.label, equals('child2')); expect(client.updates[0].children[1].strings.label, equals('child2'));
...@@ -163,10 +148,7 @@ void main() { ...@@ -163,10 +148,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isFalse); expect(client.updates[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].flags.isChecked, isFalse); expect(client.updates[0].flags.isChecked, isFalse);
expect(client.updates[0].strings.label, equals('child1')); expect(client.updates[0].strings.label, equals('child1'));
...@@ -200,10 +182,7 @@ void main() { ...@@ -200,10 +182,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isFalse); expect(client.updates[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].flags.isChecked, isFalse); expect(client.updates[0].flags.isChecked, isFalse);
expect(client.updates[0].strings.label, equals('')); expect(client.updates[0].strings.label, equals(''));
...@@ -214,10 +193,7 @@ void main() { ...@@ -214,10 +193,7 @@ void main() {
expect(client.updates[0].geometry.height, equals(600.0)); expect(client.updates[0].geometry.height, equals(600.0));
expect(client.updates[0].children.length, equals(2)); expect(client.updates[0].children.length, equals(2));
expect(client.updates[0].children[0].id, equals(3)); expect(client.updates[0].children[0].id, equals(3));
expect(client.updates[0].children[0].flags.canBeTapped, isFalse); expect(client.updates[0].children[0].actions, isEmpty);
expect(client.updates[0].children[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].children[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].children[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].children[0].flags.hasCheckedState, isFalse); expect(client.updates[0].children[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].children[0].flags.isChecked, isFalse); expect(client.updates[0].children[0].flags.isChecked, isFalse);
expect(client.updates[0].children[0].strings.label, equals('child1')); expect(client.updates[0].children[0].strings.label, equals('child1'));
...@@ -228,10 +204,7 @@ void main() { ...@@ -228,10 +204,7 @@ void main() {
expect(client.updates[0].children[0].geometry.height, equals(10.0)); expect(client.updates[0].children[0].geometry.height, equals(10.0));
expect(client.updates[0].children[0].children.length, equals(0)); expect(client.updates[0].children[0].children.length, equals(0));
expect(client.updates[0].children[1].id, equals(2)); expect(client.updates[0].children[1].id, equals(2));
expect(client.updates[0].children[1].flags.canBeTapped, isFalse); expect(client.updates[0].children[1].actions, isEmpty);
expect(client.updates[0].children[1].flags.canBeLongPressed, isFalse);
expect(client.updates[0].children[1].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].children[1].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].children[1].flags.hasCheckedState, isFalse); expect(client.updates[0].children[1].flags.hasCheckedState, isFalse);
expect(client.updates[0].children[1].flags.isChecked, isFalse); expect(client.updates[0].children[1].flags.isChecked, isFalse);
expect(client.updates[0].children[1].strings.label, equals('child2')); expect(client.updates[0].children[1].strings.label, equals('child2'));
......
...@@ -38,10 +38,7 @@ void main() { ...@@ -38,10 +38,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isFalse); expect(client.updates[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].flags.isChecked, isFalse); expect(client.updates[0].flags.isChecked, isFalse);
expect(client.updates[0].strings.label, equals('')); expect(client.updates[0].strings.label, equals(''));
...@@ -52,10 +49,7 @@ void main() { ...@@ -52,10 +49,7 @@ void main() {
expect(client.updates[0].geometry.height, equals(600.0)); expect(client.updates[0].geometry.height, equals(600.0));
expect(client.updates[0].children.length, equals(2)); expect(client.updates[0].children.length, equals(2));
expect(client.updates[0].children[0].id, equals(1)); expect(client.updates[0].children[0].id, equals(1));
expect(client.updates[0].children[0].flags.canBeTapped, isFalse); expect(client.updates[0].children[0].actions, isEmpty);
expect(client.updates[0].children[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].children[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].children[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].children[0].flags.hasCheckedState, isFalse); expect(client.updates[0].children[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].children[0].flags.isChecked, isFalse); expect(client.updates[0].children[0].flags.isChecked, isFalse);
expect(client.updates[0].children[0].strings.label, equals('child1')); expect(client.updates[0].children[0].strings.label, equals('child1'));
...@@ -66,10 +60,7 @@ void main() { ...@@ -66,10 +60,7 @@ void main() {
expect(client.updates[0].children[0].geometry.height, equals(10.0)); expect(client.updates[0].children[0].geometry.height, equals(10.0));
expect(client.updates[0].children[0].children.length, equals(0)); expect(client.updates[0].children[0].children.length, equals(0));
expect(client.updates[0].children[1].id, equals(2)); expect(client.updates[0].children[1].id, equals(2));
expect(client.updates[0].children[1].flags.canBeTapped, isFalse); expect(client.updates[0].children[1].actions, isEmpty);
expect(client.updates[0].children[1].flags.canBeLongPressed, isFalse);
expect(client.updates[0].children[1].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].children[1].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].children[1].flags.hasCheckedState, isFalse); expect(client.updates[0].children[1].flags.hasCheckedState, isFalse);
expect(client.updates[0].children[1].flags.isChecked, isFalse); expect(client.updates[0].children[1].flags.isChecked, isFalse);
expect(client.updates[0].children[1].strings.label, equals('child2')); expect(client.updates[0].children[1].strings.label, equals('child2'));
...@@ -103,10 +94,7 @@ void main() { ...@@ -103,10 +94,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isFalse); expect(client.updates[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].flags.isChecked, isFalse); expect(client.updates[0].flags.isChecked, isFalse);
expect(client.updates[0].strings.label, equals('child1')); expect(client.updates[0].strings.label, equals('child1'));
...@@ -140,10 +128,7 @@ void main() { ...@@ -140,10 +128,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isFalse); expect(client.updates[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].flags.isChecked, isFalse); expect(client.updates[0].flags.isChecked, isFalse);
expect(client.updates[0].strings.label, equals('')); expect(client.updates[0].strings.label, equals(''));
...@@ -154,10 +139,7 @@ void main() { ...@@ -154,10 +139,7 @@ void main() {
expect(client.updates[0].geometry.height, equals(600.0)); expect(client.updates[0].geometry.height, equals(600.0));
expect(client.updates[0].children.length, equals(2)); expect(client.updates[0].children.length, equals(2));
expect(client.updates[0].children[0].id, equals(3)); expect(client.updates[0].children[0].id, equals(3));
expect(client.updates[0].children[0].flags.canBeTapped, isFalse); expect(client.updates[0].children[0].actions, isEmpty);
expect(client.updates[0].children[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].children[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].children[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].children[0].flags.hasCheckedState, isFalse); expect(client.updates[0].children[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].children[0].flags.isChecked, isFalse); expect(client.updates[0].children[0].flags.isChecked, isFalse);
expect(client.updates[0].children[0].strings.label, equals('child1')); expect(client.updates[0].children[0].strings.label, equals('child1'));
...@@ -168,10 +150,7 @@ void main() { ...@@ -168,10 +150,7 @@ void main() {
expect(client.updates[0].children[0].geometry.height, equals(10.0)); expect(client.updates[0].children[0].geometry.height, equals(10.0));
expect(client.updates[0].children[0].children.length, equals(0)); expect(client.updates[0].children[0].children.length, equals(0));
expect(client.updates[0].children[1].id, equals(2)); expect(client.updates[0].children[1].id, equals(2));
expect(client.updates[0].children[1].flags.canBeTapped, isFalse); expect(client.updates[0].children[1].actions, isEmpty);
expect(client.updates[0].children[1].flags.canBeLongPressed, isFalse);
expect(client.updates[0].children[1].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].children[1].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].children[1].flags.hasCheckedState, isFalse); expect(client.updates[0].children[1].flags.hasCheckedState, isFalse);
expect(client.updates[0].children[1].flags.isChecked, isFalse); expect(client.updates[0].children[1].flags.isChecked, isFalse);
expect(client.updates[0].children[1].strings.label, equals('child2')); expect(client.updates[0].children[1].strings.label, equals('child2'));
......
...@@ -27,10 +27,7 @@ void main() { ...@@ -27,10 +27,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isTrue); expect(client.updates[0].flags.hasCheckedState, isTrue);
expect(client.updates[0].flags.isChecked, isTrue); expect(client.updates[0].flags.isChecked, isTrue);
expect(client.updates[0].strings.label, equals('test')); expect(client.updates[0].strings.label, equals('test'));
...@@ -55,10 +52,7 @@ void main() { ...@@ -55,10 +52,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isTrue); expect(client.updates[0].flags.hasCheckedState, isTrue);
expect(client.updates[0].flags.isChecked, isTrue); expect(client.updates[0].flags.isChecked, isTrue);
expect(client.updates[0].strings.label, equals('')); expect(client.updates[0].strings.label, equals(''));
...@@ -83,10 +77,7 @@ void main() { ...@@ -83,10 +77,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isFalse); expect(client.updates[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].flags.isChecked, isFalse); expect(client.updates[0].flags.isChecked, isFalse);
expect(client.updates[0].strings.label, equals('test')); expect(client.updates[0].strings.label, equals('test'));
...@@ -114,10 +105,7 @@ void main() { ...@@ -114,10 +105,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isTrue); expect(client.updates[0].flags.hasCheckedState, isTrue);
expect(client.updates[0].flags.isChecked, isTrue); expect(client.updates[0].flags.isChecked, isTrue);
expect(client.updates[0].strings.label, equals('test')); expect(client.updates[0].strings.label, equals('test'));
......
...@@ -46,10 +46,7 @@ void main() { ...@@ -46,10 +46,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isFalse); expect(client.updates[0].flags.hasCheckedState, isFalse);
expect(client.updates[0].flags.isChecked, isFalse); expect(client.updates[0].flags.isChecked, isFalse);
expect(client.updates[0].strings.label, equals('')); expect(client.updates[0].strings.label, equals(''));
...@@ -60,10 +57,7 @@ void main() { ...@@ -60,10 +57,7 @@ void main() {
expect(client.updates[0].geometry.height, equals(600.0)); expect(client.updates[0].geometry.height, equals(600.0));
expect(client.updates[0].children.length, equals(2)); expect(client.updates[0].children.length, equals(2));
expect(client.updates[0].children[0].id, equals(1)); expect(client.updates[0].children[0].id, equals(1));
expect(client.updates[0].children[0].flags.canBeTapped, isFalse); expect(client.updates[0].children[0].actions, isEmpty);
expect(client.updates[0].children[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].children[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].children[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].children[0].flags.hasCheckedState, isTrue); expect(client.updates[0].children[0].flags.hasCheckedState, isTrue);
expect(client.updates[0].children[0].flags.isChecked, isTrue); expect(client.updates[0].children[0].flags.isChecked, isTrue);
expect(client.updates[0].children[0].strings.label, equals(label)); expect(client.updates[0].children[0].strings.label, equals(label));
...@@ -75,10 +69,7 @@ void main() { ...@@ -75,10 +69,7 @@ void main() {
expect(client.updates[0].children[0].children.length, equals(0)); expect(client.updates[0].children[0].children.length, equals(0));
// IDs 2 and 3 are used up by the nodes that get merged in // IDs 2 and 3 are used up by the nodes that get merged in
expect(client.updates[0].children[1].id, equals(4)); expect(client.updates[0].children[1].id, equals(4));
expect(client.updates[0].children[1].flags.canBeTapped, isFalse); expect(client.updates[0].children[1].actions, isEmpty);
expect(client.updates[0].children[1].flags.canBeLongPressed, isFalse);
expect(client.updates[0].children[1].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].children[1].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].children[1].flags.hasCheckedState, isTrue); expect(client.updates[0].children[1].flags.hasCheckedState, isTrue);
expect(client.updates[0].children[1].flags.isChecked, isTrue); expect(client.updates[0].children[1].flags.isChecked, isTrue);
expect(client.updates[0].children[1].strings.label, equals(label)); expect(client.updates[0].children[1].strings.label, equals(label));
...@@ -135,10 +126,7 @@ void main() { ...@@ -135,10 +126,7 @@ void main() {
} }
expect(a.id, equals(1)); expect(a.id, equals(1));
expect(a.flags.canBeTapped, isFalse); expect(a.actions, isEmpty);
expect(a.flags.canBeLongPressed, isFalse);
expect(a.flags.canBeScrolledHorizontally, isFalse);
expect(a.flags.canBeScrolledVertically, isFalse);
expect(a.flags.hasCheckedState, isTrue); expect(a.flags.hasCheckedState, isTrue);
expect(a.flags.isChecked, isTrue); expect(a.flags.isChecked, isTrue);
expect(a.strings.label, equals(label)); expect(a.strings.label, equals(label));
...@@ -150,10 +138,7 @@ void main() { ...@@ -150,10 +138,7 @@ void main() {
expect(a.children.length, equals(0)); expect(a.children.length, equals(0));
expect(b.id, equals(4)); expect(b.id, equals(4));
expect(b.flags.canBeTapped, isFalse); expect(b.actions, isEmpty);
expect(b.flags.canBeLongPressed, isFalse);
expect(b.flags.canBeScrolledHorizontally, isFalse);
expect(b.flags.canBeScrolledVertically, isFalse);
expect(b.flags.hasCheckedState, isTrue); expect(b.flags.hasCheckedState, isTrue);
expect(b.flags.isChecked, isTrue); expect(b.flags.isChecked, isTrue);
expect(b.strings.label, equals(label)); expect(b.strings.label, equals(label));
......
...@@ -34,10 +34,7 @@ void main() { ...@@ -34,10 +34,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isTrue); expect(client.updates[0].flags.hasCheckedState, isTrue);
expect(client.updates[0].flags.isChecked, isTrue); expect(client.updates[0].flags.isChecked, isTrue);
expect(client.updates[0].strings.label, equals('label')); expect(client.updates[0].strings.label, equals('label'));
...@@ -73,10 +70,7 @@ void main() { ...@@ -73,10 +70,7 @@ void main() {
); );
expect(client.updates.length, equals(2)); expect(client.updates.length, equals(2));
expect(client.updates[0].id, equals(0)); expect(client.updates[0].id, equals(0));
expect(client.updates[0].flags.canBeTapped, isFalse); expect(client.updates[0].actions, isEmpty);
expect(client.updates[0].flags.canBeLongPressed, isFalse);
expect(client.updates[0].flags.canBeScrolledHorizontally, isFalse);
expect(client.updates[0].flags.canBeScrolledVertically, isFalse);
expect(client.updates[0].flags.hasCheckedState, isTrue); expect(client.updates[0].flags.hasCheckedState, isTrue);
expect(client.updates[0].flags.isChecked, isTrue); expect(client.updates[0].flags.isChecked, isTrue);
expect(client.updates[0].strings.label, equals('label')); expect(client.updates[0].strings.label, equals('label'));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment