kidshift/KidShift
3
0
Fork 0
Code Issues 9 Pull Requests Wiki Activity

feature/login_register_ui #154

Merged
Fujimatsu merged 10 commits from feature/login_register_ui into main 2024-07-08 16:34:59 +00:00
Conversation 0 Commits 10 Files Changed 4 +8 -8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 58bbde92f5 - Show all commits

8
app/src/main/java/one/nem/kidshift/LoginActivity.java
View File

@ -54,10 +54,10 @@ public class LoginActivity extends AppCompatActivity {
logger = loggerFactory.create("LoginActivity"); logger = loggerFactory.create("LoginActivity");
EditText emailEditText = findViewById(R.id.emailEditText); EditText emailEditText = findViewById(R.id.parentLoginEmailEditText);
EditText passwordEditText = findViewById(R.id.passwordEditText); 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 email = emailEditText.getText().toString(); // TODO: メールアドレスのバリデーション
String password = passwordEditText.getText().toString(); String password = passwordEditText.getText().toString();
@ -87,7 +87,7 @@ public class LoginActivity extends AppCompatActivity {
}); });
}); });
findViewById(R.id.intentRegisterButton).setOnClickListener(v -> { findViewById(R.id.toRegisterButton).setOnClickListener(v -> {
startActivity(new Intent(this, RegisterActivity.class)); startActivity(new Intent(this, RegisterActivity.class));
}); });
} }

8
app/src/main/res/layout/activity_login.xml
View File

@ -36,7 +36,7 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical" android:orientation="vertical"
android:weightSum="10" android:weightSum="10"
app:layout_constraintBottom_toTopOf="@+id/childLoginButton" app:layout_constraintBottom_toTopOf="@+id/parentLoginButton"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
@ -60,7 +60,7 @@
</LinearLayout> </LinearLayout>
<Button <Button
android:id="@+id/childLoginButton" android:id="@+id/parentLoginButton"
style="@style/Widget.Material3.Button" style="@style/Widget.Material3.Button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -83,7 +83,7 @@
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<Button <Button
android:id="@+id/button2" android:id="@+id/toRegisterButton"
style="@style/Widget.Material3.Button.TextButton" style="@style/Widget.Material3.Button.TextButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -96,7 +96,7 @@
android:text="新規登録" /> android:text="新規登録" />
<Button <Button
android:id="@+id/button3" android:id="@+id/toChildLoginButton"
style="@style/Widget.Material3.Button.TextButton" style="@style/Widget.Material3.Button.TextButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"