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 8276a08..80c6693 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 @@ -7,14 +7,10 @@ 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; 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 868af2e..61c85f5 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 @@ -13,8 +13,6 @@ 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; @@ -62,7 +60,7 @@ Bundle bundle = new Bundle(); bundle.putSerializable("test", "これはテストです"); - bundle.putSerializable("position",position); + bundle.putSerializable("position", position); fragment.setArguments(bundle); transaction.replace(R.id.framelayout_place, fragment, "characters_fragment"); 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 55db6c8..bf6efda 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 @@ -9,13 +9,11 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; - import android.widget.Toast; import net.arnx.jsonic.JSON; import net.arnx.jsonic.TypeReference; - import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.Cactus; import org.ntlab.radishforandroidstudio.cactusClient.connections.LoginFragmentConnection; @@ -75,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; } @@ -85,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.framelayout_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 0095fda..149dca9 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(); } });