open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
35b4e27a 1 parent fd963c04

minor fixes

Inline Side-by-side
Showing 4 changed files with 10 additions and 8 deletions
...@@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity { ...@@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity {
36 public void onWarplyReady() { 36 public void onWarplyReady() {
37 if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) { 37 if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) {
38 WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest() 38 WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest()
39 - .setGuid("7000000800"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons, prod 6006552990, prod 6005892749, live 3000184910 39 + .setGuid("7000000831"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons, prod 6006552990, prod 6005892749, live 3000184910,prod 7000070282
40 mLoginReceiver); 40 mLoginReceiver);
41 } else { 41 } else {
42 startNextActivity(); 42 startNextActivity();
......
...@@ -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.5.4r1' 5 + PUBLISH_VERSION = '4.5.5.4r2'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -14,6 +14,8 @@ import android.widget.TextView; ...@@ -14,6 +14,8 @@ import android.widget.TextView;
14 14
15 import org.greenrobot.eventbus.EventBus; 15 import org.greenrobot.eventbus.EventBus;
16 16
17 +import java.util.Locale;
18 +
17 import io.github.inflationx.calligraphy3.CalligraphyTypefaceSpan; 19 import io.github.inflationx.calligraphy3.CalligraphyTypefaceSpan;
18 import io.github.inflationx.calligraphy3.TypefaceUtils; 20 import io.github.inflationx.calligraphy3.TypefaceUtils;
19 import io.github.inflationx.viewpump.ViewPumpContextWrapper; 21 import io.github.inflationx.viewpump.ViewPumpContextWrapper;
...@@ -182,7 +184,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -182,7 +184,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
182 mRlUnifiedBanner.setOnClickListener(this); 184 mRlUnifiedBanner.setOnClickListener(this);
183 185
184 /** First Banner */ 186 /** First Banner */
185 - String badgeValueFirst = String.format("%.02f", WarplyManagerHelper.getDealsCouponsSum()); 187 + String badgeValueFirst = String.format(Locale.US, "%.02f", WarplyManagerHelper.getDealsCouponsSum());
186 mTvDealsValue.setText(String.format(getString(R.string.cos_value), badgeValueFirst)); 188 mTvDealsValue.setText(String.format(getString(R.string.cos_value), badgeValueFirst));
187 if (String.valueOf(WarplyManagerHelper.getDealsCouponsSum()).length() >= 3) { 189 if (String.valueOf(WarplyManagerHelper.getDealsCouponsSum()).length() >= 3) {
188 mTvDealsValue.setTextSize(12); 190 mTvDealsValue.setTextSize(12);
...@@ -199,7 +201,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -199,7 +201,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
199 201
200 /** Second Banner */ 202 /** Second Banner */
201 if (WarplyManagerHelper.getLoyaltyBadge() != null && (WarplyManagerHelper.getLoyaltyBadge().getCouponCount() > 0 || WarplyManagerHelper.getLoyaltyBadge().getCouponCount() == 0)) { 203 if (WarplyManagerHelper.getLoyaltyBadge() != null && (WarplyManagerHelper.getLoyaltyBadge().getCouponCount() > 0 || WarplyManagerHelper.getLoyaltyBadge().getCouponCount() == 0)) {
202 - String badgeValue = String.format("%.02f", WarplyManagerHelper.getLoyaltyBadge().getValue()); 204 + String badgeValue = String.format(Locale.US,"%.02f", WarplyManagerHelper.getLoyaltyBadge().getValue());
203 mTvGiftsValue.setText(String.format(getString(R.string.cos_value), badgeValue)); 205 mTvGiftsValue.setText(String.format(getString(R.string.cos_value), badgeValue));
204 if (String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() >= 3) { 206 if (String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() >= 3) {
205 mTvGiftsValue.setTextSize(12); 207 mTvGiftsValue.setTextSize(12);
...@@ -240,7 +242,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -240,7 +242,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
240 } 242 }
241 243
242 mFavValue += countValue; 244 mFavValue += countValue;
243 - String badgeValue = String.format("%.02f", countValue); 245 + String badgeValue = String.format(Locale.US,"%.02f", countValue);
244 mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue)); 246 mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue));
245 if (String.valueOf(countValue).length() >= 3) { 247 if (String.valueOf(countValue).length() >= 3) {
246 mTvMarketValue.setTextSize(12); 248 mTvMarketValue.setTextSize(12);
...@@ -253,7 +255,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -253,7 +255,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
253 sBuilderThird.setSpan(typefaceBoldSpanThird, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 255 sBuilderThird.setSpan(typefaceBoldSpanThird, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
254 mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE); 256 mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE);
255 } else { 257 } else {
256 - String badgeValue = String.format("%.02f", 0.0f); 258 + String badgeValue = String.format(Locale.US,"%.02f", 0.0f);
257 mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue)); 259 mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue));
258 SpannableStringBuilder sBuilderThird = new SpannableStringBuilder(); 260 SpannableStringBuilder sBuilderThird = new SpannableStringBuilder();
259 sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue)); 261 sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue));
...@@ -264,7 +266,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -264,7 +266,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
264 /** Third Expandable Banner */ 266 /** Third Expandable Banner */
265 267
266 /** Sum Banner */ 268 /** Sum Banner */
267 - String allValue = String.format("%.02f", mFavValue); 269 + String allValue = String.format(Locale.US,"%.02f", mFavValue);
268 mTvFavValue.setText(String.format(getString(R.string.cos_value), allValue)); 270 mTvFavValue.setText(String.format(getString(R.string.cos_value), allValue));
269 /** Sum Banner */ 271 /** Sum Banner */
270 } 272 }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 android:layout_width="wrap_content" 30 android:layout_width="wrap_content"
31 android:layout_height="wrap_content" 31 android:layout_height="wrap_content"
32 android:gravity="center" 32 android:gravity="center"
33 - android:text="@string/cos_active_all_coupons" 33 + android:text="@string/cos_gifts_title"
34 android:textColor="@color/cos_light_black" 34 android:textColor="@color/cos_light_black"
35 android:textSize="19sp" 35 android:textSize="19sp"
36 app:layout_constraintBottom_toBottomOf="parent" 36 app:layout_constraintBottom_toBottomOf="parent"
......