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 305a504..d6df825 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java @@ -23,11 +23,11 @@ setTheme(R.style.AppTheme_NoActionBar); setContentView(R.layout.activity_main); + //fragmentの設定 Fragment fragment; -// fragment = new LoginFragment(); fragment = new StartFragment(); - getSupportFragmentManager().beginTransaction().add(R.id.fragment_place, fragment).commit(); + getSupportFragmentManager().beginTransaction().add(R.id.flamelayout_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 fdbc2d5..cf4a71b 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.fragment_place, new InstancesFragment()); + transaction.replace(R.id.flamelayout_place, new InstancesFragment()); transaction.commit(); } @@ -54,7 +54,7 @@ FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.fragment_place, new PlayerFragment()); + transaction.replace(R.id.flamelayout_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 d8fed11..cd5c388 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 @@ -10,14 +10,12 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.Button; import android.widget.ListView; import org.ntlab.radishforandroidstudio.R; import java.util.ArrayList; -import java.util.List; public class InstancesFragment extends Fragment { @@ -62,7 +60,7 @@ Bundle bundle = new Bundle(); bundle.putSerializable("test","これはテストです"); fragment.setArguments(bundle); - transaction.replace(R.id.fragment_place, fragment,"characters_fragment"); + transaction.replace(R.id.flamelayout_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 93f93d4..bcc302c 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.fragment_place, new SignUpFragment()); + transaction.replace(R.id.flamelayout_place, new SignUpFragment()); transaction.commit(); } }); @@ -56,7 +56,7 @@ FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.fragment_place, new InstancesFragment()); + transaction.replace(R.id.flamelayout_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 938ade5..2d393b9 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.fragment_place, new LoginFragment()); + transaction.replace(R.id.flamelayout_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 75c8a4c..e3e1778 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 @@ -11,8 +11,6 @@ import android.widget.Button; import org.ntlab.radishforandroidstudio.R; -import org.ntlab.radishforandroidstudio.cactusClient.views.LoginFragment; -import org.ntlab.radishforandroidstudio.cactusClient.views.PlayerFragment; public class StartFragment extends Fragment { @@ -33,7 +31,7 @@ public void onClick(View view) { FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.fragment_place,new LoginFragment()); + transaction.replace(R.id.flamelayout_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 9ed18ba..5c02dfb 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,22 +4,35 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".cactusClient.MainActivity" - android:id="@+id/fragment_place" - tools:layout_editor_absoluteY="73dp"> + tools:context=".cactusClient.MainActivity"> - - - - - - - - + + + + + + + + + + \ No newline at end of file