@rodrigo7/react-native-beacons-manager 1.0.0 → 1.0.2

package/.eslintrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: '@react-native',
+};

package/ReactNativeBeaconsManager.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ReactNativeBeaconsManager"
-  s.version      = "1.0.0"
+  s.version      = "1.0.1"
   s.summary      = "React-Native library for detecting beacons (iOS and Android)"
   s.homepage     = "https://github.com/rodrigo-nexudus/react-native-beacons-manager#readme"
   s.license      = { :type => "MIT" }

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Thu Aug 03 10:59:04 BST 2023
+gradle.version=8.0.1

package/android/.idea/gradle.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

package/android/.idea/misc.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Embedded JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

package/android/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

package/android/.project

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>android</name>
-	<comment>Project android created by Buildship.</comment>
+	<name>react-native-beacons-manager</name>
 	<projects>
 	</projects>
 	<buildSpec>

package/android/build.gradle

@@ -1,30 +1,30 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+      classpath("com.android.tools.build:gradle:8.1.0")
     }
 }
 
 apply plugin: 'com.android.library'
 
-
-def DEFAULT_COMPILE_SDK_VERSION             = 28
-def DEFAULT_BUILD_TOOLS_VERSION             = "28.0.3"
-def DEFAULT_TARGET_SDK_VERSION              = 23
+def DEFAULT_COMPILE_SDK_VERSION             = 33
+def DEFAULT_BUILD_TOOLS_VERSION             = "33.0.0"
+def DEFAULT_TARGET_SDK_VERSION              = 33
 
 android {
     compileSdkVersion project.hasProperty('compileSdkVersion') ? project.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
     buildToolsVersion project.hasProperty('buildToolsVersion') ? project.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
 
     defaultConfig {
+        namespace 'com.mackentoch.beaconsandroid'
         minSdkVersion 16
         targetSdkVersion project.hasProperty('targetSdkVersion') ? project.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.2"
     }
 }
 
@@ -103,6 +103,6 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.facebook.react:react-native:0.67.2'
+    implementation 'com.facebook.react:react-native:0.72.3'
     implementation 'org.altbeacon:android-beacon-library:2.19.6'
 }

package/android/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Thu Aug 03 10:59:00 BST 2023
+sdk.dir=/Users/nexudus/Library/Android/sdk

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.mackentoch.beaconsandroid">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>

package/android/src/main/java/com/mackentoch/beaconsandroid/BeaconsAndroidModule.java

@@ -54,10 +54,6 @@ public class BeaconsAndroidModule extends ReactContextBaseJavaModule {
         this.mBeaconManager = BeaconManager.getInstanceForApplication(mApplicationContext);
         this.mBeaconManager.addRangeNotifier(mRangeNotifier);
         this.mBeaconManager.addMonitorNotifier(mMonitorNotifier);
-        // need to bind at instantiation so that service loads (to test more)
-        //mBeaconManager.getBeaconParsers().add(new BeaconParser().setBeaconLayout("m:0-3=4c000215,i:4-19,i:20-21,i:22-23,p:24-24"));
-
-        //mBeaconManager.getBeaconParsers().add(new BeaconParser().setBeaconLayout("m:2-3=0215,i:4-19,i:20-21,i:22-23,p:24-24"));
     }
 
     @Override
@@ -83,27 +79,11 @@ public class BeaconsAndroidModule extends ReactContextBaseJavaModule {
     Beacon.setHardwareEqualityEnforced(e.booleanValue());
   }
 
-  /*public void bindManager() {
-    if (!mBeaconManager.isBound(this)) {
-      Log.d(LOG_TAG, "BeaconsAndroidModule - bindManager: ");
-      mBeaconManager.bind(this);
-    }
-  }*/
-
-  /*public void unbindManager() {
-    if (mBeaconManager.isBound(this)) {
-      Log.d(LOG_TAG, "BeaconsAndroidModule - unbindManager: ");
-      mBeaconManager.unbind(this);
-    }
-  }*/
-
   @ReactMethod
   public void addParser(String parser, Callback resolve, Callback reject) {
     try {
       Log.d(LOG_TAG, "BeaconsAndroidModule - addParser: " + parser);
-      //unbindManager();
       mBeaconManager.getBeaconParsers().add(new BeaconParser().setBeaconLayout(parser));
-      //bindManager();
       resolve.invoke();
     } catch (Exception e) {
       reject.invoke(e.getMessage());
@@ -114,9 +94,7 @@ public class BeaconsAndroidModule extends ReactContextBaseJavaModule {
   public void removeParser(String parser, Callback resolve, Callback reject) {
     try {
       Log.d(LOG_TAG, "BeaconsAndroidModule - removeParser: " + parser);
-      //unbindManager();
       mBeaconManager.getBeaconParsers().remove(new BeaconParser().setBeaconLayout(parser));
-      //bindManager();
       resolve.invoke();
     } catch (Exception e) {
       reject.invoke(e.getMessage());
@@ -126,13 +104,11 @@ public class BeaconsAndroidModule extends ReactContextBaseJavaModule {
   @ReactMethod
   public void addParsersListToDetection(ReadableArray parsers, Callback resolve, Callback reject) {
     try {
-      //unbindManager();
       for (int i = 0; i < parsers.size(); i++) {
         String parser = parsers.getString(i);
         Log.d(LOG_TAG, "addParsersListToDetection - add parser: " + parser);
         mBeaconManager.getBeaconParsers().add(new BeaconParser().setBeaconLayout(parser));
       }
-      //bindManager();
       resolve.invoke(parsers);
     } catch (Exception e) {
       reject.invoke(e.getMessage());
@@ -142,13 +118,11 @@ public class BeaconsAndroidModule extends ReactContextBaseJavaModule {
   @ReactMethod
   public void removeParsersListToDetection(ReadableArray parsers, Callback resolve, Callback reject) {
     try {
-      //unbindManager();
       for (int i = 0; i < parsers.size(); i++) {
         String parser = parsers.getString(i);
         Log.d(LOG_TAG, "removeParsersListToDetection - remove parser: " + parser);
         mBeaconManager.getBeaconParsers().remove(new BeaconParser().setBeaconLayout(parser));
       }
-      //bindManager();
       resolve.invoke(parsers);
     } catch (Exception e) {
       reject.invoke(e.getMessage());
@@ -208,7 +182,7 @@ public class BeaconsAndroidModule extends ReactContextBaseJavaModule {
       for (Region region: mBeaconManager.getMonitoredRegions()) {
           WritableMap map = new WritableNativeMap();
           map.putString("identifier", region.getUniqueId());
-          map.putString("uuid", region.getId1().toString());
+          map.putString("uuid", region.getId1() != null ? region.getId1().toString() : "");
           map.putInt("major", region.getId2() != null ? region.getId2().toInt() : 0);
           map.putInt("minor", region.getId3() != null ? region.getId3().toInt() : 0);
           array.pushMap(map);
@@ -228,36 +202,6 @@ public class BeaconsAndroidModule extends ReactContextBaseJavaModule {
       callback.invoke(array);
   }
 
-  /***********************************************************************************************
-   * BeaconConsumer
-   **********************************************************************************************/
-  /*@Override
-  public void onBeaconServiceConnect() {
-    Log.v(LOG_TAG, "onBeaconServiceConnect");
-
-    // deprecated since v2.9 (see github: https://github.com/AltBeacon/android-beacon-library/releases/tag/2.9)
-    // mBeaconManager.setMonitorNotifier(mMonitorNotifier);
-    // mBeaconManager.setRangeNotifier(mRangeNotifier);
-    mBeaconManager.addMonitorNotifier(mMonitorNotifier);
-    mBeaconManager.addRangeNotifier(mRangeNotifier);
-    sendEvent(mReactContext, "beaconServiceConnected", null);
-  }
-
-  @Override
-  public Context getApplicationContext() {
-      return mApplicationContext;
-  }
-
-  @Override
-  public void unbindService(ServiceConnection serviceConnection) {
-      mApplicationContext.unbindService(serviceConnection);
-  }
-
-  @Override
-  public boolean bindService(Intent intent, ServiceConnection serviceConnection, int i) {
-      return mApplicationContext.bindService(intent, serviceConnection, i);
-  }*/
-
   /***********************************************************************************************
    * Monitoring
    **********************************************************************************************/
@@ -271,7 +215,6 @@ public class BeaconsAndroidModule extends ReactContextBaseJavaModule {
             String.valueOf(minor).equals("-1") ? "" : String.valueOf(minor),
             String.valueOf(major).equals("-1") ? "" : String.valueOf(major)
           );
-          //mBeaconManager.startMonitoringBeaconsInRegion(region);
           mBeaconManager.startMonitoring(region);
           resolve.invoke();
       } catch (Exception e) {
@@ -441,6 +384,7 @@ public class BeaconsAndroidModule extends ReactContextBaseJavaModule {
   }
 
   private Region createRegion(String regionId, String beaconUuid) {
+      Log.d(LOG_TAG, "Creating following region - Region Id: " + regionId + ", Beacon UUID: " + beaconUuid);
       Identifier id1 = (beaconUuid == null) ? null : Identifier.parse(beaconUuid);
       return new Region(regionId, id1, null, null);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rodrigo7/react-native-beacons-manager",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "React-Native library for detecting beacons (iOS and Android)",
   "keywords": [
     "react-native",
@@ -47,16 +47,18 @@
   "license": "MIT",
   "nativePackage": true,
   "devDependencies": {
-    "babel-cli": "^6.24.1",
-    "babel-eslint": "^7.2.3",
-    "eslint": "^4.4.1",
-    "eslint-plugin-flowtype": "^2.35.0",
-    "eslint-plugin-react": "^7.2.0",
-    "eslint-plugin-react-native": "^3.0.1",
-    "flow-bin": "^0.85.0",
-    "prop-types": "^15.5.10",
-    "react": "^15.4.2",
-    "react-native": "^0.61.5"
+    "@babel/core": "^7.20.0",
+    "@babel/preset-env": "^7.20.0",
+    "@babel/runtime": "^7.20.0",
+    "eslint": "^8.19.0",
+    "@react-native/eslint-config": "^0.72.2",
+    "@react-native/metro-config": "^0.72.9",
+    "@tsconfig/react-native": "^3.0.0",
+    "metro-react-native-babel-preset": "0.76.7",
+    "prettier": "^2.4.1",
+    "typescript": "4.8.4",
+    "react": "^18.2.0",
+    "react-native": "^0.72.3"
   },
   "peerDependencies": {
     "react": ">=15.4.2",

package/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "@tsconfig/react-native/tsconfig.json"
+}

package/typings/index.d.ts

@@ -1,4 +1,4 @@
-declare module '@rodrigo77777/react-native-beacons-manager' {
+declare module '@rodrigo7/react-native-beacons-manager' {
 
   class Beacons {
     ///////////////////////////////////////////////////////
@@ -140,35 +140,32 @@ declare module '@rodrigo77777/react-native-beacons-manager' {
   const beacons: Beacons;
   export default beacons;
 
-  declare namespace Beacons {
-    export interface BeaconRegion {
-      identifier: string,
-      uuid: string,
-      minor?: number,
-      major?: number
-    }
-
-    export type AuthorizationStatus =
-      | 'authorizedAlways'
-      | 'authorizedWhenInUse'
-      | 'denied'
-      | 'notDetermined'
-      | 'restricted';
-
-    export type Beacon = {
-      distance: number;
-      major: number;
-      minor: number;
-      proximity: 'immediate' | 'near' | 'far';
-      rssi: number;
-      uuid: string;
-    }
-
-    export type BeaconRangingResponse = {
-      beacons: Beacon[];
-      identifier: string;
-      uuid: string;
-    }
+  export interface BeaconRegion {
+    identifier: string,
+    uuid: string,
+    minor?: number,
+    major?: number
+  }
+
+  export type AuthorizationStatus =
+    | 'authorizedAlways'
+    | 'authorizedWhenInUse'
+    | 'denied'
+    | 'notDetermined'
+    | 'restricted';
+
+  export type Beacon = {
+    distance: number;
+    major: number;
+    minor: number;
+    proximity: 'immediate' | 'near' | 'far';
+    rssi: number;
+    uuid: string;
+  }
 
+  export type BeaconRangingResponse = {
+    beacons: Beacon[];
+    identifier: string;
+    uuid: string;
   }
 }

package/typings.json

@@ -1,7 +1,7 @@
 {
-  "name": "@rodrigo77777/react-native-beacons-manager",
+  "name": "@rodrigo7/react-native-beacons-manager",
   "dependencies": {},
   "globalDependencies": {
-    "node": "registry:dt/node#7.0.0+20170322231424"
+    "node": "registry:dt/node"
   }
 }