Merged in release/17.1.1 (pull request #94)

Release/17.1.1

Author: mstanic-shake

README.md

@@ -27,6 +27,8 @@ If your app is running on old architecture you should use Shake RN SDK 17.0.x.
 
 ### Install Shake
 
+#### React Native CLI
+
 Execute the npm install command in your terminal:
 ```bash
 npm install @shakebugs/react-native-shake
@@ -37,6 +39,17 @@ Install pods from the project root directory:
 cd ios && pod install && cd ..
 ```
 
+#### Expo
+
+If you are using Expo, recommended way to install packages is by using `expo install` command:
+
+```bash
+npm install @shakebugs/react-native-shake
+```
+
+Shake is not supported in Expo Go, you need to set up [development builds](https://docs.expo.dev/develop/development-builds/create-a-build/)
+in order to use Shake with Expo.
+
 ### Start Shake
 
 Call `Shake.start()` method in the *index.js* file.

example/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
 
     <application
       android:name="com.shakebugs.react.example.MainApplication"
@@ -22,8 +23,5 @@
             <category android:name="android.intent.category.LAUNCHER" />
         </intent-filter>
       </activity>
-      <meta-data
-        android:name="com.google.android.geo.API_KEY"
-        android:value="AIzaSyAdw2aCW8-Dg7fOOWRNfT43iH1Xjj4_uqg" />
       </application>
 </manifest>

example/android/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         buildToolsVersion = "35.0.0"
         minSdkVersion = 24
         compileSdkVersion = 35
-        targetSdkVersion = 34
+        targetSdkVersion = 35
         ndkVersion = "26.1.10909125"
         kotlinVersion = "1.9.24"
     }

example/index.js

@@ -1,7 +1,7 @@
 import { AppRegistry, Platform } from 'react-native';
 import App from './src/App';
 import { name as appName } from './app.json';
-import Shake from 'react-native-shake';
+import Shake from '@shakebugs/react-native-shake';
 
 import messaging from '@react-native-firebase/messaging';
 

example/ios/Podfile.lock

@@ -1322,7 +1322,7 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - Shake-Staging (~> 17.0.0-rc)
+    - Shake-Staging (~> 17.1.0-rc)
     - Yoga
   - React-nativeconfig (0.76.3)
   - React-NativeModulesApple (0.76.3):
@@ -1605,7 +1605,7 @@ PODS:
     - RNFBApp
   - RNFS (2.20.0):
     - React-Core
-  - Shake-Staging (17.0.2-rc.1616)
+  - Shake-Staging (17.1.0-rc.1618)
   - SocketRocket (0.7.1)
   - Yoga (0.0.0)
 
@@ -1885,7 +1885,7 @@ SPEC CHECKSUMS:
   React-logger: 2736a90a3fdaed3dab1e2e9c5a5e9b3be00c287d
   React-Mapbuffer: 12bbf447b326f0de8a472998eceafbdc4f43ca4e
   React-microtasksnativemodule: 6483158af194b5bca6cc3c842451019c45100d80
-  react-native-shake: 4a7db319452f3b0c01adb15780cac3ba165baf5f
+  react-native-shake: fecbf5c3907abaf9857c18cbba411b59db3afbee
   React-nativeconfig: f2bddc1e6c2eb793c065b37e12c513fdea88afef
   React-NativeModulesApple: 43be3b84598af78efe8fcdbad90033caef83af43
   React-perflogger: 2991d4258277af250eb7a2705980ebb3ef9ba85e
@@ -1918,7 +1918,7 @@ SPEC CHECKSUMS:
   RNFBApp: 72b96921c64702d51eca9f3ed579c1777efd0d7e
   RNFBMessaging: 2ad5a47bd81da9f2d65188292d24115f40cbba74
   RNFS: 89de7d7f4c0f6bafa05343c578f61118c8282ed8
-  Shake-Staging: 969f693866a68e0ca7572b7c6b97388bbcb6697c
+  Shake-Staging: f77d61b3b376dbb23bfff829725ed49666ca5040
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: e6c2f5a192a47cd0c5523ec8c4f7eca01d15d077
 

example/src/DarkModeObserver.ts

@@ -1,6 +1,6 @@
 import { useColorScheme } from 'react-native';
 import { useEffect } from 'react';
-import Shake, { ShakeTheme } from 'react-native-shake';
+import Shake, { ShakeTheme } from '@shakebugs/react-native-shake';
 
 const DarkModeObserver = (props: any) => {
   const colorScheme = useColorScheme();

example/src/ui/shake/MainScreen.tsx

@@ -19,7 +19,7 @@ import Shake, {
   ShakeTextInput,
   ShakeTheme,
   ShakeTitle,
-} from 'react-native-shake';
+} from '@shakebugs/react-native-shake';
 import RNFS from 'react-native-fs';
 import Button from '../core/Button';
 import Title from '../core/Title';
@@ -131,7 +131,7 @@ const MainScreen = () => {
     // const oldForm = Shake.getShakeForm();
     // oldForm.components = oldForm.components.filter(c => c.type !== 'inspect');
 
-    const pickerItems: Array<ShakePickerItem> = [
+    const pickerItems: ShakePickerItem[] = [
       new ShakePickerItem('Mouse', 'Mouse', null, 'mouse'),
       new ShakePickerItem('Keyboard', 'Keyboard', null, 'keyboard'),
       new ShakePickerItem('Display', 'Display', null, 'display'),
@@ -206,22 +206,28 @@ const MainScreen = () => {
   };
 
   const setNotificationEventsFilter = () => {
-    Shake.setNotificationEventsFilter((notificationEvent) => {
-      notificationEvent.setDescription('data_redacted');
-      notificationEvent.setTitle('data_redacted');
-
-      return notificationEvent;
-    });
+    Shake.setNotificationEventsFilter(
+      (
+        notificationEvent: NotificationEventBuilder
+      ): NotificationEventBuilder | null => {
+        notificationEvent.setDescription('data_redacted');
+        notificationEvent.setTitle('data_redacted');
+
+        return notificationEvent;
+      }
+    );
   };
 
   const setNetworkRequestsFilter = () => {
-    Shake.setNetworkRequestsFilter((networkRequest) => {
-      networkRequest.setResponseBody('data_redacted');
-      networkRequest.setRequestBody('data_redacted');
-      networkRequest.setDate(new Date());
-
-      return networkRequest;
-    });
+    Shake.setNetworkRequestsFilter(
+      (networkRequest: NetworkRequestBuilder): NetworkRequestBuilder | null => {
+        networkRequest.setResponseBody('data_redacted');
+        networkRequest.setRequestBody('data_redacted');
+        networkRequest.setDate(new Date());
+
+        return networkRequest;
+      }
+    );
   };
 
   const showNotificationsSettings = () => {

ios/Shake.mm

@@ -719,20 +719,30 @@ - (NSDictionary*)mapToNetworkRequestToDict:(JS::NativeShake::NetworkRequest &)na
     NSDictionary *networkRequest = [[NSDictionary alloc] init];
     NSString *requestBody = nativeNetworkRequest.requestBody() ?: @"";
     NSData *data = [requestBody dataUsingEncoding:NSUTF8StringEncoding];
+    NSNumber* statusCode = [self parseIntegerFromString:nativeNetworkRequest.statusCode()];
+
     networkRequest = @{
         @"url": nativeNetworkRequest.url() ?: @"",
         @"method": nativeNetworkRequest.method() ?: @"",
         @"responseBody": nativeNetworkRequest.responseBody() ?: @"",
-        @"statusCode": nativeNetworkRequest.statusCode() ?: @"",
+        @"statusCode": statusCode ?: 0,
         @"requestBody": data,
         @"requestHeaders": nativeNetworkRequest.requestHeaders() ?: @{},
         @"duration": [NSNumber numberWithDouble:nativeNetworkRequest.duration() ?: 0],
         @"responseHeaders": nativeNetworkRequest.responseHeaders() ?: @{},
         @"timestamp": nativeNetworkRequest.timestamp() ?: @""
     };
+
     return networkRequest;
 }
 
+- (NSNumber *)parseIntegerFromString:(NSString *)string {
+    NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init];
+    formatter.numberStyle = NSNumberFormatterNoStyle;
+
+    return [formatter numberFromString:string];
+}
+
 - (NSDictionary*)mapToNotificationEvent:(JS::NativeShake::NotificationEvent &)nativeNotification
 {
     NSDictionary *notificationEvent = [[NSDictionary alloc] init];

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "react-native-shake",
+  "name": "@shakebugs/react-native-shake",
   "title": "React Native Shake SDK",
   "version": "17.0.0",
   "description": "Shake SDK wrapper",

react-native.config.js

@@ -6,6 +6,7 @@ module.exports = {
     platforms: {
       android: {
         cmakeListsPath: 'generated/jni/CMakeLists.txt',
+        packageImportPath: 'import com.shakebugs.react.ShakePackage;',
       },
     },
   },