open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
1075cbbe 1 parent fb61c83c

fixes

Inline Side-by-side
Showing 11 changed files with 363 additions and 353 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-cosbeta59' 5 + PUBLISH_VERSION = '4.5.4-cosbeta60'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -221,9 +221,16 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -221,9 +221,16 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
221 mLlTerms.setOnClickListener(this); 221 mLlTerms.setOnClickListener(this);
222 222
223 String tempCoupon = mCoupon.getCoupon(); 223 String tempCoupon = mCoupon.getCoupon();
224 + int result = 0;
224 for (int i = 0; i < (12 - mCoupon.getCoupon().length()); i++) { 225 for (int i = 0; i < (12 - mCoupon.getCoupon().length()); i++) {
225 tempCoupon += "0"; 226 tempCoupon += "0";
226 } 227 }
228 +
229 + for (int i = mCoupon.getCoupon().length() - 1; i >= 0; i--) {
230 + result = result + Integer.parseInt(String.valueOf((mCoupon.getCoupon()).charAt(i))) * (1 + (2 * (i % 2)));
231 + }
232 +
233 + tempCoupon = tempCoupon + (10 - (result % 10)) % 10;
227 createBarcodeBitmap(tempCoupon); 234 createBarcodeBitmap(tempCoupon);
228 } 235 }
229 236
......
...@@ -161,6 +161,8 @@ public class TelcoActivity extends Activity implements View.OnClickListener { ...@@ -161,6 +161,8 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
161 private void showActivationDialog() { 161 private void showActivationDialog() {
162 final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this); 162 final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this);
163 bottomSheetDialog.setContentView(R.layout.dl_share); 163 bottomSheetDialog.setContentView(R.layout.dl_share);
164 + TextView tvHeader = bottomSheetDialog.findViewById(R.id.tv_sender_value);
165 + tvHeader.setText(R.string.cos_coupon_share_telco);
164 LinearLayout parent = bottomSheetDialog.findViewById(R.id.ll_share_dialog_view_inner); 166 LinearLayout parent = bottomSheetDialog.findViewById(R.id.ll_share_dialog_view_inner);
165 167
166 ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_sender_list_close); 168 ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_sender_list_close);
......
...@@ -60,7 +60,7 @@ public class WarplyHealthService extends Service implements SensorEventListener ...@@ -60,7 +60,7 @@ public class WarplyHealthService extends Service implements SensorEventListener
60 private final int ACCEL_RING_SIZE = 50; 60 private final int ACCEL_RING_SIZE = 50;
61 private final int VEL_RING_SIZE = 10; 61 private final int VEL_RING_SIZE = 10;
62 // change this threshold according to your sensitivity preferences 62 // change this threshold according to your sensitivity preferences
63 - private final float STEP_THRESHOLD = 20f; 63 + private final float STEP_THRESHOLD = 10f; // default 40, cosmote default 20
64 private final int STEP_DELAY_NS = 250000000; 64 private final int STEP_DELAY_NS = 250000000;
65 private int accelRingCounter = 0; 65 private int accelRingCounter = 0;
66 private float[] accelRingX = new float[ACCEL_RING_SIZE]; 66 private float[] accelRingX = new float[ACCEL_RING_SIZE];
...@@ -101,7 +101,7 @@ public class WarplyHealthService extends Service implements SensorEventListener ...@@ -101,7 +101,7 @@ public class WarplyHealthService extends Service implements SensorEventListener
101 b.setDefaults(Notification.DEFAULT_VIBRATE | Notification.DEFAULT_LIGHTS); 101 b.setDefaults(Notification.DEFAULT_VIBRATE | Notification.DEFAULT_LIGHTS);
102 b.setChannelId(STEPS_CHANNEL_ID); 102 b.setChannelId(STEPS_CHANNEL_ID);
103 b.setContentTitle(getString(R.string.cos_steps_for_good_notification_title)); 103 b.setContentTitle(getString(R.string.cos_steps_for_good_notification_title));
104 - b.setContentText("Subtitle"); 104 + b.setContentText(getString(R.string.cos_steps_for_good_notification_subtitle));
105 b.setContentIntent(pbIntent); 105 b.setContentIntent(pbIntent);
106 b.setAutoCancel(true); 106 b.setAutoCancel(true);
107 b.setOngoing(true); 107 b.setOngoing(true);
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 + <item>
4 + <shape android:shape="rectangle">
5 + <solid android:color="@color/cos_grey10" />
6 + <corners android:radius="7dp" />
7 + </shape>
8 + </item>
9 +
10 + <item
11 + android:bottom="2dp"
12 + android:left="0dp"
13 + android:right="0dp"
14 + android:top="0dp">
15 + <shape android:shape="rectangle">
16 + <gradient
17 + android:endColor="@color/cos_skyblue"
18 + android:startColor="@color/cos_green9"
19 + android:type="linear" />
20 + <corners android:radius="7dp" />
21 + </shape>
22 + </item>
23 +</layer-list>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 + <item>
4 + <shape xmlns:android="http://schemas.android.com/apk/res/android"
5 + android:shape="rectangle">
6 + <corners android:topLeftRadius="30dp" />
7 + <solid android:color="@color/cos_grey5" />
8 + </shape>
9 + </item>
10 +</layer-list>
...\ No newline at end of file ...\ No newline at end of file
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
43 <RelativeLayout 43 <RelativeLayout
44 android:layout_width="match_parent" 44 android:layout_width="match_parent"
45 android:layout_height="match_parent" 45 android:layout_height="match_parent"
46 - android:background="@drawable/shape_cos_loyalty" 46 + android:background="@drawable/shape_cos_loyalty_no_border"
47 android:orientation="vertical"> 47 android:orientation="vertical">
48 48
49 <LinearLayout 49 <LinearLayout
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 - android:background="@android:color/white"> 6 + android:background="@color/cos_grey5">
7 7
8 <androidx.constraintlayout.widget.ConstraintLayout 8 <androidx.constraintlayout.widget.ConstraintLayout
9 android:id="@+id/cl_loyalty_wallet_header" 9 android:id="@+id/cl_loyalty_wallet_header"
...@@ -34,407 +34,372 @@ ...@@ -34,407 +34,372 @@
34 app:layout_constraintTop_toTopOf="parent" /> 34 app:layout_constraintTop_toTopOf="parent" />
35 </androidx.constraintlayout.widget.ConstraintLayout> 35 </androidx.constraintlayout.widget.ConstraintLayout>
36 36
37 - <!-- <ScrollView--> 37 + <LinearLayout
38 - <!-- android:layout_width="match_parent"--> 38 + android:id="@+id/ll_first_view"
39 - <!-- android:layout_height="match_parent"-->
40 - <!-- android:layout_below="@+id/cl_header"-->
41 - <!-- android:fillViewport="true">-->
42 -
43 - <!-- <RelativeLayout-->
44 - <!-- android:layout_width="match_parent"-->
45 - <!-- android:layout_height="wrap_content"-->
46 - <!-- android:background="@drawable/shape_cos_loyalty"-->
47 - <!-- android:orientation="vertical"-->
48 - <!-- android:paddingBottom="24dp">-->
49 -
50 -
51 - <!-- <ImageView-->
52 - <!-- android:id="@+id/iv_deals_logo_new"-->
53 - <!-- android:layout_width="wrap_content"-->
54 - <!-- android:layout_height="wrap_content"-->
55 - <!-- android:layout_below="@id/cl_deals_win"-->
56 - <!-- android:layout_marginStart="12dp"-->
57 - <!-- android:layout_marginTop="48dp"-->
58 - <!-- android:src="@drawable/ic_deals_logo_new" />-->
59 -
60 -
61 - <!-- <TextView-->
62 - <!-- android:id="@+id/tv_mygifts_title"-->
63 - <!-- android:layout_width="wrap_content"-->
64 - <!-- android:layout_height="wrap_content"-->
65 - <!-- android:layout_below="@+id/cl_loyalty_deals"-->
66 - <!-- android:layout_marginStart="12dp"-->
67 - <!-- android:layout_marginTop="48dp"-->
68 - <!-- android:text="@string/cos_mygifts"-->
69 - <!-- android:textColor="@android:color/white"-->
70 - <!-- android:textFontWeight="600"-->
71 - <!-- android:textSize="18sp" />-->
72 -
73 -
74 - <!-- </RelativeLayout>-->
75 - <!-- </ScrollView>-->
76 -
77 - <ScrollView
78 android:layout_width="match_parent" 39 android:layout_width="match_parent"
79 - android:layout_height="match_parent" 40 + android:layout_height="wrap_content"
80 android:layout_below="@+id/cl_loyalty_wallet_header" 41 android:layout_below="@+id/cl_loyalty_wallet_header"
81 - android:background="@color/cos_grey5" 42 + android:background="@drawable/ic_background_circle"
82 - android:fillViewport="true"> 43 + android:gravity="center_horizontal"
44 + android:orientation="vertical"
45 + android:paddingVertical="32dp">
46 +
47 + <de.hdodenhof.circleimageview.CircleImageView
48 + android:id="@+id/iv_profile_photo"
49 + android:layout_width="70dp"
50 + android:layout_height="70dp"
51 + android:src="@drawable/ic_default_photo"
52 + app:layout_constraintBottom_toBottomOf="parent"
53 + app:layout_constraintLeft_toLeftOf="parent"
54 + app:layout_constraintTop_toTopOf="parent" />
83 55
84 - <RelativeLayout 56 + <TextView
85 - android:layout_width="match_parent" 57 + android:id="@+id/tv_profile_name"
86 - android:layout_height="match_parent"> 58 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
59 + android:layout_width="wrap_content"
60 + android:layout_height="wrap_content"
61 + android:layout_marginVertical="6dp"
62 + android:maxLines="1"
63 + android:textColor="@color/grey"
64 + android:textSize="15sp"
65 + tools:text="Test Name" />
87 66
88 - <LinearLayout 67 + <LinearLayout
89 - android:id="@+id/ll_first_view" 68 + android:id="@+id/ll_user_badge"
90 - android:layout_width="match_parent" 69 + android:layout_width="wrap_content"
70 + android:layout_height="wrap_content"
71 + android:background="@drawable/shape_cos_gradient6"
72 + android:gravity="center"
73 + android:paddingHorizontal="10dp"
74 + android:paddingVertical="3dp"
75 + android:visibility="gone"
76 + tools:visibility="gone">
77 +
78 + <TextView
79 + android:id="@+id/tv_type"
80 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
81 + android:layout_width="wrap_content"
91 android:layout_height="wrap_content" 82 android:layout_height="wrap_content"
92 - android:background="@drawable/ic_background_circle" 83 + android:textColor="@android:color/white"
93 - android:gravity="center_horizontal" 84 + tools:text="@string/cos_profile_type" />
94 - android:orientation="vertical" 85 + </LinearLayout>
95 - android:paddingVertical="32dp">
96 -
97 - <de.hdodenhof.circleimageview.CircleImageView
98 - android:id="@+id/iv_profile_photo"
99 - android:layout_width="70dp"
100 - android:layout_height="70dp"
101 - android:src="@drawable/ic_default_photo"
102 - app:layout_constraintBottom_toBottomOf="parent"
103 - app:layout_constraintLeft_toLeftOf="parent"
104 - app:layout_constraintTop_toTopOf="parent" />
105 -
106 - <TextView
107 - android:id="@+id/tv_profile_name"
108 - fontPath="fonts/pf_square_sans_pro_regular.ttf"
109 - android:layout_width="wrap_content"
110 - android:layout_height="wrap_content"
111 - android:layout_marginVertical="6dp"
112 - android:maxLines="1"
113 - android:textColor="@color/grey"
114 - android:textSize="15sp"
115 - tools:text="Test Name" />
116 86
117 - <LinearLayout 87 + <LinearLayout
118 - android:id="@+id/ll_user_badge" 88 + android:id="@+id/ll_user_questionnaire"
119 - android:layout_width="wrap_content" 89 + android:layout_width="wrap_content"
120 - android:layout_height="wrap_content" 90 + android:layout_height="wrap_content"
121 - android:background="@drawable/shape_cos_gradient6" 91 + android:background="@drawable/shape_cos_grey5"
122 - android:gravity="center" 92 + android:gravity="center"
123 - android:paddingHorizontal="10dp" 93 + android:paddingHorizontal="8dp"
124 - android:paddingVertical="3dp" 94 + android:paddingVertical="4dp"
125 - android:visibility="gone" 95 + android:visibility="gone"
126 - tools:visibility="gone"> 96 + tools:visibility="visible">
127 - 97 +
128 - <TextView 98 + <TextView
129 - android:id="@+id/tv_type" 99 + android:id="@+id/tv_questionnaire"
130 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 100 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
131 - android:layout_width="wrap_content" 101 + android:layout_width="wrap_content"
132 - android:layout_height="wrap_content" 102 + android:layout_height="wrap_content"
133 - android:textColor="@android:color/white" 103 + android:text="@string/cos_profile_preferences"
134 - tools:text="@string/cos_profile_type" /> 104 + android:textColor="@color/cos_green6" />
135 - </LinearLayout> 105 + </LinearLayout>
106 + </LinearLayout>
136 107
137 - <LinearLayout 108 + <RelativeLayout
138 - android:id="@+id/ll_user_questionnaire" 109 + android:layout_width="match_parent"
139 - android:layout_width="wrap_content" 110 + android:layout_height="match_parent"
140 - android:layout_height="wrap_content" 111 + android:layout_below="@+id/ll_first_view"
141 - android:background="@drawable/shape_cos_grey5" 112 + android:background="@color/cos_grey5">
142 - android:gravity="center"
143 - android:paddingHorizontal="8dp"
144 - android:paddingVertical="4dp"
145 - android:visibility="gone"
146 - tools:visibility="visible">
147 113
148 - <TextView 114 + <ScrollView
149 - android:id="@+id/tv_questionnaire" 115 + android:layout_width="match_parent"
150 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 116 + android:layout_height="match_parent"
151 - android:layout_width="wrap_content" 117 + android:background="@color/cos_grey5"
152 - android:layout_height="wrap_content" 118 + android:fillViewport="true">
153 - android:text="@string/cos_profile_preferences"
154 - android:textColor="@color/cos_green6" />
155 - </LinearLayout>
156 - </LinearLayout>
157 119
158 - <LinearLayout 120 + <RelativeLayout
159 - android:id="@+id/ll_second_view"
160 android:layout_width="match_parent" 121 android:layout_width="match_parent"
161 - android:layout_height="match_parent" 122 + android:layout_height="wrap_content">
162 - android:layout_below="@+id/ll_first_view"
163 - android:gravity="center_horizontal"
164 - android:orientation="vertical">
165 123
166 - <androidx.constraintlayout.widget.ConstraintLayout 124 + <LinearLayout
167 - android:id="@+id/cl_deals_cos" 125 + android:id="@+id/ll_second_view"
168 android:layout_width="match_parent" 126 android:layout_width="match_parent"
169 - android:layout_height="wrap_content" 127 + android:layout_height="match_parent"
170 - android:layout_marginHorizontal="8dp" 128 + android:gravity="center_horizontal"
171 - android:layout_marginTop="32dp"> 129 + android:orientation="vertical">
172 -
173 - <androidx.constraintlayout.widget.Guideline
174 - android:id="@+id/gl_vertical_06_cos"
175 - android:layout_width="wrap_content"
176 - android:layout_height="match_parent"
177 - android:orientation="vertical"
178 - app:layout_constraintGuide_percent="0.09" />
179 -
180 - <androidx.constraintlayout.widget.Guideline
181 - android:id="@+id/gl_horizontal_50_cos"
182 - android:layout_width="wrap_content"
183 - android:layout_height="match_parent"
184 - android:orientation="horizontal"
185 - app:layout_constraintGuide_percent="0.56" />
186 130
187 <androidx.constraintlayout.widget.ConstraintLayout 131 <androidx.constraintlayout.widget.ConstraintLayout
188 - android:id="@+id/cl_deals_win_inner_cos" 132 + android:id="@+id/cl_deals_cos"
189 - android:layout_width="0dp" 133 + android:layout_width="match_parent"
190 - android:layout_height="0dp" 134 + android:layout_height="wrap_content"
191 - android:background="@drawable/shape_cos_grey4" 135 + android:layout_marginHorizontal="8dp"
192 - app:layout_constraintBottom_toBottomOf="parent" 136 + android:layout_marginTop="32dp">
193 - app:layout_constraintEnd_toEndOf="parent"
194 - app:layout_constraintStart_toEndOf="@+id/gl_vertical_06_cos"
195 - app:layout_constraintTop_toTopOf="parent">
196 137
197 <androidx.constraintlayout.widget.Guideline 138 <androidx.constraintlayout.widget.Guideline
198 - android:id="@+id/gl_vertical_16_cos" 139 + android:id="@+id/gl_vertical_06_cos"
199 android:layout_width="wrap_content" 140 android:layout_width="wrap_content"
200 android:layout_height="match_parent" 141 android:layout_height="match_parent"
201 android:orientation="vertical" 142 android:orientation="vertical"
202 - app:layout_constraintGuide_percent="0.16" /> 143 + app:layout_constraintGuide_percent="0.09" />
203 144
204 - <TextView 145 + <androidx.constraintlayout.widget.Guideline
205 - android:id="@+id/tv_deals_value_all" 146 + android:id="@+id/gl_horizontal_50_cos"
206 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 147 + android:layout_width="wrap_content"
148 + android:layout_height="match_parent"
149 + android:orientation="horizontal"
150 + app:layout_constraintGuide_percent="0.56" />
151 +
152 + <androidx.constraintlayout.widget.ConstraintLayout
153 + android:id="@+id/cl_deals_win_inner_cos"
207 android:layout_width="0dp" 154 android:layout_width="0dp"
208 - android:layout_height="wrap_content" 155 + android:layout_height="0dp"
209 - android:layout_marginEnd="16dp" 156 + android:background="@drawable/shape_cos_grey4"
210 - android:text="@string/cos_deals_win_title_cos"
211 - android:textColor="@android:color/white"
212 - android:textSize="16sp"
213 app:layout_constraintBottom_toBottomOf="parent" 157 app:layout_constraintBottom_toBottomOf="parent"
214 app:layout_constraintEnd_toEndOf="parent" 158 app:layout_constraintEnd_toEndOf="parent"
215 - app:layout_constraintStart_toStartOf="@+id/gl_vertical_16_cos" 159 + app:layout_constraintStart_toEndOf="@+id/gl_vertical_06_cos"
160 + app:layout_constraintTop_toTopOf="parent">
161 +
162 + <androidx.constraintlayout.widget.Guideline
163 + android:id="@+id/gl_vertical_16_cos"
164 + android:layout_width="wrap_content"
165 + android:layout_height="match_parent"
166 + android:orientation="vertical"
167 + app:layout_constraintGuide_percent="0.16" />
168 +
169 + <TextView
170 + android:id="@+id/tv_deals_value_all"
171 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
172 + android:layout_width="0dp"
173 + android:layout_height="wrap_content"
174 + android:layout_marginEnd="16dp"
175 + android:text="@string/cos_deals_win_title_cos"
176 + android:textColor="@android:color/white"
177 + android:textSize="16sp"
178 + app:layout_constraintBottom_toBottomOf="parent"
179 + app:layout_constraintEnd_toEndOf="parent"
180 + app:layout_constraintStart_toStartOf="@+id/gl_vertical_16_cos"
181 + app:layout_constraintTop_toTopOf="parent" />
182 + </androidx.constraintlayout.widget.ConstraintLayout>
183 +
184 + <ImageView
185 + android:id="@+id/iv_deals_logo"
186 + android:layout_width="80dp"
187 + android:layout_height="80dp"
188 + android:layout_marginVertical="4dp"
189 + android:src="@drawable/ic_deals_polygon"
190 + app:layout_constraintBottom_toBottomOf="parent"
191 + app:layout_constraintEnd_toEndOf="@+id/gl_vertical_06_cos"
192 + app:layout_constraintStart_toStartOf="@+id/gl_vertical_06_cos"
216 app:layout_constraintTop_toTopOf="parent" /> 193 app:layout_constraintTop_toTopOf="parent" />
217 - </androidx.constraintlayout.widget.ConstraintLayout>
218 -
219 - <ImageView
220 - android:id="@+id/iv_deals_logo"
221 - android:layout_width="80dp"
222 - android:layout_height="80dp"
223 - android:layout_marginVertical="4dp"
224 - android:src="@drawable/ic_deals_polygon"
225 - app:layout_constraintBottom_toBottomOf="parent"
226 - app:layout_constraintEnd_toEndOf="@+id/gl_vertical_06_cos"
227 - app:layout_constraintStart_toStartOf="@+id/gl_vertical_06_cos"
228 - app:layout_constraintTop_toTopOf="parent" />
229 -
230 - <TextView
231 - android:id="@+id/tv_deals_value"
232 - fontPath="fonts/pf_square_sans_pro_bold.ttf"
233 - android:layout_width="wrap_content"
234 - android:layout_height="wrap_content"
235 - android:textColor="@color/cos_grey"
236 - android:textSize="12sp"
237 - app:layout_constraintEnd_toEndOf="@+id/iv_deals_logo"
238 - app:layout_constraintStart_toStartOf="@+id/iv_deals_logo"
239 - app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50_cos"
240 - tools:text="18.00€" />
241 194
242 - </androidx.constraintlayout.widget.ConstraintLayout> 195 + <TextView
243 - 196 + android:id="@+id/tv_deals_value"
244 - <androidx.constraintlayout.widget.ConstraintLayout 197 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
245 - android:id="@+id/cl_deals_win" 198 + android:layout_width="wrap_content"
246 - android:layout_width="match_parent" 199 + android:layout_height="wrap_content"
247 - android:layout_height="wrap_content" 200 + android:textColor="@color/cos_grey"
248 - android:layout_marginHorizontal="8dp" 201 + android:textSize="12sp"
249 - android:layout_marginTop="32dp"> 202 + app:layout_constraintEnd_toEndOf="@+id/iv_deals_logo"
250 - 203 + app:layout_constraintStart_toStartOf="@+id/iv_deals_logo"
251 - <androidx.constraintlayout.widget.Guideline 204 + app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50_cos"
252 - android:id="@+id/gl_vertical_06" 205 + tools:text="18.00€" />
253 - android:layout_width="wrap_content"
254 - android:layout_height="match_parent"
255 - android:orientation="vertical"
256 - app:layout_constraintGuide_percent="0.09" />
257 206
258 - <androidx.constraintlayout.widget.Guideline 207 + </androidx.constraintlayout.widget.ConstraintLayout>
259 - android:id="@+id/gl_horizontal_50"
260 - android:layout_width="wrap_content"
261 - android:layout_height="match_parent"
262 - android:orientation="horizontal"
263 - app:layout_constraintGuide_percent="0.56" />
264 208
265 <androidx.constraintlayout.widget.ConstraintLayout 209 <androidx.constraintlayout.widget.ConstraintLayout
266 - android:id="@+id/cl_deals_win_inner" 210 + android:id="@+id/cl_deals_win"
267 - android:layout_width="0dp" 211 + android:layout_width="match_parent"
268 - android:layout_height="0dp" 212 + android:layout_height="wrap_content"
269 - android:background="@drawable/shape_cos_grey4" 213 + android:layout_marginHorizontal="8dp"
270 - app:layout_constraintBottom_toBottomOf="parent" 214 + android:layout_marginTop="32dp">
271 - app:layout_constraintEnd_toEndOf="parent"
272 - app:layout_constraintStart_toEndOf="@+id/gl_vertical_06"
273 - app:layout_constraintTop_toTopOf="parent">
274 215
275 <androidx.constraintlayout.widget.Guideline 216 <androidx.constraintlayout.widget.Guideline
276 - android:id="@+id/gl_vertical_16" 217 + android:id="@+id/gl_vertical_06"
277 android:layout_width="wrap_content" 218 android:layout_width="wrap_content"
278 android:layout_height="match_parent" 219 android:layout_height="match_parent"
279 android:orientation="vertical" 220 android:orientation="vertical"
280 - app:layout_constraintGuide_percent="0.16" /> 221 + app:layout_constraintGuide_percent="0.09" />
281 222
282 - <TextView 223 + <androidx.constraintlayout.widget.Guideline
283 - android:id="@+id/tv_gifts_value_all" 224 + android:id="@+id/gl_horizontal_50"
284 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 225 + android:layout_width="wrap_content"
226 + android:layout_height="match_parent"
227 + android:orientation="horizontal"
228 + app:layout_constraintGuide_percent="0.56" />
229 +
230 + <androidx.constraintlayout.widget.ConstraintLayout
231 + android:id="@+id/cl_deals_win_inner"
285 android:layout_width="0dp" 232 android:layout_width="0dp"
286 - android:layout_height="wrap_content" 233 + android:layout_height="0dp"
287 - android:layout_marginEnd="16dp" 234 + android:background="@drawable/shape_cos_grey4"
288 - android:text="@string/cos_deals_win_title"
289 - android:textColor="@android:color/white"
290 - android:textSize="16sp"
291 app:layout_constraintBottom_toBottomOf="parent" 235 app:layout_constraintBottom_toBottomOf="parent"
292 app:layout_constraintEnd_toEndOf="parent" 236 app:layout_constraintEnd_toEndOf="parent"
293 - app:layout_constraintStart_toStartOf="@+id/gl_vertical_16" 237 + app:layout_constraintStart_toEndOf="@+id/gl_vertical_06"
238 + app:layout_constraintTop_toTopOf="parent">
239 +
240 + <androidx.constraintlayout.widget.Guideline
241 + android:id="@+id/gl_vertical_16"
242 + android:layout_width="wrap_content"
243 + android:layout_height="match_parent"
244 + android:orientation="vertical"
245 + app:layout_constraintGuide_percent="0.16" />
246 +
247 + <TextView
248 + android:id="@+id/tv_gifts_value_all"
249 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
250 + android:layout_width="0dp"
251 + android:layout_height="wrap_content"
252 + android:layout_marginEnd="16dp"
253 + android:text="@string/cos_deals_win_title"
254 + android:textColor="@android:color/white"
255 + android:textSize="16sp"
256 + app:layout_constraintBottom_toBottomOf="parent"
257 + app:layout_constraintEnd_toEndOf="parent"
258 + app:layout_constraintStart_toStartOf="@+id/gl_vertical_16"
259 + app:layout_constraintTop_toTopOf="parent" />
260 + </androidx.constraintlayout.widget.ConstraintLayout>
261 +
262 + <ImageView
263 + android:id="@+id/iv_gifts_logo"
264 + android:layout_width="80dp"
265 + android:layout_height="80dp"
266 + android:layout_marginVertical="4dp"
267 + android:src="@drawable/ic_gifts_polygon"
268 + app:layout_constraintBottom_toBottomOf="parent"
269 + app:layout_constraintEnd_toEndOf="@+id/gl_vertical_06"
270 + app:layout_constraintStart_toStartOf="@+id/gl_vertical_06"
294 app:layout_constraintTop_toTopOf="parent" /> 271 app:layout_constraintTop_toTopOf="parent" />
272 +
273 + <TextView
274 + android:id="@+id/tv_gifts_value"
275 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
276 + android:layout_width="wrap_content"
277 + android:layout_height="wrap_content"
278 + android:textColor="@color/cos_grey"
279 + android:textSize="12sp"
280 + app:layout_constraintEnd_toEndOf="@+id/iv_gifts_logo"
281 + app:layout_constraintStart_toStartOf="@+id/iv_gifts_logo"
282 + app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50"
283 + tools:text="20.00€" />
284 +
295 </androidx.constraintlayout.widget.ConstraintLayout> 285 </androidx.constraintlayout.widget.ConstraintLayout>
296 286
297 <ImageView 287 <ImageView
298 - android:id="@+id/iv_gifts_logo" 288 + android:id="@+id/dfy_logo"
299 - android:layout_width="80dp" 289 + android:layout_width="110dp"
300 - android:layout_height="80dp" 290 + android:layout_height="40dp"
301 - android:layout_marginVertical="4dp" 291 + android:layout_gravity="start"
302 - android:src="@drawable/ic_gifts_polygon" 292 + android:layout_marginHorizontal="16dp"
303 - app:layout_constraintBottom_toBottomOf="parent" 293 + android:layout_marginTop="48dp"
304 - app:layout_constraintEnd_toEndOf="@+id/gl_vertical_06" 294 + android:src="@drawable/ic_deals_horizontal" />
305 - app:layout_constraintStart_toStartOf="@+id/gl_vertical_06" 295 +
306 - app:layout_constraintTop_toTopOf="parent" /> 296 + <androidx.constraintlayout.widget.ConstraintLayout
297 + android:id="@+id/cl_mygifts"
298 + android:layout_width="match_parent"
299 + android:layout_height="wrap_content"
300 + android:layout_marginHorizontal="8dp"
301 + android:layout_marginTop="12dp"
302 + android:background="@drawable/shape_cos_white2"
303 + android:paddingVertical="10dp">
304 +
305 + <LinearLayout
306 + android:layout_width="0dp"
307 + android:layout_height="wrap_content"
308 + android:layout_marginHorizontal="24dp"
309 + android:orientation="vertical"
310 + app:layout_constraintBottom_toBottomOf="parent"
311 + app:layout_constraintEnd_toStartOf="@+id/iv_deals_circle"
312 + app:layout_constraintStart_toStartOf="parent"
313 + app:layout_constraintTop_toTopOf="parent">
314 +
315 + <TextView
316 + android:id="@+id/tv_active_gifts"
317 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
318 + android:layout_width="wrap_content"
319 + android:layout_height="wrap_content"
320 + android:textColor="@color/blue_dark"
321 + android:textSize="18sp"
322 + tools:text="@string/cos_active_deals" />
323 +
324 + <TextView
325 + android:id="@+id/tv_active_deals_text"
326 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
327 + android:layout_width="wrap_content"
328 + android:layout_height="wrap_content"
329 + android:ellipsize="end"
330 + android:maxLines="2"
331 + android:textColor="@color/blue_dark"
332 + android:textSize="18sp"
333 + tools:text="961544809" />
334 +
335 + <TextView
336 + android:id="@+id/tv_active_deals_date_text"
337 + android:layout_width="wrap_content"
338 + android:layout_height="wrap_content"
339 + android:textColor="@color/blue_dark"
340 + android:visibility="gone"
341 + tools:text="@string/cos_active_coupon_date" />
342 + </LinearLayout>
343 +
344 + <ImageView
345 + android:id="@+id/iv_deals_circle"
346 + android:layout_width="86dp"
347 + android:layout_height="86dp"
348 + android:layout_marginVertical="4dp"
349 + android:layout_marginEnd="32dp"
350 + android:src="@drawable/ic_deals_circle"
351 + app:layout_constraintBottom_toBottomOf="parent"
352 + app:layout_constraintEnd_toEndOf="parent"
353 + app:layout_constraintTop_toTopOf="parent" />
354 + </androidx.constraintlayout.widget.ConstraintLayout>
307 355
308 <TextView 356 <TextView
309 - android:id="@+id/tv_gifts_value" 357 + android:id="@+id/tv_active_coupons_header"
310 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 358 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
311 android:layout_width="wrap_content" 359 android:layout_width="wrap_content"
312 android:layout_height="wrap_content" 360 android:layout_height="wrap_content"
313 - android:textColor="@color/cos_grey" 361 + android:layout_gravity="start"
314 - android:textSize="12sp" 362 + android:layout_marginHorizontal="16dp"
315 - app:layout_constraintEnd_toEndOf="@+id/iv_gifts_logo" 363 + android:layout_marginTop="48dp"
316 - app:layout_constraintStart_toStartOf="@+id/iv_gifts_logo" 364 + android:layout_marginBottom="10dp"
317 - app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50" 365 + android:text="@string/cos_mygifts"
318 - tools:text="20.00€" /> 366 + android:textColor="@android:color/white"
319 - 367 + android:textSize="20sp" />
320 - </androidx.constraintlayout.widget.ConstraintLayout> 368 +
321 - 369 + <androidx.recyclerview.widget.RecyclerView
322 - <ImageView 370 + android:id="@+id/rv_active_coupons"
323 - android:id="@+id/dfy_logo" 371 + android:layout_width="match_parent"
324 - android:layout_width="110dp" 372 + android:layout_height="wrap_content"
325 - android:layout_height="40dp" 373 + android:layout_marginHorizontal="2dp"
326 - android:layout_gravity="start" 374 + android:paddingBottom="40dp" />
327 - android:layout_marginHorizontal="16dp"
328 - android:layout_marginTop="48dp"
329 - android:src="@drawable/ic_deals_horizontal" />
330 -
331 - <androidx.constraintlayout.widget.ConstraintLayout
332 - android:id="@+id/cl_mygifts"
333 - android:layout_width="match_parent"
334 - android:layout_height="wrap_content"
335 - android:layout_below="@+id/tv_mygifts_title"
336 - android:layout_marginHorizontal="8dp"
337 - android:layout_marginTop="12dp"
338 - android:background="@drawable/shape_cos_white2"
339 - android:paddingVertical="10dp">
340 375
341 <LinearLayout 376 <LinearLayout
342 - android:layout_width="0dp" 377 + android:id="@+id/ll_empty_wallet"
378 + android:layout_width="match_parent"
343 android:layout_height="wrap_content" 379 android:layout_height="wrap_content"
344 - android:layout_marginHorizontal="24dp" 380 + android:layout_marginHorizontal="32dp"
381 + android:layout_marginTop="24dp"
382 + android:gravity="center"
345 android:orientation="vertical" 383 android:orientation="vertical"
346 - app:layout_constraintBottom_toBottomOf="parent" 384 + android:visibility="gone">
347 - app:layout_constraintEnd_toStartOf="@+id/iv_deals_circle"
348 - app:layout_constraintStart_toStartOf="parent"
349 - app:layout_constraintTop_toTopOf="parent">
350 385
351 - <TextView 386 + <ImageView
352 - android:id="@+id/tv_active_gifts" 387 + android:layout_width="72dp"
353 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 388 + android:layout_height="72dp"
354 - android:layout_width="wrap_content" 389 + android:src="@drawable/ic_empty_wallet" />
355 - android:layout_height="wrap_content"
356 - android:textColor="@color/blue_dark"
357 - android:textSize="18sp"
358 - tools:text="@string/cos_active_deals" />
359 -
360 - <TextView
361 - android:id="@+id/tv_active_deals_text"
362 - fontPath="fonts/pf_square_sans_pro_bold.ttf"
363 - android:layout_width="wrap_content"
364 - android:layout_height="wrap_content"
365 - android:ellipsize="end"
366 - android:maxLines="2"
367 - android:textColor="@color/blue_dark"
368 - android:textSize="18sp"
369 - tools:text="961544809" />
370 390
371 <TextView 391 <TextView
372 - android:id="@+id/tv_active_deals_date_text" 392 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
373 android:layout_width="wrap_content" 393 android:layout_width="wrap_content"
374 android:layout_height="wrap_content" 394 android:layout_height="wrap_content"
375 - android:textColor="@color/blue_dark" 395 + android:layout_marginTop="8dp"
376 - android:visibility="gone" 396 + android:gravity="center"
377 - tools:text="@string/cos_active_coupon_date" /> 397 + android:text="@string/cos_empty_wallet"
398 + android:textColor="@color/cos_white_tr"
399 + android:textSize="16sp" />
378 </LinearLayout> 400 </LinearLayout>
379 -
380 - <ImageView
381 - android:id="@+id/iv_deals_circle"
382 - android:layout_width="86dp"
383 - android:layout_height="86dp"
384 - android:layout_marginVertical="4dp"
385 - android:layout_marginEnd="32dp"
386 - android:src="@drawable/ic_deals_circle"
387 - app:layout_constraintBottom_toBottomOf="parent"
388 - app:layout_constraintEnd_toEndOf="parent"
389 - app:layout_constraintTop_toTopOf="parent" />
390 - </androidx.constraintlayout.widget.ConstraintLayout>
391 -
392 - <TextView
393 - android:id="@+id/tv_active_coupons_header"
394 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
395 - android:layout_width="wrap_content"
396 - android:layout_height="wrap_content"
397 - android:layout_gravity="start"
398 - android:layout_marginHorizontal="16dp"
399 - android:layout_marginTop="48dp"
400 - android:layout_marginBottom="10dp"
401 - android:text="@string/cos_mygifts"
402 - android:textColor="@android:color/white"
403 - android:textSize="20sp" />
404 -
405 - <androidx.recyclerview.widget.RecyclerView
406 - android:id="@+id/rv_active_coupons"
407 - android:layout_width="match_parent"
408 - android:layout_height="wrap_content"
409 - android:layout_marginHorizontal="2dp"
410 - android:paddingBottom="40dp" />
411 -
412 - <LinearLayout
413 - android:id="@+id/ll_empty_wallet"
414 - android:layout_width="match_parent"
415 - android:layout_height="wrap_content"
416 - android:layout_marginHorizontal="32dp"
417 - android:layout_marginTop="24dp"
418 - android:gravity="center"
419 - android:orientation="vertical"
420 - android:visibility="gone">
421 -
422 - <ImageView
423 - android:layout_width="72dp"
424 - android:layout_height="72dp"
425 - android:src="@drawable/ic_empty_wallet" />
426 -
427 - <TextView
428 - fontPath="fonts/pf_square_sans_pro_regular.ttf"
429 - android:layout_width="wrap_content"
430 - android:layout_height="wrap_content"
431 - android:layout_marginTop="8dp"
432 - android:gravity="center"
433 - android:text="@string/cos_empty_wallet"
434 - android:textColor="@color/cos_white_tr"
435 - android:textSize="16sp" />
436 </LinearLayout> 401 </LinearLayout>
437 - </LinearLayout> 402 + </RelativeLayout>
438 - </RelativeLayout> 403 + </ScrollView>
439 - </ScrollView> 404 + </RelativeLayout>
440 </RelativeLayout> 405 </RelativeLayout>
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
43 android:layout_width="match_parent" 43 android:layout_width="match_parent"
44 android:layout_height="match_parent" 44 android:layout_height="match_parent"
45 android:layout_below="@+id/cl_more_header" 45 android:layout_below="@+id/cl_more_header"
46 - android:background="@drawable/shape_cos_loyalty" 46 + android:background="@drawable/shape_cos_loyalty_no_border"
47 android:orientation="vertical"> 47 android:orientation="vertical">
48 48
49 <ScrollView 49 <ScrollView
......
...@@ -61,4 +61,5 @@ ...@@ -61,4 +61,5 @@
61 <color name="cos_green10">#73CA34</color> 61 <color name="cos_green10">#73CA34</color>
62 <color name="cos_blue5">#0D81B8</color> 62 <color name="cos_blue5">#0D81B8</color>
63 <color name="cos_grey9">#757575</color> 63 <color name="cos_grey9">#757575</color>
64 + <color name="cos_grey10">#53626E</color>
64 </resources> 65 </resources>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -133,6 +133,8 @@ ...@@ -133,6 +133,8 @@
133 <string name="cos_empty_expired_coupons">Δεν έχεις εξαργυρώσει ακόμη κουπόνια</string> 133 <string name="cos_empty_expired_coupons">Δεν έχεις εξαργυρώσει ακόμη κουπόνια</string>
134 <string name="cos_dlg_pacing_goal">Πέτυχες το στόχο του μήνα! Διάλεξε το δώρο που επιθυμείς να ενεργοποιήσεις!</string> 134 <string name="cos_dlg_pacing_goal">Πέτυχες το στόχο του μήνα! Διάλεξε το δώρο που επιθυμείς να ενεργοποιήσεις!</string>
135 <string name="cos_mfy_other">ΆΛΛΕΣ</string> 135 <string name="cos_mfy_other">ΆΛΛΕΣ</string>
136 + <string name="cos_coupon_share_telco">Επιλογή σύνδεσης</string>
137 + <string name="cos_steps_for_good_notification_subtitle">Περπάτησε κάθε μέρα περισσότερο για να ολοκληρώσεις το στόχο του μήνα και να ξεκλειδώσεις μοναδικές προσφορές!</string>
136 138
137 <string-array name="coupons_array"> 139 <string-array name="coupons_array">
138 <item>Κουπόνια</item> 140 <item>Κουπόνια</item>
......