fix iOS issues with missing native module (#15)

Author: fabOnReact

CONTRIBUTING.md

@@ -18,7 +18,7 @@ To get started with the project, run `yarn` in the root directory to install the
 yarn
 ```
 
-To run the wearos and mobile apps follow this [instructions][1].
+To run the wearos and android mobile apps follow this [instructions][1], for iOS follow the same steps and use `pod install` and `yarn ios`.
 
 [1]: https://github.com/fabOnReact/react-native-wear-connectivity?tab=readme-ov-file#how-to-create-a-wearos-app-using-react-native
 

example/ios/Podfile.lock

@@ -1,10 +1,4 @@
 PODS:
-  - AppAuth (1.6.2):
-    - AppAuth/Core (= 1.6.2)
-    - AppAuth/ExternalUserAgent (= 1.6.2)
-  - AppAuth/Core (1.6.2)
-  - AppAuth/ExternalUserAgent (1.6.2):
-    - AppAuth/Core
   - boost (1.83.0)
   - CocoaAsyncSocket (7.6.5)
   - DoubleConversion (1.1.6)
@@ -74,14 +68,6 @@ PODS:
     - FlipperKit/FlipperKitNetworkPlugin
   - fmt (6.2.1)
   - glog (0.3.5)
-  - GoogleSignIn (7.0.0):
-    - AppAuth (~> 1.5)
-    - GTMAppAuth (< 3.0, >= 1.3)
-    - GTMSessionFetcher/Core (< 4.0, >= 1.1)
-  - GTMAppAuth (2.0.0):
-    - AppAuth/Core (~> 1.6)
-    - GTMSessionFetcher/Core (< 4.0, >= 1.5)
-  - GTMSessionFetcher/Core (3.1.1)
   - hermes-engine (0.73.4):
     - hermes-engine/Pre-built (= 0.73.4)
   - hermes-engine/Pre-built (0.73.4)
@@ -958,14 +944,6 @@ PODS:
   - React-Mapbuffer (0.73.4):
     - glog
     - React-debug
-  - react-native-config (1.5.1):
-    - react-native-config/App (= 1.5.1)
-  - react-native-config/App (1.5.1):
-    - React-Core
-  - react-native-wear-connectivity (0.1.0):
-    - glog
-    - RCT-Folly (= 2022.05.16.00)
-    - React-Core
   - React-nativeconfig (0.73.4)
   - React-NativeModulesApple (0.73.4):
     - glog
@@ -1133,9 +1111,6 @@ PODS:
     - React-jsi (= 0.73.4)
     - React-logger (= 0.73.4)
     - React-perflogger (= 0.73.4)
-  - RNGoogleSignin (11.0.0):
-    - GoogleSignIn (~> 7.0)
-    - React-Core
   - SocketRocket (0.6.1)
   - Yoga (1.14.0)
 
@@ -1192,8 +1167,6 @@ DEPENDENCIES:
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector-modern`)
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
   - React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
-  - react-native-config (from `../node_modules/react-native-config`)
-  - react-native-wear-connectivity (from `../..`)
   - React-nativeconfig (from `../node_modules/react-native/ReactCommon`)
   - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
@@ -1214,12 +1187,10 @@ DEPENDENCIES:
   - React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`)
   - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
-  - "RNGoogleSignin (from `../node_modules/@react-native-google-signin/google-signin`)"
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
   trunk:
-    - AppAuth
     - CocoaAsyncSocket
     - Flipper
     - Flipper-Boost-iOSX
@@ -1230,9 +1201,6 @@ SPEC REPOS:
     - Flipper-PeerTalk
     - FlipperKit
     - fmt
-    - GoogleSignIn
-    - GTMAppAuth
-    - GTMSessionFetcher
     - libevent
     - OpenSSL-Universal
     - SocketRocket
@@ -1293,10 +1261,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/logger"
   React-Mapbuffer:
     :path: "../node_modules/react-native/ReactCommon"
-  react-native-config:
-    :path: "../node_modules/react-native-config"
-  react-native-wear-connectivity:
-    :path: "../.."
   React-nativeconfig:
     :path: "../node_modules/react-native/ReactCommon"
   React-NativeModulesApple:
@@ -1337,13 +1301,10 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/react/utils"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
-  RNGoogleSignin:
-    :path: "../node_modules/@react-native-google-signin/google-signin"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  AppAuth: 3bb1d1cd9340bd09f5ed189fb00b1cc28e1e8570
   boost: d3f49c53809116a5d38da093a8aa78bf551aed09
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
@@ -1359,9 +1320,6 @@ SPEC CHECKSUMS:
   FlipperKit: 37525a5d056ef9b93d1578e04bc3ea1de940094f
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
-  GoogleSignIn: b232380cf495a429b8095d3178a8d5855b42e842
-  GTMAppAuth: 99fb010047ba3973b7026e45393f51f27ab965ae
-  GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72
   hermes-engine: b2669ce35fc4ac14f523b307aff8896799829fe2
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
@@ -1386,8 +1344,6 @@ SPEC CHECKSUMS:
   React-jsinspector: 9ac353eccf6ab54d1e0a33862ba91221d1e88460
   React-logger: 0a57b68dd2aec7ff738195f081f0520724b35dab
   React-Mapbuffer: 63913773ed7f96b814a2521e13e6d010282096ad
-  react-native-config: 86038147314e2e6d10ea9972022aa171e6b1d4d8
-  react-native-wear-connectivity: 218d8a95c3fcec75a3c49ee0a3ac729d8eb471b2
   React-nativeconfig: d7af5bae6da70fa15ce44f045621cf99ed24087c
   React-NativeModulesApple: 0123905d5699853ac68519607555a9a4f5c7b3ac
   React-perflogger: 8a1e1af5733004bdd91258dcefbde21e0d1faccd
@@ -1408,7 +1364,6 @@ SPEC CHECKSUMS:
   React-runtimescheduler: ed48e5faac6751e66ee1261c4bd01643b436f112
   React-utils: 6e5ad394416482ae21831050928ae27348f83487
   ReactCommon: 840a955d37b7f3358554d819446bffcf624b2522
-  RNGoogleSignin: fc408799f1990a12497a32f64280c0fe353ffcc1
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: 64cd2a583ead952b0315d5135bf39e053ae9be70
 

src/index.tsx

@@ -1,12 +1,7 @@
 import { NativeModules, Platform } from 'react-native';
-import { watchEvents, watchEventsMock } from './subscriptions';
-import { sendMessage, sendMessageMock } from './messages';
-import type { WatchEvents } from './types';
-import type {
-  ReplyCallback,
-  ErrorCallback,
-  SendMessage,
-} from './NativeWearConnectivity';
+import { watchEvents } from './subscriptions';
+import { sendMessage } from './messages';
+import type { ReplyCallback, ErrorCallback } from './NativeWearConnectivity';
 
 const LINKING_ERROR =
   `The package 'react-native-wear-connectivity' doesn't seem to be linked. Make sure: \n\n` +
@@ -32,20 +27,5 @@ const WearConnectivity = WearConnectivityModule
       }
     );
 
-let sendMessageExport: SendMessage;
-let watchEventsExport: WatchEvents;
-
-if (Platform.OS === 'ios') {
-  sendMessageExport = sendMessageMock;
-  watchEventsExport = watchEventsMock;
-} else {
-  sendMessageExport = sendMessage;
-  watchEventsExport = watchEvents;
-}
-
-export {
-  sendMessageExport as sendMessage,
-  watchEventsExport as watchEvents,
-  WearConnectivity,
-};
+export { sendMessage, watchEvents, WearConnectivity };
 export type { ReplyCallback, ErrorCallback };

src/messages.ts

@@ -1,3 +1,4 @@
+import { Platform } from 'react-native';
 import type { SendMessage, Payload } from './NativeWearConnectivity';
 import { WearConnectivity } from './index';
 import { LIBRARY_NAME, IOS_NOT_SUPPORTED_WARNING } from './constants';
@@ -30,4 +31,9 @@ const sendMessage: SendMessage = (message, cb, errCb) => {
 const sendMessageMock: SendMessage = () =>
   console.warn(LIBRARY_NAME + 'message' + IOS_NOT_SUPPORTED_WARNING);
 
-export { sendMessage, sendMessageMock };
+let sendMessageExport: SendMessage = sendMessageMock;
+if (Platform.OS !== 'ios') {
+  sendMessageExport = sendMessage;
+}
+
+export { sendMessageExport as sendMessage };

src/subscriptions.ts

@@ -1,8 +1,11 @@
-import { NativeModules, NativeEventEmitter } from 'react-native';
+import { NativeModules, NativeEventEmitter, Platform } from 'react-native';
 import type { AddListener, WatchEvents } from './types';
 import { LIBRARY_NAME, IOS_NOT_SUPPORTED_WARNING } from './constants';
 
 const _addListener: AddListener = (event, cb) => {
+  const nativeWatchEventEmitter = new NativeEventEmitter(
+    NativeModules.AndroidWearCommunication
+  );
   if (!event) {
     throw new Error('Must pass event');
   }
@@ -18,23 +21,21 @@ const _addListener: AddListener = (event, cb) => {
   return () => sub.remove();
 };
 
-const nativeWatchEventEmitter = new NativeEventEmitter(
-  NativeModules.AndroidWearCommunication
-);
-
 const _addListenerMock: AddListener = () => {
   console.warn(LIBRARY_NAME + 'watchEvents' + IOS_NOT_SUPPORTED_WARNING);
   return () => {};
 };
 
-const watchEventsMock: WatchEvents = {
+let watchEvents: WatchEvents = {
   addListener: _addListenerMock,
-  on: _addListener,
+  on: _addListenerMock,
 };
 
-const watchEvents: WatchEvents = {
-  addListener: _addListener,
-  on: _addListener,
-};
+if (Platform.OS !== 'ios') {
+  watchEvents = {
+    addListener: _addListener,
+    on: _addListener,
+  };
+}
 
-export { watchEvents, watchEventsMock };
+export { watchEvents };