장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
e9226d93 1 parent bb2ff6c9

home category size changing and login margin and recyclerview duplicating fixing

Inline Side-by-side
Showing 16 changed files with 95 additions and 80 deletions
...@@ -71,9 +71,12 @@ class AFragment : Fragment() { ...@@ -71,9 +71,12 @@ class AFragment : Fragment() {
71 memo!!.D_day 71 memo!!.D_day
72 ) 72 )
73 ) 73 )
74 + val adapter = PolicyAdapter(policyList)
75 + policyRecyclerView.adapter = adapter
76 + policyRecyclerView.setItemViewCacheSize((200000000))
74 } 77 }
75 - val adapter = PolicyAdapter(policyList) 78 + //val adapter = PolicyAdapter(policyList)
76 - policyRecyclerView.adapter = adapter 79 + //policyRecyclerView.adapter = adapter
77 } 80 }
78 }) 81 })
79 } 82 }
......
...@@ -71,6 +71,7 @@ class BFragment : Fragment() { ...@@ -71,6 +71,7 @@ class BFragment : Fragment() {
71 } 71 }
72 val adapter = PolicyAdapter(policyList) 72 val adapter = PolicyAdapter(policyList)
73 policyRecyclerView.adapter = adapter 73 policyRecyclerView.adapter = adapter
74 + policyRecyclerView.setItemViewCacheSize((200000000))
74 } 75 }
75 }) 76 })
76 } 77 }
......
...@@ -71,6 +71,7 @@ class CFragment : Fragment() { ...@@ -71,6 +71,7 @@ class CFragment : Fragment() {
71 } 71 }
72 val adapter = PolicyAdapter(policyList) 72 val adapter = PolicyAdapter(policyList)
73 policyRecyclerView.adapter = adapter 73 policyRecyclerView.adapter = adapter
74 + policyRecyclerView.setItemViewCacheSize((200000000))
74 } 75 }
75 }) 76 })
76 } 77 }
......
...@@ -71,6 +71,7 @@ class DFragment : Fragment() { ...@@ -71,6 +71,7 @@ class DFragment : Fragment() {
71 } 71 }
72 val adapter = PolicyAdapter(policyList) 72 val adapter = PolicyAdapter(policyList)
73 policyRecyclerView.adapter = adapter 73 policyRecyclerView.adapter = adapter
74 + policyRecyclerView.setItemViewCacheSize((200000000))
74 } 75 }
75 }) 76 })
76 } 77 }
......
...@@ -72,6 +72,7 @@ class EFragment : Fragment() { ...@@ -72,6 +72,7 @@ class EFragment : Fragment() {
72 } 72 }
73 val adapter = PolicyAdapter(policyList) 73 val adapter = PolicyAdapter(policyList)
74 policyRecyclerView.adapter = adapter 74 policyRecyclerView.adapter = adapter
75 + policyRecyclerView.setItemViewCacheSize((200000000))
75 } 76 }
76 }) 77 })
77 } 78 }
......
...@@ -5,6 +5,6 @@ ...@@ -5,6 +5,6 @@
5 android:color="#FFF"/> 5 android:color="#FFF"/>
6 6
7 <size 7 <size
8 - android:height="7dp" 8 + android:height="8dp"
9 - android:width="7dp"/> 9 + android:width="8dp"/>
10 </shape> 10 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 android:color="#29ABE2"/> 6 android:color="#29ABE2"/>
7 7
8 <size 8 <size
9 - android:height="7dp" 9 + android:height="8dp"
10 - android:width="7dp"/> 10 + android:width="8dp"/>
11 11
12 </shape> 12 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -46,50 +46,58 @@ ...@@ -46,50 +46,58 @@
46 46
47 <TextView 47 <TextView
48 android:id="@+id/textView4" 48 android:id="@+id/textView4"
49 - android:layout_width="350dp" 49 + android:layout_width="match_parent"
50 android:layout_height="wrap_content" 50 android:layout_height="wrap_content"
51 + android:layout_marginLeft="25dp"
52 + android:layout_marginRight="25dp"
51 android:text="이메일" 53 android:text="이메일"
52 android:textColor="#29ABE2" 54 android:textColor="#29ABE2"
53 android:textSize="13dp" /> 55 android:textSize="13dp" />
54 56
55 <EditText 57 <EditText
56 android:id="@+id/edit_email" 58 android:id="@+id/edit_email"
57 - android:layout_width="350dp" 59 + android:layout_width="match_parent"
58 android:layout_height="wrap_content" 60 android:layout_height="wrap_content"
61 + android:layout_marginLeft="25dp"
62 + android:layout_marginRight="25dp"
59 android:drawableLeft="@drawable/profile" 63 android:drawableLeft="@drawable/profile"
60 android:drawablePadding="11dp" 64 android:drawablePadding="11dp"
61 - android:paddingLeft="5dp"
62 android:inputType="textEmailAddress" 65 android:inputType="textEmailAddress"
66 + android:paddingLeft="5dp"
63 android:theme="@style/EditTheme" /> 67 android:theme="@style/EditTheme" />
64 68
65 <TextView 69 <TextView
66 android:id="@+id/textView5" 70 android:id="@+id/textView5"
67 - android:layout_width="350dp" 71 + android:layout_width="match_parent"
68 android:layout_height="wrap_content" 72 android:layout_height="wrap_content"
73 + android:layout_marginLeft="25dp"
69 android:layout_marginTop="10dp" 74 android:layout_marginTop="10dp"
75 + android:layout_marginRight="25dp"
70 android:text="비밀번호" 76 android:text="비밀번호"
71 android:textColor="#29ABE2" 77 android:textColor="#29ABE2"
72 android:textSize="13dp" /> 78 android:textSize="13dp" />
73 79
74 <EditText 80 <EditText
75 android:id="@+id/edit_password" 81 android:id="@+id/edit_password"
76 - android:drawableLeft="@drawable/lock" 82 + android:layout_width="match_parent"
77 - android:layout_width="350dp"
78 android:layout_height="wrap_content" 83 android:layout_height="wrap_content"
84 + android:layout_marginLeft="25dp"
85 + android:layout_marginRight="25dp"
86 + android:drawableLeft="@drawable/lock"
79 android:drawablePadding="11dp" 87 android:drawablePadding="11dp"
80 - android:paddingLeft="5dp"
81 android:inputType="textPassword" 88 android:inputType="textPassword"
89 + android:paddingLeft="5dp"
82 android:theme="@style/EditTheme" /> 90 android:theme="@style/EditTheme" />
83 91
84 <Button 92 <Button
85 android:id="@+id/emailSigninBtn" 93 android:id="@+id/emailSigninBtn"
86 - android:layout_width="350dp" 94 + android:layout_width="match_parent"
87 android:layout_height="wrap_content" 95 android:layout_height="wrap_content"
88 android:layout_marginStart="16dp" 96 android:layout_marginStart="16dp"
89 - android:layout_marginLeft="16dp" 97 + android:layout_marginLeft="25dp"
90 android:layout_marginTop="8dp" 98 android:layout_marginTop="8dp"
91 android:layout_marginEnd="16dp" 99 android:layout_marginEnd="16dp"
92 - android:layout_marginRight="16dp" 100 + android:layout_marginRight="25dp"
93 android:background="@drawable/button_o" 101 android:background="@drawable/button_o"
94 android:text="로그인" 102 android:text="로그인"
95 android:textColor="#FFFFFF" /> 103 android:textColor="#FFFFFF" />
......
...@@ -39,41 +39,34 @@ ...@@ -39,41 +39,34 @@
39 android:layout_height="match_parent" 39 android:layout_height="match_parent"
40 android:layout_gravity="center" 40 android:layout_gravity="center"
41 android:layout_weight="1" 41 android:layout_weight="1"
42 - android:elevation="5dp" 42 + android:elevation="-7dp"
43 android:gravity="center" 43 android:gravity="center"
44 android:orientation="vertical"> 44 android:orientation="vertical">
45 45
46 - <LinearLayout 46 + <FrameLayout
47 android:layout_width="match_parent" 47 android:layout_width="match_parent"
48 - android:layout_height="0dp" 48 + android:layout_height="wrap_content">
49 - android:layout_weight="1"
50 - android:orientation="horizontal">
51 -
52 - </LinearLayout>
53 -
54 - <FrameLayout
55 - android:layout_width="match_parent"
56 - android:layout_height="wrap_content">
57 49
58 - <androidx.viewpager.widget.ViewPager 50 + <androidx.viewpager.widget.ViewPager
59 - android:id="@+id/welcomeViewPager" 51 + android:id="@+id/welcomeViewPager"
60 - android:layout_width="match_parent" 52 + android:layout_width="match_parent"
61 - android:layout_height="262dp" 53 + android:layout_height="262dp"
62 - android:layout_gravity="top" 54 + android:layout_gravity="top"
63 - android:layout_weight="1"> 55 + android:layout_weight="1"
56 + android:elevation="-7dp">
64 57
65 - </androidx.viewpager.widget.ViewPager> 58 + </androidx.viewpager.widget.ViewPager>
66 59
67 - <com.example.vip.CircleIndicator 60 + <com.example.vip.CircleIndicator
68 - android:id="@+id/ciMainActivity" 61 + android:id="@+id/ciMainActivity"
69 - android:layout_width="wrap_content" 62 + android:layout_width="wrap_content"
70 - android:layout_height="wrap_content" 63 + android:layout_height="wrap_content"
71 - android:layout_gravity="bottom|center_horizontal" 64 + android:layout_gravity="bottom|center_horizontal"
72 - android:layout_marginBottom="20dp" 65 + android:layout_marginBottom="20dp"
73 - app:layout_constraintBottom_toBottomOf="parent" 66 + app:layout_constraintBottom_toBottomOf="parent"
74 - app:layout_constraintEnd_toEndOf="parent" 67 + app:layout_constraintEnd_toEndOf="parent"
75 - app:layout_constraintStart_toStartOf="parent" /> 68 + app:layout_constraintStart_toStartOf="parent" />
76 - </FrameLayout> 69 + </FrameLayout>
77 70
78 <LinearLayout 71 <LinearLayout
79 android:layout_width="match_parent" 72 android:layout_width="match_parent"
...@@ -88,8 +81,7 @@ ...@@ -88,8 +81,7 @@
88 <LinearLayout 81 <LinearLayout
89 android:layout_width="match_parent" 82 android:layout_width="match_parent"
90 android:layout_height="wrap_content" 83 android:layout_height="wrap_content"
91 - android:layout_marginTop="15dp" 84 + android:layout_weight="1"
92 - android:layout_marginBottom="15dp"
93 android:gravity="center" 85 android:gravity="center"
94 android:orientation="horizontal"> 86 android:orientation="horizontal">
95 87
...@@ -105,11 +97,13 @@ ...@@ -105,11 +97,13 @@
105 97
106 <Button 98 <Button
107 android:id="@+id/kyoyookButton" 99 android:id="@+id/kyoyookButton"
108 - android:layout_width="50dp" 100 + android:layout_width="70dp"
109 - android:layout_height="50dp" 101 + android:layout_height="70dp"
110 android:layout_gravity="center" 102 android:layout_gravity="center"
111 - android:background="@drawable/homecat1" 103 + android:layout_weight="1"
112 - android:gravity="center" /> 104 + android:background="@drawable/homecaticon_1"
105 + android:gravity="center"
106 + android:theme="@style/ButtonTheme" />
113 107
114 <TextView 108 <TextView
115 android:id="@+id/kyoyooktextView" 109 android:id="@+id/kyoyooktextView"
...@@ -134,11 +128,13 @@ ...@@ -134,11 +128,13 @@
134 128
135 <Button 129 <Button
136 android:id="@+id/koyongButton" 130 android:id="@+id/koyongButton"
137 - android:layout_width="50dp" 131 + android:layout_width="70dp"
138 - android:layout_height="50dp" 132 + android:layout_height="70dp"
139 android:layout_gravity="center" 133 android:layout_gravity="center"
140 - android:background="@drawable/homecat2" 134 + android:layout_weight="1"
141 - android:gravity="center" /> 135 + android:background="@drawable/homecaticon_2"
136 + android:gravity="center"
137 + android:theme="@style/ButtonTheme" />
142 138
143 <TextView 139 <TextView
144 android:id="@+id/koyongtextView" 140 android:id="@+id/koyongtextView"
...@@ -163,11 +159,13 @@ ...@@ -163,11 +159,13 @@
163 159
164 <Button 160 <Button
165 android:id="@+id/joogeoButton" 161 android:id="@+id/joogeoButton"
166 - android:layout_width="50dp" 162 + android:layout_width="70dp"
167 - android:layout_height="50dp" 163 + android:layout_height="70dp"
168 android:layout_gravity="center" 164 android:layout_gravity="center"
169 - android:background="@drawable/homecat3" 165 + android:layout_weight="1"
170 - android:gravity="center" /> 166 + android:background="@drawable/homecaticon_3"
167 + android:gravity="center"
168 + android:theme="@style/ButtonTheme" />
171 169
172 <TextView 170 <TextView
173 android:id="@+id/joogeotextView" 171 android:id="@+id/joogeotextView"
...@@ -184,15 +182,13 @@ ...@@ -184,15 +182,13 @@
184 182
185 <LinearLayout 183 <LinearLayout
186 android:layout_width="match_parent" 184 android:layout_width="match_parent"
187 - android:layout_height="match_parent" 185 + android:layout_height="wrap_content"
188 - android:layout_weight="1"
189 android:orientation="horizontal"></LinearLayout> 186 android:orientation="horizontal"></LinearLayout>
190 187
191 <LinearLayout 188 <LinearLayout
192 android:layout_width="match_parent" 189 android:layout_width="match_parent"
193 android:layout_height="wrap_content" 190 android:layout_height="wrap_content"
194 - android:layout_marginTop="15dp" 191 + android:layout_weight="1"
195 - android:layout_marginBottom="15dp"
196 android:gravity="center" 192 android:gravity="center"
197 android:orientation="horizontal"> 193 android:orientation="horizontal">
198 194
...@@ -208,11 +204,13 @@ ...@@ -208,11 +204,13 @@
208 204
209 <Button 205 <Button
210 android:id="@+id/geongangButton" 206 android:id="@+id/geongangButton"
211 - android:layout_width="50dp" 207 + android:layout_width="70dp"
212 - android:layout_height="50dp" 208 + android:layout_height="70dp"
213 android:layout_gravity="center" 209 android:layout_gravity="center"
214 - android:background="@drawable/homecat4" 210 + android:layout_weight="1"
215 - android:gravity="center" /> 211 + android:background="@drawable/homecaticon_4"
212 + android:gravity="center"
213 + android:theme="@style/ButtonTheme" />
216 214
217 <TextView 215 <TextView
218 android:id="@+id/geongangtextView" 216 android:id="@+id/geongangtextView"
...@@ -237,11 +235,13 @@ ...@@ -237,11 +235,13 @@
237 235
238 <Button 236 <Button
239 android:id="@+id/seominButton" 237 android:id="@+id/seominButton"
240 - android:layout_width="50dp" 238 + android:layout_width="70dp"
241 - android:layout_height="50dp" 239 + android:layout_height="70dp"
242 android:layout_gravity="center" 240 android:layout_gravity="center"
243 - android:background="@drawable/homecat5" 241 + android:layout_weight="1"
244 - android:gravity="center" /> 242 + android:background="@drawable/homecaticon_5"
243 + android:gravity="center"
244 + android:theme="@style/ButtonTheme" />
245 245
246 <TextView 246 <TextView
247 android:id="@+id/seomintextView" 247 android:id="@+id/seomintextView"
...@@ -266,11 +266,13 @@ ...@@ -266,11 +266,13 @@
266 266
267 <Button 267 <Button
268 android:id="@+id/moonhwaButton" 268 android:id="@+id/moonhwaButton"
269 - android:layout_width="50dp" 269 + android:layout_width="70dp"
270 - android:layout_height="50dp" 270 + android:layout_height="70dp"
271 android:layout_gravity="center" 271 android:layout_gravity="center"
272 - android:background="@drawable/homecat6" 272 + android:layout_weight="1"
273 - android:gravity="center" /> 273 + android:background="@drawable/homecaticon_6"
274 + android:gravity="center"
275 + android:theme="@style/ButtonTheme" />
274 276
275 <TextView 277 <TextView
276 android:id="@+id/moonhwatextView" 278 android:id="@+id/moonhwatextView"
...@@ -285,12 +287,6 @@ ...@@ -285,12 +287,6 @@
285 </LinearLayout> 287 </LinearLayout>
286 </LinearLayout> 288 </LinearLayout>
287 289
288 - <LinearLayout
289 - android:layout_width="match_parent"
290 - android:layout_height="0dp"
291 - android:layout_weight="1"
292 - android:orientation="horizontal"></LinearLayout>
293 -
294 </LinearLayout> 290 </LinearLayout>
295 291
296 <!-- 292 <!--
......
...@@ -30,4 +30,8 @@ ...@@ -30,4 +30,8 @@
30 <item name="android:textColorSecondary">#000</item> <!-- 탭바 텍스트 --> 30 <item name="android:textColorSecondary">#000</item> <!-- 탭바 텍스트 -->
31 </style> 31 </style>
32 32
33 + <style name="ButtonTheme">
34 + <item name="android:scaleType">fitXY</item>
35 + </style>
36 +
33 </resources> 37 </resources>
......