diff --git a/app/src/main/java/one/nem/kidshift/LoginActivity.java b/app/src/main/java/one/nem/kidshift/LoginActivity.java index 2c070b8..40d41c8 100644 --- a/app/src/main/java/one/nem/kidshift/LoginActivity.java +++ b/app/src/main/java/one/nem/kidshift/LoginActivity.java @@ -54,10 +54,10 @@ public class LoginActivity extends AppCompatActivity { logger = loggerFactory.create("LoginActivity"); - EditText emailEditText = findViewById(R.id.emailEditText); - EditText passwordEditText = findViewById(R.id.passwordEditText); + EditText emailEditText = findViewById(R.id.parentLoginEmailEditText); + EditText passwordEditText = findViewById(R.id.parentLoginPasswordEditText); - findViewById(R.id.loginButton).setOnClickListener(v -> { + findViewById(R.id.parentLoginButton).setOnClickListener(v -> { String email = emailEditText.getText().toString(); // TODO: メールアドレスのバリデーション String password = passwordEditText.getText().toString(); @@ -87,8 +87,12 @@ public class LoginActivity extends AppCompatActivity { }); }); - findViewById(R.id.intentRegisterButton).setOnClickListener(v -> { + findViewById(R.id.toRegisterButton).setOnClickListener(v -> { startActivity(new Intent(this, RegisterActivity.class)); }); + + findViewById(R.id.toChildLoginButton).setOnClickListener(v -> { + startActivity(new Intent(this, ChildLoginActivity.class)); + }); } } \ No newline at end of file diff --git a/app/src/main/java/one/nem/kidshift/RegisterActivity.java b/app/src/main/java/one/nem/kidshift/RegisterActivity.java index f251e9d..4f21899 100644 --- a/app/src/main/java/one/nem/kidshift/RegisterActivity.java +++ b/app/src/main/java/one/nem/kidshift/RegisterActivity.java @@ -53,10 +53,10 @@ public class RegisterActivity extends AppCompatActivity { logger = loggerFactory.create("RegisterActivity"); - EditText emailEditText = findViewById(R.id.emailEditText); // TODO: メールアドレスのバリデーション - EditText passwordEditText = findViewById(R.id.passwordEditText); + EditText emailEditText = findViewById(R.id.parentRegisterEmailEditText); // TODO: メールアドレスのバリデーション + EditText passwordEditText = findViewById(R.id.parentRegisterPasswordEditText); - findViewById(R.id.registerButton).setOnClickListener(v -> { + findViewById(R.id.parentRegisterButton).setOnClickListener(v -> { String email = emailEditText.getText().toString(); String password = passwordEditText.getText().toString(); @@ -86,8 +86,12 @@ public class RegisterActivity extends AppCompatActivity { }); }); - findViewById(R.id.intentLoginButton).setOnClickListener(v -> { + findViewById(R.id.toLoginButton).setOnClickListener(v -> { startActivity(new Intent(this, LoginActivity.class)); }); + + findViewById(R.id.toChildLoginButton).setOnClickListener(v -> { + startActivity(new Intent(this, ChildLoginActivity.class)); + }); } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 4807f50..74c93a1 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -7,43 +7,85 @@ android:layout_height="match_parent" tools:context=".LoginActivity"> - - + + + android:layout_marginStart="24dp" + android:layout_marginEnd="24dp" + android:layout_marginBottom="128dp" + android:gravity="center_horizontal" + android:orientation="vertical" + android:weightSum="10" + app:layout_constraintBottom_toTopOf="@+id/parentLoginButton" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent"> - + + + + + + + + + + +