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 69 additions and 59 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,61 +34,11 @@ ...@@ -34,61 +34,11 @@
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-->
38 - <!-- android:layout_width="match_parent"-->
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"
79 - android:layout_height="match_parent"
80 - android:layout_below="@+id/cl_loyalty_wallet_header"
81 - android:background="@color/cos_grey5"
82 - android:fillViewport="true">
83 -
84 - <RelativeLayout
85 - android:layout_width="match_parent"
86 - android:layout_height="match_parent">
87 -
88 <LinearLayout 37 <LinearLayout
89 android:id="@+id/ll_first_view" 38 android:id="@+id/ll_first_view"
90 android:layout_width="match_parent" 39 android:layout_width="match_parent"
91 android:layout_height="wrap_content" 40 android:layout_height="wrap_content"
41 + android:layout_below="@+id/cl_loyalty_wallet_header"
92 android:background="@drawable/ic_background_circle" 42 android:background="@drawable/ic_background_circle"
93 android:gravity="center_horizontal" 43 android:gravity="center_horizontal"
94 android:orientation="vertical" 44 android:orientation="vertical"
...@@ -155,11 +105,26 @@ ...@@ -155,11 +105,26 @@
155 </LinearLayout> 105 </LinearLayout>
156 </LinearLayout> 106 </LinearLayout>
157 107
108 + <RelativeLayout
109 + android:layout_width="match_parent"
110 + android:layout_height="match_parent"
111 + android:layout_below="@+id/ll_first_view"
112 + android:background="@color/cos_grey5">
113 +
114 + <ScrollView
115 + android:layout_width="match_parent"
116 + android:layout_height="match_parent"
117 + android:background="@color/cos_grey5"
118 + android:fillViewport="true">
119 +
120 + <RelativeLayout
121 + android:layout_width="match_parent"
122 + android:layout_height="wrap_content">
123 +
158 <LinearLayout 124 <LinearLayout
159 android:id="@+id/ll_second_view" 125 android:id="@+id/ll_second_view"
160 android:layout_width="match_parent" 126 android:layout_width="match_parent"
161 android:layout_height="match_parent" 127 android:layout_height="match_parent"
162 - android:layout_below="@+id/ll_first_view"
163 android:gravity="center_horizontal" 128 android:gravity="center_horizontal"
164 android:orientation="vertical"> 129 android:orientation="vertical">
165 130
...@@ -332,7 +297,6 @@ ...@@ -332,7 +297,6 @@
332 android:id="@+id/cl_mygifts" 297 android:id="@+id/cl_mygifts"
333 android:layout_width="match_parent" 298 android:layout_width="match_parent"
334 android:layout_height="wrap_content" 299 android:layout_height="wrap_content"
335 - android:layout_below="@+id/tv_mygifts_title"
336 android:layout_marginHorizontal="8dp" 300 android:layout_marginHorizontal="8dp"
337 android:layout_marginTop="12dp" 301 android:layout_marginTop="12dp"
338 android:background="@drawable/shape_cos_white2" 302 android:background="@drawable/shape_cos_white2"
...@@ -437,4 +401,5 @@ ...@@ -437,4 +401,5 @@
437 </LinearLayout> 401 </LinearLayout>
438 </RelativeLayout> 402 </RelativeLayout>
439 </ScrollView> 403 </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>
......