Merge branch 'dev_1.17.5' of github.com:Unity-Technologies/com.unity.uiwidgets into fix_window_instance_null_crash

README-ZH.md

 通过使用最新的Unity渲染SDK，UIWidgets应用可以非常快速地运行并且大多数时间保持大于60fps的速度。
 
 #### 跨平台
-与任何其他Unity项目一样，UIWidgets应用可以直接部署在各种平台上，包括PC，移动设备和网页等。
+与任何其他Unity项目一样，UIWidgets应用可以直接部署在各种平台上，包括PC和移动设备等。
 
 #### 多媒体支持
 除了基本的2D UI之外，开发人员还能够将3D模型，音频，粒子系统添加到UIWidgets应用中。
 
 #### Unity
 
-安装 **Unity 2018.4.10f1(LTS)** 或 **Unity 2019.1.14f1** 及其更高版本。 你可以从[https://unity3d.com/get-unity/download](https://unity3d.com/get-unity/download)下载最新的Unity。
+安装 **Unity 2019.1.14f1c1** 及其更高版本。 你可以从[https://unity3d.com/get-unity/download](https://unity3d.com/get-unity/download)下载最新的Unity。
-访问我们的Github存储库 [https://github.com/UnityTech/UIWidgets](https://github.com/UnityTech/UIWidgets)下载最新的UIWidgets包。
+访问我们的Github存储库 [https://github.com/Unity-Technologies/com.unity.uiwidgets](https://github.com/Unity-Technologies/com.unity.uiwidgets)下载最新的UIWidgets包。
 
 将下载的包文件夹移动到Unity项目的Package文件夹中。
 
-    cd <YourProjectPath>/Packages
-    git clone https://github.com/UnityTech/UIWidgets.git com.unity.uiwidgets
+    cd <YourPackagePath>
+    git clone https://github.com/Unity-Technologies/com.unity.uiwidgets.git com.unity.uiwidgets
+在unity的PackageManager中，选择添加添加local file。选中```/com.unity.uiwidgets```下的```package.json```。
+
+对于windows,请用在```com.unity.uiwidgets/Runtime/Plugins/x86_64```下的 ```libEGL.dll, libGLESv2.dll```替换编辑器中中相应文件
 
 ## 入门指南
 
 UIWidgets应用是用**C＃脚本**来编写的。 请按照以下步骤创建应用程序并在Unity编辑器中播放。
 1. 创建一个新C＃脚本，命名为“UIWidgetsExample.cs”，并将以下代码粘贴到其中。
 
-```csharp
+    ```csharp
-    using Unity.UIWidgets.animation;
+    using uiwidgets;
+    using Unity.UIWidgets.cupertino;
-    using Unity.UIWidgets.foundation;
-    using Unity.UIWidgets.material;
-    using Unity.UIWidgets.painting;
-    using UnityEngine;
-    using FontStyle = Unity.UIWidgets.ui.FontStyle;
+    using Text = Unity.UIWidgets.widgets.Text;
+    using ui_ = Unity.UIWidgets.widgets.ui_;
+    using TextStyle = Unity.UIWidgets.painting.TextStyle;
-    namespace UIWidgetsSample {
-        public class UIWidgetsExample : UIWidgetsPanel {
-            protected override void OnEnable() {
+    namespace UIWidgetsSample
+    {
+        public class CountDemo : UIWidgetsPanel
+        {
+            protected void OnEnable()
+            {
-                // FontManager.instance.addFont(Resources.Load<Font>(path: "path to your font"), "font family name");
-
-                // load custom font with weight & style. The font weight & style corresponds to fontWeight, fontStyle of
-                // a TextStyle object
-                // FontManager.instance.addFont(Resources.Load<Font>(path: "path to your font"), "Roboto", FontWeight.w500,
-                //    FontStyle.italic);
-
-                // add material icons, familyName must be "Material Icons"
-                // FontManager.instance.addFont(Resources.Load<Font>(path: "path to material icons"), "Material Icons");
-
+                    // AddFont("Material Icons", new List<string> {"MaterialIcons-Regular.ttf"}, new List<int> {0});
-            protected override Widget createWidget() {
-                return new WidgetsApp(
-                    home: new ExampleApp(),
-                    pageRouteBuilder: (RouteSettings settings, WidgetBuilder builder) =>
-                        new PageRouteBuilder(
-                            settings: settings,
-                            pageBuilder: (BuildContext context, Animation<float> animation,
-                                Animation<float> secondaryAnimation) => builder(context)
-                        )
-                );
+            protected override void main()
+            {
+                ui_.runApp(new MyApp());
-            class ExampleApp : StatefulWidget {
-                public ExampleApp(Key key = null) : base(key) {
+            class MyApp : StatelessWidget
+            {
+                public override Widget build(BuildContext context)
+                {
+                    return new CupertinoApp(
+                        home: new CounterApp()
+                    );
+            }
+        }
-                public override State createState() {
-                    return new ExampleState();
-                }
+        internal class CounterApp : StatefulWidget
+        {
+            public override State createState()
+            {
+                return new CountDemoState();
+        }
-            class ExampleState : State<ExampleApp> {
-                int counter = 0;
+        internal class CountDemoState : State<CounterApp>
+        {
+            private int count = 0;
-                public override Widget build(BuildContext context) {
-                    return new Column(
-                        children: new List<Widget> {
-                            new Text("Counter: " + this.counter),
-                            new GestureDetector(
-                                onTap: () => {
-                                    this.setState(() => {
-                                        this.counter++;
+            public override Widget build(BuildContext context)
+            {
+                return new Container(
+                    color: Color.fromARGB(255, 255, 0, 0),
+                    child: new Column(children: new List<Widget>()
+                        {
+                            new Text($"count: {count}", style: new TextStyle(color: Color.fromARGB(255, 0 ,0 ,255))),
+                            new CupertinoButton(
+                                onPressed: () =>
+                                {
+                                    setState(() =>
+                                    {
+                                        count++;
-                                    padding: EdgeInsets.symmetric(20, 20),
-                                    color: Colors.blue,
-                                    child: new Text("Click Me")
+                                    color: Color.fromARGB(255,0 , 255, 0),
+                                    width: 100,
+                                    height: 40
-                            )
+                            ),
-                    );
-                }
+                    )
+                );
-```
+    ```
 
 2. 保存此脚本，并将其附加到Panel 1中作为其组件。
 3. 在Unity编辑器中，点击Play按钮来启动应用。
 2. 选择目标平台，点击Build。 之后Unity编辑器将自动组装所有相关资源并生成最终的应用程序包。
 
 #### 五、如何加载图像？
-1. 将你的图像文件，如image1.png，放在Resources文件夹中。
-2. 你可以在同一文件夹中添加image1@2.png和image1@3.png以支持高清屏幕显示。
-3. 使用Image.asset（“image1”）加载图像。 注意：因为是在Unity中，所以不需要添加.png后缀。
+1. 将你的图像文件，如image1.png，放在StreamingAssets文件夹中。
+2. 使用Image.File（“image1.png”）加载图像。
-1. 假设你有一个loading1.gif文件，将其重命名为loading1.gif.bytes并复制到Resources文件夹。
-2. 你可以在同一文件夹中添加loading1@2.gif.bytes和loading1@3.gif.bytes以支持高清屏幕显示。
-3. 使用Image.asset（“loading1.gif”）加载gif图像。
+1. 假设你有一个loading1.gif文件，复制到StreamingAssets文件夹。
+2. 使用Image.file（“loading1.gif”）加载gif图像。
-如果您希望在您的UIWidgets App中显示状态栏，您可以使用这个[解决方案](https://github.com/Over17/UnityShowAndroidStatusBar)。我们将尽快推出我们自己的解决方案，并保证届时开发者可以进行无缝切换。
-
-此外，为了让上述插件在Android P及以上Android系统中正常工作，请勾选上"Player Settings"中的"Render Outside Safe Area"选项。
-
-#### 七、自动调节帧率
-如果要使得构建出的应用能够自动调节帧率，请打开Project Settings，将构建目标平台对应的Quality选项卡中的V Sync Count设置为Don't Sync。
-默认的逻辑是在界面静止时将帧率降低，在界面变动时再将帧率提高至60。
-如果您不想开启该功能，请将`Window.onFrameRateSpeedUp`和/或`Window.onFrameRateCoolDown`设置为空函数，()=> {}即可。
-
-在Unity 2019.3版本及以上，UIWidgets将使用OnDemandRenderAPI来实现帧率调节，它将在不影响UI响应速度的情况下大幅降低耗电和发热问题。
-
-#### 八、WebGL Canvas分辨率调整插件
-因为浏览器中Canvas的宽高和其在显示器上的像素数可能不一致，所以构建出的WebGL程序中画面可能会模糊。
-插件`Plugins/platform/webgl/UIWidgetsCanvasDevicePixelRatio_20xx.x.jslib`（目前有2018.3和2019.1）解决了这个问题。
-请根据您的项目的Unity版本选择对应的插件，并禁用此插件的其他版本。方法如下：在Project面板中选中该插件，在Inspector面板中的Select platforms for plugin中，去掉WebGL后面的对勾。
-如果您因为任何原因需要完全禁止此插件的功能，请按上述方法禁用此插件的所有版本。
-
-此插件覆盖了Unity WebGL构建模块中的如下参数：
-```none
-JS_SystemInfo_GetWidth
-JS_SystemInfo_GetHeight
-JS_SystemInfo_GetCurrentCanvasWidth
-JS_SystemInfo_GetCurrentCanvasHeight
-$Browser
-$JSEvents
-```
-如果您需要实现自己的WebGL插件，并且您的插件覆盖了这些参数中的至少一种，您需要采用上文中提到的方法禁用`UIWidgetsCanvasDevicePixelRatio`插件，以防止可能的冲突。
-如果您仍然需要此插件所提供的功能，您可以手动将此插件对Unity WebGL构建模块的修改应用到您的插件中。
-`UIWidgetsCanvasDevicePixelRatio`插件中所有的修改之处都以`////////// Modification Start ////////////`和`////////// Modification End ////////////`标识。
-在被标识的代码中，所有乘/除以`devicePixelRatio`都来自于我们的修改。
-若您需要详细了解此插件所修改的脚本，请参考您的Unity Editor安装目录下的`PlaybackEngines/WebGLSupport/BuildTools/lib`文件夹中的`SystemInfo.js`和`UnityNativeJS/UnityNative.js`。
-
-#### 九、图片导入设置
-默认情况下，Unity会将导入图片的宽和高放缩为最近的等于2的幂的整数。
-在UIWidgets中使用图片时，记得将这一特性关闭，以免图片被意外放缩，方法如下：在Project面板中选中图片，在"Inspector"面板中将"Non Power of 2"（在"Advanced"中）设置为"None"。
-
-#### 十、更新表情(Emoji)
-UIWidgets支持渲染文本中包含的表情。
-默认的表情资源为[iOS 13.2](https://emojipedia.org/apple/ios-13.2)。
-我们也准备了[Google Emoji](https://emojipedia.org/google)的表情资源。
-如果您希望切换到Google版本的表情，请按如下步骤操作：
-
-1. 拷贝`Runtime/Resources/backup~/EmojiGoogle.png`到`Runtime/Resources/images`目录。
-2. 在**Project**面板中，找到`EmojiGoogle`资源，在**Inspector**面板中，将**Max Size**更改为4096，取消选中**Generate Mipmaps**，并选中**Alpha Is Transparency**。
-3. 在您的代码中继承`UIWidgetsPanel`的类的`OnEnable()`函数中，添加如下代码
+如果您希望在您的UIWidgets App中显示状态栏，您可以取消```Start in fullscreen``` 与 ```record outside safe area```, 确认```UIWidgetsAndroidConfiguration```下```showStatusBar```为 ```true```
-```csharp
-EmojiUtils.configuration = EmojiUtils.googleEmojiConfiguration;
-```
-
-如果您希望使用自己的表情图片，请按如下步骤操作：
-
-1. 参照`EmojiGoogle.png`，创建您自己的Emoji表单，并放到工程目录下的某个`Resources`目录中，例如`Resources/myImages/MyEmoji.png`）。
-2. 在`OnEnable()`函数中，添加如下代码（记得将示例的值改为真实的值）。注意Emoji的编码的顺序要和Emoji表单一致。
-
-```csharp
-EmojiUtils.configuration = new EmojiResourceConfiguration(
-  spriteSheetAssetName: "myImage/MyEmoji",
-  emojiCodes: new List<int> {
-    0x1f004, 0x1f0cf, 0x1f170, ...
-  },
-  spriteSheetNumberOfRows: 36,
-  spriteSheetNumberOfColumns: 37,
-);
-```
-
-#### 十一、与GameObject进行拖拽交互
-
-<p align="center">
-  <img src="https://connect-prd-cdn.unity.com/20190718/p/images/e3c9cf9b-c732-4eb2-9afd-fe7de894f342_Custom_Inspector_Showcase_320px.gif" width="300"/>
-</p>
-
-我们提供了一个包装好的`UnityObjectDetector`组件以及`onRelease`回调函数，借此您可以实现简单地将物体（例如Hierarchy内的场景物体、Project窗口下的文件等）拖拽至区域内，来获得`UnityEngine.Object[] `类型的引用并进行操作。
+#### 七、图片导入设置
+请将图片放入StreamingAssets下，而后用```Image.file```读取
-#### 定义UIWidgets_DEBUG
-我们建议在Unity编辑器中定义 UIWidgets_DEBUG 脚本符号，这将打开UIWidgets中的调试断言（debug assertion），有助于更早发现潜在的Bug。
-因此选择 **Player Settings** > **Other Settings** > **Configuration** > **Scripting Define Symbols** ，并添加 UIWidgets_DEBUG。
-该符号仅供调试使用，请在发布版本中删除它。
+在编辑器菜单栏选择```UIWidgets->EnableDebug```
-#### UIWidgets Inspector
-
-UIWidgets Inspector工具用于可视化和浏览窗口小部件树。 你可以在Unity编辑器的**Window** > **Analysis** > **UIWidget Inspector** 中的找到它。
-
-注意
-- 需要定义 UIWidgets_DEBUG 使inspector正常工作。
-- Inspector目前仅适用于编辑器的播放模式，目前不支持独立版本的应用程序。
-
+如果想在runtime选择是否debug，请修改文件```com.unity.uiwidgets/com.unity.uiwidgets/Runtime/foundation/debug.cs```中的```static bool debugEnableAtRuntimeInternal```
 
 ## 学习
 
-- UIWidgets官方示例。目前所有官方使用的示例项目均维护在一个独立的Github仓库（ https://github.com/UIWidgets/UIWidgetsSamples ）中。你可以
-将它clone到你项目本地的Assets目录下使用。
+- UIWidgets官方示例。目前所有官方使用的示例项目均维护在一个独立的Github仓库（ https://github.com/Unity-Technologies/com.unity.uiwidgets ）中。
 具体的，你可以在Sample项目的**Scene**子文件夹中浏览所有示例UI场景。
 此外，你还可以点击主菜单上的新增的UIWidgetsTests选项卡，并在下拉菜单中选择一个EditorWindow UI示例来运行。
 - UIWidgets凉鞋系列教程。你可以在凉鞋老师整理的Github仓库（ https://github.com/liangxiegame/awesome-uiwidgets ）中学习UIWidgets的基本用法

README.md

 
 
 #### Cross-Platform
-A UIWidgets App can be deployed on all kinds of platforms including PCs, mobile devices and web page directly, like
+A UIWidgets App can be deployed on all kinds of platforms including PCs and mobile devices directly, like
 any other Unity projects.
 
 #### Multimedia Support
 
 #### Unity
 
-Install **Unity 2018.4.10f1 (LTS)** or **Unity 2019.1.14f1** and above. You can download the latest Unity on https://unity3d.com/get-unity/download.
+Install **Unity 2019.1.14f1c1** and above. You can download the latest Unity on https://unity3d.com/get-unity/download.
-Visit our Github repository https://github.com/UnityTech/UIWidgets
+Visit our Github repository https://github.com/Unity-Technologies/com.unity.uiwidgets
  to download the latest UIWidgets package.
 
 Move the downloaded package folder into the **Package** folder of your Unity project.
    ```none
-    cd <YourProjectPath>/Packages
-    git clone https://github.com/UnityTech/UIWidgets.git com.unity.uiwidgets
+    cd <YourPackagePath>
+    git clone https://github.com/Unity-Technologies/com.unity.uiwidgets.git com.unity.uiwidgets
+
+In PackageManger of unity, select add local file. select ```package.json``` under ```/com.unity.uiwidgets```
+
+for windows, please replace ```libEGL.dll, libGLESv2.dll``` in Editor from ones in ```com.unity.uiwidgets/Runtime/Plugins/x86_64``
 
 ## Getting Start
 
 1. Create a new C# Script named "UIWidgetsExample.cs" and paste the following codes into it.
    ```csharp
     using System.Collections.Generic;
-    using Unity.UIWidgets.animation;
+    using uiwidgets;
+    using Unity.UIWidgets.cupertino;
-    using Unity.UIWidgets.foundation;
-    using Unity.UIWidgets.material;
-    using Unity.UIWidgets.painting;
-    using UnityEngine;
-    using FontStyle = Unity.UIWidgets.ui.FontStyle;
+    using Text = Unity.UIWidgets.widgets.Text;
+    using ui_ = Unity.UIWidgets.widgets.ui_;
+    using TextStyle = Unity.UIWidgets.painting.TextStyle;
-    namespace UIWidgetsSample {
-        public class UIWidgetsExample : UIWidgetsPanel {
-            protected override void OnEnable() {
+    namespace UIWidgetsSample
+    {
+        public class CountDemo : UIWidgetsPanel
+        {
+            protected void OnEnable()
+            {
-                // FontManager.instance.addFont(Resources.Load<Font>(path: "path to your font"), "font family name");
-
-                // load custom font with weight & style. The font weight & style corresponds to fontWeight, fontStyle of
-                // a TextStyle object
-                // FontManager.instance.addFont(Resources.Load<Font>(path: "path to your font"), "Roboto", FontWeight.w500,
-                //    FontStyle.italic);
-
-                // add material icons, familyName must be "Material Icons"
-                // FontManager.instance.addFont(Resources.Load<Font>(path: "path to material icons"), "Material Icons");
-
+                    // AddFont("Material Icons", new List<string> {"MaterialIcons-Regular.ttf"}, new List<int> {0});
-            protected override Widget createWidget() {
-                return new WidgetsApp(
-                    home: new ExampleApp(),
-                    pageRouteBuilder: (RouteSettings settings, WidgetBuilder builder) =>
-                        new PageRouteBuilder(
-                            settings: settings,
-                            pageBuilder: (BuildContext context, Animation<float> animation,
-                                Animation<float> secondaryAnimation) => builder(context)
-                        )
-                );
+            protected override void main()
+            {
+                ui_.runApp(new MyApp());
-            class ExampleApp : StatefulWidget {
-                public ExampleApp(Key key = null) : base(key) {
+            class MyApp : StatelessWidget
+            {
+                public override Widget build(BuildContext context)
+                {
+                    return new CupertinoApp(
+                        home: new CounterApp()
+                    );
+            }
+        }
-                public override State createState() {
-                    return new ExampleState();
-                }
+        internal class CounterApp : StatefulWidget
+        {
+            public override State createState()
+            {
+                return new CountDemoState();
+        }
-            class ExampleState : State<ExampleApp> {
-                int counter = 0;
+        internal class CountDemoState : State<CounterApp>
+        {
+            private int count = 0;
-                public override Widget build(BuildContext context) {
-                    return new Column(
-                        children: new List<Widget> {
-                            new Text("Counter: " + this.counter),
-                            new GestureDetector(
-                                onTap: () => {
-                                    this.setState(()
-                                        => {
-                                        this.counter++;
+            public override Widget build(BuildContext context)
+            {
+                return new Container(
+                    color: Color.fromARGB(255, 255, 0, 0),
+                    child: new Column(children: new List<Widget>()
+                        {
+                            new Text($"count: {count}", style: new TextStyle(color: Color.fromARGB(255, 0 ,0 ,255))),
+                            new CupertinoButton(
+                                onPressed: () =>
+                                {
+                                    setState(() =>
+                                    {
+                                        count++;
-                                    padding: EdgeInsets.symmetric(20, 20),
-                                    color: Colors.blue,
-                                    child: new Text("Click Me")
+                                    color: Color.fromARGB(255,0 , 255, 0),
+                                    width: 100,
+                                    height: 40
-                            )
+                            ),
-                    );
-                }
+                    )
+                );
             }
         }
     }
 all relevant resources and generate the final App package.
 
 #### How to load images?
-1. Put your images files in Resources folder. e.g. image1.png.
-2. You can add image1@2.png and image1@3.png in the same folder to support HD screens.
-3. Use Image.asset("image1") to load the image. Note: as in Unity, ".png" is not needed.
+1. Put your images files in StreamingAssets folder. e.g. image1.png.
+2. Use Image.file("image1.png") to load the image.
-1. Suppose you have loading1.gif. Rename it to loading1.gif.bytes and copy it to Resources folder.
-2. You can add loading1@2.gif.bytes and loading1@3.gif.bytes in the same folder to support HD screens.
-3. Use Image.asset("loading1.gif") to load the gif images.
-
-#### Using Window Scope
-If you see the error `AssertionError: Window.instance is null` or null pointer error of `Window.instance`,
-it means the code is not running in the window scope. In this case, you can enclose your code
-with window scope as below:
-```csharp
-using(WindowProvider.of(your gameObject with UIWidgetsPanel).getScope()) {
-    // code dealing with UIWidgets,
-    // e.g. setState(() => {....})
-}
-```
-
-This is needed if the code is in methods
-not invoked by UIWidgets. For example, if the code is in `completed` callback of `UnityWebRequest`,
-you need to enclose them with window scope.
-Please see [HttpRequestSample](./Samples/UIWidgetSample/HttpRequestSample.cs) for detail.
-For callback/event handler methods from UIWidgets (e.g `Widget.build, State.initState...`), you don't need do
-it yourself, since the framework ensure it's in window scope.
+1. Put your gif files in StreamingAssets folder. e.g. loading1.gif.
+2. Use Image.asset("loading1.gif") to load the gif images.
-Status bar is always hidden by default when an Unity project is running on an Android device. If you
- want to show the status bar in your App, this
- [solution](https://github.com/Over17/UnityShowAndroidStatusBar) seems to be
- compatible to UIWidgets, therefore can be used as a good option before we release our
- full support solution on this issue.
-
- Besides,
- please set "Render Outside Safe Area" to true in the "Player Settings" to make this plugin working properly on Android P or later.
-
-
-
-
-#### Automatically Adjust Frame Rate
-
-To build an App that is able to adjust the frame rate automatically, please open Project Settings, and in the Quality tab, set the "V Sync Count" option of the target platform to "Don't Sync".
-The default logic is to reduce the frame rate when the screen is static, and change it back to 60 whenever the screen changes.
-If you would like to disable this behavior, please set `Window.onFrameRateSpeedUp` and `Window.onFrameRateCoolDown` to null function, i.e., () => {}.
-
-Note that in Unity 2019.3 and above, UIWidgets will use OnDemandRenderAPI to implement this feature, which will greatly save the battery.
-
-#### WebGL Canvas Device Pixel Ratio Plugin
-The width and height of the Canvas in browser may differ from the number of pixels the Canvas occupies on the screen.
-Therefore, the image may blur in the builded WebGL program.
-The Plugin `Plugins/platform/webgl/UIWidgetsCanvasDevicePixelRatio_20xx.x.jslib` (2018.3 and 2019.1 for now) solves this issue.
-Please select the plugin of the Unity version corresponding to your project, and disable other versions of this plugin, as follows: select this plugin in the **Project** panel, and uncheck **WebGL** under **Select platforms for plugin** in the **Inspector** panel.
-If you need to disable this plugin for any reason, please disable all the versions of this plugin as described above.
-
-This plugin overrides the following parameters in the Unity WebGL building module:
-```none
-JS_SystemInfo_GetWidth
-JS_SystemInfo_GetHeight
-JS_SystemInfo_GetCurrentCanvasWidth
-JS_SystemInfo_GetCurrentCanvasHeight
-$Browser
-$JSEvents
-```
-If you would like to implement your own WebGL plugin, and your plugin overrides at least one of the above parameters, you need to disable the `UIWidgetsCanvasDevicePixelRatio` plugin in the above mentioned way to avoid possible conflicts.
-If you still need the function provided by this plugin, you can mannually apply the modification to Unity WebGL building module introduced in this plugin.
-All the modifications introduced in `UIWidgetsCanvasDevicePixelRatio` are marked by `////////// Modifcation Start ////////////` and `////////// Modifcation End ////////////`.
-In the marked codes, all the multiplications and divisions with `devicePixelRatio` are introduced by our modification.
-To learn about the original script in detail, please refer to `SystemInfo.js` and `UnityNativeJS/UnityNative.js` in `PlaybackEngines/WebGLSupport/BuildTools/lib` in your Unity Editor installation.
+Status bar is always hidden by default when an Unity project is running on an Android device.
+If you
+want to show the status bar in your App, you can disable```Start in fullscreen``` and ```record outside safe area```, make sure ```showStatusBar``` is ```true``` under ```UIWidgetsAndroidConfiguration```
-Unity, by default, resizes the width and height of an imported image to the nearest integer that is a power of 2.
-In UIWidgets, you should almost always disable this by selecting the image in the "Project" panel, then in the "Inspector" panel set the "Non Power of 2" option (in "Advanced") to "None", to prevent your image from being resized unexpectedly.
-
-#### Update Emoji
-UIWidgets supports rendering emoji in (editable) texts.
-The default emoji resource version is [iOS 13.2](https://emojipedia.org/apple/ios-13.2).
-We also prepared the resources of [Google Emoji](https://emojipedia.org/google).
-To switch to Google version of emoji, please follow the following steps:
-
-1. Copy `Runtime/Resources/backup~/EmojiGoogle.png` to `Runtime/Resources/images` folder.
-2. In the **Project** panel, find and select `EmojiGoogle` asset, and in the **Inspector** panel, change **Max Size** to 4096, disable **Generate Mipmaps**, and enable **Alpha Is Transparency**.
-3. In the `OnEnable()` function in your class overriding `UIWidgetsPanel`, add the following code
-
-```csharp
-EmojiUtils.configuration = EmojiUtils.googleEmojiConfiguration;
-```
-
-If you would like to use your own images for emoji, please follow the following steps:
-
-1. Create the sprite sheet (take `EmojiGoogle.png` as an example), and put in a `Resources` folder in your project, (for example `Resources/myImages/MyEmoji.png`).
-2. In the `OnEnable()` function, add the following code (replace example values with actual value). Note that the order of emoji codes should be consistent with the sprite sheet.
-
-```csharp
-EmojiUtils.configuration = new EmojiResourceConfiguration(
-  spriteSheetAssetName: "myImage/MyEmoji",
-  emojiCodes: new List<int> {
-    0x1f004, 0x1f0cf, 0x1f170, ...
-  },
-  spriteSheetNumberOfRows: 36,
-  spriteSheetNumberOfColumns: 37,
-);
-```
-
-#### Interact with GameObject Drag&Drops
-
-<p align="center">
-  <img src="https://connect-prd-cdn.unity.com/20190718/p/images/e3c9cf9b-c732-4eb2-9afd-fe7de894f342_Custom_Inspector_Showcase_320px.gif" width="300"/>
-</p>
-
-With the provided packaged stateful widget `UnityObjectDetector` and its `onRelease` callback function, you can easily drag some objects (for example GameObject from Hierarchy, files from Project Window, etc) into the area, get the UnityEngine.Object[] references and make further modification.
+Please put images under StreamingAssets folder, a and loading it using ```Image.file```.
-#### Define UIWidgets_DEBUG
-It's recommended to define the **UIWidgets_DEBUG** script symbol in editor, this will turn on
-debug assertion in UIWidgets, which will help to find potential bugs earlier. To do this:
-please go to **Player Settings -> Other Settings -> Configuration -> Scripting Define Symbols**,
-and add **UIWidgets_DEBUG**.
-The symbol is for debug purpose, please remove it from your release build.
+In Unity editor, you can switch debug/release mode by “UIWidgets->EnableDebug”.
-#### UIWidgets Inspector
-The UIWidgets Inspector tool is for visualizing and exploring the widget trees. You can find it
-via *Window/Analysis/UIWidgets* inspector in Editor menu.
-
-**Note**
-* **UIWidgets_DEBUG** needs to be define for inspector to work properly.
-* Inspector currently only works in Editor Play Mode, inspect standalone built application is not supported for now.
+If you want to change different mode in runtime, please modify the file “com.unity.uiwidgets/com.unity.uiwidgets/Runtime/foundation/debug.cs” by making “static bool debugEnableAtRuntimeInternal” to true or false. Note that the value is set to false by default.
 
 ## Learn
 
-* UIWidgetsSamples (https://github.com/UIWidgets/UIWidgetsSamples). These samples are developed by the dev team in order to illustrates all the features of 
-UIWidgets. First clone this Repo to the **Assets** folder of your local UIWidgets project. Then
+* UIWidgetsSamples (https://github.com/Unity-Technologies/com.unity.uiwidgets). These samples are developed by the dev team in order to illustrates all the features of 
+UIWidgets. 
 you can find all the sample scenes under the **Scene** folder.
 You can also try UIWidgets-based Editor windows by clicking the new **UIWidgetsTests** tab on the main menu
 and open one of the dropdown samples.

Samples/UIWidgetsSamples_2019_4/Assets/CountDemo.cs

 using System.Collections.Generic;
 using uiwidgets;
 using Unity.UIWidgets.cupertino;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using Text = Unity.UIWidgets.widgets.Text;

Samples/UIWidgetsSamples_2019_4/Assets/Editor/EditorWindowSample/GalleryMain.cs

 using System.Collections.Generic;
 using UIWidgetsGallery.gallery;
 using Unity.UIWidgets.Editor;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.widgets;
 using UnityEditor;
 using UnityEngine;

Samples/UIWidgetsSamples_2019_4/Assets/MaterialSample/BottomAppBarSample.cs

 using System.Collections.Generic;
 using uiwidgets;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.rendering;

Samples/UIWidgetsSamples_2019_4/Assets/MaterialSample/DividerAndButton.cs

 using System.Collections.Generic;
 using uiwidgets;
 using Unity.UIWidgets.engine;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

Samples/UIWidgetsSamples_2019_4/Assets/MaterialSample/HoverSample.cs

-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.widgets;

Samples/UIWidgetsSamples_2019_4/Assets/MaterialSample/MaterialAppBarSample.cs

 using System.Collections.Generic;
 using uiwidgets;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

Samples/UIWidgetsSamples_2019_4/Assets/MaterialSample/MaterialButtonSample.cs

 using System.Collections.Generic;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

Samples/UIWidgetsSamples_2019_4/Assets/MaterialSample/MaterialInkWellSample.cs

-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

Samples/UIWidgetsSamples_2019_4/Assets/MaterialSample/MaterialNavigationBarSample.cs

 using System.Collections.Generic;
 using uiwidgets;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

Samples/UIWidgetsSamples_2019_4/Assets/MaterialSample/MaterialSliderSample.cs

 using System.Collections.Generic;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.ui;

Samples/UIWidgetsSamples_2019_4/Assets/MaterialSample/MaterialTabBarSample.cs

 using System.Collections.Generic;
 using uiwidgets;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

Samples/UIWidgetsSamples_2019_4/Assets/MaterialSample/MaterialThemeSample.cs

 using uiwidgets;
 using Unity.UIWidgets.animation;
 using Unity.UIWidgets.engine;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.rendering;

Samples/UIWidgetsSamples_2019_4/Assets/MaterialSample/NavigatorPopSample.cs

 using System.Collections.Generic;
-using Unity.UIWidgets.async2;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.async;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.rendering;

Samples/UIWidgetsSamples_2019_4/Assets/MaterialSample/NetWorkImageSample.cs

 using System.Collections;
 using System.Collections.Generic;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.widgets;

Samples/UIWidgetsSamples_2019_4/Assets/MaterialSample/ReorderableListSample.cs

 using System.Collections.Generic;
 using System.Linq;
 using uiwidgets;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

Samples/UIWidgetsSamples_2019_4/Assets/MaterialSample/TableSample.cs

 using System.Collections.Generic;
 using uiwidgets;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

Samples/UIWidgetsSamples_2019_4/Assets/Script/CountTest.cs

 using System.Collections.Generic;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.ui;

Samples/UIWidgetsSamples_2019_4/Assets/Script/ImageTest.cs

 using System.Collections.Generic;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.ui;

Samples/UIWidgetsSamples_2019_4/Assets/Script/TextFieldTest.cs

-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.widgets;
 using ui_ = Unity.UIWidgets.widgets.ui_;
 using Unity.UIWidgets.cupertino;

Samples/UIWidgetsSamples_2019_4/Assets/Script/TextTest.cs

 using System.Collections.Generic;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 //using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/GalleryMain.cs

 using System.Collections.Generic;
 using UIWidgetsGallery.gallery;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.widgets;
 
 namespace UIWidgetsGallery

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/cupertino/cupertino_refresh_demo.cs

 using System;
 using System.Collections.Generic;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.cupertino;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.rendering;

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/cupertino/cupertino_segmented_control_demo.cs

 using System;
 using System.Collections.Generic;
 using uiwidgets;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.cupertino;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.rendering;

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/material/bottom_navigation_demo.cs

 using Unity.UIWidgets.animation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/material/cards_demo.cs

                                 // of the Material and display ink effects above it. Using a
                                 // standard Image will obscure the ink splash.
                                 child: Ink.image(
-                                    image: new FileImage(this.destination.assetPackage + "/" +
-                                                         this.destination.assetName),
+                                    image: new FileImage(System.IO.Path.Combine(destination.assetPackage,
+                                                         destination.assetName)),
                                     fit: BoxFit.cover,
                                     child: new Container()
                                 )

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/material/date_and_time_picker_demo.cs

 using System.Linq;
 using uiwidgets;
 using UIWidgetsGallery.gallery;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/material/leave_behind_demo.cs

 using System.Linq;
 using uiwidgets;
 using UIWidgetsGallery.gallery;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/material/overscroll_demo.cs

 using System;
 using System.Collections.Generic;
 using UIWidgetsGallery.gallery;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.widgets;

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/material/text_form_field_demo.cs

 using uiwidgets;
 using UIWidgets.Runtime.material;
 using UIWidgetsGallery.gallery;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.gestures;
 using Unity.UIWidgets.material;

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/shrine/expanding_bottom_sheet.cs

 using System.Xml.Serialization;
 using UIWidgetsGallery.demo.shrine.model;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/shrine/model/scoped_model.cs

 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/gallery/app.cs

 using System.Collections.Generic;
 using uiwidgets;
 using UIWidgetsGallery.demo.shrine.model;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using UnityEngine;

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/gallery/demo.cs

 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/gallery/home.cs

 using System.Linq;
 using uiwidgets;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.gestures;
 using Unity.UIWidgets.material;

Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/gallery/updater.cs

 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

Samples/UIWidgetsSamples_2019_4/Assets/WidgetsSample/CustomPaintSample.cs

-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;

Samples/UIWidgetsSamples_2019_4/Assets/WidgetsSample/DragDropSample.cs

 using System.Collections.Generic;
 using uiwidgets;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.rendering;
 using Unity.UIWidgets.ui;

Samples/UIWidgetsSamples_2019_4/Assets/WidgetsSample/ExpansionPanelSample.cs

 using System.Collections.Generic;
 using uiwidgets;
 using Unity.UIWidgets.engine;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.rendering;

Samples/UIWidgetsSamples_2019_4/Assets/WidgetsSample/HttpRequestSample.cs

 using System;
 using System.Collections.Generic;
 using Unity.UIWidgets.engine;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.rendering;

Samples/UIWidgetsSamples_2019_4/Assets/WidgetsSample/ImageFormatSample.cs

 using System.Collections.Generic;
 using uiwidgets;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;

Samples/UIWidgetsSamples_2019_4/Assets/WidgetsSample/LongPressSample.cs

 using uiwidgets;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.widgets;
 using UnityEngine;
 using Color = Unity.UIWidgets.ui.Color;

Samples/UIWidgetsSamples_2019_4/Assets/WidgetsSample/NavigationSample.cs

 using System.Collections.Generic;
 using uiwidgets;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.gestures;
 using Unity.UIWidgets.material;

Samples/UIWidgetsSamples_2019_4/Assets/WidgetsSample/PageViewSample.cs

 using System.Collections.Generic;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using ui_ = Unity.UIWidgets.widgets.ui_;

Samples/UIWidgetsSamples_2019_4/Assets/WidgetsSample/ScrollbarSample.cs

 using System.Collections.Generic;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.ui;

Samples/UIWidgetsSamples_2019_4/Assets/WidgetsSample/UIWidgetsSamplePanel.cs

 using Unity.UIWidgets.animation;
 using Unity.UIWidgets.engine;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.widgets;
 
 namespace UIWidgetsSample {

com.unity.uiwidgets/Editor/UIWidgetsEditorPanel.cs

 using System.Collections;
 using System.Collections.Generic;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
-using Font = Unity.UIWidgets.engine2.Font;
+using Font = Unity.UIWidgets.engine.Font;
 using Rect = UnityEngine.Rect;
 
 namespace Unity.UIWidgets.Editor {

com.unity.uiwidgets/Editor/UIWidgetsPanelEditor.cs

 using Unity.UIWidgets.engine;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.foundation;
 using UnityEditor;
 using UnityEditor.UI;

com.unity.uiwidgets/Runtime/Plugins/Android/InputConnectionAdaptor.java.meta

   isPreloaded: 0
   isOverridable: 1
   isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
   - first:
       Android: Android

com.unity.uiwidgets/Runtime/Plugins/Android/TextInputPlugin.java.meta

   isPreloaded: 0
   isOverridable: 1
   isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
   - first:
       Android: Android

com.unity.uiwidgets/Runtime/Plugins/Android/TextInputView.java.meta

   isPreloaded: 0
   isOverridable: 1
   isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
   - first:
       Android: Android

com.unity.uiwidgets/Runtime/animation/animation_controller.cs

 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.physics;
 using Unity.UIWidgets.ui;
-using Ticker = Unity.UIWidgets.scheduler2.Ticker;
-using TickerFuture = Unity.UIWidgets.scheduler2.TickerFuture;
-using TickerProvider = Unity.UIWidgets.scheduler2.TickerProvider;
+using Ticker = Unity.UIWidgets.scheduler.Ticker;
+using TickerFuture = Unity.UIWidgets.scheduler.TickerFuture;
+using TickerProvider = Unity.UIWidgets.scheduler.TickerProvider;
 
 namespace Unity.UIWidgets.animation {
     enum _AnimationDirection {

com.unity.uiwidgets/Runtime/animation/tween_sequence.cs

 using Unity.UIWidgets.rendering;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using System;
 using Unity.UIWidgets.gestures;
 using Unity.UIWidgets.painting;

com.unity.uiwidgets/Runtime/async/timer.cs

-/*
-using System.Collections.Generic;
-using Unity.UIWidgets.foundation;
+using System.Runtime.InteropServices;
+using AOT;
+using Unity.UIWidgets.ui;
-#if UNITY_EDITOR
-using UnityEditor;
-
-#endif
-        public abstract void cancel();
-
-        public void Dispose() {
-            cancel();
-        }
-
-        public static float timeSinceStartup {
-            get {
-#if UNITY_EDITOR
-                return (float) EditorApplication.timeSinceStartup;
-#else
-                return Time.realtimeSinceStartup;
-#endif
+        public static Timer create(TimeSpan duration, ZoneCallback callback) {
+            if (Zone.current == Zone.root) {
+                return Zone.current.createTimer(duration, callback);
-        }
-        public static TimeSpan timespanSinceStartup {
-            get { return TimeSpan.FromSeconds(timeSinceStartup); }
+            return Zone.current
+                .createTimer(duration, Zone.current.bindCallbackGuarded(callback));
-        static readonly object _syncObj = new object();
+       
-        static LinkedList<Action> _callbacks = new LinkedList<Action>();
-
-        public static void runInMainFromFinalizer(Action callback) {
-            lock (_syncObj) {
-                _callbacks.AddLast(callback);
-            }
+        public static Timer create(TimeSpan duration, Action callback) {
+            return create(duration, () => {
+                callback.Invoke();
+                return null;
+            });
-        internal static void update() {
-            LinkedList<Action> callbacks;
-
-            lock (_syncObj) {
-                if (_callbacks.isEmpty()) {
-                    return;
-                }
-
-                callbacks = _callbacks;
-                _callbacks = new LinkedList<Action>();
+        public static Timer periodic(TimeSpan duration, ZoneUnaryCallback callback) {
+            if (Zone.current == Zone.root) {
+                return Zone.current.createPeriodicTimer(duration, callback);
-            foreach (var callback in callbacks) {
-                try {
-                    callback();
-                }
-                catch (Exception ex) {
-                    D.logError("Error to execute runInMain callback: ", ex);
-                }
-            }
+            var boundCallback = Zone.current.bindUnaryCallbackGuarded(callback);
+            return Zone.current.createPeriodicTimer(duration, boundCallback);
-    }
-    public class TimerProvider {
-        readonly PriorityQueue<TimerImpl> _queue;
-
-        public TimerProvider() {
-            _queue = new PriorityQueue<TimerImpl>();
+        public static void run(ZoneCallback callback) {
+            create(TimeSpan.Zero, callback);
-        public Timer runInMain(Action callback) {
-            var timer = new TimerImpl(callback);
+        public abstract void cancel();
-            lock (_queue) {
-                _queue.enqueue(timer);
-            }
-
-            return timer;
+        public void Dispose() {
+            cancel();
-        public Timer run(TimeSpan duration, Action callback) {
-            var timer = new TimerImpl(duration, callback);
+        public abstract long tick { get; }
+
+        public abstract bool isActive { get; }
-            lock (_queue) {
-                _queue.enqueue(timer);
-            }
+        internal static Timer _createTimer(TimeSpan duration, ZoneCallback callback) {
+            return _Timer._createTimer(_ => callback(), (int) duration.TotalMilliseconds, false);
+        }
-            return timer;
+        internal static Timer _createPeriodicTimer(
+            TimeSpan duration, ZoneUnaryCallback callback) {
+            return _Timer._createTimer(callback, (int) duration.TotalMilliseconds, true);
+    }
-        public Timer periodic(TimeSpan duration, Action callback) {
-            var timer = new TimerImpl(duration, callback, periodic: true);
+    class _Timer : Timer {
+        long _tick = 0;
-            lock (_queue) {
-                _queue.enqueue(timer);
-            }
+        ZoneUnaryCallback _callback;
+        long _wakeupTime;
+        readonly int _milliSeconds;
+        readonly bool _repeating;
-            return timer;
+        _Timer(ZoneUnaryCallback callback, long wakeupTime, int milliSeconds, bool repeating) {
+            _callback = callback;
+            _wakeupTime = wakeupTime;
+            _milliSeconds = milliSeconds;
+            _repeating = repeating;
-
-        static readonly List<TimerImpl> _timers = new List<TimerImpl>();
-        static readonly List<TimerImpl> _appendList = new List<TimerImpl>();
-        public void update(Action flushMicroTasks = null) {
-            var now = Timer.timeSinceStartup;
-
-            _timers.Clear();
-            _appendList.Clear();
-            lock (_queue) {
-                while (_queue.count > 0 && _queue.peek().deadline <= now) {
-                    var timer = _queue.dequeue();
-                    _timers.Add(timer);
-                }
+        public static TimeSpan timespanSinceStartup {
+            get { return TimeSpan.FromMilliseconds(UIMonoState_timerMillisecondClock()); }
+        }
+
+        internal static _Timer _createTimer(ZoneUnaryCallback callback, int milliSeconds, bool repeating) {
+            if (milliSeconds < 0) {
+                milliSeconds = 0;
-            if (_timers.Count != 0) {
-                foreach (var timer in _timers) {
-                    if (flushMicroTasks != null) {
-                        flushMicroTasks();
-                    }
+            long now = UIMonoState_timerMillisecondClock();
+            long wakeupTime = (milliSeconds == 0) ? now : (now + 1 + milliSeconds);
-                    timer.invoke();
-                    if (timer.periodic && !timer.done) {
-                        _appendList.Add(timer);
-                    }
-                }
-            }
+            _Timer timer = new _Timer(callback, wakeupTime, milliSeconds, repeating);
+            timer._enqueue();
-            if (_appendList.Count != 0) {
-                lock (_queue) {
-                    foreach (var timer in _appendList) {
-                        _queue.enqueue(timer);
-                    }
-                }
-            }
+            return timer;
-        class TimerImpl : Timer, IComparable<TimerImpl> {
-            float _deadline;
-            readonly Action _callback;
-            bool _done;
+        public override void cancel() {
+            _callback = null;
+        }
-            public readonly bool periodic;
-            readonly TimeSpan _interval;
+        public override bool isActive => _callback != null;
-            public TimerImpl(TimeSpan duration, Action callback, bool periodic = false) {
-                _deadline = timeSinceStartup + (float) duration.TotalSeconds;
-                _callback = callback;
-                _done = false;
+        public override long tick => _tick;
-                this.periodic = periodic;
-                if (periodic) {
-                    _interval = duration;
-                }
+        void _advanceWakeupTime() {
+            if (_milliSeconds > 0) {
+                _wakeupTime += _milliSeconds;
-
-            public TimerImpl(Action callback) {
-                _deadline = 0;
-                _callback = callback;
-                _done = false;
+            else {
+                _wakeupTime = UIMonoState_timerMillisecondClock();
+        }
-            public float deadline {
-                get { return _deadline; }
-            }
+        const long MILLI_TO_NANO = 1000000L;
+        
+        void _enqueue() {
+            Isolate.ensureExists();
+            
+            GCHandle callbackHandle = GCHandle.Alloc(this);
+            UIMonoState_postTaskForTime(_postTaskForTime, (IntPtr) callbackHandle, _wakeupTime * MILLI_TO_NANO);
+        }
-            public override void cancel() {
-                _done = true;
-            }
+        [MonoPInvokeCallback(typeof(UIMonoState_postTaskForTimeCallback))]
+        static void _postTaskForTime(IntPtr callbackHandle) {
+            GCHandle timerHandle = (GCHandle) callbackHandle;
+            var timer = (_Timer) timerHandle.Target;
+            timerHandle.Free();
-            public bool done {
-                get { return _done; }
-            }
-
-            public void invoke() {
-                if (_done) {
-                    return;
-                }
+            try {
+                if (timer._callback != null) {
+                    var callback = timer._callback;
+                    if (!timer._repeating) {
+                        timer._callback = null;
+                    }
+                    else if (timer._milliSeconds > 0) {
+                        var ms = timer._milliSeconds;
+                        long overdue = UIMonoState_timerMillisecondClock() - timer._wakeupTime;
+                        if (overdue > ms) {
+                            long missedTicks = overdue / ms;
+                            timer._wakeupTime += missedTicks * ms;
+                            timer._tick += missedTicks;
+                        }
+                    }
-                var now = timeSinceStartup;
-                if (!periodic) {
-                    _done = true;
-                }
+                    timer._tick += 1;
-                try {
-                    _callback();
-                }
-                catch (Exception ex) {
-                    D.logError("Error to execute timer callback: ", ex);
-                }
+                    callback(timer);
-                if (periodic) {
-                    _deadline = now + (float) _interval.TotalSeconds;
+                    if (timer._repeating && (timer._callback != null)) {
+                        timer._advanceWakeupTime();
+                        timer._enqueue();
+                    }
-
-            public int CompareTo(TimerImpl other) {
-                return deadline.CompareTo(other.deadline);
+            catch (Exception ex) {
+                Debug.LogException(ex);
+
+        [DllImport(NativeBindings.dllName)]
+        static extern long UIMonoState_timerMillisecondClock();
+
+        delegate void UIMonoState_postTaskForTimeCallback(IntPtr callbackHandle);
+
+        [DllImport(NativeBindings.dllName)]
+        static extern void UIMonoState_postTaskForTime(UIMonoState_postTaskForTimeCallback callback,
+            IntPtr callbackHandle, long targetTimeNanos);
-}*/
+}

com.unity.uiwidgets/Runtime/cupertino/button.cs

 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using TextStyle = Unity.UIWidgets.painting.TextStyle;
-using TickerFuture = Unity.UIWidgets.scheduler2.TickerFuture;
+using TickerFuture = Unity.UIWidgets.scheduler.TickerFuture;
 
 namespace Unity.UIWidgets.cupertino {
     public class CupertinoButtonUtils {

com.unity.uiwidgets/Runtime/cupertino/context_menu.cs

 using Unity.UIWidgets.rendering;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using System;
 using Unity.UIWidgets.gestures;
 using Unity.UIWidgets.painting;

com.unity.uiwidgets/Runtime/cupertino/context_menu_action.cs

 using Unity.UIWidgets.gestures;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.rendering;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using TextStyle = Unity.UIWidgets.painting.TextStyle;

com.unity.uiwidgets/Runtime/cupertino/date_picker.cs

 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.rendering;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using UnityEngine;

com.unity.uiwidgets/Runtime/cupertino/localization.cs

 using System;
 using System.Collections.Generic;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;

com.unity.uiwidgets/Runtime/cupertino/refresh.cs

 using System.Collections.Generic;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using UnityEngine;

com.unity.uiwidgets/Runtime/cupertino/route.cs

 using System;
 using System.Collections.Generic;
 using uiwidgets;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.animation;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.gestures;

com.unity.uiwidgets/Runtime/cupertino/scrollbar.cs

 using System;
 using System.Collections.Generic;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.gestures;
 using Unity.UIWidgets.painting;

com.unity.uiwidgets/Runtime/cupertino/slider.cs

 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.gestures;
 using Unity.UIWidgets.rendering;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using UnityEngine;

com.unity.uiwidgets/Runtime/cupertino/switch.cs

 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.gestures;
 using Unity.UIWidgets.rendering;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using UnityEngine;

com.unity.uiwidgets/Runtime/engine/DisplayMetrics.cs

-using System;
 using System.Runtime.InteropServices;
 using Unity.UIWidgets.ui;
 using UnityEngine;
         public float padding_right;
     }
 
-    public static class DisplayMetricsProvider {
-        public static Func<DisplayMetrics> provider = () => new PlayerDisplayMetrics();
-    }
-
-    public interface DisplayMetrics {
-        void OnEnable();
-        void OnGUI();
-        void Update();
-        void onViewMetricsChanged();
-
-        float devicePixelRatio { get; }
-
-        viewMetrics viewMetrics { get; }
-
-        WindowPadding viewPadding { get; }
-
-        WindowPadding viewInsets { get; }
-    }
-
-    public class PlayerDisplayMetrics : DisplayMetrics {
-        float _devicePixelRatio = 0;
-        viewMetrics? _viewMetrics = null;
-
-        public void OnEnable() {
-        }
-
-        public void OnGUI() {
-        }
-
-        public void Update() {
-            
-        }
-
-        public void onViewMetricsChanged() {
-            //view metrics marks dirty
-            _viewMetrics = null;
-        }
+    public class DisplayMetrics {
+        float _devicePixelRatioByDefault;
-        public float devicePixelRatio {
+        public float DevicePixelRatioByDefault {
-                if (_devicePixelRatio > 0) {
-                    return _devicePixelRatio;
+                if (_devicePixelRatioByDefault > 0) {
+                    return _devicePixelRatioByDefault;
-                _devicePixelRatio = AndroidDevicePixelRatio();
-#endif
-
-#if UNITY_WEBGL
-                this._devicePixelRatio = UIWidgetsWebGLDevicePixelRatio();
+                _devicePixelRatioByDefault = AndroidDevicePixelRatio();
-                //this._devicePixelRatio = IOSDeviceScaleFactor();
+                _devicePixelRatioByDefault = IOSDeviceScaleFactor();
-                if (_devicePixelRatio <= 0) {
-                    _devicePixelRatio = 1;
+                if (_devicePixelRatioByDefault <= 0) {
+                    _devicePixelRatioByDefault = 1;
-                return _devicePixelRatio;
+                return _devicePixelRatioByDefault;
-
+        
         public WindowPadding viewPadding {
             get {
                 return new WindowPadding(viewMetrics.padding_left,
             }
         }
 
+        private viewMetrics? _viewMetrics;
+
         public viewMetrics viewMetrics {
             get {
                 if (_viewMetrics != null) {
-#if UNITY_ANDROID
-
+#if UNITY_ANDROID && !UNITY_EDITOR
                 using (
                     AndroidJavaClass viewController =
                         new AndroidJavaClass("com.unity.uiwidgets.plugin.UIWidgetsViewController")
                         padding_bottom = padding_bottom
                     };
                 }
-#elif UNITY_WEBGL
-                this._viewMetrics = new viewMetrics {
-                    insets_bottom = 0,
-                    insets_left = 0,
-                    insets_right = 0,
-                    insets_top = 0,
-                    padding_left = 0,
-                    padding_top = 0,
-                    padding_right = 0,
-                    padding_bottom = 0
-                };
-#elif UNITY_IOS
-                //viewMetrics metrics = IOSGetViewportPadding();
-                //this._viewMetrics = metrics;
+#elif !UNITY_EDITOR && UNITY_IOS
+                viewMetrics metrics = IOSGetViewportPadding();
+                this._viewMetrics = metrics;
 #else
                 _viewMetrics = new viewMetrics {
                     insets_bottom = 0,
                 return _viewMetrics.Value;
             }
         }
+        
+        public void onViewMetricsChanged() {
+            //view metrics marks dirty
+            _viewMetrics = null;
+        }
 
 #if UNITY_ANDROID
         static float AndroidDevicePixelRatio() {
         }
 #endif
 
-#if UNITY_WEBGL
-        [DllImport("__Internal")]
-        static extern float UIWidgetsWebGLDevicePixelRatio();
-#endif
-
-        //[DllImport("__Internal")]
-        //static extern float IOSDeviceScaleFactor();
+        [DllImport("__Internal")]
+        static extern float IOSDeviceScaleFactor();
-		//[DllImport("__Internal")]
-		//static extern viewMetrics IOSGetViewportPadding();
+        [DllImport("__Internal")]
+        static extern viewMetrics IOSGetViewportPadding();
+
     }
 }

com.unity.uiwidgets/Runtime/engine/UIWidgetsMessageManager.cs

 using System.Collections.Generic;
-using System.Runtime.InteropServices;
+using Unity.UIWidgets.engine;
+using Unity.UIWidgets.service;
+using System.Runtime.InteropServices;
+using Unity.UIWidgets.ui;
 using UnityEngine;
 
 namespace Unity.UIWidgets.engine {
         }
 
         void UpdateNameIfNeed() {
-#if UNITY_ANDROID || UNITY_WEBGL
+#if UNITY_IOS || UNITY_ANDROID || UNITY_WEBGL
             var name = gameObject.name;
             if (name != _lastObjectName) {
 
             }  
         }
 
-        Queue<string> messages = new Queue<string>();
-
-            messages.Enqueue(message);
-        }
-
-        public void handlePlatformMessage(){
-            while (!messages.isEmpty()) {
-
-                var message = messages.Dequeue();
-                JSONObject jsonObject = (JSONObject) JSON.Parse(message);
-                string channel = jsonObject["channel"].Value;
-                string method = jsonObject["method"].Value;
-                var args = new List<JSONNode>(jsonObject["args"].AsArray.Children);
-                if (string.IsNullOrEmpty(channel) || string.IsNullOrEmpty(method)) {
-                    Debug.LogError("invalid uiwidgets method message");
-                }
-                else {
-                    MethodChannelMessageDelegate exists;
-                    _methodChannelMessageDelegates.TryGetValue(channel, out exists);
-                    exists?.Invoke(method, args);
-                }
+            JSONObject jsonObject = (JSONObject) JSON.Parse(message);
+            string channel = jsonObject["channel"].Value;
+            string method = jsonObject["method"].Value;
+            var args = new List<JSONNode>(jsonObject["args"].AsArray.Children);
+            if (string.IsNullOrEmpty(channel) || string.IsNullOrEmpty(method)) {
+                Debug.LogError("invalid uiwidgets method message");
+            }
+            else {
+                MethodChannelMessageDelegate exists;
+                _methodChannelMessageDelegates.TryGetValue(channel, out exists);
+                exists?.Invoke(method, args);
-        //[DllImport("__Internal")]
-        //static extern void UIWidgetsMessageSetObjectName(string objectName);
+        [DllImport("__Internal")]
+        static extern void UIWidgetsMessageSetObjectName(string objectName);
 #elif UNITY_ANDROID
         
         static void UIWidgetsMessageSetObjectName(string objectName) {

com.unity.uiwidgets/Runtime/engine/UIWidgetsPanel.cs

-/*using System.Collections.Generic;
-using Unity.UIWidgets.async;
-using Unity.UIWidgets.editor;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Unity.UIWidgets.engine;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.external.simplejson;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.ui;
 using UnityEngine.UI;
 using RawImage = UnityEngine.UI.RawImage;
-using Rect = UnityEngine.Rect;
-using Texture = UnityEngine.Texture;
-    public class UIWidgetWindowAdapter : WindowAdapter {
-        readonly UIWidgetsPanel _uiWidgetsPanel;
-        bool _needsPaint;
+    public enum UIWidgetsWindowType {
+        InvalidPanel = 0,
+        GameObjectPanel = 1,
+        EditorWindowPanel = 2
+    }
+    [Serializable]
+    public struct Font {
+        public string asset;
+        public int weight;
+    }
-        protected override void updateSafeArea() {
-            _padding = _uiWidgetsPanel.viewPadding;
-            _viewInsets = _uiWidgetsPanel.viewInsets;
-        }
+    [Serializable]
+    public struct TextFont {
+        public string family;
+        [SerializeField] public Font[] fonts;
+    }
-        protected override bool hasFocus() {
-            return EventSystem.current != null &&
-                   EventSystem.current.currentSelectedGameObject == _uiWidgetsPanel.gameObject;
-        }
+    public interface IUIWidgetsWindow {
+        Offset windowPosToScreenPos(Offset offset);
-        public override void scheduleFrame(bool regenerateLayerTree = true) {
-            base.scheduleFrame(regenerateLayerTree);
-            _needsPaint = true;
-        }
+        void startCoroutine(IEnumerator routing);
-        public UIWidgetWindowAdapter(UIWidgetsPanel uiWidgetsPanel) {
-            _uiWidgetsPanel = uiWidgetsPanel;
-        }
+        bool isActive();
+
+        void mainEntry();
+        void onNewFrameScheduled();
-        public override void OnGUI(Event evt) {
-            if (displayMetricsChanged()) {
-                _needsPaint = true;
+        UIWidgetsWindowType getWindowType();
+    }
+    public class Configurations {
+        
+        private Dictionary<string, TextFont> _textFonts = new Dictionary<string, TextFont>();
+
+        public void Clear() {
+            _textFonts.Clear();
+        }
+        public void AddFont(string family, TextFont font) {
+           _textFonts[key: family] = font;
+        }
+        public object fontsToObject() {
+            Dictionary<string, TextFont> settings = _textFonts;
+            if (settings == null || settings.Count == 0) {
+                return null;
-            if (evt.type == EventType.Repaint) {
-                if (!_needsPaint) {
-                    return;
+            var result = new object[settings.Count];
+            var i = 0;
+            foreach (var setting in settings) {
+                var font = new Dictionary<string, object>();
+                font.Add("family", value: setting.Key);
+                var dic = new Dictionary<string, object>[setting.Value.fonts.Length];
+                for (var j = 0; j < setting.Value.fonts.Length; j++) {
+                    dic[j] = new Dictionary<string, object>();
+                    if (setting.Value.fonts[j].asset.Length > 0) {
+                        dic[j].Add("asset", value: setting.Value.fonts[j].asset);
+                    }
+
+                    if (setting.Value.fonts[j].weight > 0) {
+                        dic[j].Add("weight", value: setting.Value.fonts[j].weight);
+                    }
-                _needsPaint = false;
+                font.Add("fonts", value: dic);
+                result[i] = font;
+                i++;
-            base.OnGUI(evt);
+            return result;
+    }
-        protected override Surface createSurface() {
-            return new WindowSurfaceImpl(_uiWidgetsPanel.applyRenderTexture);
-        }
+    public partial class UIWidgetsPanel : RawImage, IUIWidgetsWindow {
+        static List<UIWidgetsPanel> panels = new List<UIWidgetsPanel>();
-        public override GUIContent titleContent {
-            get { return new GUIContent(_uiWidgetsPanel.gameObject.name); }
-        }
+        static public Isolate anyIsolate {
+            get {
+                if (panels.Count == 0) {
+                    return null;
+                }
-        protected override float queryDevicePixelRatio() {
-            return _uiWidgetsPanel.devicePixelRatio;
-        }
-        
-        protected override int queryAntiAliasing() {
-            return _uiWidgetsPanel.antiAliasing;
+                return panels[0]._wrapper.isolate;
+            }
-        protected override Vector2 queryWindowSize() {
-            var rect = _uiWidgetsPanel.rectTransform.rect;
-            // Here we use ReferenceEquals instead of "==" due to
-            // https://blogs.unity3d.com/2014/05/16/custom-operator-should-we-keep-it/
-            // In short, "==" is overloaded for UnityEngine.Object and will bring performance issues
-            if (!ReferenceEquals(_uiWidgetsPanel.canvas, null)) {
-                var size = new Vector2(rect.width, rect.height) *
-                           _uiWidgetsPanel.canvas.scaleFactor / _uiWidgetsPanel.devicePixelRatio;
-                size.x = Mathf.Round(size.x);
-                size.y = Mathf.Round(size.y);
-                return size;
-            }
+        static void registerPanel(UIWidgetsPanel panel) {
+            panels.Add(panel);
+        }
-            return new Vector2(0, 0);
+        static void unregisterPanel(UIWidgetsPanel panel) {
+            panels.Remove(panel);
-        public Offset windowPosToScreenPos(Offset windowPos) {
-            Camera camera = null;
-            var canvas = _uiWidgetsPanel.canvas;
-            if (canvas.renderMode != RenderMode.ScreenSpaceCamera) {
-                camera = canvas.GetComponent<GraphicRaycaster>().eventCamera;
-            }
+        float _devicePixelRatioOverride;
-            var pos = new Vector2(windowPos.dx, windowPos.dy);
-            pos = pos * queryDevicePixelRatio() / _uiWidgetsPanel.canvas.scaleFactor;
-            var rectTransform = _uiWidgetsPanel.rectTransform;
-            var rect = rectTransform.rect;
-            pos.x += rect.min.x;
-            pos.y = rect.max.y - pos.y;
-            var worldPos = rectTransform.TransformPoint(new Vector2(pos.x, pos.y));
-            var screenPos = RectTransformUtility.WorldToScreenPoint(camera, worldPos);
-            return new Offset(screenPos.x, Screen.height - screenPos.y);
-        }
-    }
+        public bool hardwareAntiAliasing;
-    [RequireComponent(typeof(RectTransform))]
-    public class UIWidgetsPanel : RawImage, IPointerDownHandler, IPointerUpHandler, IDragHandler,
-        IPointerEnterHandler, IPointerExitHandler, WindowHost {
-        static Event _repaintEvent;
+        public TextFont[] fonts;
-        [Tooltip("set to zero if you want to use the default device pixel ratio of the target platforms; otherwise the " +
-                 "device pixel ratio will be forced to the given value on all devices.")]
-        [SerializeField] protected float devicePixelRatioOverride;
-        
-        [Tooltip("set to true will enable the hardware anti-alias feature, which will improve the appearance of the UI greatly but " +
-                 "making it much slower. Enable it only when seriously required.")]
-        [SerializeField] protected bool hardwareAntiAliasing = false;
-        WindowAdapter _windowAdapter;
-        Texture _texture;
-        Vector2 _lastMouseMove;
+        Configurations _configurations;
-        readonly HashSet<int> _enteredPointers = new HashSet<int>();
-
-        bool _viewMetricsCallbackRegistered;
+        UIWidgetsPanelWrapper _wrapper;
-        bool _mouseEntered {
-            get { return !_enteredPointers.isEmpty(); }
+        int _currentWidth {
+            get { return Mathf.RoundToInt(rectTransform.rect.width * canvas.scaleFactor); }
-        DisplayMetrics _displayMetrics;
-
-        const int mouseButtonNum = 3;
-
-        void _handleViewMetricsChanged(string method, List<JSONNode> args) {
-            _windowAdapter?.onViewMetricsChanged();
-            _displayMetrics?.onViewMetricsChanged();
+        int _currentHeight {
+            get { return Mathf.RoundToInt(rectTransform.rect.height * canvas.scaleFactor); }
-        protected virtual void InitWindowAdapter() {
-            D.assert(_windowAdapter == null);
-            _windowAdapter = new UIWidgetWindowAdapter(this);
+        float _currentDevicePixelRatio {
+            get {
+#if !UNITY_EDITOR
+                return _wrapper.displayMetrics.DevicePixelRatioByDefault;
+#endif
+                var currentDpi = Screen.dpi;
+                if (currentDpi == 0) {
+                    currentDpi = canvas.GetComponent<CanvasScaler>().fallbackScreenDPI;
+                }
-            _windowAdapter.OnEnable();
+                return currentDpi / 96;
+            }
-        protected override void OnEnable() {
-            base.OnEnable();
-
-            //Disable the default touch -> mouse event conversion on mobile devices
-            Input.simulateMouseWithTouches = false;
-
-            _displayMetrics = DisplayMetricsProvider.provider();
-            _displayMetrics.OnEnable();
+        bool _viewMetricsCallbackRegistered;
-            _enteredPointers.Clear();
+        void _handleViewMetricsChanged(string method, List<JSONNode> args) {
+            using (Isolate.getScope(anyIsolate)) {
+                _wrapper.displayMetrics.onViewMetricsChanged();
+                Window.instance.updateSafeArea();
+                Window.instance.onMetricsChanged?.Invoke();
+            }
+        }
+        
+        protected virtual void Update() {
+            UIWidgetsMessageManager.ensureUIWidgetsMessageManagerIfNeeded();
-            if (_repaintEvent == null) {
-                _repaintEvent = new Event {type = EventType.Repaint};
+            if (!_viewMetricsCallbackRegistered) {
+                _viewMetricsCallbackRegistered = true;
+                UIWidgetsMessageManager.instance?.AddChannelMessageDelegate("ViewportMetricsChanged",
+                    _handleViewMetricsChanged);
-            InitWindowAdapter();
+            Input_Update();
+        }
-            Widget root;
-            using (_windowAdapter.getScope()) {
-                root = createWidget();
-            }
+#if !UNITY_EDITOR && UNITY_ANDROID
+        bool AndroidInitialized = true;
-            _windowAdapter.attachRootWidget(root);
-            _lastMouseMove = Input.mousePosition;
+        IEnumerator DoInitAndroid() {
+            yield return new WaitForEndOfFrame();
+            AndroidPlatformUtil.Init();
+            yield return new WaitForEndOfFrame();
+            enabled = true;
-
-        public float devicePixelRatio {
-            get {
-                return devicePixelRatioOverride > 0
-                    ? devicePixelRatioOverride
-                    : _displayMetrics.devicePixelRatio;
+        bool IsAndroidInitialized() {
+            if (AndroidInitialized) {
+                enabled = false;
+                AndroidInitialized = false;
+                startCoroutine(DoInitAndroid());
+                return false;
+            return true;
-        
-        public int antiAliasing {
-            get { return hardwareAntiAliasing ? Window.defaultAntiAliasing : 0; }
-        }
+#endif
-        public WindowPadding viewPadding {
-            get { return _displayMetrics.viewPadding; }
-        }
-
-        public WindowPadding viewInsets {
-            get { return _displayMetrics.viewInsets; }
+        protected void OnEnable() {
+#if !UNITY_EDITOR && UNITY_ANDROID
+            if (!IsAndroidInitialized()) {return ;}
+#endif
+#if !UNITY_EDITOR && UNITY_IOS
+            //the hook API cannot be automatically called on IOS, so we need try hook it here
+            Hooks.tryHook();
+#endif
+            base.OnEnable();
+            
+            D.assert(_wrapper == null);
+            _configurations = new Configurations();
+            _wrapper = new UIWidgetsPanelWrapper();
+            onEnable();
+            if (fonts != null && fonts.Length > 0) {
+                foreach (var font in fonts) {
+                    AddFont(family: font.family, font: font);
+                }
+            }
+            _wrapper.Initiate(this, width: _currentWidth, height: _currentHeight, dpr: _currentDevicePixelRatio,
+                _configurations: _configurations);
+            _configurations.Clear();
+            texture = _wrapper.renderTexture;
+            Input_OnEnable();
+            registerPanel(this);
-            D.assert(_windowAdapter != null);
-            _windowAdapter.OnDisable();
-            _windowAdapter = null;
+            unregisterPanel(this);
+            D.assert(_wrapper != null);
+            _wrapper?.Destroy();
+            _wrapper = null;
+            texture = null;
+            Input_OnDisable();
-        protected virtual Widget createWidget() {
-            return null;
+        protected virtual void OnGUI() {
+            Input_OnGUI();
-        public void recreateWidget() {
-            Widget root;
-            using (_windowAdapter.getScope()) {
-                root = createWidget();
+        protected override void OnRectTransformDimensionsChange() {
+            if (_wrapper != null && _wrapper.didDisplayMetricsChanged(width: _currentWidth, height: _currentHeight,
+                dpr: _currentDevicePixelRatio)) {
+                _wrapper.OnDisplayMetricsChanged(width: _currentWidth, height: _currentHeight,
+                    dpr: _currentDevicePixelRatio);
+                texture = _wrapper.renderTexture;
-
-            _windowAdapter.attachRootWidget(root);
-        internal void applyRenderTexture(Rect screenRect, Texture texture, Material mat) {
-            this.texture = texture;
-            material = mat;
+        public UIWidgetsWindowType getWindowType() {
+            return UIWidgetsWindowType.GameObjectPanel;
-        protected virtual void Update() {
-            _displayMetrics.Update();
-            UIWidgetsMessageManager.ensureUIWidgetsMessageManagerIfNeeded();
+        public bool isActive() {
+            return IsActive();
+        }
-#if UNITY_ANDROID
-            if (Input.GetKeyDown(KeyCode.Escape)) {
-                this._windowAdapter.withBinding(() => { WidgetsBinding.instance.handlePopRoute(); });
-            }
-#endif
+        public void startCoroutine(IEnumerator routing) {
+            StartCoroutine(routine: routing);
+        }
-            if (!_viewMetricsCallbackRegistered) {
-                _viewMetricsCallbackRegistered = true;
-                UIWidgetsMessageManager.instance?.AddChannelMessageDelegate("ViewportMatricsChanged",
-                    _handleViewMetricsChanged);
-            }
+        public void onNewFrameScheduled() {
+        }
-            if (_mouseEntered) {
-                if (_lastMouseMove.x != Input.mousePosition.x || _lastMouseMove.y != Input.mousePosition.y) {
-                    handleMouseMovement();
-                }
+        public Offset windowPosToScreenPos(Offset offset) {
+            Camera camera = null;
+            if (canvas.renderMode != RenderMode.ScreenSpaceCamera) {
+                camera = canvas.GetComponent<GraphicRaycaster>().eventCamera;
-            _lastMouseMove = Input.mousePosition;
-
-            if (_mouseEntered) {
-                handleMouseScroll();
-            }
+            var pos = new Vector2(x: offset.dx, y: offset.dy);
+            pos = pos * _currentDevicePixelRatio / canvas.scaleFactor;
+            var rect = rectTransform.rect;
+            pos.x += rect.min.x;
+            pos.y = rect.max.y - pos.y;
+            var worldPos = rectTransform.TransformPoint(new Vector2(x: pos.x, y: pos.y));
+            var screenPos = RectTransformUtility.WorldToScreenPoint(cam: camera, worldPoint: worldPos);
+            return new Offset(dx: screenPos.x, Screen.height - screenPos.y);
+        }
-            D.assert(_windowAdapter != null);
-            _windowAdapter.Update();
-            _windowAdapter.OnGUI(_repaintEvent);
+        public void mainEntry() {
+            main();
-        void OnGUI() {
-            _displayMetrics.OnGUI();
-            if (Event.current.type == EventType.KeyDown || Event.current.type == EventType.KeyUp) {
-                _windowAdapter.OnGUI(Event.current);
-            }
+        protected virtual void onEnable() {
+        }
+        
+        protected void AddFont(string family, TextFont font) {
+            _configurations.AddFont(family,font);
-        void handleMouseMovement() {
-            var pos = getPointPosition(Input.mousePosition);
-            if (pos == null) {
+        protected void AddFont(string family, List<string> assets, List<int> weights) {
+            if (assets.Count != weights.Count) {
+                Debug.LogError($"The size of {family}‘s assets should be equal to the weights'.");
-            _windowAdapter.postPointerEvent(new PointerData(
-                timeStamp: Timer.timespanSinceStartup,
-                change: PointerChange.hover,
-                kind: PointerDeviceKind.mouse,
-                device: getMouseButtonDown(),
-                physicalX: pos.Value.x,
-                physicalY: pos.Value.y
-            ));
-        }
-        void handleMouseScroll() {
-            if (Input.mouseScrollDelta.y != 0 || Input.mouseScrollDelta.x != 0) {
-                var scaleFactor = canvas.scaleFactor;
-                var pos = getPointPosition(Input.mousePosition);
-                if (pos == null) {
-                    return;
-                }
-                _windowAdapter.onScroll(Input.mouseScrollDelta.x * scaleFactor,
-                    Input.mouseScrollDelta.y * scaleFactor,
-                    pos.Value.x,
-                    pos.Value.y,
-                    InputUtils.getScrollButtonKey());
+            var textFont = new TextFont {family = family};
+            var fonts = new Font[assets.Count];
+            for (var j = 0; j < assets.Count; j++) {
+                var font = new Font {asset = assets[index: j], weight = weights[index: j]};
+                fonts[j] = font;
+
+            textFont.fonts = fonts;
+            AddFont(family: family, font: textFont);
+        }
+        
+        protected virtual void main() {
+    }
-        int getMouseButtonDown() {
-            //default mouse button key = left mouse button
-            var defaultKey = 0;
-            for (int key = 0; key < mouseButtonNum; key++) {
-                if (Input.GetMouseButton(key)) {
-                    defaultKey = key;
-                    break;
-                }
-            }
+    enum UIWidgetsInputMode 
+    {
+        Mouse,
+        Touch
+    }
+
+    public partial class UIWidgetsPanel : IPointerDownHandler, IPointerUpHandler,
+        IPointerEnterHandler, IPointerExitHandler, IDragHandler {
+        bool _isEntered;
+        Vector2 _lastMousePosition;
-            return InputUtils.getMouseButtonKey(defaultKey);
-        }
+        UIWidgetsInputMode _inputMode;
-        public void OnPointerDown(PointerEventData eventData) {
-            var position = getPointPosition(eventData);
-            if (position == null) {
-                return;
-            }
-            EventSystem.current.SetSelectedGameObject(gameObject, eventData);
-            _windowAdapter.postPointerEvent(new PointerData(
-                timeStamp: Timer.timespanSinceStartup,
-                change: PointerChange.down,
-                kind: InputUtils.getPointerDeviceKind(eventData),
-                device: InputUtils.getPointerDeviceKey(eventData),
-                physicalX: position.Value.x,
-                physicalY: position.Value.y
-            ));
+        void _convertPointerData(PointerEventData evt, out Vector2? position, out int pointerId) {
+            position = _inputMode == UIWidgetsInputMode.Mouse
+                ? _getPointerPosition(Input.mousePosition)
+                : _getPointerPosition(evt);
+            pointerId = _inputMode == UIWidgetsInputMode.Mouse ? evt.pointerId : (-1 - evt.pointerId);
-        public void OnPointerUp(PointerEventData eventData) {
-            var position = getPointPosition(eventData);
-            if (position == null) {
-                return;
+        Vector2? _getPointerPosition(Vector2 position) {
+            var worldCamera = canvas.worldCamera;
+            if (RectTransformUtility.ScreenPointToLocalPointInRectangle(
+                rect: rectTransform, screenPoint: position, cam: worldCamera, out var localPoint)) {
+                var scaleFactor = canvas.scaleFactor;
+                localPoint.x = (localPoint.x - rectTransform.rect.min.x) * scaleFactor;
+                localPoint.y = (rectTransform.rect.max.y - localPoint.y) * scaleFactor;
+                return localPoint;
-            _windowAdapter.postPointerEvent(new PointerData(
-                timeStamp: Timer.timespanSinceStartup,
-                change: PointerChange.up,
-                kind: InputUtils.getPointerDeviceKind(eventData),
-                device: InputUtils.getPointerDeviceKey(eventData),
-                physicalX: position.Value.x,
-                physicalY: position.Value.y
-            ));
+
+            return null;
-        Camera getActiveCamera() {
+        Vector2? _getPointerPosition(PointerEventData eventData) {
-            return eventCamera;
-        }
-        Vector2? getPointPosition(PointerEventData eventData) {
-            Camera camera = getActiveCamera();
-                camera, out localPoint);
+                eventCamera, out localPoint);
             var scaleFactor = canvas.scaleFactor;
             localPoint.x = (localPoint.x - rectTransform.rect.min.x) * scaleFactor;
             localPoint.y = (rectTransform.rect.max.y - localPoint.y) * scaleFactor;
-        Vector2? getPointPosition(Vector2 position) {
-            Vector2 localPoint;
-            Camera eventCamera = getActiveCamera();
+        void Input_OnEnable() {
+            _inputMode = Input.mousePresent ? UIWidgetsInputMode.Mouse : UIWidgetsInputMode.Touch;
+        }
-            RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, position,
-                eventCamera, out localPoint);
-            var scaleFactor = canvas.scaleFactor;
-            localPoint.x = (localPoint.x - rectTransform.rect.min.x) * scaleFactor;
-            localPoint.y = (rectTransform.rect.max.y - localPoint.y) * scaleFactor;
-            return localPoint;
+        void Input_OnDisable() {
+        }
+
+        void Input_Update() {
+            //we only process hover events for desktop applications
+            if (_inputMode == UIWidgetsInputMode.Mouse) {
+                if (_isEntered) {
+                    if (!Input.GetMouseButton(0) && !Input.GetMouseButton(1) && !Input.GetMouseButton(2)) {
+                        if (_lastMousePosition.x != Input.mousePosition.x ||
+                            _lastMousePosition.y != Input.mousePosition.y) {
+                            _lastMousePosition = Input.mousePosition;
+                            _onMouseMove();
+                        }
+                    }
+                    else {
+                        _lastMousePosition = Input.mousePosition;
+                    }
+
+                    if (Input.mouseScrollDelta.magnitude != 0) {
+                        _onScroll();
+                    }
+                }
+            }
+        }
+
+        void Input_OnGUI() {
+            var e = Event.current;
+            if (e.isKey) {
+                _wrapper.OnKeyDown(e: e);
+            }
+        }
+
+        void _onMouseMove() {
+            if (_inputMode != UIWidgetsInputMode.Mouse) {
+                return;
+            }
+            var pos = _getPointerPosition(Input.mousePosition);
+            _wrapper.OnMouseMove(pos);
-        public void OnDrag(PointerEventData eventData) {
-            var position = getPointPosition(eventData);
-            if (position == null) {
+        void _onScroll() {
+            if (_inputMode != UIWidgetsInputMode.Mouse) {
-            _windowAdapter.postPointerEvent(new PointerData(
-                timeStamp: Timer.timespanSinceStartup,
-                change: PointerChange.move,
-                kind: InputUtils.getPointerDeviceKind(eventData),
-                device: InputUtils.getPointerDeviceKey(eventData),
-                physicalX: position.Value.x,
-                physicalY: position.Value.y
-            ));
+            var pos = _getPointerPosition(Input.mousePosition);
+            _wrapper.OnMouseScroll(Input.mouseScrollDelta, pos);
-            var position = getPointPosition(eventData);
-            if (position == null) {
+            if (_inputMode != UIWidgetsInputMode.Mouse) {
-            var pointerKey = InputUtils.getPointerDeviceKey(eventData);
-            _enteredPointers.Add(pointerKey);
-
-            _lastMouseMove = eventData.position;
-            _windowAdapter.postPointerEvent(new PointerData(
-                timeStamp: Timer.timespanSinceStartup,
-                change: PointerChange.hover,
-                kind: InputUtils.getPointerDeviceKind(eventData),
-                device: pointerKey,
-                physicalX: position.Value.x,
-                physicalY: position.Value.y
-            ));
+            D.assert(eventData.pointerId < 0);
+            _isEntered = true;
+            _lastMousePosition = Input.mousePosition;
-            var position = getPointPosition(eventData);
-            if (position == null) {
+            if (_inputMode != UIWidgetsInputMode.Mouse) {
-            var pointerKey = InputUtils.getPointerDeviceKey(eventData);
-            _enteredPointers.Remove(pointerKey);
-            _windowAdapter.postPointerEvent(new PointerData(
-                timeStamp: Timer.timespanSinceStartup,
-                change: PointerChange.hover,
-                kind: InputUtils.getPointerDeviceKind(eventData),
-                device: pointerKey,
-                physicalX: position.Value.x,
-                physicalY: position.Value.y
-            ));
+            D.assert(eventData.pointerId < 0);
+            _isEntered = false;
+            _wrapper.OnPointerLeave();
+        }
+
+        public void OnPointerDown(PointerEventData eventData) {
+            _convertPointerData(eventData, out var pos, out var pointerId);
+            _wrapper.OnPointerDown(pos, pointerId);
+        }
+
+        public void OnPointerUp(PointerEventData eventData) {
+            _convertPointerData(eventData, out var pos, out var pointerId);
+            _wrapper.OnPointerUp(pos, pointerId);
-        public Window window {
-            get { return _windowAdapter; }
+        public void OnDrag(PointerEventData eventData) {
+            _convertPointerData(eventData, out var pos, out var pointerId);
+            _wrapper.OnDrag(pos, pointerId);
-}*/
+}

com.unity.uiwidgets/Runtime/engine/UIWidgetsPanel.cs.meta

 fileFormatVersion: 2
-guid: 5f8434687aa245d9ae7f766b6109166b
-timeCreated: 1545642183
+guid: 305c123a2a944eba8f2b397a962323ff
+timeCreated: 1597215247

com.unity.uiwidgets/Runtime/foundation/basic_types.cs

 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.InternalBridge;
 using UnityEngine;
 using Object = UnityEngine.Object;

com.unity.uiwidgets/Runtime/foundation/binding.cs

 using System.Collections;
 using System.Collections.Generic;
 using developer;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.ui;
 
 namespace Unity.UIWidgets.foundation {

com.unity.uiwidgets/Runtime/foundation/debug.cs

 using System;
 using System.Diagnostics;
 using System.Linq;
-using Unity.UIWidgets.engine2;
+using Unity.UIWidgets.engine;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.ui;
 using UnityEngine;

com.unity.uiwidgets/Runtime/foundation/isolates.cs

 using System.ComponentModel;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.ui;
 
 namespace Unity.UIWidgets.foundation {

com.unity.uiwidgets/Runtime/foundation/synchronous_future.cs

 using System;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 
 namespace Unity.UIWidgets.foundation {
     public class SynchronousFuture : Future {

com.unity.uiwidgets/Runtime/gestures/binding.cs

 using System;
 using System.Collections.Generic;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using UnityEngine;
 
                 if (evt is PointerDownEvent) {
                     _hitTests[evt.pointer] = hitTestResult;
                 }
-
-                _hitTests[evt.pointer] = hitTestResult;
                 D.assert(() => {
                     if (D.debugPrintHitTestResults) {
                         Debug.LogFormat("{0}: {1}", evt, hitTestResult);

com.unity.uiwidgets/Runtime/gestures/force_press.cs

 using System.Collections.Generic;
 using System.Linq;
 using Unity.UIWidgets.foundation;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 
 namespace Unity.UIWidgets.gestures {

com.unity.uiwidgets/Runtime/gestures/mouse_tracking.cs

 using System.Collections.Generic;
 using System.Linq;
 using Unity.UIWidgets.foundation;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 
 namespace Unity.UIWidgets.gestures {

com.unity.uiwidgets/Runtime/gestures/multidrag.cs

 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.ui;
 

com.unity.uiwidgets/Runtime/gestures/multitap.cs

 using System;
 using System.Collections.Generic;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.ui;
 

com.unity.uiwidgets/Runtime/gestures/recognizer.cs

 using System;
 using System.Collections.Generic;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.ui;
 using UnityEngine;

com.unity.uiwidgets/Runtime/material/about.cs

 using System.Collections.Generic;
 using developer;
 using uiwidgets;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using TextStyle = Unity.UIWidgets.painting.TextStyle;

com.unity.uiwidgets/Runtime/material/bottom_navigation_bar.cs

 using Unity.UIWidgets.gestures;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.rendering;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.service;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;

com.unity.uiwidgets/Runtime/material/bottom_sheet.cs

 using uiwidgets;
 using Unity.UIWidget.material;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using UnityEngine;

com.unity.uiwidgets/Runtime/material/checkbox.cs

 using Unity.UIWidgets.animation;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.rendering;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using UnityEngine;

com.unity.uiwidgets/Runtime/material/dialog.cs

 using System.Collections.Generic;
 using uiwidgets;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.painting;

com.unity.uiwidgets/Runtime/material/dropdown.cs

 using System.Linq;
 using uiwidgets;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.external;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.gestures;

com.unity.uiwidgets/Runtime/material/feedback.cs

-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.gestures;
 using Unity.UIWidgets.widgets;

com.unity.uiwidgets/Runtime/material/material.cs

 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.rendering;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using TextStyle = Unity.UIWidgets.painting.TextStyle;

com.unity.uiwidgets/Runtime/material/material_localizations.cs

 using System;
 using System.Collections.Generic;
 using System.Text;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;

com.unity.uiwidgets/Runtime/material/pickers/date_picker_dialog.cs

 using System;
 using System.Collections.Generic;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.rendering;

com.unity.uiwidgets/Runtime/material/popup_menu.cs

 using System;
 using System.Collections.Generic;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.gestures;
 using Unity.UIWidgets.painting;

com.unity.uiwidgets/Runtime/material/radio.cs

 using uiwidgets;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.rendering;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 

com.unity.uiwidgets/Runtime/material/range_slider.cs

 using System.Collections.Generic;
 using System.Linq;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using UnityEngine;

com.unity.uiwidgets/Runtime/material/refresh_indicator.cs

 using System;
 using System.Collections.Generic;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.ui;

com.unity.uiwidgets/Runtime/material/scaffold.cs

 using uiwidgets;
 using Unity.UIWidget.material;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using UnityEngine;

com.unity.uiwidgets/Runtime/material/scrollbar.cs

 using System;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.cupertino;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.ui;

com.unity.uiwidgets/Runtime/material/search.cs

 using System.Collections.Generic;
 using uiwidgets;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.service;
 using Unity.UIWidgets.ui;

com.unity.uiwidgets/Runtime/material/selectable_text.cs

 using System;
 using System.Collections.Generic;
 using Unity.UIWidgets.animation;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
 using Unity.UIWidgets.cupertino;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.gestures;

com.unity.uiwidgets/Runtime/material/slider.cs

 using uiwidgets;
 using Unity.UIWidgets.animation;
 using Unity.UIWidgets.async;
-using Unity.UIWidgets.async2;
+using Unity.UIWidgets.async;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using UnityEngine;

com.unity.uiwidgets/Runtime/material/snack_bar.cs

 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.painting;
 using Unity.UIWidgets.rendering;
-using Unity.UIWidgets.scheduler2;
+using Unity.UIWidgets.scheduler;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
 using TextStyle = Unity.UIWidgets.painting.TextStyle;