From 0663a87337972cf245619b5e1555274a10fb83ad Mon Sep 17 00:00:00 2001 From: davr59 Date: Wed, 11 Dec 2019 21:23:34 -0600 Subject: [PATCH 01/13] return dialog when isAndroid --- index.js | 13 ++++++++----- package.json | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/index.js b/index.js index bdcc63c..0a1a392 100644 --- a/index.js +++ b/index.js @@ -15,7 +15,7 @@ if (platform.isAndroid) { feedback.addProperty(p, properties[p]); } } - feedback.show(); + return feedback.show(); }; } else { exports.showDoorbellFeedback = function( @@ -33,11 +33,14 @@ if (platform.isAndroid) { } } if (viewController) { - feedback.showFeedbackDialogInViewControllerCompletion(viewController, error => { - if (error) { - throw error; + feedback.showFeedbackDialogInViewControllerCompletion( + viewController, + error => { + if (error) { + throw error; + } } - }); + ); } }; } diff --git a/package.json b/package.json index d03d088..5f480e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-doorbell.io", - "version": "0.0.6", + "version": "0.0.7", "homepage": "https://github.com/codeparticle/nativescript-doorbell.io", "nativescript": { "platforms": { From ea05ed76f40bbef5b5a8e0100b1c2a5788411b61 Mon Sep 17 00:00:00 2001 From: davr59 Date: Thu, 12 Dec 2019 05:53:34 -0600 Subject: [PATCH 02/13] change null to undefined --- index.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 0a1a392..eeb9e30 100644 --- a/index.js +++ b/index.js @@ -4,7 +4,11 @@ var platform = require('platform'); var exports = {}; if (platform.isAndroid) { - exports.showDoorbellFeedback = function(appId, appKey, properties = null) { + exports.showDoorbellFeedback = function( + appId, + appKey, + properties = undefined + ) { const feedback = new io.doorbell.android.Doorbell( application.android.startActivity, parseInt(appId), @@ -22,7 +26,7 @@ if (platform.isAndroid) { appId, appKey, viewController, - properties = null, + properties = undefined, animated = true ) { const feedback = Doorbell.alloc().initWithApiKeyAppId(appKey, appId); From afbf917f10810d7a1d30964a70c6f40295c7e4db Mon Sep 17 00:00:00 2001 From: davr59 Date: Sun, 9 Feb 2020 22:34:12 -0600 Subject: [PATCH 03/13] fix android function signature so is similar to ios --- index.js | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index eeb9e30..0b63096 100644 --- a/index.js +++ b/index.js @@ -7,6 +7,7 @@ if (platform.isAndroid) { exports.showDoorbellFeedback = function( appId, appKey, + viewController, properties = undefined ) { const feedback = new io.doorbell.android.Doorbell( diff --git a/package.json b/package.json index 5f480e0..bb18a6a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-doorbell.io", - "version": "0.0.7", + "version": "0.0.8", "homepage": "https://github.com/codeparticle/nativescript-doorbell.io", "nativescript": { "platforms": { From a32f0a8f356c11694335cf57b23fee3b13ff55c0 Mon Sep 17 00:00:00 2001 From: davr59 Date: Mon, 10 Feb 2020 18:05:04 -0600 Subject: [PATCH 04/13] change var to let --- index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 0b63096..5df2de6 100644 --- a/index.js +++ b/index.js @@ -16,7 +16,7 @@ if (platform.isAndroid) { appKey ); if (properties) { - for (var p in properties) { + for (let p in properties) { feedback.addProperty(p, properties[p]); } } @@ -33,7 +33,7 @@ if (platform.isAndroid) { const feedback = Doorbell.alloc().initWithApiKeyAppId(appKey, appId); feedback.animated = animated; if (properties) { - for (var p in properties) { + for (let p in properties) { feedback.addPropertyWithNameAndValue(p, properties[p]); } } From 85e32582bafb42a9c874208e4336c7333006370f Mon Sep 17 00:00:00 2001 From: davr59 Date: Mon, 10 Feb 2020 18:12:01 -0600 Subject: [PATCH 05/13] restore version 0.0.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bb18a6a..5f480e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-doorbell.io", - "version": "0.0.8", + "version": "0.0.7", "homepage": "https://github.com/codeparticle/nativescript-doorbell.io", "nativescript": { "platforms": { From fc787c929205ba214f97e28e9d69198fd4211b0d Mon Sep 17 00:00:00 2001 From: David V <[davr59@outlook.com](mailto:davr59@outlook.com)> Date: Fri, 2 Apr 2021 09:42:49 -0600 Subject: [PATCH 06/13] update nativescript --- index.js | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/index.js b/index.js index 5df2de6..e445ec6 100644 --- a/index.js +++ b/index.js @@ -1,17 +1,11 @@ -var application = require('application'); -var platform = require('platform'); +import { Application, isAndroid } from '@nativescript/core'; var exports = {}; -if (platform.isAndroid) { - exports.showDoorbellFeedback = function( - appId, - appKey, - viewController, - properties = undefined - ) { +if (isAndroid) { + exports.showDoorbellFeedback = function (appId, appKey, viewController, properties = undefined) { const feedback = new io.doorbell.android.Doorbell( - application.android.startActivity, + Application.android.startActivity, parseInt(appId), appKey ); @@ -23,7 +17,7 @@ if (platform.isAndroid) { return feedback.show(); }; } else { - exports.showDoorbellFeedback = function( + exports.showDoorbellFeedback = function ( appId, appKey, viewController, @@ -38,14 +32,11 @@ if (platform.isAndroid) { } } if (viewController) { - feedback.showFeedbackDialogInViewControllerCompletion( - viewController, - error => { - if (error) { - throw error; - } + feedback.showFeedbackDialogInViewControllerCompletion(viewController, (error) => { + if (error) { + throw error; } - ); + }); } }; } From 706f1befadcb747ba982e45f59a6afef86660333 Mon Sep 17 00:00:00 2001 From: David V <[davr59@outlook.com](mailto:davr59@outlook.com)> Date: Fri, 2 Apr 2021 10:06:20 -0600 Subject: [PATCH 07/13] test --- index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index e445ec6..713ca12 100644 --- a/index.js +++ b/index.js @@ -1,9 +1,9 @@ import { Application, isAndroid } from '@nativescript/core'; -var exports = {}; +let showDoorbellFeedback; if (isAndroid) { - exports.showDoorbellFeedback = function (appId, appKey, viewController, properties = undefined) { + showDoorbellFeedback = function (appId, appKey, viewController, properties = undefined) { const feedback = new io.doorbell.android.Doorbell( Application.android.startActivity, parseInt(appId), @@ -17,7 +17,7 @@ if (isAndroid) { return feedback.show(); }; } else { - exports.showDoorbellFeedback = function ( + showDoorbellFeedback = function ( appId, appKey, viewController, @@ -41,4 +41,4 @@ if (isAndroid) { }; } -module.exports = exports; +export { showDoorbellFeedback }; From 5f6e579253d894e439d38608ed7e76629153aa9d Mon Sep 17 00:00:00 2001 From: David V Date: Sat, 14 Jan 2023 22:46:08 -0600 Subject: [PATCH 08/13] update gradle --- platforms/android/include.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/android/include.gradle b/platforms/android/include.gradle index c230c85..82e1db3 100644 --- a/platforms/android/include.gradle +++ b/platforms/android/include.gradle @@ -4,5 +4,5 @@ repositories { } dependencies { - compile "io.doorbell:android-sdk:0.3.0@aar" + implementation "io.doorbell:android-sdk:0.3.0@aar" } \ No newline at end of file From d9543ba91d949e920053bd10566386d91816d934 Mon Sep 17 00:00:00 2001 From: David V Date: Sun, 15 Jan 2023 16:20:10 -0600 Subject: [PATCH 09/13] update nativescript --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5f480e0..a18a1b6 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "homepage": "https://github.com/codeparticle/nativescript-doorbell.io", "nativescript": { "platforms": { - "ios": "1.3.0", - "android": "1.2.0" + "ios": "6.0.0", + "android": "6.0.0" } } } From 000fc6680d3944d53cbe59d4145d4702ab7c3ea4 Mon Sep 17 00:00:00 2001 From: David V Date: Sun, 15 Jan 2023 17:35:47 -0600 Subject: [PATCH 10/13] test version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a18a1b6..a07273b 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "homepage": "https://github.com/codeparticle/nativescript-doorbell.io", "nativescript": { "platforms": { - "ios": "6.0.0", - "android": "6.0.0" + "ios": "7.0.0", + "android": "7.0.0" } } } From 71af5a794b1291bdc0a42fbf060e24ec103761b0 Mon Sep 17 00:00:00 2001 From: David V Date: Mon, 16 Jan 2023 21:30:25 -0600 Subject: [PATCH 11/13] test --- platforms/android/include.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/android/include.gradle b/platforms/android/include.gradle index 82e1db3..f58c214 100644 --- a/platforms/android/include.gradle +++ b/platforms/android/include.gradle @@ -4,5 +4,5 @@ repositories { } dependencies { - implementation "io.doorbell:android-sdk:0.3.0@aar" + implementation "io.doorbell:android-sdk:0.4.7@aar" } \ No newline at end of file From 3649a6488c218eceeca5fbc33416aa6e33200527 Mon Sep 17 00:00:00 2001 From: David V Date: Mon, 16 Jan 2023 22:04:43 -0600 Subject: [PATCH 12/13] test --- platforms/android/include.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/android/include.gradle b/platforms/android/include.gradle index f58c214..82e1db3 100644 --- a/platforms/android/include.gradle +++ b/platforms/android/include.gradle @@ -4,5 +4,5 @@ repositories { } dependencies { - implementation "io.doorbell:android-sdk:0.4.7@aar" + implementation "io.doorbell:android-sdk:0.3.0@aar" } \ No newline at end of file From 85b2f933b6210a36a6c15c62c942f8329081cddf Mon Sep 17 00:00:00 2001 From: David V Date: Mon, 16 Jan 2023 22:15:22 -0600 Subject: [PATCH 13/13] test --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a07273b..5f480e0 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "homepage": "https://github.com/codeparticle/nativescript-doorbell.io", "nativescript": { "platforms": { - "ios": "7.0.0", - "android": "7.0.0" + "ios": "1.3.0", + "android": "1.2.0" } } }