diff --git a/app/src/debug/java/com/majinnaibu/monstercards/init/FlipperInitializer.java b/app/src/debug/java/com/majinnaibu/monstercards/init/FlipperInitializer.java index afefe5a..ec9b4b9 100644 --- a/app/src/debug/java/com/majinnaibu/monstercards/init/FlipperInitializer.java +++ b/app/src/debug/java/com/majinnaibu/monstercards/init/FlipperInitializer.java @@ -2,6 +2,10 @@ package com.majinnaibu.monstercards.init; import android.content.Context; +import android.os.Bundle; + +import androidx.navigation.NavController; +import androidx.navigation.NavDestination; import com.facebook.flipper.android.AndroidFlipperClient; import com.facebook.flipper.android.utils.FlipperUtils; @@ -11,6 +15,7 @@ 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.google.gson.Gson; import com.majinnaibu.monstercards.BuildConfig; public class FlipperInitializer { @@ -25,7 +30,11 @@ public class FlipperInitializer { client.addPlugin(NavigationFlipperPlugin.getInstance()); client.start(); } - } + public static void sendNavigationEvent(NavController controller, NavDestination destination, Bundle arguments) { + Gson gson = new Gson(); + String json = gson.toJson(arguments != null ? arguments : new Bundle()); + NavigationFlipperPlugin.getInstance().sendNavigationEvent(String.format("%s:%s", destination.getLabel(), json), null, null); + } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c6ee887..3a1de80 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ + + - - \ No newline at end of file diff --git a/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java b/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java index b46ca97..d8f7b69 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java +++ b/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java @@ -11,6 +11,7 @@ import androidx.navigation.ui.NavigationUI; import com.google.android.material.bottomnavigation.BottomNavigationView; import com.majinnaibu.monstercards.init.AppCenterInitializer; +import com.majinnaibu.monstercards.init.FlipperInitializer; public class MainActivity extends AppCompatActivity { @@ -37,6 +38,9 @@ public class MainActivity extends AppCompatActivity { .build(); NavHostFragment navHostFragment = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment); NavController navController = navHostFragment.getNavController(); + navController.addOnDestinationChangedListener((controller, destination, arguments) -> { + FlipperInitializer.sendNavigationEvent(controller, destination, arguments); + }); NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); NavigationUI.setupWithNavController(navView, navController); } diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index 62b75c1..328db82 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -23,6 +23,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" + android:contentDescription="@string/action_add_monster" app:srcCompat="@android:drawable/ic_input_add" app:tint="@android:color/white" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index bcff9f6..97467f9 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,7 +1,5 @@ - 16dp - 16dp 16dp 16dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ba4a8cf..de20d44 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,4 @@ - Search Actions MonsterCards CHA @@ -14,4 +13,5 @@ Library Search WIS + Add monster \ No newline at end of file diff --git a/app/src/release/java/com/majinnaibu/monstercards/init/FlipperInitializer.java b/app/src/release/java/com/majinnaibu/monstercards/init/FlipperInitializer.java index baeedd5..8b28e37 100644 --- a/app/src/release/java/com/majinnaibu/monstercards/init/FlipperInitializer.java +++ b/app/src/release/java/com/majinnaibu/monstercards/init/FlipperInitializer.java @@ -6,4 +6,5 @@ public class FlipperInitializer { public static void init(Context ctx) {} + public static void sendNavigationEvent(NavController controller, NavDestination destination, Bundle arguments) { } \ No newline at end of file