Merge pull request #67 from kanzitelli/packages-update

Packages update + Flipper
kanzitelli · Jan 7, 2022 · 55338e3 · 55338e3
2 parents 80786a2 + 830aa02
commit 55338e3
Show file tree

Hide file tree

Showing 24 changed files with 1,400 additions and 947 deletions.
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
@@ -12,6 +12,7 @@
 -keep class com.facebook.hermes.unicode.** { *; }
 -keep class com.facebook.jni.** { *; }
 
+-keep class com.swmansion.reanimated.** { *; }
 -keep class com.facebook.react.turbomodule.** { *; }
 
 -keepclassmembers class com.android.installreferrer.api.** { *; }
diff --git a/android/app/src/main/java/com/rnnstarter/MainActivity.java b/android/app/src/main/java/com/rnnstarter/MainActivity.java
@@ -4,5 +4,4 @@
 
 public class MainActivity extends NavigationActivity {
 
-
 }
diff --git a/android/app/src/main/java/com/rnnstarter/MainApplication.java b/android/app/src/main/java/com/rnnstarter/MainApplication.java
@@ -1,17 +1,14 @@
 package com.rnnstarter;
 
-import android.app.Application;
 import android.content.Context;
 import com.facebook.react.PackageList;
 import com.reactnativenavigation.NavigationApplication;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.soloader.SoLoader;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
-import java.util.Collections;
 
 import com.facebook.react.bridge.JSIModulePackage;
 import com.swmansion.reanimated.ReanimatedJSIModulePackage;
@@ -59,7 +56,7 @@ public ReactNativeHost getReactNativeHost() {
   public void onCreate() {
     super.onCreate();
 
-    // initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
   }
 
   /**
@@ -99,8 +96,7 @@ private static void initializeFlipper(
 class RNNStarterJSIPackage extends ReanimatedJSIModulePackage {
   @Override
   public List<JSIModuleSpec> getJSIModules(ReactApplicationContext reactApplicationContext, JavaScriptContextHolder jsContext) {
-    super.getJSIModules(reactApplicationContext, jsContext);
     MmkvModule.install(jsContext, reactApplicationContext.getFilesDir().getAbsolutePath() + "/mmkv");
-    return Collections.emptyList();
+    return super.getJSIModules(reactApplicationContext, jsContext);
   }
 }
diff --git a/ios/Podfile b/ios/Podfile
@@ -21,7 +21,7 @@ target 'RNNStarter' do
   #
   # Note that if you have use_frameworks! enabled, Flipper will not work and
   # you should disable the next line.
-  # use_flipper!()
+  use_flipper!()
 
   post_install do |installer|
     react_native_post_install(installer)