Revert "Feat/rn76 oldarch (#7967)" (#8003)

Author: d4vidi

.eslintrc.js

@@ -5,6 +5,5 @@ module.exports = {
   plugins: ['@typescript-eslint'],
   env: {
     jest: true,
-    'jest/globals': true,
   },
 };

.gitignore

@@ -244,4 +244,3 @@ Mock.js
 Mock.d.ts
 
 Gemfile.lock
-/playground/ios/.xcode.env.local

babel.config.js

@@ -1,7 +1,7 @@
 module.exports = function (api) {
   api && api.cache(false);
   return {
-    presets: ['module:@react-native/babel-preset'],
+    presets: ['module:metro-react-native-babel-preset'],
     plugins: [
       '@babel/plugin-proposal-export-namespace-from',
       '@babel/plugin-proposal-export-default-from',

e2e/StaticLifecycleEvents.test.js

@@ -1,7 +1,7 @@
 import Utils from './Utils';
 import TestIDs from '../playground/src/testIDs';
 
-const { elementByLabel, elementById, sleep } = Utils;
+const { elementByLabel, elementById } = Utils;
 
 describe('static lifecycle events', () => {
   beforeEach(async () => {
@@ -93,9 +93,6 @@ describe('static lifecycle events', () => {
     await elementById(TestIDs.SET_ROOT_BTN).tap();
     await elementById(TestIDs.CLEAR_OVERLAY_EVENTS_BTN).tap();
     await elementById(TestIDs.SET_ROOT_BTN).tap();
-    // This sleep is needed in order to synchronize the test rendered with state changes. We can remove it after moving
-    // our mock to work with act(()=>{}) from react-test-renderer
-    await sleep(10);
     await expect(elementByLabel('setRoot complete - previous root is unmounted')).toBeVisible();
   });
 

e2e/assets/overlay_banner_padding.png

@@ -20,7 +20,6 @@ def DEFAULT_KOTLIN_STDLIB = 'kotlin-stdlib-jdk8'
 def kotlinVersion = safeExtGet("RNNKotlinVersion", DEFAULT_KOTLIN_VERSION)
 def kotlinStdlib = safeExtGet('RNNKotlinStdlib',DEFAULT_KOTLIN_STDLIB )
 def kotlinCoroutinesCore = safeExtGet('RNNKotlinCoroutinesCore', '1.5.2')
-
 android {
     namespace 'com.reactnativenavigation'
     compileSdkVersion safeExtGetFallbackLowerBound('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)

lib/android/app/build.gradle

@@ -2,20 +2,18 @@
 
 import android.app.Application;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
-import com.facebook.react.soloader.OpenSourceMergedSoMapping;
 import com.facebook.soloader.SoLoader;
 import com.reactnativenavigation.react.ReactGateway;
 import com.reactnativenavigation.viewcontrollers.externalcomponent.ExternalComponentCreator;
 
 import java.util.Collections;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import androidx.annotation.NonNull;
-
 public abstract class NavigationApplication extends Application implements ReactApplication {
 
 	public static NavigationApplication instance;
@@ -35,11 +33,7 @@ public NavigationApplication(Map<RNNToggles, Boolean> featureToggleOverrides) {
 	@Override
 	public void onCreate() {
 		super.onCreate();
-        try {
-            SoLoader.init(this, OpenSourceMergedSoMapping.INSTANCE);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        SoLoader.init(this, false);
         reactGateway = createReactGateway();
 	}
 

lib/android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -5,21 +5,21 @@
 import android.os.Bundle;
 import android.view.MotionEvent;
 
-import androidx.annotation.RestrictTo;
-
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.JSTouchDispatcher;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
 import com.reactnativenavigation.react.events.ComponentType;
 import com.reactnativenavigation.react.events.EventEmitter;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.IReactView;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
 import com.reactnativenavigation.views.component.Renderable;
 
+import androidx.annotation.RestrictTo;
+
 @SuppressLint("ViewConstructor")
 public class ReactView extends ReactRootView implements IReactView, Renderable {
 

lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java

@@ -34,7 +34,7 @@ open class ModalHostLayout(reactContext: ThemedReactContext) : ViewGroup(reactCo
     }
 
     @TargetApi(23)
-    override fun dispatchProvideStructure(structure: ViewStructure) {
+    override fun dispatchProvideStructure(structure: ViewStructure?) {
         mHostView.dispatchProvideStructure(structure)
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/react/modal/ModalHostLayout.kt

@@ -18,7 +18,6 @@
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.common.ReactConstants;
 import com.facebook.react.views.text.ReactFontManager;
 import com.facebook.react.views.text.ReactTextShadowNode;
 import java.util.ArrayList;
@@ -97,12 +96,12 @@ public static Typeface applyStyles(
 
     int want = 0;
     if ((weight == Typeface.BOLD)
-        || ((oldStyle & Typeface.BOLD) != 0 && weight == ReactConstants.UNSET)) {
+        || ((oldStyle & Typeface.BOLD) != 0 && weight == ReactTextShadowNode.UNSET)) {
       want |= Typeface.BOLD;
     }
 
     if ((style == Typeface.ITALIC)
-        || ((oldStyle & Typeface.ITALIC) != 0 && style == ReactConstants.UNSET)) {
+        || ((oldStyle & Typeface.ITALIC) != 0 && style == ReactTextShadowNode.UNSET)) {
       want |= Typeface.ITALIC;
     }