diff --git a/app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java b/app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java index d36fa48..c3076d4 100644 --- a/app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java @@ -10,8 +10,12 @@ import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; +import androidx.lifecycle.ViewModelProvider; import com.example.tampopo_client.R; +import com.example.tampopo_client.viewmodels.UserViewModel; + +import retrofit2.Retrofit; public class LaunchActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java b/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java index 4ba2800..625e438 100644 --- a/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java @@ -4,16 +4,23 @@ import android.os.Bundle; import android.view.View; 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.R; +import com.example.tampopo_client.Tampopo; +import com.example.tampopo_client.viewmodels.UserViewModel; public class RegisterActivity extends AppCompatActivity { + private Tampopo tampopo; + UserViewModel userViewModel; @Override protected void onCreate(Bundle savedInstanceState) { @@ -25,19 +32,55 @@ v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); return insets; }); - Button button_register = (Button) findViewById(R.id.Registerbutton); - button_register.setOnClickListener(new View.OnClickListener() { + + //Tampopoの取得 + tampopo = (Tampopo) this.getApplication(); + //ViewModel の取得 + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + + //入力欄の取得 + EditText userIdEditText = findViewById(R.id.editTextUserId); + EditText passwordEditText = findViewById(R.id.editTextPassword); + + + //登録 + Button registerButton = (Button) findViewById(R.id.Registerbutton); + registerButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Intent intent = new Intent(RegisterActivity.this,LoginActivity.class); - startActivity(intent); + String userId = userIdEditText.getText().toString().trim(); + String password = passwordEditText.getText().toString().trim(); + + //空文字チェック + if (userId.isEmpty() || password.isEmpty()) { + Toast.makeText(RegisterActivity.this, "IDとパスワードを入力してください", Toast.LENGTH_SHORT).show(); + return; + } + + //通信 + userViewModel.createUser(userId, password); + + + //アカウントの確認、問題なければ通信 + if (userViewModel.getUser().getValue() != null) { + userViewModel.login(userId, password); + tampopo.setUserId(userId); + tampopo.setPassword(password); + Intent intent = new Intent(RegisterActivity.this, MainActivity.class); + startActivity(intent); + } else { + Toast.makeText(RegisterActivity.this, "アカウント作成に失敗しました", Toast.LENGTH_SHORT).show(); + } + } }); - button_register = (Button) findViewById(R.id.Loginbutton2); - button_register.setOnClickListener(new View.OnClickListener() { + + //ログイン画面へ + Button loginButton = findViewById(R.id.Loginbutton2); + loginButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Intent intent = new Intent(RegisterActivity.this,LoginActivity.class); + Intent intent = new Intent(RegisterActivity.this, LoginActivity.class); startActivity(intent); } }); diff --git a/app/src/main/res/layout/activity_launch.xml b/app/src/main/res/layout/activity_launch.xml index 7ccbd4b..cc3237c 100644 --- a/app/src/main/res/layout/activity_launch.xml +++ b/app/src/main/res/layout/activity_launch.xml @@ -23,7 +23,7 @@