open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
17d4ae6b 1 parent 9a959169

ui changes and fixes

Inline Side-by-side
Showing 7 changed files with 258 additions and 222 deletions
...@@ -12,6 +12,7 @@ import android.widget.LinearLayout; ...@@ -12,6 +12,7 @@ import android.widget.LinearLayout;
12 import android.widget.RelativeLayout; 12 import android.widget.RelativeLayout;
13 import android.widget.TextView; 13 import android.widget.TextView;
14 14
15 +import androidx.cardview.widget.CardView;
15 import androidx.core.content.ContextCompat; 16 import androidx.core.content.ContextCompat;
16 import androidx.recyclerview.widget.LinearLayoutManager; 17 import androidx.recyclerview.widget.LinearLayoutManager;
17 import androidx.recyclerview.widget.RecyclerView; 18 import androidx.recyclerview.widget.RecyclerView;
...@@ -53,7 +54,8 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -53,7 +54,8 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
53 private ExpiredCouponAdapter mAdapterExpiredCoupons; 54 private ExpiredCouponAdapter mAdapterExpiredCoupons;
54 private SharedCouponAdapter mAdapterSharedCoupons; 55 private SharedCouponAdapter mAdapterSharedCoupons;
55 private LinearLayout mLlExpiredTab, mLlSharedTab, mLlShowMoreExpired, mLlShowMoreShared; 56 private LinearLayout mLlExpiredTab, mLlSharedTab, mLlShowMoreExpired, mLlShowMoreShared;
56 - private RelativeLayout mRlExpiredView, mRlSharedView; 57 + private RelativeLayout mRlExpiredView;
58 + private CardView mRlSharedView;
57 private SharingList mSharedCoupons = new SharingList(); 59 private SharingList mSharedCoupons = new SharingList();
58 private int mTimer = 0; 60 private int mTimer = 0;
59 private Handler mSecondsHandler; 61 private Handler mSecondsHandler;
......
...@@ -18,6 +18,7 @@ import android.widget.ScrollView; ...@@ -18,6 +18,7 @@ import android.widget.ScrollView;
18 import android.widget.TextView; 18 import android.widget.TextView;
19 19
20 import androidx.appcompat.app.AlertDialog; 20 import androidx.appcompat.app.AlertDialog;
21 +import androidx.cardview.widget.CardView;
21 import androidx.constraintlayout.widget.ConstraintLayout; 22 import androidx.constraintlayout.widget.ConstraintLayout;
22 import androidx.core.content.ContextCompat; 23 import androidx.core.content.ContextCompat;
23 import androidx.core.widget.NestedScrollView; 24 import androidx.core.widget.NestedScrollView;
...@@ -81,7 +82,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -81,7 +82,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
81 mTvUserBadge, mTvGiftsValue, mTvGiftsValueAll, mTvActiveCode, mTvActiveDate, 82 mTvUserBadge, mTvGiftsValue, mTvGiftsValueAll, mTvActiveCode, mTvActiveDate,
82 mTvActiveTitle, mTvActiveCouponsHeader, mTvMarketValue, mTvMarketAll, mTvFavValue, mTvFavValueAll; 83 mTvActiveTitle, mTvActiveCouponsHeader, mTvMarketValue, mTvMarketAll, mTvFavValue, mTvFavValueAll;
83 private ConstraintLayout mClDealsBanner, mClDealsView, 84 private ConstraintLayout mClDealsBanner, mClDealsView,
84 - mClGiftsBanner, mClToolbar, mClExp, mClMarket; 85 + mClGiftsBanner, mClToolbar, mClMarket;
85 private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet, mLlDeals, mLlGifts, 86 private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet, mLlDeals, mLlGifts,
86 mLlMarketView; 87 mLlMarketView;
87 private FlowLayout mLlActiveCodesView; 88 private FlowLayout mLlActiveCodesView;
...@@ -99,6 +100,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -99,6 +100,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
99 private MarketCouponAdapter mAdapterMarketCoupons; 100 private MarketCouponAdapter mAdapterMarketCoupons;
100 private ExpandableLayout mElGifts; 101 private ExpandableLayout mElGifts;
101 private boolean mIsStayCollapsed = true; 102 private boolean mIsStayCollapsed = true;
103 + private CardView mClExp;
102 104
103 // =========================================================== 105 // ===========================================================
104 // Methods for/from SuperClass/Interfaces 106 // Methods for/from SuperClass/Interfaces
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
106 android:layout_marginTop="24dp" 106 android:layout_marginTop="24dp"
107 android:text="Κωδικός Κουπονιού" 107 android:text="Κωδικός Κουπονιού"
108 android:textColor="@color/cos_light_black" 108 android:textColor="@color/cos_light_black"
109 - android:textSize="16sp" /> 109 + android:textSize="18sp" />
110 110
111 <TextView 111 <TextView
112 android:id="@+id/textView16" 112 android:id="@+id/textView16"
...@@ -210,9 +210,9 @@ ...@@ -210,9 +210,9 @@
210 android:layout_width="wrap_content" 210 android:layout_width="wrap_content"
211 android:layout_height="wrap_content" 211 android:layout_height="wrap_content"
212 android:layout_gravity="center" 212 android:layout_gravity="center"
213 - android:layout_marginTop="24dp" 213 + android:layout_marginTop="16dp"
214 android:textColor="@color/cos_light_black" 214 android:textColor="@color/cos_light_black"
215 - android:textSize="15sp" 215 + android:textSize="16sp"
216 tools:text="@string/cos_coupon_date" /> 216 tools:text="@string/cos_coupon_date" />
217 217
218 <LinearLayout 218 <LinearLayout
......
...@@ -136,73 +136,80 @@ ...@@ -136,73 +136,80 @@
136 android:gravity="center_horizontal" 136 android:gravity="center_horizontal"
137 android:orientation="vertical"> 137 android:orientation="vertical">
138 138
139 - <androidx.constraintlayout.widget.ConstraintLayout 139 + <androidx.cardview.widget.CardView
140 android:id="@+id/cl_exp" 140 android:id="@+id/cl_exp"
141 android:layout_width="match_parent" 141 android:layout_width="match_parent"
142 android:layout_height="wrap_content" 142 android:layout_height="wrap_content"
143 - android:layout_marginHorizontal="4dp" 143 + android:layout_marginHorizontal="11dp"
144 android:layout_marginTop="24dp" 144 android:layout_marginTop="24dp"
145 - android:background="@drawable/shape_cos_white_border"
146 - android:paddingHorizontal="14dp"
147 - android:paddingVertical="14dp"
148 android:visibility="gone" 145 android:visibility="gone"
146 + app:cardCornerRadius="16dp"
147 + app:cardElevation="2dp"
149 tools:visibility="visible"> 148 tools:visibility="visible">
150 149
151 - <androidx.constraintlayout.widget.Guideline 150 + <androidx.constraintlayout.widget.ConstraintLayout
152 - android:id="@+id/gl_horizontal_64_exp" 151 + android:layout_width="match_parent"
153 - android:layout_width="wrap_content" 152 + android:layout_height="wrap_content"
154 - android:layout_height="match_parent" 153 + android:background="@color/white"
155 - android:orientation="horizontal" 154 + android:paddingHorizontal="14dp"
156 - app:layout_constraintGuide_percent="0.64" /> 155 + android:paddingVertical="14dp">
157 156
158 - <ImageView 157 + <androidx.constraintlayout.widget.Guideline
159 - android:id="@+id/iv_exp_logo" 158 + android:id="@+id/gl_horizontal_64_exp"
160 - android:layout_width="76dp" 159 + android:layout_width="wrap_content"
161 - android:layout_height="76dp" 160 + android:layout_height="match_parent"
162 - android:layout_marginVertical="4dp" 161 + android:orientation="horizontal"
163 - android:src="@drawable/ic_foryou_polygon_new" 162 + app:layout_constraintGuide_percent="0.64" />
164 - app:layout_constraintBottom_toBottomOf="parent"
165 - app:layout_constraintStart_toStartOf="parent"
166 - app:layout_constraintTop_toTopOf="parent" />
167 163
168 - <TextView 164 + <ImageView
169 - android:id="@+id/tv_exp_value" 165 + android:id="@+id/iv_exp_logo"
170 - fontPath="fonts/PeridotPE-Bold.ttf" 166 + android:layout_width="76dp"
171 - android:layout_width="wrap_content" 167 + android:layout_height="76dp"
172 - android:layout_height="wrap_content" 168 + android:layout_marginVertical="4dp"
173 - android:includeFontPadding="false" 169 + android:src="@drawable/ic_foryou_polygon_new"
174 - android:textColor="@color/cos_light_black" 170 + app:layout_constraintBottom_toBottomOf="parent"
175 - android:textSize="14sp" 171 + app:layout_constraintStart_toStartOf="parent"
176 - app:layout_constraintEnd_toEndOf="@+id/iv_exp_logo" 172 + app:layout_constraintTop_toTopOf="parent" />
177 - app:layout_constraintStart_toStartOf="@+id/iv_exp_logo"
178 - app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_64_exp"
179 - tools:text="18.00€" />
180 173
181 - <TextView 174 + <TextView
182 - android:id="@+id/tv_exp_value_all" 175 + android:id="@+id/tv_exp_value"
183 - fontPath="fonts/PeridotPE-Regular.ttf" 176 + fontPath="fonts/PeridotPE-Bold.ttf"
184 - android:layout_width="0dp" 177 + android:layout_width="wrap_content"
185 - android:layout_height="wrap_content" 178 + android:layout_height="wrap_content"
186 - android:layout_marginHorizontal="8dp" 179 + android:includeFontPadding="false"
187 - android:includeFontPadding="false" 180 + android:textColor="@color/cos_light_black"
188 - android:text="@string/cos_for_you_all" 181 + android:textSize="14sp"
189 - android:textColor="@color/cos_light_black" 182 + app:layout_constraintEnd_toEndOf="@+id/iv_exp_logo"
190 - android:textSize="15sp" 183 + app:layout_constraintStart_toStartOf="@+id/iv_exp_logo"
191 - app:layout_constraintBottom_toBottomOf="parent" 184 + app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_64_exp"
192 - app:layout_constraintEnd_toStartOf="@+id/iv_exp_arrow" 185 + tools:text="18.00€" />
193 - app:layout_constraintStart_toEndOf="@+id/iv_exp_logo"
194 - app:layout_constraintTop_toTopOf="parent" />
195 186
196 - <ImageView 187 + <TextView
197 - android:id="@+id/iv_exp_arrow" 188 + android:id="@+id/tv_exp_value_all"
198 - android:layout_width="14dp" 189 + fontPath="fonts/PeridotPE-Regular.ttf"
199 - android:layout_height="14dp" 190 + android:layout_width="0dp"
200 - android:src="@drawable/ic_down_dark_new" 191 + android:layout_height="wrap_content"
201 - android:visibility="gone" 192 + android:layout_marginHorizontal="8dp"
202 - app:layout_constraintBottom_toBottomOf="parent" 193 + android:includeFontPadding="false"
203 - app:layout_constraintEnd_toEndOf="parent" 194 + android:text="@string/cos_for_you_all"
204 - app:layout_constraintTop_toTopOf="parent" /> 195 + android:textColor="@color/cos_light_black"
205 - </androidx.constraintlayout.widget.ConstraintLayout> 196 + android:textSize="15sp"
197 + app:layout_constraintBottom_toBottomOf="parent"
198 + app:layout_constraintEnd_toStartOf="@+id/iv_exp_arrow"
199 + app:layout_constraintStart_toEndOf="@+id/iv_exp_logo"
200 + app:layout_constraintTop_toTopOf="parent" />
201 +
202 + <ImageView
203 + android:id="@+id/iv_exp_arrow"
204 + android:layout_width="14dp"
205 + android:layout_height="14dp"
206 + android:src="@drawable/ic_down_dark_new"
207 + android:visibility="gone"
208 + app:layout_constraintBottom_toBottomOf="parent"
209 + app:layout_constraintEnd_toEndOf="parent"
210 + app:layout_constraintTop_toTopOf="parent" />
211 + </androidx.constraintlayout.widget.ConstraintLayout>
212 + </androidx.cardview.widget.CardView>
206 213
207 <net.cachapa.expandablelayout.ExpandableLayout 214 <net.cachapa.expandablelayout.ExpandableLayout
208 android:id="@+id/el_exp" 215 android:id="@+id/el_exp"
...@@ -216,172 +223,197 @@ ...@@ -216,172 +223,197 @@
216 android:layout_width="match_parent" 223 android:layout_width="match_parent"
217 android:layout_height="wrap_content"> 224 android:layout_height="wrap_content">
218 225
219 - <androidx.constraintlayout.widget.ConstraintLayout 226 + <androidx.cardview.widget.CardView
220 - android:id="@+id/cl_deals_win_inner_cos" 227 + android:id="@+id/cv_deals_win_inner_cos"
221 android:layout_width="match_parent" 228 android:layout_width="match_parent"
222 android:layout_height="wrap_content" 229 android:layout_height="wrap_content"
223 android:layout_marginHorizontal="16dp" 230 android:layout_marginHorizontal="16dp"
224 android:layout_marginTop="6dp" 231 android:layout_marginTop="6dp"
225 - android:background="@drawable/shape_cos_white_border" 232 + app:cardCornerRadius="16dp"
226 - android:paddingHorizontal="6dp" 233 + app:cardElevation="2dp">
227 - android:paddingVertical="4dp">
228 -
229 - <androidx.constraintlayout.widget.Guideline
230 - android:id="@+id/gl_horizontal_50_cos"
231 - android:layout_width="wrap_content"
232 - android:layout_height="match_parent"
233 - android:orientation="horizontal"
234 - app:layout_constraintGuide_percent="0.64" />
235 -
236 - <ImageView
237 - android:id="@+id/iv_deals_logo"
238 - android:layout_width="76dp"
239 - android:layout_height="76dp"
240 - android:src="@drawable/ic_deals_polygon_new"
241 - app:layout_constraintBottom_toBottomOf="parent"
242 - app:layout_constraintStart_toStartOf="parent"
243 - app:layout_constraintTop_toTopOf="parent" />
244 234
245 - <TextView 235 + <androidx.constraintlayout.widget.ConstraintLayout
246 - android:id="@+id/tv_deals_value_all" 236 + android:id="@+id/cl_deals_win_inner_cos"
247 - fontPath="fonts/PeridotPE-Regular.ttf" 237 + android:layout_width="match_parent"
248 - android:layout_width="0dp"
249 android:layout_height="wrap_content" 238 android:layout_height="wrap_content"
250 - android:layout_marginHorizontal="8dp" 239 + android:background="@color/white"
251 - android:includeFontPadding="false" 240 + android:paddingHorizontal="6dp"
252 - android:text="@string/cos_deals_win_title_cos" 241 + android:paddingVertical="4dp">
253 - android:textColor="@color/cos_light_black"
254 - android:textSize="15sp"
255 - app:layout_constraintBottom_toBottomOf="parent"
256 - app:layout_constraintEnd_toEndOf="parent"
257 - app:layout_constraintStart_toEndOf="@+id/iv_deals_logo"
258 - app:layout_constraintTop_toTopOf="parent" />
259 242
260 - <TextView 243 + <androidx.constraintlayout.widget.Guideline
261 - android:id="@+id/tv_deals_value" 244 + android:id="@+id/gl_horizontal_50_cos"
262 - fontPath="fonts/PeridotPE-Bold.ttf" 245 + android:layout_width="wrap_content"
263 - android:layout_width="wrap_content" 246 + android:layout_height="match_parent"
264 - android:layout_height="wrap_content" 247 + android:orientation="horizontal"
265 - android:includeFontPadding="false" 248 + app:layout_constraintGuide_percent="0.64" />
266 - android:textColor="@color/cos_light_black" 249 +
267 - android:textSize="14sp" 250 + <ImageView
268 - app:layout_constraintEnd_toEndOf="@+id/iv_deals_logo" 251 + android:id="@+id/iv_deals_logo"
269 - app:layout_constraintStart_toStartOf="@+id/iv_deals_logo" 252 + android:layout_width="76dp"
270 - app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50_cos" 253 + android:layout_height="76dp"
271 - tools:text="18.00€" /> 254 + android:src="@drawable/ic_deals_polygon_new"
272 - </androidx.constraintlayout.widget.ConstraintLayout> 255 + app:layout_constraintBottom_toBottomOf="parent"
256 + app:layout_constraintStart_toStartOf="parent"
257 + app:layout_constraintTop_toTopOf="parent" />
273 258
274 - <androidx.constraintlayout.widget.ConstraintLayout 259 + <TextView
275 - android:id="@+id/cl_deals_win_inner" 260 + android:id="@+id/tv_deals_value_all"
261 + fontPath="fonts/PeridotPE-Regular.ttf"
262 + android:layout_width="0dp"
263 + android:layout_height="wrap_content"
264 + android:layout_marginHorizontal="8dp"
265 + android:includeFontPadding="false"
266 + android:text="@string/cos_deals_win_title_cos"
267 + android:textColor="@color/cos_light_black"
268 + android:textSize="15sp"
269 + app:layout_constraintBottom_toBottomOf="parent"
270 + app:layout_constraintEnd_toEndOf="parent"
271 + app:layout_constraintStart_toEndOf="@+id/iv_deals_logo"
272 + app:layout_constraintTop_toTopOf="parent" />
273 +
274 + <TextView
275 + android:id="@+id/tv_deals_value"
276 + fontPath="fonts/PeridotPE-Bold.ttf"
277 + android:layout_width="wrap_content"
278 + android:layout_height="wrap_content"
279 + android:includeFontPadding="false"
280 + android:textColor="@color/cos_light_black"
281 + android:textSize="14sp"
282 + app:layout_constraintEnd_toEndOf="@+id/iv_deals_logo"
283 + app:layout_constraintStart_toStartOf="@+id/iv_deals_logo"
284 + app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50_cos"
285 + tools:text="18.00€" />
286 + </androidx.constraintlayout.widget.ConstraintLayout>
287 + </androidx.cardview.widget.CardView>
288 +
289 + <androidx.cardview.widget.CardView
290 + android:id="@+id/cv_deals_win_inner"
276 android:layout_width="match_parent" 291 android:layout_width="match_parent"
277 android:layout_height="wrap_content" 292 android:layout_height="wrap_content"
278 - android:layout_below="@+id/cl_deals_win_inner_cos" 293 + android:layout_below="@+id/cv_deals_win_inner_cos"
279 android:layout_marginHorizontal="16dp" 294 android:layout_marginHorizontal="16dp"
280 android:layout_marginTop="6dp" 295 android:layout_marginTop="6dp"
281 - android:background="@drawable/shape_cos_white_border" 296 + app:cardCornerRadius="16dp"
282 - android:paddingHorizontal="6dp" 297 + app:cardElevation="2dp">
283 - android:paddingVertical="4dp">
284 298
285 - <androidx.constraintlayout.widget.Guideline 299 + <androidx.constraintlayout.widget.ConstraintLayout
286 - android:id="@+id/gl_horizontal_50" 300 + android:id="@+id/cl_deals_win_inner"
287 - android:layout_width="wrap_content" 301 + android:layout_width="match_parent"
288 - android:layout_height="match_parent"
289 - android:orientation="horizontal"
290 - app:layout_constraintGuide_percent="0.64" />
291 -
292 - <ImageView
293 - android:id="@+id/iv_gifts_logo"
294 - android:layout_width="76dp"
295 - android:layout_height="76dp"
296 - android:src="@drawable/ic_gifts_polygon_new"
297 - app:layout_constraintBottom_toBottomOf="parent"
298 - app:layout_constraintStart_toStartOf="parent"
299 - app:layout_constraintTop_toTopOf="parent" />
300 -
301 - <TextView
302 - android:id="@+id/tv_gifts_value_all"
303 - fontPath="fonts/PeridotPE-Regular.ttf"
304 - android:layout_width="0dp"
305 android:layout_height="wrap_content" 302 android:layout_height="wrap_content"
306 - android:layout_marginHorizontal="8dp" 303 + android:background="@color/white"
307 - android:includeFontPadding="false" 304 + android:paddingHorizontal="6dp"
308 - android:text="@string/cos_deals_win_title" 305 + android:paddingVertical="4dp">
309 - android:textColor="@color/cos_light_black"
310 - android:textSize="15sp"
311 - app:layout_constraintBottom_toBottomOf="parent"
312 - app:layout_constraintEnd_toEndOf="parent"
313 - app:layout_constraintStart_toEndOf="@+id/iv_gifts_logo"
314 - app:layout_constraintTop_toTopOf="parent" />
315 306
316 - <TextView 307 + <androidx.constraintlayout.widget.Guideline
317 - android:id="@+id/tv_gifts_value" 308 + android:id="@+id/gl_horizontal_50"
318 - fontPath="fonts/PeridotPE-Bold.ttf" 309 + android:layout_width="wrap_content"
319 - android:layout_width="wrap_content" 310 + android:layout_height="match_parent"
320 - android:layout_height="wrap_content" 311 + android:orientation="horizontal"
321 - android:includeFontPadding="false" 312 + app:layout_constraintGuide_percent="0.64" />
322 - android:textColor="@color/cos_light_black" 313 +
323 - android:textSize="14sp" 314 + <ImageView
324 - app:layout_constraintEnd_toEndOf="@+id/iv_gifts_logo" 315 + android:id="@+id/iv_gifts_logo"
325 - app:layout_constraintStart_toStartOf="@+id/iv_gifts_logo" 316 + android:layout_width="76dp"
326 - app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50" 317 + android:layout_height="76dp"
327 - tools:text="20.00€" /> 318 + android:src="@drawable/ic_gifts_polygon_new"
328 - </androidx.constraintlayout.widget.ConstraintLayout> 319 + app:layout_constraintBottom_toBottomOf="parent"
320 + app:layout_constraintStart_toStartOf="parent"
321 + app:layout_constraintTop_toTopOf="parent" />
329 322
330 - <androidx.constraintlayout.widget.ConstraintLayout 323 + <TextView
331 - android:id="@+id/cl_market_inner" 324 + android:id="@+id/tv_gifts_value_all"
325 + fontPath="fonts/PeridotPE-Regular.ttf"
326 + android:layout_width="0dp"
327 + android:layout_height="wrap_content"
328 + android:layout_marginHorizontal="8dp"
329 + android:includeFontPadding="false"
330 + android:text="@string/cos_deals_win_title"
331 + android:textColor="@color/cos_light_black"
332 + android:textSize="15sp"
333 + app:layout_constraintBottom_toBottomOf="parent"
334 + app:layout_constraintEnd_toEndOf="parent"
335 + app:layout_constraintStart_toEndOf="@+id/iv_gifts_logo"
336 + app:layout_constraintTop_toTopOf="parent" />
337 +
338 + <TextView
339 + android:id="@+id/tv_gifts_value"
340 + fontPath="fonts/PeridotPE-Bold.ttf"
341 + android:layout_width="wrap_content"
342 + android:layout_height="wrap_content"
343 + android:includeFontPadding="false"
344 + android:textColor="@color/cos_light_black"
345 + android:textSize="14sp"
346 + app:layout_constraintEnd_toEndOf="@+id/iv_gifts_logo"
347 + app:layout_constraintStart_toStartOf="@+id/iv_gifts_logo"
348 + app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50"
349 + tools:text="20.00€" />
350 + </androidx.constraintlayout.widget.ConstraintLayout>
351 + </androidx.cardview.widget.CardView>
352 +
353 + <androidx.cardview.widget.CardView
354 + android:id="@+id/cv_market_inner"
332 android:layout_width="match_parent" 355 android:layout_width="match_parent"
333 android:layout_height="wrap_content" 356 android:layout_height="wrap_content"
334 - android:layout_below="@+id/cl_deals_win_inner" 357 + android:layout_below="@+id/cv_deals_win_inner"
335 android:layout_marginHorizontal="16dp" 358 android:layout_marginHorizontal="16dp"
336 android:layout_marginTop="6dp" 359 android:layout_marginTop="6dp"
337 - android:background="@drawable/shape_cos_white_border" 360 + android:layout_marginBottom="6dp"
338 - android:paddingHorizontal="6dp" 361 + app:cardCornerRadius="16dp"
339 - android:paddingVertical="4dp"> 362 + app:cardElevation="2dp">
340 363
341 - <androidx.constraintlayout.widget.Guideline 364 + <androidx.constraintlayout.widget.ConstraintLayout
342 - android:id="@+id/gl_horizontal_50_market" 365 + android:id="@+id/cl_market_inner"
343 - android:layout_width="wrap_content" 366 + android:layout_width="match_parent"
344 - android:layout_height="match_parent" 367 + android:layout_height="wrap_content"
345 - android:orientation="horizontal" 368 + android:background="@color/white"
346 - app:layout_constraintGuide_percent="0.64" /> 369 + android:paddingHorizontal="6dp"
370 + android:paddingVertical="4dp">
347 371
348 - <ImageView 372 + <androidx.constraintlayout.widget.Guideline
349 - android:id="@+id/iv_market_logo" 373 + android:id="@+id/gl_horizontal_50_market"
350 - android:layout_width="76dp" 374 + android:layout_width="wrap_content"
351 - android:layout_height="76dp" 375 + android:layout_height="match_parent"
352 - android:src="@drawable/ic_market_polygon" 376 + android:orientation="horizontal"
353 - app:layout_constraintBottom_toBottomOf="parent" 377 + app:layout_constraintGuide_percent="0.64" />
354 - app:layout_constraintStart_toStartOf="parent" 378 +
355 - app:layout_constraintTop_toTopOf="parent" /> 379 + <ImageView
380 + android:id="@+id/iv_market_logo"
381 + android:layout_width="76dp"
382 + android:layout_height="76dp"
383 + android:src="@drawable/ic_market_polygon"
384 + app:layout_constraintBottom_toBottomOf="parent"
385 + app:layout_constraintStart_toStartOf="parent"
386 + app:layout_constraintTop_toTopOf="parent" />
356 387
357 - <TextView 388 + <TextView
358 - android:id="@+id/tv_market_value_all" 389 + android:id="@+id/tv_market_value_all"
359 - fontPath="fonts/PeridotPE-Regular.ttf" 390 + fontPath="fonts/PeridotPE-Regular.ttf"
360 - android:layout_width="0dp" 391 + android:layout_width="0dp"
361 - android:layout_height="wrap_content" 392 + android:layout_height="wrap_content"
362 - android:layout_marginHorizontal="8dp" 393 + android:layout_marginHorizontal="8dp"
363 - android:includeFontPadding="false" 394 + android:includeFontPadding="false"
364 - android:text="@string/cos_supermarket_win" 395 + android:text="@string/cos_supermarket_win"
365 - android:textColor="@color/cos_light_black" 396 + android:textColor="@color/cos_light_black"
366 - android:textSize="15sp" 397 + android:textSize="15sp"
367 - app:layout_constraintBottom_toBottomOf="parent" 398 + app:layout_constraintBottom_toBottomOf="parent"
368 - app:layout_constraintEnd_toEndOf="parent" 399 + app:layout_constraintEnd_toEndOf="parent"
369 - app:layout_constraintStart_toEndOf="@+id/iv_market_logo" 400 + app:layout_constraintStart_toEndOf="@+id/iv_market_logo"
370 - app:layout_constraintTop_toTopOf="parent" /> 401 + app:layout_constraintTop_toTopOf="parent" />
371 402
372 - <TextView 403 + <TextView
373 - android:id="@+id/tv_market_value" 404 + android:id="@+id/tv_market_value"
374 - fontPath="fonts/PeridotPE-Bold.ttf" 405 + fontPath="fonts/PeridotPE-Bold.ttf"
375 - android:layout_width="wrap_content" 406 + android:layout_width="wrap_content"
376 - android:layout_height="wrap_content" 407 + android:layout_height="wrap_content"
377 - android:includeFontPadding="false" 408 + android:includeFontPadding="false"
378 - android:textColor="@color/cos_light_black" 409 + android:textColor="@color/cos_light_black"
379 - android:textSize="14sp" 410 + android:textSize="14sp"
380 - app:layout_constraintEnd_toEndOf="@+id/iv_market_logo" 411 + app:layout_constraintEnd_toEndOf="@+id/iv_market_logo"
381 - app:layout_constraintStart_toStartOf="@+id/iv_market_logo" 412 + app:layout_constraintStart_toStartOf="@+id/iv_market_logo"
382 - app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50_market" 413 + app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50_market"
383 - tools:text="20.00€" /> 414 + tools:text="20.00€" />
384 - </androidx.constraintlayout.widget.ConstraintLayout> 415 + </androidx.constraintlayout.widget.ConstraintLayout>
416 + </androidx.cardview.widget.CardView>
385 </RelativeLayout> 417 </RelativeLayout>
386 </net.cachapa.expandablelayout.ExpandableLayout> 418 </net.cachapa.expandablelayout.ExpandableLayout>
387 419
...@@ -389,7 +421,7 @@ ...@@ -389,7 +421,7 @@
389 android:id="@+id/ll_market_view" 421 android:id="@+id/ll_market_view"
390 android:layout_width="match_parent" 422 android:layout_width="match_parent"
391 android:layout_height="wrap_content" 423 android:layout_height="wrap_content"
392 - android:layout_marginTop="24dp" 424 + android:layout_marginTop="20dp"
393 android:orientation="vertical" 425 android:orientation="vertical"
394 android:visibility="gone" 426 android:visibility="gone"
395 tools:visibility="visible"> 427 tools:visibility="visible">
...@@ -446,15 +478,14 @@ ...@@ -446,15 +478,14 @@
446 android:id="@+id/cl_mygifts" 478 android:id="@+id/cl_mygifts"
447 android:layout_width="match_parent" 479 android:layout_width="match_parent"
448 android:layout_height="wrap_content" 480 android:layout_height="wrap_content"
449 - android:layout_marginHorizontal="8dp"
450 - android:layout_marginTop="8dp"
451 android:background="@color/white" 481 android:background="@color/white"
452 - android:paddingVertical="10dp"> 482 + android:paddingVertical="8dp">
453 483
454 <LinearLayout 484 <LinearLayout
455 android:layout_width="0dp" 485 android:layout_width="0dp"
456 android:layout_height="wrap_content" 486 android:layout_height="wrap_content"
457 - android:layout_marginHorizontal="24dp" 487 + android:layout_marginEnd="24dp"
488 + android:layout_marginStart="20dp"
458 android:orientation="vertical" 489 android:orientation="vertical"
459 app:layout_constraintBottom_toBottomOf="parent" 490 app:layout_constraintBottom_toBottomOf="parent"
460 app:layout_constraintEnd_toStartOf="@+id/iv_deals_circle" 491 app:layout_constraintEnd_toStartOf="@+id/iv_deals_circle"
...@@ -514,7 +545,7 @@ ...@@ -514,7 +545,7 @@
514 android:layout_width="86dp" 545 android:layout_width="86dp"
515 android:layout_height="86dp" 546 android:layout_height="86dp"
516 android:layout_marginVertical="4dp" 547 android:layout_marginVertical="4dp"
517 - android:layout_marginEnd="32dp" 548 + android:layout_marginEnd="20dp"
518 android:src="@drawable/ic_deals_new" 549 android:src="@drawable/ic_deals_new"
519 app:layout_constraintBottom_toBottomOf="parent" 550 app:layout_constraintBottom_toBottomOf="parent"
520 app:layout_constraintEnd_toEndOf="parent" 551 app:layout_constraintEnd_toEndOf="parent"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:text="@string/cos_coupon_info_title" 29 android:text="@string/cos_coupon_info_title"
30 android:textColor="@color/cos_light_black" 30 android:textColor="@color/cos_light_black"
31 - android:textSize="21sp" 31 + android:textSize="19sp"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 app:layout_constraintEnd_toEndOf="parent"
34 app:layout_constraintStart_toStartOf="parent" 34 app:layout_constraintStart_toStartOf="parent"
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 <ImageView 56 <ImageView
57 android:id="@+id/imageView6" 57 android:id="@+id/imageView6"
58 android:layout_width="match_parent" 58 android:layout_width="match_parent"
59 - android:layout_height="295dp" 59 + android:layout_height="255dp"
60 android:scaleType="centerCrop" 60 android:scaleType="centerCrop"
61 android:src="@drawable/unified_coupon_banner" /> 61 android:src="@drawable/unified_coupon_banner" />
62 62
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
189 android:layout_height="wrap_content" 189 android:layout_height="wrap_content"
190 android:text="@string/cos_hide_market_coupons" 190 android:text="@string/cos_hide_market_coupons"
191 android:textColor="@color/cos_light_black" 191 android:textColor="@color/cos_light_black"
192 - android:textSize="16sp" /> 192 + android:textSize="15sp" />
193 193
194 <ImageView 194 <ImageView
195 android:id="@+id/iv_market_expand" 195 android:id="@+id/iv_market_expand"
...@@ -283,7 +283,8 @@ ...@@ -283,7 +283,8 @@
283 android:layout_marginHorizontal="32dp" 283 android:layout_marginHorizontal="32dp"
284 android:layout_marginTop="16dp" 284 android:layout_marginTop="16dp"
285 android:text="@string/cos_market_terms" 285 android:text="@string/cos_market_terms"
286 - android:textColor="@color/cos_gray" 286 + android:textColor="@color/cos_light_black"
287 + android:textSize="14sp"
287 android:visibility="gone" 288 android:visibility="gone"
288 tools:visibility="visible"/> 289 tools:visibility="visible"/>
289 </RelativeLayout> 290 </RelativeLayout>
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
5 xmlns:tools="http://schemas.android.com/tools" 5 xmlns:tools="http://schemas.android.com/tools"
6 android:id="@+id/cl_custom_layout" 6 android:id="@+id/cl_custom_layout"
7 android:layout_width="match_parent" 7 android:layout_width="match_parent"
8 - android:layout_height="150dp" 8 + android:layout_height="145dp"
9 - android:layout_marginHorizontal="4dp" 9 + android:layout_marginHorizontal="6dp"
10 - android:layout_marginVertical="4dp" 10 + android:layout_marginBottom="4dp"
11 - android:background="@drawable/ic_coupon_background_new2"> 11 + android:background="@drawable/ic_coupon_background_new3">
12 12
13 <ImageView 13 <ImageView
14 android:id="@+id/iv_active_coupon" 14 android:id="@+id/iv_active_coupon"
......
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
4 xmlns:custom="http://schemas.android.com/apk/res-auto" 4 xmlns:custom="http://schemas.android.com/apk/res-auto"
5 xmlns:tools="http://schemas.android.com/tools" 5 xmlns:tools="http://schemas.android.com/tools"
6 android:layout_width="match_parent" 6 android:layout_width="match_parent"
7 - android:layout_height="150dp" 7 + android:layout_height="145dp"
8 - android:layout_marginHorizontal="4dp" 8 + android:layout_marginHorizontal="6dp"
9 - android:layout_marginVertical="4dp" 9 + android:layout_marginBottom="3dp"
10 - android:background="@drawable/ic_coupon_background_new2"> 10 + android:background="@drawable/ic_coupon_background_new3">
11 11
12 <androidx.constraintlayout.widget.Guideline 12 <androidx.constraintlayout.widget.Guideline
13 android:id="@+id/gl_vertical_72_percent" 13 android:id="@+id/gl_vertical_72_percent"
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 <ly.warp.sdk.views.DividerView 30 <ly.warp.sdk.views.DividerView
31 android:id="@+id/v_separator" 31 android:id="@+id/v_separator"
32 android:layout_width="1dp" 32 android:layout_width="1dp"
33 - android:layout_height="match_parent" 33 + android:layout_height="0dp"
34 android:layout_marginVertical="16dp" 34 android:layout_marginVertical="16dp"
35 android:layout_marginStart="16dp" 35 android:layout_marginStart="16dp"
36 android:layerType="software" 36 android:layerType="software"
......