diff --git a/.idea/misc.xml b/.idea/misc.xml index 2e2414d..658b7fd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,6 +7,7 @@ + @@ -30,6 +31,7 @@ + diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java index a6e73d6..6295b16 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java @@ -29,6 +29,7 @@ public class MainActivity extends AppCompatActivity { private ActivityMainBinding binding; + private NavController navController; Intent intent; @Override @@ -45,7 +46,7 @@ AppBarConfiguration appBarConfiguration = new AppBarConfiguration.Builder( R.id.navigation_home, R.id.navigation_search, R.id.navigation_edit, R.id.navigation_mypage) .build(); - NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_activity_main); + navController = Navigation.findNavController(this, R.id.nav_host_fragment_activity_main); NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); NavigationUI.setupWithNavController(binding.navView, navController); } @@ -76,15 +77,16 @@ return true; // Iconを押したときMyPageに遷移 - case R.id.icon: - String[] poptext = { "I LOVE JENKINS", "わけわからん", "そうだ、新田研に行こう。", "大吉", "中吉", "吉", "凶" }; - Random random = new Random(); - Toast myToast = Toast.makeText( - getApplicationContext(), - poptext[random.nextInt(7)], - Toast.LENGTH_SHORT - ); - myToast.show(); + case R.id.navigation_icon: + navController.navigate(R.id.navigation_mypage); +// String[] poptext = { "I LOVE JENKINS", "わけわからん", "そうだ、新田研に行こう。", "大吉", "中吉", "吉", "凶" }; +// Random random = new Random(); +// Toast myToast = Toast.makeText( +// getApplicationContext(), +// poptext[random.nextInt(7)], +// Toast.LENGTH_SHORT +// ); +// myToast.show(); return true; default: