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..30d7393 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 @@ -8,12 +8,15 @@ 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.viewmodels.UserViewModel; import com.example.tampopo_client.views.MainActivity; import com.example.tampopo_client.R; @@ -32,10 +35,28 @@ }); userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + userViewModel.getToken().observe(this, token -> { + if (token != null) { + // → ログイン成功。次の画面へ遷移 + Intent i = new Intent(this, MainActivity.class); + i.putExtra("TOKEN", token); + startActivity(i); + finish(); // 戻ってこないなら + } + }); + userViewModel.getError().observe(this, + msg -> { if (msg != null) Toast.makeText(this, msg, Toast.LENGTH_SHORT).show(); }); + Button button_login = (Button) findViewById(R.id.loginbutton); button_login.setOnClickListener(new OnClickListener(){ 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); + Intent intent = new Intent(LoginActivity.this, MainActivity.class); startActivity(intent);