changed package folder structure

hetu-script · Apr 1, 2021 · 5820987 · 5820987
1 parent ff3b23f
commit 5820987
Show file tree

Hide file tree

Showing 962 changed files with 698 additions and 584 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1,7 +1,7 @@
 # Defines a default set of lint rules enforced for
 # projects at Google. For details and rationale,
 # see https://github.com/dart-lang/pedantic#enabled-lints.
-include: package:pedantic/analysis_options.yaml
+# include: package:pedantic/analysis_options.yaml
 
 # For lint rules and documentation, see http://dart-lang.github.io/linter/lints.
 # Uncomment to specify additional rules.

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:hetu_script/hetu_script.dart';
 import 'package:script_widget/script_widget.dart';
 
@@ -34,7 +33,7 @@ class MyHomePage extends StatefulWidget {
   late final Hetu interpreter;
 
   MyHomePage({Key? key, required this.title}) : super(key: key) {
-    interpreter = Hetu(moduleHandler: ScriptImportHandler());
+    interpreter = Hetu(moduleHandler: ScriptModuleHandler());
   }
 
   // This widget is the home page of your application. It is stateful, meaning
@@ -57,10 +56,11 @@ class _MyHomePageState extends State<MyHomePage> {
   bool loading = true;
 
   void load() async {
-    var binding = ManualBinding();
+    var binding = ManualBinding(widget.interpreter);
     await widget.interpreter.init();
-    binding.loadExternalClasses(widget.interpreter);
-    await binding.importScripts(widget.interpreter, 'ht-lib');
+    binding.loadExternalFunctionTypes();
+    binding.loadExternalClasses();
+    await binding.importScripts();
     setState(() {
       loading = false;
     });
@@ -90,24 +90,12 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 }
 
-class ScriptImportHandler extends HTModuleHandler {
-  final Set<String> _cachedKeys = {};
+class ManualBinding extends DefaultBindingHander {
+  ManualBinding(Hetu interpreter) : super(interpreter);
 
   @override
-  Future<HTModuleInfo> import(String key, [String? curFile]) async {
-    if (!_cachedKeys.contains(key)) {
-      var content = await rootBundle.loadString(key);
-      _cachedKeys.add(key);
-      return HTModuleInfo(key, content);
-    }
-    return HTModuleInfo(key, '', duplicate: true);
-  }
-}
-
-class ManualBinding extends Binding {
-  @override
-  void loadExternalFunctionTypes(Hetu interpreter) {
-    super.loadExternalFunctionTypes(interpreter);
+  void loadExternalFunctionTypes() {
+    super.loadExternalFunctionTypes();
 
     final functionWrappers = <String, HTExternalFunctionTypedef>{
       'ValueChangedInt': (HTFunction function) => (int data) => function.call(positionalArgs: [data]),
@@ -125,8 +113,16 @@ class ManualBinding extends Binding {
   }
 
   @override
-  void loadExternalClasses(Hetu interpreter) {
-    super.loadExternalClasses(interpreter);
+  void loadExternalClasses() {
+    super.loadExternalClasses();
     interpreter.bindExternalFunction('_rebuild', ScriptWidget.rebuild);
   }
+
+  @override
+  Future importScripts() {
+    var future = super.importScripts();
+    var futures = <Future>[];
+    futures.add(future);
+    return Future.wait(futures);
+  }
 }
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -45,30 +45,6 @@ flutter:
   # the material Icons class.
   uses-material-design: true
 
-  assets:
-    - assets/
-    - ht-lib/dart/
-    - ht-lib/dart/async/
-    - ht-lib/dart/convert/
-    - ht-lib/dart/core/
-    - ht-lib/dart/io/
-    - ht-lib/dart/ui/
-    - ht-lib/dart/math/
-    - ht-lib/flutter/
-    - ht-lib/flutter/animation/
-    - ht-lib/flutter/cupertino/
-    - ht-lib/flutter/foundation/
-    - ht-lib/flutter/gestures/
-    - ht-lib/flutter/material/
-    - ht-lib/flutter/painting/
-    - ht-lib/flutter/physics/
-    - ht-lib/flutter/rendering/
-    - ht-lib/flutter/scheduler/
-    - ht-lib/flutter/semantics/
-    - ht-lib/flutter/services/
-    - ht-lib/flutter/widgets/
-    - ht-lib/user/
-
   # To add assets to your application, add an assets section, like this:
   # assets:
   #   - images/a_dot_burr.jpeg

diff --git a/ht-lib/ht-lib/dart/async.ht → ht-bindings/dart/async.ht b/ht-lib/ht-lib/dart/async.ht → ht-bindings/dart/async.ht
diff --git a/ht-lib/ht-lib/dart/async/async_error.ht → ht-bindings/dart/async/async_error.ht b/ht-lib/ht-lib/dart/async/async_error.ht → ht-bindings/dart/async/async_error.ht
diff --git a/ht-lib/ht-lib/dart/async/deferred_load.ht → ht-bindings/dart/async/deferred_load.ht b/ht-lib/ht-lib/dart/async/deferred_load.ht → ht-bindings/dart/async/deferred_load.ht
diff --git a/ht-lib/ht-lib/dart/async/future.ht → ht-bindings/dart/async/future.ht b/ht-lib/ht-lib/dart/async/future.ht → ht-bindings/dart/async/future.ht
diff --git a/ht-lib/ht-lib/dart/async/timer.ht → ht-bindings/dart/async/timer.ht b/ht-lib/ht-lib/dart/async/timer.ht → ht-bindings/dart/async/timer.ht
diff --git a/ht-lib/ht-lib/dart/async/zone.ht → ht-bindings/dart/async/zone.ht b/ht-lib/ht-lib/dart/async/zone.ht → ht-bindings/dart/async/zone.ht
diff --git a/ht-lib/ht-lib/dart/convert.ht → ht-bindings/dart/convert.ht b/ht-lib/ht-lib/dart/convert.ht → ht-bindings/dart/convert.ht
diff --git a/ht-lib/ht-lib/dart/convert/ascii.ht → ht-bindings/dart/convert/ascii.ht b/ht-lib/ht-lib/dart/convert/ascii.ht → ht-bindings/dart/convert/ascii.ht
diff --git a/ht-lib/ht-lib/dart/convert/base64.ht → ht-bindings/dart/convert/base64.ht b/ht-lib/ht-lib/dart/convert/base64.ht → ht-bindings/dart/convert/base64.ht
diff --git a/...ib/ht-lib/dart/convert/byte_conversion.ht → ht-bindings/dart/convert/byte_conversion.ht b/...ib/ht-lib/dart/convert/byte_conversion.ht → ht-bindings/dart/convert/byte_conversion.ht
diff --git a/ht-lib/ht-lib/dart/convert/html_escape.ht → ht-bindings/dart/convert/html_escape.ht b/ht-lib/ht-lib/dart/convert/html_escape.ht → ht-bindings/dart/convert/html_escape.ht
diff --git a/ht-lib/ht-lib/dart/convert/json.ht → ht-bindings/dart/convert/json.ht b/ht-lib/ht-lib/dart/convert/json.ht → ht-bindings/dart/convert/json.ht
diff --git a/ht-lib/ht-lib/dart/convert/latin1.ht → ht-bindings/dart/convert/latin1.ht b/ht-lib/ht-lib/dart/convert/latin1.ht → ht-bindings/dart/convert/latin1.ht
diff --git a/ht-lib/ht-lib/dart/convert/line_splitter.ht → ht-bindings/dart/convert/line_splitter.ht b/ht-lib/ht-lib/dart/convert/line_splitter.ht → ht-bindings/dart/convert/line_splitter.ht
diff --git a/.../ht-lib/dart/convert/string_conversion.ht → ...indings/dart/convert/string_conversion.ht b/.../ht-lib/dart/convert/string_conversion.ht → ...indings/dart/convert/string_conversion.ht
diff --git a/ht-lib/ht-lib/dart/convert/utf.ht → ht-bindings/dart/convert/utf.ht b/ht-lib/ht-lib/dart/convert/utf.ht → ht-bindings/dart/convert/utf.ht
diff --git a/ht-lib/ht-lib/dart/core.ht → ht-bindings/dart/core.ht b/ht-lib/ht-lib/dart/core.ht → ht-bindings/dart/core.ht
diff --git a/ht-lib/ht-lib/dart/core/bigint.ht → ht-bindings/dart/core/bigint.ht b/ht-lib/ht-lib/dart/core/bigint.ht → ht-bindings/dart/core/bigint.ht
diff --git a/ht-lib/ht-lib/dart/core/date_time.ht → ht-bindings/dart/core/date_time.ht b/ht-lib/ht-lib/dart/core/date_time.ht → ht-bindings/dart/core/date_time.ht
diff --git a/ht-lib/ht-lib/dart/core/double.ht → ht-bindings/dart/core/double.ht b/ht-lib/ht-lib/dart/core/double.ht → ht-bindings/dart/core/double.ht
diff --git a/ht-lib/ht-lib/dart/core/duration.ht → ht-bindings/dart/core/duration.ht b/ht-lib/ht-lib/dart/core/duration.ht → ht-bindings/dart/core/duration.ht
diff --git a/ht-lib/ht-lib/dart/core/function.ht → ht-bindings/dart/core/function.ht b/ht-lib/ht-lib/dart/core/function.ht → ht-bindings/dart/core/function.ht
diff --git a/ht-lib/ht-lib/dart/core/int.ht → ht-bindings/dart/core/int.ht b/ht-lib/ht-lib/dart/core/int.ht → ht-bindings/dart/core/int.ht
diff --git a/ht-lib/ht-lib/dart/core/invocation.ht → ht-bindings/dart/core/invocation.ht b/ht-lib/ht-lib/dart/core/invocation.ht → ht-bindings/dart/core/invocation.ht
diff --git a/ht-lib/ht-lib/dart/core/regexp.ht → ht-bindings/dart/core/regexp.ht b/ht-lib/ht-lib/dart/core/regexp.ht → ht-bindings/dart/core/regexp.ht
diff --git a/ht-lib/ht-lib/dart/core/stacktrace.ht → ht-bindings/dart/core/stacktrace.ht b/ht-lib/ht-lib/dart/core/stacktrace.ht → ht-bindings/dart/core/stacktrace.ht
diff --git a/ht-lib/ht-lib/dart/core/stopwatch.ht → ht-bindings/dart/core/stopwatch.ht b/ht-lib/ht-lib/dart/core/stopwatch.ht → ht-bindings/dart/core/stopwatch.ht
diff --git a/ht-lib/ht-lib/dart/core/string_buffer.ht → ht-bindings/dart/core/string_buffer.ht b/ht-lib/ht-lib/dart/core/string_buffer.ht → ht-bindings/dart/core/string_buffer.ht
diff --git a/ht-lib/ht-lib/dart/core/symbol.ht → ht-bindings/dart/core/symbol.ht b/ht-lib/ht-lib/dart/core/symbol.ht → ht-bindings/dart/core/symbol.ht
diff --git a/ht-lib/ht-lib/dart/core/uri.ht → ht-bindings/dart/core/uri.ht b/ht-lib/ht-lib/dart/core/uri.ht → ht-bindings/dart/core/uri.ht
diff --git a/ht-lib/ht-lib/dart/io.ht → ht-bindings/dart/io.ht b/ht-lib/ht-lib/dart/io.ht → ht-bindings/dart/io.ht
diff --git a/ht-lib/ht-lib/dart/io/common.ht → ht-bindings/dart/io/common.ht b/ht-lib/ht-lib/dart/io/common.ht → ht-bindings/dart/io/common.ht
diff --git a/ht-lib/ht-lib/dart/io/data_transformer.ht → ht-bindings/dart/io/data_transformer.ht b/ht-lib/ht-lib/dart/io/data_transformer.ht → ht-bindings/dart/io/data_transformer.ht
diff --git a/ht-lib/ht-lib/dart/io/directory.ht → ht-bindings/dart/io/directory.ht b/ht-lib/ht-lib/dart/io/directory.ht → ht-bindings/dart/io/directory.ht
diff --git a/ht-lib/ht-lib/dart/io/file.ht → ht-bindings/dart/io/file.ht b/ht-lib/ht-lib/dart/io/file.ht → ht-bindings/dart/io/file.ht
diff --git a/ht-lib/ht-lib/dart/io/file_system_entity.ht → ht-bindings/dart/io/file_system_entity.ht b/ht-lib/ht-lib/dart/io/file_system_entity.ht → ht-bindings/dart/io/file_system_entity.ht
diff --git a/ht-lib/ht-lib/dart/io/io_sink.ht → ht-bindings/dart/io/io_sink.ht b/ht-lib/ht-lib/dart/io/io_sink.ht → ht-bindings/dart/io/io_sink.ht
diff --git a/ht-lib/ht-lib/dart/io/link.ht → ht-bindings/dart/io/link.ht b/ht-lib/ht-lib/dart/io/link.ht → ht-bindings/dart/io/link.ht
diff --git a/ht-lib/ht-lib/dart/io/overrides.ht → ht-bindings/dart/io/overrides.ht b/ht-lib/ht-lib/dart/io/overrides.ht → ht-bindings/dart/io/overrides.ht
diff --git a/ht-lib/ht-lib/dart/io/platform.ht → ht-bindings/dart/io/platform.ht b/ht-lib/ht-lib/dart/io/platform.ht → ht-bindings/dart/io/platform.ht
diff --git a/ht-lib/ht-lib/dart/io/process.ht → ht-bindings/dart/io/process.ht b/ht-lib/ht-lib/dart/io/process.ht → ht-bindings/dart/io/process.ht
diff --git a/...ib/ht-lib/dart/io/secure_server_socket.ht → ht-bindings/dart/io/secure_server_socket.ht b/...ib/ht-lib/dart/io/secure_server_socket.ht → ht-bindings/dart/io/secure_server_socket.ht
diff --git a/ht-lib/ht-lib/dart/io/secure_socket.ht → ht-bindings/dart/io/secure_socket.ht b/ht-lib/ht-lib/dart/io/secure_socket.ht → ht-bindings/dart/io/secure_socket.ht
diff --git a/ht-lib/ht-lib/dart/io/security_context.ht → ht-bindings/dart/io/security_context.ht b/ht-lib/ht-lib/dart/io/security_context.ht → ht-bindings/dart/io/security_context.ht
diff --git a/ht-lib/ht-lib/dart/io/socket.ht → ht-bindings/dart/io/socket.ht b/ht-lib/ht-lib/dart/io/socket.ht → ht-bindings/dart/io/socket.ht
diff --git a/ht-lib/ht-lib/dart/io/stdio.ht → ht-bindings/dart/io/stdio.ht b/ht-lib/ht-lib/dart/io/stdio.ht → ht-bindings/dart/io/stdio.ht
diff --git a/ht-lib/ht-lib/dart/io/string_transformer.ht → ht-bindings/dart/io/string_transformer.ht b/ht-lib/ht-lib/dart/io/string_transformer.ht → ht-bindings/dart/io/string_transformer.ht
diff --git a/ht-lib/ht-lib/dart/io/sync_socket.ht → ht-bindings/dart/io/sync_socket.ht b/ht-lib/ht-lib/dart/io/sync_socket.ht → ht-bindings/dart/io/sync_socket.ht
diff --git a/ht-lib/ht-lib/dart/math.ht → ht-bindings/dart/math.ht b/ht-lib/ht-lib/dart/math.ht → ht-bindings/dart/math.ht
diff --git a/ht-lib/ht-lib/dart/math/random.ht → ht-bindings/dart/math/random.ht b/ht-lib/ht-lib/dart/math/random.ht → ht-bindings/dart/math/random.ht
diff --git a/ht-lib/ht-lib/dart/ui.ht → ht-bindings/dart/ui.ht b/ht-lib/ht-lib/dart/ui.ht → ht-bindings/dart/ui.ht
diff --git a/ht-lib/ht-lib/dart/ui/channel_buffers.ht → ht-bindings/dart/ui/channel_buffers.ht b/ht-lib/ht-lib/dart/ui/channel_buffers.ht → ht-bindings/dart/ui/channel_buffers.ht
diff --git a/ht-lib/ht-lib/dart/ui/compositing.ht → ht-bindings/dart/ui/compositing.ht b/ht-lib/ht-lib/dart/ui/compositing.ht → ht-bindings/dart/ui/compositing.ht
diff --git a/ht-lib/ht-lib/dart/ui/geometry.ht → ht-bindings/dart/ui/geometry.ht b/ht-lib/ht-lib/dart/ui/geometry.ht → ht-bindings/dart/ui/geometry.ht
diff --git a/ht-lib/ht-lib/dart/ui/isolate_name_server.ht → ht-bindings/dart/ui/isolate_name_server.ht b/ht-lib/ht-lib/dart/ui/isolate_name_server.ht → ht-bindings/dart/ui/isolate_name_server.ht
diff --git a/ht-lib/ht-lib/dart/ui/painting.ht → ht-bindings/dart/ui/painting.ht b/ht-lib/ht-lib/dart/ui/painting.ht → ht-bindings/dart/ui/painting.ht
diff --git a/ht-lib/ht-lib/dart/ui/platform_dispatcher.ht → ht-bindings/dart/ui/platform_dispatcher.ht b/ht-lib/ht-lib/dart/ui/platform_dispatcher.ht → ht-bindings/dart/ui/platform_dispatcher.ht
diff --git a/ht-lib/ht-lib/dart/ui/plugins.ht → ht-bindings/dart/ui/plugins.ht b/ht-lib/ht-lib/dart/ui/plugins.ht → ht-bindings/dart/ui/plugins.ht
diff --git a/ht-lib/ht-lib/dart/ui/pointer.ht → ht-bindings/dart/ui/pointer.ht b/ht-lib/ht-lib/dart/ui/pointer.ht → ht-bindings/dart/ui/pointer.ht
diff --git a/ht-lib/ht-lib/dart/ui/semantics.ht → ht-bindings/dart/ui/semantics.ht b/ht-lib/ht-lib/dart/ui/semantics.ht → ht-bindings/dart/ui/semantics.ht
diff --git a/ht-lib/ht-lib/dart/ui/text.ht → ht-bindings/dart/ui/text.ht b/ht-lib/ht-lib/dart/ui/text.ht → ht-bindings/dart/ui/text.ht
diff --git a/ht-lib/ht-lib/dart/ui/window.ht → ht-bindings/dart/ui/window.ht b/ht-lib/ht-lib/dart/ui/window.ht → ht-bindings/dart/ui/window.ht
diff --git a/ht-lib/ht-lib/flutter/animation.ht → ht-bindings/flutter/animation.ht b/ht-lib/ht-lib/flutter/animation.ht → ht-bindings/flutter/animation.ht
diff --git a/ht-lib/ht-lib/flutter/animation/animation.ht → ht-bindings/flutter/animation/animation.ht b/ht-lib/ht-lib/flutter/animation/animation.ht → ht-bindings/flutter/animation/animation.ht
diff --git a/...flutter/animation/animation_controller.ht → ...flutter/animation/animation_controller.ht b/...flutter/animation/animation_controller.ht → ...flutter/animation/animation_controller.ht
diff --git a/...ib/ht-lib/flutter/animation/animations.ht → ht-bindings/flutter/animation/animations.ht b/...ib/ht-lib/flutter/animation/animations.ht → ht-bindings/flutter/animation/animations.ht
diff --git a/ht-lib/ht-lib/flutter/animation/curves.ht → ht-bindings/flutter/animation/curves.ht b/ht-lib/ht-lib/flutter/animation/curves.ht → ht-bindings/flutter/animation/curves.ht
diff --git a/ht-lib/ht-lib/flutter/animation/tween.ht → ht-bindings/flutter/animation/tween.ht b/ht-lib/ht-lib/flutter/animation/tween.ht → ht-bindings/flutter/animation/tween.ht
diff --git a/...t-lib/flutter/animation/tween_sequence.ht → ...dings/flutter/animation/tween_sequence.ht b/...t-lib/flutter/animation/tween_sequence.ht → ...dings/flutter/animation/tween_sequence.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino.ht → ht-bindings/flutter/cupertino.ht b/ht-lib/ht-lib/flutter/cupertino.ht → ht-bindings/flutter/cupertino.ht
diff --git a/.../ht-lib/flutter/cupertino/action_sheet.ht → ...indings/flutter/cupertino/action_sheet.ht b/.../ht-lib/flutter/cupertino/action_sheet.ht → ...indings/flutter/cupertino/action_sheet.ht
diff --git a/...b/flutter/cupertino/activity_indicator.ht → ...s/flutter/cupertino/activity_indicator.ht b/...b/flutter/cupertino/activity_indicator.ht → ...s/flutter/cupertino/activity_indicator.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/app.ht → ht-bindings/flutter/cupertino/app.ht b/ht-lib/ht-lib/flutter/cupertino/app.ht → ht-bindings/flutter/cupertino/app.ht
diff --git a/...t-lib/flutter/cupertino/bottom_tab_bar.ht → ...dings/flutter/cupertino/bottom_tab_bar.ht b/...t-lib/flutter/cupertino/bottom_tab_bar.ht → ...dings/flutter/cupertino/bottom_tab_bar.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/button.ht → ht-bindings/flutter/cupertino/button.ht b/ht-lib/ht-lib/flutter/cupertino/button.ht → ht-bindings/flutter/cupertino/button.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/colors.ht → ht-bindings/flutter/cupertino/colors.ht b/ht-lib/ht-lib/flutter/cupertino/colors.ht → ht-bindings/flutter/cupertino/colors.ht
diff --git a/.../ht-lib/flutter/cupertino/context_menu.ht → ...indings/flutter/cupertino/context_menu.ht b/.../ht-lib/flutter/cupertino/context_menu.ht → ...indings/flutter/cupertino/context_menu.ht
diff --git a/.../flutter/cupertino/context_menu_action.ht → .../flutter/cupertino/context_menu_action.ht b/.../flutter/cupertino/context_menu_action.ht → .../flutter/cupertino/context_menu_action.ht
diff --git a/...b/ht-lib/flutter/cupertino/date_picker.ht → ht-bindings/flutter/cupertino/date_picker.ht b/...b/ht-lib/flutter/cupertino/date_picker.ht → ht-bindings/flutter/cupertino/date_picker.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/dialog.ht → ht-bindings/flutter/cupertino/dialog.ht b/ht-lib/ht-lib/flutter/cupertino/dialog.ht → ht-bindings/flutter/cupertino/dialog.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/form_row.ht → ht-bindings/flutter/cupertino/form_row.ht b/ht-lib/ht-lib/flutter/cupertino/form_row.ht → ht-bindings/flutter/cupertino/form_row.ht
diff --git a/.../ht-lib/flutter/cupertino/form_section.ht → ...indings/flutter/cupertino/form_section.ht b/.../ht-lib/flutter/cupertino/form_section.ht → ...indings/flutter/cupertino/form_section.ht
diff --git a/...-lib/flutter/cupertino/icon_theme_data.ht → ...ings/flutter/cupertino/icon_theme_data.ht b/...-lib/flutter/cupertino/icon_theme_data.ht → ...ings/flutter/cupertino/icon_theme_data.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/icons.ht → ht-bindings/flutter/cupertino/icons.ht b/ht-lib/ht-lib/flutter/cupertino/icons.ht → ht-bindings/flutter/cupertino/icons.ht
diff --git a/...-lib/flutter/cupertino/interface_level.ht → ...ings/flutter/cupertino/interface_level.ht b/...-lib/flutter/cupertino/interface_level.ht → ...ings/flutter/cupertino/interface_level.ht
diff --git a/...ht-lib/flutter/cupertino/localizations.ht → ...ndings/flutter/cupertino/localizations.ht b/...ht-lib/flutter/cupertino/localizations.ht → ...ndings/flutter/cupertino/localizations.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/nav_bar.ht → ht-bindings/flutter/cupertino/nav_bar.ht b/ht-lib/ht-lib/flutter/cupertino/nav_bar.ht → ht-bindings/flutter/cupertino/nav_bar.ht
diff --git a/...ht-lib/flutter/cupertino/page_scaffold.ht → ...ndings/flutter/cupertino/page_scaffold.ht b/...ht-lib/flutter/cupertino/page_scaffold.ht → ...ndings/flutter/cupertino/page_scaffold.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/picker.ht → ht-bindings/flutter/cupertino/picker.ht b/ht-lib/ht-lib/flutter/cupertino/picker.ht → ht-bindings/flutter/cupertino/picker.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/refresh.ht → ht-bindings/flutter/cupertino/refresh.ht b/ht-lib/ht-lib/flutter/cupertino/refresh.ht → ht-bindings/flutter/cupertino/refresh.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/route.ht → ht-bindings/flutter/cupertino/route.ht b/ht-lib/ht-lib/flutter/cupertino/route.ht → ht-bindings/flutter/cupertino/route.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/scrollbar.ht → ht-bindings/flutter/cupertino/scrollbar.ht b/ht-lib/ht-lib/flutter/cupertino/scrollbar.ht → ht-bindings/flutter/cupertino/scrollbar.ht
diff --git a/.../ht-lib/flutter/cupertino/search_field.ht → ...indings/flutter/cupertino/search_field.ht b/.../ht-lib/flutter/cupertino/search_field.ht → ...indings/flutter/cupertino/search_field.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/slider.ht → ht-bindings/flutter/cupertino/slider.ht b/ht-lib/ht-lib/flutter/cupertino/slider.ht → ht-bindings/flutter/cupertino/slider.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/switch.ht → ht-bindings/flutter/cupertino/switch.ht b/ht-lib/ht-lib/flutter/cupertino/switch.ht → ht-bindings/flutter/cupertino/switch.ht
diff --git a/.../ht-lib/flutter/cupertino/tab_scaffold.ht → ...indings/flutter/cupertino/tab_scaffold.ht b/.../ht-lib/flutter/cupertino/tab_scaffold.ht → ...indings/flutter/cupertino/tab_scaffold.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/tab_view.ht → ht-bindings/flutter/cupertino/tab_view.ht b/ht-lib/ht-lib/flutter/cupertino/tab_view.ht → ht-bindings/flutter/cupertino/tab_view.ht
diff --git a/...ib/ht-lib/flutter/cupertino/text_field.ht → ht-bindings/flutter/cupertino/text_field.ht b/...ib/ht-lib/flutter/cupertino/text_field.ht → ht-bindings/flutter/cupertino/text_field.ht
diff --git a/.../flutter/cupertino/text_form_field_row.ht → .../flutter/cupertino/text_form_field_row.ht b/.../flutter/cupertino/text_form_field_row.ht → .../flutter/cupertino/text_form_field_row.ht
diff --git a/...t-lib/flutter/cupertino/text_selection.ht → ...dings/flutter/cupertino/text_selection.ht b/...t-lib/flutter/cupertino/text_selection.ht → ...dings/flutter/cupertino/text_selection.ht
diff --git a/...utter/cupertino/text_selection_toolbar.ht → ...utter/cupertino/text_selection_toolbar.ht b/...utter/cupertino/text_selection_toolbar.ht → ...utter/cupertino/text_selection_toolbar.ht
diff --git a/...upertino/text_selection_toolbar_button.ht → ...upertino/text_selection_toolbar_button.ht b/...upertino/text_selection_toolbar_button.ht → ...upertino/text_selection_toolbar_button.ht
diff --git a/...ib/ht-lib/flutter/cupertino/text_theme.ht → ht-bindings/flutter/cupertino/text_theme.ht b/...ib/ht-lib/flutter/cupertino/text_theme.ht → ht-bindings/flutter/cupertino/text_theme.ht
diff --git a/ht-lib/ht-lib/flutter/cupertino/theme.ht → ht-bindings/flutter/cupertino/theme.ht b/ht-lib/ht-lib/flutter/cupertino/theme.ht → ht-bindings/flutter/cupertino/theme.ht
diff --git a/...ht-lib/flutter/cupertino/thumb_painter.ht → ...ndings/flutter/cupertino/thumb_painter.ht b/...ht-lib/flutter/cupertino/thumb_painter.ht → ...ndings/flutter/cupertino/thumb_painter.ht
diff --git a/ht-lib/ht-lib/flutter/foundation.ht → ht-bindings/flutter/foundation.ht b/ht-lib/ht-lib/flutter/foundation.ht → ht-bindings/flutter/foundation.ht
diff --git a/.../ht-lib/flutter/foundation/annotations.ht → ...indings/flutter/foundation/annotations.ht b/.../ht-lib/flutter/foundation/annotations.ht → ...indings/flutter/foundation/annotations.ht
diff --git a/...b/ht-lib/flutter/foundation/assertions.ht → ht-bindings/flutter/foundation/assertions.ht b/...b/ht-lib/flutter/foundation/assertions.ht → ht-bindings/flutter/foundation/assertions.ht
diff --git a/...lib/flutter/foundation/change_notifier.ht → ...ngs/flutter/foundation/change_notifier.ht b/...lib/flutter/foundation/change_notifier.ht → ...ngs/flutter/foundation/change_notifier.ht
diff --git a/.../ht-lib/flutter/foundation/diagnostics.ht → ...indings/flutter/foundation/diagnostics.ht b/.../ht-lib/flutter/foundation/diagnostics.ht → ...indings/flutter/foundation/diagnostics.ht
diff --git a/ht-lib/ht-lib/flutter/foundation/key.ht → ht-bindings/flutter/foundation/key.ht b/ht-lib/ht-lib/flutter/foundation/key.ht → ht-bindings/flutter/foundation/key.ht
diff --git a/ht-lib/ht-lib/flutter/foundation/licenses.ht → ht-bindings/flutter/foundation/licenses.ht b/ht-lib/ht-lib/flutter/foundation/licenses.ht → ht-bindings/flutter/foundation/licenses.ht
diff --git a/ht-lib/ht-lib/flutter/foundation/node.ht → ht-bindings/flutter/foundation/node.ht b/ht-lib/ht-lib/flutter/foundation/node.ht → ht-bindings/flutter/foundation/node.ht
diff --git a/ht-lib/ht-lib/flutter/foundation/platform.ht → ht-bindings/flutter/foundation/platform.ht b/ht-lib/ht-lib/flutter/foundation/platform.ht → ht-bindings/flutter/foundation/platform.ht
diff --git a/...t-lib/flutter/foundation/serialization.ht → ...dings/flutter/foundation/serialization.ht b/...t-lib/flutter/foundation/serialization.ht → ...dings/flutter/foundation/serialization.ht
diff --git a/.../ht-lib/flutter/foundation/stack_frame.ht → ...indings/flutter/foundation/stack_frame.ht b/.../ht-lib/flutter/foundation/stack_frame.ht → ...indings/flutter/foundation/stack_frame.ht
diff --git a/ht-lib/ht-lib/flutter/foundation/unicode.ht → ht-bindings/flutter/foundation/unicode.ht b/ht-lib/ht-lib/flutter/foundation/unicode.ht → ht-bindings/flutter/foundation/unicode.ht
diff --git a/ht-lib/ht-lib/flutter/gestures.ht → ht-bindings/flutter/gestures.ht b/ht-lib/ht-lib/flutter/gestures.ht → ht-bindings/flutter/gestures.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/arena.ht → ht-bindings/flutter/gestures/arena.ht b/ht-lib/ht-lib/flutter/gestures/arena.ht → ht-bindings/flutter/gestures/arena.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/binding.ht → ht-bindings/flutter/gestures/binding.ht b/ht-lib/ht-lib/flutter/gestures/binding.ht → ht-bindings/flutter/gestures/binding.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/converter.ht → ht-bindings/flutter/gestures/converter.ht b/ht-lib/ht-lib/flutter/gestures/converter.ht → ht-bindings/flutter/gestures/converter.ht
diff --git a/...b/ht-lib/flutter/gestures/drag_details.ht → ht-bindings/flutter/gestures/drag_details.ht b/...b/ht-lib/flutter/gestures/drag_details.ht → ht-bindings/flutter/gestures/drag_details.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/eager.ht → ht-bindings/flutter/gestures/eager.ht b/ht-lib/ht-lib/flutter/gestures/eager.ht → ht-bindings/flutter/gestures/eager.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/events.ht → ht-bindings/flutter/gestures/events.ht b/ht-lib/ht-lib/flutter/gestures/events.ht → ht-bindings/flutter/gestures/events.ht
diff --git a/...ib/ht-lib/flutter/gestures/force_press.ht → ht-bindings/flutter/gestures/force_press.ht b/...ib/ht-lib/flutter/gestures/force_press.ht → ht-bindings/flutter/gestures/force_press.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/hit_test.ht → ht-bindings/flutter/gestures/hit_test.ht b/ht-lib/ht-lib/flutter/gestures/hit_test.ht → ht-bindings/flutter/gestures/hit_test.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/long_press.ht → ht-bindings/flutter/gestures/long_press.ht b/ht-lib/ht-lib/flutter/gestures/long_press.ht → ht-bindings/flutter/gestures/long_press.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/lsq_solver.ht → ht-bindings/flutter/gestures/lsq_solver.ht b/ht-lib/ht-lib/flutter/gestures/lsq_solver.ht → ht-bindings/flutter/gestures/lsq_solver.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/monodrag.ht → ht-bindings/flutter/gestures/monodrag.ht b/ht-lib/ht-lib/flutter/gestures/monodrag.ht → ht-bindings/flutter/gestures/monodrag.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/multidrag.ht → ht-bindings/flutter/gestures/multidrag.ht b/ht-lib/ht-lib/flutter/gestures/multidrag.ht → ht-bindings/flutter/gestures/multidrag.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/multitap.ht → ht-bindings/flutter/gestures/multitap.ht b/ht-lib/ht-lib/flutter/gestures/multitap.ht → ht-bindings/flutter/gestures/multitap.ht
diff --git a/...ht-lib/flutter/gestures/pointer_router.ht → ...ndings/flutter/gestures/pointer_router.ht b/...ht-lib/flutter/gestures/pointer_router.ht → ...ndings/flutter/gestures/pointer_router.ht
diff --git a/...utter/gestures/pointer_signal_resolver.ht → ...utter/gestures/pointer_signal_resolver.ht b/...utter/gestures/pointer_signal_resolver.ht → ...utter/gestures/pointer_signal_resolver.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/recognizer.ht → ht-bindings/flutter/gestures/recognizer.ht b/ht-lib/ht-lib/flutter/gestures/recognizer.ht → ht-bindings/flutter/gestures/recognizer.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/resampler.ht → ht-bindings/flutter/gestures/resampler.ht b/ht-lib/ht-lib/flutter/gestures/resampler.ht → ht-bindings/flutter/gestures/resampler.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/scale.ht → ht-bindings/flutter/gestures/scale.ht b/ht-lib/ht-lib/flutter/gestures/scale.ht → ht-bindings/flutter/gestures/scale.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/tap.ht → ht-bindings/flutter/gestures/tap.ht b/ht-lib/ht-lib/flutter/gestures/tap.ht → ht-bindings/flutter/gestures/tap.ht
diff --git a/ht-lib/ht-lib/flutter/gestures/team.ht → ht-bindings/flutter/gestures/team.ht b/ht-lib/ht-lib/flutter/gestures/team.ht → ht-bindings/flutter/gestures/team.ht
diff --git a/...-lib/flutter/gestures/velocity_tracker.ht → ...ings/flutter/gestures/velocity_tracker.ht b/...-lib/flutter/gestures/velocity_tracker.ht → ...ings/flutter/gestures/velocity_tracker.ht
diff --git a/ht-lib/ht-lib/flutter/material.ht → ht-bindings/flutter/material.ht b/ht-lib/ht-lib/flutter/material.ht → ht-bindings/flutter/material.ht
diff --git a/ht-lib/ht-lib/flutter/material/about.ht → ht-bindings/flutter/material/about.ht b/ht-lib/ht-lib/flutter/material/about.ht → ht-bindings/flutter/material/about.ht
diff --git a/...ht-lib/flutter/material/animated_icons.ht → ...ndings/flutter/material/animated_icons.ht b/...ht-lib/flutter/material/animated_icons.ht → ...ndings/flutter/material/animated_icons.ht
diff --git a/...b/flutter/material/animated_icons_data.ht → ...s/flutter/material/animated_icons_data.ht b/...b/flutter/material/animated_icons_data.ht → ...s/flutter/material/animated_icons_data.ht
diff --git a/ht-lib/ht-lib/flutter/material/app.ht → ht-bindings/flutter/material/app.ht b/ht-lib/ht-lib/flutter/material/app.ht → ht-bindings/flutter/material/app.ht
diff --git a/ht-lib/ht-lib/flutter/material/app_bar.ht → ht-bindings/flutter/material/app_bar.ht b/ht-lib/ht-lib/flutter/material/app_bar.ht → ht-bindings/flutter/material/app_bar.ht
diff --git a/.../ht-lib/flutter/material/app_bar_theme.ht → ...indings/flutter/material/app_bar_theme.ht b/.../ht-lib/flutter/material/app_bar_theme.ht → ...indings/flutter/material/app_bar_theme.ht
diff --git a/ht-lib/ht-lib/flutter/material/arc.ht → ht-bindings/flutter/material/arc.ht b/ht-lib/ht-lib/flutter/material/arc.ht → ht-bindings/flutter/material/arc.ht
diff --git a/...ib/ht-lib/flutter/material/back_button.ht → ht-bindings/flutter/material/back_button.ht b/...ib/ht-lib/flutter/material/back_button.ht → ht-bindings/flutter/material/back_button.ht
diff --git a/ht-lib/ht-lib/flutter/material/banner.ht → ht-bindings/flutter/material/banner.ht b/ht-lib/ht-lib/flutter/material/banner.ht → ht-bindings/flutter/material/banner.ht
diff --git a/...b/ht-lib/flutter/material/banner_theme.ht → ht-bindings/flutter/material/banner_theme.ht b/...b/ht-lib/flutter/material/banner_theme.ht → ht-bindings/flutter/material/banner_theme.ht
diff --git a/...ht-lib/flutter/material/bottom_app_bar.ht → ...ndings/flutter/material/bottom_app_bar.ht b/...ht-lib/flutter/material/bottom_app_bar.ht → ...ndings/flutter/material/bottom_app_bar.ht
diff --git a/.../flutter/material/bottom_app_bar_theme.ht → .../flutter/material/bottom_app_bar_theme.ht b/.../flutter/material/bottom_app_bar_theme.ht → .../flutter/material/bottom_app_bar_theme.ht
diff --git a/...flutter/material/bottom_navigation_bar.ht → ...flutter/material/bottom_navigation_bar.ht b/...flutter/material/bottom_navigation_bar.ht → ...flutter/material/bottom_navigation_bar.ht
diff --git a/...r/material/bottom_navigation_bar_theme.ht → ...r/material/bottom_navigation_bar_theme.ht b/...r/material/bottom_navigation_bar_theme.ht → ...r/material/bottom_navigation_bar_theme.ht
diff --git a/...b/ht-lib/flutter/material/bottom_sheet.ht → ht-bindings/flutter/material/bottom_sheet.ht b/...b/ht-lib/flutter/material/bottom_sheet.ht → ht-bindings/flutter/material/bottom_sheet.ht
diff --git a/...ib/flutter/material/bottom_sheet_theme.ht → ...gs/flutter/material/bottom_sheet_theme.ht b/...ib/flutter/material/bottom_sheet_theme.ht → ...gs/flutter/material/bottom_sheet_theme.ht
diff --git a/ht-lib/ht-lib/flutter/material/button.ht → ht-bindings/flutter/material/button.ht b/ht-lib/ht-lib/flutter/material/button.ht → ht-bindings/flutter/material/button.ht
diff --git a/ht-lib/ht-lib/flutter/material/button_bar.ht → ht-bindings/flutter/material/button_bar.ht b/ht-lib/ht-lib/flutter/material/button_bar.ht → ht-bindings/flutter/material/button_bar.ht
diff --git a/...-lib/flutter/material/button_bar_theme.ht → ...ings/flutter/material/button_bar_theme.ht b/...-lib/flutter/material/button_bar_theme.ht → ...ings/flutter/material/button_bar_theme.ht
diff --git a/...b/ht-lib/flutter/material/button_style.ht → ht-bindings/flutter/material/button_style.ht b/...b/ht-lib/flutter/material/button_style.ht → ht-bindings/flutter/material/button_style.ht
diff --git a/...b/ht-lib/flutter/material/button_theme.ht → ht-bindings/flutter/material/button_theme.ht b/...b/ht-lib/flutter/material/button_theme.ht → ht-bindings/flutter/material/button_theme.ht
diff --git a/.../flutter/material/calendar_date_picker.ht → .../flutter/material/calendar_date_picker.ht b/.../flutter/material/calendar_date_picker.ht → .../flutter/material/calendar_date_picker.ht
diff --git a/ht-lib/ht-lib/flutter/material/card.ht → ht-bindings/flutter/material/card.ht b/ht-lib/ht-lib/flutter/material/card.ht → ht-bindings/flutter/material/card.ht
diff --git a/ht-lib/ht-lib/flutter/material/card_theme.ht → ht-bindings/flutter/material/card_theme.ht b/ht-lib/ht-lib/flutter/material/card_theme.ht → ht-bindings/flutter/material/card_theme.ht
diff --git a/ht-lib/ht-lib/flutter/material/checkbox.ht → ht-bindings/flutter/material/checkbox.ht b/ht-lib/ht-lib/flutter/material/checkbox.ht → ht-bindings/flutter/material/checkbox.ht
diff --git a/...ib/flutter/material/checkbox_list_tile.ht → ...gs/flutter/material/checkbox_list_tile.ht b/...ib/flutter/material/checkbox_list_tile.ht → ...gs/flutter/material/checkbox_list_tile.ht
diff --git a/...ht-lib/flutter/material/checkbox_theme.ht → ...ndings/flutter/material/checkbox_theme.ht b/...ht-lib/flutter/material/checkbox_theme.ht → ...ndings/flutter/material/checkbox_theme.ht
diff --git a/ht-lib/ht-lib/flutter/material/chip.ht → ht-bindings/flutter/material/chip.ht b/ht-lib/ht-lib/flutter/material/chip.ht → ht-bindings/flutter/material/chip.ht
diff --git a/ht-lib/ht-lib/flutter/material/chip_theme.ht → ht-bindings/flutter/material/chip_theme.ht b/ht-lib/ht-lib/flutter/material/chip_theme.ht → ht-bindings/flutter/material/chip_theme.ht
diff --git a/.../ht-lib/flutter/material/circle_avatar.ht → ...indings/flutter/material/circle_avatar.ht b/.../ht-lib/flutter/material/circle_avatar.ht → ...indings/flutter/material/circle_avatar.ht
diff --git a/...b/ht-lib/flutter/material/color_scheme.ht → ht-bindings/flutter/material/color_scheme.ht b/...b/ht-lib/flutter/material/color_scheme.ht → ht-bindings/flutter/material/color_scheme.ht
diff --git a/ht-lib/ht-lib/flutter/material/colors.ht → ht-bindings/flutter/material/colors.ht b/ht-lib/ht-lib/flutter/material/colors.ht → ht-bindings/flutter/material/colors.ht
diff --git a/ht-lib/ht-lib/flutter/material/data_table.ht → ht-bindings/flutter/material/data_table.ht b/ht-lib/ht-lib/flutter/material/data_table.ht → ht-bindings/flutter/material/data_table.ht
diff --git a/...-lib/flutter/material/data_table_theme.ht → ...ings/flutter/material/data_table_theme.ht b/...-lib/flutter/material/data_table_theme.ht → ...ings/flutter/material/data_table_theme.ht
diff --git a/ht-lib/ht-lib/flutter/material/date.ht → ht-bindings/flutter/material/date.ht b/ht-lib/ht-lib/flutter/material/date.ht → ht-bindings/flutter/material/date.ht
diff --git a/...lutter/material/date_picker_deprecated.ht → ...lutter/material/date_picker_deprecated.ht b/...lutter/material/date_picker_deprecated.ht → ...lutter/material/date_picker_deprecated.ht
diff --git a/ht-lib/ht-lib/flutter/material/dialog.ht → ht-bindings/flutter/material/dialog.ht b/ht-lib/ht-lib/flutter/material/dialog.ht → ht-bindings/flutter/material/dialog.ht
diff --git a/...b/ht-lib/flutter/material/dialog_theme.ht → ht-bindings/flutter/material/dialog_theme.ht b/...b/ht-lib/flutter/material/dialog_theme.ht → ht-bindings/flutter/material/dialog_theme.ht
diff --git a/ht-lib/ht-lib/flutter/material/divider.ht → ht-bindings/flutter/material/divider.ht b/ht-lib/ht-lib/flutter/material/divider.ht → ht-bindings/flutter/material/divider.ht
diff --git a/.../ht-lib/flutter/material/divider_theme.ht → ...indings/flutter/material/divider_theme.ht b/.../ht-lib/flutter/material/divider_theme.ht → ...indings/flutter/material/divider_theme.ht
diff --git a/ht-lib/ht-lib/flutter/material/drawer.ht → ht-bindings/flutter/material/drawer.ht b/ht-lib/ht-lib/flutter/material/drawer.ht → ht-bindings/flutter/material/drawer.ht
diff --git a/.../ht-lib/flutter/material/drawer_header.ht → ...indings/flutter/material/drawer_header.ht b/.../ht-lib/flutter/material/drawer_header.ht → ...indings/flutter/material/drawer_header.ht
diff --git a/ht-lib/ht-lib/flutter/material/dropdown.ht → ht-bindings/flutter/material/dropdown.ht b/ht-lib/ht-lib/flutter/material/dropdown.ht → ht-bindings/flutter/material/dropdown.ht
diff --git a/...t-lib/flutter/material/elevated_button.ht → ...dings/flutter/material/elevated_button.ht b/...t-lib/flutter/material/elevated_button.ht → ...dings/flutter/material/elevated_button.ht
diff --git a/...flutter/material/elevated_button_theme.ht → ...flutter/material/elevated_button_theme.ht b/...flutter/material/elevated_button_theme.ht → ...flutter/material/elevated_button_theme.ht
diff --git a/...lib/flutter/material/elevation_overlay.ht → ...ngs/flutter/material/elevation_overlay.ht b/...lib/flutter/material/elevation_overlay.ht → ...ngs/flutter/material/elevation_overlay.ht
diff --git a/...ib/ht-lib/flutter/material/expand_icon.ht → ht-bindings/flutter/material/expand_icon.ht b/...ib/ht-lib/flutter/material/expand_icon.ht → ht-bindings/flutter/material/expand_icon.ht
diff --git a/...t-lib/flutter/material/expansion_panel.ht → ...dings/flutter/material/expansion_panel.ht b/...t-lib/flutter/material/expansion_panel.ht → ...dings/flutter/material/expansion_panel.ht
diff --git a/...ht-lib/flutter/material/expansion_tile.ht → ...ndings/flutter/material/expansion_tile.ht b/...ht-lib/flutter/material/expansion_tile.ht → ...ndings/flutter/material/expansion_tile.ht
diff --git a/ht-lib/ht-lib/flutter/material/feedback.ht → ht-bindings/flutter/material/feedback.ht b/ht-lib/ht-lib/flutter/material/feedback.ht → ht-bindings/flutter/material/feedback.ht
diff --git a/...ib/ht-lib/flutter/material/flat_button.ht → ht-bindings/flutter/material/flat_button.ht b/...ib/ht-lib/flutter/material/flat_button.ht → ht-bindings/flutter/material/flat_button.ht
diff --git a/...ib/flutter/material/flexible_space_bar.ht → ...gs/flutter/material/flexible_space_bar.ht b/...ib/flutter/material/flexible_space_bar.ht → ...gs/flutter/material/flexible_space_bar.ht
diff --git a/...lutter/material/floating_action_button.ht → ...lutter/material/floating_action_button.ht b/...lutter/material/floating_action_button.ht → ...lutter/material/floating_action_button.ht
diff --git a/.../material/floating_action_button_theme.ht → .../material/floating_action_button_theme.ht b/.../material/floating_action_button_theme.ht → .../material/floating_action_button_theme.ht
diff --git a/...b/ht-lib/flutter/material/flutter_logo.ht → ht-bindings/flutter/material/flutter_logo.ht b/...b/ht-lib/flutter/material/flutter_logo.ht → ht-bindings/flutter/material/flutter_logo.ht
diff --git a/ht-lib/ht-lib/flutter/material/grid_tile.ht → ht-bindings/flutter/material/grid_tile.ht b/ht-lib/ht-lib/flutter/material/grid_tile.ht → ht-bindings/flutter/material/grid_tile.ht
diff --git a/.../ht-lib/flutter/material/grid_tile_bar.ht → ...indings/flutter/material/grid_tile_bar.ht b/.../ht-lib/flutter/material/grid_tile_bar.ht → ...indings/flutter/material/grid_tile_bar.ht
diff --git a/...ib/ht-lib/flutter/material/icon_button.ht → ht-bindings/flutter/material/icon_button.ht b/...ib/ht-lib/flutter/material/icon_button.ht → ht-bindings/flutter/material/icon_button.ht
diff --git a/ht-lib/ht-lib/flutter/material/icons.ht → ht-bindings/flutter/material/icons.ht b/ht-lib/ht-lib/flutter/material/icons.ht → ht-bindings/flutter/material/icons.ht
diff --git a/...ht-lib/flutter/material/ink_decoration.ht → ...ndings/flutter/material/ink_decoration.ht b/...ht-lib/flutter/material/ink_decoration.ht → ...ndings/flutter/material/ink_decoration.ht
diff --git a/.../ht-lib/flutter/material/ink_highlight.ht → ...indings/flutter/material/ink_highlight.ht b/.../ht-lib/flutter/material/ink_highlight.ht → ...indings/flutter/material/ink_highlight.ht
diff --git a/ht-lib/ht-lib/flutter/material/ink_ripple.ht → ht-bindings/flutter/material/ink_ripple.ht b/ht-lib/ht-lib/flutter/material/ink_ripple.ht → ht-bindings/flutter/material/ink_ripple.ht
diff --git a/ht-lib/ht-lib/flutter/material/ink_splash.ht → ht-bindings/flutter/material/ink_splash.ht b/ht-lib/ht-lib/flutter/material/ink_splash.ht → ht-bindings/flutter/material/ink_splash.ht
diff --git a/ht-lib/ht-lib/flutter/material/ink_well.ht → ht-bindings/flutter/material/ink_well.ht b/ht-lib/ht-lib/flutter/material/ink_well.ht → ht-bindings/flutter/material/ink_well.ht
diff --git a/...b/ht-lib/flutter/material/input_border.ht → ht-bindings/flutter/material/input_border.ht b/...b/ht-lib/flutter/material/input_border.ht → ht-bindings/flutter/material/input_border.ht
diff --git a/.../material/input_date_picker_form_field.ht → .../material/input_date_picker_form_field.ht b/.../material/input_date_picker_form_field.ht → .../material/input_date_picker_form_field.ht
diff --git a/...t-lib/flutter/material/input_decorator.ht → ...dings/flutter/material/input_decorator.ht b/...t-lib/flutter/material/input_decorator.ht → ...dings/flutter/material/input_decorator.ht
diff --git a/ht-lib/ht-lib/flutter/material/list_tile.ht → ht-bindings/flutter/material/list_tile.ht b/ht-lib/ht-lib/flutter/material/list_tile.ht → ht-bindings/flutter/material/list_tile.ht
diff --git a/ht-lib/ht-lib/flutter/material/material.ht → ht-bindings/flutter/material/material.ht b/ht-lib/ht-lib/flutter/material/material.ht → ht-bindings/flutter/material/material.ht
diff --git a/...t-lib/flutter/material/material_button.ht → ...dings/flutter/material/material_button.ht b/...t-lib/flutter/material/material_button.ht → ...dings/flutter/material/material_button.ht
diff --git a/...lutter/material/material_localizations.ht → ...lutter/material/material_localizations.ht b/...lutter/material/material_localizations.ht → ...lutter/material/material_localizations.ht
diff --git a/...ht-lib/flutter/material/material_state.ht → ...ndings/flutter/material/material_state.ht b/...ht-lib/flutter/material/material_state.ht → ...ndings/flutter/material/material_state.ht
diff --git a/...ib/flutter/material/mergeable_material.ht → ...gs/flutter/material/mergeable_material.ht b/...ib/flutter/material/mergeable_material.ht → ...gs/flutter/material/mergeable_material.ht
diff --git a/...t-lib/flutter/material/navigation_rail.ht → ...dings/flutter/material/navigation_rail.ht b/...t-lib/flutter/material/navigation_rail.ht → ...dings/flutter/material/navigation_rail.ht
diff --git a/...flutter/material/navigation_rail_theme.ht → ...flutter/material/navigation_rail_theme.ht b/...flutter/material/navigation_rail_theme.ht → ...flutter/material/navigation_rail_theme.ht
diff --git a/...ht-lib/flutter/material/outline_button.ht → ...ndings/flutter/material/outline_button.ht b/...ht-lib/flutter/material/outline_button.ht → ...ndings/flutter/material/outline_button.ht
diff --git a/...t-lib/flutter/material/outlined_button.ht → ...dings/flutter/material/outlined_button.ht b/...t-lib/flutter/material/outlined_button.ht → ...dings/flutter/material/outlined_button.ht
diff --git a/...flutter/material/outlined_button_theme.ht → ...flutter/material/outlined_button_theme.ht b/...flutter/material/outlined_button_theme.ht → ...flutter/material/outlined_button_theme.ht
diff --git a/...lutter/material/page_transitions_theme.ht → ...lutter/material/page_transitions_theme.ht b/...lutter/material/page_transitions_theme.ht → ...lutter/material/page_transitions_theme.ht
diff --git a/.../flutter/material/paginated_data_table.ht → .../flutter/material/paginated_data_table.ht b/.../flutter/material/paginated_data_table.ht → .../flutter/material/paginated_data_table.ht
diff --git a/ht-lib/ht-lib/flutter/material/popup_menu.ht → ht-bindings/flutter/material/popup_menu.ht b/ht-lib/ht-lib/flutter/material/popup_menu.ht → ht-bindings/flutter/material/popup_menu.ht
diff --git a/...-lib/flutter/material/popup_menu_theme.ht → ...ings/flutter/material/popup_menu_theme.ht b/...-lib/flutter/material/popup_menu_theme.ht → ...ings/flutter/material/popup_menu_theme.ht
diff --git a/...ib/flutter/material/progress_indicator.ht → ...gs/flutter/material/progress_indicator.ht b/...ib/flutter/material/progress_indicator.ht → ...gs/flutter/material/progress_indicator.ht
diff --git a/...ib/ht-lib/flutter/material/radio_theme.ht → ht-bindings/flutter/material/radio_theme.ht b/...ib/ht-lib/flutter/material/radio_theme.ht → ht-bindings/flutter/material/radio_theme.ht
diff --git a/.../ht-lib/flutter/material/raised_button.ht → ...indings/flutter/material/raised_button.ht b/.../ht-lib/flutter/material/raised_button.ht → ...indings/flutter/material/raised_button.ht
diff --git a/...b/ht-lib/flutter/material/range_slider.ht → ht-bindings/flutter/material/range_slider.ht b/...b/ht-lib/flutter/material/range_slider.ht → ht-bindings/flutter/material/range_slider.ht
diff --git a/...lib/flutter/material/refresh_indicator.ht → ...ngs/flutter/material/refresh_indicator.ht b/...lib/flutter/material/refresh_indicator.ht → ...ngs/flutter/material/refresh_indicator.ht
diff --git a/...-lib/flutter/material/reorderable_list.ht → ...ings/flutter/material/reorderable_list.ht b/...-lib/flutter/material/reorderable_list.ht → ...ings/flutter/material/reorderable_list.ht
diff --git a/ht-lib/ht-lib/flutter/material/scaffold.ht → ht-bindings/flutter/material/scaffold.ht b/ht-lib/ht-lib/flutter/material/scaffold.ht → ht-bindings/flutter/material/scaffold.ht
diff --git a/ht-lib/ht-lib/flutter/material/scrollbar.ht → ht-bindings/flutter/material/scrollbar.ht b/ht-lib/ht-lib/flutter/material/scrollbar.ht → ht-bindings/flutter/material/scrollbar.ht
diff --git a/...t-lib/flutter/material/scrollbar_theme.ht → ...dings/flutter/material/scrollbar_theme.ht b/...t-lib/flutter/material/scrollbar_theme.ht → ...dings/flutter/material/scrollbar_theme.ht
diff --git a/...t-lib/flutter/material/selectable_text.ht → ...dings/flutter/material/selectable_text.ht b/...t-lib/flutter/material/selectable_text.ht → ...dings/flutter/material/selectable_text.ht
diff --git a/ht-lib/ht-lib/flutter/material/slider.ht → ht-bindings/flutter/material/slider.ht b/ht-lib/ht-lib/flutter/material/slider.ht → ht-bindings/flutter/material/slider.ht
diff --git a/...b/ht-lib/flutter/material/slider_theme.ht → ht-bindings/flutter/material/slider_theme.ht b/...b/ht-lib/flutter/material/slider_theme.ht → ht-bindings/flutter/material/slider_theme.ht
diff --git a/ht-lib/ht-lib/flutter/material/snack_bar.ht → ht-bindings/flutter/material/snack_bar.ht b/ht-lib/ht-lib/flutter/material/snack_bar.ht → ht-bindings/flutter/material/snack_bar.ht
diff --git a/...t-lib/flutter/material/snack_bar_theme.ht → ...dings/flutter/material/snack_bar_theme.ht b/...t-lib/flutter/material/snack_bar_theme.ht → ...dings/flutter/material/snack_bar_theme.ht
diff --git a/ht-lib/ht-lib/flutter/material/stepper.ht → ht-bindings/flutter/material/stepper.ht b/ht-lib/ht-lib/flutter/material/stepper.ht → ht-bindings/flutter/material/stepper.ht
diff --git a/ht-lib/ht-lib/flutter/material/switch.ht → ht-bindings/flutter/material/switch.ht b/ht-lib/ht-lib/flutter/material/switch.ht → ht-bindings/flutter/material/switch.ht
diff --git a/...-lib/flutter/material/switch_list_tile.ht → ...ings/flutter/material/switch_list_tile.ht b/...-lib/flutter/material/switch_list_tile.ht → ...ings/flutter/material/switch_list_tile.ht
diff --git a/...b/ht-lib/flutter/material/switch_theme.ht → ht-bindings/flutter/material/switch_theme.ht b/...b/ht-lib/flutter/material/switch_theme.ht → ht-bindings/flutter/material/switch_theme.ht
diff --git a/.../ht-lib/flutter/material/tab_bar_theme.ht → ...indings/flutter/material/tab_bar_theme.ht b/.../ht-lib/flutter/material/tab_bar_theme.ht → ...indings/flutter/material/tab_bar_theme.ht
diff --git a/...ht-lib/flutter/material/tab_controller.ht → ...ndings/flutter/material/tab_controller.ht b/...ht-lib/flutter/material/tab_controller.ht → ...ndings/flutter/material/tab_controller.ht
diff --git a/.../ht-lib/flutter/material/tab_indicator.ht → ...indings/flutter/material/tab_indicator.ht b/.../ht-lib/flutter/material/tab_indicator.ht → ...indings/flutter/material/tab_indicator.ht
diff --git a/ht-lib/ht-lib/flutter/material/tabs.ht → ht-bindings/flutter/material/tabs.ht b/ht-lib/ht-lib/flutter/material/tabs.ht → ht-bindings/flutter/material/tabs.ht
diff --git a/...ib/ht-lib/flutter/material/text_button.ht → ht-bindings/flutter/material/text_button.ht b/...ib/ht-lib/flutter/material/text_button.ht → ht-bindings/flutter/material/text_button.ht
diff --git a/...lib/flutter/material/text_button_theme.ht → ...ngs/flutter/material/text_button_theme.ht b/...lib/flutter/material/text_button_theme.ht → ...ngs/flutter/material/text_button_theme.ht
diff --git a/ht-lib/ht-lib/flutter/material/text_field.ht → ht-bindings/flutter/material/text_field.ht b/ht-lib/ht-lib/flutter/material/text_field.ht → ht-bindings/flutter/material/text_field.ht
diff --git a/...t-lib/flutter/material/text_form_field.ht → ...dings/flutter/material/text_form_field.ht b/...t-lib/flutter/material/text_form_field.ht → ...dings/flutter/material/text_form_field.ht
diff --git a/...ht-lib/flutter/material/text_selection.ht → ...ndings/flutter/material/text_selection.ht b/...ht-lib/flutter/material/text_selection.ht → ...ndings/flutter/material/text_selection.ht
diff --git a/.../flutter/material/text_selection_theme.ht → .../flutter/material/text_selection_theme.ht b/.../flutter/material/text_selection_theme.ht → .../flutter/material/text_selection_theme.ht
diff --git a/...lutter/material/text_selection_toolbar.ht → ...lutter/material/text_selection_toolbar.ht b/...lutter/material/text_selection_toolbar.ht → ...lutter/material/text_selection_toolbar.ht
diff --git a/...ial/text_selection_toolbar_text_button.ht → ...ial/text_selection_toolbar_text_button.ht b/...ial/text_selection_toolbar_text_button.ht → ...ial/text_selection_toolbar_text_button.ht
diff --git a/ht-lib/ht-lib/flutter/material/text_theme.ht → ht-bindings/flutter/material/text_theme.ht b/ht-lib/ht-lib/flutter/material/text_theme.ht → ht-bindings/flutter/material/text_theme.ht
diff --git a/ht-lib/ht-lib/flutter/material/theme.ht → ht-bindings/flutter/material/theme.ht b/ht-lib/ht-lib/flutter/material/theme.ht → ht-bindings/flutter/material/theme.ht
diff --git a/ht-lib/ht-lib/flutter/material/theme_data.ht → ht-bindings/flutter/material/theme_data.ht b/ht-lib/ht-lib/flutter/material/theme_data.ht → ht-bindings/flutter/material/theme_data.ht
diff --git a/ht-lib/ht-lib/flutter/material/time.ht → ht-bindings/flutter/material/time.ht b/ht-lib/ht-lib/flutter/material/time.ht → ht-bindings/flutter/material/time.ht
diff --git a/...ib/ht-lib/flutter/material/time_picker.ht → ht-bindings/flutter/material/time_picker.ht b/...ib/ht-lib/flutter/material/time_picker.ht → ht-bindings/flutter/material/time_picker.ht
diff --git a/...lib/flutter/material/time_picker_theme.ht → ...ngs/flutter/material/time_picker_theme.ht b/...lib/flutter/material/time_picker_theme.ht → ...ngs/flutter/material/time_picker_theme.ht
diff --git a/...ht-lib/flutter/material/toggle_buttons.ht → ...ndings/flutter/material/toggle_buttons.ht b/...ht-lib/flutter/material/toggle_buttons.ht → ...ndings/flutter/material/toggle_buttons.ht
diff --git a/.../flutter/material/toggle_buttons_theme.ht → .../flutter/material/toggle_buttons_theme.ht b/.../flutter/material/toggle_buttons_theme.ht → .../flutter/material/toggle_buttons_theme.ht
diff --git a/ht-lib/ht-lib/flutter/material/tooltip.ht → ht-bindings/flutter/material/tooltip.ht b/ht-lib/ht-lib/flutter/material/tooltip.ht → ht-bindings/flutter/material/tooltip.ht
diff --git a/.../ht-lib/flutter/material/tooltip_theme.ht → ...indings/flutter/material/tooltip_theme.ht b/.../ht-lib/flutter/material/tooltip_theme.ht → ...indings/flutter/material/tooltip_theme.ht
diff --git a/ht-lib/ht-lib/flutter/material/typography.ht → ht-bindings/flutter/material/typography.ht b/ht-lib/ht-lib/flutter/material/typography.ht → ht-bindings/flutter/material/typography.ht
diff --git a/...r/material/user_accounts_drawer_header.ht → ...r/material/user_accounts_drawer_header.ht b/...r/material/user_accounts_drawer_header.ht → ...r/material/user_accounts_drawer_header.ht
diff --git a/ht-lib/ht-lib/flutter/painting.ht → ht-bindings/flutter/painting.ht b/ht-lib/ht-lib/flutter/painting.ht → ht-bindings/flutter/painting.ht
diff --git a/ht-lib/ht-lib/flutter/painting/alignment.ht → ht-bindings/flutter/painting/alignment.ht b/ht-lib/ht-lib/flutter/painting/alignment.ht → ht-bindings/flutter/painting/alignment.ht
diff --git a/...ib/ht-lib/flutter/painting/basic_types.ht → ht-bindings/flutter/painting/basic_types.ht b/...ib/ht-lib/flutter/painting/basic_types.ht → ht-bindings/flutter/painting/basic_types.ht
diff --git a/...tter/painting/beveled_rectangle_border.ht → ...tter/painting/beveled_rectangle_border.ht b/...tter/painting/beveled_rectangle_border.ht → ...tter/painting/beveled_rectangle_border.ht
diff --git a/.../ht-lib/flutter/painting/border_radius.ht → ...indings/flutter/painting/border_radius.ht b/.../ht-lib/flutter/painting/border_radius.ht → ...indings/flutter/painting/border_radius.ht
diff --git a/ht-lib/ht-lib/flutter/painting/borders.ht → ht-bindings/flutter/painting/borders.ht b/ht-lib/ht-lib/flutter/painting/borders.ht → ht-bindings/flutter/painting/borders.ht
diff --git a/ht-lib/ht-lib/flutter/painting/box_border.ht → ht-bindings/flutter/painting/box_border.ht b/ht-lib/ht-lib/flutter/painting/box_border.ht → ht-bindings/flutter/painting/box_border.ht
diff --git a/...ht-lib/flutter/painting/box_decoration.ht → ...ndings/flutter/painting/box_decoration.ht b/...ht-lib/flutter/painting/box_decoration.ht → ...ndings/flutter/painting/box_decoration.ht
diff --git a/ht-lib/ht-lib/flutter/painting/box_fit.ht → ht-bindings/flutter/painting/box_fit.ht b/ht-lib/ht-lib/flutter/painting/box_fit.ht → ht-bindings/flutter/painting/box_fit.ht
diff --git a/ht-lib/ht-lib/flutter/painting/box_shadow.ht → ht-bindings/flutter/painting/box_shadow.ht b/ht-lib/ht-lib/flutter/painting/box_shadow.ht → ht-bindings/flutter/painting/box_shadow.ht
diff --git a/.../ht-lib/flutter/painting/circle_border.ht → ...indings/flutter/painting/circle_border.ht b/.../ht-lib/flutter/painting/circle_border.ht → ...indings/flutter/painting/circle_border.ht
diff --git a/ht-lib/ht-lib/flutter/painting/colors.ht → ht-bindings/flutter/painting/colors.ht b/ht-lib/ht-lib/flutter/painting/colors.ht → ht-bindings/flutter/painting/colors.ht
diff --git a/...r/painting/continuous_rectangle_border.ht → ...r/painting/continuous_rectangle_border.ht b/...r/painting/continuous_rectangle_border.ht → ...r/painting/continuous_rectangle_border.ht
diff --git a/ht-lib/ht-lib/flutter/painting/debug.ht → ht-bindings/flutter/painting/debug.ht b/ht-lib/ht-lib/flutter/painting/debug.ht → ht-bindings/flutter/painting/debug.ht
diff --git a/...-lib/flutter/painting/decoration_image.ht → ...ings/flutter/painting/decoration_image.ht b/...-lib/flutter/painting/decoration_image.ht → ...ings/flutter/painting/decoration_image.ht
diff --git a/...ib/ht-lib/flutter/painting/edge_insets.ht → ht-bindings/flutter/painting/edge_insets.ht b/...ib/ht-lib/flutter/painting/edge_insets.ht → ht-bindings/flutter/painting/edge_insets.ht
diff --git a/...b/ht-lib/flutter/painting/flutter_logo.ht → ht-bindings/flutter/painting/flutter_logo.ht b/...b/ht-lib/flutter/painting/flutter_logo.ht → ht-bindings/flutter/painting/flutter_logo.ht
diff --git a/...lib/flutter/painting/fractional_offset.ht → ...ngs/flutter/painting/fractional_offset.ht b/...lib/flutter/painting/fractional_offset.ht → ...ngs/flutter/painting/fractional_offset.ht
diff --git a/ht-lib/ht-lib/flutter/painting/gradient.ht → ht-bindings/flutter/painting/gradient.ht b/ht-lib/ht-lib/flutter/painting/gradient.ht → ht-bindings/flutter/painting/gradient.ht
diff --git a/...ib/ht-lib/flutter/painting/image_cache.ht → ht-bindings/flutter/painting/image_cache.ht b/...ib/ht-lib/flutter/painting/image_cache.ht → ht-bindings/flutter/painting/image_cache.ht
diff --git a/...ht-lib/flutter/painting/image_provider.ht → ...ndings/flutter/painting/image_provider.ht b/...ht-lib/flutter/painting/image_provider.ht → ...ndings/flutter/painting/image_provider.ht
diff --git a/...-lib/flutter/painting/image_resolution.ht → ...ings/flutter/painting/image_resolution.ht b/...-lib/flutter/painting/image_resolution.ht → ...ings/flutter/painting/image_resolution.ht
diff --git a/...b/ht-lib/flutter/painting/image_stream.ht → ht-bindings/flutter/painting/image_stream.ht b/...b/ht-lib/flutter/painting/image_stream.ht → ht-bindings/flutter/painting/image_stream.ht
diff --git a/...ib/ht-lib/flutter/painting/inline_span.ht → ht-bindings/flutter/painting/inline_span.ht b/...ib/ht-lib/flutter/painting/inline_span.ht → ht-bindings/flutter/painting/inline_span.ht
diff --git a/...b/ht-lib/flutter/painting/matrix_utils.ht → ht-bindings/flutter/painting/matrix_utils.ht b/...b/ht-lib/flutter/painting/matrix_utils.ht → ht-bindings/flutter/painting/matrix_utils.ht
diff --git a/...ht-lib/flutter/painting/notched_shapes.ht → ...ndings/flutter/painting/notched_shapes.ht b/...ht-lib/flutter/painting/notched_shapes.ht → ...ndings/flutter/painting/notched_shapes.ht
diff --git a/...tter/painting/rounded_rectangle_border.ht → ...tter/painting/rounded_rectangle_border.ht b/...tter/painting/rounded_rectangle_border.ht → ...tter/painting/rounded_rectangle_border.ht
diff --git a/...ht-lib/flutter/painting/shader_warm_up.ht → ...ndings/flutter/painting/shader_warm_up.ht b/...ht-lib/flutter/painting/shader_warm_up.ht → ...ndings/flutter/painting/shader_warm_up.ht
diff --git a/...-lib/flutter/painting/shape_decoration.ht → ...ings/flutter/painting/shape_decoration.ht b/...-lib/flutter/painting/shape_decoration.ht → ...ings/flutter/painting/shape_decoration.ht
diff --git a/...ht-lib/flutter/painting/stadium_border.ht → ...ndings/flutter/painting/stadium_border.ht b/...ht-lib/flutter/painting/stadium_border.ht → ...ndings/flutter/painting/stadium_border.ht
diff --git a/...ib/ht-lib/flutter/painting/strut_style.ht → ht-bindings/flutter/painting/strut_style.ht b/...ib/ht-lib/flutter/painting/strut_style.ht → ht-bindings/flutter/painting/strut_style.ht
diff --git a/...b/ht-lib/flutter/painting/text_painter.ht → ht-bindings/flutter/painting/text_painter.ht b/...b/ht-lib/flutter/painting/text_painter.ht → ht-bindings/flutter/painting/text_painter.ht
diff --git a/ht-lib/ht-lib/flutter/painting/text_span.ht → ht-bindings/flutter/painting/text_span.ht b/ht-lib/ht-lib/flutter/painting/text_span.ht → ht-bindings/flutter/painting/text_span.ht