Skip to content

Commit 5dd2922

Browse files
Merge branch 'main' into moo/moo-1800/rn-sound-migration
2 parents 25e29f0 + 8b043e0 commit 5dd2922

File tree

8 files changed

+107
-91
lines changed

8 files changed

+107
-91
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
99
### Changes
1010

1111
- Migrated from `react-native-sound` to `react-native-track-player` for improved audio playback capabilities and reliability.
12+
- Removed `@react-native-masked-view/masked-view` dependency.
13+
- We migrated from react-native-file-viewer to react-native-file-viewer-turbo for new architecture compatibility
14+
- File viewer now uses modal to display content
15+
- We migrated from react-native-biometrics to @sbaiahmed1/react-native-biometrics for new architecture compatibility
1216

1317
## [3.1.8] Make it Native - 2025-4-02
1418

android/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ dependencies {
154154
implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
155155
implementation "androidx.compose.foundation:foundation:$compose_ui_version"
156156
implementation 'androidx.compose.material:material:1.2.0'
157-
implementation "app.notifee:core:9.1.8"
158157
debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
159158
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version"
160159

android/app/proguard-rules.pro

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,7 @@
7979
@org.greenrobot.eventbus.Subscribe <methods>;
8080
}
8181
-keep enum org.greenrobot.eventbus.ThreadMode { *; }
82+
83+
# @sbaiahmed1/react-native-biometrics
84+
-keep class androidx.biometric.** { *; }
85+
-keep class com.sbaiahmed1.reactnativebiometrics.** { *; }

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<!-- <uses-permission android:name="android.permission.USE_EXACT_ALARM" /> -->
3737
<!-- Ignore deprecation: We still need this for the RN I think -->
3838
<uses-permission android:name="android.permission.USE_FINGERPRINT"/>
39+
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
3940
<!-- Ignore deprecation -->
4041

4142
<uses-feature

android/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ buildscript {
2929
repositories {
3030
google()
3131
mavenCentral()
32-
maven { url "https://notifee.app/maven" }
3332
}
3433
dependencies {
3534
classpath "com.android.tools.build:gradle:8.8.2"

ios/Podfile.lock

Lines changed: 54 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,8 +1393,6 @@ PODS:
13931393
- React-jsiexecutor
13941394
- React-RCTFBReactNativeSpec
13951395
- ReactCommon/turbomodule/core
1396-
- react-native-biometrics (3.0.1):
1397-
- React-Core
13981396
- react-native-ble-plx (2.0.3):
13991397
- MultiplatformBleAdapter (= 0.1.9)
14001398
- React-Core
@@ -1429,6 +1427,27 @@ PODS:
14291427
- ReactCommon/turbomodule/bridging
14301428
- ReactCommon/turbomodule/core
14311429
- Yoga
1430+
- react-native-file-viewer-turbo (0.6.0):
1431+
- DoubleConversion
1432+
- glog
1433+
- hermes-engine
1434+
- RCT-Folly (= 2024.11.18.00)
1435+
- RCTRequired
1436+
- RCTTypeSafety
1437+
- React-Core
1438+
- React-debug
1439+
- React-Fabric
1440+
- React-featureflags
1441+
- React-graphics
1442+
- React-ImageManager
1443+
- React-NativeModulesApple
1444+
- React-RCTFabric
1445+
- React-rendererdebug
1446+
- React-utils
1447+
- ReactCodegen
1448+
- ReactCommon/turbomodule/bridging
1449+
- ReactCommon/turbomodule/core
1450+
- Yoga
14321451
- react-native-geocoder (0.5.0):
14331452
- React
14341453
- react-native-geolocation (3.4.0):
@@ -1506,7 +1525,7 @@ PODS:
15061525
- React-Core
15071526
- react-native-splash-screen (3.2.0):
15081527
- React
1509-
- react-native-track-player (4.1.2):
1528+
- react-native-track-player (4.1.1):
15101529
- React-Core
15111530
- SwiftAudioEx (= 1.1.0)
15121531
- react-native-video (6.10.0):
@@ -1883,12 +1902,31 @@ PODS:
18831902
- React-logger (= 0.77.3)
18841903
- React-perflogger (= 0.77.3)
18851904
- React-utils (= 0.77.3)
1905+
- ReactNativeBiometrics (0.4.0):
1906+
- DoubleConversion
1907+
- glog
1908+
- hermes-engine
1909+
- RCT-Folly (= 2024.11.18.00)
1910+
- RCTRequired
1911+
- RCTTypeSafety
1912+
- React-Core
1913+
- React-debug
1914+
- React-Fabric
1915+
- React-featureflags
1916+
- React-graphics
1917+
- React-ImageManager
1918+
- React-NativeModulesApple
1919+
- React-RCTFabric
1920+
- React-rendererdebug
1921+
- React-utils
1922+
- ReactCodegen
1923+
- ReactCommon/turbomodule/bridging
1924+
- ReactCommon/turbomodule/core
1925+
- Yoga
18861926
- RNCalendarEvents (2.1.0):
18871927
- React
18881928
- RNCAsyncStorage (2.0.0):
18891929
- React-Core
1890-
- RNCMaskedView (0.3.1):
1891-
- React-Core
18921930
- RNCPicker (2.11.0):
18931931
- React-Core
18941932
- RNDateTimePicker (8.2.0):
@@ -1919,8 +1957,6 @@ PODS:
19191957
- RNFBML (17.3.0):
19201958
- React-Core
19211959
- RNFBApp
1922-
- RNFileViewer (2.1.5):
1923-
- React-Core
19241960
- RNGestureHandler (2.23.1):
19251961
- DoubleConversion
19261962
- glog
@@ -1951,7 +1987,7 @@ PODS:
19511987
- RNNotifee/NotifeeCore (= 9.1.8)
19521988
- RNNotifee/NotifeeCore (9.1.8):
19531989
- React-Core
1954-
- RNPermissions (4.1.5):
1990+
- RNPermissions (5.4.2):
19551991
- React-Core
19561992
- RNReanimated (3.16.1):
19571993
- DoubleConversion
@@ -2146,11 +2182,11 @@ DEPENDENCIES:
21462182
- React-logger (from `../node_modules/react-native/ReactCommon/logger`)
21472183
- React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
21482184
- React-microtasksnativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)
2149-
- react-native-biometrics (from `../node_modules/react-native-biometrics`)
21502185
- react-native-ble-plx (from `../node_modules/react-native-ble-plx`)
21512186
- react-native-blob-util (from `../node_modules/react-native-blob-util`)
21522187
- react-native-camera (from `../node_modules/react-native-camera`)
21532188
- "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
2189+
- react-native-file-viewer-turbo (from `../node_modules/react-native-file-viewer-turbo`)
21542190
- react-native-geocoder (from `../node_modules/react-native-geocoder`)
21552191
- "react-native-geolocation (from `../node_modules/@react-native-community/geolocation`)"
21562192
- react-native-google-maps (from `../node_modules/react-native-maps`)
@@ -2193,9 +2229,9 @@ DEPENDENCIES:
21932229
- ReactAppDependencyProvider (from `build/generated/ios`)
21942230
- ReactCodegen (from `build/generated/ios`)
21952231
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
2232+
- "ReactNativeBiometrics (from `../node_modules/@sbaiahmed1/react-native-biometrics`)"
21962233
- RNCalendarEvents (from `../node_modules/react-native-calendar-events`)
21972234
- "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
2198-
- "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
21992235
- "RNCPicker (from `../node_modules/@react-native-picker/picker`)"
22002236
- "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)"
22012237
- RNDeviceInfo (from `../node_modules/react-native-device-info`)
@@ -2205,7 +2241,6 @@ DEPENDENCIES:
22052241
- "RNFBCrashlytics (from `../node_modules/@react-native-firebase/crashlytics`)"
22062242
- "RNFBMessaging (from `../node_modules/@react-native-firebase/messaging`)"
22072243
- "RNFBML (from `../node_modules/@react-native-firebase/ml`)"
2208-
- RNFileViewer (from `../node_modules/react-native-file-viewer`)
22092244
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
22102245
- RNInAppBrowser (from `../node_modules/react-native-inappbrowser-reborn`)
22112246
- RNLocalize (from `../node_modules/react-native-localize`)
@@ -2325,8 +2360,6 @@ EXTERNAL SOURCES:
23252360
:path: "../node_modules/react-native/ReactCommon"
23262361
React-microtasksnativemodule:
23272362
:path: "../node_modules/react-native/ReactCommon/react/nativemodule/microtasks"
2328-
react-native-biometrics:
2329-
:path: "../node_modules/react-native-biometrics"
23302363
react-native-ble-plx:
23312364
:path: "../node_modules/react-native-ble-plx"
23322365
react-native-blob-util:
@@ -2335,6 +2368,8 @@ EXTERNAL SOURCES:
23352368
:path: "../node_modules/react-native-camera"
23362369
react-native-cameraroll:
23372370
:path: "../node_modules/@react-native-camera-roll/camera-roll"
2371+
react-native-file-viewer-turbo:
2372+
:path: "../node_modules/react-native-file-viewer-turbo"
23382373
react-native-geocoder:
23392374
:path: "../node_modules/react-native-geocoder"
23402375
react-native-geolocation:
@@ -2419,12 +2454,12 @@ EXTERNAL SOURCES:
24192454
:path: build/generated/ios
24202455
ReactCommon:
24212456
:path: "../node_modules/react-native/ReactCommon"
2457+
ReactNativeBiometrics:
2458+
:path: "../node_modules/@sbaiahmed1/react-native-biometrics"
24222459
RNCalendarEvents:
24232460
:path: "../node_modules/react-native-calendar-events"
24242461
RNCAsyncStorage:
24252462
:path: "../node_modules/@react-native-async-storage/async-storage"
2426-
RNCMaskedView:
2427-
:path: "../node_modules/@react-native-masked-view/masked-view"
24282463
RNCPicker:
24292464
:path: "../node_modules/@react-native-picker/picker"
24302465
RNDateTimePicker:
@@ -2443,8 +2478,6 @@ EXTERNAL SOURCES:
24432478
:path: "../node_modules/@react-native-firebase/messaging"
24442479
RNFBML:
24452480
:path: "../node_modules/@react-native-firebase/ml"
2446-
RNFileViewer:
2447-
:path: "../node_modules/react-native-file-viewer"
24482481
RNGestureHandler:
24492482
:path: "../node_modules/react-native-gesture-handler"
24502483
RNInAppBrowser:
@@ -2527,11 +2560,11 @@ SPEC CHECKSUMS:
25272560
React-logger: a23563f96a622637d7cce687bdf304929104effd
25282561
React-Mapbuffer: 1864935968d15b9b73d8e413d29c780f0ab50038
25292562
React-microtasksnativemodule: 3b784cf40f7c3c9500b9a5f9e4eec5c9bbfbef8f
2530-
react-native-biometrics: 43ed5b828646a7862dbc7945556446be00798e7d
25312563
react-native-ble-plx: 2dd8780ee8d34c60399aaa897249ed1860ebef10
25322564
react-native-blob-util: b653f7dae5c9fa3f903af51bc2edfb8ef659022b
25332565
react-native-camera: 22dbf8ce6a4c6a25ae49f4e2fa5859c5277f1631
25342566
react-native-cameraroll: 0d805139369f07b822f51841801429a4049e1234
2567+
react-native-file-viewer-turbo: 02b2556f5193a8512c5b00fa24e0d29c1fa639cb
25352568
react-native-geocoder: bc977303c9c53cce36bcdb3c6f17e6832f86beb6
25362569
react-native-geolocation: 697f7e4206386120bfdcf0c6a858e956360c734c
25372570
react-native-google-maps: 992905591a0a9315b8e74faecadd72f039e41dda
@@ -2541,7 +2574,7 @@ SPEC CHECKSUMS:
25412574
react-native-pager-view: 68e8a65a607a6f91a1e25865002192c3c4f53fcf
25422575
react-native-safe-area-context: 3e33e7c43c8b74dba436a5a32651cb8d7064c740
25432576
react-native-splash-screen: a43276f9cf4b2e65d7ce30efe372ffc528064293
2544-
react-native-track-player: dd56f9948e03756a217c75e0a61aa04aab65b5a1
2577+
react-native-track-player: 6dc2e2633265704b8ab6d8124b80239d4ed1f911
25452578
react-native-video: 75279235027642749f1da92c456b10860c3aa13a
25462579
react-native-view-shot: 16b52ee447420cb06810b8dd05b711d3f978efb4
25472580
react-native-webview: 2cf4fe62b06f9ac42f92d1e2bb1345a407a13a57
@@ -2574,9 +2607,9 @@ SPEC CHECKSUMS:
25742607
ReactAppDependencyProvider: 31015410a4a53b9fd0a908ad4d6e3e2b9a25086a
25752608
ReactCodegen: eac5d74d85dff515b48a5c36f154bc4128f217e6
25762609
ReactCommon: bf4612cba0fa356b529385029f470d5529dddde4
2610+
ReactNativeBiometrics: f56337d452bec236502d5ef4a4c86ec2a38214d0
25772611
RNCalendarEvents: 1a67c97e7427cf16fbf60adbb4c11c0d62082eaa
25782612
RNCAsyncStorage: 40367e8d25522dca9c3513c7b9815a184669bd97
2579-
RNCMaskedView: de80352547bd4f0d607bf6bab363d826822bd126
25802613
RNCPicker: 124b4fb5859ba1a3fd53a91e16d1e7a0fc016e59
25812614
RNDateTimePicker: 818460dc31b0dc5ec58289003e27dd8d022fb79c
25822615
RNDeviceInfo: d863506092aef7e7af3a1c350c913d867d795047
@@ -2586,12 +2619,11 @@ SPEC CHECKSUMS:
25862619
RNFBCrashlytics: 83fd3d33655ff926e3a57008ec94815ba8c2bc94
25872620
RNFBMessaging: 8047aaea4d0e56547715085c6d2bedee31bdcd9b
25882621
RNFBML: df509c560094cdf6fa5b8d17fde64ad504f305e9
2589-
RNFileViewer: 4b5d83358214347e4ab2d4ca8d5c1c90d869e251
25902622
RNGestureHandler: 9bf6e8f72d2e72c8f7eb45986fe71a5005fb072d
25912623
RNInAppBrowser: 031138591f9cbf57e987d0fe97f4e73d5fc7524b
25922624
RNLocalize: e7378161f0b6a6365407eb2377aab46cc38047d8
25932625
RNNotifee: 5e3b271e8ea7456a36eec994085543c9adca9168
2594-
RNPermissions: e1ce3272c349e0e06c38d540353967737428336b
2626+
RNPermissions: a4f47362ad585ea7a9a84d03288f18d22c54595d
25952627
RNReanimated: 20f0d150af988258289b2d6cda655bd14945a769
25962628
RNScreens: 86e5c168cdd055a8feead28eb756ca7103918b6a
25972629
RNSVG: 4903d466c3a877644d5219dbc1d97f9ef9e4a3cc

0 commit comments

Comments
 (0)