Fixes a bunch of lint errors and enables Flipper navigation logging.
This commit is contained in:
		| @@ -2,6 +2,10 @@ package com.majinnaibu.monstercards.init; | |||||||
|  |  | ||||||
|  |  | ||||||
| import android.content.Context; | 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.AndroidFlipperClient; | ||||||
| import com.facebook.flipper.android.utils.FlipperUtils; | 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.inspector.InspectorFlipperPlugin; | ||||||
| import com.facebook.flipper.plugins.navigation.NavigationFlipperPlugin; | import com.facebook.flipper.plugins.navigation.NavigationFlipperPlugin; | ||||||
| import com.facebook.soloader.SoLoader; | import com.facebook.soloader.SoLoader; | ||||||
|  | import com.google.gson.Gson; | ||||||
| import com.majinnaibu.monstercards.BuildConfig; | import com.majinnaibu.monstercards.BuildConfig; | ||||||
|  |  | ||||||
| public class FlipperInitializer { | public class FlipperInitializer { | ||||||
| @@ -25,7 +30,11 @@ public class FlipperInitializer { | |||||||
|             client.addPlugin(NavigationFlipperPlugin.getInstance()); |             client.addPlugin(NavigationFlipperPlugin.getInstance()); | ||||||
|             client.start(); |             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); | ||||||
|  |     } | ||||||
| } | } | ||||||
| @@ -2,6 +2,8 @@ | |||||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||||||
|     package="com.majinnaibu.monstercards"> |     package="com.majinnaibu.monstercards"> | ||||||
|  |  | ||||||
|  |     <uses-permission android:name="android.permission.INTERNET" /> | ||||||
|  |  | ||||||
|     <application |     <application | ||||||
|         android:allowBackup="true" |         android:allowBackup="true" | ||||||
|         android:icon="@mipmap/ic_launcher" |         android:icon="@mipmap/ic_launcher" | ||||||
| @@ -23,6 +25,4 @@ | |||||||
|             android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity" |             android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity" | ||||||
|             android:exported="true" /> |             android:exported="true" /> | ||||||
|     </application> |     </application> | ||||||
|  |  | ||||||
|     <uses-permission android:name="android.permission.INTERNET" /> |  | ||||||
| </manifest> | </manifest> | ||||||
| @@ -11,6 +11,7 @@ import androidx.navigation.ui.NavigationUI; | |||||||
|  |  | ||||||
| import com.google.android.material.bottomnavigation.BottomNavigationView; | import com.google.android.material.bottomnavigation.BottomNavigationView; | ||||||
| import com.majinnaibu.monstercards.init.AppCenterInitializer; | import com.majinnaibu.monstercards.init.AppCenterInitializer; | ||||||
|  | import com.majinnaibu.monstercards.init.FlipperInitializer; | ||||||
|  |  | ||||||
| public class MainActivity extends AppCompatActivity { | public class MainActivity extends AppCompatActivity { | ||||||
|  |  | ||||||
| @@ -37,6 +38,9 @@ public class MainActivity extends AppCompatActivity { | |||||||
|                 .build(); |                 .build(); | ||||||
|         NavHostFragment navHostFragment = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment); |         NavHostFragment navHostFragment = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment); | ||||||
|         NavController navController = navHostFragment.getNavController(); |         NavController navController = navHostFragment.getNavController(); | ||||||
|  |         navController.addOnDestinationChangedListener((controller, destination, arguments) -> { | ||||||
|  |             FlipperInitializer.sendNavigationEvent(controller, destination, arguments); | ||||||
|  |         }); | ||||||
|         NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); |         NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); | ||||||
|         NavigationUI.setupWithNavController(navView, navController); |         NavigationUI.setupWithNavController(navView, navController); | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -23,6 +23,7 @@ | |||||||
|         android:layout_height="wrap_content" |         android:layout_height="wrap_content" | ||||||
|         android:layout_gravity="bottom|end" |         android:layout_gravity="bottom|end" | ||||||
|         android:layout_margin="@dimen/fab_margin" |         android:layout_margin="@dimen/fab_margin" | ||||||
|  |         android:contentDescription="@string/action_add_monster" | ||||||
|         app:srcCompat="@android:drawable/ic_input_add" |         app:srcCompat="@android:drawable/ic_input_add" | ||||||
|         app:tint="@android:color/white" |         app:tint="@android:color/white" | ||||||
|         app:layout_constraintBottom_toBottomOf="parent" |         app:layout_constraintBottom_toBottomOf="parent" | ||||||
|   | |||||||
| @@ -1,7 +1,5 @@ | |||||||
| <resources> | <resources> | ||||||
|     <!-- Default screen margins, per the Android Design guidelines. --> |     <!-- Default screen margins, per the Android Design guidelines. --> | ||||||
|     <dimen name="activity_horizontal_margin">16dp</dimen> |  | ||||||
|     <dimen name="activity_vertical_margin">16dp</dimen> |  | ||||||
|     <dimen name="text_margin">16dp</dimen> |     <dimen name="text_margin">16dp</dimen> | ||||||
|     <dimen name="fab_margin">16dp</dimen> |     <dimen name="fab_margin">16dp</dimen> | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,5 +1,4 @@ | |||||||
| <resources> | <resources> | ||||||
|     <string name="action_search">Search</string> |  | ||||||
|     <string name="actions_label">Actions</string> |     <string name="actions_label">Actions</string> | ||||||
|     <string name="app_name">MonsterCards</string> |     <string name="app_name">MonsterCards</string> | ||||||
|     <string name="charisma_abbreviation">CHA</string> |     <string name="charisma_abbreviation">CHA</string> | ||||||
| @@ -14,4 +13,5 @@ | |||||||
|     <string name="title_library">Library</string> |     <string name="title_library">Library</string> | ||||||
|     <string name="title_search">Search</string> |     <string name="title_search">Search</string> | ||||||
|     <string name="wisdom_abbreviation">WIS</string> |     <string name="wisdom_abbreviation">WIS</string> | ||||||
|  |     <string name="action_add_monster">Add monster</string> | ||||||
| </resources> | </resources> | ||||||
| @@ -6,4 +6,5 @@ public class FlipperInitializer { | |||||||
|  |  | ||||||
|     public static void init(Context ctx) {} |     public static void init(Context ctx) {} | ||||||
|  |  | ||||||
|  |     public static void sendNavigationEvent(NavController controller, NavDestination destination, Bundle arguments) { | ||||||
| } | } | ||||||
		Reference in New Issue
	
	Block a user