Merge branch 'master' of github.com:UnityTech/UIWidgets into dev

Author: zhuxingwei

README-ZH.md

@@ -49,7 +49,8 @@ https://github.com/UnityTech/DocCN 查看。
 ## 使用要求
 
 #### Unity
-安装 Unity 2018.3 或更高版本。 你可以从[https://unity3d.com/get-unity/download](https://unity3d.com/get-unity/download)下载最新的Unity。
+
+安装 **Unity 2018.4.10f1(LTS)** 或 **Unity 2019.1.14f1** 及其更高版本。 你可以从[https://unity3d.com/get-unity/download](https://unity3d.com/get-unity/download)下载最新的Unity。
 
 #### UIWidgets包
 

README.md

@@ -55,10 +55,11 @@ and iOS (Searching for "Unity Connect" in App Store). This project is open-sourc
 The official website of Unity Chinese Documentation (https://connect.unity.com/doc) is powered by UIWidgets and
 open-sourced @https://github.com/UnityTech/DocCN.
 
-## Requirement
+## Requirements
 
 #### Unity
-Install **Unity 2018.3** or above. You can download the latest Unity on https://unity3d.com/get-unity/download.
+
+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.
 
 #### UIWidgets Package
 Visit our Github repository https://github.com/UnityTech/UIWidgets

Runtime/cupertino/route.cs

@@ -42,6 +42,7 @@ public class CupertinoRouteUtils {
         );
 
         public static readonly DecorationTween _kGradientShadowTween = new DecorationTween(
+            begin: _CupertinoEdgeShadowDecoration.none,
             end: new _CupertinoEdgeShadowDecoration(
                 edgeGradient: new LinearGradient(
                     begin: new Alignment(0.9f, 0.0f),
@@ -107,7 +108,8 @@ WidgetBuilder builder
                 barrierDismissible: false,
                 barrierColor: _kModalBarrierColor,
                 transitionDuration: new TimeSpan(0, 0, 0, 0, 250),
-                pageBuilder: (BuildContext _context, Animation<float> animation, Animation<float> secondaryAnimation) => {
+                pageBuilder:
+                (BuildContext _context, Animation<float> animation, Animation<float> secondaryAnimation) => {
                     return builder(_context);
                 },
                 transitionBuilder: _buildCupertinoDialogTransitions
@@ -127,7 +129,7 @@ public _CupertinoEdgeShadowDecoration(
 
         public readonly LinearGradient edgeGradient;
 
-        static _CupertinoEdgeShadowDecoration lerp(
+        static _CupertinoEdgeShadowDecoration lerpCupertino(
             _CupertinoEdgeShadowDecoration a,
             _CupertinoEdgeShadowDecoration b,
             float t
@@ -143,18 +145,18 @@ float t
 
         public override Decoration lerpFrom(Decoration a, float t) {
             if (!(a is _CupertinoEdgeShadowDecoration)) {
-                return lerp(null, this, t);
+                return lerpCupertino(null, this, t);
             }
 
-            return lerp(a, this, t);
+            return lerpCupertino((_CupertinoEdgeShadowDecoration) a, this, t);
         }
 
         public override Decoration lerpTo(Decoration b, float t) {
             if (!(b is _CupertinoEdgeShadowDecoration)) {
-                return lerp(this, null, t);
+                return lerpCupertino(this, null, t);
             }
 
-            return lerp(this, b, t);
+            return lerpCupertino(this, (_CupertinoEdgeShadowDecoration) b, t);
         }
 
         public override BoxPainter createBoxPainter(VoidCallback onChanged = null) {

Runtime/material/bottom_navigation_bar.cs

@@ -348,7 +348,7 @@ public override Widget build(BuildContext context) {
                     child: text
                 );
             }
-            else if (this.showUnselectedLabels) {
+            else if (!this.showUnselectedLabels) {
                 text = new FadeTransition(
                     opacity: this.animation,
                     child: text
@@ -576,6 +576,7 @@ public override Widget build(BuildContext context) {
             Color backgroundColor = null;
             switch (this.widget.type) {
                 case BottomNavigationBarType.fix:
+                    backgroundColor = this.widget.backgroundColor;
                     break;
                 case BottomNavigationBarType.shifting:
                     backgroundColor = this._backgroundColor;

Runtime/rendering/sliver_multi_box_adaptor.cs

@@ -36,8 +36,12 @@ public class SliverMultiBoxAdaptorParentData : ContainerParentDataMixinSliverLog
 
         public bool keepAlive = false;
 
-        internal bool _keptAlive = false;
+        public bool keptAlive {
+            get { return this._keptAlive; }
+        }
 
+        internal bool _keptAlive = false;
+        
         public override string ToString() {
             return $"index={this.index}; {(this.keepAlive ? "keeyAlive; " : "")}{base.ToString()}";
         }
@@ -80,6 +84,7 @@ bool _debugAssertChildListLocked() {
         }
 
         public override void insert(RenderBox child, RenderBox after = null) {
+            D.assert(!this._keepAliveBucket.ContainsValue(value: child));
             base.insert(child, after: after);
             D.assert(this.firstChild != null);
             D.assert(() => {

Runtime/widgets/automatic_keep_alive.cs

@@ -67,6 +67,9 @@ bool _addClient(KeepAliveNotification notification) {
                 }
                 else {
                     SchedulerBinding.instance.addPostFrameCallback(timeStamp => {
+                        if (!this.mounted) {
+                            return;
+                        }
                         ParentDataElement childElement1 = this._getChildElement();
                         D.assert(childElement1 != null);
                         this._updateParentDataOfChild(childElement1);
@@ -78,6 +81,7 @@ bool _addClient(KeepAliveNotification notification) {
         }
 
         ParentDataElement _getChildElement() {
+            D.assert(this.mounted);
             Element element = (Element) this.context;
             Element childElement = null;
             element.visitChildren((Element child) => { childElement = child; });

Runtime/widgets/routes.cs

@@ -605,7 +605,7 @@ public void removeScopedWillPopCallback(WillPopCallback callback) {
             this._willPopCallbacks.Remove(callback);
         }
 
-        protected internal bool hasScopedWillPopCallback {
+        public bool hasScopedWillPopCallback {
             get { return this._willPopCallbacks.isNotEmpty(); }
         }
 

Runtime/widgets/sliver.cs

@@ -355,29 +355,27 @@ protected override void performRebuild() {
             this._currentBeforeChild = null;
             D.assert(this._currentlyUpdatingChildIndex == null);
             try {
-                int firstIndex = 0;
-                int lastIndex = 0;
-
-                if (!this._childElements.isEmpty()) {
-                    firstIndex = this._childElements.First().Key;
-                    lastIndex = this._childElements.Last().Key;
-                    if (this._didUnderflow) {
-                        lastIndex += 1;
-                    }
-                }
-
-                for (int index = firstIndex; index <= lastIndex; ++index) {
+                void processElement(int index) {
                     this._currentlyUpdatingChildIndex = index;
                     Element newChild = this.updateChild(this._childElements.getOrDefault(index), this._build(index),
                         index);
                     if (newChild != null) {
                         this._childElements[index] = newChild;
-                        this._currentBeforeChild = (RenderBox) newChild.renderObject;
+                        var parentData = (SliverMultiBoxAdaptorParentData) newChild.renderObject.parentData;
+                        if (!parentData.keptAlive) {
+                            this._currentBeforeChild = (RenderBox) newChild.renderObject;
+                        }
                     }
                     else {
                         this._childElements.Remove(index);
                     }
                 }
+                // processElement may modify the Map - need to do a .toList() here.
+                this._childElements.Keys.ToList().ForEach(action: processElement);
+                if (this._didUnderflow) {
+                    var lastKey = this._childElements?.Last().Key ?? -1;
+                    processElement(lastKey + 1);
+                }
             }
             finally {
                 this._currentlyUpdatingChildIndex = null;