장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
a5090492 1 parent e1679624

profil input activity proto ing

Inline Side-by-side
Showing 11 changed files with 626 additions and 122 deletions
...@@ -9,7 +9,11 @@ ...@@ -9,7 +9,11 @@
9 android:roundIcon="@mipmap/ic_launcher_round" 9 android:roundIcon="@mipmap/ic_launcher_round"
10 android:supportsRtl="true" 10 android:supportsRtl="true"
11 android:theme="@style/NoActionBar"> 11 android:theme="@style/NoActionBar">
12 - <activity android:name=".InputProfilActivity"></activity> 12 + <activity android:name=".InputProfilFirstThreeActivity"></activity>
13 + <activity android:name=".InputProfilFirstTwoActivity" />
14 + <activity android:name=".FragmentActivity" />
15 + <activity android:name=".FragmentLayout" />
16 + <activity android:name=".InputProfilFirstOneActivity" />
13 <activity android:name=".WelcomeActivity" /> 17 <activity android:name=".WelcomeActivity" />
14 <activity android:name=".SettingActivity" /> 18 <activity android:name=".SettingActivity" />
15 <activity android:name=".DetailActivity" /> 19 <activity android:name=".DetailActivity" />
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.content.Context
3 import android.content.Intent 4 import android.content.Intent
5 +import android.content.SharedPreferences
4 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 7 import android.os.Bundle
6 import android.widget.ImageView 8 import android.widget.ImageView
7 -import android.widget.RatingBar 9 +import android.widget.Toast
8 -import android.widget.TextView
9 import kotlinx.android.synthetic.main.activity_info.* 10 import kotlinx.android.synthetic.main.activity_info.*
10 11
11 class InfoActivity : AppCompatActivity() { 12 class InfoActivity : AppCompatActivity() {
...@@ -14,7 +15,11 @@ class InfoActivity : AppCompatActivity() { ...@@ -14,7 +15,11 @@ class InfoActivity : AppCompatActivity() {
14 super.onCreate(savedInstanceState) 15 super.onCreate(savedInstanceState)
15 setContentView(R.layout.activity_info) 16 setContentView(R.layout.activity_info)
16 17
18 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
19 + val editor: SharedPreferences.Editor=prof.edit()
17 20
21 + Toast.makeText(applicationContext,prof.getString("manorwoman","nothing"),
22 + Toast.LENGTH_SHORT).show()
18 23
19 //temp 24 //temp
20 var accountImage: ImageView =findViewById(R.id.infoAccountImage) 25 var accountImage: ImageView =findViewById(R.id.infoAccountImage)
...@@ -28,7 +33,10 @@ class InfoActivity : AppCompatActivity() { ...@@ -28,7 +33,10 @@ class InfoActivity : AppCompatActivity() {
28 33
29 //pushing test start 34 //pushing test start
30 InfoButtonSettings.setOnClickListener { 35 InfoButtonSettings.setOnClickListener {
31 - var intent = Intent(this, SettingActivity::class.java) 36 + //var intent = Intent(this, SettingActivity::class.java)
37 + //test start
38 + var intent = Intent(this, InputProfilFirstOneActivity::class.java)
39 + //test end
32 startActivity(intent) 40 startActivity(intent)
33 } 41 }
34 //pushing test end 42 //pushing test end
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.content.Intent
3 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
4 import android.os.Bundle 5 import android.os.Bundle
6 +import kotlinx.android.synthetic.main.activity_input_profil_first_one.*
5 7
6 -class InputProfilActivity : AppCompatActivity() { 8 +class InputProfilFirstOneActivity : AppCompatActivity() {
7 9
8 override fun onCreate(savedInstanceState: Bundle?) { 10 override fun onCreate(savedInstanceState: Bundle?) {
9 super.onCreate(savedInstanceState) 11 super.onCreate(savedInstanceState)
10 - setContentView(R.layout.activity_input_profil) 12 + setContentView(R.layout.activity_input_profil_first_one)
13 +
14 +
15 +
16 + inputStartButton.setOnClickListener {
17 + var intent = Intent(this, InputProfilFirstTwoActivity::class.java)
18 + startActivity(intent)
19 + }
20 +
11 } 21 }
22 +
23 +
12 } 24 }
......
1 +package com.example.vip
2 +
3 +import android.content.Context
4 +import android.content.Intent
5 +import android.content.SharedPreferences
6 +import androidx.appcompat.app.AppCompatActivity
7 +import android.os.Bundle
8 +import android.util.Log
9 +import android.util.MonthDisplayHelper
10 +import android.view.View
11 +import android.widget.RadioButton
12 +import android.widget.RadioGroup
13 +import android.widget.Toast
14 +import kotlinx.android.synthetic.main.activity_input_profil_first_one.*
15 +import kotlinx.android.synthetic.main.activity_input_profil_first_three.*
16 +
17 +class InputProfilFirstThreeActivity : AppCompatActivity() {
18 +
19 +
20 +
21 + override fun onCreate(savedInstanceState: Bundle?) {
22 + super.onCreate(savedInstanceState)
23 + setContentView(R.layout.activity_input_profil_first_three)
24 +
25 + /* not use this code start
26 + radio_group.setOnCheckedChangeListener(
27 + RadioGroup.OnCheckedChangeListener { group, checkedId ->
28 + val radio: RadioButton = findViewById(checkedId)
29 + Toast.makeText(applicationContext," On checked change : ${radio.text}",
30 + Toast.LENGTH_SHORT).show()
31 + })
32 + not use this code end */
33 +
34 + val prof: SharedPreferences=getSharedPreferences("profdata", Context.MODE_PRIVATE)
35 + val editor: SharedPreferences.Editor=prof.edit()
36 +
37 + manButton.setOnClickListener{
38 + var id: Int = radio_group.checkedRadioButtonId
39 + if (id!=-1){
40 + val radio:RadioButton = findViewById(id)
41 + editor.putString("manorwoman","man")
42 + editor.commit()
43 + /*
44 + Toast.makeText(applicationContext,"On button click : ${radio.text}"+prof.getString("manorwoman","nothing"),
45 + Toast.LENGTH_SHORT).show()
46 + */
47 + }else
48 + {
49 + }
50 + }
51 +
52 + womanButton.setOnClickListener{
53 + var id: Int = radio_group.checkedRadioButtonId
54 + if (id!=-1){
55 + val radio:RadioButton = findViewById(id)
56 + Toast.makeText(applicationContext,"On button click : ${radio.text}",
57 + Toast.LENGTH_SHORT).show()
58 + editor.putString("manorwoman","woman")
59 + editor.commit()
60 + }else
61 + {
62 + }
63 + }
64 +
65 + previousButton.setOnClickListener {
66 + var intent = Intent(this, SignInActivity::class.java)
67 + startActivity(intent)
68 + }
69 +
70 + }
71 +
72 +/* i will not use this code start
73 + fun radio_button_click(view: View){
74 + // Get the clicked radio button instance
75 + val radio: RadioButton = findViewById(radio_group.checkedRadioButtonId)
76 + Toast.makeText(applicationContext,"On click : ${radio.text}",
77 + Toast.LENGTH_SHORT).show()
78 + }
79 +i will not use this code start end*/
80 +
81 +
82 +}
1 +package com.example.vip
2 +
3 +import android.content.Context
4 +import android.content.Intent
5 +import android.content.SharedPreferences
6 +import androidx.appcompat.app.AppCompatActivity
7 +import android.os.Bundle
8 +import kotlinx.android.synthetic.main.activity_input_profil_first_two.*
9 +
10 +class InputProfilFirstTwoActivity : AppCompatActivity() {
11 +
12 + override fun onCreate(savedInstanceState: Bundle?) {
13 + super.onCreate(savedInstanceState)
14 + setContentView(R.layout.activity_input_profil_first_two)
15 +
16 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
17 + val editor: SharedPreferences.Editor=prof.edit()
18 +
19 + editor.putString("birthdate","none")
20 + editor.commit()
21 +
22 + nextButton.setOnClickListener {
23 + var intent = Intent(this, InputProfilFirstThreeActivity::class.java)
24 + startActivity(intent)
25 + }
26 + }
27 +}
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - xmlns:app="http://schemas.android.com/apk/res-auto"
4 - xmlns:tools="http://schemas.android.com/tools"
5 - android:layout_width="match_parent"
6 - android:layout_height="match_parent"
7 - tools:context=".InputProfilActivity">
8 -
9 -</androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 + xmlns:app="http://schemas.android.com/apk/res-auto"
4 + xmlns:tools="http://schemas.android.com/tools"
5 + android:layout_width="match_parent"
6 + android:layout_height="match_parent"
7 + tools:context=".InputProfilFirstOneActivity">
8 +
9 + <LinearLayout
10 + android:layout_width="match_parent"
11 + android:layout_height="match_parent"
12 + android:orientation="vertical">
13 +
14 + <LinearLayout
15 + android:layout_width="match_parent"
16 + android:layout_height="50dp"
17 + android:layout_weight="1"
18 + android:orientation="vertical">
19 +
20 + </LinearLayout>
21 +
22 + <LinearLayout
23 + android:layout_width="match_parent"
24 + android:layout_height="wrap_content"
25 + android:orientation="vertical">
26 +
27 + <ImageView
28 + android:id="@+id/imageView"
29 + android:layout_width="wrap_content"
30 + android:layout_height="wrap_content"
31 + android:layout_gravity="center"
32 + tools:srcCompat="@tools:sample/avatars" />
33 + </LinearLayout>
34 +
35 + <LinearLayout
36 + android:layout_width="match_parent"
37 + android:layout_height="30dp"
38 + android:layout_weight="2"
39 + android:orientation="vertical"></LinearLayout>
40 +
41 + <LinearLayout
42 + android:layout_width="match_parent"
43 + android:layout_height="wrap_content"
44 + android:orientation="vertical">
45 +
46 + <Button
47 + android:id="@+id/inputStartButton"
48 + android:layout_width="wrap_content"
49 + android:layout_height="wrap_content"
50 + android:layout_gravity="center"
51 + android:gravity="center"
52 + android:text="프로필 정보 입력하기" />
53 + </LinearLayout>
54 +
55 + <LinearLayout
56 + android:layout_width="match_parent"
57 + android:layout_height="30dp"
58 + android:layout_weight="3"
59 + android:orientation="vertical"></LinearLayout>
60 + </LinearLayout>
61 +</androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 + xmlns:app="http://schemas.android.com/apk/res-auto"
4 + xmlns:tools="http://schemas.android.com/tools"
5 + android:layout_width="match_parent"
6 + android:layout_height="match_parent"
7 + tools:context=".InputProfilFirstThreeActivity">
8 +
9 + <LinearLayout
10 + android:layout_width="match_parent"
11 + android:layout_height="match_parent"
12 + android:orientation="vertical">
13 +
14 + <LinearLayout
15 + android:layout_width="match_parent"
16 + android:layout_height="50dp"
17 + android:layout_weight="0"
18 + android:orientation="horizontal">
19 +
20 + <TextView
21 + android:id="@+id/stageTextView"
22 + android:layout_width="wrap_content"
23 + android:layout_height="wrap_content"
24 + android:layout_gravity="center"
25 + android:layout_weight="1"
26 + android:gravity="center"
27 + android:text="1단계" />
28 +
29 + <TextView
30 + android:id="@+id/neccesaryTextView"
31 + android:layout_width="wrap_content"
32 + android:layout_height="wrap_content"
33 + android:layout_gravity="center"
34 + android:layout_weight="1"
35 + android:gravity="center"
36 + android:text="필수항목" />
37 + </LinearLayout>
38 +
39 + <LinearLayout
40 + android:layout_width="match_parent"
41 + android:layout_height="10dp"
42 + android:layout_weight="1"
43 + android:orientation="vertical"></LinearLayout>
44 +
45 + <LinearLayout
46 + android:layout_width="match_parent"
47 + android:layout_height="wrap_content"
48 + android:layout_weight="1"
49 + android:orientation="vertical">
50 +
51 + <LinearLayout
52 + android:layout_width="match_parent"
53 + android:layout_height="wrap_content"
54 + android:orientation="vertical">
55 +
56 + <TextView
57 + android:id="@+id/explainTextView"
58 + android:layout_width="match_parent"
59 + android:layout_height="wrap_content"
60 + android:layout_gravity="center"
61 + android:gravity="center"
62 + android:text="2. 성별을 선택해 주세요." />
63 + </LinearLayout>
64 +
65 + <LinearLayout
66 + android:layout_width="match_parent"
67 + android:layout_height="50dp"
68 + android:layout_weight="1"
69 + android:orientation="vertical"></LinearLayout>
70 +
71 + <LinearLayout
72 + android:layout_width="wrap_content"
73 + android:layout_height="wrap_content"
74 + android:layout_gravity="center"
75 + android:gravity="center"
76 + android:orientation="vertical">
77 +
78 + <RadioGroup
79 + android:id="@+id/radio_group"
80 + android:layout_width="match_parent"
81 + android:layout_height="match_parent">
82 +
83 + <RadioButton
84 + android:id="@+id/manButton"
85 + android:layout_width="match_parent"
86 + android:layout_height="wrap_content"
87 + android:text="남자" />
88 +
89 + <RadioButton
90 + android:id="@+id/womanButton"
91 + android:layout_width="match_parent"
92 + android:layout_height="wrap_content"
93 + android:text="여자" />
94 + </RadioGroup>
95 +
96 + </LinearLayout>
97 +
98 + <LinearLayout
99 + android:layout_width="match_parent"
100 + android:layout_height="100dp"
101 + android:layout_weight="1"
102 + android:orientation="vertical"></LinearLayout>
103 +
104 + <LinearLayout
105 + android:layout_width="match_parent"
106 + android:layout_height="wrap_content"
107 + android:orientation="horizontal">
108 +
109 + <Button
110 + android:id="@+id/previousButton"
111 + android:layout_width="10dp"
112 + android:layout_height="wrap_content"
113 + android:layout_weight="1"
114 + android:text="이전 단계로" />
115 +
116 + <LinearLayout
117 + android:layout_width="10dp"
118 + android:layout_height="match_parent"
119 + android:layout_weight="1"
120 + android:orientation="vertical"></LinearLayout>
121 +
122 + <Button
123 + android:id="@+id/nextButton"
124 + android:layout_width="10dp"
125 + android:layout_height="wrap_content"
126 + android:layout_weight="1"
127 + android:text="다음 단계로" />
128 + </LinearLayout>
129 + </LinearLayout>
130 + </LinearLayout>
131 +</androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 + xmlns:app="http://schemas.android.com/apk/res-auto"
4 + xmlns:tools="http://schemas.android.com/tools"
5 + android:layout_width="match_parent"
6 + android:layout_height="match_parent"
7 + tools:context=".InputProfilFirstTwoActivity">
8 +
9 + <LinearLayout
10 + android:layout_width="match_parent"
11 + android:layout_height="match_parent"
12 + android:orientation="vertical">
13 +
14 + <LinearLayout
15 + android:layout_width="match_parent"
16 + android:layout_height="50dp"
17 + android:layout_weight="0"
18 + android:orientation="horizontal">
19 +
20 + <TextView
21 + android:id="@+id/stageTextView"
22 + android:layout_width="wrap_content"
23 + android:layout_height="wrap_content"
24 + android:layout_gravity="center"
25 + android:layout_weight="1"
26 + android:gravity="center"
27 + android:text="1단계" />
28 +
29 + <TextView
30 + android:id="@+id/neccesaryTextView"
31 + android:layout_width="wrap_content"
32 + android:layout_height="wrap_content"
33 + android:layout_gravity="center"
34 + android:layout_weight="1"
35 + android:gravity="center"
36 + android:text="필수항목" />
37 + </LinearLayout>
38 +
39 + <LinearLayout
40 + android:layout_width="match_parent"
41 + android:layout_height="10dp"
42 + android:layout_weight="1"
43 + android:orientation="vertical"></LinearLayout>
44 +
45 + <LinearLayout
46 + android:layout_width="match_parent"
47 + android:layout_height="wrap_content"
48 + android:layout_weight="1"
49 + android:orientation="vertical">
50 +
51 + <LinearLayout
52 + android:layout_width="match_parent"
53 + android:layout_height="wrap_content"
54 + android:orientation="vertical">
55 +
56 + <TextView
57 + android:id="@+id/explainTextView"
58 + android:layout_width="match_parent"
59 + android:layout_height="wrap_content"
60 + android:layout_gravity="center"
61 + android:gravity="center"
62 + android:text="1. 생년월일을 입력해 주세요." />
63 + </LinearLayout>
64 +
65 + <LinearLayout
66 + android:layout_width="match_parent"
67 + android:layout_height="50dp"
68 + android:layout_weight="1"
69 + android:orientation="vertical"></LinearLayout>
70 +
71 + <LinearLayout
72 + android:layout_width="wrap_content"
73 + android:layout_height="wrap_content"
74 + android:layout_gravity="center"
75 + android:gravity="center"
76 + android:orientation="vertical">
77 +
78 + <EditText
79 + android:id="@+id/editText"
80 + android:layout_width="match_parent"
81 + android:layout_height="wrap_content"
82 + android:layout_gravity="center"
83 + android:ems="10"
84 + android:gravity="center"
85 + android:inputType="date" />
86 + </LinearLayout>
87 +
88 + <LinearLayout
89 + android:layout_width="match_parent"
90 + android:layout_height="100dp"
91 + android:layout_weight="1"
92 + android:orientation="vertical"></LinearLayout>
93 +
94 + <LinearLayout
95 + android:layout_width="match_parent"
96 + android:layout_height="wrap_content"
97 + android:orientation="horizontal">
98 +
99 + <LinearLayout
100 + android:layout_width="10dp"
101 + android:layout_height="match_parent"
102 + android:layout_weight="1"
103 + android:orientation="vertical">
104 +
105 + </LinearLayout>
106 +
107 + <LinearLayout
108 + android:layout_width="10dp"
109 + android:layout_height="match_parent"
110 + android:layout_weight="1"
111 + android:orientation="vertical"></LinearLayout>
112 +
113 + <Button
114 + android:id="@+id/nextButton"
115 + android:layout_width="10dp"
116 + android:layout_height="wrap_content"
117 + android:layout_weight="1"
118 + android:text="다음 단계로" />
119 + </LinearLayout>
120 + </LinearLayout>
121 + </LinearLayout>
122 +</androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -6,67 +6,81 @@ ...@@ -6,67 +6,81 @@
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 tools:context=".MainActivity"> 7 tools:context=".MainActivity">
8 8
9 - <EditText 9 + <LinearLayout
10 - android:layout_width="0dp" 10 + android:layout_width="match_parent"
11 - android:layout_height="wrap_content" 11 + android:layout_height="match_parent"
12 - android:inputType="textEmailAddress" 12 + android:orientation="vertical">
13 - android:ems="10"
14 - android:id="@+id/edit_email"
15 - android:hint="Email"
16 - android:layout_marginStart="16dp"
17 - app:layout_constraintStart_toStartOf="parent"
18 - android:layout_marginLeft="16dp"
19 - android:layout_marginEnd="16dp"
20 - app:layout_constraintEnd_toEndOf="parent"
21 - android:layout_marginRight="16dp"
22 - android:layout_marginTop="8dp"
23 - app:layout_constraintTop_toTopOf="parent"/>
24 - <EditText
25 - android:layout_width="0dp"
26 - android:layout_height="wrap_content"
27 - android:inputType="textPassword"
28 - android:ems="10"
29 - android:id="@+id/edit_password"
30 - android:hint="Password"
31 - android:layout_marginStart="16dp"
32 - app:layout_constraintStart_toStartOf="parent"
33 - android:layout_marginLeft="16dp"
34 - android:layout_marginEnd="16dp"
35 - app:layout_constraintEnd_toEndOf="parent"
36 - android:layout_marginRight="16dp"
37 - android:layout_marginTop="8dp"
38 - app:layout_constraintTop_toBottomOf="@+id/edit_email"/>
39 13
40 - <Button 14 + <LinearLayout
41 - android:id="@+id/emailSignupBtn" 15 + android:layout_width="match_parent"
42 - android:layout_width="0dp" 16 + android:layout_height="10dp"
43 - android:layout_height="wrap_content" 17 + android:layout_weight="1"
44 - android:layout_marginStart="16dp" 18 + android:orientation="vertical"></LinearLayout>
45 - android:layout_marginLeft="16dp"
46 - android:layout_marginTop="8dp"
47 - android:layout_marginEnd="16dp"
48 - android:layout_marginRight="16dp"
49 - android:background="@color/colorPrimary"
50 - android:text="Sign Up"
51 - android:textColor="@color/common_google_signin_btn_text_dark_default"
52 - app:layout_constraintEnd_toEndOf="parent"
53 - app:layout_constraintStart_toStartOf="parent"
54 - app:layout_constraintTop_toBottomOf="@+id/edit_password" />
55 19
56 - <Button 20 + <LinearLayout
57 - android:id="@+id/emailSigninBtn" 21 + android:layout_width="match_parent"
58 - android:layout_width="0dp" 22 + android:layout_height="wrap_content"
59 - android:layout_height="wrap_content" 23 + android:orientation="vertical">
60 - android:layout_marginStart="16dp" 24 +
61 - android:layout_marginLeft="16dp" 25 + <EditText
62 - android:layout_marginTop="8dp" 26 + android:id="@+id/edit_email"
63 - android:layout_marginEnd="16dp" 27 + android:layout_width="match_parent"
64 - android:layout_marginRight="16dp" 28 + android:layout_height="wrap_content"
65 - android:background="@color/colorPrimary" 29 + android:layout_marginStart="16dp"
66 - android:text="Sign In" 30 + android:layout_marginLeft="16dp"
67 - android:textColor="@color/common_google_signin_btn_text_dark_default" 31 + android:layout_marginTop="8dp"
68 - app:layout_constraintEnd_toEndOf="parent" 32 + android:layout_marginEnd="16dp"
69 - app:layout_constraintStart_toStartOf="parent" 33 + android:layout_marginRight="16dp"
70 - app:layout_constraintTop_toBottomOf="@+id/emailSignupBtn" /> 34 + android:ems="10"
35 + android:hint="Email"
36 + android:inputType="textEmailAddress" />
37 +
38 + <EditText
39 + android:id="@+id/edit_password"
40 + android:layout_width="match_parent"
41 + android:layout_height="wrap_content"
42 + android:layout_marginStart="16dp"
43 + android:layout_marginLeft="16dp"
44 + android:layout_marginTop="8dp"
45 + android:layout_marginEnd="16dp"
46 + android:layout_marginRight="16dp"
47 + android:ems="10"
48 + android:hint="Password"
49 + android:inputType="textPassword" />
50 +
51 + <Button
52 + android:id="@+id/emailSigninBtn"
53 + android:layout_width="match_parent"
54 + android:layout_height="wrap_content"
55 + android:layout_marginStart="16dp"
56 + android:layout_marginLeft="16dp"
57 + android:layout_marginTop="8dp"
58 + android:layout_marginEnd="16dp"
59 + android:layout_marginRight="16dp"
60 + android:background="@color/colorPrimary"
61 + android:text="로그인"
62 + android:textColor="@color/common_google_signin_btn_text_dark_default" />
63 +
64 + <Button
65 + android:id="@+id/emailSignupBtn"
66 + android:layout_width="match_parent"
67 + android:layout_height="wrap_content"
68 + android:layout_marginStart="16dp"
69 + android:layout_marginLeft="16dp"
70 + android:layout_marginTop="8dp"
71 + android:layout_marginEnd="16dp"
72 + android:layout_marginRight="16dp"
73 + android:background="@color/colorPrimary"
74 + android:text="회원가입"
75 + android:textColor="@color/common_google_signin_btn_text_dark_default" />
76 +
77 + </LinearLayout>
78 +
79 + <LinearLayout
80 + android:layout_width="match_parent"
81 + android:layout_height="10dp"
82 + android:layout_weight="1"
83 + android:orientation="vertical"></LinearLayout>
84 + </LinearLayout>
71 85
72 </androidx.constraintlayout.widget.ConstraintLayout> 86 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -7,53 +7,105 @@ ...@@ -7,53 +7,105 @@
7 tools:context=".SignUpActivity"> 7 tools:context=".SignUpActivity">
8 8
9 9
10 - <EditText 10 + <LinearLayout
11 - android:id="@+id/edit_email_sign_up" 11 + android:layout_width="match_parent"
12 - android:layout_width="0dp" 12 + android:layout_height="match_parent"
13 - android:layout_height="wrap_content" 13 + android:orientation="vertical">
14 - android:layout_marginStart="16dp" 14 +
15 - android:layout_marginLeft="16dp" 15 + <LinearLayout
16 - android:layout_marginEnd="16dp" 16 + android:layout_width="match_parent"
17 - android:layout_marginRight="16dp" 17 + android:layout_height="10dp"
18 - android:ems="10" 18 + android:layout_weight="1"
19 - android:hint="Email" 19 + android:orientation="vertical">
20 - android:inputType="textEmailAddress" 20 +
21 - app:layout_constraintBottom_toBottomOf="parent" 21 + <LinearLayout
22 - app:layout_constraintEnd_toEndOf="parent" 22 + android:layout_width="match_parent"
23 - app:layout_constraintStart_toStartOf="parent" 23 + android:layout_height="10dp"
24 - app:layout_constraintTop_toTopOf="parent" /> 24 + android:layout_weight="1"
25 - 25 + android:orientation="vertical">
26 - <EditText 26 +
27 - android:id="@+id/edit_password_sign_up" 27 + </LinearLayout>
28 - android:layout_width="0dp" 28 +
29 - android:layout_height="wrap_content" 29 + <TextView
30 - android:layout_marginStart="16dp" 30 + android:id="@+id/becomeFamilyTextView"
31 - android:layout_marginLeft="16dp" 31 + android:layout_width="match_parent"
32 - android:layout_marginEnd="16dp" 32 + android:layout_height="wrap_content"
33 - android:layout_marginRight="16dp" 33 + android:layout_gravity="center|center_horizontal|center_vertical"
34 - android:ems="10" 34 + android:gravity="center|center_horizontal|center_vertical"
35 - android:hint="Password" 35 + android:text="Wello의 가족이 되어주세요 ^^"
36 - android:inputType="textPassword" 36 + android:textSize="30dp" />
37 - app:layout_constraintBottom_toBottomOf="parent" 37 +
38 - app:layout_constraintEnd_toEndOf="parent" 38 + <LinearLayout
39 - app:layout_constraintStart_toStartOf="parent" 39 + android:layout_width="match_parent"
40 - app:layout_constraintTop_toBottomOf="@+id/edit_email_sign_up" /> 40 + android:layout_height="10dp"
41 - 41 + android:layout_weight="1"
42 - <Button 42 + android:orientation="vertical"></LinearLayout>
43 - android:id="@+id/signupBtn" 43 +
44 - android:layout_width="0dp" 44 + </LinearLayout>
45 - android:layout_height="wrap_content" 45 +
46 - android:layout_marginStart="16dp" 46 + <EditText
47 - android:layout_marginLeft="16dp" 47 + android:id="@+id/edit_email_sign_up"
48 - android:layout_marginEnd="16dp" 48 + android:layout_width="300dp"
49 - android:layout_marginRight="16dp" 49 + android:layout_height="wrap_content"
50 - android:background="@color/colorPrimary" 50 + android:layout_gravity="center"
51 - android:text="Sign Up" 51 + android:layout_marginStart="16dp"
52 - android:textColor="@color/common_google_signin_btn_text_dark_default" 52 + android:layout_marginEnd="16dp"
53 - app:layout_constraintBottom_toBottomOf="parent" 53 + android:ems="10"
54 - app:layout_constraintEnd_toEndOf="parent" 54 + android:gravity="center"
55 - app:layout_constraintStart_toStartOf="parent" 55 + android:hint="Email"
56 - app:layout_constraintTop_toBottomOf="@+id/edit_password_sign_up" /> 56 + android:inputType="textEmailAddress" />
57 +
58 + <EditText
59 + android:id="@+id/edit_password_sign_up"
60 + android:layout_width="300dp"
61 + android:layout_height="wrap_content"
62 + android:layout_gravity="center"
63 + android:layout_marginStart="16dp"
64 + android:layout_marginEnd="16dp"
65 + android:ems="10"
66 + android:gravity="center"
67 + android:hint="Password"
68 + android:inputType="textPassword" />
69 +
70 + <Button
71 + android:id="@+id/signupBtn"
72 + android:layout_width="300dp"
73 + android:layout_height="wrap_content"
74 + android:layout_gravity="center"
75 + android:layout_marginStart="16dp"
76 + android:layout_marginEnd="16dp"
77 + android:background="@color/colorPrimary"
78 + android:gravity="center"
79 + android:text="회원가입"
80 + android:textColor="@color/common_google_signin_btn_text_dark_default" />
81 +
82 + <LinearLayout
83 + android:layout_width="match_parent"
84 + android:layout_height="10dp"
85 + android:layout_weight="1"
86 + android:orientation="vertical">
87 +
88 + <LinearLayout
89 + android:layout_width="match_parent"
90 + android:layout_height="10dp"
91 + android:layout_weight="1"
92 + android:orientation="vertical"></LinearLayout>
93 +
94 + <TextView
95 + android:id="@+id/agreeTextView"
96 + android:layout_width="200dp"
97 + android:layout_height="wrap_content"
98 + android:layout_gravity="center"
99 + android:gravity="center"
100 + android:text="* 회원가입을 진행하실 경우, 서비스 이용약관, 개인 정보 취급 방침에 자동으로 동의하시게 됩니다." />
101 +
102 + <LinearLayout
103 + android:layout_width="match_parent"
104 + android:layout_height="10dp"
105 + android:layout_weight="1"
106 + android:orientation="vertical"></LinearLayout>
107 + </LinearLayout>
108 + </LinearLayout>
57 109
58 110
59 </androidx.constraintlayout.widget.ConstraintLayout> 111 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......