diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml index 90cdf2a..c9d60dd 100644 --- a/Android/app/src/main/AndroidManifest.xml +++ b/Android/app/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ + + - - \ No newline at end of file diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java b/Android/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java index 7a20e80..d8f7b69 100644 --- a/Android/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java +++ b/Android/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java @@ -5,11 +5,13 @@ import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; import androidx.navigation.NavController; import androidx.navigation.Navigation; +import androidx.navigation.fragment.NavHostFragment; import androidx.navigation.ui.AppBarConfiguration; 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 { @@ -34,7 +36,11 @@ public class MainActivity extends AppCompatActivity { R.id.navigation_collections, R.id.navigation_library) .build(); - NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment); + 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/Android/app/src/main/res/layout/fragment_library.xml b/Android/app/src/main/res/layout/fragment_library.xml index 71c3329..328db82 100644 --- a/Android/app/src/main/res/layout/fragment_library.xml +++ b/Android/app/src/main/res/layout/fragment_library.xml @@ -6,17 +6,26 @@ android:layout_height="match_parent" tools:context=".ui.library.LibraryFragment"> - + + + app:layout_constraintEnd_toEndOf="parent" /> \ No newline at end of file diff --git a/Android/app/src/main/res/values/dimens.xml b/Android/app/src/main/res/values/dimens.xml index bcff9f6..97467f9 100644 --- a/Android/app/src/main/res/values/dimens.xml +++ b/Android/app/src/main/res/values/dimens.xml @@ -1,7 +1,5 @@ - 16dp - 16dp 16dp 16dp diff --git a/Android/app/src/main/res/values/strings.xml b/Android/app/src/main/res/values/strings.xml index d1a421d..de20d44 100644 --- a/Android/app/src/main/res/values/strings.xml +++ b/Android/app/src/main/res/values/strings.xml @@ -1,10 +1,17 @@ + Actions MonsterCards - Dashboard - Search - Collections - Library - Search + CHA + CON + DEX + INT Query section divider + STR + Collections + Dashboard + Library + Search + WIS + Add monster \ No newline at end of file diff --git a/Android/app/src/release/java/com/majinnaibu/monstercards/init/FlipperInitializer.java b/Android/app/src/release/java/com/majinnaibu/monstercards/init/FlipperInitializer.java index baeedd5..8b28e37 100644 --- a/Android/app/src/release/java/com/majinnaibu/monstercards/init/FlipperInitializer.java +++ b/Android/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