Panagiotis Triantafyllou

minor fixes

......@@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity {
public void onWarplyReady() {
if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) {
WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest()
.setGuid("7000000800"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons, prod 6006552990, prod 6005892749, live 3000184910
.setGuid("7000000831"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons, prod 6006552990, prod 6005892749, live 3000184910,prod 7000070282
mLoginReceiver);
} else {
startNextActivity();
......
......@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
ext {
PUBLISH_GROUP_ID = 'ly.warp'
PUBLISH_VERSION = '4.5.5.4r1'
PUBLISH_VERSION = '4.5.5.4r2'
PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
}
......
......@@ -14,6 +14,8 @@ import android.widget.TextView;
import org.greenrobot.eventbus.EventBus;
import java.util.Locale;
import io.github.inflationx.calligraphy3.CalligraphyTypefaceSpan;
import io.github.inflationx.calligraphy3.TypefaceUtils;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
......@@ -182,7 +184,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
mRlUnifiedBanner.setOnClickListener(this);
/** First Banner */
String badgeValueFirst = String.format("%.02f", WarplyManagerHelper.getDealsCouponsSum());
String badgeValueFirst = String.format(Locale.US, "%.02f", WarplyManagerHelper.getDealsCouponsSum());
mTvDealsValue.setText(String.format(getString(R.string.cos_value), badgeValueFirst));
if (String.valueOf(WarplyManagerHelper.getDealsCouponsSum()).length() >= 3) {
mTvDealsValue.setTextSize(12);
......@@ -199,7 +201,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
/** Second Banner */
if (WarplyManagerHelper.getLoyaltyBadge() != null && (WarplyManagerHelper.getLoyaltyBadge().getCouponCount() > 0 || WarplyManagerHelper.getLoyaltyBadge().getCouponCount() == 0)) {
String badgeValue = String.format("%.02f", WarplyManagerHelper.getLoyaltyBadge().getValue());
String badgeValue = String.format(Locale.US,"%.02f", WarplyManagerHelper.getLoyaltyBadge().getValue());
mTvGiftsValue.setText(String.format(getString(R.string.cos_value), badgeValue));
if (String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() >= 3) {
mTvGiftsValue.setTextSize(12);
......@@ -240,7 +242,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
}
mFavValue += countValue;
String badgeValue = String.format("%.02f", countValue);
String badgeValue = String.format(Locale.US,"%.02f", countValue);
mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue));
if (String.valueOf(countValue).length() >= 3) {
mTvMarketValue.setTextSize(12);
......@@ -253,7 +255,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
sBuilderThird.setSpan(typefaceBoldSpanThird, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE);
} else {
String badgeValue = String.format("%.02f", 0.0f);
String badgeValue = String.format(Locale.US,"%.02f", 0.0f);
mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue));
SpannableStringBuilder sBuilderThird = new SpannableStringBuilder();
sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue));
......@@ -264,7 +266,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
/** Third Expandable Banner */
/** Sum Banner */
String allValue = String.format("%.02f", mFavValue);
String allValue = String.format(Locale.US,"%.02f", mFavValue);
mTvFavValue.setText(String.format(getString(R.string.cos_value), allValue));
/** Sum Banner */
}
......
......@@ -30,7 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/cos_active_all_coupons"
android:text="@string/cos_gifts_title"
android:textColor="@color/cos_light_black"
android:textSize="19sp"
app:layout_constraintBottom_toBottomOf="parent"
......