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 4e9c458..305a504 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java @@ -5,7 +5,7 @@ import android.support.v7.app.AppCompatActivity; import org.ntlab.radishforandroidstudio.R; -import org.ntlab.radishforandroidstudio.cactusClient.views.LoginFragment; +import org.ntlab.radishforandroidstudio.cactusClient.views.StartFragment; public class MainActivity extends AppCompatActivity { @@ -16,7 +16,7 @@ //splash // ここで5秒間スリープし、スプラッシュを表示させたままにする。 try { - Thread.sleep(5000); + Thread.sleep(3000); } catch (InterruptedException e) { e.printStackTrace(); } @@ -25,7 +25,8 @@ setContentView(R.layout.activity_main); //fragmentの設定 Fragment fragment; - fragment = new LoginFragment(); +// fragment = new LoginFragment(); + fragment = new StartFragment(); 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/tests/SampleActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java index 5b6d935..fac885d 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java @@ -6,6 +6,7 @@ import android.os.Bundle; import org.ntlab.radishforandroidstudio.R; +import org.ntlab.radishforandroidstudio.cactusClient.views.StartFragment; public class SampleActivity extends AppCompatActivity { diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java deleted file mode 100644 index 61c2011..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient.tests; - - -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; - -import org.ntlab.radishforandroidstudio.R; -import org.ntlab.radishforandroidstudio.cactusClient.views.PlayerFragment; - -public class StartFragment extends Fragment { - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_start, container, false); - } - - @Override - public void onStart() { - super.onStart(); - - Button button = getActivity().findViewById(R.id.start_button); - button.setOnClickListener(new View.OnClickListener(){ - @Override - public void onClick(View view) { - FragmentManager manager = getFragmentManager(); - FragmentTransaction transaction = manager.beginTransaction(); -// transaction.replace(R.id.framelayout_field, new SampleUiFragment()); -// transaction.replace(R.id.framelayout_field, new SampleGameFragment()); -// transaction.replace(R.id.framelayout_field,new SampleGame2Fragment()); - transaction.replace(R.id.framelayout_field,new PlayerFragment()); - transaction.addToBackStack(null); - 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 new file mode 100644 index 0000000..75c8a4c --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java @@ -0,0 +1,42 @@ +package org.ntlab.radishforandroidstudio.cactusClient.views; + + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +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 { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_start, container, false); + } + + @Override + public void onStart() { + super.onStart(); + + Button button = getActivity().findViewById(R.id.start_button); + button.setOnClickListener(new View.OnClickListener(){ + @Override + public void onClick(View view) { + FragmentManager manager = getFragmentManager(); + FragmentTransaction transaction = manager.beginTransaction(); + transaction.replace(R.id.fragment_place,new LoginFragment()); + transaction.addToBackStack(null); + transaction.commit(); + } + }); + } +} diff --git a/app/src/main/res/layout/fragment_start.xml b/app/src/main/res/layout/fragment_start.xml index f9d8f19..7b7846d 100644 --- a/app/src/main/res/layout/fragment_start.xml +++ b/app/src/main/res/layout/fragment_start.xml @@ -4,7 +4,7 @@ android:id="@+id/fragment_start" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".cactusClient.tests.StartFragment"> + tools:context=".cactusClient.views.StartFragment"> - RadishForAndroidStudio + Cactus Settings