React Native 0.73 0.79 0.83 Example Apps [sc-185996]

.gitignore

@@ -2,9 +2,6 @@
 #
 .DS_Store
 
-# XDE
-.expo/
-
 # VSCode
 .vscode/
 jsconfig.json
@@ -70,3 +67,10 @@ android/keystores/debug.keystore
 lib/
 .yarn/install-state.gz
 example/.yarn/install-state.gz
+example-0.73/.yarn/install-state.gz
+example-0.79/.yarn/install-state.gz
+example-0.83/.yarn/install-state.gz
+
+google-services.json
+
+

android/build.gradle

@@ -1,19 +1,14 @@
 buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["RNMovableInk_kotlinVersion"]
-
   repositories {
     google()
     mavenCentral()
     maven {
-      url 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
+      url 'https://central.sonatype.com/repository/maven-snapshots/'
     }
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.2"
-    // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    // AGP and Kotlin versions provided by the consuming app
   }
 }
 
@@ -40,7 +35,6 @@ def supportsNamespace() {
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
-apply plugin: 'org.jetbrains.kotlin.android'
 
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"
@@ -70,22 +64,34 @@ android {
     }
   }
 
-  lintOptions {
+  lint {
     disable "GradleCompatible"
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
+  }
+
+  kotlinOptions {
+    jvmTarget = "17"
+    freeCompilerArgs += ["-Xskip-metadata-version-check"]
   }
 
 }
 
+// Configure all Kotlin compile tasks to skip metadata version check
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+  kotlinOptions {
+    freeCompilerArgs += ["-Xskip-metadata-version-check"]
+  }
+}
+
 repositories {
   mavenCentral()
   google()
   maven {
-    url 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
+    url 'https://central.sonatype.com/repository/maven-snapshots/'
   }
 }
 
@@ -97,9 +103,8 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.movableink.sdk:inked:2.2.0"
+  implementation "com.movableink.sdk:inked:2.3.0-SNAPSHOT"
   implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0"
-
 }
 
 if (isNewArchitectureEnabled()) {

android/gradle.properties

@@ -1,6 +1,6 @@
-RNMovableInk_kotlinVersion=1.8.0
+RNMovableInk_kotlinVersion=2.2.0
 RNMovableInk_minSdkVersion=24
-RNMovableInk_targetSdkVersion=33
-RNMovableInk_compileSdkVersion=33
+RNMovableInk_targetSdkVersion=34
+RNMovableInk_compileSdkVersion=34
 RNMovableInk_ndkversion=23.1.7779620
 android.useAndroidX=true

android/src/main/java/com/rnmovableink/RNMovableInkModule.kt

@@ -8,6 +8,7 @@ import com.movableink.inked.inAppMessage.MovableInAppClient
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
+import android.util.Log
 
 class RNMovableInkModule(reactContext: ReactApplicationContext) :
   ReactContextBaseJavaModule(reactContext) {
@@ -85,41 +86,53 @@ class RNMovableInkModule(reactContext: ReactApplicationContext) :
     }
   }
 
-@ReactMethod
-fun showInAppMessage(url: String, callback: Callback) {
-    val activity = currentActivity
-    if (activity is androidx.lifecycle.LifecycleOwner) {
-        activity.lifecycleScope.launch {
-            try {
-                MIClient.showInAppBrowser(
-                    activity,
-                    url,
-                    listener = object : MovableInAppClient.OnUrlLoadingListener {
-                        override fun onButtonClicked(value: String) {
-                            activity.runOnUiThread {
-                                callback.invoke(value)
-                            }
+  @ReactMethod
+  fun showInAppMessage(url: String, callback: Callback) {
+    val activity = reactApplicationContext.currentActivity
+    if (activity == null) {
+        Log.d("MISDK", "No current activity")
+        return
+    }
+    if (activity !is androidx.lifecycle.LifecycleOwner) {
+        Log.d("MISDK", "Activity is not a LifecycleOwner")
+        return
+    }
+    activity.lifecycleScope.launch {
+        try {
+            MIClient.showInAppBrowser(
+                activity,
+                url,
+                listener = object : MovableInAppClient.OnUrlLoadingListener {
+                    override fun onButtonClicked(value: String) {
+                        (activity as? android.app.Activity)?.runOnUiThread {
+                            callback.invoke(value)
                         }
                     }
-                )
-            } catch (e: Exception) {
-                activity.runOnUiThread {
-                    callback.invoke("Error: ${e.message}")
                 }
+            )
+        } catch (e: Exception) {
+            (activity as? android.app.Activity)?.runOnUiThread {
+                Log.e("MISDK", "Error showing in-app message", e)
             }
         }
     }
-}
+  }
 
   @ReactMethod
   fun setValidPasteboardValues(values: ReadableArray) {
     MIClient.validPasteboardValues(values.toStringList())
   }
 
+  @ReactMethod
+  fun handlePushNotificationOpenedWithContent(properties: ReadableMap) {
+    // val map: Map<String, String> = properties.toHashMap().mapValues { it.value.toString() }
+    // MIClient.handlePushNotificationOpened(map)
+  }
+
   fun ReadableArray.toStringList(): List<String> {
     val stringList = mutableListOf<String>()
     for (i in 0 until size()) {
-      stringList.add(getString(i))
+      getString(i)?.let { stringList.add(it) }
     }
     return stringList
   }

example/android/app/build.gradle → example-0.73/android/app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: "com.android.application"
 apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
+apply plugin: "com.google.gms.google-services"
 
 // import com.android.build.OutputFile
 
@@ -53,6 +54,14 @@ react {
     // hermesFlags = ["-O", "-output-source-map"]
 }
 
+repositories {
+    google()
+    mavenCentral()
+    maven {
+        url 'https://central.sonatype.com/repository/maven-snapshots/'
+    }
+}
+
 /**
  * Set this to true to create four separate APKs instead of one,
  * one for each native architecture. This is useful if you don't
@@ -147,13 +156,29 @@ android {
 
     //     }
     // }
+
+    kotlinOptions {
+        jvmTarget = "17"
+        freeCompilerArgs += ["-Xskip-metadata-version-check"]
+    }
+
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/versions/9/OSGI-INF/MANIFEST.MF']
+        }
+    }
 }
 
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
     implementation("com.facebook.react:flipper-integration")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
+
+    // Firebase for push notifications
+    implementation platform('com.google.firebase:firebase-bom:32.7.0')
+    implementation 'com.google.firebase:firebase-messaging'
+    implementation project(':react-native-notifications')
 
     // debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
     // debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {

example/android/app/src/main/AndroidManifest.xml → example-0.73/android/app/src/main/AndroidManifest.xml

@@ -3,14 +3,14 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-      android:name="com.movableink.MainApplication"
+      android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme">
       <activity
-        android:name="com.movableink.MainActivity"
+        android:name=".MainActivity"
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
         android:launchMode="singleTask"

example/android/app/src/main/java/com/movableink/MainActivity.kt → example-0.73/android/app/src/main/java/com/movableink/app/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.movableink
+package com.movableink.app
 
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate

example/android/app/src/main/java/com/movableink/MainApplication.kt → example-0.73/android/app/src/main/java/com/movableink/app/MainApplication.kt

@@ -1,4 +1,4 @@
-package com.movableink
+package com.movableink.app
 
 import android.app.Application
 import com.facebook.react.PackageList
@@ -12,6 +12,7 @@ import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.react.flipper.ReactNativeFlipper
 import com.facebook.soloader.SoLoader
 import com.rnmovableink.BuildConfig
+import com.wix.reactnativenotifications.RNNotificationsPackage;
 
 class MainApplication : Application(), ReactApplication {
 

example-0.73/android/build.gradle

@@ -0,0 +1,34 @@
+buildscript {
+    ext {
+        buildToolsVersion = "34.0.0"
+        minSdkVersion = 24
+        compileSdkVersion = 34
+        targetSdkVersion = 34
+        ndkVersion = "25.1.8937393"
+        kotlinVersion = "1.9.24"
+    }
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            url 'https://central.sonatype.com/repository/maven-snapshots/'
+        }
+    }
+    dependencies {
+        classpath("com.android.tools.build:gradle:8.1.1")
+        classpath("com.facebook.react:react-native-gradle-plugin")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+        classpath("com.google.gms:google-services:4.4.0")
+    }
+}
+
+apply plugin: "com.facebook.react.rootproject"
+
+// Disable tests for react-native-notifications due to deprecated API usage
+project(':react-native-notifications') {
+    afterEvaluate {
+        tasks.withType(Test).configureEach {
+            enabled = false
+        }
+    }
+}

example/android/settings.gradle → example-0.73/android/settings.gradle

@@ -2,3 +2,5 @@ rootProject.name = 'MovableInkExample'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
+include ':react-native-notifications'
+project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/lib/android/app')

example/ios/MovableInkExample/AppDelegate.mm → example-0.73/ios/MovableInkExample/AppDelegate.mm

@@ -3,6 +3,7 @@
 #import <React/RCTBundleURLProvider.h>
 #import <MovableInk/MovableInk-Swift.h>
 #import <React/RCTLinkingManager.h>
+#import "RNNotifications.h"
 
 @implementation AppDelegate
 
@@ -13,6 +14,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   // They will be passed down to the ViewController used by React Native.
   self.initialProps = @{};
 
+  [RNNotifications startMonitorNotifications];
+
   return [super application:application didFinishLaunchingWithOptions:launchOptions];
 }
 
@@ -27,6 +30,19 @@ - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserAct
                      restorationHandler:restorationHandler];
 }
 
+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+  NSLog(@"Device Token: %@", deviceToken);
+  [RNNotifications didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
+}
+
+- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
+  [RNNotifications didFailToRegisterForRemoteNotificationsWithError:error];
+}
+
+- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))completionHandler {
+  [RNNotifications didReceiveBackgroundNotification:userInfo withCompletionHandler:completionHandler];
+}
+
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 #if DEBUG

example/ios/MovableInkExample/MovableInkExample.entitlements → example-0.73/ios/MovableInkExample/MovableInkExample.entitlements

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>aps-environment</key>
+	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>applinks:mi-mobile-sandbox.mimobile.xyz</string>