diff --git a/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java b/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java index d34fc94..64a5c94 100644 --- a/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java @@ -2,22 +2,23 @@ import android.content.Intent; import android.os.Bundle; -import android.content.Intent; - import android.view.View; import android.view.View.OnClickListener; - import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatActivity; import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; import androidx.lifecycle.ViewModelProvider; -import com.example.tampopo_client.views.MainActivity; import com.example.tampopo_client.R; +import com.example.tampopo_client.Tampopo; +import com.example.tampopo_client.viewmodels.UserViewModel; public class LoginActivity extends AppCompatActivity { + UserViewModel userViewModel; @Override @@ -32,10 +33,30 @@ }); userViewModel = new ViewModelProvider(this).get(UserViewModel.class); - Button button_login = (Button) findViewById(R.id.loginbutton); - button_login.setOnClickListener(new OnClickListener(){ + userViewModel.getError().observe(this, + msg -> { + if (msg != null) { + Toast.makeText(this, msg, Toast.LENGTH_SHORT).show(); + } + }); - public void onClick(View v){ + Button button_login = (Button) findViewById(R.id.loginbutton); + button_login.setOnClickListener(new OnClickListener() { + + private Object getApplication; + + public void onClick(View v) { + EditText useridInput = (EditText) findViewById(R.id.userIDText); + String userid = useridInput.getText().toString(); + EditText passwordInput = (EditText) findViewById(R.id.PasswordText); + String password = passwordInput.getText().toString(); + userViewModel.login(userid, password); + + userViewModel.getToken().getValue(); + //TODO:上記のトークンを使ってTampopoクラスにセットするコードを書く + //((Tampopo)this.getApplication).setToken(token); + + Intent intent = new Intent(LoginActivity.this, MainActivity.class); startActivity(intent); @@ -43,9 +64,9 @@ }); Button button_createaccount = (Button) findViewById(R.id.createaccountbutton); - button_createaccount.setOnClickListener(new OnClickListener(){ + button_createaccount.setOnClickListener(new OnClickListener() { - public void onClick(View v){ + public void onClick(View v) { Intent intent = new Intent(LoginActivity.this, RegisterActivity.class); startActivity(intent); }