Merge branch 'master' into yczhang

Author: Yuncong Zhang

README-ZH.md

@@ -179,6 +179,8 @@ UIWidgets也支持Gif！
 当一个Unity项目运行在Android设备上时，状态栏是默认隐藏且无法在编辑内进行调整的。
 如果您希望在您的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。
 默认的逻辑是在界面静止时将帧率降低为25，在界面变动时将帧率提高至60。

README.md

@@ -208,7 +208,13 @@ Status bar is always hidden by default when an Unity project is running on an An
  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.
+ 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
 

Runtime/InternalBridge.meta

@@ -0,0 +1,12 @@
+{
+    "name": "Unity.InternalAPIEngineBridge.024",
+    "references": [],
+    "optionalUnityReferences": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": []
+}

Runtime/InternalBridge/InternalBridge.asmdef

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+
+namespace Unity.UIWidgets.InternalBridge {
+    public static class NoAllocHelpersBridge<T> {
+        public static T[] ExtractArrayFromListT(List<T> list) {
+            return UnityEngine.NoAllocHelpers.ExtractArrayFromListT(list);
+        }
+
+        public static void ResizeList(List<T> list, int size) {
+            if (size < list.Count) {
+                list.RemoveRange(size, list.Count - size);
+                return;
+            }
+
+            if (size == list.Count) {
+                return;
+            }
+
+            if (list.Capacity < size) {
+                list.Capacity = size;
+            }
+
+            UnityEngine.NoAllocHelpers.ResizeList(list, size);
+        }
+
+        public static void EnsureListElemCount(List<T> list, int size) {
+            list.Clear();
+            if (list.Capacity < size) {
+                list.Capacity = size;
+            }
+
+            ResizeList(list, size);
+        }
+    }
+}

Runtime/InternalBridge/InternalBridge.asmdef.meta

@@ -35,7 +35,7 @@ public static UIWidgetsViewController getInstance() {
     private boolean keyboardOpen;
 
     private void setup() {
-        Log.i("tag", "On Setup");
+        //Log.i("tag", "On Setup 2");
 
         keyboardOpen = false;
         viewMetrics = new UIWidgetsViewMetrics();
@@ -111,7 +111,7 @@ private boolean hasNavigationBar() {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        
+        //Log.i("UIWidgetsDebug", " hasBar: " + hasBar);
         return hasBar;
     }
 
@@ -120,6 +120,8 @@ public void updateViewMetrics() {
         Rect rect = new Rect();
         unityView.getWindowVisibleDisplayFrame(rect);
 
+        //Log.i("UIWidgetsDebug", "calculation: " + unityView.getRootView().getHeight() + " " + rect.bottom + " " + rect.top);
+        
         rect.bottom = unityView.getRootView().getHeight() - (rect.bottom - rect.top) - rect.top;
         rect.right = unityView.getRootView().getWidth() - (rect.right - rect.left) - rect.left;
 
@@ -129,9 +131,6 @@ public void updateViewMetrics() {
         ZeroSides zeroSides = ZeroSides.NONE;
         if (navigationBarHidden) {
             zeroSides = calculateShouldZeroSides(unityView);
-        } else {
-            rect.bottom -= getNavigationBarHeight();
-            rect.bottom = rect.bottom > 0 ? rect.bottom : 0;
         }
 
         viewMetrics.padding_top = rect.top;
@@ -143,6 +142,10 @@ public void updateViewMetrics() {
         viewMetrics.insets_right = 0;
         viewMetrics.insets_bottom = navigationBarHidden? calculateBottomKeyboardInset(rect) : rect.bottom;
         viewMetrics.insets_left = 0;
+        
+        //Log.i("UIWidgetsDebug", "checks: " + navigationBarHidden + " " + rect.bottom);
+        //Log.i("UIWidgetsDebug", " padding: " + viewMetrics.padding_top + " " + viewMetrics.padding_right + " " + viewMetrics.padding_bottom + " " + viewMetrics.padding_left);
+        //Log.i("UIWidgetsDebug", " insets: " + viewMetrics.insets_top + " " + viewMetrics.insets_right + " " + viewMetrics.insets_bottom + " " + viewMetrics.insets_left);
     }
 
     public void setupViewMetricsChangedListener() {

Runtime/InternalBridge/NoAllocHelpersBridge.cs

@@ -1,6 +1,8 @@
 {
     "name": "Unity.UIWidgets",
-    "references": [],
+    "references": [
+        "Unity.InternalAPIEngineBridge.024"
+    ],
     "optionalUnityReferences": [],
     "includePlatforms": [],
     "excludePlatforms": [],

Runtime/ui/painting/NoAllocHelpers.cs.meta renamed to Runtime/InternalBridge/NoAllocHelpersBridge.cs.meta

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Unity.UIWidgets.ui;
+using Unity.UIWidgets.InternalBridge;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
@@ -135,16 +135,16 @@ public static string toStringList<T>(this IList<T> it) {
         }
 
         public static void reset<T>(this List<T> list, int size) {
-            NoAllocHelpers<T>.EnsureListElemCount(list, size);
+            NoAllocHelpersBridge<T>.EnsureListElemCount(list, size);
         }
 
         public static ref T refAt<T>(this List<T> list, int index) {
-            var array = NoAllocHelpers<T>.ExtractArrayFromListT(list);
+            var array = NoAllocHelpersBridge<T>.ExtractArrayFromListT(list);
             return ref array[index];
         }
 
         public static T[] array<T>(this List<T> list) {
-            return NoAllocHelpers<T>.ExtractArrayFromListT(list);
+            return NoAllocHelpersBridge<T>.ExtractArrayFromListT(list);
         }
     }
 }