flutter · fluttergithubbot · Jun 1, 2021 · fluttergithubbot · Jun 1, 2021 · chunhtai
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
@@ -743,8 +743,11 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass2 {
    required double thickness,
    required Rect rect,
    required String label,
+    List<Map<String, dynamic>>? labelAttributes,
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
@@ -758,6 +761,7 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass2 {
      scrollChildren == 0 || scrollChildren == null || (scrollChildren > 0 && childrenInHitTestOrder != null),
      'If a node has scrollChildren, it must have childrenInHitTestOrder',
    );
+    print("before converted to c++ labelAttributes $labelAttributes");
diff --git a/lib/ui/semantics/semantics_update_builder.h b/lib/ui/semantics/semantics_update_builder.h
@@ -1,10 +1,13 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE file.stand
diff --git a/fml/platform/android/jni_util.cc b/fml/platform/android/jni_util.cc
+  ScopedJavaLocalRef<jclass> byte_buffer_clazz(
+      env, env->FindClass("java/nio/ByteBuffer"));
+  FML_DCHECK(!byte_buffer_clazz.is_null());
+  jobjectArray joa =
diff --git a/fml/platform/android/jni_util.cc b/fml/platform/android/jni_util.cc
+    ScopedJavaLocalRef<jobject> item(
+        env,
+        env->NewDirectByteBuffer((void*)(vector[i].data()), vector[i].size()));
+    env->SetObjectArrayElement(joa, i, item.obj());
diff --git a/lib/ui/semantics/semantics_node.h b/lib/ui/semantics/semantics_node.h
@@ -5,6 +5,7 @@
 #ifndef FLUTTER_LIB_UI_SEMANTICS_SEMANTICS_NODE_H_
 #define FLUTTER_LIB_UI_SEMANTICS_SEMANTICS_NODE_H_

+#include <any>
diff --git a/lib/ui/semantics/semantics_update_builder.h b/lib/ui/semantics/semantics_update_builder.h
@@ -43,10 +46,15 @@ class SemanticsUpdateBuilder
                  double elevation,
                  double thickness,
                  std::string label,
-                  std::string hint,
+                  std::vector<std::vector<std::any>> labelAttributes,
 // Paint objects are encoded in two buffers: 
 // 
 // * _data is binary data in four-byte fields, each of which is either a 
 //   uint32_t or a float. The default value for each field is encoded as 
 //   zero to make initialization trivial. Most values already have a default 
 //   value of zero, but some, such as color, have a non-zero default value. 
 //   To encode or decode these values, XOR the value with the default value. 
 // 
 // * _objects is a list of unencodable objects, typically wrappers for native 
 //   objects. The objects are simply stored in the list without any additional 
 //   encoding. 
 // 
 // The binary format must match the deserialization code in paint.cc. 
diff --git a/third_party/tonic/converter/dart_converter.h b/third_party/tonic/converter/dart_converter.h
@@ -415,6 +417,70 @@ struct DartConverter<std::vector<T>> {
  }
 };

+/// Json style map.
diff --git a/lib/web_ui/lib/src/ui/semantics.dart b/lib/web_ui/lib/src/ui/semantics.dart
@@ -275,6 +275,123 @@ class SemanticsFlag {
  }
 }

+class AttributedString {
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
+  final String string;
+
+  /// The attributes the [string] carries.
+  final List<StringAttribute>? attributes;
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
+enum StringAttributeType {
+  /// The string should be spell out character by character.
+  ///
+  /// The additional argument of the string attribute is null.
+  spellOut,
+  /// The string should be treated as a specific language.
+  ///
+  /// The additional argument of the string attribute is a string language tag.
+  locale,
+}
diff --git a/lib/ui/semantics/attributed_string.cc b/lib/ui/semantics/attributed_string.cc
+  auto dart_attributed_string_string_string =
+      Dart_NewStringFromCString(flutter::kAttributedStringStringFieldName);
+  auto dart_attributed_string_attributes_string =
+      Dart_NewStringFromCString(flutter::kAttributedStringAttributesFieldName);
+
+  // Gets the string from the dart_attributed_string.
+  const char* string = NULL;
+  auto dart_attributed_string_string = Dart_GetField(
+      dart_attributed_string, dart_attributed_string_string_string);
+  Dart_StringToCString(dart_attributed_string_string, &string);
+
+  // Gets the attributes from the dart_attributed_string.
+  auto dart_attributed_string_attributes = Dart_GetField(
+      dart_attributed_string, dart_attributed_string_attributes_string);
+  flutter::StringAttributes attributes =
+      DartConverter<flutter::StringAttributes>::FromDart(
+          dart_attributed_string_attributes);
+  return {.string = string, .attributes = attributes};
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
+  ///
+  /// Depends on what [type] this attribute is, it may or may not carry an
+  /// additional arguement. For which more information, see the [StringAttributeType].
+  final Object? args;
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
+class AttributedString {
+  /// Creates a attributed string.
+  ///
+  /// the [TextRange] in the [attributes] must be inside the length of the
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
+    this.attributes,
+  }) : assert((){
+        if (attributes != null) {
+          for(final StringAttribute attribute in attributes) {
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
+            attribute.range.start <= string.length && attribute.range.end <= string.length,
+            'The range of $attribute is outside of the string $string'
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
+
+  /// Creates a string that needs to be spelled out in assistive technologies.
+  ///
+  /// The [range] specifies the text range that should be spelled out. Set it
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
+  /// to null causes the assistive technologies to spell out the whole string.
+  ///
+  /// See also:
+  ///  * [SpellOutStringAttribute], which is the attribute this factory uses.
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
+//  * engine/src/flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java
+
+/// The enum that is used in [StringAttribute] class.
+enum StringAttributeType {
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
+  locale,
+}
+
+/// An abstract interface for string attribute that affects how assistive
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
+  ///
+  /// Depends on what [type] this attribute is, it may or may not carry an
+  /// additional arguement. For which more information, see the [StringAttributeType].
+  final Object? args;
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
+  final Object? args;
+
+  /// Create a new copy of this string attribute with the given range.
+  StringAttribute copyWithRange(TextRange range) {
diff --git a/lib/web_ui/lib/src/engine/semantics/semantics.dart b/lib/web_ui/lib/src/engine/semantics/semantics.dart
@@ -57,10 +57,15 @@ class SemanticsNodeUpdate {
    required this.scrollExtentMin,
    required this.rect,
    required this.label,
-    required this.hint,
+    this.labelAttributes,
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
diff --git a/lib/ui/semantics/attributed_string.cc b/lib/ui/semantics/attributed_string.cc
diff --git a/lib/ui/semantics/attributed_string.cc b/lib/ui/semantics/attributed_string.cc
diff --git a/lib/ui/semantics/attributed_string_unittests.cc b/lib/ui/semantics/attributed_string_unittests.cc
diff --git a/lib/ui/semantics/semantics_update_builder_unittests.cc b/lib/ui/semantics/semantics_update_builder_unittests.cc
diff --git a/lib/ui/semantics/string_attribute.cc b/lib/ui/semantics/string_attribute.cc
diff --git a/lib/web_ui/lib/src/engine/semantics/semantics.dart b/lib/web_ui/lib/src/engine/semantics/semantics.dart
@@ -115,18 +120,33 @@ class SemanticsNodeUpdate {
  /// See [ui.SemanticsUpdateBuilder.updateNode].
  final String label;

+  /// See [ui.SemanticsUpdateBuilder.updateNode].
	// Paint objects are encoded in two buffers:
	//
	// * _data is binary data in four-byte fields, each of which is either a
	// uint32_t or a float. The default value for each field is encoded as
	// zero to make initialization trivial. Most values already have a default
	// value of zero, but some, such as color, have a non-zero default value.
	// To encode or decode these values, XOR the value with the default value.
	//
	// * _objects is a list of unencodable objects, typically wrappers for native
	// objects. The objects are simply stored in the list without any additional
	// encoding.
	//
	// The binary format must match the deserialization code in paint.cc.
		attribute.range.start <= string.length && attribute.range.end <= string.length,
		'The range of $attribute is outside of the string $string'