open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
9a959169 1 parent 5d0e0dc0

merge with redesign part2

Inline Side-by-side
Showing 18 changed files with 44 additions and 44 deletions
...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library' ...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
2 2
3 ext { 3 ext {
4 PUBLISH_GROUP_ID = 'ly.warp' 4 PUBLISH_GROUP_ID = 'ly.warp'
5 - PUBLISH_VERSION = '4.5.4.6rc53' 5 + PUBLISH_VERSION = '4.5.4.6rc54'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <shape xmlns:android="http://schemas.android.com/apk/res/android"> 2 <shape xmlns:android="http://schemas.android.com/apk/res/android">
3 <solid android:color="@color/white"/> 3 <solid android:color="@color/white"/>
4 - <stroke android:width="2dp" android:color="@color/cos_green12" /> 4 + <stroke android:width="1.5dp" android:color="@color/cos_green12" />
5 - <corners android:radius="16dp" /> 5 + <corners android:radius="15dp" />
6 </shape> 6 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <shape xmlns:android="http://schemas.android.com/apk/res/android"> 2 <shape xmlns:android="http://schemas.android.com/apk/res/android">
3 <solid android:color="@color/white"/> 3 <solid android:color="@color/white"/>
4 - <stroke android:width="2dp" android:color="@color/cos_green6_tr" /> 4 + <stroke android:width="1.5dp" android:color="@color/cos_green6_tr" />
5 - <corners android:radius="16dp" /> 5 + <corners android:radius="15dp" />
6 </shape> 6 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
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="6dp" 8 android:layout_marginHorizontal="6dp"
9 android:layout_marginBottom="3dp" 9 android:layout_marginBottom="3dp"
10 android:background="@drawable/ic_coupon_background_new3"> 10 android:background="@drawable/ic_coupon_background_new3">
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 android:gravity="center" 31 android:gravity="center"
32 android:text="@string/cos_active_all_coupons" 32 android:text="@string/cos_active_all_coupons"
33 android:textColor="@color/cos_light_black" 33 android:textColor="@color/cos_light_black"
34 - android:textSize="21sp" 34 + android:textSize="19sp"
35 fontPath="fonts/BTCosmo-Bold.ttf" 35 fontPath="fonts/BTCosmo-Bold.ttf"
36 app:layout_constraintBottom_toBottomOf="parent" 36 app:layout_constraintBottom_toBottomOf="parent"
37 app:layout_constraintEnd_toEndOf="parent" 37 app:layout_constraintEnd_toEndOf="parent"
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 android:layout_width="wrap_content" 27 android:layout_width="wrap_content"
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:textColor="@color/cos_light_black" 29 android:textColor="@color/cos_light_black"
30 - android:textSize="21sp" 30 + android:textSize="19sp"
31 app:layout_constraintBottom_toBottomOf="parent" 31 app:layout_constraintBottom_toBottomOf="parent"
32 app:layout_constraintEnd_toEndOf="parent" 32 app:layout_constraintEnd_toEndOf="parent"
33 app:layout_constraintStart_toStartOf="parent" 33 app:layout_constraintStart_toStartOf="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"
...@@ -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="18sp" /> 109 + android:textSize="16sp" />
110 110
111 <TextView 111 <TextView
112 android:id="@+id/textView16" 112 android:id="@+id/textView16"
...@@ -212,13 +212,13 @@ ...@@ -212,13 +212,13 @@
212 android:layout_gravity="center" 212 android:layout_gravity="center"
213 android:layout_marginTop="24dp" 213 android:layout_marginTop="24dp"
214 android:textColor="@color/cos_light_black" 214 android:textColor="@color/cos_light_black"
215 - android:textSize="16sp" 215 + android:textSize="15sp"
216 tools:text="@string/cos_coupon_date" /> 216 tools:text="@string/cos_coupon_date" />
217 217
218 <LinearLayout 218 <LinearLayout
219 android:id="@+id/ll_gift_it" 219 android:id="@+id/ll_gift_it"
220 - android:layout_width="160dp" 220 + android:layout_width="140dp"
221 - android:layout_height="55dp" 221 + android:layout_height="45dp"
222 android:layout_gravity="center" 222 android:layout_gravity="center"
223 android:layout_marginHorizontal="32dp" 223 android:layout_marginHorizontal="32dp"
224 android:layout_marginTop="32dp" 224 android:layout_marginTop="32dp"
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
244 android:layout_height="55dp" 244 android:layout_height="55dp"
245 android:layout_gravity="center" 245 android:layout_gravity="center"
246 android:layout_marginHorizontal="32dp" 246 android:layout_marginHorizontal="32dp"
247 - android:layout_marginTop="24dp" 247 + android:layout_marginTop="12dp"
248 android:background="@drawable/selector_button_green_border" 248 android:background="@drawable/selector_button_green_border"
249 android:gravity="center" 249 android:gravity="center"
250 android:orientation="horizontal" 250 android:orientation="horizontal"
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
269 android:layout_height="55dp" 269 android:layout_height="55dp"
270 android:layout_gravity="center" 270 android:layout_gravity="center"
271 android:layout_marginHorizontal="32dp" 271 android:layout_marginHorizontal="32dp"
272 - android:layout_marginTop="24dp" 272 + android:layout_marginTop="12dp"
273 android:background="@drawable/selector_button_green_border" 273 android:background="@drawable/selector_button_green_border"
274 android:gravity="center" 274 android:gravity="center"
275 android:orientation="horizontal" 275 android:orientation="horizontal"
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
331 android:layout_marginHorizontal="32dp" 331 android:layout_marginHorizontal="32dp"
332 android:layout_marginTop="16dp" 332 android:layout_marginTop="16dp"
333 android:textColor="@color/cos_light_black" 333 android:textColor="@color/cos_light_black"
334 - android:textSize="16sp" 334 + android:textSize="14sp"
335 android:visibility="gone" 335 android:visibility="gone"
336 tools:text="@string/cos_coupon_date" 336 tools:text="@string/cos_coupon_date"
337 tools:visibility="visible" /> 337 tools:visibility="visible" />
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 android:layout_height="wrap_content" 27 android:layout_height="wrap_content"
28 android:text="@string/cos_coupon_gift" 28 android:text="@string/cos_coupon_gift"
29 android:textColor="@color/cos_light_black" 29 android:textColor="@color/cos_light_black"
30 - android:textSize="21sp" 30 + android:textSize="19sp"
31 fontPath="fonts/BTCosmo-Bold.ttf" 31 fontPath="fonts/BTCosmo-Bold.ttf"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 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"
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
85 85
86 <LinearLayout 86 <LinearLayout
87 android:id="@+id/ll_get_gift" 87 android:id="@+id/ll_get_gift"
88 - android:layout_width="160dp" 88 + android:layout_width="140dp"
89 - android:layout_height="55dp" 89 + android:layout_height="45dp"
90 android:layout_marginTop="27dp" 90 android:layout_marginTop="27dp"
91 android:background="@drawable/selector_button_green" 91 android:background="@drawable/selector_button_green"
92 android:gravity="center" 92 android:gravity="center"
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 android:layout_marginHorizontal="32dp" 145 android:layout_marginHorizontal="32dp"
146 android:layout_marginTop="16dp" 146 android:layout_marginTop="16dp"
147 android:textColor="@color/cos_light_black" 147 android:textColor="@color/cos_light_black"
148 - android:textSize="16sp" 148 + android:textSize="14sp"
149 android:visibility="gone" 149 android:visibility="gone"
150 tools:text="@string/cos_coupon_date" 150 tools:text="@string/cos_coupon_date"
151 tools:visibility="visible" /> 151 tools:visibility="visible" />
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 android:layout_height="wrap_content" 31 android:layout_height="wrap_content"
32 android:gravity="center" 32 android:gravity="center"
33 android:textColor="@color/cos_light_black" 33 android:textColor="@color/cos_light_black"
34 - android:textSize="21sp" 34 + android:textSize="19sp"
35 fontPath="fonts/BTCosmo-Bold.ttf" 35 fontPath="fonts/BTCosmo-Bold.ttf"
36 android:text="@string/cos_gifts_title" 36 android:text="@string/cos_gifts_title"
37 app:layout_constraintBottom_toBottomOf="parent" 37 app:layout_constraintBottom_toBottomOf="parent"
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
31 android:text="@string/cos_analysis" 31 android:text="@string/cos_analysis"
32 android:textColor="@color/cos_light_black" 32 android:textColor="@color/cos_light_black"
33 - android:textSize="21sp" 33 + android:textSize="19sp"
34 app:layout_constraintBottom_toBottomOf="parent" 34 app:layout_constraintBottom_toBottomOf="parent"
35 app:layout_constraintEnd_toEndOf="parent" 35 app:layout_constraintEnd_toEndOf="parent"
36 app:layout_constraintStart_toStartOf="parent" 36 app:layout_constraintStart_toStartOf="parent"
...@@ -65,12 +65,12 @@ ...@@ -65,12 +65,12 @@
65 <RelativeLayout 65 <RelativeLayout
66 android:layout_width="match_parent" 66 android:layout_width="match_parent"
67 android:layout_height="wrap_content" 67 android:layout_height="wrap_content"
68 - android:paddingVertical="24dp"> 68 + android:paddingVertical="20dp">
69 69
70 <ImageView 70 <ImageView
71 android:id="@+id/iv_gift_circle_logo" 71 android:id="@+id/iv_gift_circle_logo"
72 - android:layout_width="120dp" 72 + android:layout_width="95dp"
73 - android:layout_height="120dp" 73 + android:layout_height="95dp"
74 android:layout_centerHorizontal="true" 74 android:layout_centerHorizontal="true"
75 android:src="@drawable/ic_gift_circle" /> 75 android:src="@drawable/ic_gift_circle" />
76 76
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
79 android:layout_width="match_parent" 79 android:layout_width="match_parent"
80 android:layout_height="wrap_content" 80 android:layout_height="wrap_content"
81 android:layout_below="@+id/iv_gift_circle_logo" 81 android:layout_below="@+id/iv_gift_circle_logo"
82 - android:layout_marginTop="30dp" 82 + android:layout_marginTop="26dp"
83 tools:visibility="gone"> 83 tools:visibility="gone">
84 84
85 <androidx.cardview.widget.CardView 85 <androidx.cardview.widget.CardView
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
97 android:layout_height="wrap_content" 97 android:layout_height="wrap_content"
98 android:background="@color/white" 98 android:background="@color/white"
99 android:gravity="center" 99 android:gravity="center"
100 - android:paddingVertical="16dp"> 100 + android:paddingVertical="12dp">
101 101
102 <TextView 102 <TextView
103 android:id="@+id/tv_expired_coupons_title" 103 android:id="@+id/tv_expired_coupons_title"
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
207 android:layout_height="wrap_content" 207 android:layout_height="wrap_content"
208 android:layout_below="@+id/iv_gift_circle_logo" 208 android:layout_below="@+id/iv_gift_circle_logo"
209 android:layout_marginHorizontal="12dp" 209 android:layout_marginHorizontal="12dp"
210 - android:layout_marginTop="30dp" 210 + android:layout_marginTop="26dp"
211 android:layout_marginBottom="6dp" 211 android:layout_marginBottom="6dp"
212 android:visibility="gone" 212 android:visibility="gone"
213 app:cardCornerRadius="16dp" 213 app:cardCornerRadius="16dp"
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
31 android:text="@string/cos_analysis" 31 android:text="@string/cos_analysis"
32 android:textColor="@color/cos_light_black" 32 android:textColor="@color/cos_light_black"
33 - android:textSize="21sp" 33 + android:textSize="19sp"
34 app:layout_constraintBottom_toBottomOf="parent" 34 app:layout_constraintBottom_toBottomOf="parent"
35 app:layout_constraintEnd_toEndOf="parent" 35 app:layout_constraintEnd_toEndOf="parent"
36 app:layout_constraintStart_toStartOf="parent" 36 app:layout_constraintStart_toStartOf="parent"
...@@ -65,12 +65,12 @@ ...@@ -65,12 +65,12 @@
65 <RelativeLayout 65 <RelativeLayout
66 android:layout_width="match_parent" 66 android:layout_width="match_parent"
67 android:layout_height="wrap_content" 67 android:layout_height="wrap_content"
68 - android:paddingVertical="24dp"> 68 + android:paddingVertical="20dp">
69 69
70 <ImageView 70 <ImageView
71 android:id="@+id/iv_gift_circle_logo" 71 android:id="@+id/iv_gift_circle_logo"
72 - android:layout_width="120dp" 72 + android:layout_width="95dp"
73 - android:layout_height="120dp" 73 + android:layout_height="95dp"
74 android:layout_centerHorizontal="true" 74 android:layout_centerHorizontal="true"
75 android:src="@drawable/ic_market_circle" /> 75 android:src="@drawable/ic_market_circle" />
76 76
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
79 android:layout_width="match_parent" 79 android:layout_width="match_parent"
80 android:layout_height="wrap_content" 80 android:layout_height="wrap_content"
81 android:layout_below="@+id/iv_gift_circle_logo" 81 android:layout_below="@+id/iv_gift_circle_logo"
82 - android:layout_marginTop="32dp" 82 + android:layout_marginTop="26dp"
83 tools:visibility="gone"> 83 tools:visibility="gone">
84 84
85 <androidx.cardview.widget.CardView 85 <androidx.cardview.widget.CardView
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
97 android:layout_height="wrap_content" 97 android:layout_height="wrap_content"
98 android:background="@color/white" 98 android:background="@color/white"
99 android:gravity="center" 99 android:gravity="center"
100 - android:paddingVertical="16dp"> 100 + android:paddingVertical="12dp">
101 101
102 <TextView 102 <TextView
103 android:id="@+id/tv_expired_coupons_title" 103 android:id="@+id/tv_expired_coupons_title"
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
208 android:layout_height="wrap_content" 208 android:layout_height="wrap_content"
209 android:layout_below="@+id/iv_gift_circle_logo" 209 android:layout_below="@+id/iv_gift_circle_logo"
210 android:layout_marginHorizontal="12dp" 210 android:layout_marginHorizontal="12dp"
211 - android:layout_marginTop="30dp" 211 + android:layout_marginTop="26dp"
212 android:layout_marginBottom="6dp" 212 android:layout_marginBottom="6dp"
213 android:visibility="gone" 213 android:visibility="gone"
214 app:cardCornerRadius="16dp" 214 app:cardCornerRadius="16dp"
......
...@@ -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_profile_title" 29 android:text="@string/cos_profile_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"
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
94 94
95 <TextView 95 <TextView
96 android:id="@+id/tv_type" 96 android:id="@+id/tv_type"
97 - fontPath="fonts/PeridotPE-Bold.ttf" 97 + fontPath="fonts/PeridotPE-SemiBold.ttf"
98 android:layout_width="wrap_content" 98 android:layout_width="wrap_content"
99 android:layout_height="wrap_content" 99 android:layout_height="wrap_content"
100 android:layout_marginHorizontal="20dp" 100 android:layout_marginHorizontal="20dp"
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
115 115
116 <TextView 116 <TextView
117 android:id="@+id/tv_questionnaire" 117 android:id="@+id/tv_questionnaire"
118 - fontPath="fonts/PeridotPE-Bold.ttf" 118 + fontPath="fonts/PeridotPE-SemiBold.ttf"
119 android:layout_width="wrap_content" 119 android:layout_width="wrap_content"
120 android:layout_height="wrap_content" 120 android:layout_height="wrap_content"
121 android:includeFontPadding="false" 121 android:includeFontPadding="false"
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 android:gravity="center" 33 android:gravity="center"
34 android:text="@string/cos_more_title" 34 android:text="@string/cos_more_title"
35 android:textColor="@color/cos_light_black" 35 android:textColor="@color/cos_light_black"
36 - android:textSize="21sp" 36 + android:textSize="19sp"
37 app:layout_constraintBottom_toBottomOf="parent" 37 app:layout_constraintBottom_toBottomOf="parent"
38 app:layout_constraintEnd_toEndOf="parent" 38 app:layout_constraintEnd_toEndOf="parent"
39 app:layout_constraintStart_toStartOf="parent" 39 app:layout_constraintStart_toStartOf="parent"
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 android:layout_height="wrap_content" 27 android:layout_height="wrap_content"
28 android:text="@string/cos_coupon_shops_title" 28 android:text="@string/cos_coupon_shops_title"
29 android:textColor="@color/cos_light_black" 29 android:textColor="@color/cos_light_black"
30 - android:textSize="21sp" 30 + android:textSize="19sp"
31 fontPath="fonts/BTCosmo-Bold.ttf" 31 fontPath="fonts/BTCosmo-Bold.ttf"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 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_shops_title" 29 android:text="@string/cos_coupon_shops_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"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 android:layout_width="wrap_content" 28 android:layout_width="wrap_content"
29 android:layout_height="wrap_content" 29 android:layout_height="wrap_content"
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"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 xmlns:app="http://schemas.android.com/apk/res-auto" 3 xmlns:app="http://schemas.android.com/apk/res-auto"
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 - android:layout_height="150dp" 6 + android:layout_height="143dp"
7 android:layout_marginBottom="12dp"> 7 android:layout_marginBottom="12dp">
8 8
9 <androidx.cardview.widget.CardView 9 <androidx.cardview.widget.CardView
......