Skip to content

자동 로그인 체크박스 추가 #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eun6 merged 2 commits into from
Jan 10, 2023
Merged

자동 로그인 체크박스 추가 #98

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7558662
자동 로그인 체크박스 추가
eun6 Jan 10, 2023
73d228a
Merge remote-tracking branch 'origin/front' into front
eun6 Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 37 additions & 40 deletions application/app/src/main/res/layout/activity_login.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,15 @@
android:background="@drawable/background_default"
tools:context=".ui.login.LoginActivity">


<Button
android:backgroundTint="#CCFFFFFF"
android:textColor="@color/purple"

android:id="@+id/signup"
android:layout_width="130dp"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginTop="16dp"
android:layout_marginLeft="5dp"
android:layout_marginBottom="64dp"
android:text="Sign up"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.05"
app:layout_constraintStart_toStartOf="@id/password"
app:layout_constraintTop_toBottomOf="@+id/password"
app:layout_constraintVertical_bias="0.149" />
<ImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_gravity="center"
android:layout_marginTop="76dp"
android:src="@drawable/icon_appname3"
app:layout_constraintTop_toTopOf="parent"
tools:layout_editor_absoluteX="16dp" />


<EditText
Expand Down Expand Up @@ -70,27 +61,34 @@
android:textColorHint="@color/white"
android:backgroundTint="@color/white"/>

<ImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_gravity="center"
android:layout_marginTop="76dp"
android:src="@drawable/icon_appname3"
app:layout_constraintTop_toTopOf="parent"
tools:layout_editor_absoluteX="16dp" />
<CheckBox
android:id="@+id/autoLogin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:ignore="MissingConstraints"
android:text="자동 로그인"
android:textColor="@color/white"
android:buttonTint="@color/white"
app:layout_constraintTop_toBottomOf="@+id/password"
app:layout_constraintStart_toStartOf="@id/password"/>

<!--
<ImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="90dp"
android:layout_gravity="center"
android:layout_marginTop="56dp"
android:src="@drawable/icon_app"
app:layout_constraintTop_toTopOf="parent"
tools:layout_editor_absoluteX="16dp" />
-->

<Button
android:backgroundTint="#CCFFFFFF"
android:textColor="@color/purple"

android:id="@+id/signup"
android:layout_width="130dp"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginLeft="5dp"
android:layout_marginBottom="64dp"
android:text="Sign up"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.05"
app:layout_constraintStart_toStartOf="@id/password"
app:layout_constraintTop_toBottomOf="@+id/autoLogin"
app:layout_constraintVertical_bias="0.149" />

<Button
android:backgroundTint="#CCFFFFFF"
Expand All @@ -99,15 +97,14 @@
android:layout_width="130dp"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginTop="16dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="64dp"
android:enabled="false"
android:text="SIGN IN"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/password"
app:layout_constraintHorizontal_bias="0.95"
app:layout_constraintTop_toBottomOf="@+id/password"
app:layout_constraintTop_toBottomOf="@+id/autoLogin"
app:layout_constraintVertical_bias="0.16" />

<ProgressBar
Expand Down