diff --git a/.idea/misc.xml b/.idea/misc.xml index 860da66..d5d35ec 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java index c794096..8d4d1fa 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java @@ -4,6 +4,7 @@ import android.content.Intent; import android.os.Bundle; +import android.view.View; import android.widget.Button; import android.widget.TextView; @@ -32,53 +33,41 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); init(); - - onClickSignUp(); - onClickAlreadyLoggedIn(); } //----------------------------------------------------------------- //----------------------------------------------------------------- // サインアップ時押下時 - private void onClickSignUp() { + public void onClickSignUp(View view) { Retrofit retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") .addConverterFactory(JacksonConverterFactory.create()) .build(); final AccountsRest accountsRest = retrofit.create(AccountsRest.class); - Button signUpButton = (Button) binding.buttonSignUpRegister; + // 各フォーム取得 + String name = binding.editTextTextSignUpPersonName.getText().toString(); + String emailAddress = binding.editTextTextSignUpEmailAddress.getText().toString(); + String password = binding.editTextTextSignUpPassword.getText().toString(); - // - signUpButton.setOnClickListener(v -> { - String name = binding.editTextTextSignUpPersonName.getText().toString(); - String emailAddress = binding.editTextTextSignUpEmailAddress.getText().toString(); - String password = binding.editTextTextSignUpPassword.getText().toString(); + Call call = accountsRest.createAccount(name, emailAddress, password); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if (response.isSuccessful()) transitionLoginActivity(); + else clearForm(); + } - Call call = accountsRest.createAccount(name, emailAddress, password); - call.enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - if (response.isSuccessful()) transitionLoginActivity(); - else clearForm(); - } - - @Override - public void onFailure(Call call, Throwable t) { - } - }); + @Override + public void onFailure(Call call, Throwable t) { + } }); } //----------------------------------------------------------------- // アカウント所持ボタン押下処理 - private void onClickAlreadyLoggedIn() { - Button alreadyLoggedInButton = (Button) binding.buttonAlreadyLoggedIn; - - // ログイン画面に遷移 - alreadyLoggedInButton.setOnClickListener(v -> { - transitionLoginActivity(); - }); + public void onClickAlreadyLoggedIn(View view) { + transitionLoginActivity(); } //----------------------------------------------------------------- diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml index 2859182..f2ac124 100644 --- a/app/src/main/res/layout/activity_sign_up.xml +++ b/app/src/main/res/layout/activity_sign_up.xml @@ -89,6 +89,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="60dp" + android:onClick="onClickSignUp" android:text="新規登録" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -114,6 +115,7 @@ android:id="@+id/buttonAlreadyLoggedIn" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:onClick="onClickAlreadyLoggedIn" android:text="既にアカウントをお持ちの方" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent"