diff --git a/TestsExample/.gitignore b/TestsExample/.gitignore index 0cab2ac6fc..747a97d42a 100644 --- a/TestsExample/.gitignore +++ b/TestsExample/.gitignore @@ -20,7 +20,7 @@ DerivedData *.hmap *.ipa *.xcuserstate -ios/.xcode.env.local +**/.xcode.env.local # Android/IntelliJ # @@ -56,7 +56,7 @@ yarn-error.log *.jsbundle # Ruby / CocoaPods -/ios/Pods/ +**/Pods/ /vendor/bundle/ # Temporary files created by Metro to check the health of the file watcher @@ -64,3 +64,11 @@ yarn-error.log # testing /coverage + +# Yarn +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions diff --git a/TestsExample/android/app/build.gradle b/TestsExample/android/app/build.gradle index b654dc3da4..38f5f5972c 100644 --- a/TestsExample/android/app/build.gradle +++ b/TestsExample/android/app/build.gradle @@ -108,7 +108,6 @@ android { 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") if (hermesEnabled.toBoolean()) { implementation("com.facebook.react:hermes-android") diff --git a/TestsExample/android/app/src/main/java/com/testsexample/MainApplication.kt b/TestsExample/android/app/src/main/java/com/testsexample/MainApplication.kt index 8d46ba14e3..0e66741fe7 100644 --- a/TestsExample/android/app/src/main/java/com/testsexample/MainApplication.kt +++ b/TestsExample/android/app/src/main/java/com/testsexample/MainApplication.kt @@ -9,7 +9,6 @@ import com.facebook.react.ReactPackage import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost import com.facebook.react.defaults.DefaultReactNativeHost -import com.facebook.react.flipper.ReactNativeFlipper.initializeFlipper import com.facebook.soloader.SoLoader class MainApplication : Application(), ReactApplication { @@ -29,7 +28,7 @@ class MainApplication : Application(), ReactApplication { } override val reactHost: ReactHost - get() = getDefaultReactHost(this.applicationContext, reactNativeHost) + get() = getDefaultReactHost(applicationContext, reactNativeHost) override fun onCreate() { super.onCreate() @@ -38,6 +37,5 @@ class MainApplication : Application(), ReactApplication { // If you opted-in for the New Architecture, we load the native entry point for this app. load() } - initializeFlipper(this, reactNativeHost.reactInstanceManager) } } diff --git a/TestsExample/android/app/src/main/res/drawable/rn_edit_text_material.xml b/TestsExample/android/app/src/main/res/drawable/rn_edit_text_material.xml index 73b37e4d99..5c25e728ea 100644 --- a/TestsExample/android/app/src/main/res/drawable/rn_edit_text_material.xml +++ b/TestsExample/android/app/src/main/res/drawable/rn_edit_text_material.xml @@ -17,7 +17,8 @@ android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material" android:insetRight="@dimen/abc_edit_text_inset_horizontal_material" android:insetTop="@dimen/abc_edit_text_inset_top_material" - android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"> + android:insetBottom="@dimen/abc_edit_text_inset_bottom_material" + >