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

refactor(image-source): throw if source is not a correct native instance (#5273)

Browse Source 
* refactor(image-source): throw if source is not a correct native instance

* refactor(image-source): fromNativeSource and setNativeSource methods

* refactor: update image-source.d.ts file

BREAKING CHANGE:

Change the return type of `setNativeSource` method from `boolean` to `void`.
This commit is contained in:
Vasil Chimev
2018-01-23 16:57:29 +02:00
committed by GitHub
parent 1f77301453
commit 58d61caf59
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tns-core-modules/image-source/image-source.android.ts
View File

@@ -139,9 +139,11 @@ export class ImageSource implements ImageSourceDefinition {
}); });
} }
public setNativeSource(source: any): boolean { public setNativeSource(source: any): void {
if (source && !(source instanceof android.graphics.Bitmap)) {
throw new Error("The method setNativeSource() expects android.graphics.Bitmap instance.");
}
this.android = source; this.android = source;
return source != null;
} }
public saveToFile(path: string, format: "png" | "jpeg" | "jpg", quality = 100): boolean { public saveToFile(path: string, format: "png" | "jpeg" | "jpg", quality = 100): boolean {
@@ -239,8 +241,9 @@ export function fromBase64(source: string): ImageSource {
} }
export function fromNativeSource(source: any): ImageSource { export function fromNativeSource(source: any): ImageSource {
const image = new ImageSource(); const imageSource = new ImageSource();
return image.setNativeSource(source) ? image : null; imageSource.setNativeSource(source);
return imageSource;
} }
export function fromUrl(url: string): Promise<ImageSourceDefinition> { export function fromUrl(url: string): Promise<ImageSourceDefinition> {

4
tns-core-modules/image-source/image-source.d.ts vendored
View File

@@ -88,11 +88,11 @@ export class ImageSource {
fromBase64(source: string): Promise<boolean>; fromBase64(source: string): Promise<boolean>;
/** /**
* Sets the provided native source object (typically a Bitmap). * Sets the provided native source object (typically a Bitmap or a UIImage).
* This will update either the android or ios properties, depending on the target os. * This will update either the android or ios properties, depending on the target os.
* @param source The native image object. Will be either a Bitmap for Android or a UIImage for iOS. * @param source The native image object. Will be either a Bitmap for Android or a UIImage for iOS.
*/ */
setNativeSource(source: any): boolean; setNativeSource(source: any): void;
/** /**
* Saves this instance to the specified file, using the provided image format and quality. * Saves this instance to the specified file, using the provided image format and quality.

13
tns-core-modules/image-source/image-source.ios.ts
View File

@@ -118,11 +118,11 @@ export class ImageSource implements ImageSourceDefinition {
}); });
} }
public setNativeSource(source: any): boolean { public setNativeSource(source: any): void {
if (source instanceof UIImage) { if (source && !(source instanceof UIImage)) {
this.ios = source; throw new Error("The method setNativeSource() expects UIImage instance.");
} }
return source != null; this.ios = source;
} }
public saveToFile(path: string, format: "png" | "jpeg" | "jpg", quality?: number): boolean { public saveToFile(path: string, format: "png" | "jpeg" | "jpg", quality?: number): boolean {
@@ -221,8 +221,9 @@ export function fromBase64(source: string): ImageSource {
} }
export function fromNativeSource(source: any): ImageSource { export function fromNativeSource(source: any): ImageSource {
const image = new ImageSource(); const imageSource = new ImageSource();
return image.setNativeSource(source) ? image : null; imageSource.setNativeSource(source);
return imageSource;
} }
export function fromUrl(url: string): Promise<ImageSource> { export function fromUrl(url: string): Promise<ImageSource> {