장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
6d0d209d 1 parent 017ebe57

subscribe activated

Expand all
Inline Side-by-side
Showing 28 changed files with 585 additions and 147 deletions
...@@ -3,16 +3,53 @@ package com.example.vip ...@@ -3,16 +3,53 @@ package com.example.vip
3 import android.content.Intent 3 import android.content.Intent
4 import androidx.appcompat.app.AppCompatActivity 4 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 5 import android.os.Bundle
6 +import android.widget.Toast
7 +import com.google.android.gms.tasks.OnCompleteListener
8 +import com.google.firebase.auth.FirebaseAuth
9 +import com.google.firebase.database.FirebaseDatabase
10 +import com.google.firebase.iid.FirebaseInstanceId
6 import kotlinx.android.synthetic.main.activity_input_profil_first_one.* 11 import kotlinx.android.synthetic.main.activity_input_profil_first_one.*
7 12
8 class InputProfilFirstOneActivity : AppCompatActivity() { 13 class InputProfilFirstOneActivity : AppCompatActivity() {
9 14
15 + private val firebaseAuth = FirebaseAuth.getInstance()
16 + val user_db = FirebaseDatabase.getInstance("https://capstone-vip-user.firebaseio.com/").reference
17 +
18 + private fun sendToken(){
19 + FirebaseInstanceId.getInstance().instanceId
20 + .addOnCompleteListener(OnCompleteListener { task ->
21 + if (!task.isSuccessful) {
22 + //Log.w(TAG, "getInstanceId failed", task.exception)
23 + return@OnCompleteListener
24 + }
25 +
26 + // Get new Instance ID token
27 + tkn = task.result!!.token
28 +
29 + // Log and toast
30 + val msg = getString(R.string.msg_token_fmt, tkn)
31 + //Log.d(TAG, msg)
32 + Toast.makeText(baseContext, msg, Toast.LENGTH_SHORT).show()
33 + })
34 + }
35 +
36 + private fun writeNewUser(u_id: String, u_token: String, Policy: String?) {
37 + val user = User(u_token, Policy!!)
38 + user_db.child(u_id).setValue(user)/// .setValue(user)
39 + }
40 +
41 +
42 +
43 +
44 +
10 override fun onCreate(savedInstanceState: Bundle?) { 45 override fun onCreate(savedInstanceState: Bundle?) {
11 super.onCreate(savedInstanceState) 46 super.onCreate(savedInstanceState)
12 setContentView(R.layout.activity_input_profil_first_one) 47 setContentView(R.layout.activity_input_profil_first_one)
13 48
14 49
15 50
51 +
52 +
16 inputStartButton.setOnClickListener { 53 inputStartButton.setOnClickListener {
17 var intent = Intent(this, InputProfilFirstTwoActivity::class.java) 54 var intent = Intent(this, InputProfilFirstTwoActivity::class.java)
18 startActivity(intent) 55 startActivity(intent)
......
...@@ -181,6 +181,9 @@ class InputProfilSecondOneActivity : AppCompatActivity() { ...@@ -181,6 +181,9 @@ class InputProfilSecondOneActivity : AppCompatActivity() {
181 // debug 181 // debug
182 // Log.d("topic : ", topic) 182 // Log.d("topic : ", topic)
183 183
184 + FirebaseMessaging.getInstance().subscribeToTopic(topic).addOnCompleteListener { task ->
185 + if (!task.isSuccessful) { } // 성공
186 + }
184 /* topic 구독 코드 187 /* topic 구독 코드
185 FirebaseMessaging.getInstance().subscribeToTopic(topic).addOnCompleteListener { task -> 188 FirebaseMessaging.getInstance().subscribeToTopic(topic).addOnCompleteListener { task ->
186 if (!task.isSuccessful) { } // 성공 189 if (!task.isSuccessful) { } // 성공
......
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 android.os.Bundle 6 import android.os.Bundle
5 import android.view.Menu 7 import android.view.Menu
6 import android.view.MenuItem 8 import android.view.MenuItem
...@@ -29,6 +31,9 @@ class SignInActivity : AppCompatActivity() { ...@@ -29,6 +31,9 @@ class SignInActivity : AppCompatActivity() {
29 val dialogView = layoutInflater.inflate(R.layout.dialog_example, null) 31 val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
30 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt) 32 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
31 //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb) 33 //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb)
34 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
35 + val editor: SharedPreferences.Editor=prof.edit()
36 +
32 dialogView.findViewById<TextView>(R.id.dialogTitle).text="프로필을 입력해주세요!" 37 dialogView.findViewById<TextView>(R.id.dialogTitle).text="프로필을 입력해주세요!"
33 dialogView.findViewById<TextView>(R.id.dialogContent).text="정확한 정책 추천을 얻으려면 더 많은 프로필 정보가 필요해요!" 38 dialogView.findViewById<TextView>(R.id.dialogContent).text="정확한 정책 추천을 얻으려면 더 많은 프로필 정보가 필요해요!"
34 39
...@@ -39,7 +44,8 @@ class SignInActivity : AppCompatActivity() { ...@@ -39,7 +44,8 @@ class SignInActivity : AppCompatActivity() {
39 /* 확인일 때 main의 View의 값에 dialog View에 있는 값을 적용 */ 44 /* 확인일 때 main의 View의 값에 dialog View에 있는 값을 적용 */
40 } 45 }
41 .setNegativeButton("지금할게요 :)") { dialogInterface, i -> 46 .setNegativeButton("지금할게요 :)") { dialogInterface, i ->
42 - /* 취소일 때 아무 액션이 없으므로 빈칸 */ 47 + editor.clear()
48 +
43 val intent = Intent(this, InputProfilFirstOneActivity::class.java) 49 val intent = Intent(this, InputProfilFirstOneActivity::class.java)
44 startActivity(intent) 50 startActivity(intent)
45 } 51 }
......
...@@ -4,13 +4,64 @@ ...@@ -4,13 +4,64 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 - tools:context=".InputProfilFirstFiveActivity"> 7 + tools:context=".InputProfilFourthFiveActivity">
8 8
9 <LinearLayout 9 <LinearLayout
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 android:layout_height="match_parent" 11 android:layout_height="match_parent"
12 android:orientation="vertical"> 12 android:orientation="vertical">
13 13
14 + <androidx.appcompat.widget.Toolbar
15 + android:id="@+id/toolbar"
16 + android:layout_width="fill_parent"
17 + android:layout_height="wrap_content"
18 + android:layout_marginBottom="11dp"
19 + android:background="#FFF"
20 + android:elevation="5dp"
21 + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
22 + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
23 +
24 + <LinearLayout
25 + android:layout_width="match_parent"
26 + android:layout_height="match_parent"
27 + android:orientation="horizontal">
28 +
29 + <Button
30 + android:id="@+id/skipButton"
31 + android:layout_width="10dp"
32 + android:layout_height="match_parent"
33 + android:layout_weight="1.5"
34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
38 + <LinearLayout
39 + android:layout_width="10dp"
40 + android:layout_height="match_parent"
41 + android:orientation="horizontal"
42 + android:layout_weight="1"/>
43 + <ImageView
44 + android:layout_width="77dp"
45 + android:layout_height="44dp"
46 + android:layout_gravity="center"
47 + android:layout_weight="1"
48 + android:src="@drawable/toolbar_logo" />
49 + <LinearLayout
50 + android:layout_width="10dp"
51 + android:layout_height="match_parent"
52 + android:orientation="horizontal"
53 + android:layout_weight="1"/>
54 + <LinearLayout
55 + android:layout_width="10dp"
56 + android:layout_height="match_parent"
57 + android:orientation="horizontal"
58 + android:layout_weight="1.5"/>
59 +
60 + </LinearLayout>
61 +
62 +
63 + </androidx.appcompat.widget.Toolbar>
64 +
14 <LinearLayout 65 <LinearLayout
15 android:layout_width="match_parent" 66 android:layout_width="match_parent"
16 android:layout_height="50dp" 67 android:layout_height="50dp"
...@@ -20,20 +71,52 @@ ...@@ -20,20 +71,52 @@
20 <TextView 71 <TextView
21 android:id="@+id/stageTextView1" 72 android:id="@+id/stageTextView1"
22 android:layout_width="wrap_content" 73 android:layout_width="wrap_content"
23 - android:layout_height="wrap_content" 74 + android:layout_height="match_parent"
24 android:layout_gravity="center" 75 android:layout_gravity="center"
25 android:layout_weight="1" 76 android:layout_weight="1"
77 + android:background="#1E90FF"
26 android:gravity="center" 78 android:gravity="center"
27 - android:text="1단계" /> 79 + android:text="1" />
28 80
29 <TextView 81 <TextView
30 - android:id="@+id/neccesaryTextView" 82 + android:id="@+id/stageTextView2"
31 android:layout_width="wrap_content" 83 android:layout_width="wrap_content"
32 - android:layout_height="wrap_content" 84 + android:layout_height="match_parent"
85 + android:layout_gravity="center"
86 + android:layout_weight="1"
87 + android:background="#1E90FF"
88 + android:gravity="center"
89 + android:text="2" />
90 +
91 + <TextView
92 + android:id="@+id/stageTextView3"
93 + android:layout_width="wrap_content"
94 + android:layout_height="match_parent"
95 + android:layout_gravity="center"
96 + android:layout_weight="1"
97 + android:background="#1E90FF"
98 + android:gravity="center"
99 + android:text="3" />
100 +
101 + <TextView
102 + android:id="@+id/stageTextView4"
103 + android:layout_width="wrap_content"
104 + android:layout_height="match_parent"
33 android:layout_gravity="center" 105 android:layout_gravity="center"
34 android:layout_weight="1" 106 android:layout_weight="1"
107 + android:background="#1E90FF"
35 android:gravity="center" 108 android:gravity="center"
36 - android:text="필수항목" /> 109 + android:text="4" />
110 +
111 + <TextView
112 + android:id="@+id/stageTextView5"
113 + android:layout_width="wrap_content"
114 + android:layout_height="match_parent"
115 + android:layout_gravity="center"
116 + android:layout_weight="1"
117 + android:gravity="center"
118 + android:text="5" />
119 +
37 </LinearLayout> 120 </LinearLayout>
38 121
39 <LinearLayout 122 <LinearLayout
...@@ -53,47 +136,68 @@ ...@@ -53,47 +136,68 @@
53 android:layout_height="wrap_content" 136 android:layout_height="wrap_content"
54 android:orientation="vertical"> 137 android:orientation="vertical">
55 138
56 - <TextView 139 + <RelativeLayout
57 - android:id="@+id/explainTextView"
58 android:layout_width="match_parent" 140 android:layout_width="match_parent"
59 - android:layout_height="wrap_content" 141 + android:layout_height="match_parent">
60 - android:layout_gravity="center" 142 +
61 - android:gravity="center" 143 + <TextView
62 - android:text="4. 내/외국인 여부를 선택해주세요." /> 144 + android:id="@+id/explainTextView"
145 + android:layout_width="match_parent"
146 + android:layout_height="wrap_content"
147 + android:layout_gravity="center"
148 + android:gravity="center"
149 + android:text="4. 내/외국인 여부를 선택해주세요." />
150 + <Button
151 + android:id="@+id/questionButton"
152 + android:layout_width="30dp"
153 + android:layout_height="30dp"
154 + android:layout_gravity="center"
155 + android:layout_toRightOf="@id/explainTextView"
156 + android:backgroundTint="#1E90FF"
157 + android:gravity="center"
158 + android:text=" ? "
159 + android:textSize="8sp" />
160 + </RelativeLayout>
63 </LinearLayout> 161 </LinearLayout>
64 162
65 <LinearLayout 163 <LinearLayout
66 android:layout_width="match_parent" 164 android:layout_width="match_parent"
67 android:layout_height="50dp" 165 android:layout_height="50dp"
68 android:layout_weight="1" 166 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"> 167 android:orientation="vertical">
77 168
78 - <ToggleButton 169 + </LinearLayout>
79 - android:id="@+id/inmanButton" 170 +
80 - android:layout_width="match_parent" 171 + <ScrollView
81 - android:layout_height="wrap_content" 172 + android:layout_width="match_parent"
82 - android:background="@drawable/profil_selector" 173 + android:layout_height="wrap_content">
83 - android:text="내국인"
84 - android:textOff="내국인"
85 - android:textOn="내국인" />
86 174
87 - <ToggleButton 175 + <LinearLayout
88 - android:id="@+id/outmanButton"
89 android:layout_width="match_parent" 176 android:layout_width="match_parent"
90 android:layout_height="wrap_content" 177 android:layout_height="wrap_content"
91 - android:background="@drawable/profil_selector" 178 + android:orientation="vertical">
92 - android:text="외국인" 179 + <ToggleButton
93 - android:textOff="외국인" 180 + android:id="@+id/inmanButton"
94 - android:textOn="외국인" /> 181 + android:layout_width="match_parent"
95 - 182 + android:layout_height="wrap_content"
96 - </LinearLayout> 183 + android:background="@drawable/profil_selector"
184 + android:text="내국인"
185 + android:textOff="내국인"
186 + android:textOn="내국인" />
187 +
188 + <ToggleButton
189 + android:id="@+id/outmanButton"
190 + android:layout_width="match_parent"
191 + android:layout_height="wrap_content"
192 + android:background="@drawable/profil_selector"
193 + android:text="외국인"
194 + android:textOff="외국인"
195 + android:textOn="외국인" />
196 +
197 + </LinearLayout>
198 +
199 +
200 + </ScrollView>
97 201
98 <LinearLayout 202 <LinearLayout
99 android:layout_width="match_parent" 203 android:layout_width="match_parent"
...@@ -113,12 +217,6 @@ ...@@ -113,12 +217,6 @@
113 android:layout_weight="1" 217 android:layout_weight="1"
114 android:text="이전 단계로" /> 218 android:text="이전 단계로" />
115 219
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 220 <Button
123 android:id="@+id/nextButton" 221 android:id="@+id/nextButton"
124 android:layout_width="10dp" 222 android:layout_width="10dp"
......
...@@ -4,13 +4,64 @@ ...@@ -4,13 +4,64 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 - tools:context=".InputProfilFirstFourActivity"> 7 + tools:context=".InputProfilFourthFiveActivity">
8 8
9 <LinearLayout 9 <LinearLayout
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 android:layout_height="match_parent" 11 android:layout_height="match_parent"
12 android:orientation="vertical"> 12 android:orientation="vertical">
13 13
14 + <androidx.appcompat.widget.Toolbar
15 + android:id="@+id/toolbar"
16 + android:layout_width="fill_parent"
17 + android:layout_height="wrap_content"
18 + android:layout_marginBottom="11dp"
19 + android:background="#FFF"
20 + android:elevation="5dp"
21 + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
22 + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
23 +
24 + <LinearLayout
25 + android:layout_width="match_parent"
26 + android:layout_height="match_parent"
27 + android:orientation="horizontal">
28 +
29 + <Button
30 + android:id="@+id/skipButton"
31 + android:layout_width="10dp"
32 + android:layout_height="match_parent"
33 + android:layout_weight="1.5"
34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
38 + <LinearLayout
39 + android:layout_width="10dp"
40 + android:layout_height="match_parent"
41 + android:orientation="horizontal"
42 + android:layout_weight="1"/>
43 + <ImageView
44 + android:layout_width="77dp"
45 + android:layout_height="44dp"
46 + android:layout_gravity="center"
47 + android:layout_weight="1"
48 + android:src="@drawable/toolbar_logo" />
49 + <LinearLayout
50 + android:layout_width="10dp"
51 + android:layout_height="match_parent"
52 + android:orientation="horizontal"
53 + android:layout_weight="1"/>
54 + <LinearLayout
55 + android:layout_width="10dp"
56 + android:layout_height="match_parent"
57 + android:orientation="horizontal"
58 + android:layout_weight="1.5"/>
59 +
60 + </LinearLayout>
61 +
62 +
63 + </androidx.appcompat.widget.Toolbar>
64 +
14 <LinearLayout 65 <LinearLayout
15 android:layout_width="match_parent" 66 android:layout_width="match_parent"
16 android:layout_height="50dp" 67 android:layout_height="50dp"
...@@ -20,20 +71,52 @@ ...@@ -20,20 +71,52 @@
20 <TextView 71 <TextView
21 android:id="@+id/stageTextView1" 72 android:id="@+id/stageTextView1"
22 android:layout_width="wrap_content" 73 android:layout_width="wrap_content"
23 - android:layout_height="wrap_content" 74 + android:layout_height="match_parent"
24 android:layout_gravity="center" 75 android:layout_gravity="center"
25 android:layout_weight="1" 76 android:layout_weight="1"
77 + android:background="#1E90FF"
26 android:gravity="center" 78 android:gravity="center"
27 - android:text="1단계" /> 79 + android:text="1" />
28 80
29 <TextView 81 <TextView
30 - android:id="@+id/neccesaryTextView" 82 + android:id="@+id/stageTextView2"
31 android:layout_width="wrap_content" 83 android:layout_width="wrap_content"
32 - android:layout_height="wrap_content" 84 + android:layout_height="match_parent"
33 android:layout_gravity="center" 85 android:layout_gravity="center"
34 android:layout_weight="1" 86 android:layout_weight="1"
87 + android:background="#1E90FF"
35 android:gravity="center" 88 android:gravity="center"
36 - android:text="필수항목" /> 89 + android:text="2" />
90 +
91 + <TextView
92 + android:id="@+id/stageTextView3"
93 + android:layout_width="wrap_content"
94 + android:layout_height="match_parent"
95 + android:layout_gravity="center"
96 + android:layout_weight="1"
97 + android:background="#1E90FF"
98 + android:gravity="center"
99 + android:text="3" />
100 +
101 + <TextView
102 + android:id="@+id/stageTextView4"
103 + android:layout_width="wrap_content"
104 + android:layout_height="match_parent"
105 + android:layout_gravity="center"
106 + android:layout_weight="1"
107 + android:background="#1E90FF"
108 + android:gravity="center"
109 + android:text="4" />
110 +
111 + <TextView
112 + android:id="@+id/stageTextView5"
113 + android:layout_width="wrap_content"
114 + android:layout_height="match_parent"
115 + android:layout_gravity="center"
116 + android:layout_weight="1"
117 + android:gravity="center"
118 + android:text="5" />
119 +
37 </LinearLayout> 120 </LinearLayout>
38 121
39 <LinearLayout 122 <LinearLayout
...@@ -53,28 +136,49 @@ ...@@ -53,28 +136,49 @@
53 android:layout_height="wrap_content" 136 android:layout_height="wrap_content"
54 android:orientation="vertical"> 137 android:orientation="vertical">
55 138
56 - <TextView 139 + <RelativeLayout
57 - android:id="@+id/explainTextView"
58 android:layout_width="match_parent" 140 android:layout_width="match_parent"
59 - android:layout_height="wrap_content" 141 + android:layout_height="match_parent">
60 - android:layout_gravity="center" 142 +
61 - android:gravity="center" 143 + <TextView
62 - android:text="3. 주민등록상 거주지를 선택해 주세요." /> 144 + android:id="@+id/explainTextView"
145 + android:layout_width="wrap_content"
146 + android:layout_height="wrap_content"
147 + android:layout_centerInParent="true"
148 + android:layout_gravity="center"
149 + android:gravity="center"
150 + android:text="3. 자신의 주민등록상 거주지를 선택해주세요." />
151 +
152 + <Button
153 + android:id="@+id/questionButton"
154 + android:layout_width="30dp"
155 + android:layout_height="30dp"
156 + android:layout_gravity="center"
157 + android:layout_toRightOf="@id/explainTextView"
158 + android:backgroundTint="#1E90FF"
159 + android:gravity="center"
160 + android:text=" ? "
161 + android:textSize="8sp" />
162 + </RelativeLayout>
63 </LinearLayout> 163 </LinearLayout>
64 164
65 <LinearLayout 165 <LinearLayout
66 android:layout_width="match_parent" 166 android:layout_width="match_parent"
67 android:layout_height="50dp" 167 android:layout_height="50dp"
68 android:layout_weight="1" 168 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"> 169 android:orientation="vertical">
77 170
171 + </LinearLayout>
172 +
173 + <ScrollView
174 + android:layout_width="match_parent"
175 + android:layout_height="wrap_content">
176 +
177 + <LinearLayout
178 + android:layout_width="match_parent"
179 + android:layout_height="wrap_content"
180 + android:orientation="vertical">
181 +
78 <TextView 182 <TextView
79 android:id="@+id/doTextView" 183 android:id="@+id/doTextView"
80 android:layout_width="match_parent" 184 android:layout_width="match_parent"
...@@ -96,8 +200,8 @@ ...@@ -96,8 +200,8 @@
96 android:id="@+id/gooSpinner" 200 android:id="@+id/gooSpinner"
97 android:layout_width="fill_parent" 201 android:layout_width="fill_parent"
98 android:layout_height="wrap_content" /> 202 android:layout_height="wrap_content" />
99 - 203 + </LinearLayout>
100 - </LinearLayout> 204 + </ScrollView>
101 205
102 <LinearLayout 206 <LinearLayout
103 android:layout_width="match_parent" 207 android:layout_width="match_parent"
...@@ -117,12 +221,6 @@ ...@@ -117,12 +221,6 @@
117 android:layout_weight="1" 221 android:layout_weight="1"
118 android:text="이전 단계로" /> 222 android:text="이전 단계로" />
119 223
120 - <LinearLayout
121 - android:layout_width="10dp"
122 - android:layout_height="match_parent"
123 - android:layout_weight="1"
124 - android:orientation="vertical"></LinearLayout>
125 -
126 <Button 224 <Button
127 android:id="@+id/nextButton" 225 android:id="@+id/nextButton"
128 android:layout_width="10dp" 226 android:layout_width="10dp"
......
...@@ -4,13 +4,64 @@ ...@@ -4,13 +4,64 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 - tools:context=".InputProfilFirstSixActivity"> 7 + tools:context=".InputProfilFourthFiveActivity">
8 8
9 <LinearLayout 9 <LinearLayout
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 android:layout_height="match_parent" 11 android:layout_height="match_parent"
12 android:orientation="vertical"> 12 android:orientation="vertical">
13 13
14 + <androidx.appcompat.widget.Toolbar
15 + android:id="@+id/toolbar"
16 + android:layout_width="fill_parent"
17 + android:layout_height="wrap_content"
18 + android:layout_marginBottom="11dp"
19 + android:background="#FFF"
20 + android:elevation="5dp"
21 + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
22 + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
23 +
24 + <LinearLayout
25 + android:layout_width="match_parent"
26 + android:layout_height="match_parent"
27 + android:orientation="horizontal">
28 +
29 + <Button
30 + android:id="@+id/skipButton"
31 + android:layout_width="10dp"
32 + android:layout_height="match_parent"
33 + android:layout_weight="1.5"
34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
38 + <LinearLayout
39 + android:layout_width="10dp"
40 + android:layout_height="match_parent"
41 + android:orientation="horizontal"
42 + android:layout_weight="1"/>
43 + <ImageView
44 + android:layout_width="77dp"
45 + android:layout_height="44dp"
46 + android:layout_gravity="center"
47 + android:layout_weight="1"
48 + android:src="@drawable/toolbar_logo" />
49 + <LinearLayout
50 + android:layout_width="10dp"
51 + android:layout_height="match_parent"
52 + android:orientation="horizontal"
53 + android:layout_weight="1"/>
54 + <LinearLayout
55 + android:layout_width="10dp"
56 + android:layout_height="match_parent"
57 + android:orientation="horizontal"
58 + android:layout_weight="1.5"/>
59 +
60 + </LinearLayout>
61 +
62 +
63 + </androidx.appcompat.widget.Toolbar>
64 +
14 <LinearLayout 65 <LinearLayout
15 android:layout_width="match_parent" 66 android:layout_width="match_parent"
16 android:layout_height="50dp" 67 android:layout_height="50dp"
...@@ -20,20 +71,52 @@ ...@@ -20,20 +71,52 @@
20 <TextView 71 <TextView
21 android:id="@+id/stageTextView1" 72 android:id="@+id/stageTextView1"
22 android:layout_width="wrap_content" 73 android:layout_width="wrap_content"
23 - android:layout_height="wrap_content" 74 + android:layout_height="match_parent"
24 android:layout_gravity="center" 75 android:layout_gravity="center"
25 android:layout_weight="1" 76 android:layout_weight="1"
77 + android:background="#1E90FF"
26 android:gravity="center" 78 android:gravity="center"
27 - android:text="1단계" /> 79 + android:text="1" />
28 80
29 <TextView 81 <TextView
30 - android:id="@+id/neccesaryTextView" 82 + android:id="@+id/stageTextView2"
31 android:layout_width="wrap_content" 83 android:layout_width="wrap_content"
32 - android:layout_height="wrap_content" 84 + android:layout_height="match_parent"
85 + android:layout_gravity="center"
86 + android:layout_weight="1"
87 + android:background="#1E90FF"
88 + android:gravity="center"
89 + android:text="2" />
90 +
91 + <TextView
92 + android:id="@+id/stageTextView3"
93 + android:layout_width="wrap_content"
94 + android:layout_height="match_parent"
95 + android:layout_gravity="center"
96 + android:layout_weight="1"
97 + android:background="#1E90FF"
98 + android:gravity="center"
99 + android:text="3" />
100 +
101 + <TextView
102 + android:id="@+id/stageTextView4"
103 + android:layout_width="wrap_content"
104 + android:layout_height="match_parent"
33 android:layout_gravity="center" 105 android:layout_gravity="center"
34 android:layout_weight="1" 106 android:layout_weight="1"
107 + android:background="#1E90FF"
35 android:gravity="center" 108 android:gravity="center"
36 - android:text="필수항목" /> 109 + android:text="4" />
110 +
111 + <TextView
112 + android:id="@+id/stageTextView5"
113 + android:layout_width="wrap_content"
114 + android:layout_height="match_parent"
115 + android:layout_gravity="center"
116 + android:layout_weight="1"
117 + android:gravity="center"
118 + android:text="5" />
119 +
37 </LinearLayout> 120 </LinearLayout>
38 121
39 <LinearLayout 122 <LinearLayout
...@@ -53,47 +136,67 @@ ...@@ -53,47 +136,67 @@
53 android:layout_height="wrap_content" 136 android:layout_height="wrap_content"
54 android:orientation="vertical"> 137 android:orientation="vertical">
55 138
56 - <TextView 139 + <RelativeLayout
57 - android:id="@+id/explainTextView"
58 android:layout_width="match_parent" 140 android:layout_width="match_parent"
59 - android:layout_height="wrap_content" 141 + android:layout_height="match_parent">
60 - android:layout_gravity="center" 142 +
61 - android:gravity="center" 143 + <TextView
62 - android:text="5. 가구주 여부를 선택해 주세요" /> 144 + android:id="@+id/explainTextView"
145 + android:layout_width="match_parent"
146 + android:layout_height="wrap_content"
147 + android:layout_gravity="center"
148 + android:gravity="center"
149 + android:text="5. 가구주 여부를 선택해 주세요" />
150 + <Button
151 + android:id="@+id/questionButton"
152 + android:layout_width="30dp"
153 + android:layout_height="30dp"
154 + android:layout_gravity="center"
155 + android:layout_toRightOf="@id/explainTextView"
156 + android:backgroundTint="#1E90FF"
157 + android:gravity="center"
158 + android:text=" ? "
159 + android:textSize="8sp" />
160 + </RelativeLayout>
63 </LinearLayout> 161 </LinearLayout>
64 162
65 <LinearLayout 163 <LinearLayout
66 android:layout_width="match_parent" 164 android:layout_width="match_parent"
67 android:layout_height="50dp" 165 android:layout_height="50dp"
68 android:layout_weight="1" 166 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"> 167 android:orientation="vertical">
77 168
78 - <ToggleButton 169 + </LinearLayout>
79 - android:id="@+id/gagoojooButton" 170 +
80 - android:layout_width="match_parent" 171 + <ScrollView
81 - android:layout_height="wrap_content" 172 + android:layout_width="match_parent"
82 - android:background="@drawable/profil_selector" 173 + android:layout_height="wrap_content">
83 - android:text="가구주"
84 - android:textOff="가구주"
85 - android:textOn="가구주" />
86 174
87 - <ToggleButton 175 + <LinearLayout
88 - android:id="@+id/gagoowonButton"
89 android:layout_width="match_parent" 176 android:layout_width="match_parent"
90 android:layout_height="wrap_content" 177 android:layout_height="wrap_content"
91 - android:background="@drawable/profil_selector" 178 + android:orientation="vertical">
92 - android:text="가구원" 179 +
93 - android:textOff="가구원" 180 + <ToggleButton
94 - android:textOn="외국인" /> 181 + android:id="@+id/gagoojooButton"
95 - 182 + android:layout_width="match_parent"
96 - </LinearLayout> 183 + android:layout_height="wrap_content"
184 + android:background="@drawable/profil_selector"
185 + android:text="가구주"
186 + android:textOff="가구주"
187 + android:textOn="가구주" />
188 +
189 + <ToggleButton
190 + android:id="@+id/gagoowonButton"
191 + android:layout_width="match_parent"
192 + android:layout_height="wrap_content"
193 + android:background="@drawable/profil_selector"
194 + android:text="가구원"
195 + android:textOff="가구원"
196 + android:textOn="가구원" />
197 +
198 + </LinearLayout>
199 + </ScrollView>
97 200
98 <LinearLayout 201 <LinearLayout
99 android:layout_width="match_parent" 202 android:layout_width="match_parent"
...@@ -113,12 +216,6 @@ ...@@ -113,12 +216,6 @@
113 android:layout_weight="1" 216 android:layout_weight="1"
114 android:text="이전 단계로" /> 217 android:text="이전 단계로" />
115 218
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 219 <Button
123 android:id="@+id/nextButton" 220 android:id="@+id/nextButton"
124 android:layout_width="10dp" 221 android:layout_width="10dp"
......
...@@ -4,13 +4,64 @@ ...@@ -4,13 +4,64 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 - tools:context=".InputProfilFirstTwoActivity"> 7 + tools:context=".InputProfilFourthFiveActivity">
8 8
9 <LinearLayout 9 <LinearLayout
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 android:layout_height="match_parent" 11 android:layout_height="match_parent"
12 android:orientation="vertical"> 12 android:orientation="vertical">
13 13
14 + <androidx.appcompat.widget.Toolbar
15 + android:id="@+id/toolbar"
16 + android:layout_width="fill_parent"
17 + android:layout_height="wrap_content"
18 + android:layout_marginBottom="11dp"
19 + android:background="#FFF"
20 + android:elevation="5dp"
21 + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
22 + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
23 +
24 + <LinearLayout
25 + android:layout_width="match_parent"
26 + android:layout_height="match_parent"
27 + android:orientation="horizontal">
28 +
29 + <Button
30 + android:id="@+id/skipButton"
31 + android:layout_width="10dp"
32 + android:layout_height="match_parent"
33 + android:layout_weight="1.5"
34 + android:background="#FFFFFF"
35 + android:text="나가기"
36 + android:textColor="#29ABE2"
37 + android:textSize="16dp" />
38 + <LinearLayout
39 + android:layout_width="10dp"
40 + android:layout_height="match_parent"
41 + android:orientation="horizontal"
42 + android:layout_weight="1"/>
43 + <ImageView
44 + android:layout_width="77dp"
45 + android:layout_height="44dp"
46 + android:layout_gravity="center"
47 + android:layout_weight="1"
48 + android:src="@drawable/toolbar_logo" />
49 + <LinearLayout
50 + android:layout_width="10dp"
51 + android:layout_height="match_parent"
52 + android:orientation="horizontal"
53 + android:layout_weight="1"/>
54 + <LinearLayout
55 + android:layout_width="10dp"
56 + android:layout_height="match_parent"
57 + android:orientation="horizontal"
58 + android:layout_weight="1.5"/>
59 +
60 + </LinearLayout>
61 +
62 +
63 + </androidx.appcompat.widget.Toolbar>
64 +
14 <LinearLayout 65 <LinearLayout
15 android:layout_width="match_parent" 66 android:layout_width="match_parent"
16 android:layout_height="50dp" 67 android:layout_height="50dp"
...@@ -20,20 +71,52 @@ ...@@ -20,20 +71,52 @@
20 <TextView 71 <TextView
21 android:id="@+id/stageTextView1" 72 android:id="@+id/stageTextView1"
22 android:layout_width="wrap_content" 73 android:layout_width="wrap_content"
23 - android:layout_height="wrap_content" 74 + android:layout_height="match_parent"
24 android:layout_gravity="center" 75 android:layout_gravity="center"
25 android:layout_weight="1" 76 android:layout_weight="1"
77 + android:background="#1E90FF"
26 android:gravity="center" 78 android:gravity="center"
27 - android:text="1단계" /> 79 + android:text="1" />
28 80
29 <TextView 81 <TextView
30 - android:id="@+id/neccesaryTextView" 82 + android:id="@+id/stageTextView2"
31 android:layout_width="wrap_content" 83 android:layout_width="wrap_content"
32 - android:layout_height="wrap_content" 84 + android:layout_height="match_parent"
85 + android:layout_gravity="center"
86 + android:layout_weight="1"
87 + android:background="#1E90FF"
88 + android:gravity="center"
89 + android:text="2" />
90 +
91 + <TextView
92 + android:id="@+id/stageTextView3"
93 + android:layout_width="wrap_content"
94 + android:layout_height="match_parent"
95 + android:layout_gravity="center"
96 + android:layout_weight="1"
97 + android:background="#1E90FF"
98 + android:gravity="center"
99 + android:text="3" />
100 +
101 + <TextView
102 + android:id="@+id/stageTextView4"
103 + android:layout_width="wrap_content"
104 + android:layout_height="match_parent"
33 android:layout_gravity="center" 105 android:layout_gravity="center"
34 android:layout_weight="1" 106 android:layout_weight="1"
107 + android:background="#1E90FF"
35 android:gravity="center" 108 android:gravity="center"
36 - android:text="필수항목" /> 109 + android:text="4" />
110 +
111 + <TextView
112 + android:id="@+id/stageTextView5"
113 + android:layout_width="wrap_content"
114 + android:layout_height="match_parent"
115 + android:layout_gravity="center"
116 + android:layout_weight="1"
117 + android:gravity="center"
118 + android:text="5" />
119 +
37 </LinearLayout> 120 </LinearLayout>
38 121
39 <LinearLayout 122 <LinearLayout
...@@ -53,37 +136,60 @@ ...@@ -53,37 +136,60 @@
53 android:layout_height="wrap_content" 136 android:layout_height="wrap_content"
54 android:orientation="vertical"> 137 android:orientation="vertical">
55 138
56 - <TextView 139 + <RelativeLayout
57 - android:id="@+id/explainTextView"
58 android:layout_width="match_parent" 140 android:layout_width="match_parent"
59 - android:layout_height="wrap_content" 141 + android:layout_height="match_parent">
60 - android:layout_gravity="center" 142 +
61 - android:gravity="center" 143 + <TextView
62 - android:text="1. 생년월일을 입력해 주세요." /> 144 + android:id="@+id/explainTextView"
145 + android:layout_width="match_parent"
146 + android:layout_height="wrap_content"
147 + android:layout_gravity="center"
148 + android:gravity="center"
149 + android:text="1. 생년월일을 입력해 주세요." />
150 +
151 + <Button
152 + android:id="@+id/questionButton"
153 + android:layout_width="30dp"
154 + android:layout_height="30dp"
155 + android:layout_gravity="center"
156 + android:layout_toRightOf="@id/explainTextView"
157 + android:backgroundTint="#1E90FF"
158 + android:gravity="center"
159 + android:text=" ? "
160 + android:textSize="8sp" />
161 + </RelativeLayout>
63 </LinearLayout> 162 </LinearLayout>
64 163
65 <LinearLayout 164 <LinearLayout
66 android:layout_width="match_parent" 165 android:layout_width="match_parent"
67 android:layout_height="50dp" 166 android:layout_height="50dp"
68 android:layout_weight="1" 167 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"> 168 android:orientation="vertical">
77 169
78 - <EditText 170 + </LinearLayout>
79 - android:id="@+id/editText" 171 +
172 + <ScrollView
173 + android:layout_width="match_parent"
174 + android:layout_height="wrap_content">
175 +
176 + <LinearLayout
80 android:layout_width="match_parent" 177 android:layout_width="match_parent"
81 android:layout_height="wrap_content" 178 android:layout_height="wrap_content"
82 - android:layout_gravity="center" 179 + android:orientation="vertical" >
83 - android:ems="10" 180 +
84 - android:gravity="center" 181 + <EditText
85 - android:inputType="date" /> 182 + android:id="@+id/editText"
86 - </LinearLayout> 183 + android:layout_width="match_parent"
184 + android:layout_height="wrap_content"
185 + android:layout_gravity="center"
186 + android:ems="10"
187 + android:gravity="center"
188 + android:inputType="date" />
189 +
190 +
191 + </LinearLayout>
192 + </ScrollView>
87 193
88 <LinearLayout 194 <LinearLayout
89 android:layout_width="match_parent" 195 android:layout_width="match_parent"
...@@ -96,19 +202,12 @@ ...@@ -96,19 +202,12 @@
96 android:layout_height="wrap_content" 202 android:layout_height="wrap_content"
97 android:orientation="horizontal"> 203 android:orientation="horizontal">
98 204
99 - <LinearLayout 205 + <Button
100 - android:layout_width="10dp" 206 + android:id="@+id/previousButton"
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" 207 android:layout_width="10dp"
109 - android:layout_height="match_parent" 208 + android:layout_height="wrap_content"
110 android:layout_weight="1" 209 android:layout_weight="1"
111 - android:orientation="vertical"></LinearLayout> 210 + android:text="이전 단계로" />
112 211
113 <Button 212 <Button
114 android:id="@+id/nextButton" 213 android:id="@+id/nextButton"
......