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">
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+ android:layout_marginTop="128dp"
+ android:layout_weight="1"
+ android:paddingHorizontal="48dp"
+ android:text="ログイン"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/inputContainer" />
+
+ android:padding="0dp"
+ android:paddingLeft="0dp"
+ android:paddingTop="0dp"
+ android:text="新規登録" />
+ android:padding="0dp"
+ android:paddingLeft="0dp"
+ android:paddingTop="0dp"
+ android:text="子供ログイン" />
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index 4b255a7..845f18f 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -7,43 +7,85 @@
android:layout_height="match_parent"
tools:context=".RegisterActivity">
-
-
+
+
+ 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/parentRegisterButton"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent">
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+ android:layout_marginTop="128dp"
+ android:layout_weight="1"
+ android:paddingHorizontal="48dp"
+ android:text="新規登録"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/inputContainer" />
+
+ android:padding="0dp"
+ android:paddingLeft="0dp"
+ android:paddingTop="0dp"
+ android:text="ログイン" />
+ android:padding="0dp"
+ android:paddingLeft="0dp"
+ android:paddingTop="0dp"
+ android:text="子供ログイン" />
-
\ No newline at end of file