Panagiotis Triantafyllou

clean up

...@@ -55,255 +55,55 @@ ...@@ -55,255 +55,55 @@
55 app:layout_constraintStart_toStartOf="parent" 55 app:layout_constraintStart_toStartOf="parent"
56 app:layout_constraintTop_toTopOf="parent"> 56 app:layout_constraintTop_toTopOf="parent">
57 57
58 - <RelativeLayout 58 + <include
59 android:id="@+id/rl_coupons_row" 59 android:id="@+id/rl_coupons_row"
60 + layout="@layout/loyalty_coupons"
60 android:layout_width="match_parent" 61 android:layout_width="match_parent"
61 android:layout_height="wrap_content" 62 android:layout_height="wrap_content"
62 android:layout_marginTop="110dp" 63 android:layout_marginTop="110dp"
63 app:layout_constraintEnd_toEndOf="parent" 64 app:layout_constraintEnd_toEndOf="parent"
64 app:layout_constraintStart_toStartOf="parent" 65 app:layout_constraintStart_toStartOf="parent"
65 - app:layout_constraintTop_toTopOf="parent"> 66 + app:layout_constraintTop_toTopOf="parent" />
66 -
67 - <TextView
68 - android:id="@+id/tv_coupons_loyalty_title"
69 - android:layout_width="wrap_content"
70 - android:layout_height="wrap_content"
71 - android:layout_marginStart="10dp"
72 - android:text="@string/cos_coupons_loyalty_title"
73 - android:textColor="@color/grey"
74 - android:textSize="18sp"
75 - android:textStyle="bold" />
76 -
77 - <LinearLayout
78 - android:id="@+id/rl_home_coupons"
79 - android:layout_width="match_parent"
80 - android:layout_height="wrap_content"
81 - android:layout_below="@id/tv_coupons_loyalty_title">
82 -
83 - <androidx.recyclerview.widget.RecyclerView
84 - android:id="@+id/rv_loyalty_coupons"
85 - android:layout_width="match_parent"
86 - android:layout_height="wrap_content"
87 - android:clipToPadding="false"
88 - android:orientation="horizontal"
89 - android:paddingEnd="10dp" />
90 - </LinearLayout>
91 - </RelativeLayout>
92 67
93 - <RelativeLayout 68 + <include
94 android:id="@+id/rl_gifts_row" 69 android:id="@+id/rl_gifts_row"
70 + layout="@layout/loyalty_gifts"
95 android:layout_width="match_parent" 71 android:layout_width="match_parent"
96 android:layout_height="wrap_content" 72 android:layout_height="wrap_content"
97 android:layout_marginTop="32dp" 73 android:layout_marginTop="32dp"
98 app:layout_constraintEnd_toEndOf="parent" 74 app:layout_constraintEnd_toEndOf="parent"
99 app:layout_constraintStart_toStartOf="parent" 75 app:layout_constraintStart_toStartOf="parent"
100 - app:layout_constraintTop_toBottomOf="@+id/rl_coupons_row"> 76 + app:layout_constraintTop_toBottomOf="@+id/rl_coupons_row" />
101 -
102 - <TextView
103 - android:id="@+id/tv_gifts_loyalty_title"
104 - android:layout_width="wrap_content"
105 - android:layout_height="wrap_content"
106 - android:layout_marginStart="10dp"
107 - android:text="@string/cos_gifts_loyalty_title"
108 - android:textColor="@color/grey"
109 - android:textSize="18sp"
110 - android:textStyle="bold" />
111 -
112 - <HorizontalScrollView
113 - android:id="@+id/ll_add"
114 - android:layout_width="match_parent"
115 - android:layout_height="wrap_content"
116 - android:layout_below="@id/tv_gifts_loyalty_title"
117 - android:layout_marginTop="32dp"
118 - android:scrollbars="none">
119 -
120 - <LinearLayout
121 - android:layout_width="match_parent"
122 - android:layout_height="match_parent">
123 -
124 - <include
125 - android:id="@+id/cl_loyalty_gift_item"
126 - layout="@layout/gift_layout"
127 - app:layout_constraintEnd_toEndOf="parent"
128 - app:layout_constraintStart_toStartOf="parent" />
129 77
130 <include 78 <include
131 - android:id="@+id/cl_loyalty_gift_item2"
132 - layout="@layout/gift_layout"
133 - app:layout_constraintEnd_toEndOf="parent"
134 - app:layout_constraintStart_toStartOf="parent" />
135 - </LinearLayout>
136 - </HorizontalScrollView>
137 - </RelativeLayout>
138 -
139 - <RelativeLayout
140 android:id="@+id/rl_analysis_row" 79 android:id="@+id/rl_analysis_row"
80 + layout="@layout/loyalty_analysis_container"
141 android:layout_width="match_parent" 81 android:layout_width="match_parent"
142 android:layout_height="wrap_content" 82 android:layout_height="wrap_content"
143 android:layout_marginTop="48dp" 83 android:layout_marginTop="48dp"
144 app:layout_constraintEnd_toEndOf="parent" 84 app:layout_constraintEnd_toEndOf="parent"
145 app:layout_constraintStart_toStartOf="parent" 85 app:layout_constraintStart_toStartOf="parent"
146 - app:layout_constraintTop_toBottomOf="@+id/rl_gifts_row"> 86 + app:layout_constraintTop_toBottomOf="@+id/rl_gifts_row" />
147 -
148 - <TextView
149 - android:id="@+id/tv_analysis_loyalty_title"
150 - android:layout_width="wrap_content"
151 - android:layout_height="wrap_content"
152 - android:layout_marginStart="10dp"
153 - android:text="Ανάλυση"
154 - android:textColor="@color/grey"
155 - android:textSize="18sp"
156 - android:textStyle="bold" />
157 -
158 - <RelativeLayout
159 - android:layout_width="match_parent"
160 - android:layout_height="wrap_content"
161 - android:layout_below="@+id/tv_analysis_loyalty_title"
162 - android:layout_marginHorizontal="16dp"
163 - android:layout_marginTop="24dp"
164 - android:background="@drawable/shape_cos_white"
165 - android:paddingHorizontal="16dp"
166 - android:paddingVertical="24dp">
167 -
168 - <Spinner
169 - android:id="@+id/sp_coupons"
170 - android:layout_width="match_parent"
171 - android:layout_height="60dp"
172 - android:layout_centerHorizontal="true"
173 - android:background="@drawable/shape_cos_grey"
174 - android:dropDownVerticalOffset="62dp"
175 - android:popupBackground="@drawable/shape_cos_grey"
176 - android:popupElevation="1dp"
177 - android:spinnerMode="dropdown" />
178 -
179 - <include
180 - android:id="@+id/cl_tab_analysis"
181 - layout="@layout/tab_analysis"
182 - android:layout_width="match_parent"
183 - android:layout_height="wrap_content"
184 - android:layout_below="@+id/sp_coupons"
185 - android:layout_marginTop="32dp" />
186 -
187 - <Spinner
188 - android:id="@+id/sp_redemption"
189 - android:layout_width="match_parent"
190 - android:layout_height="60dp"
191 - android:layout_below="@+id/cl_tab_analysis"
192 - android:layout_centerHorizontal="true"
193 - android:layout_marginTop="32dp"
194 - android:background="@drawable/shape_cos_sky_blue"
195 - android:dropDownVerticalOffset="62dp"
196 - android:popupBackground="@drawable/shape_cos_sky_blue"
197 - android:popupElevation="1dp"
198 - android:spinnerMode="dropdown" />
199 -
200 - <androidx.constraintlayout.widget.ConstraintLayout
201 - android:layout_width="match_parent"
202 - android:layout_height="wrap_content"
203 - android:layout_below="@+id/sp_redemption"
204 - android:layout_marginTop="32dp">
205 -
206 - <include
207 - android:id="@+id/cl_chart"
208 - layout="@layout/cos_piechart"
209 - android:layout_width="200dp"
210 - android:layout_height="200dp"
211 - app:layout_constraintEnd_toEndOf="parent"
212 - app:layout_constraintStart_toStartOf="parent"
213 - app:layout_constraintTop_toTopOf="parent" />
214 87
215 <include 88 <include
216 - layout="@layout/cos_analysis"
217 - android:layout_width="match_parent"
218 - android:layout_height="wrap_content"
219 - android:layout_marginTop="32dp"
220 - app:layout_constraintEnd_toEndOf="@+id/cl_chart"
221 - app:layout_constraintStart_toStartOf="parent"
222 - app:layout_constraintTop_toBottomOf="@+id/cl_chart" />
223 - </androidx.constraintlayout.widget.ConstraintLayout>
224 - </RelativeLayout>
225 - </RelativeLayout>
226 -
227 - <RelativeLayout
228 android:id="@+id/rl_burnt_coupons_row" 89 android:id="@+id/rl_burnt_coupons_row"
90 + layout="@layout/loyalty_burnt_coupons"
229 android:layout_width="match_parent" 91 android:layout_width="match_parent"
230 android:layout_height="wrap_content" 92 android:layout_height="wrap_content"
231 android:layout_marginTop="48dp" 93 android:layout_marginTop="48dp"
232 app:layout_constraintEnd_toEndOf="parent" 94 app:layout_constraintEnd_toEndOf="parent"
233 app:layout_constraintStart_toStartOf="parent" 95 app:layout_constraintStart_toStartOf="parent"
234 - app:layout_constraintTop_toBottomOf="@+id/rl_analysis_row"> 96 + app:layout_constraintTop_toBottomOf="@+id/rl_analysis_row" />
235 -
236 - <TextView
237 - android:id="@+id/tv_burnt_coupons_loyalty_title"
238 - android:layout_width="wrap_content"
239 - android:layout_height="wrap_content"
240 - android:layout_marginStart="10dp"
241 - android:text="Εξαργυρωμένα κουπόνια"
242 - android:textColor="@color/grey"
243 - android:textSize="18sp"
244 - android:textStyle="bold" />
245 -
246 - <LinearLayout
247 - android:id="@+id/rl_home_burnt_coupons"
248 - android:layout_width="match_parent"
249 - android:layout_height="wrap_content"
250 - android:layout_below="@id/tv_burnt_coupons_loyalty_title">
251 -
252 - <androidx.recyclerview.widget.RecyclerView
253 - android:id="@+id/rv_loyalty_burnt_coupons"
254 - android:layout_width="match_parent"
255 - android:layout_height="wrap_content"
256 - android:clipToPadding="false"
257 - android:orientation="horizontal"
258 - android:paddingEnd="10dp" />
259 - </LinearLayout>
260 - </RelativeLayout>
261 97
262 - <RelativeLayout 98 + <include
263 android:id="@+id/rl_redeemed_gifts_row" 99 android:id="@+id/rl_redeemed_gifts_row"
100 + layout="@layout/loyalty_redeemed_gifts"
264 android:layout_width="match_parent" 101 android:layout_width="match_parent"
265 android:layout_height="wrap_content" 102 android:layout_height="wrap_content"
266 android:layout_marginTop="32dp" 103 android:layout_marginTop="32dp"
267 app:layout_constraintEnd_toEndOf="parent" 104 app:layout_constraintEnd_toEndOf="parent"
268 app:layout_constraintStart_toStartOf="parent" 105 app:layout_constraintStart_toStartOf="parent"
269 - app:layout_constraintTop_toBottomOf="@+id/rl_burnt_coupons_row"> 106 + app:layout_constraintTop_toBottomOf="@+id/rl_burnt_coupons_row" />
270 -
271 - <TextView
272 - android:id="@+id/tv_redeemed_gifts_loyalty_title"
273 - android:layout_width="wrap_content"
274 - android:layout_height="wrap_content"
275 - android:layout_marginStart="10dp"
276 - android:text="Εξαργυρωμένα δώρα"
277 - android:textColor="@color/grey"
278 - android:textSize="18sp"
279 - android:textStyle="bold" />
280 -
281 - <HorizontalScrollView
282 - android:id="@+id/ll_redeemed"
283 - android:layout_width="match_parent"
284 - android:layout_height="wrap_content"
285 - android:layout_below="@id/tv_redeemed_gifts_loyalty_title"
286 - android:layout_marginTop="32dp"
287 - android:scrollbars="none">
288 -
289 - <LinearLayout
290 - android:layout_width="match_parent"
291 - android:layout_height="match_parent">
292 -
293 - <include
294 - android:id="@+id/cl_loyalty_gift_item"
295 - layout="@layout/redeemed_gift_layout"
296 - app:layout_constraintEnd_toEndOf="parent"
297 - app:layout_constraintStart_toStartOf="parent" />
298 -
299 - <include
300 - android:id="@+id/cl_loyalty_gift_item2"
301 - layout="@layout/redeemed_gift_layout"
302 - app:layout_constraintEnd_toEndOf="parent"
303 - app:layout_constraintStart_toStartOf="parent" />
304 - </LinearLayout>
305 - </HorizontalScrollView>
306 - </RelativeLayout>
307 </androidx.constraintlayout.widget.ConstraintLayout> 107 </androidx.constraintlayout.widget.ConstraintLayout>
308 108
309 <include 109 <include
......
1 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 + xmlns:app="http://schemas.android.com/apk/res-auto"
3 + android:layout_width="match_parent"
4 + android:layout_height="wrap_content">
5 +
6 + <TextView
7 + android:id="@+id/tv_analysis_loyalty_title"
8 + android:layout_width="wrap_content"
9 + android:layout_height="wrap_content"
10 + android:layout_marginStart="10dp"
11 + android:text="Ανάλυση"
12 + android:textColor="@color/grey"
13 + android:textSize="18sp"
14 + android:textStyle="bold" />
15 +
16 + <RelativeLayout
17 + android:layout_width="match_parent"
18 + android:layout_height="wrap_content"
19 + android:layout_below="@+id/tv_analysis_loyalty_title"
20 + android:layout_marginHorizontal="16dp"
21 + android:layout_marginTop="24dp"
22 + android:background="@drawable/shape_cos_white"
23 + android:paddingHorizontal="16dp"
24 + android:paddingVertical="24dp">
25 +
26 + <Spinner
27 + android:id="@+id/sp_coupons"
28 + android:layout_width="match_parent"
29 + android:layout_height="60dp"
30 + android:layout_centerHorizontal="true"
31 + android:background="@drawable/shape_cos_grey"
32 + android:dropDownVerticalOffset="62dp"
33 + android:popupBackground="@drawable/shape_cos_grey"
34 + android:popupElevation="1dp"
35 + android:spinnerMode="dropdown" />
36 +
37 + <include
38 + android:id="@+id/cl_tab_analysis"
39 + layout="@layout/tab_analysis"
40 + android:layout_width="match_parent"
41 + android:layout_height="wrap_content"
42 + android:layout_below="@+id/sp_coupons"
43 + android:layout_marginTop="32dp" />
44 +
45 + <Spinner
46 + android:id="@+id/sp_redemption"
47 + android:layout_width="match_parent"
48 + android:layout_height="60dp"
49 + android:layout_below="@+id/cl_tab_analysis"
50 + android:layout_centerHorizontal="true"
51 + android:layout_marginTop="32dp"
52 + android:background="@drawable/shape_cos_sky_blue"
53 + android:dropDownVerticalOffset="62dp"
54 + android:popupBackground="@drawable/shape_cos_sky_blue"
55 + android:popupElevation="1dp"
56 + android:spinnerMode="dropdown" />
57 +
58 + <androidx.constraintlayout.widget.ConstraintLayout
59 + android:layout_width="match_parent"
60 + android:layout_height="wrap_content"
61 + android:layout_below="@+id/sp_redemption"
62 + android:layout_marginTop="32dp">
63 +
64 + <include
65 + android:id="@+id/cl_chart"
66 + layout="@layout/cos_piechart"
67 + android:layout_width="200dp"
68 + android:layout_height="200dp"
69 + app:layout_constraintEnd_toEndOf="parent"
70 + app:layout_constraintStart_toStartOf="parent"
71 + app:layout_constraintTop_toTopOf="parent" />
72 +
73 + <include
74 + layout="@layout/cos_analysis"
75 + android:layout_width="match_parent"
76 + android:layout_height="wrap_content"
77 + android:layout_marginTop="32dp"
78 + app:layout_constraintEnd_toEndOf="@+id/cl_chart"
79 + app:layout_constraintStart_toStartOf="parent"
80 + app:layout_constraintTop_toBottomOf="@+id/cl_chart" />
81 + </androidx.constraintlayout.widget.ConstraintLayout>
82 + </RelativeLayout>
83 +</RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
1 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:layout_width="match_parent"
3 + android:layout_height="wrap_content">
4 +
5 + <TextView
6 + android:id="@+id/tv_burnt_coupons_loyalty_title"
7 + android:layout_width="wrap_content"
8 + android:layout_height="wrap_content"
9 + android:layout_marginStart="10dp"
10 + android:text="Εξαργυρωμένα κουπόνια"
11 + android:textColor="@color/grey"
12 + android:textSize="18sp"
13 + android:textStyle="bold" />
14 +
15 + <LinearLayout
16 + android:id="@+id/rl_home_burnt_coupons"
17 + android:layout_width="match_parent"
18 + android:layout_height="wrap_content"
19 + android:layout_below="@id/tv_burnt_coupons_loyalty_title">
20 +
21 + <androidx.recyclerview.widget.RecyclerView
22 + android:id="@+id/rv_loyalty_burnt_coupons"
23 + android:layout_width="match_parent"
24 + android:layout_height="wrap_content"
25 + android:clipToPadding="false"
26 + android:orientation="horizontal"
27 + android:paddingEnd="10dp" />
28 + </LinearLayout>
29 +</RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
1 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:layout_width="match_parent"
3 + android:layout_height="wrap_content">
4 +
5 + <TextView
6 + android:id="@+id/tv_coupons_loyalty_title"
7 + android:layout_width="wrap_content"
8 + android:layout_height="wrap_content"
9 + android:layout_marginStart="10dp"
10 + android:text="@string/cos_coupons_loyalty_title"
11 + android:textColor="@color/grey"
12 + android:textSize="18sp"
13 + android:textStyle="bold" />
14 +
15 + <LinearLayout
16 + android:id="@+id/rl_home_coupons"
17 + android:layout_width="match_parent"
18 + android:layout_height="wrap_content"
19 + android:layout_below="@id/tv_coupons_loyalty_title">
20 +
21 + <androidx.recyclerview.widget.RecyclerView
22 + android:id="@+id/rv_loyalty_coupons"
23 + android:layout_width="match_parent"
24 + android:layout_height="wrap_content"
25 + android:clipToPadding="false"
26 + android:orientation="horizontal"
27 + android:paddingEnd="10dp" />
28 + </LinearLayout>
29 +</RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
1 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:layout_width="match_parent"
3 + android:layout_height="wrap_content">
4 +
5 + <TextView
6 + android:id="@+id/tv_gifts_loyalty_title"
7 + android:layout_width="wrap_content"
8 + android:layout_height="wrap_content"
9 + android:layout_marginStart="10dp"
10 + android:text="@string/cos_gifts_loyalty_title"
11 + android:textColor="@color/grey"
12 + android:textSize="18sp"
13 + android:textStyle="bold" />
14 +
15 + <HorizontalScrollView
16 + android:id="@+id/ll_add"
17 + android:layout_width="match_parent"
18 + android:layout_height="wrap_content"
19 + android:layout_below="@id/tv_gifts_loyalty_title"
20 + android:layout_marginTop="32dp"
21 + android:scrollbars="none">
22 +
23 + <LinearLayout
24 + android:layout_width="match_parent"
25 + android:layout_height="match_parent">
26 +
27 + <include
28 + android:id="@+id/cl_loyalty_gift_item"
29 + layout="@layout/gift_layout" />
30 +
31 + <include
32 + android:id="@+id/cl_loyalty_gift_item2"
33 + layout="@layout/gift_layout" />
34 + </LinearLayout>
35 + </HorizontalScrollView>
36 +</RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
1 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:layout_width="match_parent"
3 + android:layout_height="wrap_content">
4 +
5 + <TextView
6 + android:id="@+id/tv_redeemed_gifts_loyalty_title"
7 + android:layout_width="wrap_content"
8 + android:layout_height="wrap_content"
9 + android:layout_marginStart="10dp"
10 + android:text="Εξαργυρωμένα δώρα"
11 + android:textColor="@color/grey"
12 + android:textSize="18sp"
13 + android:textStyle="bold" />
14 +
15 + <HorizontalScrollView
16 + android:id="@+id/ll_redeemed"
17 + android:layout_width="match_parent"
18 + android:layout_height="wrap_content"
19 + android:layout_below="@id/tv_redeemed_gifts_loyalty_title"
20 + android:layout_marginTop="32dp"
21 + android:scrollbars="none">
22 +
23 + <LinearLayout
24 + android:layout_width="match_parent"
25 + android:layout_height="match_parent">
26 +
27 + <include
28 + android:id="@+id/cl_loyalty_gift_item"
29 + layout="@layout/redeemed_gift_layout" />
30 +
31 + <include
32 + android:id="@+id/cl_loyalty_gift_item2"
33 + layout="@layout/redeemed_gift_layout" />
34 + </LinearLayout>
35 + </HorizontalScrollView>
36 +</RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file