Merge branch 'master' into border-outline

manoldonev · web-flow · commit 1562b07de222 · 2019-03-29T19:27:39.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [5.3.1](https://github.com/NativeScript/NativeScript/compare/5.3.0...5.3.1) (2019-03-28)
+
+
+### Bug Fixes
+
+* revert fromUrl deprecate warning ([#7082](https://github.com/NativeScript/NativeScript/issues/7082)) ([0a45540](https://github.com/NativeScript/NativeScript/commit/0a45540))
+
+
 <a name="5.3.0"></a>
 # [5.3.0](https://github.com/NativeScript/NativeScript/compare/5.2.1...5.3.0) (2019-03-21)
 
diff --git a/tns-core-modules/image-source/image-source.android.ts b/tns-core-modules/image-source/image-source.android.ts
@@ -246,8 +246,6 @@ export function fromNativeSource(source: any): ImageSource {
 }
 
 export function fromUrl(url: string): Promise<ImageSourceDefinition> {
-    console.log("imageSource.fromUrl(url) is deprecated; use http.getImage(url) instead");
-
     ensureHttp();
     return http.getImage(url);
 }
diff --git a/tns-core-modules/image-source/image-source.ios.ts b/tns-core-modules/image-source/image-source.ios.ts
@@ -237,8 +237,6 @@ export function fromNativeSource(source: any): ImageSource {
 }
 
 export function fromUrl(url: string): Promise<ImageSource> {
-    console.log("imageSource.fromUrl(url) is deprecated; use http.getImage(url) instead");
-
     ensureHttp();
     return http.getImage(url);
 }
diff --git a/tns-core-modules/ui/core/view/view.ios.ts b/tns-core-modules/ui/core/view/view.ios.ts
@@ -904,6 +904,14 @@ export namespace ios {
             return controller;
         }
 
+        public viewDidLoad(): void {
+            super.viewDidLoad();
+    
+            // Unify translucent and opaque bars layout
+            // this.edgesForExtendedLayout = UIRectEdgeBottom;
+            this.extendedLayoutIncludesOpaqueBars = true;
+        }
+
         public viewWillLayoutSubviews(): void {
             super.viewWillLayoutSubviews();
             const owner = this.owner.get();
@@ -959,9 +967,6 @@ export namespace ios {
                 return;
             }
 
-            // Unify translucent and opaque bars layout
-            this.extendedLayoutIncludesOpaqueBars = true;
-
             updateAutoAdjustScrollInsets(this, owner);
 
             if (!owner.parent) {
diff --git a/tns-core-modules/ui/page/page.ios.ts b/tns-core-modules/ui/page/page.ios.ts
@@ -68,6 +68,14 @@ class UIViewControllerImpl extends UIViewController {
         return controller;
     }
 
+    public viewDidLoad(): void {
+        super.viewDidLoad();
+
+        // Unify translucent and opaque bars layout
+        // this.edgesForExtendedLayout = UIRectEdgeBottom;
+        this.extendedLayoutIncludesOpaqueBars = true;
+    }
+
     public viewWillAppear(animated: boolean): void {
         super.viewWillAppear(animated);
         const owner = this._owner.get();
@@ -100,9 +108,6 @@ class UIViewControllerImpl extends UIViewController {
             frame._updateActionBar(owner);
         }
 
-        // Unify translucent and opaque bars layout
-        this.extendedLayoutIncludesOpaqueBars = true;
-
         // Set autoAdjustScrollInsets in will appear - as early as possible
         iosView.updateAutoAdjustScrollInsets(this, owner);
 
diff --git a/tns-core-modules/ui/tab-view/tab-view.ios.ts b/tns-core-modules/ui/tab-view/tab-view.ios.ts
@@ -28,6 +28,14 @@ class UITabBarControllerImpl extends UITabBarController {
         return handler;
     }
 
+    public viewDidLoad(): void {
+        super.viewDidLoad();
+
+        // Unify translucent and opaque bars layout
+        // this.edgesForExtendedLayout = UIRectEdgeBottom;
+        this.extendedLayoutIncludesOpaqueBars = true;
+    }
+
     @profile
     public viewWillAppear(animated: boolean): void {
         super.viewWillAppear(animated);
@@ -36,9 +44,6 @@ class UITabBarControllerImpl extends UITabBarController {
             return;
         }
 
-        // Unify translucent and opaque bars layout
-        this.extendedLayoutIncludesOpaqueBars = true;
-
         iosView.updateAutoAdjustScrollInsets(this, owner);
 
         if (!owner.parent) {

Original file line number	Diff line number	Diff line change
`@@ -246,8 +246,6 @@ export function fromNativeSource(source: any): ImageSource {`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`export function fromUrl(url: string): Promise<ImageSourceDefinition> {`
`249`		`- console.log("imageSource.fromUrl(url) is deprecated; use http.getImage(url) instead");`
`250`		`-`
`251`	`249`	`ensureHttp();`
`252`	`250`	`return http.getImage(url);`
`253`	`251`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,8 +237,6 @@ export function fromNativeSource(source: any): ImageSource {`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`export function fromUrl(url: string): Promise<ImageSource> {`
`240`		`- console.log("imageSource.fromUrl(url) is deprecated; use http.getImage(url) instead");`
`241`		`-`
`242`	`240`	`ensureHttp();`
`243`	`241`	`return http.getImage(url);`
`244`	`242`	`}`