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 be7b717..0e45aff 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.framelayout_place, fragment).commit(); + getSupportFragmentManager().beginTransaction().add(R.id.fragment_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 80c6693..46069de 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 @@ -46,7 +46,7 @@ FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.framelayout_place, new InstancesFragment()); + transaction.replace(R.id.fragment_place, new InstancesFragment()); transaction.commit(); } }); @@ -72,7 +72,7 @@ //positionで選ばれたインスタンスわかるで！数字は０からやで！例えば１はデータ２やで！やで FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.framelayout_place, new PlayerFragment()); + transaction.replace(R.id.fragment_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 61c85f5..af69016 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 @@ -63,7 +63,7 @@ bundle.putSerializable("position", position); fragment.setArguments(bundle); - transaction.replace(R.id.framelayout_place, fragment, "characters_fragment"); + transaction.replace(R.id.fragment_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 bf6efda..e86d83e 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 @@ -46,7 +46,7 @@ FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); transaction.addToBackStack(null); - transaction.replace(R.id.framelayout_place, new SignUpFragment()); + transaction.replace(R.id.fragment_place, new SignUpFragment()); transaction.commit(); } }); @@ -64,7 +64,7 @@ FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.framelayout_place, new InstancesFragment()); + transaction.replace(R.id.fragment_place, new InstancesFragment()); transaction.commit(); // **********************************************************************/ @@ -96,7 +96,7 @@ Toast.makeText(getActivity(), "ログインに成功しました。", Toast.LENGTH_SHORT).show(); FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.framelayout_place, new InstancesFragment()); + transaction.replace(R.id.fragment_place, new InstancesFragment()); transaction.commit(); } else { Toast.makeText(getActivity(), "ログインに失敗しました。", Toast.LENGTH_SHORT).show(); 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 149dca9..c8ebdb6 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.framelayout_place, new LoginFragment()); + transaction.replace(R.id.fragment_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 50b2019..a665386 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.framelayout_place, new LoginFragment()); + transaction.replace(R.id.fragment_place, new LoginFragment()); transaction.commit(); } }); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 147e60b..287a02e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -20,7 +20,7 @@