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 e28a303..69c21a0 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 @@ -5,7 +5,6 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -13,8 +12,11 @@ import android.widget.EditText; import android.widget.Toast; +import net.arnx.jsonic.JSON; + import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.connections.LoginFragmentConnection; +import org.ntlab.radishforandroidstudio.cactusClient.models.URIAddressedEntity; import org.ntlab.radishforandroidstudio.framework.network.CallBack; public class LoginFragment extends Fragment { @@ -28,7 +30,6 @@ } - @Override public void onStart() { super.onStart(); @@ -58,21 +59,12 @@ EditText userName = (EditText)getActivity().findViewById(R.id.inputUserName); EditText passWord = (EditText)getActivity().findViewById(R.id.checkPassword); - CharSequence userNameText = userName.getText(); - CharSequence passWordText = passWord.getText(); - - - - Toast tp = Toast.makeText(getActivity(), passWordText, Toast.LENGTH_SHORT); - tp.setGravity(Gravity.BOTTOM, 0, 0); - tp.show(); - - - if (userName.getText().toString().isEmpty()) { - Toast.makeText(getActivity(), "値が未記入です", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "ユーザー名が未記入です", Toast.LENGTH_SHORT).show(); + } else if(passWord.getText().toString().isEmpty()){ + Toast.makeText(getActivity(), "パスワードが未記入です", Toast.LENGTH_SHORT).show(); } else { connection = new LoginFragmentConnection(); @@ -81,17 +73,16 @@ @Override public void onResponse(String response) { //通信した時の処理を書くのだよ - } + URIAddressedEntity ac = JSON.decode(response, URIAddressedEntity.class); + System.out.println(ac.getUri()); + System.out.println(response); + } }); - //connection.addFormParam("userName", userName.getText().toString()); + connection.addFormParam("userName", userName.getText().toString()); + connection.addFormParam("passWord", passWord.getText().toString()); connection.doPost(); } - - - - - } }); 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 84b31ad..78f8e56 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 @@ -11,9 +11,16 @@ import android.widget.Button; import android.widget.EditText; import android.widget.Toast; + +import net.arnx.jsonic.JSON; + import org.ntlab.radishforandroidstudio.R; +import org.ntlab.radishforandroidstudio.cactusClient.connections.SignUpFragmentConnection; +import org.ntlab.radishforandroidstudio.cactusClient.models.URIAddressedEntity; +import org.ntlab.radishforandroidstudio.framework.network.CallBack; public class SignUpFragment extends Fragment { + private SignUpFragmentConnection connection; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -26,8 +33,10 @@ //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ @Override public void onStart() { + super.onStart(); + //ログインボタン Button button = (Button) getActivity().findViewById(R.id.LoginButton2); button.setOnClickListener(new View.OnClickListener() { @@ -45,35 +54,42 @@ } }); - Button sihnupButton = (Button) getActivity().findViewById(R.id.signUp2); - sihnupButton.setOnClickListener(new View.OnClickListener(){ + //サインアップ + Button signUpButton = (Button) getActivity().findViewById(R.id.signUp2); + 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); - String strInputPassword = EditTextChangeToString(inputPassword); - String strCheckPassWord = EditTextChangeToString(checkPassWord); - - if (strInputPassword.isEmpty()) { + if (inputPassword.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "パスワードを入力してください", Toast.LENGTH_SHORT).show(); - } else if (strCheckPassWord.isEmpty()) { + } else if (checkPassWord.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "確認用パスワードを入力してください", Toast.LENGTH_SHORT).show(); - } else if (!strInputPassword.equals(strCheckPassWord )) { + } else if (!inputPassword.getText().toString().equals(checkPassWord.getText().toString() )) { Toast.makeText(getActivity(), "パスワードが一致しません", Toast.LENGTH_SHORT).show(); }else{ - Toast.makeText(getActivity(), "アカウント作成に成功しましたね", Toast.LENGTH_SHORT).show(); + + connection = new SignUpFragmentConnection(); + connection.setCallBack(new CallBack() { + @Override + public void onResponse(String response) { + //通信した時の処理を書くのだよ + URIAddressedEntity ac = JSON.decode(response, URIAddressedEntity.class); + + System.out.println(ac.getUri()); + System.out.println(response); + } + }); + connection.addFormParam("inputUserName", inputUserName.getText().toString()); + connection.addFormParam("inputPassWord", inputUserID.getText().toString()); + connection.doPost(); } } }); } - private static String EditTextChangeToString(EditText text){ - CharSequence CharSequenceText = text.getText(); - - String str = CharSequenceText.toString(); - - return str; - } } \ No newline at end of file diff --git a/app/src/main/res/layout/sign_up_fragment.xml b/app/src/main/res/layout/sign_up_fragment.xml index 1417077..3a4d05b 100644 --- a/app/src/main/res/layout/sign_up_fragment.xml +++ b/app/src/main/res/layout/sign_up_fragment.xml @@ -60,7 +60,7 @@ android:text="userID" />