From 8bb53c6cafb899be51265617c3e6d9b3b1fc0b6e Mon Sep 17 00:00:00 2001 From: aajain Date: Thu, 9 Apr 2020 15:44:48 +0530 Subject: [PATCH 1/4] fix(android): renmae property zoom to zoomLevel to avoid conflict with zoom named method. Fixes MOD-2559 --- android/src/ti/map/ViewProxy.java | 8 ++++---- apidoc/View.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/src/ti/map/ViewProxy.java b/android/src/ti/map/ViewProxy.java index cea3e457..d7bd9bf4 100644 --- a/android/src/ti/map/ViewProxy.java +++ b/android/src/ti/map/ViewProxy.java @@ -194,7 +194,7 @@ public boolean handleMessage(Message msg) case MSG_ZOOM: { result = (AsyncResult) msg.obj; - result.setResult(handleGetZoom()); + result.setResult(handleGetZoomLevel()); return true; } @@ -1138,17 +1138,17 @@ public void handleZoom(int delta) // clang-format off @Kroll.method @Kroll.getProperty - public float getZoom() + public float getZoomLevel() // clang-format on { if (TiApplication.isUIThread()) { - return handleGetZoom(); + return handleGetZoomLevel(); } else { return (Float) TiMessenger.sendBlockingMainMessage(getMainHandler().obtainMessage(MSG_ZOOM)); } } - private float handleGetZoom() + private float handleGetZoomLevel() { TiUIView view = peekView(); if (view instanceof TiUIMapView) { diff --git a/apidoc/View.yml b/apidoc/View.yml index 3b52f42f..40d73d23 100644 --- a/apidoc/View.yml +++ b/apidoc/View.yml @@ -917,7 +917,7 @@ properties: since: "3.2.3" platforms: [android] - - name: zoom + - name: zoomLevel summary: The zoom level of the map. description: | For more details, see [Google Docs](https://developers.google.com/maps/documentation/android/views#zoom). From cc5b6e914a4166f8dc14a0831110b7c41bfa5692 Mon Sep 17 00:00:00 2001 From: aajain Date: Mon, 13 Apr 2020 14:15:29 +0530 Subject: [PATCH 2/4] upgraded version and set "since" value of the zoomLevel attribute --- android/manifest | 2 +- apidoc/View.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/manifest b/android/manifest index 7a47004a..ad02390d 100644 --- a/android/manifest +++ b/android/manifest @@ -2,7 +2,7 @@ # this is your module manifest and used by Titanium # during compilation, packaging, distribution, etc. # -version: 5.0.1 +version: 5.0.2 apiversion: 4 architectures: arm64-v8a armeabi-v7a x86 x86_64 description: External version of Map module using native Google Maps library diff --git a/apidoc/View.yml b/apidoc/View.yml index 40d73d23..0f7217d0 100644 --- a/apidoc/View.yml +++ b/apidoc/View.yml @@ -923,7 +923,7 @@ properties: For more details, see [Google Docs](https://developers.google.com/maps/documentation/android/views#zoom). Cannot be used in conjunction with [longitudeDelta](MapRegionTypev2.longitudeDelta) or [latitudeDelta](MapRegionTypev2.latitudeDelta) type: Number - since: "3.2.3" + since: "5.0.2" platforms: [android] --- From 7d1134c3e0a7b92a9bb1b7b0115974a0020aeb94 Mon Sep 17 00:00:00 2001 From: aajain Date: Fri, 17 Apr 2020 13:41:18 +0530 Subject: [PATCH 3/4] version bump in the package.json file --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 96c33747..235278d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@titanium-sdk/ti.map", - "version": "5.0.1", + "version": "5.0.2", "description": "Provides Map UI elements for Titanium applications", "scripts": { "commit": "git-cz", From 0394fc21ea092feb102ce254f8313e36e5189b95 Mon Sep 17 00:00:00 2001 From: aajain Date: Mon, 20 Apr 2020 12:39:48 +0530 Subject: [PATCH 4/4] updated package-lock.json file by npm install command. --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index d7ff709c..78a6c4dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@titanium-sdk/ti.map", - "version": "5.0.1", + "version": "5.0.2", "lockfileVersion": 1, "requires": true, "dependencies": {