Merge branch 'mx/10.24' into moo/MOO-1498-dev-mode-issue-fix

Author: YogendraShelke

CHANGELOG.android.txt

@@ -1 +1,2 @@
-- We have improved the UI for users who use three-button navigation when edge-to-edge mode is enabled.
+- We have migrated from react-native-push-notification to @notifee/react-native for better new architecture compatibility and enhanced push notification features.
+- We fixed an issue where TextInput-based fields like the TextBox and TextArea would not receive focus on Android devices via touch.

CHANGELOG.ios.txt

@@ -0,0 +1 @@
+- We have migrated from react-native-push-notification to @notifee/react-native for better new architecture compatibility and enhanced push notification features.

android/app/src/main/AndroidManifest.xml

@@ -23,6 +23,7 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <!-- Required for scheduling local notifications -->
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
     <!-- Ignore deprecation: We still need this for the RN I think -->
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
     <!-- Ignore deprecation -->
@@ -97,18 +98,6 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions"/>
-        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher"/>
-        <receiver
-                android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver"
-                android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
-                <action android:name="android.intent.action.QUICKBOOT_POWERON"/>
-                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
-            </intent-filter>
-        </receiver>
-
         <service
                 android:name=".firebase.FirebaseMessagingService"
                 android:exported="false">

android/app/src/main/java/com/mendix/developerapp/firebase/FirebaseMessagingService.kt

@@ -9,7 +9,6 @@ import android.net.Uri
 import android.os.Build
 import android.util.Log
 import androidx.core.app.NotificationCompat
-import com.dieam.reactnativepushnotification.modules.RNPushNotificationListenerService
 import com.google.firebase.messaging.RemoteMessage
 import com.mendix.developerapp.R
 
@@ -39,7 +38,7 @@ class FirebaseMessagingService: com.google.firebase.messaging.FirebaseMessagingS
             }
 
 
-            val notificationManager = context.getSystemService(RNPushNotificationListenerService.NOTIFICATION_SERVICE) as NotificationManager
+            val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
             // Since android Oreo notification channel is needed.
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 val channel = NotificationChannel(MENDIX_AD_CAMPAIGN_CHANNEL,

android/build.gradle

@@ -66,6 +66,9 @@ allprojects {
         }
         google()
         maven { url 'https://jitpack.io' }
+        maven {
+            url "$rootDir/../node_modules/@notifee/react-native/android/libs"
+        }
     }
 
     // Build all modules with Android 16KB pages enabled

ios/DeveloperApp/AppDelegate.swift

@@ -123,9 +123,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         didReceive response: UNNotificationResponse,
         withCompletionHandler completionHandler: @escaping () -> Void
     ) {
-        if (!handleMendixNotification(response: response)) {
-            RNCPushNotificationIOS.didReceive(response)
-        }
         completionHandler()
     }
 

ios/DeveloperApp/DeveloperApp-Bridging-Header.h

@@ -3,4 +3,3 @@
 #import "MendixNative.h"
 #import "IQKeyboardManager/IQKeyboardManager.h"
 #import "RNSplashScreen.h"
-#import "RNCPushNotificationIOS.h"

ios/DeveloperApp/Info.plist

@@ -86,7 +86,7 @@
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>To use that feature the app needs access to your photo library.</string>
 	<key>Native Binary Version</key>
-	<integer>14</integer>
+	<integer>15</integer>
 	<key>NativeOTAEnabled</key>
 	<true/>
 	<key>ReferenceGuideUrl</key>

ios/Podfile.lock

@@ -1892,8 +1892,6 @@ PODS:
     - React-Core
   - RNCPicker (2.11.0):
     - React-Core
-  - RNCPushNotificationIOS (1.10.1):
-    - React-Core
   - RNDateTimePicker (8.2.0):
     - React-Core
   - RNDeviceInfo (13.0.0):
@@ -1949,6 +1947,11 @@ PODS:
     - React-Core
   - RNLocalize (3.2.1):
     - React-Core
+  - RNNotifee (9.1.8):
+    - React-Core
+    - RNNotifee/NotifeeCore (= 9.1.8)
+  - RNNotifee/NotifeeCore (9.1.8):
+    - React-Core
   - RNPermissions (4.1.5):
     - React-Core
   - RNReanimated (3.16.1):
@@ -2208,7 +2211,6 @@ DEPENDENCIES:
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
   - "RNCPicker (from `../node_modules/@react-native-picker/picker`)"
-  - "RNCPushNotificationIOS (from `../node_modules/@react-native-community/push-notification-ios`)"
   - "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)"
   - RNDeviceInfo (from `../node_modules/react-native-device-info`)
   - RNFastImage (from `../node_modules/react-native-fast-image`)
@@ -2221,6 +2223,7 @@ DEPENDENCIES:
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - RNInAppBrowser (from `../node_modules/react-native-inappbrowser-reborn`)
   - RNLocalize (from `../node_modules/react-native-localize`)
+  - "RNNotifee (from `../node_modules/@notifee/react-native`)"
   - RNPermissions (from `../node_modules/react-native-permissions`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
@@ -2437,8 +2440,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-masked-view/masked-view"
   RNCPicker:
     :path: "../node_modules/@react-native-picker/picker"
-  RNCPushNotificationIOS:
-    :path: "../node_modules/@react-native-community/push-notification-ios"
   RNDateTimePicker:
     :path: "../node_modules/@react-native-community/datetimepicker"
   RNDeviceInfo:
@@ -2463,6 +2464,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-inappbrowser-reborn"
   RNLocalize:
     :path: "../node_modules/react-native-localize"
+  RNNotifee:
+    :path: "../node_modules/@notifee/react-native"
   RNPermissions:
     :path: "../node_modules/react-native-permissions"
   RNReanimated:
@@ -2594,7 +2597,6 @@ SPEC CHECKSUMS:
   RNCAsyncStorage: 40367e8d25522dca9c3513c7b9815a184669bd97
   RNCMaskedView: de80352547bd4f0d607bf6bab363d826822bd126
   RNCPicker: 124b4fb5859ba1a3fd53a91e16d1e7a0fc016e59
-  RNCPushNotificationIOS: 778dc253960de7b6544abe6cee86fea1e2c590ab
   RNDateTimePicker: 818460dc31b0dc5ec58289003e27dd8d022fb79c
   RNDeviceInfo: ae4e1a9b955b2a65314588cc7251795631925668
   RNFastImage: 462a183c4b0b6b26fdfd639e1ed6ba37536c3b87
@@ -2607,6 +2609,7 @@ SPEC CHECKSUMS:
   RNGestureHandler: 9bf6e8f72d2e72c8f7eb45986fe71a5005fb072d
   RNInAppBrowser: 031138591f9cbf57e987d0fe97f4e73d5fc7524b
   RNLocalize: e7378161f0b6a6365407eb2377aab46cc38047d8
+  RNNotifee: 5e3b271e8ea7456a36eec994085543c9adca9168
   RNPermissions: e1ce3272c349e0e06c38d540353967737428336b
   RNReanimated: 20f0d150af988258289b2d6cda655bd14945a769
   RNScreens: 86e5c168cdd055a8feead28eb756ca7103918b6a