Skip to content
Open
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
39 changes: 31 additions & 8 deletions lib/flutter_eval.dart
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ import 'package:flutter_eval/src/painting/image_provider.dart';
import 'package:flutter_eval/src/painting/text_style.dart';
import 'package:flutter_eval/src/rendering.dart';
import 'package:flutter_eval/src/rendering/box.dart';
import 'package:flutter_eval/src/rendering/custom_paint.dart';
import 'package:flutter_eval/src/rendering/flex.dart';
import 'package:flutter_eval/src/rendering/object.dart';
import 'package:flutter_eval/src/services/raw_keyboard.dart';
import 'package:flutter_eval/src/sky_engine/ui/geometry.dart';
import 'package:flutter_eval/src/sky_engine/ui/image.dart';
import 'package:flutter_eval/src/sky_engine/ui/painting.dart';
Expand All @@ -54,6 +56,7 @@ import 'package:flutter_eval/src/widgets/app.dart';
import 'package:flutter_eval/src/widgets/basic.dart';
import 'package:flutter_eval/src/widgets/container.dart';
import 'package:flutter_eval/src/widgets/editable_text.dart';
import 'package:flutter_eval/src/widgets/focus_manager.dart';
import 'package:flutter_eval/src/widgets/framework.dart';
import 'package:flutter_eval/src/widgets/icon.dart';
import 'package:flutter_eval/src/widgets/icon_data.dart';
Expand Down Expand Up @@ -91,6 +94,12 @@ class FlutterEvalPlugin implements EvalPlugin {
$StatelessWidget$bridge.$declaration,
$StatefulWidget$bridge.$declaration,
$ChangeNotifier$bridge.$declaration,
$CustomPaint$bridge.$declaration,
$ValueNotifier.$declaration,
$Canvas.$declaration,
$CustomPainter$bridge.$declaration,
$Paint.$declaration,
$Path.$declaration,
$State$bridge.$declaration,
$BuildContext.$declaration,
$Text.$declaration,
Expand Down Expand Up @@ -161,24 +170,26 @@ class FlutterEvalPlugin implements EvalPlugin {
$NetworkImage.$declaration,
$MemoryImage.$declaration,
$ResizeImage.$declaration,
$RawKeyEvent.$declaration,
];

for (final cls in classes) {
registry.defineBridgeClass(cls);
}

registry.defineBridgeEnum($MainAxisAlignment.$declaration);
registry.defineBridgeEnum($CrossAxisAlignment.$declaration);
registry.defineBridgeEnum($MainAxisSize.$declaration);
registry.defineBridgeEnum($FontWeight.$declaration);
registry.defineBridgeEnum($FontStyle.$declaration);
registry.defineBridgeEnum($TextDirection.$declaration);
registry.defineBridgeEnum($VerticalDirection.$declaration);
registry.defineBridgeEnum($TextBaseline.$declaration);
registry.defineBridgeEnum($Axis.$declaration);
registry.defineBridgeEnum($BorderStyle.$declaration);
registry.defineBridgeEnum($BoxFit.$declaration);
registry.defineBridgeEnum($CrossAxisAlignment.$declaration);
registry.defineBridgeEnum($FilterQuality.$declaration);
registry.defineBridgeEnum($FontStyle.$declaration);
registry.defineBridgeEnum($FontWeight.$declaration);
registry.defineBridgeEnum($KeyEventResult.$declaration);
registry.defineBridgeEnum($MainAxisAlignment.$declaration);
registry.defineBridgeEnum($MainAxisSize.$declaration);
registry.defineBridgeEnum($TextBaseline.$declaration);
registry.defineBridgeEnum($TextDirection.$declaration);
registry.defineBridgeEnum($VerticalDirection.$declaration);

registry.addSource(DartSource('dart:ui', dartUiSource));

Expand All @@ -205,16 +216,26 @@ class FlutterEvalPlugin implements EvalPlugin {
void configureForRuntime(Runtime runtime) {
runtime
..registerBridgeFunc('dart:ui', 'Color.', $Color.$new)
..registerBridgeFunc('dart:ui', 'Paint.', $Paint.$new)
..registerBridgeFunc('dart:ui', 'Path.', $Path.$new)
..registerBridgeFunc('dart:ui', 'Size.', $Size.$new)
..registerBridgeFunc(
'package:flutter/src/foundation/change_notifier.dart', 'ChangeNotifier.', $ChangeNotifier$bridge.$new,
isBridge: true)
..registerBridgeFunc(
'package:flutter/src/foundation/change_notifier.dart', 'ValueNotifier.', $ValueNotifier.$new,
isBridge: true)
..registerBridgeFunc(
'package:flutter/src/widgets/framework.dart', 'StatelessWidget.', $StatelessWidget$bridge.$new,
isBridge: true)
..registerBridgeFunc('package:flutter/src/widgets/rendering.dart', 'CustomPainter.', $CustomPainter$bridge.$new,
isBridge: true)
..registerBridgeFunc('package:flutter/src/widgets/basic.dart', 'CustomPaint.', $CustomPaint$bridge.$new,
isBridge: true)
..registerBridgeFunc('package:flutter/src/widgets/framework.dart', 'StatefulWidget.', $StatefulWidget$bridge.$new,
isBridge: true)
..registerBridgeFunc('package:flutter/src/widgets/framework.dart', 'State.', $State$bridge.$new, isBridge: true)
..registerBridgeFunc('package:flutter/src/widgets/painting.dart', 'Canvas.', $Canvas.$new, isBridge: true)
..registerBridgeFunc('package:flutter/src/painting/alignment.dart', 'Alignment.', $Alignment.$new)
..registerBridgeFunc('package:flutter/src/painting/alignment.dart', 'Alignment.topLeft*g', $Alignment.$topLeft)
..registerBridgeFunc(
Expand Down Expand Up @@ -313,6 +334,8 @@ class FlutterEvalPlugin implements EvalPlugin {
'package:flutter/src/painting/basic_types.dart', 'VerticalDirection', $VerticalDirection.$values)
..registerBridgeEnumValues('package:flutter/src/painting/basic_types.dart', 'Axis', $Axis.$values)
..registerBridgeEnumValues('package:flutter/src/painting/box_fit.dart', 'BoxFit', $BoxFit.$values)
..registerBridgeEnumValues(
'package:flutter/src/widgets/focus_manager.dart', 'KeyEventResult', $KeyEventResult.$values)
..registerBridgeEnumValues('dart:ui', 'FilterQuality', $FilterQuality.$values)
..registerBridgeEnumValues('package:flutter/src/rendering/flex.dart', 'MainAxisSize', $MainAxisSize.$values)
..registerBridgeEnumValues(
Expand Down
3 changes: 3 additions & 0 deletions lib/services.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
library flutter_eval.services;

export 'src/services/raw_keyboard.dart' show $RawKeyEvent;
100 changes: 100 additions & 0 deletions lib/src/foundation/change_notifier.dart
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,103 @@ class $ChangeNotifier$bridge extends ChangeNotifier with $Bridge<ChangeNotifier>
$_invoke('removeListener', [_$listenerNativeCache[listener]!]);
}
}

class $ValueNotifier implements $Instance {
static const $type = BridgeTypeRef(
BridgeTypeSpec('package:flutter/src/foundation/change_notifier.dart', 'ValueNotifier'),
);

static const $declaration = BridgeClassDef(
BridgeClassType(
$type,
generics: {
'T': BridgeGenericParam(),
},
isAbstract: false,
),
constructors: {
'': BridgeConstructorDef(
BridgeFunctionDef(returns: BridgeTypeAnnotation($type), params: [
BridgeParameter('_value', BridgeTypeAnnotation(BridgeTypeRef.type(RuntimeTypes.dynamicType)), false),
]),
),
},
methods: {
'toString': BridgeMethodDef(
BridgeFunctionDef(
returns: BridgeTypeAnnotation(
BridgeTypeRef.type(RuntimeTypes.stringType),
),
),
),
},
getters: {
'value': BridgeMethodDef(
BridgeFunctionDef(
returns: BridgeTypeAnnotation(
BridgeTypeRef.ref('T'),
),
),
),
},
setters: {
'value': BridgeMethodDef(
BridgeFunctionDef(
returns: BridgeTypeAnnotation(
BridgeTypeRef.type(RuntimeTypes.voidType),
),
params: [
BridgeParameter(
'newValue',
BridgeTypeAnnotation(
BridgeTypeRef.ref(
'T',
),
),
false,
),
],
),
),
},
fields: {
'_value': BridgeFieldDef(
BridgeTypeAnnotation(
BridgeTypeRef.ref('T'),
),
),
},
wrap: true,
);

@override
$Value? $getProperty(Runtime runtime, String identifier) {
switch (identifier) {
case 'value':
return $Function((runtime, target, args) {
return (target!.$value as ValueNotifier).value;
});
}
throw StateError('');
}

@override
int $getRuntimeType(Runtime runtime) => runtime.lookupType($type.spec!);

@override
get $reified => $value;

@override
void $setProperty(Runtime runtime, String identifier, $Value value) {
throw UnimplementedError();
}

@override
final ValueNotifier $value;

$ValueNotifier.wrap(this.$value);

static $Value $new(Runtime runtime, $Value? target, List<$Value?> args) {
return $ValueNotifier.wrap(ValueNotifier(args[0]!.$value));
}
}
2 changes: 1 addition & 1 deletion lib/src/material/icons.dart
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ class Icons {
static const IconData home = IconData(0xe318, fontFamily: 'MaterialIcons');
static const IconData home_filled = IconData(0xe319, fontFamily: 'MaterialIcons');

static const IconData home_max = IconData(0xe31a, fontFamily: 'MaterialIcons');
static const IconData home_max = IconData(0xe31a, fontFamily: 'MaterialIcons');
static const IconData home_mini = IconData(0xe31b, fontFamily: 'MaterialIcons');
static const IconData home_repair_service = IconData(0xe31c, fontFamily: 'MaterialIcons');
static const IconData home_work = IconData(0xe31d, fontFamily: 'MaterialIcons');
Expand Down
1 change: 1 addition & 0 deletions lib/src/rendering.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ const renderingSource = '''
export 'src/rendering/box.dart';
export 'src/rendering/flex.dart';
export 'src/rendering/object.dart';
export 'src/rendering/custom_paint.dart';
''';
Loading