fix(android): correctly clean up android bitmaps

Author: farfromrefug

src/ui-carto/index.android.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-redeclare */
-import { Color, Font } from '@nativescript/core';
+import { Color, Font, ImageAsset, ImageSource } from '@nativescript/core';
 import { NativePropertyOptions } from '.';
 import { DefaultLatLonKeys, GenericMapPos, MapPos, MapPosVector, MapPosVectorVector, fromNativeMapVec, toNativeMapPos, toNativeMapVec } from './core';
 import { Geometry } from './geometry';
@@ -9,6 +9,13 @@ import { BaseVectorElementStyleBuilder } from './vectorelements';
 export { nativeProperty };
 export { BaseNative } from './BaseNative';
 
+export function getCartoBitmap(src: string | ImageSource | ImageAsset) {
+    const bitmap = _createImageSourceFromSrc(src);
+    const result = com.carto.utils.BitmapUtils.createBitmapFromAndroidBitmap(bitmap.android as android.graphics.Bitmap);
+    (bitmap.android as android.graphics.Bitmap).recycle();
+    return result;
+}
+
 export function nativeColorProperty(target: any, k?, desc?: PropertyDescriptor): any;
 export function nativeColorProperty(options: NativePropertyOptions): (target: any, k?, desc?: PropertyDescriptor) => any;
 export function nativeColorProperty(...args) {
@@ -96,8 +103,7 @@ export function nativeCartoImageProperty(...args) {
                     return this.options[key];
                 },
                 toNative(value) {
-                    value = _createImageSourceFromSrc(value);
-                    return com.carto.utils.BitmapUtils.createBitmapFromAndroidBitmap(value.android as android.graphics.Bitmap);
+                    return getCartoBitmap(value);
                 }
             }
         },

src/ui-carto/index.d.ts

@@ -1,10 +1,12 @@
 /* eslint-disable no-redeclare */
-import { Observable } from '@nativescript/core';
+import { ImageAsset, ImageSource, Observable } from '@nativescript/core';
 import { DefaultLatLonKeys, GenericMapPos, MapPosVector, MapPosVectorVector } from './core';
 import { Geometry } from './geometry';
 import { FeatureCollection } from './geometry/feature';
 import { BaseVectorElementStyleBuilder } from './vectorelements';
 
+export function getCartoBitmap(src: string | ImageSource | ImageAsset): any;
+
 // type BaseInterface<T> = {
 //     [K in keyof T]: T[K];
 // };

src/ui-carto/index.ios.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-redeclare */
-import { Color, Font } from '@nativescript/core';
+import { Color, Font, ImageAsset, ImageSource } from '@nativescript/core';
 import { NativePropertyOptions } from '.';
 import { DefaultLatLonKeys, MapPos, MapPosVector, MapPosVectorVector, fromNativeMapVec, toNativeMapPos, toNativeMapVec } from './core';
 import { Geometry } from './geometry';
@@ -9,6 +9,11 @@ export { BaseNative } from './BaseNative';
 import { BaseVectorElementStyleBuilder } from './vectorelements';
 export { nativeProperty };
 
+export function getCartoBitmap(src: string | ImageSource | ImageAsset) {
+    const bitmap = _createImageSourceFromSrc(src);
+    return NTBitmapUtils.createBitmapFromUIImage(bitmap.ios as UIImage);
+}
+
 export function nativeColorProperty(target: any, k?, desc?: PropertyDescriptor): any;
 export function nativeColorProperty(options: NativePropertyOptions): (target: any, k?, desc?: PropertyDescriptor) => any;
 export function nativeColorProperty(...args) {
@@ -93,8 +98,7 @@ export function nativeCartoImageProperty(...args) {
                     return this.options[key];
                 },
                 toNative(value) {
-                    value = _createImageSourceFromSrc(value);
-                    return NTBitmapUtils.createBitmapFromUIImage(value.ios as UIImage);
+                    return getCartoBitmap(value);
                 }
             }
         },