장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
1235cc07 1 parent 25839cbc

profile design

Inline Side-by-side
Showing 7 changed files with 321 additions and 35 deletions
...@@ -178,6 +178,12 @@ class FavoritesActivity : AppCompatActivity() { ...@@ -178,6 +178,12 @@ class FavoritesActivity : AppCompatActivity() {
178 else 178 else
179 Toast.makeText(getBaseContext(), "\'뒤로\' 버튼을 한번 더 누르시면 종료됩니다.", Toast.LENGTH_SHORT).show() 179 Toast.makeText(getBaseContext(), "\'뒤로\' 버튼을 한번 더 누르시면 종료됩니다.", Toast.LENGTH_SHORT).show()
180 back_pressed = System.currentTimeMillis() 180 back_pressed = System.currentTimeMillis()
181 +
182 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
183 + val editor: SharedPreferences.Editor=prof.edit()
184 +
185 + editor.putBoolean("popupdone?",false)
186 + editor.commit()
181 } 187 }
182 188
183 189
......
...@@ -75,6 +75,12 @@ class InfoActivity : AppCompatActivity() { ...@@ -75,6 +75,12 @@ class InfoActivity : AppCompatActivity() {
75 else 75 else
76 Toast.makeText(getBaseContext(), "\'뒤로\' 버튼을 한번 더 누르시면 종료됩니다.", Toast.LENGTH_SHORT).show() 76 Toast.makeText(getBaseContext(), "\'뒤로\' 버튼을 한번 더 누르시면 종료됩니다.", Toast.LENGTH_SHORT).show()
77 back_pressed = System.currentTimeMillis() 77 back_pressed = System.currentTimeMillis()
78 +
79 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
80 + val editor: SharedPreferences.Editor=prof.edit()
81 +
82 + editor.putBoolean("popupdone?",false)
83 + editor.commit()
78 } 84 }
79 85
80 86
......
...@@ -223,6 +223,12 @@ class RecommendActivity : AppCompatActivity() { ...@@ -223,6 +223,12 @@ class RecommendActivity : AppCompatActivity() {
223 else 223 else
224 Toast.makeText(getBaseContext(), "\'뒤로\' 버튼을 한번 더 누르시면 종료됩니다.", Toast.LENGTH_SHORT).show() 224 Toast.makeText(getBaseContext(), "\'뒤로\' 버튼을 한번 더 누르시면 종료됩니다.", Toast.LENGTH_SHORT).show()
225 back_pressed = System.currentTimeMillis() 225 back_pressed = System.currentTimeMillis()
226 +
227 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
228 + val editor: SharedPreferences.Editor=prof.edit()
229 +
230 + editor.putBoolean("popupdone?",false)
231 + editor.commit()
226 } 232 }
227 233
228 private fun update_policy_view(policy_id: String, View_count: Int) { 234 private fun update_policy_view(policy_id: String, View_count: Int) {
......
...@@ -29,6 +29,36 @@ class SignInActivity : AppCompatActivity() { ...@@ -29,6 +29,36 @@ class SignInActivity : AppCompatActivity() {
29 super.onCreate(savedInstanceState) 29 super.onCreate(savedInstanceState)
30 setContentView(R.layout.activity_signin) 30 setContentView(R.layout.activity_signin)
31 31
32 + kyoyookButton.setOnClickListener {
33 + val intent = Intent(this, RecommendActivity::class.java)
34 + intent.putExtra("key","kyoyook")
35 + startActivity(intent)
36 + }
37 + koyongButton.setOnClickListener {
38 + val intent = Intent(this, RecommendActivity::class.java)
39 + intent.putExtra("key","koyong")
40 + startActivity(intent)
41 + }
42 + joogeoButton.setOnClickListener {
43 + val intent = Intent(this, RecommendActivity::class.java)
44 + intent.putExtra("key","joogeo")
45 + startActivity(intent)
46 + }
47 + geongangButton.setOnClickListener {
48 + val intent = Intent(this, RecommendActivity::class.java)
49 + intent.putExtra("key","geongang")
50 + startActivity(intent)
51 + }
52 + seominButton.setOnClickListener {
53 + val intent = Intent(this, RecommendActivity::class.java)
54 + intent.putExtra("key","seomin")
55 + startActivity(intent)
56 + }
57 + moonhwaButton.setOnClickListener {
58 + val intent = Intent(this, RecommendActivity::class.java)
59 + intent.putExtra("key","moonhwa")
60 + startActivity(intent)
61 + }
32 // 네비게이션 뷰 포커스 맞추는 코드 62 // 네비게이션 뷰 포커스 맞추는 코드
33 val bottomNavigationView: BottomNavigationView = findViewById(R.id.bottomNavigation) as BottomNavigationView 63 val bottomNavigationView: BottomNavigationView = findViewById(R.id.bottomNavigation) as BottomNavigationView
34 bottomNavigationView.selectedItemId = R.id.bottomHome 64 bottomNavigationView.selectedItemId = R.id.bottomHome
...@@ -45,26 +75,34 @@ class SignInActivity : AppCompatActivity() { ...@@ -45,26 +75,34 @@ class SignInActivity : AppCompatActivity() {
45 dialogView.findViewById<TextView>(R.id.dialogTitle).text="프로필을 입력해주세요!" 75 dialogView.findViewById<TextView>(R.id.dialogTitle).text="프로필을 입력해주세요!"
46 dialogView.findViewById<TextView>(R.id.dialogContent1).text="정확한 정책 추천을 얻으려면\n더 많은 프로필 정보가 필요해요!" 76 dialogView.findViewById<TextView>(R.id.dialogContent1).text="정확한 정책 추천을 얻으려면\n더 많은 프로필 정보가 필요해요!"
47 77
48 - builder.setView(dialogView) 78 + if(prof.getBoolean("popupdone?",false)==false){
49 - .setPositiveButton("지금 할게요 :)") { dialogInterface, i -> 79 + builder.setView(dialogView)
50 - //mainTv.text = dialogText.text.toString() 80 + .setPositiveButton("지금 할게요 :)") { dialogInterface, i ->
51 - //mainRb.rating = dialogRatingBar.rating 81 + //mainTv.text = dialogText.text.toString()
52 - /* 확인일 때 main의 View의 값에 dialog View에 있는 값을 적용 */ 82 + //mainRb.rating = dialogRatingBar.rating
83 + /* 확인일 때 main의 View의 값에 dialog View에 있는 값을 적용 */
84 +
85 + val intent = Intent(this, InputProfilFirstOneActivity::class.java)
86 + startActivity(intent)
87 + }
88 + .setNegativeButton("다음에 하기") { dialogInterface, i ->
89 + editor.clear()
90 +
91 + }
92 + .show()
93 + //여기서부터 점찍고 설정
94 + .questionImage.visibility=GONE
53 95
54 - val intent = Intent(this, InputProfilFirstOneActivity::class.java) 96 + editor.putBoolean("popupdone?",true)
55 - startActivity(intent) 97 + editor.commit()
56 - } 98 + }else{
57 - .setNegativeButton("다음에 하기") { dialogInterface, i ->
58 - editor.clear()
59 99
60 - } 100 + }
61 - .show()
62 - //여기서부터 점찍고 설정
63 - .questionImage.visibility=GONE
64 101
65 102
66 - //팝업창 끝
67 103
104 + //팝업창 끝
105 +/*
68 val policyFieldList = ArrayList<PolicyFieldItem>() 106 val policyFieldList = ArrayList<PolicyFieldItem>()
69 107
70 policyFieldList.add( 108 policyFieldList.add(
...@@ -107,7 +145,7 @@ class SignInActivity : AppCompatActivity() { ...@@ -107,7 +145,7 @@ class SignInActivity : AppCompatActivity() {
107 145
108 val adapter = PolicyFieldAdapter(policyFieldList) 146 val adapter = PolicyFieldAdapter(policyFieldList)
109 policyFieldRecyclerView.adapter = adapter 147 policyFieldRecyclerView.adapter = adapter
110 - 148 +*/
111 viewpager = findViewById(R.id.welcomeViewPager) as ViewPager 149 viewpager = findViewById(R.id.welcomeViewPager) as ViewPager
112 val viewpageradapter = ViewPagerAdapter(this) 150 val viewpageradapter = ViewPagerAdapter(this)
113 viewpager.adapter = viewpageradapter 151 viewpager.adapter = viewpageradapter
...@@ -145,6 +183,12 @@ class SignInActivity : AppCompatActivity() { ...@@ -145,6 +183,12 @@ class SignInActivity : AppCompatActivity() {
145 else 183 else
146 Toast.makeText(getBaseContext(), "\'뒤로\' 버튼을 한번 더 누르시면 종료됩니다.", Toast.LENGTH_SHORT).show() 184 Toast.makeText(getBaseContext(), "\'뒤로\' 버튼을 한번 더 누르시면 종료됩니다.", Toast.LENGTH_SHORT).show()
147 back_pressed = System.currentTimeMillis() 185 back_pressed = System.currentTimeMillis()
186 +
187 + val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
188 + val editor: SharedPreferences.Editor=prof.edit()
189 +
190 + editor.putBoolean("popupdone?",false)
191 + editor.commit()
148 } 192 }
149 193
150 // 4.툴바 메뉴 버튼이 클릭 됐을 때 콜백 194 // 4.툴바 메뉴 버튼이 클릭 됐을 때 콜백
......
...@@ -12,6 +12,11 @@ ...@@ -12,6 +12,11 @@
12 android:color="#dcdcdc" /> 12 android:color="#dcdcdc" />
13 13
14 <solid android:color="#FFF" /> 14 <solid android:color="#FFF" />
15 + <corners
16 + android:bottomRightRadius="10dp"
17 + android:bottomLeftRadius="10dp"
18 + android:topLeftRadius="10dp"
19 + android:topRightRadius="10dp"/>
15 </shape> 20 </shape>
16 </item> 21 </item>
17 22
......
...@@ -22,26 +22,38 @@ ...@@ -22,26 +22,38 @@
22 <LinearLayout 22 <LinearLayout
23 android:layout_width="match_parent" 23 android:layout_width="match_parent"
24 android:layout_height="wrap_content" 24 android:layout_height="wrap_content"
25 + android:layout_weight="3"
25 android:orientation="vertical"> 26 android:orientation="vertical">
26 27
27 <ImageView 28 <ImageView
28 android:id="@+id/imageView" 29 android:id="@+id/imageView"
29 - android:layout_width="wrap_content" 30 + android:layout_width="match_parent"
30 - android:layout_height="wrap_content" 31 + android:layout_height="match_parent"
31 android:layout_gravity="center" 32 android:layout_gravity="center"
32 - tools:srcCompat="@tools:sample/avatars" 33 + android:layout_marginLeft="50dp"
33 - android:background="@drawable/inputlogo"/> 34 + android:layout_marginRight="50dp"
35 + android:background="@drawable/inputlogo" />
34 </LinearLayout> 36 </LinearLayout>
35 37
36 <LinearLayout 38 <LinearLayout
37 android:layout_width="match_parent" 39 android:layout_width="match_parent"
38 android:layout_height="30dp" 40 android:layout_height="30dp"
39 - android:layout_weight="2" 41 + android:layout_weight="1"
40 - android:orientation="vertical"></LinearLayout> 42 + android:gravity="center"
43 + android:orientation="vertical">
44 +
45 + <TextView
46 + android:id="@+id/textView11"
47 + android:layout_width="wrap_content"
48 + android:layout_height="wrap_content"
49 + android:gravity="center"
50 + android:text="WELLO는 프로필을 기반으로 동작해요\n더 정확한 맞춤형 결과를 위해 프로필을 입력해주세요!" />
51 + </LinearLayout>
41 52
42 <LinearLayout 53 <LinearLayout
43 android:layout_width="match_parent" 54 android:layout_width="match_parent"
44 android:layout_height="wrap_content" 55 android:layout_height="wrap_content"
56 + android:layout_weight="1"
45 android:orientation="vertical"> 57 android:orientation="vertical">
46 58
47 <Button 59 <Button
...@@ -56,10 +68,5 @@ ...@@ -56,10 +68,5 @@
56 android:textSize="20dp" /> 68 android:textSize="20dp" />
57 </LinearLayout> 69 </LinearLayout>
58 70
59 - <LinearLayout
60 - android:layout_width="match_parent"
61 - android:layout_height="30dp"
62 - android:layout_weight="3"
63 - android:orientation="vertical"></LinearLayout>
64 </LinearLayout> 71 </LinearLayout>
65 </androidx.constraintlayout.widget.ConstraintLayout> 72 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -34,17 +34,25 @@ ...@@ -34,17 +34,25 @@
34 android:src="@drawable/toolbar_logo" /> 34 android:src="@drawable/toolbar_logo" />
35 </androidx.appcompat.widget.Toolbar> 35 </androidx.appcompat.widget.Toolbar>
36 36
37 - <androidx.viewpager.widget.ViewPager 37 + <LinearLayout
38 - android:id="@+id/welcomeViewPager"
39 android:layout_width="match_parent" 38 android:layout_width="match_parent"
40 - android:layout_height="262dp" 39 + android:layout_height="wrap_content"
41 - android:layout_gravity="center" 40 + android:layout_gravity="top"
42 - app:layout_constraintEnd_toEndOf="parent" 41 + android:layout_weight="1"
43 - app:layout_constraintStart_toStartOf="parent" 42 + android:gravity="top"
44 - app:layout_constraintTop_toTopOf="parent"> 43 + android:orientation="horizontal">
44 +
45 + <androidx.viewpager.widget.ViewPager
46 + android:id="@+id/welcomeViewPager"
47 + android:layout_width="match_parent"
48 + android:layout_height="262dp"
49 + android:layout_gravity="top"
50 + android:layout_weight="1">
45 51
46 - </androidx.viewpager.widget.ViewPager> 52 + </androidx.viewpager.widget.ViewPager>
53 + </LinearLayout>
47 54
55 + <!--
48 <LinearLayout 56 <LinearLayout
49 android:layout_width="match_parent" 57 android:layout_width="match_parent"
50 android:layout_height="wrap_content" 58 android:layout_height="wrap_content"
...@@ -76,6 +84,210 @@ ...@@ -76,6 +84,210 @@
76 app:spanCount="3" 84 app:spanCount="3"
77 tools:listitem="@layout/item_policyfield" /> 85 tools:listitem="@layout/item_policyfield" />
78 </LinearLayout> 86 </LinearLayout>
87 +-->
88 +
89 + <LinearLayout
90 + android:layout_width="match_parent"
91 + android:layout_height="wrap_content"
92 + android:layout_margin="15dp"
93 + android:layout_weight="1"
94 + android:background="@drawable/edgemaking"
95 + android:gravity="center"
96 + android:orientation="vertical">
97 +
98 + <LinearLayout
99 + android:layout_width="match_parent"
100 + android:layout_height="wrap_content"
101 + android:layout_marginTop="15dp"
102 + android:layout_marginBottom="15dp"
103 + android:gravity="center"
104 + android:orientation="horizontal">
105 +
106 + <LinearLayout
107 + android:layout_width="wrap_content"
108 + android:layout_height="wrap_content"
109 + android:layout_gravity="center"
110 + android:layout_marginLeft="10dp"
111 + android:layout_marginRight="10dp"
112 + android:layout_weight="1"
113 + android:gravity="center"
114 + android:orientation="vertical">
115 +
116 + <Button
117 + android:id="@+id/kyoyookButton"
118 + android:layout_width="80dp"
119 + android:layout_height="80dp"
120 + android:layout_gravity="center"
121 + android:background="@drawable/kyoyook_icon"
122 + android:gravity="center" />
123 +
124 + <TextView
125 + android:id="@+id/kyoyooktextView"
126 + android:layout_width="match_parent"
127 + android:layout_height="wrap_content"
128 + android:layout_gravity="center"
129 + android:gravity="center"
130 + android:text="교육"
131 + android:textColor="#4A4A4A"
132 + android:textSize="13dp" />
133 + </LinearLayout>
134 +
135 + <LinearLayout
136 + android:layout_width="wrap_content"
137 + android:layout_height="wrap_content"
138 + android:layout_gravity="center"
139 + android:layout_marginLeft="10dp"
140 + android:layout_marginRight="10dp"
141 + android:layout_weight="1"
142 + android:gravity="center"
143 + android:orientation="vertical">
144 +
145 + <Button
146 + android:id="@+id/koyongButton"
147 + android:layout_width="80dp"
148 + android:layout_height="80dp"
149 + android:layout_gravity="center"
150 + android:background="@drawable/koyong_icon"
151 + android:gravity="center" />
152 +
153 + <TextView
154 + android:id="@+id/koyongtextView"
155 + android:layout_width="match_parent"
156 + android:layout_height="wrap_content"
157 + android:layout_gravity="center"
158 + android:gravity="center"
159 + android:text="고용"
160 + android:textColor="#4A4A4A"
161 + android:textSize="13dp" />
162 + </LinearLayout>
163 +
164 + <LinearLayout
165 + android:layout_width="wrap_content"
166 + android:layout_height="wrap_content"
167 + android:layout_gravity="center"
168 + android:layout_marginLeft="10dp"
169 + android:layout_marginRight="10dp"
170 + android:layout_weight="1"
171 + android:gravity="center"
172 + android:orientation="vertical">
173 +
174 + <Button
175 + android:id="@+id/joogeoButton"
176 + android:layout_width="80dp"
177 + android:layout_height="80dp"
178 + android:layout_gravity="center"
179 + android:background="@drawable/joogeo_icon"
180 + android:gravity="center" />
181 +
182 + <TextView
183 + android:id="@+id/joogeotextView"
184 + android:layout_width="match_parent"
185 + android:layout_height="wrap_content"
186 + android:layout_gravity="center"
187 + android:gravity="center"
188 + android:text="주거"
189 + android:textColor="#4A4A4A"
190 + android:textSize="13dp" />
191 + </LinearLayout>
192 +
193 + </LinearLayout>
194 +
195 + <LinearLayout
196 + android:layout_width="match_parent"
197 + android:layout_height="wrap_content"
198 + android:layout_marginTop="15dp"
199 + android:layout_marginBottom="15dp"
200 + android:gravity="center"
201 + android:orientation="horizontal">
202 +
203 + <LinearLayout
204 + android:layout_width="wrap_content"
205 + android:layout_height="wrap_content"
206 + android:layout_gravity="center"
207 + android:layout_marginLeft="10dp"
208 + android:layout_marginRight="10dp"
209 + android:layout_weight="1"
210 + android:gravity="center"
211 + android:orientation="vertical">
212 +
213 + <Button
214 + android:id="@+id/geongangButton"
215 + android:layout_width="80dp"
216 + android:layout_height="80dp"
217 + android:layout_gravity="center"
218 + android:background="@drawable/health_icon"
219 + android:gravity="center" />
220 +
221 + <TextView
222 + android:id="@+id/geongangtextView"
223 + android:layout_width="match_parent"
224 + android:layout_height="wrap_content"
225 + android:layout_gravity="center"
226 + android:gravity="center"
227 + android:text="건강"
228 + android:textColor="#4A4A4A"
229 + android:textSize="13dp" />
230 + </LinearLayout>
231 +
232 + <LinearLayout
233 + android:layout_width="wrap_content"
234 + android:layout_height="wrap_content"
235 + android:layout_gravity="center"
236 + android:layout_marginLeft="10dp"
237 + android:layout_marginRight="10dp"
238 + android:layout_weight="1"
239 + android:gravity="center"
240 + android:orientation="vertical">
241 +
242 + <Button
243 + android:id="@+id/seominButton"
244 + android:layout_width="80dp"
245 + android:layout_height="80dp"
246 + android:layout_gravity="center"
247 + android:background="@drawable/seomin_icon"
248 + android:gravity="center" />
249 +
250 + <TextView
251 + android:id="@+id/seomintextView"
252 + android:layout_width="match_parent"
253 + android:layout_height="wrap_content"
254 + android:layout_gravity="center"
255 + android:gravity="center"
256 + android:text="서민금융"
257 + android:textColor="#4A4A4A"
258 + android:textSize="13dp" />
259 + </LinearLayout>
260 +
261 + <LinearLayout
262 + android:layout_width="wrap_content"
263 + android:layout_height="wrap_content"
264 + android:layout_gravity="center"
265 + android:layout_marginLeft="10dp"
266 + android:layout_marginRight="10dp"
267 + android:layout_weight="1"
268 + android:gravity="center"
269 + android:orientation="vertical">
270 +
271 + <Button
272 + android:id="@+id/moonhwaButton"
273 + android:layout_width="80dp"
274 + android:layout_height="80dp"
275 + android:layout_gravity="center"
276 + android:background="@drawable/moonhwa_icon"
277 + android:gravity="center" />
278 +
279 + <TextView
280 + android:id="@+id/moonhwatextView"
281 + android:layout_width="match_parent"
282 + android:layout_height="wrap_content"
283 + android:layout_gravity="center"
284 + android:gravity="center"
285 + android:text="문화"
286 + android:textColor="#4A4A4A"
287 + android:textSize="13dp" />
288 + </LinearLayout>
289 + </LinearLayout>
290 + </LinearLayout>
79 291
80 <com.google.android.material.bottomnavigation.BottomNavigationView 292 <com.google.android.material.bottomnavigation.BottomNavigationView
81 android:id="@+id/bottomNavigation" 293 android:id="@+id/bottomNavigation"
......