Merge pull request 'feature/login_register_ui' (#154) from feature/login_register_ui into main
Reviewed-on: #154
This commit is contained in:
commit
8406ac6e36
|
@ -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,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));
|
startActivity(new Intent(this, RegisterActivity.class));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
findViewById(R.id.toChildLoginButton).setOnClickListener(v -> {
|
||||||
|
startActivity(new Intent(this, ChildLoginActivity.class));
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -53,10 +53,10 @@ public class RegisterActivity extends AppCompatActivity {
|
||||||
|
|
||||||
logger = loggerFactory.create("RegisterActivity");
|
logger = loggerFactory.create("RegisterActivity");
|
||||||
|
|
||||||
EditText emailEditText = findViewById(R.id.emailEditText); // TODO: メールアドレスのバリデーション
|
EditText emailEditText = findViewById(R.id.parentRegisterEmailEditText); // TODO: メールアドレスのバリデーション
|
||||||
EditText passwordEditText = findViewById(R.id.passwordEditText);
|
EditText passwordEditText = findViewById(R.id.parentRegisterPasswordEditText);
|
||||||
|
|
||||||
findViewById(R.id.registerButton).setOnClickListener(v -> {
|
findViewById(R.id.parentRegisterButton).setOnClickListener(v -> {
|
||||||
String email = emailEditText.getText().toString();
|
String email = emailEditText.getText().toString();
|
||||||
String password = passwordEditText.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));
|
startActivity(new Intent(this, LoginActivity.class));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
findViewById(R.id.toChildLoginButton).setOnClickListener(v -> {
|
||||||
|
startActivity(new Intent(this, ChildLoginActivity.class));
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -7,43 +7,85 @@
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".LoginActivity">
|
tools:context=".LoginActivity">
|
||||||
|
|
||||||
<LinearLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:id="@+id/inputContainer"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical"
|
app:layout_constraintBottom_toTopOf="@+id/linearLayout3"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
<EditText
|
<TextView
|
||||||
android:id="@+id/emailEditText"
|
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_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:ems="10"
|
android:layout_marginStart="24dp"
|
||||||
android:inputType="textEmailAddress" />
|
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
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/passwordEditText"
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
android:layout_width="match_parent"
|
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:layout_height="wrap_content"
|
||||||
android:ems="10"
|
android:layout_marginTop="128dp"
|
||||||
android:inputType="textPassword" />
|
android:layout_weight="1"
|
||||||
|
android:paddingHorizontal="48dp"
|
||||||
</LinearLayout>
|
android:text="ログイン"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
<TextView
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
android:id="@+id/textView"
|
app:layout_constraintTop_toBottomOf="@+id/inputContainer" />
|
||||||
android:layout_width="wrap_content"
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
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" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/linearLayout2"
|
android:id="@+id/linearLayout3"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
|
@ -52,19 +94,29 @@
|
||||||
app:layout_constraintStart_toStartOf="parent">
|
app:layout_constraintStart_toStartOf="parent">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/loginButton"
|
android:id="@+id/toRegisterButton"
|
||||||
|
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"
|
||||||
|
android:layout_marginHorizontal="12dp"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="LOGIN" />
|
android:padding="0dp"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingTop="0dp"
|
||||||
|
android:text="新規登録" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/intentRegisterButton"
|
android:id="@+id/toChildLoginButton"
|
||||||
style="@style/Widget.Material3.Button.IconButton.Outlined"
|
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"
|
||||||
|
android:layout_marginHorizontal="12dp"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="Register" />
|
android:padding="0dp"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingTop="0dp"
|
||||||
|
android:text="子供ログイン" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
@ -7,43 +7,85 @@
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".RegisterActivity">
|
tools:context=".RegisterActivity">
|
||||||
|
|
||||||
<LinearLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:id="@+id/inputContainer"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical"
|
app:layout_constraintBottom_toTopOf="@+id/linearLayout3"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
<EditText
|
<TextView
|
||||||
android:id="@+id/emailEditText"
|
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_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:ems="10"
|
android:layout_marginStart="24dp"
|
||||||
android:inputType="textEmailAddress" />
|
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
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/passwordEditText"
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
android:layout_width="match_parent"
|
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:layout_height="wrap_content"
|
||||||
android:ems="10"
|
android:layout_marginTop="128dp"
|
||||||
android:inputType="textPassword" />
|
android:layout_weight="1"
|
||||||
|
android:paddingHorizontal="48dp"
|
||||||
</LinearLayout>
|
android:text="新規登録"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
<TextView
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
android:id="@+id/textView"
|
app:layout_constraintTop_toBottomOf="@+id/inputContainer" />
|
||||||
android:layout_width="wrap_content"
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
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" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/linearLayout2"
|
android:id="@+id/linearLayout3"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
|
@ -52,19 +94,29 @@
|
||||||
app:layout_constraintStart_toStartOf="parent">
|
app:layout_constraintStart_toStartOf="parent">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/registerButton"
|
android:id="@+id/toLoginButton"
|
||||||
|
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"
|
||||||
|
android:layout_marginHorizontal="12dp"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="REGISTER" />
|
android:padding="0dp"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingTop="0dp"
|
||||||
|
android:text="ログイン" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/intentLoginButton"
|
android:id="@+id/toChildLoginButton"
|
||||||
style="@style/Widget.Material3.Button.IconButton.Outlined"
|
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"
|
||||||
|
android:layout_marginHorizontal="12dp"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="Login" />
|
android:padding="0dp"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingTop="0dp"
|
||||||
|
android:text="子供ログイン" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
Loading…
Reference in New Issue
Block a user