CR tweaks

Author: dratwas

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

@@ -1,10 +1,8 @@
 package com.callstack.reactnativebrownfield
 
 import android.app.Application
-import com.facebook.react.ReactInstanceManager
 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
 

android/src/main/java/com/callstack/reactnativebrownfield/BridgeManagerJava.java

@@ -1,7 +1,6 @@
 package com.callstack.reactnativebrownfield;
 
 import android.app.Application;
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import kotlin.Unit;

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

@@ -15,17 +15,9 @@ import com.facebook.react.bridge.Callback
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler
 import com.facebook.react.modules.core.PermissionAwareActivity
 
-class ReactNativeActivity : ReactActivity(), DefaultHardwareBackBtnHandler, PermissionAwareActivity {
-    companion object {
-        const val MODULE_NAME = "com.callstack.reactnativebrownfield.MODULE_NAME"
-
-        fun createReactActivityIntent(context: Context, moduleName: String): Intent {
-            val intent = Intent(context, ReactNativeActivity::class.java)
-            intent.putExtra(ReactNativeActivity.MODULE_NAME, "ReactNative")
-            return intent
-        }
-    }
+private const val MODULE_NAME = "com.callstack.reactnativebrownfield.ACTIVITY_MODULE_NAME"
 
+class ReactNativeActivity : ReactActivity(), DefaultHardwareBackBtnHandler, PermissionAwareActivity {
     private var reactRootView: ReactRootView? = null
     private lateinit var moduleName: String
     private lateinit var doubleTapReloadRecognizer: DoubleTapReloadRecognizer
@@ -151,4 +143,13 @@ class ReactNativeActivity : ReactActivity(), DefaultHardwareBackBtnHandler, Perm
             }
         }
     }
+
+    companion object {
+        @JvmStatic
+        fun createReactActivityIntent(context: Context, moduleName: String): Intent {
+            val intent = Intent(context, ReactNativeActivity::class.java)
+            intent.putExtra(MODULE_NAME, moduleName)
+            return intent
+        }
+    }
 }

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

@@ -4,7 +4,6 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 
-
 class ReactNativeBrownfieldModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
     companion object {
         var shouldPopToNative: Boolean = false

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

@@ -17,6 +17,8 @@ import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler
 import com.facebook.react.modules.core.PermissionAwareActivity
 import com.facebook.react.modules.core.PermissionListener
 
+private const val MODULE_NAME = "com.callstack.reactnativebrownfield.FRAGMENT_MODULE_NAME"
+
 class ReactNativeFragment : Fragment(), PermissionAwareActivity {
 
     private var reactRootView: ReactRootView? = null
@@ -145,8 +147,7 @@ class ReactNativeFragment : Fragment(), PermissionAwareActivity {
     }
 
     companion object {
-        const val MODULE_NAME = "com.callstack.reactnativebrownfield.MODULE_NAME"
-
+        @JvmStatic
         fun createReactNativeFragment(moduleName: String): ReactNativeFragment {
             val fragment = ReactNativeFragment()
             val args = Bundle()

example/native/android/app/src/debug/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+    <application android:usesCleartextTraffic="true" tools:targetApi="28" />
+</manifest>

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
           package="com.callstack.nativeexample">
 
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -13,8 +12,7 @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
-            android:theme="@style/AppTheme"
-            android:usesCleartextTraffic="true">
+            android:theme="@style/AppTheme">
         <activity android:name=".ReactNativeFragmentActivity"/>
         <activity android:name=".MainActivity">
             <intent-filter>

example/native/android/app/src/main/java/com/callstack/nativeexample/MainActivity.java

@@ -15,7 +15,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     public void startReactNative(View view) {
-        Intent intent = ReactNativeActivity.Companion.createReactActivityIntent(
+        Intent intent = ReactNativeActivity.createReactActivityIntent(
                 this,
                 "ReactNative"
         );

example/native/android/app/src/main/java/com/callstack/nativeexample/ReactNativeFragmentActivity.java

@@ -22,7 +22,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(R.layout.activity_react_native_fragment);
 
         if (savedInstanceState == null) {
-            ReactNativeFragment reactNativeFragment = ReactNativeFragment.Companion.createReactNativeFragment("ReactNative");
+            ReactNativeFragment reactNativeFragment = ReactNativeFragment.createReactNativeFragment("ReactNative");
             getSupportFragmentManager().beginTransaction()
                     .add(R.id.container_main, reactNativeFragment)
                     .commit();