javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-15 19:26:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(android-images): set decodeHeight/decodeWidth default values to dip (#5490)

Browse Source 
BREAKING CHANGE: change decodeHeight/decodeWidth properties to accept device independent pixels by default
This commit is contained in:
Alexander Djenkov
2018-03-07 15:56:28 +02:00
committed by GitHub
parent 92148833d3
commit 6509efa430
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tns-core-modules/ui/image/image-common.ts
View File

@ -1,5 +1,5 @@
import { Image as ImageDefinition, Stretch } from "."; import { Image as ImageDefinition, Stretch } from ".";
import { View, Property, InheritedCssProperty, Style, Color, isIOS, booleanConverter } from "../core/view"; import { View, Property, InheritedCssProperty, Length, Style, Color, isIOS, booleanConverter } from "../core/view";
import { ImageAsset } from "../../image-asset"; import { ImageAsset } from "../../image-asset";
import { ImageSource, fromAsset, fromNativeSource, fromUrl } from "../../image-source"; import { ImageSource, fromAsset, fromNativeSource, fromUrl } from "../../image-source";
import { isDataURI, isFileOrResourcePath, RESOURCE_PREFIX } from "../../utils/utils"; import { isDataURI, isFileOrResourcePath, RESOURCE_PREFIX } from "../../utils/utils";
@ -13,6 +13,8 @@ export abstract class ImageBase extends View implements ImageDefinition {
public isLoading: boolean; public isLoading: boolean;
public stretch: Stretch; public stretch: Stretch;
public loadMode: "sync" | "async"; public loadMode: "sync" | "async";
public decodeWidth: Length;
public decodeHeight: Length;
get tintColor(): Color { get tintColor(): Color {
return this.style.tintColor; return this.style.tintColor;
@ -118,4 +120,10 @@ export const stretchProperty = new Property<ImageBase, Stretch>({ name: "stretch
stretchProperty.register(ImageBase); stretchProperty.register(ImageBase);
export const tintColorProperty = new InheritedCssProperty<Style, Color>({ name: "tintColor", cssName: "tint-color", equalityComparer: Color.equals, valueConverter: (value) => new Color(value) }); export const tintColorProperty = new InheritedCssProperty<Style, Color>({ name: "tintColor", cssName: "tint-color", equalityComparer: Color.equals, valueConverter: (value) => new Color(value) });
tintColorProperty.register(Style); tintColorProperty.register(Style);
export const decodeHeightProperty = new Property<ImageBase, Length>({ name: "decodeHeight", defaultValue: { value: 0, unit: "dip" }, valueConverter: Length.parse });
decodeHeightProperty.register(ImageBase);
export const decodeWidthProperty = new Property<ImageBase, Length>({ name: "decodeWidth", defaultValue: { value: 0, unit: "dip" }, valueConverter: Length.parse });
decodeWidthProperty.register(ImageBase);

12
tns-core-modules/ui/image/image.android.ts
View File

@ -1,6 +1,6 @@
import { import {
ImageSource, ImageAsset, ImageBase, stretchProperty, imageSourceProperty, srcProperty, tintColorProperty, Color, ImageSource, ImageAsset, ImageBase, stretchProperty, imageSourceProperty, srcProperty, tintColorProperty, Color,
isDataURI, isFileOrResourcePath, RESOURCE_PREFIX isDataURI, isFileOrResourcePath, RESOURCE_PREFIX, Length
} from "./image-common"; } from "./image-common";
import { knownFolders } from "../../file-system"; import { knownFolders } from "../../file-system";
@ -43,8 +43,6 @@ function initializeImageLoadedListener() {
export class Image extends ImageBase { export class Image extends ImageBase {
nativeViewProtected: org.nativescript.widgets.ImageView; nativeViewProtected: org.nativescript.widgets.ImageView;
public decodeWidth = 0;
public decodeHeight = 0;
public useCache = true; public useCache = true;
public createNativeView() { public createNativeView() {
@ -52,7 +50,7 @@ export class Image extends ImageBase {
AndroidImageView = org.nativescript.widgets.ImageView; AndroidImageView = org.nativescript.widgets.ImageView;
} }
initializeImageLoadedListener(); initializeImageLoadedListener();
const imageView = new AndroidImageView(this._context); const imageView = new AndroidImageView(this._context);
const listener = new ImageLoadedListener(this); const listener = new ImageLoadedListener(this);
imageView.setImageLoadedListener(listener); imageView.setImageLoadedListener(listener);
@ -73,7 +71,7 @@ export class Image extends ImageBase {
public resetNativeView(): void { public resetNativeView(): void {
super.resetNativeView(); super.resetNativeView();
this.nativeViewProtected.setImageMatrix(new android.graphics.Matrix()); this.nativeViewProtected.setImageMatrix(new android.graphics.Matrix());
} }
public _createImageSourceFromSrc(value: string | ImageSource | ImageAsset) { public _createImageSourceFromSrc(value: string | ImageSource | ImageAsset) {
@ -89,8 +87,8 @@ export class Image extends ImageBase {
let screen = platform.screen.mainScreen; let screen = platform.screen.mainScreen;
let decodeWidth = Math.min(this.decodeWidth, screen.widthPixels); let decodeWidth = Math.min(Length.toDevicePixels(this.decodeWidth, 0), screen.widthPixels);
let decodeHeight = Math.min(this.decodeHeight, screen.heightPixels); let decodeHeight = Math.min(Length.toDevicePixels(this.decodeHeight, 0), screen.heightPixels);
let keepAspectRatio = this._calculateKeepAspectRatio(); let keepAspectRatio = this._calculateKeepAspectRatio();
if (value instanceof ImageAsset) { if (value instanceof ImageAsset) {
if (value.options) { if (value.options) {