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'
ext {
PUBLISH_GROUP_ID = 'ly.warp'
PUBLISH_VERSION = '4.5.4-cosbeta59'
PUBLISH_VERSION = '4.5.4-cosbeta60'
PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
}
......
......@@ -221,9 +221,16 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
mLlTerms.setOnClickListener(this);
String tempCoupon = mCoupon.getCoupon();
int result = 0;
for (int i = 0; i < (12 - mCoupon.getCoupon().length()); i++) {
tempCoupon += "0";
}
for (int i = mCoupon.getCoupon().length() - 1; i >= 0; i--) {
result = result + Integer.parseInt(String.valueOf((mCoupon.getCoupon()).charAt(i))) * (1 + (2 * (i % 2)));
}
tempCoupon = tempCoupon + (10 - (result % 10)) % 10;
createBarcodeBitmap(tempCoupon);
}
......
......@@ -161,6 +161,8 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
private void showActivationDialog() {
final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this);
bottomSheetDialog.setContentView(R.layout.dl_share);
TextView tvHeader = bottomSheetDialog.findViewById(R.id.tv_sender_value);
tvHeader.setText(R.string.cos_coupon_share_telco);
LinearLayout parent = bottomSheetDialog.findViewById(R.id.ll_share_dialog_view_inner);
ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_sender_list_close);
......
......@@ -60,7 +60,7 @@ public class WarplyHealthService extends Service implements SensorEventListener
private final int ACCEL_RING_SIZE = 50;
private final int VEL_RING_SIZE = 10;
// change this threshold according to your sensitivity preferences
private final float STEP_THRESHOLD = 20f;
private final float STEP_THRESHOLD = 10f; // default 40, cosmote default 20
private final int STEP_DELAY_NS = 250000000;
private int accelRingCounter = 0;
private float[] accelRingX = new float[ACCEL_RING_SIZE];
......@@ -101,7 +101,7 @@ public class WarplyHealthService extends Service implements SensorEventListener
b.setDefaults(Notification.DEFAULT_VIBRATE | Notification.DEFAULT_LIGHTS);
b.setChannelId(STEPS_CHANNEL_ID);
b.setContentTitle(getString(R.string.cos_steps_for_good_notification_title));
b.setContentText("Subtitle");
b.setContentText(getString(R.string.cos_steps_for_good_notification_subtitle));
b.setContentIntent(pbIntent);
b.setAutoCancel(true);
b.setOngoing(true);
......
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/cos_grey10" />
<corners android:radius="7dp" />
</shape>
</item>
<item
android:bottom="2dp"
android:left="0dp"
android:right="0dp"
android:top="0dp">
<shape android:shape="rectangle">
<gradient
android:endColor="@color/cos_skyblue"
android:startColor="@color/cos_green9"
android:type="linear" />
<corners android:radius="7dp" />
</shape>
</item>
</layer-list>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:topLeftRadius="30dp" />
<solid android:color="@color/cos_grey5" />
</shape>
</item>
</layer-list>
\ No newline at end of file
......@@ -43,7 +43,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_cos_loyalty"
android:background="@drawable/shape_cos_loyalty_no_border"
android:orientation="vertical">
<LinearLayout
......
......@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white">
android:background="@color/cos_grey5">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_loyalty_wallet_header"
......@@ -34,61 +34,11 @@
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- <ScrollView-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_below="@+id/cl_header"-->
<!-- android:fillViewport="true">-->
<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:background="@drawable/shape_cos_loyalty"-->
<!-- android:orientation="vertical"-->
<!-- android:paddingBottom="24dp">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_deals_logo_new"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_below="@id/cl_deals_win"-->
<!-- android:layout_marginStart="12dp"-->
<!-- android:layout_marginTop="48dp"-->
<!-- android:src="@drawable/ic_deals_logo_new" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_mygifts_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_below="@+id/cl_loyalty_deals"-->
<!-- android:layout_marginStart="12dp"-->
<!-- android:layout_marginTop="48dp"-->
<!-- android:text="@string/cos_mygifts"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textFontWeight="600"-->
<!-- android:textSize="18sp" />-->
<!-- </RelativeLayout>-->
<!-- </ScrollView>-->
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/cl_loyalty_wallet_header"
android:background="@color/cos_grey5"
android:fillViewport="true">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/ll_first_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/cl_loyalty_wallet_header"
android:background="@drawable/ic_background_circle"
android:gravity="center_horizontal"
android:orientation="vertical"
......@@ -155,11 +105,26 @@
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/ll_first_view"
android:background="@color/cos_grey5">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cos_grey5"
android:fillViewport="true">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/ll_second_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/ll_first_view"
android:gravity="center_horizontal"
android:orientation="vertical">
......@@ -332,7 +297,6 @@
android:id="@+id/cl_mygifts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_mygifts_title"
android:layout_marginHorizontal="8dp"
android:layout_marginTop="12dp"
android:background="@drawable/shape_cos_white2"
......@@ -437,4 +401,5 @@
</LinearLayout>
</RelativeLayout>
</ScrollView>
</RelativeLayout>
</RelativeLayout>
......
......@@ -43,7 +43,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/cl_more_header"
android:background="@drawable/shape_cos_loyalty"
android:background="@drawable/shape_cos_loyalty_no_border"
android:orientation="vertical">
<ScrollView
......
......@@ -61,4 +61,5 @@
<color name="cos_green10">#73CA34</color>
<color name="cos_blue5">#0D81B8</color>
<color name="cos_grey9">#757575</color>
<color name="cos_grey10">#53626E</color>
</resources>
\ No newline at end of file
......
......@@ -133,6 +133,8 @@
<string name="cos_empty_expired_coupons">Δεν έχεις εξαργυρώσει ακόμη κουπόνια</string>
<string name="cos_dlg_pacing_goal">Πέτυχες το στόχο του μήνα! Διάλεξε το δώρο που επιθυμείς να ενεργοποιήσεις!</string>
<string name="cos_mfy_other">ΆΛΛΕΣ</string>
<string name="cos_coupon_share_telco">Επιλογή σύνδεσης</string>
<string name="cos_steps_for_good_notification_subtitle">Περπάτησε κάθε μέρα περισσότερο για να ολοκληρώσεις το στόχο του μήνα και να ξεκλειδώσεις μοναδικές προσφορές!</string>
<string-array name="coupons_array">
<item>Κουπόνια</item>
......