Skip to content

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
  • Loading branch information
@genwo123
genwo123 committed Dec 7, 2022
1 parent f2a0926 commit b3e0eec
Show file tree
Hide file tree
Showing 8 changed files with 203 additions and 212 deletions.
Binary file modified app/src/main/res/drawable/load.png
View file
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/load2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_intro.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ImageView
android:layout_width="300dp"
android:layout_height="wrap_content"
android:src="@drawable/load"
android:src="@drawable/load2"
android:layout_gravity="center"
/>

Expand Down
40 changes: 25 additions & 15 deletions app/src/main/res/layout/f_f_activity_login.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,29 @@

<Button
android:id="@+id/login_button"
style="@style/defaultButton"
android:fontFamily="@font/l_f_binggraebold"

android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="#9370db"
android:text="로그인"
android:textColor="@android:color/black"
android:textColor="@android:color/white"
app:layout_constraintBaseline_toBaselineOf="@+id/F_V_signup_btn"
app:layout_constraintStart_toStartOf="@+id/login_password" />
app:layout_constraintStart_toStartOf="@+id/login_password"
/>

<EditText
android:id="@+id/login_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="41dp"
android:layout_marginBottom="40dp"
android:ems="10"
android:hint="아이디"
android:inputType="textEmailAddress"
android:hint="학번"
android:textColorHint="#6441a5"
android:backgroundTint="#6441a5"
app:layout_constraintBottom_toTopOf="@+id/login_password"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent" />

<EditText
Expand All @@ -36,29 +41,34 @@
android:layout_marginBottom="41dp"
android:ems="10"
android:hint="비밀번호"
android:textColorHint="#6441a5"
android:backgroundTint="#6441a5"
android:inputType="textPassword"
app:layout_constraintBottom_toTopOf="@+id/login_button"
app:layout_constraintStart_toStartOf="@+id/login_email" />


<ImageView
android:id="@+id/imageView3"
android:layout_width="55dp"
android:layout_height="55dp"
android:layout_marginBottom="41dp"
android:layout_width="105dp"
android:layout_height="106dp"
android:layout_marginBottom="40dp"
android:scaleType="fitCenter"

app:layout_constraintBottom_toTopOf="@+id/login_email"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:tint="@color/colorAccent" />

app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent" />

<Button
android:id="@+id/F_V_signup_btn"
style="@style/defaultButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="190dp"
android:layout_marginBottom="132dp"
android:backgroundTint="#9370db"
android:fontFamily="@font/l_f_binggraebold"
android:text="가입"
android:textColor="@android:color/black"
android:textColor="@android:color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/login_password" />

Expand Down
168 changes: 85 additions & 83 deletions app/src/main/res/layout/f_f_activity_signup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="82dp"
android:gravity="center">
android:gravity="center"
>

<TextView

android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:fontFamily="@font/l_f_binggraebold"
android:gravity="center"
android:text="회원가입"
Expand All @@ -32,112 +32,111 @@
android:gravity="center"
android:orientation="vertical">


<!-- <LinearLayout
android:layout_width="291dp"
android:layout_height="35dp"
android:orientation="horizontal"
android:layout_marginTop="20dp">
<TextView
android:layout_width="65dp"
android:layout_height="wrap_content"
android:fontFamily="@font/l_f_binggraebold"
android:text=" 과 선택"
android:textSize="15dp"></TextView>
<Spinner
android:id="@+id/spinner"
android:layout_width="125dp"
android:layout_height="21dp"></Spinner>
</LinearLayout>
<LinearLayout
android:layout_width="240dp"
android:layout_height="wrap_content"
android:orientation="vertical">
<RadioGroup
android:id="@+id/radiogroup"
android:layout_width="166dp"
android:layout_height="match_parent"
android:orientation="horizontal">
<RadioButton
android:id="@+id/radioButton1"
android:layout_width="40dp"
android:layout_height="23dp"
android:layout_weight="1"
android:text="남" />
<RadioButton
android:id="@+id/radioButton2"
android:layout_width="40dp"
android:layout_height="23dp"
android:layout_weight="1"
android:text="여" />
</RadioGroup>
</LinearLayout>
-->

<EditText
android:id="@+id/userName"
android:layout_width="260dp"
android:layout_height="wrap_content"
android:layout_width="280dp"
android:layout_height="48dp"
android:layout_marginEnd="2dp"
android:layout_marginBottom="16dp"
android:ems="10"
android:fontFamily="@font/l_f_binggraebold"
android:hint="이름"
android:hint="이름 "
android:inputType="textPersonName" />

<LinearLayout
android:layout_width="273dp"
android:layout_height="47dp"
android:orientation="horizontal">
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal"
android:gravity="center">

<EditText
android:id="@+id/userNum"
android:layout_width="174dp"
android:layout_height="47dp"
android:layout_marginStart="8dp"
android:layout_marginLeft="20dp"
android:layout_marginBottom="30dp"
android:ems="10"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:ems="8"
android:fontFamily="@font/l_f_binggraebold"
android:gravity="left"
android:hint="학번"
/>
android:hint="학번" />

<Button
android:fontFamily="@font/l_f_binggraebold"
android:id="@+id/check_button"
android:layout_width="85dp"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_marginEnd="100dp"
android:layout_marginLeft="5dp"
android:text="확인"
android:textColor="@android:color/black"
/>
android:backgroundTint="#9370db"
android:textColor="@android:color/white" />


</LinearLayout>


<!-- <LinearLayout
android:layout_width="291dp"
android:layout_height="35dp"
android:orientation="horizontal"
android:layout_marginTop="20dp">
<TextView
android:layout_width="65dp"
android:layout_height="wrap_content"
android:fontFamily="@font/l_f_binggraebold"
android:text=" 과 선택"
android:textSize="15dp"></TextView>
<Spinner
android:id="@+id/spinner"
android:layout_width="125dp"
android:layout_height="21dp"></Spinner>
</LinearLayout>
<LinearLayout
android:layout_width="240dp"
android:layout_height="wrap_content"
android:orientation="vertical">
<RadioGroup
android:id="@+id/radiogroup"
android:layout_width="166dp"
android:layout_height="match_parent"
android:orientation="horizontal">
<RadioButton
android:id="@+id/radioButton1"
android:layout_width="40dp"
android:layout_height="23dp"
android:layout_weight="1"
android:text="남" />
<RadioButton
android:id="@+id/radioButton2"
android:layout_width="40dp"
android:layout_height="23dp"
android:layout_weight="1"
android:text="여" />
</RadioGroup>
</LinearLayout>
-->
<EditText
android:id="@+id/userClass"
android:layout_width="286dp"
android:layout_height="50dp"
android:layout_margin="20dp"
android:layout_marginStart="8dp"
android:layout_marginBottom="10dp"
android:ems="10"
android:ems="15"
android:fontFamily="@font/l_f_binggraebold"
android:hint="과"
/>
android:hint="과" />

<EditText
android:id="@+id/userSex"
android:layout_width="286dp"
Expand All @@ -147,8 +146,7 @@
android:layout_marginBottom="20dp"
android:ems="10"
android:fontFamily="@font/l_f_binggraebold"
android:hint="성별"
/>
android:hint="성별" />


<EditText
Expand All @@ -173,26 +171,30 @@
android:inputType="textPassword" />

<LinearLayout
android:layout_width="411dp"
android:layout_width="394dp"
android:layout_height="103dp"
android:gravity="center"
android:orientation="horizontal">

<Button
android:fontFamily="@font/l_f_binggraebold"
android:backgroundTint="#9370db"
android:id="@+id/signup_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="20dp"
android:text="가입"
android:textColor="@android:color/black" />
android:textColor="@android:color/white" />

<Button
android:fontFamily="@font/l_f_binggraebold"
android:id="@+id/delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:text="취소"
android:textColor="@android:color/black" />
android:backgroundTint="#9370db"
android:textColor="@android:color/white" />

</LinearLayout>

Expand Down
Loading

0 comments on commit b3e0eec

Please sign in to comment.