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 c87643a..c794096 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 @@ -8,6 +8,7 @@ import android.widget.TextView; import org.ntlab.acanthus_client.R; +import org.ntlab.acanthus_client.databinding.ActivitySignUpBinding; import org.ntlab.acanthus_client.entities.AccountUidJson; import org.ntlab.acanthus_client.resources.accounts.AccountsRest; import org.ntlab.acanthus_client.views.login.LoginScreenActivity; @@ -23,59 +24,36 @@ //----------------------------------------------------------------- // public class SignUpActivity extends AppCompatActivity { - //----------------------------------------------------------------- - // 各Viewの列挙型 - public enum EditTexts { - nameForm(0), emailForm(1), passwordForm(2), signUpButton(3), loginButton(4); - - private int textId; - - //----------------------------------------------------------------- - private EditTexts(int textId) { - this.textId = textId; - } - - //----------------------------------------------------------------- - // getter - public int getTextId() { - return this.textId; - } - } - - //----------------------------------------------------------------- - private ArrayList views = new ArrayList<>(); + private ActivitySignUpBinding binding; //----------------------------------------------------------------- // @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_sign_up); - initView(); - 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); + init(); - onClickSignUp(accountsRest); + onClickSignUp(); onClickAlreadyLoggedIn(); } //----------------------------------------------------------------- //----------------------------------------------------------------- // サインアップ時押下時 - private void onClickSignUp(AccountsRest accountsRest) { - Button signUpButton = (Button) views.get(EditTexts.signUpButton.getTextId()); + private void onClickSignUp() { + 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; // signUpButton.setOnClickListener(v -> { - String name = views.get(EditTexts.nameForm.getTextId()).getText().toString(); - ; - String emailAddress = views.get(EditTexts.emailForm.getTextId()).getText().toString(); - ; - String password = views.get(EditTexts.passwordForm.getTextId()).getText().toString(); - ; + 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() { @@ -95,7 +73,7 @@ //----------------------------------------------------------------- // アカウント所持ボタン押下処理 private void onClickAlreadyLoggedIn() { - Button alreadyLoggedInButton = (Button) views.get(EditTexts.loginButton.getTextId()); + Button alreadyLoggedInButton = (Button) binding.buttonAlreadyLoggedIn; // ログイン画面に遷移 alreadyLoggedInButton.setOnClickListener(v -> { @@ -115,20 +93,17 @@ //----------------------------------------------------------------- // 登録内容のクリア private void clearForm() { - for (int i = EditTexts.nameForm.getTextId(); i <= EditTexts.passwordForm.getTextId(); i++) { - views.get(i).getEditableText().clear(); - } - + binding.editTextTextSignUpPersonName.getEditableText().clear(); + binding.editTextTextSignUpEmailAddress.getEditableText().clear(); + binding.editTextTextSignUpPassword.getEditableText().clear(); } //----------------------------------------------------------------- //----------------------------------------------------------------- - // - private void initView() { - views.add(findViewById(R.id.editTextTextSignUpPersonName)); - views.add(findViewById(R.id.editTextTextSignUpEmailAddress)); - views.add(findViewById(R.id.editTextTextSignUpPassword)); - views.add(findViewById(R.id.buttonSignUpRegister)); - views.add(findViewById(R.id.buttonAlreadyLoggedIn)); + // 初期化 + private void init() { + setContentView(R.layout.activity_sign_up); + binding = ActivitySignUpBinding.inflate(getLayoutInflater()); } + //----------------------------------------------------------------- } \ No newline at end of file