react-native-move-sdk 2.14.5 → 2.16.0

package/react-native-move-sdk.podspec

@@ -16,7 +16,11 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
 
-  s.dependency 'DolphinMoveSDK', '2.14.3.320'
+  s.dependency 'DolphinMoveSDK', '2.16.0.335'
+
+  if ENV['DOLPHIN_MOVE_SDK_HEALTH'] == '1' then
+    s.dependency 'DolphinMoveSDKHealth', '2.16.0.335'
+  end
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

package/src/NativeMoveSdk.ts

@@ -52,7 +52,9 @@ export type WarningReasons =
   | 'LOCATION_POWER_MODE(3)'
   | 'LOCATION_POWER_MODE(4)'
   | 'ENERGY_SAVER'
-  | 'BACKGROUND_READ_STEPS_MISSING_IN_SYSTEM';
+  | 'BACKGROUND_READ_STEPS_MISSING_IN_SYSTEM'
+  | 'HEALTH_DEPENDENCY_MISSING'
+  | 'HEALTHKIT_NO_STEPS_DETECTED';
 export type IssueListService = TimelineDetectionService | DrivingService | WalkingService;
 export type ErrorListType = Array<IssueListItem<ErrorReasons>>;
 export type WarningListType = Array<IssueListItem<WarningReasons>>;
@@ -154,6 +156,8 @@ export interface Spec extends TurboModule {
 
   geocode(latitude: number, longitude: number): Promise<string>;
 
+  getMoveConfig(): Promise<MoveSdkConfig>;
+
   getRegisteredDevices(): Promise<Array<MoveSdkDevice>>;
 
   getState(): Promise<SdkState>;

package/src/expo.tsx

@@ -0,0 +1,203 @@
+import {
+  createRunOncePlugin,
+  type ConfigPlugin,
+  withDangerousMod,
+  withAndroidManifest,
+  AndroidConfig,
+  withMainActivity,
+  withProjectBuildGradle,
+  withMainApplication,
+} from '@expo/config-plugins';
+import { mergeContents } from '@expo/config-plugins/build/utils/generateCode';
+import type { ExpoConfig } from '@expo/config-types';
+import * as fs from 'fs/promises';
+import * as path from 'path';
+
+type Props = {
+  extensions?: ('Development' | 'Health')[];
+};
+
+function withMoveAndroidMainApplication(config: ExpoConfig) {
+  return withMainApplication(config, (cfg) => {
+    const { modResults } = cfg;
+    const { contents } = modResults;
+    const lines = contents.split('\n');
+
+    const importIndex = lines.findIndex((line: string) =>
+      /^package/.test(line)
+    );
+    if (importIndex !== -1) {
+      // Replace 'in' with '`in`' in the package name
+      lines[importIndex] = lines[importIndex]!.replace(
+        'package in',
+        'package `in`'
+      );
+    }
+    const mainApplicationIndex = lines.findIndex((line: string) =>
+      /^class MainApplication : Application\(\), ReactApplication {$/.test(line)
+    );
+
+    const onCreateIndex = lines.findIndex((line: string) =>
+      /super.onCreate\(\)/.test(line)
+    );
+
+    modResults.contents = [
+      ...lines.slice(0, importIndex + 1),
+      `import com.movesdk.NativeMoveSdkWrapper`,
+      ...lines.slice(importIndex + 1, mainApplicationIndex + 1),
+      `	private lateinit var sdkWrapper: NativeMoveSdkWrapper`,
+      ...lines.slice(mainApplicationIndex + 1, onCreateIndex + 1),
+      `		sdkWrapper = NativeMoveSdkWrapper.getInstance(this)`,
+      `		sdkWrapper.init(this)`,
+      ...lines.slice(onCreateIndex + 1),
+    ].join('\n');
+
+    return cfg;
+  });
+}
+
+function withMoveAndroidProjectBuildGradle(config: ExpoConfig) {
+  return withProjectBuildGradle(config, (cfg) => {
+    const { modResults } = cfg;
+    const { contents } = modResults;
+    const lines = contents.split('\n');
+
+    const mavenIndex = lines.lastIndexOf('allprojects {') + 1;
+
+    modResults.contents = [
+      ...lines.slice(0, mavenIndex + 1),
+      `		maven {`,
+      `			url "https://dolphin.jfrog.io/artifactory/move-sdk-libs-release"`,
+      `			content {`,
+      `				includeGroup "io.dolphin.move"`,
+      `			}`,
+      `		}`,
+      ...lines.slice(mavenIndex + 1),
+    ].join('\n');
+
+    return cfg;
+  });
+}
+
+function withMoveAndroidHealth(config: ExpoConfig) {
+  config = withMainActivity(config, async (cfg) => {
+    const mainActivity = cfg.modResults;
+
+    const importStatement = 'import com.movesdk.NativeMoveSdkWrapper';
+    if (!mainActivity.contents.includes(importStatement)) {
+      mainActivity.contents = mainActivity.contents.replace(
+        /import android.os.Bundle/,
+        `import android.os.Bundle\n${importStatement}`
+      );
+    }
+
+    const codeToAdd =
+      'NativeMoveSdkWrapper.getInstance(this.applicationContext).registerRequestPermissionLauncher(this)';
+    if (!mainActivity.contents.includes(codeToAdd)) {
+      mainActivity.contents = mainActivity.contents.replace(
+        /super\.onCreate\(null\)/,
+        `${codeToAdd}\n    super.onCreate(null)`
+      );
+    }
+
+    return cfg;
+  });
+
+  config = withAndroidManifest(config, async (cfg) => {
+    const mainApplication = AndroidConfig.Manifest.getMainApplicationOrThrow(
+      cfg.modResults
+    );
+
+    const mainActivity = mainApplication.activity?.find(
+      (activity) => activity.$['android:name'] === '.MainActivity'
+    );
+
+    if (mainActivity) {
+      if (!mainActivity['intent-filter']) {
+        mainActivity['intent-filter'] = [];
+      }
+
+      // Add Health Connect permission rationale intent filter
+      mainActivity['intent-filter'].push({
+        action: [
+          {
+            $: {
+              'android:name':
+                'androidx.health.ACTION_SHOW_PERMISSIONS_RATIONALE',
+            },
+          },
+        ],
+        category: [
+          {
+            $: { 'android:name': 'android.intent.category.HEALTH_PERMISSIONS' },
+          },
+        ],
+      });
+
+      // Add View Permission Usage intent filter
+      mainActivity['intent-filter'].push({
+        action: [
+          {
+            $: {
+              'android:name': 'android.intent.action.VIEW_PERMISSION_USAGE',
+            },
+          },
+        ],
+        category: [
+          {
+            $: { 'android:name': 'android.intent.category.HEALTH_PERMISSIONS' },
+          },
+        ],
+      });
+    }
+
+    return cfg;
+  });
+
+  config = withAndroidManifest(config, async (cfg) => {
+    const permissions = [
+      'android.permission.health.READ_HEALTH_DATA_IN_BACKGROUND',
+      'android.permission.health.READ_STEPS',
+    ];
+    cfg.modResults.manifest['uses-permission'] = [
+      ...(cfg.modResults.manifest['uses-permission'] || []),
+      ...permissions.map((perm) => ({ $: { 'android:name': perm } })),
+    ];
+    return cfg;
+  });
+
+  return config;
+}
+
+const withExtensions: ConfigPlugin<Props> = (config, { extensions = [] }) =>
+  withDangerousMod(config, [
+    'ios',
+    async (config) => {
+      const file = path.join(config.modRequest.platformProjectRoot, 'Podfile');
+      const contents = await fs.readFile(file, 'utf8');
+
+      const withSetup = mergeContents({
+        tag: 'setup-move-sdk',
+        src: contents,
+        anchor: /^prepare_react_native_project!$/m,
+        newSrc: `ENV['DOLPHIN_MOVE_SDK_HEALTH'] = '${extensions.includes('Health') ? '1' : '0'}'`,
+        offset: 1,
+        comment: '#',
+      });
+
+      await fs.writeFile(file, withSetup.contents, 'utf-8');
+      return config;
+    },
+  ]);
+
+const withMove: ConfigPlugin<Props> = (config, { extensions = [] }) => {
+  config = withExtensions(config, { extensions });
+  if (extensions.includes('Health')) {
+    config = withMoveAndroidHealth(config);
+  }
+  config = withMoveAndroidMainApplication(config);
+  config = withMoveAndroidProjectBuildGradle(config);
+  return config;
+};
+
+export default createRunOncePlugin(withMove, 'react-native-move-sdk');

package/src/index.tsx

@@ -81,13 +81,13 @@ const eventEmitter = new NativeEventEmitter(MoveSdkModule);
 const NativeMoveSdk = MoveSdkModule
   ? MoveSdkModule
   : new Proxy(
-      {},
-      {
-        get() {
-          throw new Error(LINKING_ERROR);
-        },
-      }
-    );
+    {},
+    {
+      get() {
+        throw new Error(LINKING_ERROR);
+      },
+    }
+  );
 
 export default class MoveSdk {
   static READY: SdkState = 'READY';
@@ -153,13 +153,13 @@ export default class MoveSdk {
       auth,
       // Config
       config,
-      options,
+      options ?? {},
       // Platform config
       platformParams
     );
   }
 
-  static async setupWithCode(code:string, config: MoveSdkConfig, android: MoveSdkAndroidConfig, options?: MoveSdkOptions): Promise<void> {
+  static async setupWithCode(code: string, config: MoveSdkConfig, android: MoveSdkAndroidConfig, options?: MoveSdkOptions): Promise<void> {
 
     let platformParams: Array<string | boolean> = [];
     if (Platform.OS === 'android') {
@@ -183,14 +183,18 @@ export default class MoveSdk {
       code,
       // Config
       config,
-      options,
+      options ?? {},
       // Platform config
       platformParams
     );
   }
 
   static allowMockLocations(allowMockLocations: boolean) {
-    NativeMoveSdk.allowMockLocations(allowMockLocations);
+    if (isTurboModuleEnabled) {
+      NativeMoveSdk.allowMockLocations(allowMockLocations);
+    } else {
+      NativeMoveSdk.mockLocations(allowMockLocations);
+    }
   }
 
   static resolveError() {
@@ -309,7 +313,7 @@ export default class MoveSdk {
 
   static addLogListener(logReceived: (event: MoveSdkLog) => void): EmitterSubscription {
     return eventEmitter.addListener('MOVE_SDK_LOG', (event) => {
-    logReceived(event);
+      logReceived(event);
     });
   }
 
@@ -320,8 +324,8 @@ export default class MoveSdk {
   }
 
   static addHealthListener(scoreReceived: (health: Array<HealthListItem>) => void): EmitterSubscription {
-	return eventEmitter.addListener('MOVE_SDK_HEALTH', (health) => {
-		scoreReceived(health);
+    return eventEmitter.addListener('MOVE_SDK_HEALTH', (health) => {
+      scoreReceived(health);
     });
   }
 
@@ -353,6 +357,10 @@ export default class MoveSdk {
     return NativeMoveSdk.getDeviceQualifier();
   }
 
+  static async getMoveConfig(): Promise<MoveSdkConfig> {
+    return await NativeMoveSdk.getMoveConfig();
+  }
+
   static async geocode(latitude: number, longitude: number): Promise<string> {
     return await NativeMoveSdk.geocode(latitude, longitude);
   }
@@ -420,11 +428,11 @@ export default class MoveSdk {
   }
 
   static async getBluetoothPermission() {
-  	return await NativeMoveSdk.getBluetoothPermission();
+    return await NativeMoveSdk.getBluetoothPermission();
   }
 
   static async getBluetoothState() {
-  	return await NativeMoveSdk.getBluetoothState();
+    return await NativeMoveSdk.getBluetoothState();
   }
 
   static addDeviceDiscoveryListener(onScanResult: (state: Array<MoveScanResult>) => void): EmitterSubscription {
@@ -463,10 +471,10 @@ export default class MoveSdk {
   }
 
   static updateConfig(config: MoveSdkConfig, options?: MoveSdkOptions) {
-    NativeMoveSdk.updateConfig(config, options);
+    NativeMoveSdk.updateConfig(config, options ?? {});
   }
 
-  static setTripMetadata(metadata?: {[key: string]: string}) {
+  static setTripMetadata(metadata?: { [key: string]: string }) {
     NativeMoveSdk.setTripMetadata(metadata);
   }
 
@@ -481,4 +489,9 @@ export default class MoveSdk {
   static async requestHealthPermissions(): Promise<HealthPermissionsResult> {
     return await NativeMoveSdk.requestHealthPermissions();
   }
+
+  static beaconDevices(serviceUUID: string): MoveSdkDevice {
+    const name = `Beacons ${serviceUUID}`
+    return { id: serviceUUID, name: name, data: JSON.stringify({ id: serviceUUID, name: name, uuid: serviceUUID }) };
+  }
 }