diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java index e6369c9..20a4c69 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java @@ -1,14 +1,22 @@ package org.ntlab.acanthus_client.views.Login; +import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; +import androidx.lifecycle.ViewModelProvider; +import android.app.Activity; import android.content.Intent; import android.os.Bundle; import android.text.Editable; +import android.text.Layout; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; import org.ntlab.acanthus_client.R; +import org.ntlab.acanthus_client.databinding.ActivityLoginScreenBinding; import org.ntlab.acanthus_client.entities.AccountTokenJson; import org.ntlab.acanthus_client.resources.accounts.LoginRest; import org.ntlab.acanthus_client.views.MainActivity; @@ -22,26 +30,32 @@ //----------------------------------------------------------------- // ログイン画面 public class LoginScreenActivity extends AppCompatActivity { - private EditText editEmailTextView; - private EditText editPasswordTextView; - private Button loginButton; + //----------------------------------------------------------------- + // @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); Retrofit retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") - - .addConverterFactory(JacksonConverterFactory.create()) + .addConverterFactory(JacksonConverterFactory.create()) .build(); - final LoginRest loginRest = retrofit.create(LoginRest.class); setContentView(R.layout.activity_login_screen); - initView(); + + onClicked(loginRest); + + } + //----------------------------------------------------------------- + // ログインボタン押下時の処理 + private void onClicked(LoginRest loginRest) { + + EditText editEmailTextView = findViewById(R.id.input_email); + EditText editPasswordTextView = findViewById(R.id.input_password); + Button loginButton = (Button) findViewById(R.id.login_button); loginButton.setOnClickListener(v -> { - String emailStr = editEmailTextView.getText().toString(); String password = editPasswordTextView.getText().toString(); @@ -50,12 +64,8 @@ call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { - if (response.isSuccessful()) { - loginButton.setText("success"); - Intent intent = new Intent(getApplication(), MainActivity.class); - startActivity(intent); - finish(); - } else loginButton.setText("faild"); + if (response.isSuccessful()) succeedLogin(); + else loginButton.setText("Faild"); } @Override @@ -64,17 +74,13 @@ } }); }); - - } - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - // 各種Viewの初期化 - private void initView() { - editEmailTextView = findViewById(R.id.input_email); - editPasswordTextView = findViewById(R.id.input_password); - loginButton = (Button) findViewById(R.id.login_button); } //----------------------------------------------------------------- - + // ログイン成功時の処理 + private void succeedLogin(){ + Intent intent = new Intent(getApplication(), MainActivity.class); + startActivity(intent); + finish(); + } + //----------------------------------------------------------------- } \ No newline at end of file