Skip to content

Add Locale, TextSpan, and Text.rich() #134

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.

Sign up for GitHub

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

Open
Zverik wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Locale, TextSpan, and Text.rich() #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## 0.8.2
- Support for Flutter 3.38
- Added `Color` methods, `SafeArea` widget, and `showBottomSheet` function.
- Added `Locale`, `TextSpan`, and `Text.rich()` constructor.
- Exported multiple wrappers (thanks @Zverik)
- Fix typo in example code (thanks @chan150)

Expand Down
10 changes: 10 additions & 0 deletions lib/flutter_eval.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ import 'package:flutter_eval/src/painting/colors.dart';
import 'package:flutter_eval/src/painting/decoration.dart';
import 'package:flutter_eval/src/painting/edge_insets.dart';
import 'package:flutter_eval/src/painting/image_provider.dart';
import 'package:flutter_eval/src/painting/inline_span.dart';
import 'package:flutter_eval/src/painting/text_span.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';
Expand All @@ -67,6 +69,7 @@ import 'package:flutter_eval/src/scheduler/ticker.dart';
import 'package:flutter_eval/src/services.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/locale.dart';
import 'package:flutter_eval/src/sky_engine/ui/painting.dart';
import 'package:flutter_eval/src/sky_engine/ui/pointer.dart';
import 'package:flutter_eval/src/sky_engine/ui/text.dart';
Expand Down Expand Up @@ -250,6 +253,9 @@ class FlutterEvalPlugin implements EvalPlugin {
$KeyRepeatEvent.$declaration,
$BottomSheet.$declaration,
$SafeArea.$declaration,
$Locale.$declaration,
$InlineSpan.$declaration,
$TextSpan.$declaration,
];

for (final cls in classes) {
Expand Down Expand Up @@ -383,6 +389,8 @@ class FlutterEvalPlugin implements EvalPlugin {
$IconAlignment.configureForRuntime(runtime);
$BottomSheet.configureForRuntime(runtime);
$SafeArea.configureForRuntime(runtime);
$TextSpan.configureForRuntime(runtime);
$Locale.configureForRuntime(runtime);

$showModalBottomSheetFn.configureForRuntime(runtime);

Expand Down Expand Up @@ -546,6 +554,8 @@ class FlutterEvalPlugin implements EvalPlugin {
'package:flutter/src/widgets/spacer.dart', 'Spacer.', $Spacer.$new)
..registerBridgeFunc(
'package:flutter/src/widgets/text.dart', 'Text.', $Text.$new)
..registerBridgeFunc(
'package:flutter/src/widgets/text.dart', 'Text.rich', $Text.$rich)
..registerBridgeFunc('package:flutter/src/widgets/container.dart',
'Container.', $Container.$new)
..registerBridgeFunc('package:flutter/src/widgets/editable_text.dart',
Expand Down
2 changes: 2 additions & 0 deletions lib/painting.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ export 'src/painting/decoration.dart';
export 'src/painting/edge_insets.dart';
export 'src/painting/image_provider.dart';
export 'src/painting/text_style.dart';
export 'src/painting/inline_span.dart';
export 'src/painting/text_span.dart';
2 changes: 2 additions & 0 deletions lib/src/painting.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ export 'src/painting/decoration.dart';
export 'src/painting/edge_insets.dart';
export 'src/painting/image_provider.dart';
export 'src/painting/text_style.dart';
export 'src/painting/inline_span.dart';
export 'src/painting/text_span.dart';
''';
68 changes: 68 additions & 0 deletions lib/src/painting/inline_span.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import 'package:dart_eval/dart_eval_bridge.dart';
import 'package:dart_eval/stdlib/core.dart';
import 'package:flutter/material.dart' show InlineSpan;
import 'package:flutter_eval/painting.dart' show $TextStyle;

/// dart_eval wrapper binding for [InlineSpan]
class $InlineSpan implements $Instance {
/// Configure this class for use in a [Runtime]
static void configureForRuntime(Runtime runtime) {}

/// Compile-time type specification of [$InlineSpan]
static const $spec = BridgeTypeSpec(
'package:flutter/src/painting/inline_span.dart',
'InlineSpan',
);

/// Compile-time type declaration of [$InlineSpan]
static const $type = BridgeTypeRef($spec);

/// Compile-time class declaration of [$InlineSpan]
static const $declaration = BridgeClassDef(
BridgeClassType($type, isAbstract: true),
constructors: {
'': BridgeConstructorDef(
BridgeFunctionDef(
returns: BridgeTypeAnnotation($type),
namedParams: [
BridgeParameter(
'style',
BridgeTypeAnnotation(
$TextStyle.$type,
nullable: true,
),
true,
),
],
params: [],
),
),
},
wrap: true,
bridge: false,
);

final $Instance _superclass;

@override
final InlineSpan $value;

@override
InlineSpan get $reified => $value;

/// Wrap a [InlineSpan] in a [$InlineSpan]
$InlineSpan.wrap(this.$value) : _superclass = $Object($value);

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

@override
$Value? $getProperty(Runtime runtime, String identifier) {
return _superclass.$getProperty(runtime, identifier);
}

@override
void $setProperty(Runtime runtime, String identifier, $Value value) {
return _superclass.$setProperty(runtime, identifier, value);
}
}
136 changes: 136 additions & 0 deletions lib/src/painting/text_span.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
import 'package:dart_eval/dart_eval_bridge.dart';
import 'package:flutter/material.dart' show TextSpan;
import 'package:flutter_eval/painting.dart' show $TextStyle;
import 'package:flutter_eval/src/painting/inline_span.dart';
import 'package:flutter_eval/src/sky_engine/ui/locale.dart';

/// dart_eval wrapper binding for [TextSpan]
class $TextSpan implements $Instance {
/// Configure this class for use in a [Runtime]
static void configureForRuntime(Runtime runtime) {
runtime.registerBridgeFunc(
'package:flutter/src/painting/text_span.dart',
'TextSpan.',
$TextSpan.$new,
);
}

/// Compile-time type specification of [$TextSpan]
static const $spec = BridgeTypeSpec(
'package:flutter/src/painting/text_span.dart',
'TextSpan',
);

/// Compile-time type declaration of [$TextSpan]
static const $type = BridgeTypeRef($spec);

/// Compile-time class declaration of [$TextSpan]
static const $declaration = BridgeClassDef(
BridgeClassType($type, $extends: $InlineSpan.$type),
constructors: {
'': BridgeConstructorDef(
BridgeFunctionDef(
returns: BridgeTypeAnnotation($type),
namedParams: [
BridgeParameter(
'text',
BridgeTypeAnnotation(
BridgeTypeRef(CoreTypes.string, []),
nullable: true,
),
true,
),
BridgeParameter(
'children',
BridgeTypeAnnotation(
BridgeTypeRef(
CoreTypes.list, [BridgeTypeAnnotation($InlineSpan.$type)]),
nullable: true,
),
true,
),
BridgeParameter(
'style',
BridgeTypeAnnotation(
$TextStyle.$type,
nullable: true,
),
true,
),
BridgeParameter(
'semanticsLabel',
BridgeTypeAnnotation(
BridgeTypeRef(CoreTypes.string, []),
nullable: true,
),
true,
),
BridgeParameter(
'semanticsIdentifier',
BridgeTypeAnnotation(
BridgeTypeRef(CoreTypes.string, []),
nullable: true,
),
true,
),
BridgeParameter(
'locale',
BridgeTypeAnnotation($Locale.$type, nullable: true),
true,
),
BridgeParameter(
'spellOut',
BridgeTypeAnnotation(
BridgeTypeRef(CoreTypes.bool, []),
nullable: true
),
true,
),
],
params: [],
),
),
},
wrap: true,
bridge: false,
);

/// Wrapper for the [TextSpan.new] constructor
static $Value? $new(Runtime runtime, $Value? thisValue, List<$Value?> args) {
return $TextSpan.wrap(
TextSpan(
text: args[0]?.$value,
children: (args[1]?.$reified as List?)?.cast(),
style: args[2]?.$value,
semanticsLabel: args[3]?.$value,
semanticsIdentifier: args[4]?.$value,
locale: args[5]?.$value,
spellOut: args[6]?.$value,
),
);
}

final $Instance _superclass;

@override
final TextSpan $value;

@override
TextSpan get $reified => $value;

/// Wrap a [TextSpan] in a [$TextSpan]
$TextSpan.wrap(this.$value) : _superclass = $InlineSpan.wrap($value);

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

@override
$Value? $getProperty(Runtime runtime, String identifier) {
return _superclass.$getProperty(runtime, identifier);
}

@override
void $setProperty(Runtime runtime, String identifier, $Value value) {
return _superclass.$setProperty(runtime, identifier, value);
}
}
Loading