diff --git a/apps/app/App_Resources/iOS/icon.png b/apps/app/App_Resources/iOS/icon.png index 6dca6255b..76f61ec1f 100644 Binary files a/apps/app/App_Resources/iOS/icon.png and b/apps/app/App_Resources/iOS/icon.png differ diff --git a/apps/app/App_Resources/iOS/icon@2x.png b/apps/app/App_Resources/iOS/icon@2x.png deleted file mode 100644 index 4213bf531..000000000 Binary files a/apps/app/App_Resources/iOS/icon@2x.png and /dev/null differ diff --git a/apps/app/App_Resources/iOS/icon@3x.png b/apps/app/App_Resources/iOS/icon@3x.png deleted file mode 100644 index 76baa2c62..000000000 Binary files a/apps/app/App_Resources/iOS/icon@3x.png and /dev/null differ diff --git a/apps/app/App_Resources/iOS/testlogo.jpg b/apps/app/App_Resources/iOS/testlogo.jpg new file mode 100644 index 000000000..102a9b134 Binary files /dev/null and b/apps/app/App_Resources/iOS/testlogo.jpg differ diff --git a/apps/app/ui-tests-app/web-view/web-view-test.xml b/apps/app/ui-tests-app/web-view/web-view-test.xml index 0c4a05ca1..954ddcf4c 100644 --- a/apps/app/ui-tests-app/web-view/web-view-test.xml +++ b/apps/app/ui-tests-app/web-view/web-view-test.xml @@ -7,8 +7,8 @@ - - + + diff --git a/tns-core-modules/ui/image/image.ios.ts b/tns-core-modules/ui/image/image.ios.ts index f0945a925..2642ab2ab 100644 --- a/tns-core-modules/ui/image/image.ios.ts +++ b/tns-core-modules/ui/image/image.ios.ts @@ -53,8 +53,8 @@ export class Image extends ImageBase { let height = layout.getMeasureSpecSize(heightMeasureSpec); let heightMode = layout.getMeasureSpecMode(heightMeasureSpec); - let nativeWidth = this.imageSource ? this.imageSource.width : 0; - let nativeHeight = this.imageSource ? this.imageSource.height : 0; + let nativeWidth = this.imageSource ? layout.toDevicePixels(this.imageSource.width) : 0; + let nativeHeight = this.imageSource ? layout.toDevicePixels(this.imageSource.height) : 0; let measureWidth = Math.max(nativeWidth, this.effectiveMinWidth); let measureHeight = Math.max(nativeHeight, this.effectiveMinHeight);