신기성 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
e14056d7 1 parent e453ce24

design doing

Inline Side-by-side
Showing 9 changed files with 157 additions and 106 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=".PushingActivity"></activity> 12 + <activity android:name=".OnboardingActivity"></activity>
13 + <activity android:name=".PushingActivity" />
13 <activity android:name=".DetailActivity" /> 14 <activity android:name=".DetailActivity" />
14 <activity android:name=".InfoActivity" /> 15 <activity android:name=".InfoActivity" />
15 <activity android:name=".FavoritesActivity" /> 16 <activity android:name=".FavoritesActivity" />
...@@ -28,8 +29,6 @@ ...@@ -28,8 +29,6 @@
28 <category android:name="android.intent.category.LAUNCHER" /> 29 <category android:name="android.intent.category.LAUNCHER" />
29 </intent-filter> 30 </intent-filter>
30 </activity> 31 </activity>
31 -
32 -
33 </application> 32 </application>
34 33
35 </manifest> 34 </manifest>
...\ No newline at end of file ...\ No newline at end of file
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.animation.Animator
4 +import android.animation.AnimatorInflater
3 import android.content.Intent 5 import android.content.Intent
4 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 7 import android.os.Bundle
8 +import android.preference.PreferenceManager
9 +import android.view.LayoutInflater
10 +import android.view.View
11 +import android.view.ViewGroup
12 +import android.widget.ImageView
6 import android.widget.Toast 13 import android.widget.Toast
7 import com.google.firebase.auth.FirebaseAuth 14 import com.google.firebase.auth.FirebaseAuth
8 import kotlinx.android.synthetic.main.activity_main.* 15 import kotlinx.android.synthetic.main.activity_main.*
9 import org.w3c.dom.Node 16 import org.w3c.dom.Node
17 +import java.lang.Boolean.getBoolean
10 18
11 19
12 class MainActivity : AppCompatActivity() { 20 class MainActivity : AppCompatActivity() {
...@@ -42,9 +50,9 @@ class MainActivity : AppCompatActivity() { ...@@ -42,9 +50,9 @@ class MainActivity : AppCompatActivity() {
42 50
43 override fun onCreate(savedInstanceState: Bundle?) { 51 override fun onCreate(savedInstanceState: Bundle?) {
44 super.onCreate(savedInstanceState) 52 super.onCreate(savedInstanceState)
45 -
46 setContentView(R.layout.activity_main) 53 setContentView(R.layout.activity_main)
47 54
55 +
48 emailSigninBtn.setOnClickListener{ 56 emailSigninBtn.setOnClickListener{
49 loginEmail() 57 loginEmail()
50 58
...@@ -55,7 +63,11 @@ class MainActivity : AppCompatActivity() { ...@@ -55,7 +63,11 @@ class MainActivity : AppCompatActivity() {
55 startActivity(intent) 63 startActivity(intent)
56 } 64 }
57 65
66 +
67 +
68 +
58 } 69 }
59 70
60 71
72 +
61 } 73 }
......
...@@ -29,146 +29,180 @@ ...@@ -29,146 +29,180 @@
29 </androidx.appcompat.widget.Toolbar> 29 </androidx.appcompat.widget.Toolbar>
30 30
31 <LinearLayout 31 <LinearLayout
32 - android:layout_width="wrap_content" 32 + android:layout_width="match_parent"
33 - android:layout_height="100dp" 33 + android:layout_height="wrap_content"
34 - android:layout_gravity="center" 34 + android:layout_weight="1"
35 - android:orientation="horizontal"> 35 + android:orientation="vertical">
36 36
37 - <ImageView 37 + <LinearLayout
38 - android:id="@+id/infoAccountImage" 38 + android:layout_width="match_parent"
39 - android:layout_width="50dp" 39 + android:layout_height="wrap_content"
40 - android:layout_height="50dp" 40 + android:layout_gravity="center"
41 android:layout_weight="1" 41 android:layout_weight="1"
42 - tools:srcCompat="@tools:sample/avatars" /> 42 + android:orientation="horizontal">
43 +
44 + <ImageView
45 + android:id="@+id/infoAccountImage"
46 + android:layout_width="50dp"
47 + android:layout_height="50dp"
48 + android:layout_gravity="center"
49 + android:layout_weight="1"
50 + tools:srcCompat="@tools:sample/avatars" />
51 +
52 + <LinearLayout
53 + android:layout_width="wrap_content"
54 + android:layout_height="match_parent"
55 + android:layout_weight="1"
56 + android:orientation="vertical">
57 +
58 + <TextView
59 + android:id="@+id/InfoNickname"
60 + android:layout_width="wrap_content"
61 + android:layout_height="wrap_content"
62 + android:layout_gravity="center"
63 + android:layout_weight="1"
64 + android:gravity="center"
65 + android:text="GRACE" />
66 +
67 + <TextView
68 + android:id="@+id/InfoEmail"
69 + android:layout_width="wrap_content"
70 + android:layout_height="wrap_content"
71 + android:layout_gravity="center"
72 + android:layout_weight="1"
73 + android:gravity="center"
74 + android:text="grace@naver.com" />
75 +
76 + <TextView
77 + android:id="@+id/InfoProfilProgress"
78 + android:layout_width="wrap_content"
79 + android:layout_height="wrap_content"
80 + android:layout_gravity="center"
81 + android:layout_weight="1"
82 + android:gravity="center"
83 + android:text="프로필정보입력15/20" />
84 +
85 + </LinearLayout>
86 +
87 + <ImageView
88 + android:id="@+id/InfoProfilImage"
89 + android:layout_width="50dp"
90 + android:layout_height="50dp"
91 + android:layout_gravity="center"
92 + android:layout_weight="1"
93 + tools:srcCompat="@tools:sample/avatars" />
94 + </LinearLayout>
43 95
44 <LinearLayout 96 <LinearLayout
45 android:layout_width="match_parent" 97 android:layout_width="match_parent"
46 - android:layout_height="match_parent" 98 + android:layout_height="wrap_content"
99 + android:layout_gravity="center"
47 android:layout_weight="1" 100 android:layout_weight="1"
101 + android:gravity="center"
48 android:orientation="vertical"> 102 android:orientation="vertical">
49 103
50 <TextView 104 <TextView
51 - android:id="@+id/InfoNickname" 105 + android:id="@+id/InfoProfilModify"
52 android:layout_width="match_parent" 106 android:layout_width="match_parent"
53 android:layout_height="wrap_content" 107 android:layout_height="wrap_content"
108 + android:layout_gravity="center"
54 android:gravity="center" 109 android:gravity="center"
55 - android:text="GRACE" /> 110 + android:text="프로필 정보 수정" />
111 +
112 + <ProgressBar
113 + android:id="@+id/InfoProgress"
114 + style="?android:attr/progressBarStyleHorizontal"
115 + android:layout_width="match_parent"
116 + android:layout_height="wrap_content"
117 + android:layout_gravity="center" />
56 118
57 <TextView 119 <TextView
58 - android:id="@+id/InfoEmail" 120 + android:id="@+id/InfoExplain"
59 android:layout_width="match_parent" 121 android:layout_width="match_parent"
60 android:layout_height="wrap_content" 122 android:layout_height="wrap_content"
123 + android:layout_gravity="center"
61 android:gravity="center" 124 android:gravity="center"
62 - android:text="grace@naver.com" /> 125 + android:text="많이입력해야정확해요" />
63 126
64 <TextView 127 <TextView
65 - android:id="@+id/InfoProfilProgress" 128 + android:id="@+id/InfoStep"
66 android:layout_width="match_parent" 129 android:layout_width="match_parent"
67 android:layout_height="wrap_content" 130 android:layout_height="wrap_content"
131 + android:layout_gravity="center"
68 android:gravity="center" 132 android:gravity="center"
69 - android:text="프로필정보입력15/20" /> 133 + android:text="STEP 15/20" />
70 -
71 </LinearLayout> 134 </LinearLayout>
72 135
73 - <ImageView 136 + <LinearLayout
74 - android:id="@+id/InfoProfilImage"
75 - android:layout_width="50dp"
76 - android:layout_height="50dp"
77 - android:layout_weight="1"
78 - tools:srcCompat="@tools:sample/avatars" />
79 - </LinearLayout>
80 -
81 - <LinearLayout
82 - android:layout_width="match_parent"
83 - android:layout_height="wrap_content"
84 - android:orientation="vertical">
85 -
86 - <TextView
87 - android:id="@+id/InfoProfilModify"
88 android:layout_width="match_parent" 137 android:layout_width="match_parent"
89 android:layout_height="wrap_content" 138 android:layout_height="wrap_content"
139 + android:layout_weight="1"
90 android:gravity="center" 140 android:gravity="center"
91 - android:text="프로필 정보 수정" /> 141 + android:orientation="horizontal">
92 142
93 - <ProgressBar 143 + <Button
94 - android:id="@+id/InfoProgress" 144 + android:id="@+id/InfoButtonApp"
95 - style="?android:attr/progressBarStyleHorizontal" 145 + android:layout_width="match_parent"
96 - android:layout_width="match_parent" 146 + android:layout_height="wrap_content"
97 - android:layout_height="wrap_content" /> 147 + android:text="APP 정보" />
98 - 148 + </LinearLayout>
99 - <TextView
100 - android:id="@+id/InfoExplain"
101 - android:layout_width="match_parent"
102 - android:layout_height="wrap_content"
103 - android:gravity="center"
104 - android:text="많이입력해야정확해요" />
105 149
106 - <TextView 150 + <LinearLayout
107 - android:id="@+id/InfoStep"
108 android:layout_width="match_parent" 151 android:layout_width="match_parent"
109 android:layout_height="wrap_content" 152 android:layout_height="wrap_content"
153 + android:layout_weight="1"
110 android:gravity="center" 154 android:gravity="center"
111 - android:text="STEP 15/20" /> 155 + android:orientation="horizontal">
112 - </LinearLayout>
113 -
114 - <LinearLayout
115 - android:layout_width="match_parent"
116 - android:layout_height="wrap_content"
117 - android:orientation="horizontal">
118 156
119 - <Button 157 + <Button
120 - android:id="@+id/InfoButtonNotice" 158 + android:id="@+id/InfoButtonLaw"
121 - android:layout_width="match_parent" 159 + android:layout_width="match_parent"
122 - android:layout_height="wrap_content" 160 + android:layout_height="wrap_content"
123 - android:text="공지사항" /> 161 + android:text="개인정보처리방침" />
124 - </LinearLayout> 162 + </LinearLayout>
125 -
126 - <LinearLayout
127 - android:layout_width="match_parent"
128 - android:layout_height="wrap_content"
129 - android:orientation="horizontal">
130 163
131 - <Button 164 + <LinearLayout
132 - android:id="@+id/InfoButtonFAQ"
133 android:layout_width="match_parent" 165 android:layout_width="match_parent"
134 android:layout_height="wrap_content" 166 android:layout_height="wrap_content"
135 - android:text="자주 묻는 질문" /> 167 + android:layout_weight="1"
136 - </LinearLayout> 168 + android:gravity="center"
169 + android:orientation="horizontal">
137 170
138 - <LinearLayout 171 + <Button
139 - android:layout_width="match_parent" 172 + android:id="@+id/InfoButtonSettings"
140 - android:layout_height="wrap_content" 173 + android:layout_width="match_parent"
141 - android:orientation="horizontal"> 174 + android:layout_height="wrap_content"
175 + android:text="환경설정" />
176 + </LinearLayout>
142 177
143 - <Button 178 + <LinearLayout
144 - android:id="@+id/InfoButtonSettings"
145 android:layout_width="match_parent" 179 android:layout_width="match_parent"
146 android:layout_height="wrap_content" 180 android:layout_height="wrap_content"
147 - android:text="환경설정" /> 181 + android:layout_weight="1"
148 - </LinearLayout> 182 + android:gravity="center"
183 + android:orientation="horizontal">
149 184
150 - <LinearLayout 185 + <Button
151 - android:layout_width="match_parent" 186 + android:id="@+id/InfoButtonFAQ"
152 - android:layout_height="wrap_content" 187 + android:layout_width="match_parent"
153 - android:orientation="horizontal"> 188 + android:layout_height="wrap_content"
189 + android:text="자주 묻는 질문" />
190 + </LinearLayout>
154 191
155 - <Button 192 + <LinearLayout
156 - android:id="@+id/InfoButtonLaw"
157 android:layout_width="match_parent" 193 android:layout_width="match_parent"
158 android:layout_height="wrap_content" 194 android:layout_height="wrap_content"
159 - android:text="개인정보처리방침" /> 195 + android:layout_weight="1"
160 - </LinearLayout> 196 + android:gravity="center"
197 + android:orientation="horizontal">
161 198
162 - <LinearLayout 199 + <Button
163 - android:layout_width="match_parent" 200 + android:id="@+id/InfoButtonNotice"
164 - android:layout_height="wrap_content" 201 + android:layout_width="match_parent"
165 - android:orientation="horizontal"> 202 + android:layout_height="wrap_content"
203 + android:text="공지사항" />
204 + </LinearLayout>
166 205
167 - <Button
168 - android:id="@+id/InfoButtonApp"
169 - android:layout_width="match_parent"
170 - android:layout_height="wrap_content"
171 - android:text="APP 정보" />
172 </LinearLayout> 206 </LinearLayout>
173 207
174 <FrameLayout 208 <FrameLayout
......
...@@ -69,4 +69,5 @@ ...@@ -69,4 +69,5 @@
69 android:layout_gravity="center" 69 android:layout_gravity="center"
70 android:layout_weight="1" /> 70 android:layout_weight="1" />
71 </LinearLayout> 71 </LinearLayout>
72 +
72 </LinearLayout> 73 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,19 +4,25 @@ ...@@ -4,19 +4,25 @@
4 android:orientation="horizontal" 4 android:orientation="horizontal"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="wrap_content" 6 android:layout_height="wrap_content"
7 - android:layout_margin="20dp"> 7 + android:layout_margin="3dp"
8 + android:background="@drawable/edgemaking">
8 9
9 10
10 <ImageView 11 <ImageView
11 android:id="@+id/searchIcon" 12 android:id="@+id/searchIcon"
12 android:layout_width="100dp" 13 android:layout_width="100dp"
13 android:layout_height="wrap_content" 14 android:layout_height="wrap_content"
14 - android:adjustViewBounds="true"/> 15 + android:layout_gravity="center"
16 + android:layout_weight="0"
17 + android:adjustViewBounds="true" />
15 18
16 <TextView 19 <TextView
17 android:id="@+id/searchIconText" 20 android:id="@+id/searchIconText"
18 - android:layout_width="150dp" 21 + android:layout_width="wrap_content"
19 android:layout_height="wrap_content" 22 android:layout_height="wrap_content"
20 - android:textSize="20sp"/> 23 + android:layout_gravity="center"
24 + android:layout_weight="1"
25 + android:gravity="center"
26 + android:textSize="20sp" />
21 27
22 </LinearLayout> 28 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:orientation="vertical" 5 android:orientation="vertical"
6 android:layout_width="match_parent" 6 android:layout_width="match_parent"
7 - android:layout_height="match_parent"> 7 + android:layout_height="wrap_content">
8 8
9 <SearchView 9 <SearchView
10 android:id="@+id/searchForm" 10 android:id="@+id/searchForm"
...@@ -18,9 +18,8 @@ ...@@ -18,9 +18,8 @@
18 <androidx.recyclerview.widget.RecyclerView 18 <androidx.recyclerview.widget.RecyclerView
19 android:id="@+id/searchRecyclerView" 19 android:id="@+id/searchRecyclerView"
20 android:layout_width="match_parent" 20 android:layout_width="match_parent"
21 - android:layout_height="340dp" 21 + android:layout_height="wrap_content"
22 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" 22 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
23 - app:spanCount="3"
24 - app:layout_constraintBottom_toBottomOf="@id/bottomNavigation"
25 tools:listitem="@layout/item_search" /> 23 tools:listitem="@layout/item_search" />
24 +
26 </LinearLayout> 25 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......