From 6d88267d504d8a74159d26bf941f53106427f9f9 Mon Sep 17 00:00:00 2001 From: etikhonov Date: Sun, 30 Mar 2025 05:36:02 +0300 Subject: [PATCH 1/4] draft --- .gitignore | 2 ++ packages/.DS_Store | Bin 10244 -> 0 bytes ...ocation.podspec => NitraGeolocation.podspec} | 2 +- packages/capacitor-plugin/android/build.gradle | 3 ++- .../plugins/geolocation/GeolocationPlugin.kt | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 packages/.DS_Store rename packages/capacitor-plugin/{CapacitorGeolocation.podspec => NitraGeolocation.podspec} (94%) diff --git a/.gitignore b/.gitignore index 3c3629e..333efab 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ node_modules +packages/.DS_Store +.idea diff --git a/packages/.DS_Store b/packages/.DS_Store deleted file mode 100644 index be773d101cdb05c00f14a158ddf61e8705e4d223..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10244 zcmeHMYitx%6uxI#=nSPWg|@UTYgbE2Ek#OcOQ8tcc6oy!+c)U4yEC*CW@nb2*cT;lAST9knHgy=*e5?Mx6lx}hn za1n43a1n43a1r<~B7kc)O?)wvZtf!BBH$u0h5(%(eE3l5x8*34*3^NSbp$|Jh}BlY zcRUAJHa=VWZ8^%MWr}^W(*xM1U>`AnnPa<;s-yJVa+FDCPJo#cutx^_gaX#+Xy>!k z3HX_Ga~A;@f$<2?vwJZK6AjPpiLCQ`L^7gkMAubnG=Yjbv?3VQV{xlrcX-m`4jt^)2iURAmh$MP9dk&U-l0tH|k) zSk|R$W?0eWgk_*eGOFzDQ#46Wcj`$^GA!F5Yv2W52#HlABP*I(TN-?=ZOw-pd?Txy z8XJ7gt<8rI3w(La^7h@K18Pjuk6Eq|u%|py!pdX$aeSN7(af(nrE>Q7yf2o|0IHGd zVn`NLI7oisASnpNp5DIxfsiOB4SBb$hD{|U2g0Uogv7Z9g1RNDYr7J13c>7)>S{8k zVM}Q=tVWZlEO)4CP`Ot&`c3(eN#6zyJz;iPiv0@O(z=j1kJ|5yn~JU(y>h}pDF|m~ zmwRtnvb3>f&HBLR?Yl0O%$X|+^Mta#lwv3mRqjbEk~usOHlng7DcaB=ek09P_A7Ei zD1~;RTMNhJOJc=>%BqDPPp-DpOMfz=984dvoWeYHw)q${9Xwi*r7|bN6BjO zRC{W9eh;nhO30YAYN5_kFNk5j+dyYn7t4g@f@lcc2arh2v`J{@MM>yU!x33!RjY*6 zytqy1OEHgGE^`?Xd^0GO2OE{ z&%i>6ukqJ2-ddp6_#0WNjES+FZUd@F16fBll0l4JjikwOa)O*BPm>qO8S*-LmwZe< zA)k`Z$VKus`IdZ7ej>k-KLEo7WTot#FtKsT6yhf#obHa3xm7SdH#J8y<&q&$x5qI!fQRLmYY4etUC5pbBP2;9? z-u$xin`-KoHMO?;$Ed}~=GlO_4RW($O268_8`~gLlecBSVURPU!vO8 zKEW%_z-VB_#kE+RiIKpHx7K^TB8LIUinlHI3St3~GXyyWb>crRrJ|(eZ`qia;I(FBysHcJnP1Us_^oIuH z9GpPt!Y^T-!mU8o1|V}?oK!JuO(cP*rs_BoDAaxOeA?RSOgcs;Ncq}i0fcPAR8C}a z2px@CI~^GvrhA|`%5l4)O!uc@mIcPFQ(vrQ5-&Bh;pWzB0N{<#K35ye}85jpK_YAfFkEE;*dES z696(!>uNM$9}a9eTGdnqNALeP;2w2?|Nn1%AY2b!1pdbe zKw%&lpr=%4+mMR|y=(X3vkxDdsNN`(mI-E5h1Ofw@mQeO@pX2ceb%?y{dV0bla@K! bS>`C&ZT{c>XMlVD&;J(9J^$a3=l?$e;xZ7i diff --git a/packages/capacitor-plugin/CapacitorGeolocation.podspec b/packages/capacitor-plugin/NitraGeolocation.podspec similarity index 94% rename from packages/capacitor-plugin/CapacitorGeolocation.podspec rename to packages/capacitor-plugin/NitraGeolocation.podspec index 5b18988..81e4851 100644 --- a/packages/capacitor-plugin/CapacitorGeolocation.podspec +++ b/packages/capacitor-plugin/NitraGeolocation.podspec @@ -3,7 +3,7 @@ require 'json' package = JSON.parse(File.read(File.join(__dir__, 'package.json'))) Pod::Spec.new do |s| - s.name = 'CapacitorGeolocation' + s.name = 'NitraGeolocation' s.version = package['version'] s.summary = package['description'] s.license = package['license'] diff --git a/packages/capacitor-plugin/android/build.gradle b/packages/capacitor-plugin/android/build.gradle index 41b25ee..5373bc1 100644 --- a/packages/capacitor-plugin/android/build.gradle +++ b/packages/capacitor-plugin/android/build.gradle @@ -58,7 +58,8 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation("io.ionic.libs:iongeolocation-android:1.0.0") + implementation 'com.github.nitra:ion-android-geolocation:fake-SNAPSHOT' + implementation project(':capacitor-android') implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion" diff --git a/packages/capacitor-plugin/android/src/main/kotlin/com/capacitorjs/plugins/geolocation/GeolocationPlugin.kt b/packages/capacitor-plugin/android/src/main/kotlin/com/capacitorjs/plugins/geolocation/GeolocationPlugin.kt index b5b158a..c9a70cb 100644 --- a/packages/capacitor-plugin/android/src/main/kotlin/com/capacitorjs/plugins/geolocation/GeolocationPlugin.kt +++ b/packages/capacitor-plugin/android/src/main/kotlin/com/capacitorjs/plugins/geolocation/GeolocationPlugin.kt @@ -259,6 +259,7 @@ class GeolocationPlugin : Plugin() { locationResult.altitudeAccuracy?.let { put("altitudeAccuracy", it) } put("speed", locationResult.speed) put("heading", locationResult.heading) + put("isMock", location.isMock); } return JSObject().apply { put("timestamp", locationResult.timestamp) From 1e1459b582a269a1d13e62956cc93de33840dd6c Mon Sep 17 00:00:00 2001 From: etikhonov Date: Sun, 30 Mar 2025 05:36:13 +0300 Subject: [PATCH 2/4] jitpack.io --- packages/capacitor-plugin/android/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/capacitor-plugin/android/build.gradle b/packages/capacitor-plugin/android/build.gradle index 5373bc1..9b2ee2d 100644 --- a/packages/capacitor-plugin/android/build.gradle +++ b/packages/capacitor-plugin/android/build.gradle @@ -53,6 +53,7 @@ kotlin { repositories { google() mavenCentral() + maven { url 'https://jitpack.io' } } From d217a3f991b2ae55f00614fb3e56fc46d4f44149 Mon Sep 17 00:00:00 2001 From: etikhonov Date: Sun, 30 Mar 2025 05:44:01 +0300 Subject: [PATCH 3/4] fix put --- .../com/capacitorjs/plugins/geolocation/GeolocationPlugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/capacitor-plugin/android/src/main/kotlin/com/capacitorjs/plugins/geolocation/GeolocationPlugin.kt b/packages/capacitor-plugin/android/src/main/kotlin/com/capacitorjs/plugins/geolocation/GeolocationPlugin.kt index c9a70cb..681b18e 100644 --- a/packages/capacitor-plugin/android/src/main/kotlin/com/capacitorjs/plugins/geolocation/GeolocationPlugin.kt +++ b/packages/capacitor-plugin/android/src/main/kotlin/com/capacitorjs/plugins/geolocation/GeolocationPlugin.kt @@ -259,7 +259,7 @@ class GeolocationPlugin : Plugin() { locationResult.altitudeAccuracy?.let { put("altitudeAccuracy", it) } put("speed", locationResult.speed) put("heading", locationResult.heading) - put("isMock", location.isMock); + put("isMock", locationResult.isMock) } return JSObject().apply { put("timestamp", locationResult.timestamp) From 4cb4787c27c98ae59b4b9983a9bc824f17da0fe0 Mon Sep 17 00:00:00 2001 From: vitaliytv Date: Sun, 30 Mar 2025 12:27:49 +0300 Subject: [PATCH 4/4] chore: increment package version to 7.1.3 for capacitor plugin --- packages/capacitor-plugin/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/capacitor-plugin/package.json b/packages/capacitor-plugin/package.json index 7bd1b94..0d31775 100644 --- a/packages/capacitor-plugin/package.json +++ b/packages/capacitor-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@nitra/geolocation", - "version": "7.1.2", + "version": "7.1.3", "description": "The Geolocation API provides simple methods for getting and tracking the current position of the device using GPS, along with altitude, heading, and speed information if available.", "main": "dist/plugin.cjs.js", "module": "dist/esm/index.js",