Merge pull request #73 from callstack/@okwasniewski/chore/upgradeRN

chore: upgrade example to RN 0.74, move to typescript, update deprecated code

Author: okwasniewski

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   analyse:
     docker:
-      - image: circleci/node:10
+      - image: cimg/node:current
     steps:
       - checkout
       - restore_cache:
@@ -19,10 +19,10 @@ jobs:
           name: Lint JS Code (ESLint)
           command: yarn run lint
       - run:
-          name: Flow
-          command: yarn run flow
+          name: Typescript Type Checking (tsc) 
+          command: yarn run typecheck
 
 workflows:
   test:
     jobs:
-      - analyse
+      - analyse

.eslintrc.js

@@ -21,6 +21,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
+**/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -57,3 +58,17 @@ buck-out/
 
 # CocoaPods
 **/Pods
+
+
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+.yarnrc.yml 
+
+# generated by bob
+lib/
+

.flowconfig

@@ -0,0 +1 @@
+nodeLinker: node-modules

.gitignore

@@ -84,9 +84,11 @@ class ReactNativeActivity : ReactActivity(), DefaultHardwareBackBtnHandler, Perm
                 ReactNativeBrownfield.shared.reactNativeHost.reactInstanceManager.showDevOptionsDialog()
                 return true
             }
-            val didDoubleTapR = Assertions.assertNotNull(doubleTapReloadRecognizer)
-                .didDoubleTapR(keyCode, this.currentFocus)
-            if (didDoubleTapR) {
+            val didDoubleTapR = this.currentFocus?.let {
+                Assertions.assertNotNull(doubleTapReloadRecognizer)
+                    .didDoubleTapR(keyCode, it)
+            }
+            if (didDoubleTapR == true) {
                 ReactNativeBrownfield.shared.reactNativeHost.reactInstanceManager.devSupportManager.handleReloadJS()
                 return true
             }
@@ -132,6 +134,7 @@ class ReactNativeActivity : ReactActivity(), DefaultHardwareBackBtnHandler, Perm
         permissions: Array<String>,
         grantResults: IntArray
     ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         permissionsCallback = Callback {
             if (permissionListener != null) {
                 permissionListener?.onRequestPermissionsResult(

.yarnrc.yml

@@ -1,8 +1,10 @@
 package com.callstack.reactnativebrownfield
 
 import android.app.Application
+import com.facebook.react.ReactInstanceEventListener
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.ReactContext
 import com.facebook.soloader.SoLoader
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -60,10 +62,13 @@ class ReactNativeBrownfield private constructor(val reactNativeHost: ReactNative
 
   @JvmName("startReactNativeKotlin")
   fun startReactNative(callback: ((initialized: Boolean) -> Unit)?) {
-    if (callback != null) {
-      reactNativeHost.reactInstanceManager?.addReactInstanceEventListener { callback(true) }
-    }
-
+    reactNativeHost.reactInstanceManager.addReactInstanceEventListener(object : ReactInstanceEventListener {
+      override fun onReactContextInitialized(reactContext: ReactContext) {
+        callback?.let { it(true) }
+        reactNativeHost.reactInstanceManager.removeReactInstanceEventListener(this)
+      }
+    })
     reactNativeHost.reactInstanceManager?.createReactContextInBackground()
   }
-}
+}
+

android/src/main/java/com/callstack/reactnativebrownfield/ReactNativeActivity.kt

@@ -103,12 +103,12 @@ class ReactNativeFragment : Fragment(), PermissionAwareActivity {
     }
 
     override fun checkPermission(permission: String, pid: Int, uid: Int): Int {
-        return activity!!.checkPermission(permission, pid, uid)
+        return requireActivity().checkPermission(permission, pid, uid)
     }
 
     @TargetApi(Build.VERSION_CODES.M)
     override fun checkSelfPermission(permission: String): Int {
-        return activity!!.checkSelfPermission(permission)
+        return requireActivity().checkSelfPermission(permission)
     }
 
     @TargetApi(Build.VERSION_CODES.M)
@@ -128,9 +128,11 @@ class ReactNativeFragment : Fragment(), PermissionAwareActivity {
                 ReactNativeBrownfield.shared.reactNativeHost.reactInstanceManager.showDevOptionsDialog()
                 handled = true
             }
-            val didDoubleTapR = Assertions.assertNotNull(doubleTapReloadRecognizer)
-                .didDoubleTapR(keyCode, activity?.currentFocus)
-            if (didDoubleTapR) {
+            val didDoubleTapR = activity?.currentFocus?.let {
+                Assertions.assertNotNull(doubleTapReloadRecognizer)
+                    .didDoubleTapR(keyCode, it)
+            }
+            if (didDoubleTapR == true) {
                 ReactNativeBrownfield.shared.reactNativeHost.reactInstanceManager.devSupportManager.handleReloadJS()
                 handled = true
             }

android/src/main/java/com/callstack/reactnativebrownfield/ReactNativeBrownfield.kt

@@ -1,5 +1,5 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
+  presets: ['module:@react-native/babel-preset'],
   plugins: [
     [
       'module-resolver',