Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions app/src/main/res/drawable-v24/login_signup_btn_activate.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:padding="10dp"
android:shape="rectangle" >
<solid android:color="#e54b4b" />

<corners
android:bottomLeftRadius="14dp"
android:bottomRightRadius="14dp"
android:topLeftRadius="14dp"
android:topRightRadius="14dp" />

</shape>
13 changes: 13 additions & 0 deletions app/src/main/res/drawable-v24/login_signup_btn_deactivate.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:padding="10dp"
android:shape="rectangle" >
<solid android:color="#80f2d4d4" />

<corners
android:bottomLeftRadius="14dp"
android:bottomRightRadius="14dp"
android:topLeftRadius="14dp"
android:topRightRadius="14dp" />

</shape>
Binary file added app/src/main/res/drawable/logo_login_home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/topbar_arrow_right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
77 changes: 77 additions & 0 deletions app/src/main/res/layout/activity_login.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">

<ImageView
android:id="@+id/login_logo"
android:layout_width="130dp"
android:layout_height="130dp"
android:src="@drawable/logo_login_home"
android:layout_marginTop="82dp"
android:layout_marginLeft="115dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>

<EditText
android:id="@+id/login_input_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:text="이메일"
android:textStyle="normal"
android:textSize="10sp"
android:textColor="#66958383"
android:background="@null"
android:layout_marginTop="55dp"
android:layout_marginLeft="23dp"
app:layout_constraintTop_toBottomOf="@+id/login_logo"
app:layout_constraintStart_toStartOf="parent"/>

<View
android:id="@+id/login_line_email"
android:layout_width="296dp"
android:layout_height="1dp"
android:background="#26958383"
android:layout_marginTop="3dp"
app:layout_constraintTop_toBottomOf="@+id/login_input_email"
app:layout_constraintStart_toStartOf="@+id/login_input_email"/>

<EditText
android:id="@+id/login_input_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:text="비밀번호"
android:textStyle="normal"
android:textSize="10sp"
android:textColor="#66958383"
android:background="@null"
android:layout_marginTop="28dp"
app:layout_constraintTop_toBottomOf="@+id/login_line_email"
app:layout_constraintStart_toStartOf="@+id/login_input_email"/>

<View
android:id="@+id/login_line_password"
android:layout_width="296dp"
android:layout_height="1dp"
android:background="#26958383"
android:layout_marginTop="3dp"
app:layout_constraintTop_toBottomOf="@+id/login_input_password"
app:layout_constraintStart_toStartOf="@+id/login_input_email"/>

<Button
android:id="@+id/login_login_btn_deactivate"
android:layout_width="330dp"
android:layout_height="48dp"
android:text="로그인"
android:textSize="14sp"
android:textColor="#958383"
android:background="@drawable/login_signup_btn_deactivate"
android:layout_marginTop="46dp"
android:layout_marginLeft="15dp"
app:layout_constraintTop_toBottomOf="@+id/login_line_password"
app:layout_constraintStart_toStartOf="parent"/>

</androidx.constraintlayout.widget.ConstraintLayout>
56 changes: 56 additions & 0 deletions app/src/main/res/layout/activity_login_main.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">

<ImageView
android:id="@+id/login_main_logo"
android:layout_width="120dp"
android:layout_height="120dp"
android:src="@drawable/logo_login_home"
android:layout_marginTop="140dp"
android:layout_marginLeft="120dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>

<TextView
android:id="@+id/login_main_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:text="나만의 맛집일기"
android:textStyle="normal"
android:textSize="12sp"
android:textColor="#e54b4b"
android:layout_marginTop="20dp"
android:layout_marginLeft="136dp"
app:layout_constraintTop_toBottomOf="@+id/login_main_logo"
app:layout_constraintStart_toStartOf="parent"/>

<Button
android:id="@+id/login_main_login_btn_activate"
android:layout_width="330dp"
android:layout_height="48dp"
android:text="로그인"
android:textSize="14sp"
android:textColor="#ffffff"
android:background="@drawable/login_signup_btn_activate"
android:layout_marginTop="190dp"
android:layout_marginLeft="15dp"
app:layout_constraintTop_toBottomOf="@+id/login_main_title"
app:layout_constraintStart_toStartOf="parent"/>

<Button
android:id="@+id/login_main_signup_btn_deactivate"
android:layout_width="330dp"
android:layout_height="48dp"
android:background="@drawable/login_signup_btn_deactivate"
android:text="회원가입"
android:textSize="14sp"
android:textColor="#958383"
android:layout_marginTop="16dp"
app:layout_constraintTop_toBottomOf="@+id/login_main_login_btn_activate"
app:layout_constraintStart_toStartOf="@+id/login_main_login_btn_activate"/>

</androidx.constraintlayout.widget.ConstraintLayout>
177 changes: 177 additions & 0 deletions app/src/main/res/layout/activity_signup.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/signup_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:text="회원가입"
android:textStyle="normal"
android:textSize="18sp"
android:textColor="#7e7373"
android:layout_marginTop="68dp"
android:layout_marginLeft="19dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>

<EditText
android:id="@+id/signup_input_nickname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:hint="닉네임"
android:textStyle="normal"
android:textSize="10sp"
android:textColor="#66958383"
android:background="@null"
android:layout_marginTop="60dp"
android:layout_marginLeft="32dp"
app:layout_constraintTop_toBottomOf="@+id/signup_title"
app:layout_constraintStart_toStartOf="parent"/>

<View
android:id="@+id/signup_line_nickname"
android:layout_width="296dp"
android:layout_height="1dp"
android:background="#26958383"
android:layout_marginTop="3dp"
app:layout_constraintTop_toBottomOf="@+id/signup_input_nickname"
app:layout_constraintStart_toStartOf="@+id/signup_input_nickname"/>

<TextView
android:id="@+id/signup_des_nickname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textStyle="normal"
android:textSize="8sp"
android:textColor="#d5cece"
android:text="닉네임은 1~6자리의 한글로 설정해 주세요."
android:layout_marginTop="1dp"
app:layout_constraintTop_toBottomOf="@+id/signup_line_nickname"
app:layout_constraintStart_toStartOf="@+id/signup_input_nickname"/>

<EditText
android:id="@+id/signup_input_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:hint="전화번호 입력"
android:textStyle="normal"
android:textSize="10sp"
android:textColor="#66958383"
android:background="@null"
android:layout_marginTop="17dp"
app:layout_constraintTop_toBottomOf="@+id/signup_des_nickname"
app:layout_constraintStart_toStartOf="@id/signup_input_nickname"/>

<View
android:id="@+id/signup_line_phone"
android:layout_width="296dp"
android:layout_height="1dp"
android:background="#26958383"
android:layout_marginTop="3dp"
app:layout_constraintTop_toBottomOf="@+id/signup_input_phone"
app:layout_constraintStart_toStartOf="@+id/signup_input_nickname"/>

<EditText
android:id="@+id/signup_input_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:hint="이메일 주소 입력"
android:textStyle="normal"
android:textSize="10sp"
android:textColor="#66958383"
android:background="@null"
android:layout_marginTop="28dp"
app:layout_constraintTop_toBottomOf="@+id/signup_line_phone"
app:layout_constraintStart_toStartOf="@id/signup_input_nickname"/>

<View
android:id="@+id/signup_line_email"
android:layout_width="296dp"
android:layout_height="1dp"
android:background="#26958383"
android:layout_marginTop="3dp"
app:layout_constraintTop_toBottomOf="@+id/signup_input_email"
app:layout_constraintStart_toStartOf="@+id/signup_input_nickname"/>

<EditText
android:id="@+id/signup_input_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:hint="비밀번호"
android:textStyle="normal"
android:textSize="10sp"
android:textColor="#66958383"
android:background="@null"
android:layout_marginTop="28dp"
app:layout_constraintTop_toBottomOf="@+id/signup_line_email"
app:layout_constraintStart_toStartOf="@id/signup_input_nickname"/>

<View
android:id="@+id/signup_line_password"
android:layout_width="296dp"
android:layout_height="1dp"
android:background="#26958383"
android:layout_marginTop="3dp"
app:layout_constraintTop_toBottomOf="@+id/signup_input_password"
app:layout_constraintStart_toStartOf="@+id/signup_input_nickname"/>

<TextView
android:id="@+id/signup_des_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textStyle="normal"
android:textSize="8sp"
android:textColor="#d5cece"
android:text="비밀번호는 6~12자리의 영문, 숫자를 조합하여 설정해 주세요."
android:layout_marginTop="1dp"
app:layout_constraintTop_toBottomOf="@+id/signup_line_password"
app:layout_constraintStart_toStartOf="@+id/signup_input_nickname"/>

<EditText
android:id="@+id/signup_input_password_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:hint="전화번호 입력"
android:textStyle="normal"
android:textSize="10sp"
android:textColor="#66958383"
android:background="@null"
android:layout_marginTop="17dp"
app:layout_constraintTop_toBottomOf="@+id/signup_des_password"
app:layout_constraintStart_toStartOf="@id/signup_input_nickname"/>

<View
android:id="@+id/signup_line_password_check"
android:layout_width="296dp"
android:layout_height="1dp"
android:background="#26958383"
android:layout_marginTop="3dp"
app:layout_constraintTop_toBottomOf="@+id/signup_input_password_check"
app:layout_constraintStart_toStartOf="@+id/signup_input_nickname"/>

<Button
android:id="@+id/signup_btn_deactivate"
android:layout_width="330dp"
android:layout_height="54dp"
android:text="다음"
android:textStyle="normal"
android:textSize="18sp"
android:textColor="#958383"
android:background="@drawable/login_signup_btn_deactivate"
android:layout_marginTop="52dp"
android:layout_marginLeft="17dp"
app:layout_constraintTop_toBottomOf="@id/signup_line_password_check"
app:layout_constraintStart_toStartOf="parent"/>

</androidx.constraintlayout.widget.ConstraintLayout>
Loading