diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 44d36cf..0195fea 100644 --- a/.idea/caches/build_file_checksums.ser +++ b/.idea/caches/build_file_checksums.ser Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 388aa06..795735f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,26 +22,17 @@ android:theme="@style/AppTheme"> - + android:screenOrientation="landscape" + android:theme="@style/SplashTheme"> - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java index a21946d..169053e 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java @@ -53,11 +53,11 @@ } //MyAccountの追加 - public Account getMyAccount(){ + public Account getMyAccount() { return myAccount; } - public void setMyAccount(Account ac){ + public void setMyAccount(Account ac) { myAccount = ac; } 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 ca51f9c..0e45aff 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 { @@ -13,12 +13,23 @@ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + //splash + // ここで5秒間スリープし、スプラッシュを表示させたままにする。 + try { + Thread.sleep(3000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + 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(); - + 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/CharactersFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java index c246924..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 @@ -1,18 +1,16 @@ 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.support.v4.app.Fragment; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.ListView; -import android.widget.Toast; - import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.Cactus; @@ -48,9 +46,7 @@ FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.fragment_place, new InstancesFragment()); - 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 d4cbbc1..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 @@ -10,16 +10,11 @@ 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 org.ntlab.radishforandroidstudio.cactusClient.Cactus; -import org.ntlab.radishforandroidstudio.cactusClient.models.Account; import java.util.ArrayList; -import java.util.List; public class InstancesFragment extends Fragment { @@ -63,9 +58,12 @@ FragmentTransaction transaction = manager.beginTransaction(); CharactersFragment fragment = new CharactersFragment(); Bundle bundle = new Bundle(); - bundle.putSerializable("position",position); + + bundle.putSerializable("test", "これはテストです"); + bundle.putSerializable("position", position); + fragment.setArguments(bundle); - transaction.replace(R.id.fragment_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 673fd26..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 @@ -36,7 +36,7 @@ public void onStart() { super.onStart(); - Button button = (Button)getActivity().findViewById(R.id.signUP1); + Button button = (Button) getActivity().findViewById(R.id.signUP1); //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ button.setOnClickListener(new View.OnClickListener() { @@ -52,12 +52,12 @@ }); //↑↑↑↑↑画面遷移↑↑↑↑↑↑ - Button loginButton = (Button)getActivity().findViewById(R.id.login); + Button loginButton = (Button) getActivity().findViewById(R.id.login); loginButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - EditText userName = (EditText)getActivity().findViewById(R.id.inputUserName); - EditText passWord = (EditText)getActivity().findViewById(R.id.checkPassword); + EditText userName = (EditText) getActivity().findViewById(R.id.inputUserName); + EditText passWord = (EditText) getActivity().findViewById(R.id.checkPassword); // /**************************************************************** // テストするなら以下を実行するとパスの入力をしなくても画面遷移します @@ -73,7 +73,7 @@ if (userName.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "ユーザー名が未記入です", Toast.LENGTH_SHORT).show(); return; - } else if(passWord.getText().toString().isEmpty()){ + } else if (passWord.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "パスワードが未記入です", Toast.LENGTH_SHORT).show(); return; } @@ -83,22 +83,23 @@ @Override public void onResponse(String response) { //通信した時の処理を書くのだよ - URIAddressedAccount lac = JSON.decode(response, new TypeReference(){}); + URIAddressedAccount lac = JSON.decode(response, new TypeReference() { + }); System.out.println("///////////////////////////////////////////////"); System.out.println(response); Account user = lac.getAccount(); - if(user.isLogin()){ + if (user.isLogin()) { Cactus c = (Cactus) getActivity().getApplication(); c.setMyAccount(user); - Toast.makeText(getActivity(),"ログインに成功しました。", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "ログインに成功しました。", Toast.LENGTH_SHORT).show(); FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); transaction.replace(R.id.fragment_place, new InstancesFragment()); transaction.commit(); - }else { - Toast.makeText(getActivity(),"ログインに失敗しました。", Toast.LENGTH_SHORT).show(); + } 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 eeadd8b..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 @@ -10,6 +10,7 @@ import android.widget.Button; import android.widget.EditText; import android.widget.Toast; + import net.arnx.jsonic.JSON; import net.arnx.jsonic.TypeReference; @@ -55,25 +56,25 @@ //サインアップ Button signUpButton = (Button) getActivity().findViewById(R.id.signUp2); - signUpButton.setOnClickListener(new View.OnClickListener(){ + signUpButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - EditText inputPassword = (EditText)getActivity().findViewById(R.id.inputPassword2); - EditText checkPassWord = (EditText)getActivity().findViewById(R.id.checkPassword); - EditText inputUserName = (EditText)getActivity().findViewById(R.id.inputUserName); - EditText inputUserID = (EditText)getActivity().findViewById(R.id.inputUserID); + EditText inputPassword = (EditText) getActivity().findViewById(R.id.inputPassword2); + EditText checkPassWord = (EditText) getActivity().findViewById(R.id.checkPassword); + EditText inputUserName = (EditText) getActivity().findViewById(R.id.inputUserName); + EditText inputUserID = (EditText) getActivity().findViewById(R.id.inputUserID); - if(inputUserID.getText().toString().contains(" ") || inputUserID.getText().toString().contains("　")){ + if (inputUserID.getText().toString().contains(" ") || inputUserID.getText().toString().contains("　")) { Toast.makeText(getActivity(), "空白の含むIDは登録できません", Toast.LENGTH_SHORT).show(); return; - }else if (inputPassword.getText().toString().isEmpty()) { + } else if (inputPassword.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "パスワードを入力してください", Toast.LENGTH_SHORT).show(); return; } else if (checkPassWord.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "確認用パスワードを入力してください", Toast.LENGTH_SHORT).show(); return; - } else if (!inputPassword.getText().toString().equals(checkPassWord.getText().toString() )) { + } else if (!inputPassword.getText().toString().equals(checkPassWord.getText().toString())) { Toast.makeText(getActivity(), "パスワードが一致しません", Toast.LENGTH_SHORT).show(); return; } @@ -84,11 +85,12 @@ public void onResponse(String response) { //通信した時の処理を書くのだよ URIAddressedAccount ac = JSON.decode(response, URIAddressedAccount.class); - URIAddressedAccount ac2 = JSON.decode(response, new TypeReference(){}); - System.out.println("JSON.decode(response, URIAddressedAccount.class);\n"+ac.getUri()); - System.out.println("JSON.decode(response, new TypeReference(){});\n"+ac2.getUri()); + URIAddressedAccount ac2 = JSON.decode(response, new TypeReference() { + }); + System.out.println("JSON.decode(response, URIAddressedAccount.class);\n" + ac.getUri()); + System.out.println("JSON.decode(response, new TypeReference(){});\n" + ac2.getUri()); System.out.println(response); - Toast.makeText(getActivity(),response, Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), response, Toast.LENGTH_SHORT).show(); } }); 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..a665386 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java @@ -0,0 +1,39 @@ +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; + +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.commit(); + } + }); + } +} diff --git a/app/src/main/res/drawable/nittalab.png b/app/src/main/res/drawable/nittalab.png new file mode 100644 index 0000000..94547b5 --- /dev/null +++ b/app/src/main/res/drawable/nittalab.png Binary files differ diff --git a/app/src/main/res/drawable/splash.xml b/app/src/main/res/drawable/splash.xml new file mode 100644 index 0000000..91a9688 --- /dev/null +++ b/app/src/main/res/drawable/splash.xml @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ef10842..287a02e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,20 +4,29 @@ 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 diff --git a/app/src/main/res/layout/fragment_start.xml b/app/src/main/res/layout/fragment_start.xml index f9d8f19..c4aa179 100644 --- a/app/src/main/res/layout/fragment_start.xml +++ b/app/src/main/res/layout/fragment_start.xml @@ -1,24 +1,39 @@ - + tools:context=".cactusClient.views.StartFragment"> -