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 +182 -70
4 changed files with 182 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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));
});
}
}

12
app/src/main/java/one/nem/kidshift/RegisterActivity.java
View File

@ -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));
});
}
}

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

@ -7,43 +7,85 @@
android:layout_height="match_parent"
tools:context=".LoginActivity">
<LinearLayout
android:id="@+id/inputContainer"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/linearLayout3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<EditText
android:id="@+id/emailEditText"
<TextView
android:id="@+id/titleTextView"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginBottom="128dp"
android:text="KidShiftにログイン"
android:textSize="32dp"
app:layout_constraintBottom_toTopOf="@+id/inputContainer"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<LinearLayout
android:id="@+id/inputContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textEmailAddress" />
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">
<EditText
android:id="@+id/passwordEditText"
android:layout_width="match_parent"
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:hint="メールアドレス">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/parentLoginEmailEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textEmailAddress" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:hint="パスワード"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/parentLoginPasswordEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<Button
android:id="@+id/parentLoginButton"
style="@style/Widget.Material3.Button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textPassword" />
</LinearLayout>
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="※Loginボタン長押しでBypass"
app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
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" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/linearLayout2"
android:id="@+id/linearLayout3"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="horizontal"
@ -52,19 +94,29 @@
app:layout_constraintStart_toStartOf="parent">
<Button
android:id="@+id/loginButton"
android:id="@+id/toRegisterButton"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:layout_marginBottom="8dp"
android:layout_weight="1"
android:text="LOGIN" />
android:padding="0dp"
android:paddingLeft="0dp"
android:paddingTop="0dp"
android:text="新規登録" />
<Button
android:id="@+id/intentRegisterButton"
style="@style/Widget.Material3.Button.IconButton.Outlined"
android:id="@+id/toChildLoginButton"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:layout_marginBottom="8dp"
android:layout_weight="1"
android:text="Register" />
android:padding="0dp"
android:paddingLeft="0dp"
android:paddingTop="0dp"
android:text="子供ログイン" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

114
app/src/main/res/layout/activity_register.xml
View File

@ -7,43 +7,85 @@
android:layout_height="match_parent"
tools:context=".RegisterActivity">
<LinearLayout
android:id="@+id/inputContainer"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/linearLayout3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<EditText
android:id="@+id/emailEditText"
<TextView
android:id="@+id/titleTextView"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginBottom="128dp"
android:text="KidShiftに新規登録"
android:textSize="32dp"
app:layout_constraintBottom_toTopOf="@+id/inputContainer"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<LinearLayout
android:id="@+id/inputContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textEmailAddress" />
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">
<EditText
android:id="@+id/passwordEditText"
android:layout_width="match_parent"
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:hint="メールアドレス">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/parentRegisterEmailEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textEmailAddress" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:hint="パスワード"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/parentRegisterPasswordEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<Button
android:id="@+id/parentRegisterButton"
style="@style/Widget.Material3.Button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textPassword" />
</LinearLayout>
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="※Registerボタン長押しでBypass"
app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
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" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/linearLayout2"
android:id="@+id/linearLayout3"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="horizontal"
@ -52,19 +94,29 @@
app:layout_constraintStart_toStartOf="parent">
<Button
android:id="@+id/registerButton"
android:id="@+id/toLoginButton"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:layout_marginBottom="8dp"
android:layout_weight="1"
android:text="REGISTER" />
android:padding="0dp"
android:paddingLeft="0dp"
android:paddingTop="0dp"
android:text="ログイン" />
<Button
android:id="@+id/intentLoginButton"
style="@style/Widget.Material3.Button.IconButton.Outlined"
android:id="@+id/toChildLoginButton"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:layout_marginBottom="8dp"
android:layout_weight="1"
android:text="Login" />
android:padding="0dp"
android:paddingLeft="0dp"
android:paddingTop="0dp"
android:text="子供ログイン" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>