From ce8583a87621e31108fd0e9ba45b4bdb54d16729 Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Sun, 2 May 2021 00:03:46 -0700 Subject: [PATCH] Removes release build dependencies on Flipper and SoLoader. --- .../utils/FlipperInitializer.java | 31 +++++++++++++++++++ .../monstercards/MonsterCardsApplication.java | 18 ++--------- .../utils/FlipperInitializer.java | 9 ++++++ 3 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 app/src/debug/java/com/majinnaibu/monstercards/utils/FlipperInitializer.java create mode 100644 app/src/release/java/com/majinnaibu/monstercards/utils/FlipperInitializer.java diff --git a/app/src/debug/java/com/majinnaibu/monstercards/utils/FlipperInitializer.java b/app/src/debug/java/com/majinnaibu/monstercards/utils/FlipperInitializer.java new file mode 100644 index 0000000..6ba14fd --- /dev/null +++ b/app/src/debug/java/com/majinnaibu/monstercards/utils/FlipperInitializer.java @@ -0,0 +1,31 @@ +package com.majinnaibu.monstercards.utils; + + +import android.content.Context; + +import com.facebook.flipper.android.AndroidFlipperClient; +import com.facebook.flipper.android.utils.FlipperUtils; +import com.facebook.flipper.core.FlipperClient; +import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin; +import com.facebook.flipper.plugins.inspector.DescriptorMapping; +import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin; +import com.facebook.flipper.plugins.navigation.NavigationFlipperPlugin; +import com.facebook.soloader.SoLoader; +import com.majinnaibu.monstercards.BuildConfig; + +public class FlipperInitializer { + + public static void init(Context ctx) { + SoLoader.init(ctx, false); + + if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(ctx)) { + final FlipperClient client = AndroidFlipperClient.getInstance(ctx); + client.addPlugin(new InspectorFlipperPlugin(ctx, DescriptorMapping.withDefaults())); + client.addPlugin(new DatabasesFlipperPlugin(ctx)); + client.addPlugin(NavigationFlipperPlugin.getInstance()); + client.start(); + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/majinnaibu/monstercards/MonsterCardsApplication.java b/app/src/main/java/com/majinnaibu/monstercards/MonsterCardsApplication.java index eea208e..e11071b 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/MonsterCardsApplication.java +++ b/app/src/main/java/com/majinnaibu/monstercards/MonsterCardsApplication.java @@ -9,15 +9,8 @@ import androidx.room.Room; import androidx.room.migration.Migration; import androidx.sqlite.db.SupportSQLiteDatabase; -import com.facebook.flipper.android.AndroidFlipperClient; -import com.facebook.flipper.android.utils.FlipperUtils; -import com.facebook.flipper.core.FlipperClient; -import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin; -import com.facebook.flipper.plugins.inspector.DescriptorMapping; -import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin; -import com.facebook.flipper.plugins.navigation.NavigationFlipperPlugin; -import com.facebook.soloader.SoLoader; import com.majinnaibu.monstercards.data.MonsterRepository; +import com.majinnaibu.monstercards.utils.FlipperInitializer; public class MonsterCardsApplication extends Application { @@ -42,15 +35,8 @@ public class MonsterCardsApplication extends Application { public void onCreate() { super.onCreate(); // Required initialization logic here! - SoLoader.init(this, false); - if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(this)) { - final FlipperClient client = AndroidFlipperClient.getInstance(this); - client.addPlugin(new InspectorFlipperPlugin(this, DescriptorMapping.withDefaults())); - client.addPlugin(new DatabasesFlipperPlugin(this)); - client.addPlugin(NavigationFlipperPlugin.getInstance()); - client.start(); - } + FlipperInitializer.init(this); m_db = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "monsters") .addMigrations(MIGRATION_1_2) diff --git a/app/src/release/java/com/majinnaibu/monstercards/utils/FlipperInitializer.java b/app/src/release/java/com/majinnaibu/monstercards/utils/FlipperInitializer.java new file mode 100644 index 0000000..2536331 --- /dev/null +++ b/app/src/release/java/com/majinnaibu/monstercards/utils/FlipperInitializer.java @@ -0,0 +1,9 @@ +package com.majinnaibu.monstercards.utils; + +import android.content.Context; + +public class FlipperInitializer { + + public static void init(Context ctx) {} + +} \ No newline at end of file