diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index b782eed..9534814 100644 --- a/.idea/caches/build_file_checksums.ser +++ b/.idea/caches/build_file_checksums.ser Binary files differ diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java index d6df825..be7b717 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java @@ -27,7 +27,7 @@ //fragmentの設定 Fragment fragment; fragment = new StartFragment(); - getSupportFragmentManager().beginTransaction().add(R.id.flamelayout_place, fragment).commit(); + getSupportFragmentManager().beginTransaction().add(R.id.framelayout_place, fragment).commit(); setContentView(R.layout.activity_main); } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java index cf4a71b..41f363c 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java @@ -38,7 +38,7 @@ FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.flamelayout_place, new InstancesFragment()); + transaction.replace(R.id.framelayout_place, new InstancesFragment()); transaction.commit(); } @@ -54,7 +54,7 @@ FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.flamelayout_place, new PlayerFragment()); + transaction.replace(R.id.framelayout_place, new PlayerFragment()); transaction.addToBackStack(null); transaction.commit(); } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java index cd5c388..f9c40e6 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java @@ -60,7 +60,7 @@ Bundle bundle = new Bundle(); bundle.putSerializable("test","これはテストです"); fragment.setArguments(bundle); - transaction.replace(R.id.flamelayout_place, fragment,"characters_fragment"); + transaction.replace(R.id.framelayout_place, fragment,"characters_fragment"); transaction.commit(); } }); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java index bcc302c..31a0b2a 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java @@ -38,7 +38,7 @@ FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); transaction.addToBackStack(null); - transaction.replace(R.id.flamelayout_place, new SignUpFragment()); + transaction.replace(R.id.framelayout_place, new SignUpFragment()); transaction.commit(); } }); @@ -56,7 +56,7 @@ FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.flamelayout_place, new InstancesFragment()); + transaction.replace(R.id.framelayout_place, new InstancesFragment()); transaction.commit(); // **********************************************************************/ diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java index 2d393b9..19df6e1 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java @@ -48,7 +48,7 @@ transaction.addToBackStack(null); //transaction.replace(R.id.fragment_place, new LoginFragment()); - transaction.replace(R.id.flamelayout_place, new LoginFragment()); + transaction.replace(R.id.framelayout_place, new LoginFragment()); transaction.commit(); } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java index e3e1778..2383e91 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java @@ -31,7 +31,7 @@ public void onClick(View view) { FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.flamelayout_place,new LoginFragment()); + transaction.replace(R.id.framelayout_place,new LoginFragment()); transaction.addToBackStack(null); transaction.commit(); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5c02dfb..147e60b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -20,15 +20,9 @@ - -