장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
3e871c38 1 parent 4c76b2c3

subsub

Inline Side-by-side
Showing 25 changed files with 208 additions and 55 deletions
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
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=".ChildAdapter"></activity> 12 + <activity android:name=".SignUpCompleteActivity"></activity>
13 + <activity android:name=".ChildAdapter" />
13 <activity android:name=".InputProfilFifthFourActivity" /> 14 <activity android:name=".InputProfilFifthFourActivity" />
14 <activity android:name=".InputProfilFifthThreeActivity" /> 15 <activity android:name=".InputProfilFifthThreeActivity" />
15 <activity android:name=".InputProfilFifthTwoActivity" /> 16 <activity android:name=".InputProfilFifthTwoActivity" />
...@@ -32,19 +33,19 @@ ...@@ -32,19 +33,19 @@
32 <activity android:name=".InputProfilFirstThreeActivity" /> 33 <activity android:name=".InputProfilFirstThreeActivity" />
33 <activity android:name=".InputProfilFirstTwoActivity" /> 34 <activity android:name=".InputProfilFirstTwoActivity" />
34 <activity android:name=".InputProfilFirstOneActivity" /> 35 <activity android:name=".InputProfilFirstOneActivity" />
35 - <activity android:name=".AccountSettingActivity"/> 36 + <activity android:name=".AccountSettingActivity" />
36 - <activity android:name=".PrivacyPolicyActivity"/> 37 + <activity android:name=".PrivacyPolicyActivity" />
37 - <activity android:name=".TermsOfUserActivity"/> 38 + <activity android:name=".TermsOfUserActivity" />
38 - <activity android:name=".NoticeActivity"/> 39 + <activity android:name=".NoticeActivity" />
39 - <activity android:name=".QuestionsActivity"/> 40 + <activity android:name=".QuestionsActivity" />
40 <activity android:name=".WelcomeActivity" /> 41 <activity android:name=".WelcomeActivity" />
41 - <activity android:name=".PushInfoActivity"/> 42 + <activity android:name=".PushInfoActivity" />
42 <activity android:name=".SettingActivity" /> 43 <activity android:name=".SettingActivity" />
43 - <activity android:name=".TermsDetailActivity"/> 44 + <activity android:name=".TermsDetailActivity" />
44 <activity android:name=".DetailActivity" /> 45 <activity android:name=".DetailActivity" />
45 <activity android:name=".InfoActivity" /> 46 <activity android:name=".InfoActivity" />
46 <activity android:name=".FavoritesActivity" /> 47 <activity android:name=".FavoritesActivity" />
47 - <activity android:name=".SettingsInForm"/> 48 + <activity android:name=".SettingsInForm" />
48 <activity android:name=".RecommendActivity" /> 49 <activity android:name=".RecommendActivity" />
49 <activity android:name=".SignInActivity" /> 50 <activity android:name=".SignInActivity" />
50 <activity android:name=".SignUpActivity" /> 51 <activity android:name=".SignUpActivity" />
......
...@@ -34,7 +34,7 @@ class InputProfilFourthOneActivity : AppCompatActivity() { ...@@ -34,7 +34,7 @@ class InputProfilFourthOneActivity : AppCompatActivity() {
34 34
35 questionButton.setOnClickListener { 35 questionButton.setOnClickListener {
36 val builder = AlertDialog.Builder(this) 36 val builder = AlertDialog.Builder(this)
37 - val dialogView = layoutInflater.inflate(R.layout.family_member_dialog, null) 37 + val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
38 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt) 38 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
39 //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb) 39 //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb)
40 dialogView.findViewById<TextView>(R.id.dialogTitle).text="가족구성원이란?" 40 dialogView.findViewById<TextView>(R.id.dialogTitle).text="가족구성원이란?"
......
...@@ -5,14 +5,9 @@ import android.content.Intent ...@@ -5,14 +5,9 @@ import android.content.Intent
5 import android.content.SharedPreferences 5 import android.content.SharedPreferences
6 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
7 import android.os.Bundle 7 import android.os.Bundle
8 -import android.widget.Button
9 -import android.widget.EditText
10 -import android.widget.RatingBar
11 import android.widget.TextView 8 import android.widget.TextView
12 import androidx.appcompat.app.AlertDialog 9 import androidx.appcompat.app.AlertDialog
13 import kotlinx.android.synthetic.main.activity_input_profil_second_one.* 10 import kotlinx.android.synthetic.main.activity_input_profil_second_one.*
14 -import kotlinx.android.synthetic.main.family_member_dialog.*
15 -import kotlinx.android.synthetic.main.family_member_dialog.view.*
16 11
17 class InputProfilSecondOneActivity : AppCompatActivity() { 12 class InputProfilSecondOneActivity : AppCompatActivity() {
18 13
...@@ -30,7 +25,7 @@ class InputProfilSecondOneActivity : AppCompatActivity() { ...@@ -30,7 +25,7 @@ class InputProfilSecondOneActivity : AppCompatActivity() {
30 25
31 questionButton.setOnClickListener { 26 questionButton.setOnClickListener {
32 val builder = AlertDialog.Builder(this) 27 val builder = AlertDialog.Builder(this)
33 - val dialogView = layoutInflater.inflate(R.layout.family_member_dialog, null) 28 + val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
34 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt) 29 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
35 //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb) 30 //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb)
36 dialogView.findViewById<TextView>(R.id.dialogTitle).text="가족구성원이란?" 31 dialogView.findViewById<TextView>(R.id.dialogTitle).text="가족구성원이란?"
......
...@@ -26,12 +26,6 @@ class MainActivity : AppCompatActivity() { ...@@ -26,12 +26,6 @@ class MainActivity : AppCompatActivity() {
26 26
27 override fun onCreate(savedInstanceState: Bundle?) { 27 override fun onCreate(savedInstanceState: Bundle?) {
28 super.onCreate(savedInstanceState) 28 super.onCreate(savedInstanceState)
29 -
30 -
31 -
32 - //onboarding start
33 -
34 - //onboarding end
35 setContentView(R.layout.activity_main) 29 setContentView(R.layout.activity_main)
36 30
37 31
...@@ -40,6 +34,13 @@ class MainActivity : AppCompatActivity() { ...@@ -40,6 +34,13 @@ class MainActivity : AppCompatActivity() {
40 34
41 } 35 }
42 36
37 + textview2.setOnClickListener{
38 +
39 + }
40 + textview3.setOnClickListener{
41 +
42 + }
43 +
43 emailSignupBtn.setOnClickListener { 44 emailSignupBtn.setOnClickListener {
44 var intent = Intent(this, SignUpActivity::class.java) 45 var intent = Intent(this, SignUpActivity::class.java)
45 startActivity(intent) 46 startActivity(intent)
......
...@@ -4,8 +4,10 @@ import android.content.Intent ...@@ -4,8 +4,10 @@ import android.content.Intent
4 import android.os.Bundle 4 import android.os.Bundle
5 import android.view.Menu 5 import android.view.Menu
6 import android.view.MenuItem 6 import android.view.MenuItem
7 +import android.widget.TextView
7 import android.widget.Toast 8 import android.widget.Toast
8 import androidx.appcompat.app.ActionBar 9 import androidx.appcompat.app.ActionBar
10 +import androidx.appcompat.app.AlertDialog
9 import androidx.appcompat.app.AppCompatActivity 11 import androidx.appcompat.app.AppCompatActivity
10 import androidx.core.content.ContextCompat 12 import androidx.core.content.ContextCompat
11 import androidx.viewpager.widget.ViewPager 13 import androidx.viewpager.widget.ViewPager
...@@ -23,6 +25,27 @@ class SignInActivity : AppCompatActivity() { ...@@ -23,6 +25,27 @@ class SignInActivity : AppCompatActivity() {
23 super.onCreate(savedInstanceState) 25 super.onCreate(savedInstanceState)
24 setContentView(R.layout.activity_signin) 26 setContentView(R.layout.activity_signin)
25 27
28 + val builder = AlertDialog.Builder(this)
29 + val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
30 + //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
31 + //val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb)
32 + dialogView.findViewById<TextView>(R.id.dialogTitle).text="프로필을 입력해주세요!"
33 + dialogView.findViewById<TextView>(R.id.dialogContent).text="정확한 정책 추천을 얻으려면 더 많은 프로필 정보가 필요해요!"
34 +
35 + builder.setView(dialogView)
36 + .setPositiveButton("다음에 하기") { dialogInterface, i ->
37 + //mainTv.text = dialogText.text.toString()
38 + //mainRb.rating = dialogRatingBar.rating
39 + /* 확인일 때 main의 View의 값에 dialog View에 있는 값을 적용 */
40 + }
41 + .setNegativeButton("지금할게요 :)") { dialogInterface, i ->
42 + /* 취소일 때 아무 액션이 없으므로 빈칸 */
43 + val intent = Intent(this, InputProfilFirstOneActivity::class.java)
44 + startActivity(intent)
45 + }
46 + .show()
47 +
48 +
26 val policyFieldList = ArrayList<PolicyFieldItem>() 49 val policyFieldList = ArrayList<PolicyFieldItem>()
27 50
28 policyFieldList.add( 51 policyFieldList.add(
......
...@@ -81,7 +81,7 @@ class SignUpActivity : AppCompatActivity() { ...@@ -81,7 +81,7 @@ class SignUpActivity : AppCompatActivity() {
81 cnt ++ 81 cnt ++
82 82
83 if(user!=null){ 83 if(user!=null){
84 - var intent = Intent(this, InputProfilFirstOneActivity::class.java) 84 + var intent = Intent(this, SignUpCompleteActivity::class.java)
85 startActivity(intent) 85 startActivity(intent)
86 } 86 }
87 } else { 87 } else {
......
1 +package com.example.vip
2 +
3 +import android.content.Intent
4 +import androidx.appcompat.app.AppCompatActivity
5 +import android.os.Bundle
6 +import kotlinx.android.synthetic.main.activity_sign_up_complete.*
7 +
8 +class SignUpCompleteActivity : AppCompatActivity() {
9 +
10 + override fun onCreate(savedInstanceState: Bundle?) {
11 + super.onCreate(savedInstanceState)
12 + setContentView(R.layout.activity_sign_up_complete)
13 +
14 + goToLoginButton.setOnClickListener {
15 + var intent = Intent(this, MainActivity::class.java)
16 + startActivity(intent)
17 + }
18 + }
19 +}
...@@ -12,11 +12,11 @@ class WelcomeViewPagerAdapter(private val context : Context) : PagerAdapter() { ...@@ -12,11 +12,11 @@ class WelcomeViewPagerAdapter(private val context : Context) : PagerAdapter() {
12 12
13 private var layoutInflater : LayoutInflater? = null 13 private var layoutInflater : LayoutInflater? = null
14 val Image = arrayOf( 14 val Image = arrayOf(
15 - R.drawable.hwajilgooji1, 15 + R.drawable.onboarding_1,
16 - R.drawable.hwajilgooji2, 16 + R.drawable.onboarding_2,
17 - R.drawable.hwajilgooji3, 17 + R.drawable.onboarding_3,
18 - R.drawable.hwajilgooji3, 18 + R.drawable.onboarding_4,
19 - R.drawable.hwajilgooji3 19 + R.drawable.onboarding_5
20 ) 20 )
21 21
22 22
......
...@@ -91,9 +91,9 @@ ...@@ -91,9 +91,9 @@
91 android:layout_marginTop="8dp" 91 android:layout_marginTop="8dp"
92 android:layout_marginEnd="16dp" 92 android:layout_marginEnd="16dp"
93 android:layout_marginRight="16dp" 93 android:layout_marginRight="16dp"
94 - android:background="@drawable/button_x" 94 + android:background="@drawable/button_o"
95 android:text="로그인" 95 android:text="로그인"
96 - android:textColor="#DDDDDD" /> 96 + android:textColor="#FFFFFF" />
97 97
98 </LinearLayout> 98 </LinearLayout>
99 99
...@@ -104,6 +104,58 @@ ...@@ -104,6 +104,58 @@
104 android:gravity="bottom" 104 android:gravity="bottom"
105 android:orientation="vertical"> 105 android:orientation="vertical">
106 106
107 + <LinearLayout
108 + android:layout_width="wrap_content"
109 + android:layout_height="wrap_content"
110 + android:layout_gravity="center"
111 + android:layout_marginBottom="10dp"
112 + android:gravity="left"
113 + android:orientation="horizontal"
114 + android:padding="3dp">
115 +
116 + <TextView
117 + android:id="@+id/textview1"
118 + android:layout_width="wrap_content"
119 + android:layout_height="wrap_content"
120 + android:layout_weight="1"
121 + android:gravity="right"
122 + android:text="*회원가입을 진행하실 경우, "
123 + android:textColor="#757575"
124 + android:textSize="7dp" />
125 +
126 + <TextView
127 + android:id="@+id/textview2"
128 + android:layout_width="wrap_content"
129 + android:layout_height="wrap_content"
130 + android:layout_weight="1"
131 + android:gravity="right"
132 + android:text="서비스 이용약관, "
133 + android:textColor="#757575"
134 + android:textSize="7dp" />
135 +
136 + <TextView
137 + android:id="@+id/textview3"
138 + android:layout_width="wrap_content"
139 + android:layout_height="wrap_content"
140 + android:layout_weight="1"
141 + android:gravity="right"
142 + android:text="개인 정보 취급 방침"
143 + android:textColor="#757575"
144 + android:textSize="7dp" />
145 +
146 + <TextView
147 + android:id="@+id/textview4"
148 + android:layout_width="wrap_content"
149 + android:layout_height="wrap_content"
150 + android:layout_weight="1"
151 + android:gravity="right"
152 + android:text="에 동의하시게 됩니다."
153 + android:textColor="#757575"
154 + android:textSize="7dp" />
155 +
156 +
157 + </LinearLayout>
158 +
107 <Button 159 <Button
108 android:id="@+id/emailSignupBtn" 160 android:id="@+id/emailSignupBtn"
109 android:layout_width="match_parent" 161 android:layout_width="match_parent"
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<LinearLayout 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 + android:orientation="vertical"
8 + tools:context=".SignUpCompleteActivity">
9 +
10 + <LinearLayout
11 + android:layout_width="match_parent"
12 + android:layout_height="wrap_content"
13 + android:layout_weight="1"
14 + android:orientation="horizontal"></LinearLayout>
15 +
16 + <ImageView
17 + android:id="@+id/logoImageView"
18 + android:layout_width="wrap_content"
19 + android:layout_height="wrap_content"
20 + android:layout_gravity="center"
21 + android:layout_margin="10dp"
22 + android:src="@drawable/final_logo"
23 + tools:srcCompat="@tools:sample/avatars" />
24 +
25 + <ImageView
26 + android:id="@+id/characterImageView"
27 + android:layout_width="wrap_content"
28 + android:layout_height="wrap_content"
29 + android:layout_gravity="center"
30 + android:layout_margin="10dp"
31 + android:src="@drawable/character_righthandsup"
32 + tools:srcCompat="@tools:sample/avatars" />
33 +
34 + <TextView
35 + android:id="@+id/textView1"
36 + android:layout_width="match_parent"
37 + android:layout_height="wrap_content"
38 + android:layout_margin="10dp"
39 + android:gravity="center"
40 + android:text="가입이 완료되었습니다 :)" />
41 +
42 + <TextView
43 + android:id="@+id/textView2"
44 + android:layout_width="match_parent"
45 + android:layout_height="wrap_content"
46 + android:layout_margin="10dp"
47 + android:gravity="center"
48 + android:text="wello의 가족이 된 걸 환영해요!" />
49 +
50 + <TextView
51 + android:id="@+id/textView3"
52 + android:layout_width="match_parent"
53 + android:layout_height="wrap_content"
54 + android:layout_margin="10dp"
55 + android:gravity="center"
56 + android:text="당신이 필요한 정책을 추천해 드릴게요." />
57 +
58 + <LinearLayout
59 + android:layout_width="match_parent"
60 + android:layout_height="wrap_content"
61 + android:layout_weight="1"
62 + android:orientation="horizontal"></LinearLayout>
63 +
64 + <LinearLayout
65 + android:layout_width="match_parent"
66 + android:layout_height="wrap_content"
67 + android:orientation="horizontal">
68 +
69 + <Button
70 + android:id="@+id/goToLoginButton"
71 + android:layout_width="match_parent"
72 + android:layout_height="70dp"
73 + android:layout_gravity="bottom"
74 + android:background="#FF29ABE2"
75 + android:text="로그인 하기"
76 + android:textColor="@android:color/white"
77 + android:textSize="16dp" />
78 + </LinearLayout>
79 +
80 +</LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
51 android:layout_marginStart="16dp" 51 android:layout_marginStart="16dp"
52 android:layout_marginEnd="16dp" 52 android:layout_marginEnd="16dp"
53 android:ems="10" 53 android:ems="10"
54 - android:gravity="center"
55 android:hint="Email" 54 android:hint="Email"
56 android:inputType="textEmailAddress" /> 55 android:inputType="textEmailAddress" />
57 56
...@@ -63,7 +62,6 @@ ...@@ -63,7 +62,6 @@
63 android:layout_marginStart="16dp" 62 android:layout_marginStart="16dp"
64 android:layout_marginEnd="16dp" 63 android:layout_marginEnd="16dp"
65 android:ems="10" 64 android:ems="10"
66 - android:gravity="center"
67 android:hint="Password" 65 android:hint="Password"
68 android:inputType="textPassword" /> 66 android:inputType="textPassword" />
69 67
...@@ -74,7 +72,7 @@ ...@@ -74,7 +72,7 @@
74 android:layout_gravity="center" 72 android:layout_gravity="center"
75 android:layout_marginStart="16dp" 73 android:layout_marginStart="16dp"
76 android:layout_marginEnd="16dp" 74 android:layout_marginEnd="16dp"
77 - android:background="@color/colorPrimary" 75 + android:background="@drawable/button_o"
78 android:gravity="center" 76 android:gravity="center"
79 android:text="회원가입" 77 android:text="회원가입"
80 android:textColor="@color/common_google_signin_btn_text_dark_default" /> 78 android:textColor="@color/common_google_signin_btn_text_dark_default" />
......
...@@ -29,4 +29,9 @@ ...@@ -29,4 +29,9 @@
29 android:gravity="center" 29 android:gravity="center"
30 android:text="다이얼로그 내용" /> 30 android:text="다이얼로그 내용" />
31 31
32 + <LinearLayout
33 + android:layout_width="match_parent"
34 + android:layout_height="match_parent"
35 + android:orientation="horizontal"/>
36 +
32 </LinearLayout> 37 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - android:orientation="vertical" android:layout_width="match_parent"
4 - android:layout_height="match_parent"
5 - android:background="@drawable/hwajilgooji1">
6 -
7 -</LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - android:orientation="vertical" android:layout_width="match_parent"
4 - android:layout_height="match_parent"
5 - android:background="@drawable/hwajilgooji2">
6 -
7 -</LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - android:orientation="vertical" android:layout_width="match_parent"
4 - android:layout_height="match_parent"
5 - android:background="@drawable/hwajilgooji3">
6 -
7 -</LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <ImageView 8 <ImageView
9 android:id="@+id/imageview" 9 android:id="@+id/imageview"
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 - android:layout_height="wrap_content" 11 + android:layout_height="match_parent"
12 android:layout_weight="1" 12 android:layout_weight="1"
13 tools:srcCompat="@tools:sample/avatars" /> 13 tools:srcCompat="@tools:sample/avatars" />
14 </LinearLayout> 14 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......