open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
42d45697 1 parent 6a23c5c2

uat fixes and changes

Inline Side-by-side
Showing 55 changed files with 358 additions and 1358 deletions
...@@ -35,21 +35,9 @@ public class SplashActivity extends BaseActivity { ...@@ -35,21 +35,9 @@ public class SplashActivity extends BaseActivity {
35 @Override 35 @Override
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.login(new WarplyLoginRequest()
39 -// .setId("6981234567")
40 -// .setPassword("123456"),
41 -// mLoginReceiver
42 -// );
43 -
44 WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest() 38 WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest()
45 - .setGuid("6012049321"), //6012049321, 6012049322, 6012049323 39 + .setGuid("6012049139"), //6012049321, 6012049322, 6012049323
46 mLoginReceiver); 40 mLoginReceiver);
47 -
48 -// WarplyManager.verifyTicket(new WarplyVerifyTicketRequest()
49 -// .setGuid("6012139059")
50 -// .setTicket("eyJraWQiOiIxMjc3IiwidHlwIjoiSldUIiwiYWxnIjoiUlM1MTIifQ.eyJhdWQiOiJsb3lhbHR5Iiwic3ViIjoiNjAxMjEzOTA1OSIsIm5iZiI6MTY1NTgwMjE4Miwic2NvcGUiOltdLCJraWQiOjEyNzcsImlzcyI6IlBVQkxJQ19DQUxMRVIiLCJleHAiOjE2NTU4MDM5ODIsImlhdCI6MTY1NTgwMjE4Mn0.T5F7QoGd0PFwW4hQ7FhSqxjK0V8RKUmuu7PgXAbfTnpeHuR1Jj8BT3vDNGsVjoF6ZXR3wIouxCnpJroUn0o6bMROk0YI_zFkpinoYF9ByxI2ErJqCAruhpcsNQvbONQaUk9oMTPRI1-B8iYJkofThAKvs98wjqWRDlM30KDTpXI7A3yxY56gVHYzZvfe2uSuNeniw60X5XowZyFrLvzwkdAeIuafQhfGZCvFSP2tTz1apVKh3rv8erLI92MA6xu66bc3MFpTOrKQklQDqmRYL6xcbFNtOk1D_Tb84KjHj7C8Ufg1wWIYkSTi4TtfneSkYkcjZfI2Anbmqm-0mCRKRA"),
51 -// mLoginReceiver
52 -// );
53 } else { 41 } else {
54 startNextActivity(); 42 startNextActivity();
55 } 43 }
......
...@@ -74,6 +74,10 @@ dependencies { ...@@ -74,6 +74,10 @@ dependencies {
74 //------------------------------ SQLCipher -----------------------------// 74 //------------------------------ SQLCipher -----------------------------//
75 api "net.zetetic:android-database-sqlcipher:4.5.0" 75 api "net.zetetic:android-database-sqlcipher:4.5.0"
76 api "androidx.sqlite:sqlite:2.2.0" 76 api "androidx.sqlite:sqlite:2.2.0"
77 +
78 + //------------------------------ Calligraphy -----------------------------//
79 + api 'io.github.inflationx:calligraphy3:3.1.1'
80 + api 'io.github.inflationx:viewpump:2.0.3'
77 } 81 }
78 82
79 // In every export please update the version number 83 // In every export please update the version number
......
...@@ -34,41 +34,16 @@ ...@@ -34,41 +34,16 @@
34 android:screenOrientation="portrait" /> 34 android:screenOrientation="portrait" />
35 35
36 <activity 36 <activity
37 - android:name="ly.warp.sdk.activities.BillPaymentActivity"
38 - android:exported="false"
39 - android:screenOrientation="portrait" />
40 -
41 - <activity
42 android:name="ly.warp.sdk.activities.CouponInfoActivity" 37 android:name="ly.warp.sdk.activities.CouponInfoActivity"
43 android:exported="false" 38 android:exported="false"
44 android:screenOrientation="portrait" /> 39 android:screenOrientation="portrait" />
45 40
46 <activity 41 <activity
47 - android:name="ly.warp.sdk.activities.CouponTransactionActivity"
48 - android:exported="false"
49 - android:screenOrientation="portrait" />
50 -
51 - <activity
52 android:name="ly.warp.sdk.activities.ActiveCouponsActivity" 42 android:name="ly.warp.sdk.activities.ActiveCouponsActivity"
53 android:exported="false" 43 android:exported="false"
54 android:screenOrientation="portrait" /> 44 android:screenOrientation="portrait" />
55 45
56 <activity 46 <activity
57 - android:name="ly.warp.sdk.activities.ActiveRewardsActivity"
58 - android:exported="false"
59 - android:screenOrientation="portrait" />
60 -
61 - <activity
62 - android:name="ly.warp.sdk.activities.StepsActivity"
63 - android:exported="false"
64 - android:screenOrientation="portrait" />
65 -
66 - <activity
67 - android:name="ly.warp.sdk.activities.PastCouponsActivity"
68 - android:exported="false"
69 - android:screenOrientation="portrait" />
70 -
71 - <activity
72 android:name="ly.warp.sdk.activities.GiftsForYouActivity" 47 android:name="ly.warp.sdk.activities.GiftsForYouActivity"
73 android:exported="false" 48 android:exported="false"
74 android:screenOrientation="portrait" /> 49 android:screenOrientation="portrait" />
...@@ -213,5 +188,9 @@ ...@@ -213,5 +188,9 @@
213 <receiver 188 <receiver
214 android:name="ly.warp.sdk.receivers.WarplyInAppNotificationReceiver" 189 android:name="ly.warp.sdk.receivers.WarplyInAppNotificationReceiver"
215 android:exported="false" /> 190 android:exported="false" />
191 +
192 + <provider
193 + android:name=".utils.WarplyProvider"
194 + android:authorities="ly.warp.sdk.utils.WarplyProvider" />
216 </application> 195 </application>
217 </manifest> 196 </manifest>
...\ No newline at end of file ...\ No newline at end of file
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 +import android.content.Context;
4 import android.content.Intent; 5 import android.content.Intent;
5 import android.os.Bundle; 6 import android.os.Bundle;
6 import android.view.View; 7 import android.view.View;
...@@ -12,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -12,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
12 13
13 import java.io.Serializable; 14 import java.io.Serializable;
14 15
16 +import io.github.inflationx.viewpump.ViewPumpContextWrapper;
15 import ly.warp.sdk.R; 17 import ly.warp.sdk.R;
16 import ly.warp.sdk.io.models.Coupon; 18 import ly.warp.sdk.io.models.Coupon;
17 import ly.warp.sdk.io.models.CouponList; 19 import ly.warp.sdk.io.models.CouponList;
...@@ -90,6 +92,11 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe ...@@ -90,6 +92,11 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe
90 } 92 }
91 } 93 }
92 94
95 + @Override
96 + protected void attachBaseContext(Context newBase) {
97 + super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
98 + }
99 +
93 // =========================================================== 100 // ===========================================================
94 // Methods 101 // Methods
95 // =========================================================== 102 // ===========================================================
......
1 -package ly.warp.sdk.activities;
2 -
3 -import android.app.Activity;
4 -import android.content.Intent;
5 -import android.os.Bundle;
6 -import android.view.View;
7 -import android.widget.ImageView;
8 -import android.widget.TextView;
9 -
10 -import androidx.recyclerview.widget.LinearLayoutManager;
11 -import androidx.recyclerview.widget.RecyclerView;
12 -
13 -import java.io.Serializable;
14 -
15 -import ly.warp.sdk.R;
16 -import ly.warp.sdk.io.models.Coupon;
17 -import ly.warp.sdk.io.models.CouponList;
18 -import ly.warp.sdk.views.adapters.ActiveRewardAdapter;
19 -
20 -
21 -public class ActiveRewardsActivity extends Activity implements View.OnClickListener {
22 -
23 - // ===========================================================
24 - // Constants
25 - // ===========================================================
26 -
27 - // ===========================================================
28 - // Fields
29 - // ===========================================================
30 -
31 - private ImageView mIvBack;
32 - private RecyclerView mRecyclerRewards;
33 - private ActiveRewardAdapter mAdapterRewards;
34 - private CouponList mRewardList = new CouponList();
35 - private TextView mTvEmptyRewards;
36 -
37 - // ===========================================================
38 - // Methods for/from SuperClass/Interfaces
39 - // ===========================================================
40 -
41 - @Override
42 - public void onCreate(Bundle savedInstanceState) {
43 - super.onCreate(savedInstanceState);
44 - setContentView(R.layout.activity_active_rewards);
45 -
46 - if (getIntent().getExtras() != null && getIntent().getSerializableExtra("couponlist") != null) {
47 - mRewardList = new CouponList(getIntent().getSerializableExtra("couponlist").toString(), true);
48 - CouponList cpnlist = new CouponList();
49 - for (Coupon cpn : mRewardList) {
50 - if (cpn.getStatus() == 1)
51 - cpnlist.add(cpn);
52 - }
53 - mRewardList.clear();
54 - mRewardList.addAll(cpnlist);
55 - }
56 -
57 - mIvBack = findViewById(R.id.iv_coupons_close);
58 - mTvEmptyRewards = findViewById(R.id.tv_no_rewards);
59 -
60 - if (mRewardList != null) {
61 - mRecyclerRewards = findViewById(R.id.rv_active_rewards);
62 - mRecyclerRewards.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
63 - mAdapterRewards = new ActiveRewardAdapter(this, mRewardList);
64 - mRecyclerRewards.setAdapter(mAdapterRewards);
65 - mAdapterRewards.getPositionClicks()
66 - .doOnNext(coupon -> {
67 - Intent intent = new Intent(ActiveRewardsActivity.this, CouponInfoActivity.class);
68 - intent.putExtra("coupon", (Serializable) coupon);
69 - startActivity(intent);
70 - })
71 - .doOnError(error -> {
72 - })
73 - .subscribe();
74 - } else {
75 - mTvEmptyRewards.setVisibility(View.VISIBLE);
76 - }
77 -
78 - initViews();
79 - }
80 -
81 - @Override
82 - public void onResume() {
83 - super.onResume();
84 - }
85 -
86 - @Override
87 - public void onClick(View view) {
88 - if (view.getId() == R.id.iv_coupons_close) {
89 - onBackPressed();
90 - }
91 - }
92 -
93 - // ===========================================================
94 - // Methods
95 - // ===========================================================
96 -
97 - private void initViews() {
98 - mIvBack.setOnClickListener(this);
99 - }
100 -
101 - // ===========================================================
102 - // Inner and Anonymous Classes
103 - // ===========================================================
104 -
105 -}
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Dialog; 3 import android.app.Dialog;
4 -import android.content.Intent;
5 -import android.net.Uri;
6 import android.os.Bundle; 4 import android.os.Bundle;
7 import android.os.Handler; 5 import android.os.Handler;
8 import android.os.Looper; 6 import android.os.Looper;
...@@ -20,7 +18,6 @@ import com.google.android.material.navigation.NavigationBarView; ...@@ -20,7 +18,6 @@ import com.google.android.material.navigation.NavigationBarView;
20 import java.util.HashMap; 18 import java.util.HashMap;
21 19
22 import ly.warp.sdk.R; 20 import ly.warp.sdk.R;
23 -import ly.warp.sdk.Warply;
24 import ly.warp.sdk.fragments.HomeFragment; 21 import ly.warp.sdk.fragments.HomeFragment;
25 import ly.warp.sdk.fragments.LoyaltyFragment; 22 import ly.warp.sdk.fragments.LoyaltyFragment;
26 import ly.warp.sdk.io.callbacks.CallbackReceiver; 23 import ly.warp.sdk.io.callbacks.CallbackReceiver;
...@@ -28,15 +25,9 @@ import ly.warp.sdk.io.models.Campaign; ...@@ -28,15 +25,9 @@ import ly.warp.sdk.io.models.Campaign;
28 import ly.warp.sdk.io.models.CampaignList; 25 import ly.warp.sdk.io.models.CampaignList;
29 import ly.warp.sdk.io.models.Consumer; 26 import ly.warp.sdk.io.models.Consumer;
30 import ly.warp.sdk.io.models.CouponList; 27 import ly.warp.sdk.io.models.CouponList;
31 -import ly.warp.sdk.io.models.CouponsetsList;
32 -import ly.warp.sdk.io.models.NewCampaignList;
33 -import ly.warp.sdk.io.request.WarplyConsumerRequest;
34 import ly.warp.sdk.io.request.WarplyGetCampaignsRequest; 28 import ly.warp.sdk.io.request.WarplyGetCampaignsRequest;
35 -import ly.warp.sdk.io.request.WarplyGetCouponsetsRequest;
36 -import ly.warp.sdk.io.request.WarplyInboxRequest;
37 import ly.warp.sdk.io.request.WarplyUserCouponsRequest; 29 import ly.warp.sdk.io.request.WarplyUserCouponsRequest;
38 import ly.warp.sdk.utils.WarplyManagerHelper; 30 import ly.warp.sdk.utils.WarplyManagerHelper;
39 -import ly.warp.sdk.utils.WarplyProperty;
40 import ly.warp.sdk.utils.managers.WarplyManager; 31 import ly.warp.sdk.utils.managers.WarplyManager;
41 import ly.warp.sdk.utils.managers.WarplySessionManager; 32 import ly.warp.sdk.utils.managers.WarplySessionManager;
42 33
...@@ -118,20 +109,6 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation ...@@ -118,20 +109,6 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation
118 // Methods 109 // Methods
119 // =========================================================== 110 // ===========================================================
120 111
121 - private void handleIntent(Intent intent) {
122 - Uri data = intent.getData();
123 - if (data != null) {
124 - if (intent.getData().getQueryParameterNames().size() > 0 && intent.getData().getQueryParameterNames().contains("participations")) {
125 - String parameter = String.valueOf(intent.getData().getQueryParameter("participations"));
126 - showDialog(parameter);
127 - }
128 - if (data.getPath().equals("/payment")) {
129 - Intent intentBill = new Intent(BaseFragmentActivity.this, BillPaymentActivity.class);
130 - startActivity(intentBill);
131 - }
132 - }
133 - }
134 -
135 private void showDialog(String parameter) { 112 private void showDialog(String parameter) {
136 Dialog dialog = new Dialog(this, R.style.PopUpDialog); 113 Dialog dialog = new Dialog(this, R.style.PopUpDialog);
137 dialog.setContentView(R.layout.dl_dialog); 114 dialog.setContentView(R.layout.dl_dialog);
...@@ -154,7 +131,6 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation ...@@ -154,7 +131,6 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation
154 } 131 }
155 132
156 private void initViews() { 133 private void initViews() {
157 - handleIntent(getIntent());
158 mBottomNavigationView.setOnItemSelectedListener(this); 134 mBottomNavigationView.setOnItemSelectedListener(this);
159 mFragmentToSet = HomeFragment.newInstance(); 135 mFragmentToSet = HomeFragment.newInstance();
160 getSupportFragmentManager().beginTransaction().add(R.id.fl_fragment, mFragmentToSet).commit(); 136 getSupportFragmentManager().beginTransaction().add(R.id.fl_fragment, mFragmentToSet).commit();
......
1 -package ly.warp.sdk.activities;
2 -
3 -import android.app.Activity;
4 -import android.app.Dialog;
5 -import android.app.Notification;
6 -import android.app.NotificationChannel;
7 -import android.app.NotificationManager;
8 -import android.app.PendingIntent;
9 -import android.content.Context;
10 -import android.content.Intent;
11 -import android.graphics.BitmapFactory;
12 -import android.graphics.Typeface;
13 -import android.os.Build;
14 -import android.os.Bundle;
15 -import android.os.Handler;
16 -import android.os.Looper;
17 -import android.text.Spannable;
18 -import android.text.SpannableString;
19 -import android.text.SpannableStringBuilder;
20 -import android.text.style.StyleSpan;
21 -import android.view.View;
22 -import android.widget.Button;
23 -import android.widget.ImageView;
24 -import android.widget.LinearLayout;
25 -import android.widget.TextView;
26 -
27 -import androidx.core.app.NotificationCompat;
28 -
29 -import ly.warp.sdk.R;
30 -import ly.warp.sdk.utils.WarplyManagerHelper;
31 -
32 -
33 -public class BillPaymentActivity extends Activity implements View.OnClickListener {
34 -
35 - // ===========================================================
36 - // Constants
37 - // ===========================================================
38 -
39 - // ===========================================================
40 - // Fields
41 - // ===========================================================
42 -
43 - private ImageView mIvBack;
44 - private Button mPayBtn;
45 -
46 - // ===========================================================
47 - // Methods for/from SuperClass/Interfaces
48 - // ===========================================================
49 -
50 - @Override
51 - public void onCreate(Bundle savedInstanceState) {
52 - super.onCreate(savedInstanceState);
53 - setContentView(R.layout.activity_bill_payment);
54 -
55 - mIvBack = findViewById(R.id.iv_bill_payment_close);
56 - mPayBtn = findViewById(R.id.button_pay);
57 -
58 - initViews();
59 - }
60 -
61 - @Override
62 - public void onResume() {
63 - super.onResume();
64 - }
65 -
66 - @Override
67 - protected void onNewIntent(Intent intent) {
68 - super.onNewIntent(intent);
69 - if (intent.hasExtra("channel")) {
70 - startActivity(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(WarplyManagerHelper.getUniqueCampaignList().get("lucky_draw").get(0))));
71 - }
72 - }
73 -
74 - @Override
75 - public void onClick(View view) {
76 - if (view.getId() == R.id.iv_bill_payment_close) {
77 - onBackPressed();
78 - return;
79 - }
80 - if (view.getId() == R.id.button_pay) {
81 - showDialog();
82 - new Handler(Looper.getMainLooper()).postDelayed(
83 - () -> createLocalNotification(BillPaymentActivity.this),
84 - 3000);
85 - }
86 - }
87 -
88 - // ===========================================================
89 - // Methods
90 - // ===========================================================
91 -
92 - private void createLocalNotification(Context context) {
93 - PendingIntent pendingIntent;
94 - Intent notifyIntent;
95 - notifyIntent = new Intent(this, BillPaymentActivity.class).putExtra("channel", "paymentNotify");
96 - notifyIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
97 -
98 - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
99 - pendingIntent = PendingIntent.getActivity(context, 1001, notifyIntent, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_MUTABLE);
100 - } else {
101 - pendingIntent = PendingIntent.getActivity(context, 1001, notifyIntent, PendingIntent.FLAG_ONE_SHOT);
102 - }
103 -
104 - NotificationCompat.Builder b = new NotificationCompat.Builder(this, "paymentNotify")
105 - .setSmallIcon(R.drawable.gift_icon)
106 - .setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(), R.drawable.ic_launcher))
107 - .setContentTitle("Συγχαρητήρια!")
108 - .setContentText("Ξεκλείδωσες το My Lucky Draw με την πληρωμή του λογαριασμού σου! Πάρε μέρος στις κληρώσεις!")
109 - .setStyle(new NotificationCompat.BigTextStyle()
110 - .bigText("Ξεκλείδωσες το My Lucky Draw με την πληρωμή του λογαριασμού σου! Πάρε μέρος στις κληρώσεις!"))
111 - .setAutoCancel(true)
112 - .setVibrate(new long[0])
113 - .setDefaults(Notification.DEFAULT_ALL)
114 - .setChannelId("paymentNotify")
115 - .setPriority(Notification.PRIORITY_HIGH)
116 - .setContentIntent(pendingIntent);
117 -
118 - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
119 - NotificationChannel notificationChannel = new NotificationChannel("paymentNotify", "paymentNotify", NotificationManager.IMPORTANCE_HIGH);
120 - notificationChannel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC);
121 - notificationChannel.setDescription("Ξεκλείδωσες το My Lucky Draw με την πληρωμή του λογαριασμού σου! Πάρε μέρος στις κληρώσεις!");
122 - notificationChannel.setShowBadge(true);
123 - NotificationManager nm = getSystemService(NotificationManager.class);
124 - nm.createNotificationChannel(notificationChannel);
125 - Notification notification_build = b.setChannelId("paymentNotify").build();
126 - notification_build.flags = Notification.FLAG_AUTO_CANCEL;
127 - nm.notify(1001, notification_build);
128 - } else {
129 - NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
130 - Notification notification_build = b.build();
131 - notification_build.flags = Notification.FLAG_AUTO_CANCEL;
132 - nm.notify(1001, notification_build);
133 - }
134 - }
135 -
136 - private void initViews() {
137 - mIvBack.setOnClickListener(this);
138 - mPayBtn.setOnClickListener(this);
139 - }
140 -
141 - private void showDialog() {
142 - Dialog dialog = new Dialog(this, R.style.PopUpDialog);
143 - dialog.setContentView(R.layout.payment_success_dialog);
144 - dialog.getWindow().setBackgroundDrawableResource(R.drawable.banner_border_white);
145 - dialog.show();
146 -
147 - TextView mTvLuckyDraw = dialog.findViewById(R.id.tv_lucky_draw);
148 - LinearLayout mClLuckyDraw = dialog.findViewById(R.id.constraintLayout);
149 -
150 - SpannableStringBuilder builder = new SpannableStringBuilder();
151 - String s1 = "My Lucky Day Draw";
152 - String s2 = " 10 συμμετοχές αντί για 1";
153 - SpannableString ss1 = new SpannableString(s1);
154 - ss1.setSpan(new StyleSpan(Typeface.BOLD), 0, s1.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); // set size
155 - ss1.setSpan("#3A5266", 0, s1.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);// set color
156 -
157 - builder.append(ss1);
158 - builder.append(s2);
159 - mTvLuckyDraw.setText(builder, TextView.BufferType.SPANNABLE);
160 -
161 - mClLuckyDraw.setOnClickListener(view -> {
162 - if (WarplyManagerHelper.getUniqueCampaignList() != null && !WarplyManagerHelper.getUniqueCampaignList().isEmpty()) {
163 - if (WarplyManagerHelper.getUniqueCampaignList().containsKey("lucky_draw") && WarplyManagerHelper.getUniqueCampaignList().get("lucky_draw").size() > 0) {
164 - startActivity(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(WarplyManagerHelper.getUniqueCampaignList().get("lucky_draw").get(0))));
165 - dialog.dismiss();
166 - }
167 - }
168 - });
169 - }
170 - // ===========================================================
171 - // Inner and Anonymous Classes
172 - // ===========================================================
173 -
174 -}
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 +import android.content.Context;
4 import android.content.Intent; 5 import android.content.Intent;
5 import android.graphics.Bitmap; 6 import android.graphics.Bitmap;
6 import android.graphics.Color; 7 import android.graphics.Color;
...@@ -22,6 +23,7 @@ import java.text.ParseException; ...@@ -22,6 +23,7 @@ import java.text.ParseException;
22 import java.text.SimpleDateFormat; 23 import java.text.SimpleDateFormat;
23 import java.util.Date; 24 import java.util.Date;
24 25
26 +import io.github.inflationx.viewpump.ViewPumpContextWrapper;
25 import ly.warp.sdk.R; 27 import ly.warp.sdk.R;
26 import ly.warp.sdk.io.models.Coupon; 28 import ly.warp.sdk.io.models.Coupon;
27 import ly.warp.sdk.io.models.Couponset; 29 import ly.warp.sdk.io.models.Couponset;
...@@ -93,6 +95,11 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -93,6 +95,11 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
93 } 95 }
94 } 96 }
95 97
98 + @Override
99 + protected void attachBaseContext(Context newBase) {
100 + super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
101 + }
102 +
96 // =========================================================== 103 // ===========================================================
97 // Methods 104 // Methods
98 // =========================================================== 105 // ===========================================================
......
...@@ -27,6 +27,7 @@ import org.json.JSONObject; ...@@ -27,6 +27,7 @@ import org.json.JSONObject;
27 27
28 import java.util.ArrayList; 28 import java.util.ArrayList;
29 29
30 +import io.github.inflationx.viewpump.ViewPumpContextWrapper;
30 import ly.warp.sdk.R; 31 import ly.warp.sdk.R;
31 import ly.warp.sdk.io.callbacks.CallbackReceiver; 32 import ly.warp.sdk.io.callbacks.CallbackReceiver;
32 import ly.warp.sdk.io.models.Consumer; 33 import ly.warp.sdk.io.models.Consumer;
...@@ -113,6 +114,11 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -113,6 +114,11 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
113 } 114 }
114 } 115 }
115 116
117 + @Override
118 + protected void attachBaseContext(Context newBase) {
119 + super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
120 + }
121 +
116 // =========================================================== 122 // ===========================================================
117 // Methods 123 // Methods
118 // =========================================================== 124 // ===========================================================
......
1 -package ly.warp.sdk.activities;
2 -
3 -import android.app.Activity;
4 -import android.content.Intent;
5 -import android.graphics.Paint;
6 -import android.os.Bundle;
7 -import android.view.View;
8 -import android.widget.ImageView;
9 -import android.widget.LinearLayout;
10 -import android.widget.TextView;
11 -
12 -import ly.warp.sdk.R;
13 -
14 -
15 -public class CouponTransactionActivity extends Activity implements View.OnClickListener {
16 -
17 - // ===========================================================
18 - // Constants
19 - // ===========================================================
20 -
21 - // ===========================================================
22 - // Fields
23 - // ===========================================================
24 -
25 - private ImageView mIvBack;
26 -
27 - // ===========================================================
28 - // Methods for/from SuperClass/Interfaces
29 - // ===========================================================
30 -
31 - @Override
32 - public void onCreate(Bundle savedInstanceState) {
33 - super.onCreate(savedInstanceState);
34 - setContentView(R.layout.activity_coupons_history);
35 -
36 - mIvBack = findViewById(R.id.iv_transactions_close);
37 -
38 - initViews();
39 - }
40 -
41 - @Override
42 - public void onResume() {
43 - super.onResume();
44 - }
45 -
46 - @Override
47 - public void onClick(View view) {
48 - if (view.getId() == R.id.iv_transactions_close) {
49 - onBackPressed();
50 - }
51 -
52 - }
53 -
54 - // ===========================================================
55 - // Methods
56 - // ===========================================================
57 -
58 - private void initViews() {
59 - mIvBack.setOnClickListener(this);
60 - }
61 -
62 - // ===========================================================
63 - // Inner and Anonymous Classes
64 - // ===========================================================
65 -
66 -}
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 +import android.content.Context;
4 import android.os.Bundle; 5 import android.os.Bundle;
5 import android.text.Html; 6 import android.text.Html;
6 import android.text.TextUtils; 7 import android.text.TextUtils;
...@@ -19,6 +20,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy; ...@@ -19,6 +20,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
19 20
20 import org.json.JSONObject; 21 import org.json.JSONObject;
21 22
23 +import io.github.inflationx.viewpump.ViewPumpContextWrapper;
22 import ly.warp.sdk.R; 24 import ly.warp.sdk.R;
23 import ly.warp.sdk.Warply; 25 import ly.warp.sdk.Warply;
24 import ly.warp.sdk.io.callbacks.CallbackReceiver; 26 import ly.warp.sdk.io.callbacks.CallbackReceiver;
...@@ -112,6 +114,11 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -112,6 +114,11 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
112 } 114 }
113 } 115 }
114 116
117 + @Override
118 + protected void attachBaseContext(Context newBase) {
119 + super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
120 + }
121 +
115 // =========================================================== 122 // ===========================================================
116 // Methods 123 // Methods
117 // =========================================================== 124 // ===========================================================
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 +import android.content.Context;
4 import android.content.Intent; 5 import android.content.Intent;
5 import android.os.Bundle; 6 import android.os.Bundle;
6 import android.util.Log; 7 import android.util.Log;
...@@ -21,6 +22,7 @@ import java.util.ArrayList; ...@@ -21,6 +22,7 @@ import java.util.ArrayList;
21 import java.util.HashMap; 22 import java.util.HashMap;
22 import java.util.HashSet; 23 import java.util.HashSet;
23 24
25 +import io.github.inflationx.viewpump.ViewPumpContextWrapper;
24 import ly.warp.sdk.R; 26 import ly.warp.sdk.R;
25 import ly.warp.sdk.io.models.Campaign; 27 import ly.warp.sdk.io.models.Campaign;
26 import ly.warp.sdk.io.models.CampaignList; 28 import ly.warp.sdk.io.models.CampaignList;
...@@ -125,6 +127,11 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -125,6 +127,11 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
125 } 127 }
126 } 128 }
127 129
130 + @Override
131 + protected void attachBaseContext(Context newBase) {
132 + super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
133 + }
134 +
128 @Subscribe() 135 @Subscribe()
129 public void onMessageEvent(WarplyEventBusManager event) { 136 public void onMessageEvent(WarplyEventBusManager event) {
130 if (event.getCcmsAdded() != null || event.getCampaignsAdded() != null) { 137 if (event.getCcmsAdded() != null || event.getCampaignsAdded() != null) {
......
1 -package ly.warp.sdk.activities;
2 -
3 -import android.app.Activity;
4 -import android.content.Intent;
5 -import android.os.Bundle;
6 -import android.view.View;
7 -import android.widget.AdapterView;
8 -import android.widget.ArrayAdapter;
9 -import android.widget.ImageView;
10 -import android.widget.Spinner;
11 -import android.widget.TextView;
12 -
13 -import ly.warp.sdk.R;
14 -
15 -
16 -public class LoyaltyActivity extends Activity implements View.OnClickListener,
17 - AdapterView.OnItemSelectedListener {
18 -
19 - // ===========================================================
20 - // Constants
21 - // ===========================================================
22 -
23 - // ===========================================================
24 - // Fields
25 - // ===========================================================
26 -
27 - private ImageView mIvBack;
28 - private Spinner mCouponSpinner, mRedemptionSpinner, mCollectionSpinner;
29 - private TextView mTvAnalysisButton;
30 -
31 - // ===========================================================
32 - // Methods for/from SuperClass/Interfaces
33 - // ===========================================================
34 -
35 - @Override
36 - public void onCreate(Bundle savedInstanceState) {
37 - super.onCreate(savedInstanceState);
38 - setContentView(R.layout.activity_loyalty);
39 -
40 - mIvBack = findViewById(R.id.iv_back);
41 - mCouponSpinner = findViewById(R.id.sp_coupons);
42 - mRedemptionSpinner = findViewById(R.id.sp_redemption);
43 - mCollectionSpinner = findViewById(R.id.sp_collection);
44 - mTvAnalysisButton = findViewById(R.id.rl_analysis_row).findViewById(R.id.cl_chart_info).findViewById(R.id.tv_analysis_details);
45 -
46 - initViews();
47 - }
48 -
49 - @Override
50 - public void onResume() {
51 - super.onResume();
52 - }
53 -
54 - @Override
55 - public void onClick(View view) {
56 - if (view.getId() == R.id.iv_back) {
57 - onBackPressed();
58 - return;
59 - }
60 - if (view.getId() == R.id.tv_analysis_details) {
61 - Intent intent = new Intent(this, CouponTransactionActivity.class);
62 - startActivity(intent);
63 - }
64 - }
65 -
66 - @Override
67 - public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
68 - // parent.getItemAtPosition(pos)
69 -
70 - if (parent.getId() == mCouponSpinner.getId()) {
71 - if (pos == 1) {
72 - mRedemptionSpinner.setVisibility(View.GONE);
73 - mCollectionSpinner.setVisibility(View.VISIBLE);
74 - findViewById(R.id.cl_tab_analysis).setVisibility(View.GONE);
75 - ImageView piechart = findViewById(R.id.rl_analysis_row).findViewById(R.id.cl_chart).findViewById(R.id.cl_inner_chart).findViewById(R.id.iv_chart);
76 - piechart.setImageResource(R.drawable.ic_chart_collection);
77 - findViewById(R.id.cl_chart_info).findViewById(R.id.analysis_tab).setVisibility(View.GONE);
78 - findViewById(R.id.cl_chart_info).findViewById(R.id.analysis_tab2).setVisibility(View.GONE);
79 - findViewById(R.id.cl_chart_info).findViewById(R.id.analysis_tab3).setVisibility(View.GONE);
80 - findViewById(R.id.cl_chart_info).findViewById(R.id.analysis_tab4).setVisibility(View.VISIBLE);
81 - findViewById(R.id.cl_chart_info).findViewById(R.id.analysis_tab5).setVisibility(View.VISIBLE);
82 - } else {
83 - mRedemptionSpinner.setVisibility(View.VISIBLE);
84 - mCollectionSpinner.setVisibility(View.GONE);
85 - ImageView piechart = findViewById(R.id.rl_analysis_row).findViewById(R.id.cl_chart).findViewById(R.id.cl_inner_chart).findViewById(R.id.iv_chart);
86 - piechart.setImageResource(R.drawable.ic_chart);
87 - findViewById(R.id.cl_tab_analysis).setVisibility(View.VISIBLE);
88 - findViewById(R.id.cl_chart_info).findViewById(R.id.analysis_tab).setVisibility(View.VISIBLE);
89 - findViewById(R.id.cl_chart_info).findViewById(R.id.analysis_tab2).setVisibility(View.VISIBLE);
90 - findViewById(R.id.cl_chart_info).findViewById(R.id.analysis_tab3).setVisibility(View.VISIBLE);
91 - findViewById(R.id.cl_chart_info).findViewById(R.id.analysis_tab4).setVisibility(View.GONE);
92 - findViewById(R.id.cl_chart_info).findViewById(R.id.analysis_tab5).setVisibility(View.GONE);
93 - }
94 - }
95 - }
96 -
97 - @Override
98 - public void onNothingSelected(AdapterView<?> parent) {
99 -
100 - }
101 -
102 - // ===========================================================
103 - // Methods
104 - // ===========================================================
105 -
106 - private void initViews() {
107 - mIvBack.setOnClickListener(this);
108 - mTvAnalysisButton.setOnClickListener(this);
109 -
110 - ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,
111 - R.array.coupons_array, R.layout.spinner_item);
112 - adapter.setDropDownViewResource(R.layout.spinner_dropdown_item_grey);
113 - mCouponSpinner.setAdapter(adapter);
114 - mCouponSpinner.setOnItemSelectedListener(this);
115 -
116 - ArrayAdapter<CharSequence> adapter2 = ArrayAdapter.createFromResource(this,
117 - R.array.redemption_array, R.layout.spinner_item);
118 - adapter2.setDropDownViewResource(R.layout.spinner_dropdown_item_sky_blue);
119 - mRedemptionSpinner.setAdapter(adapter2);
120 - mRedemptionSpinner.setOnItemSelectedListener(this);
121 -
122 - ArrayAdapter<CharSequence> adapter3 = ArrayAdapter.createFromResource(this,
123 - R.array.collection_array, R.layout.spinner_item);
124 - adapter3.setDropDownViewResource(R.layout.spinner_dropdown_item_sky_blue);
125 - mCollectionSpinner.setAdapter(adapter3);
126 - mCollectionSpinner.setOnItemSelectedListener(this);
127 - }
128 -
129 - // ===========================================================
130 - // Inner and Anonymous Classes
131 - // ===========================================================
132 -
133 -}
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 +import android.content.Context;
4 import android.graphics.Typeface; 5 import android.graphics.Typeface;
5 import android.os.Bundle; 6 import android.os.Bundle;
7 +import android.text.SpannableStringBuilder;
8 +import android.text.Spanned;
6 import android.view.View; 9 import android.view.View;
7 import android.widget.ImageView; 10 import android.widget.ImageView;
8 import android.widget.LinearLayout; 11 import android.widget.LinearLayout;
...@@ -13,6 +16,9 @@ import androidx.core.content.ContextCompat; ...@@ -13,6 +16,9 @@ import androidx.core.content.ContextCompat;
13 import androidx.recyclerview.widget.LinearLayoutManager; 16 import androidx.recyclerview.widget.LinearLayoutManager;
14 import androidx.recyclerview.widget.RecyclerView; 17 import androidx.recyclerview.widget.RecyclerView;
15 18
19 +import io.github.inflationx.calligraphy3.CalligraphyTypefaceSpan;
20 +import io.github.inflationx.calligraphy3.TypefaceUtils;
21 +import io.github.inflationx.viewpump.ViewPumpContextWrapper;
16 import ly.warp.sdk.R; 22 import ly.warp.sdk.R;
17 import ly.warp.sdk.io.callbacks.CallbackReceiver; 23 import ly.warp.sdk.io.callbacks.CallbackReceiver;
18 import ly.warp.sdk.io.models.Couponset; 24 import ly.warp.sdk.io.models.Couponset;
...@@ -90,12 +96,20 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -90,12 +96,20 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
90 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_gradient2); 96 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_gradient2);
91 TextView expiredTab = findViewById(R.id.tv_expired_tab); 97 TextView expiredTab = findViewById(R.id.tv_expired_tab);
92 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4)); 98 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4));
93 - expiredTab.setTypeface(null, Typeface.BOLD); 99 + CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
100 + SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
101 + sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
102 + sBuilderExpired.setSpan(typefaceBoldSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
103 + expiredTab.setText(sBuilderExpired, TextView.BufferType.SPANNABLE);
94 104
95 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent); 105 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent);
96 TextView sharedTab = findViewById(R.id.tv_shared_tab); 106 TextView sharedTab = findViewById(R.id.tv_shared_tab);
97 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey)); 107 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey));
98 - sharedTab.setTypeface(null, Typeface.NORMAL); 108 + CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
109 + SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
110 + sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
111 + sBuilderShared.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
112 + sharedTab.setText(sBuilderShared, TextView.BufferType.SPANNABLE);
99 113
100 mRlSharedView.setVisibility(View.GONE); 114 mRlSharedView.setVisibility(View.GONE);
101 mRlExpiredView.setVisibility(View.VISIBLE); 115 mRlExpiredView.setVisibility(View.VISIBLE);
...@@ -105,18 +119,31 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -105,18 +119,31 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
105 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_gradient2); 119 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_gradient2);
106 TextView sharedTab = findViewById(R.id.tv_shared_tab); 120 TextView sharedTab = findViewById(R.id.tv_shared_tab);
107 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4)); 121 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4));
108 - sharedTab.setTypeface(null, Typeface.BOLD); 122 + CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
123 + SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
124 + sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
125 + sBuilderShared.setSpan(typefaceBoldSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
126 + sharedTab.setText(sBuilderShared, TextView.BufferType.SPANNABLE);
109 127
110 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_transparent); 128 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_transparent);
111 TextView expiredTab = findViewById(R.id.tv_expired_tab); 129 TextView expiredTab = findViewById(R.id.tv_expired_tab);
112 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey)); 130 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey));
113 - expiredTab.setTypeface(null, Typeface.NORMAL); 131 + CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
132 + SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
133 + sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
134 + sBuilderExpired.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
135 + expiredTab.setText(sBuilderExpired, TextView.BufferType.SPANNABLE);
114 136
115 mRlExpiredView.setVisibility(View.GONE); 137 mRlExpiredView.setVisibility(View.GONE);
116 mRlSharedView.setVisibility(View.VISIBLE); 138 mRlSharedView.setVisibility(View.VISIBLE);
117 } 139 }
118 } 140 }
119 141
142 + @Override
143 + protected void attachBaseContext(Context newBase) {
144 + super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
145 + }
146 +
120 // =========================================================== 147 // ===========================================================
121 // Methods 148 // Methods
122 // =========================================================== 149 // ===========================================================
...@@ -126,7 +153,44 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -126,7 +153,44 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
126 mLlExpiredTab.setOnClickListener(this); 153 mLlExpiredTab.setOnClickListener(this);
127 mLlSharedTab.setOnClickListener(this); 154 mLlSharedTab.setOnClickListener(this);
128 155
129 - mTvCouponsValueAll.setText(String.format(getString(R.string.cos_deals_win_title), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()))); 156 + mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_gradient2);
157 + TextView expiredTab = findViewById(R.id.tv_expired_tab);
158 + expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4));
159 + CalligraphyTypefaceSpan typefaceBoldExpiredSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
160 + SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
161 + sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
162 + sBuilderExpired.setSpan(typefaceBoldExpiredSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
163 + expiredTab.setText(sBuilderExpired, TextView.BufferType.SPANNABLE);
164 +
165 + mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent);
166 + TextView sharedTab = findViewById(R.id.tv_shared_tab);
167 + sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey));
168 + CalligraphyTypefaceSpan typefaceRegularSharedSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
169 + SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
170 + sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
171 + sBuilderShared.setSpan(typefaceRegularSharedSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
172 + sharedTab.setText(sBuilderShared, TextView.BufferType.SPANNABLE);
173 +
174 + SpannableStringBuilder sBuilder = new SpannableStringBuilder();
175 + sBuilder
176 + .append(getString(R.string.cos_wallet_text3))
177 + .append(String.format(getString(R.string.cos_value), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue())))
178 + .append(getString(R.string.cos_wallet_text4))
179 + .append(String.format(getString(R.string.cos_value2), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount())))
180 + .append(getString(R.string.cos_wallet_text5));
181 +
182 + CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
183 + CalligraphyTypefaceSpan typefaceRegularSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
184 + CalligraphyTypefaceSpan typefaceRegularSpan3 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
185 + CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
186 + CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
187 + sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text3).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
188 + sBuilder.setSpan(typefaceBoldSpan, getString(R.string.cos_wallet_text3).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
189 + sBuilder.setSpan(typefaceRegularSpan2, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
190 + sBuilder.setSpan(typefaceBoldSpan2, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
191 + sBuilder.setSpan(typefaceRegularSpan3, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length() + getString(R.string.cos_wallet_text5).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
192 +
193 + mTvCouponsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE);
130 194
131 if (WarplyManagerHelper.getCouponExpiredList() != null && WarplyManagerHelper.getCouponExpiredList().size() > 0) { 195 if (WarplyManagerHelper.getCouponExpiredList() != null && WarplyManagerHelper.getCouponExpiredList().size() > 0) {
132 mRvExpiredCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); 196 mRvExpiredCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 +import android.content.Context;
4 import android.content.Intent; 5 import android.content.Intent;
5 import android.os.Bundle; 6 import android.os.Bundle;
7 +import android.text.SpannableStringBuilder;
8 +import android.text.Spanned;
6 import android.text.TextUtils; 9 import android.text.TextUtils;
7 import android.view.View; 10 import android.view.View;
8 import android.widget.ImageView; 11 import android.widget.ImageView;
...@@ -22,6 +25,9 @@ import java.io.Serializable; ...@@ -22,6 +25,9 @@ import java.io.Serializable;
22 import java.util.Collections; 25 import java.util.Collections;
23 import java.util.Comparator; 26 import java.util.Comparator;
24 27
28 +import io.github.inflationx.calligraphy3.CalligraphyTypefaceSpan;
29 +import io.github.inflationx.calligraphy3.TypefaceUtils;
30 +import io.github.inflationx.viewpump.ViewPumpContextWrapper;
25 import ly.warp.sdk.R; 31 import ly.warp.sdk.R;
26 import ly.warp.sdk.io.models.ActiveDFYCouponEventModel; 32 import ly.warp.sdk.io.models.ActiveDFYCouponEventModel;
27 import ly.warp.sdk.io.models.ActiveDFYCouponModel; 33 import ly.warp.sdk.io.models.ActiveDFYCouponModel;
...@@ -154,12 +160,17 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener { ...@@ -154,12 +160,17 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
154 } 160 }
155 } 161 }
156 162
163 + @Override
164 + protected void attachBaseContext(Context newBase) {
165 + super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
166 + }
167 +
157 // =========================================================== 168 // ===========================================================
158 // Methods 169 // Methods
159 // =========================================================== 170 // ===========================================================
160 171
161 private void initViews() { 172 private void initViews() {
162 - if (WarplyManagerHelper.getCouponList() != null) { 173 + if (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() > 0) {
163 mAdapterCoupons = new ActiveCouponAdapter(this, WarplyManagerHelper.getCouponList()); 174 mAdapterCoupons = new ActiveCouponAdapter(this, WarplyManagerHelper.getCouponList());
164 mRecyclerCoupons.setAdapter(mAdapterCoupons); 175 mRecyclerCoupons.setAdapter(mAdapterCoupons);
165 mAdapterCoupons.getPositionClicks() 176 mAdapterCoupons.getPositionClicks()
...@@ -171,11 +182,26 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener { ...@@ -171,11 +182,26 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
171 .doOnError(error -> { 182 .doOnError(error -> {
172 }) 183 })
173 .subscribe(); 184 .subscribe();
185 + } else {
186 + mRecyclerCoupons.setVisibility(View.GONE);
187 + mTvActiveCouponsHeader.setVisibility(View.GONE);
174 } 188 }
175 189
176 if (WarplyManagerHelper.getDealsCouponsSum() > 0) { 190 if (WarplyManagerHelper.getDealsCouponsSum() > 0) {
177 mTvDealsValue.setText(String.format(getString(R.string.cos_value), String.valueOf(/*couponDfyValue*/ WarplyManagerHelper.getDealsCouponsSum()))); 191 mTvDealsValue.setText(String.format(getString(R.string.cos_value), String.valueOf(/*couponDfyValue*/ WarplyManagerHelper.getDealsCouponsSum())));
178 - mTvDealsValueAll.setText(String.format(getString(R.string.cos_deals_win_title_cos), String.valueOf(/*couponDfyValue*/WarplyManagerHelper.getDealsCouponsSum()))); 192 +
193 + SpannableStringBuilder sBuilder = new SpannableStringBuilder();
194 + sBuilder
195 + .append(getString(R.string.cos_wallet_text1))
196 + .append(String.format(getString(R.string.cos_value), String.valueOf(WarplyManagerHelper.getDealsCouponsSum())))
197 + .append(getString(R.string.cos_wallet_text2));
198 + CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
199 + CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
200 + sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text1).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
201 + sBuilder.setSpan(typefaceRegularSpan, getString(R.string.cos_wallet_text1).length() + String.valueOf(WarplyManagerHelper.getDealsCouponsSum()).length(), getString(R.string.cos_wallet_text1).length() + String.valueOf(WarplyManagerHelper.getDealsCouponsSum()).length() + getString(R.string.cos_wallet_text2).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
202 + sBuilder.setSpan(typefaceBoldSpan, getString(R.string.cos_wallet_text1).length(), getString(R.string.cos_wallet_text1).length() + String.valueOf(WarplyManagerHelper.getDealsCouponsSum()).length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
203 +
204 + mTvDealsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE);
179 } else { 205 } else {
180 mClDealsBanner.setVisibility(View.GONE); 206 mClDealsBanner.setVisibility(View.GONE);
181 } 207 }
...@@ -183,7 +209,27 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener { ...@@ -183,7 +209,27 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
183 if (WarplyManagerHelper.getLoyaltyBadge() != null) { 209 if (WarplyManagerHelper.getLoyaltyBadge() != null) {
184 if (WarplyManagerHelper.getLoyaltyBadge().getCouponCount() > 0) { 210 if (WarplyManagerHelper.getLoyaltyBadge().getCouponCount() > 0) {
185 mTvGiftsValue.setText(String.format(getString(R.string.cos_value), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()))); 211 mTvGiftsValue.setText(String.format(getString(R.string.cos_value), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue())));
186 - mTvGiftsValueAll.setText(String.format(getString(R.string.cos_deals_win_title), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()))); 212 +
213 + SpannableStringBuilder sBuilder = new SpannableStringBuilder();
214 + sBuilder
215 + .append(getString(R.string.cos_wallet_text3))
216 + .append(String.format(getString(R.string.cos_value), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue())))
217 + .append(getString(R.string.cos_wallet_text4))
218 + .append(String.format(getString(R.string.cos_value2), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount())))
219 + .append(getString(R.string.cos_wallet_text5));
220 +
221 + CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
222 + CalligraphyTypefaceSpan typefaceRegularSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
223 + CalligraphyTypefaceSpan typefaceRegularSpan3 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
224 + CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
225 + CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
226 + sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text3).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
227 + sBuilder.setSpan(typefaceBoldSpan, getString(R.string.cos_wallet_text3).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
228 + sBuilder.setSpan(typefaceRegularSpan2, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
229 + sBuilder.setSpan(typefaceBoldSpan2, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
230 + sBuilder.setSpan(typefaceRegularSpan3, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length() + getString(R.string.cos_wallet_text5).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
231 +
232 + mTvGiftsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE);
187 } else { 233 } else {
188 mClGiftsBanner.setVisibility(View.GONE); 234 mClGiftsBanner.setVisibility(View.GONE);
189 } 235 }
...@@ -219,7 +265,6 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener { ...@@ -219,7 +265,6 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
219 // e.printStackTrace(); 265 // e.printStackTrace();
220 // } 266 // }
221 } else { 267 } else {
222 - mTvActiveCouponsHeader.setVisibility(View.GONE);
223 mIvDealsLogo.setVisibility(View.GONE); 268 mIvDealsLogo.setVisibility(View.GONE);
224 mClDealsView.setVisibility(View.GONE); 269 mClDealsView.setVisibility(View.GONE);
225 } 270 }
...@@ -249,7 +294,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener { ...@@ -249,7 +294,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
249 } 294 }
250 } 295 }
251 296
252 - if (mClDealsBanner.getVisibility() == View.GONE && mClGiftsBanner.getVisibility() == View.GONE && mClDealsView.getVisibility() == View.GONE) { 297 + if (mClDealsBanner.getVisibility() == View.GONE && mClGiftsBanner.getVisibility() == View.GONE
298 + && mClDealsView.getVisibility() == View.GONE && WarplyManagerHelper.getCouponList().size() == 0) {
253 mLlEmptyWallet.setVisibility(View.VISIBLE); 299 mLlEmptyWallet.setVisibility(View.VISIBLE);
254 } 300 }
255 301
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 +import android.content.Context;
4 import android.content.Intent; 5 import android.content.Intent;
5 import android.os.Bundle; 6 import android.os.Bundle;
6 import android.os.Parcelable; 7 import android.os.Parcelable;
...@@ -21,6 +22,7 @@ import java.io.Serializable; ...@@ -21,6 +22,7 @@ import java.io.Serializable;
21 import java.util.ArrayList; 22 import java.util.ArrayList;
22 import java.util.HashSet; 23 import java.util.HashSet;
23 24
25 +import io.github.inflationx.viewpump.ViewPumpContextWrapper;
24 import ly.warp.sdk.R; 26 import ly.warp.sdk.R;
25 import ly.warp.sdk.io.models.Campaign; 27 import ly.warp.sdk.io.models.Campaign;
26 import ly.warp.sdk.io.models.CampaignList; 28 import ly.warp.sdk.io.models.CampaignList;
...@@ -107,6 +109,11 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -107,6 +109,11 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
107 } 109 }
108 } 110 }
109 111
112 + @Override
113 + protected void attachBaseContext(Context newBase) {
114 + super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
115 + }
116 +
110 @Subscribe() 117 @Subscribe()
111 public void onMessageEvent(WarplyEventBusManager event) { 118 public void onMessageEvent(WarplyEventBusManager event) {
112 if (event.getCcmsAdded() != null || event.getCampaignsAdded() != null) { 119 if (event.getCcmsAdded() != null || event.getCampaignsAdded() != null) {
......
1 -package ly.warp.sdk.activities;
2 -
3 -import android.app.Activity;
4 -import android.content.Intent;
5 -import android.os.Bundle;
6 -import android.view.View;
7 -import android.widget.ImageView;
8 -import android.widget.TextView;
9 -
10 -import androidx.recyclerview.widget.LinearLayoutManager;
11 -import androidx.recyclerview.widget.RecyclerView;
12 -
13 -import java.io.Serializable;
14 -
15 -import ly.warp.sdk.R;
16 -import ly.warp.sdk.io.models.Coupon;
17 -import ly.warp.sdk.io.models.CouponList;
18 -import ly.warp.sdk.views.adapters.ActiveCouponAdapter;
19 -
20 -
21 -public class PastCouponsActivity extends Activity implements View.OnClickListener {
22 -
23 - // ===========================================================
24 - // Constants
25 - // ===========================================================
26 -
27 - // ===========================================================
28 - // Fields
29 - // ===========================================================
30 -
31 - private ImageView mIvBack;
32 - private RecyclerView mRecyclerCoupons;
33 - private ActiveCouponAdapter mAdapterCoupons;
34 - private CouponList mCouponList = new CouponList();
35 - private TextView mTvEmptyCoupons;
36 -
37 - // ===========================================================
38 - // Methods for/from SuperClass/Interfaces
39 - // ===========================================================
40 -
41 - @Override
42 - public void onCreate(Bundle savedInstanceState) {
43 - super.onCreate(savedInstanceState);
44 - setContentView(R.layout.activity_past_coupons);
45 -
46 - if (getIntent().getExtras() != null && getIntent().getSerializableExtra("couponlist") != null) {
47 - mCouponList = new CouponList(getIntent().getSerializableExtra("couponlist").toString(), true);
48 - CouponList cpnlist = new CouponList();
49 - for (Coupon cpn : mCouponList) {
50 - if (cpn.getStatus() == 1)
51 - cpnlist.add(cpn);
52 - }
53 - mCouponList.clear();
54 - mCouponList.addAll(cpnlist);
55 - }
56 -
57 - mIvBack = findViewById(R.id.iv_coupons_close);
58 - mTvEmptyCoupons = findViewById(R.id.tv_no_coupons);
59 -
60 - if (mCouponList != null) {
61 - mRecyclerCoupons = findViewById(R.id.rv_active_coupons);
62 - mRecyclerCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
63 - mAdapterCoupons = new ActiveCouponAdapter(this, mCouponList, true);
64 - mRecyclerCoupons.setAdapter(mAdapterCoupons);
65 - mAdapterCoupons.getPositionClicks()
66 - .doOnNext(coupon -> {
67 -// Intent intent = new Intent(PastCouponsActivity.this, CouponInfoActivity.class);
68 -// intent.putExtra("coupon", (Serializable) coupon);
69 -// startActivity(intent);
70 - })
71 - .doOnError(error -> {
72 - })
73 - .subscribe();
74 - } else {
75 - mTvEmptyCoupons.setVisibility(View.VISIBLE);
76 - }
77 -
78 - initViews();
79 - }
80 -
81 - @Override
82 - public void onResume() {
83 - super.onResume();
84 - }
85 -
86 - @Override
87 - public void onClick(View view) {
88 - if (view.getId() == R.id.iv_coupons_close) {
89 - onBackPressed();
90 - }
91 - }
92 -
93 - // ===========================================================
94 - // Methods
95 - // ===========================================================
96 -
97 - private void initViews() {
98 - mIvBack.setOnClickListener(this);
99 - }
100 -
101 - // ===========================================================
102 - // Inner and Anonymous Classes
103 - // ===========================================================
104 -
105 -}
1 -package ly.warp.sdk.activities;
2 -
3 -import android.app.Activity;
4 -import android.os.Bundle;
5 -import android.view.View;
6 -import android.widget.ImageView;
7 -import android.widget.TextView;
8 -
9 -import ly.warp.sdk.R;
10 -import ly.warp.sdk.io.callbacks.WarplyHealthCallback;
11 -import ly.warp.sdk.utils.managers.WarplyHealthManager;
12 -
13 -
14 -public class StepsActivity extends Activity implements View.OnClickListener {
15 -
16 - // ===========================================================
17 - // Constants
18 - // ===========================================================
19 -
20 - // ===========================================================
21 - // Fields
22 - // ===========================================================
23 -
24 - private TextView mTvStepsValue;
25 - private ImageView mIvBack;
26 -
27 - // ===========================================================
28 - // Methods for/from SuperClass/Interfaces
29 - // ===========================================================
30 -
31 - @Override
32 - public void onCreate(Bundle savedInstanceState) {
33 - super.onCreate(savedInstanceState);
34 - setContentView(R.layout.activity_steps);
35 -
36 - mIvBack = findViewById(R.id.iv_back);
37 - mTvStepsValue = findViewById(R.id.tv_counter_value);
38 -
39 - initViews();
40 - }
41 -
42 - @Override
43 - protected void onStart() {
44 - super.onStart();
45 - WarplyHealthManager
46 - .getInstance(this, mWarplyHealthCallback)
47 - .registerStepSensor();
48 - }
49 -
50 - @Override
51 - public void onResume() {
52 - super.onResume();
53 - }
54 -
55 - @Override
56 - protected void onStop() {
57 - super.onStop();
58 - WarplyHealthManager
59 - .getInstance(this)
60 - .unregisterStepSensor();
61 - }
62 -
63 - @Override
64 - public void onClick(View view) {
65 - if (view.getId() == R.id.iv_back) {
66 - onBackPressed();
67 - }
68 - }
69 -
70 - // ===========================================================
71 - // Methods
72 - // ===========================================================
73 -
74 - private void initViews() {
75 - mIvBack.setOnClickListener(this);
76 - }
77 -
78 - private final WarplyHealthCallback mWarplyHealthCallback = new WarplyHealthCallback() {
79 - @Override
80 - public void onStepCount(long stepsCount) {
81 - mTvStepsValue.setText(String.valueOf(stepsCount));
82 - }
83 - };
84 -
85 - // ===========================================================
86 - // Inner and Anonymous Classes
87 - // ===========================================================
88 -
89 -}
...@@ -18,8 +18,6 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -18,8 +18,6 @@ import androidx.recyclerview.widget.RecyclerView;
18 18
19 import ly.warp.sdk.R; 19 import ly.warp.sdk.R;
20 import ly.warp.sdk.activities.ActiveCouponsActivity; 20 import ly.warp.sdk.activities.ActiveCouponsActivity;
21 -import ly.warp.sdk.activities.BillPaymentActivity;
22 -import ly.warp.sdk.activities.StepsActivity;
23 import ly.warp.sdk.activities.WarpViewActivity; 21 import ly.warp.sdk.activities.WarpViewActivity;
24 import ly.warp.sdk.utils.WarplyManagerHelper; 22 import ly.warp.sdk.utils.WarplyManagerHelper;
25 import ly.warp.sdk.views.adapters.HomeCampaignAdapter; 23 import ly.warp.sdk.views.adapters.HomeCampaignAdapter;
...@@ -96,20 +94,10 @@ public class HomeFragment extends Fragment implements View.OnClickListener { ...@@ -96,20 +94,10 @@ public class HomeFragment extends Fragment implements View.OnClickListener {
96 94
97 @Override 95 @Override
98 public void onClick(View view) { 96 public void onClick(View view) {
99 - if (view.getId() == R.id.ll_bill_payment) {
100 - Intent intent = new Intent(getContext(), BillPaymentActivity.class);
101 - startActivity(intent);
102 - return;
103 - }
104 if (view.getId() == R.id.cl_coupon) { 97 if (view.getId() == R.id.cl_coupon) {
105 Intent intent = new Intent(getContext(), ActiveCouponsActivity.class); 98 Intent intent = new Intent(getContext(), ActiveCouponsActivity.class);
106 intent.putExtra("couponlist", WarplyManagerHelper.getCouponList()); 99 intent.putExtra("couponlist", WarplyManagerHelper.getCouponList());
107 startActivity(intent); 100 startActivity(intent);
108 - return;
109 - }
110 - if (view.getId() == R.id.iv_settings) {
111 - Intent intent = new Intent(getContext(), StepsActivity.class);
112 - startActivity(intent);
113 } 101 }
114 } 102 }
115 103
......
...@@ -16,17 +16,13 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -16,17 +16,13 @@ import androidx.recyclerview.widget.RecyclerView;
16 16
17 import org.json.JSONObject; 17 import org.json.JSONObject;
18 18
19 -import java.io.Serializable;
20 -
21 import ly.warp.sdk.R; 19 import ly.warp.sdk.R;
22 import ly.warp.sdk.activities.GiftsForYouActivity; 20 import ly.warp.sdk.activities.GiftsForYouActivity;
23 import ly.warp.sdk.activities.LoyaltyWallet; 21 import ly.warp.sdk.activities.LoyaltyWallet;
24 import ly.warp.sdk.activities.MoreForYouActivity; 22 import ly.warp.sdk.activities.MoreForYouActivity;
25 -import ly.warp.sdk.activities.TelcoActivity;
26 import ly.warp.sdk.activities.WarpViewActivity; 23 import ly.warp.sdk.activities.WarpViewActivity;
27 import ly.warp.sdk.io.models.Campaign; 24 import ly.warp.sdk.io.models.Campaign;
28 import ly.warp.sdk.io.models.CampaignList; 25 import ly.warp.sdk.io.models.CampaignList;
29 -import ly.warp.sdk.io.models.LoyaltyContextualOfferModel;
30 import ly.warp.sdk.utils.WarpJSONParser; 26 import ly.warp.sdk.utils.WarpJSONParser;
31 import ly.warp.sdk.utils.WarplyManagerHelper; 27 import ly.warp.sdk.utils.WarplyManagerHelper;
32 import ly.warp.sdk.views.adapters.ProfileCampaignAdapter; 28 import ly.warp.sdk.views.adapters.ProfileCampaignAdapter;
......
1 +package ly.warp.sdk.utils;
2 +
3 +import android.content.ContentProvider;
4 +import android.content.ContentValues;
5 +import android.database.Cursor;
6 +import android.graphics.Typeface;
7 +import android.net.Uri;
8 +
9 +import androidx.annotation.NonNull;
10 +import androidx.annotation.Nullable;
11 +
12 +import io.github.inflationx.calligraphy3.CalligraphyConfig;
13 +import io.github.inflationx.calligraphy3.CalligraphyInterceptor;
14 +import io.github.inflationx.calligraphy3.FontMapper;
15 +import io.github.inflationx.viewpump.ViewPump;
16 +import ly.warp.sdk.R;
17 +
18 +/**
19 + * Created by Panagiotis Triantafyllou on 05/Αυγ/2022.
20 + */
21 +public class WarplyProvider extends ContentProvider {
22 +
23 + private static Typeface PF_BOLD;
24 +
25 + @Override
26 + public boolean onCreate() {
27 + ViewPump.init(ViewPump.builder()
28 + .addInterceptor(new CalligraphyInterceptor(
29 + new CalligraphyConfig.Builder()
30 + .setDefaultFontPath("fonts/pf_square_sans_pro_regular.ttf")
31 + .setFontAttrId(R.attr.fontPath)
32 + .setFontMapper(new FontMapper() {
33 + @Override
34 + public String map(String font) {
35 + return font;
36 + }
37 + })
38 + .build()))
39 + .build());
40 +
41 + return true;
42 + }
43 +
44 + @Nullable
45 + @Override
46 + public Cursor query(@NonNull Uri uri, @Nullable String[] strings, @Nullable String s, @Nullable String[] strings1, @Nullable String s1) {
47 + return null;
48 + }
49 +
50 + @Nullable
51 + @Override
52 + public String getType(@NonNull Uri uri) {
53 + return null;
54 + }
55 +
56 + @Nullable
57 + @Override
58 + public Uri insert(@NonNull Uri uri, @Nullable ContentValues contentValues) {
59 + return null;
60 + }
61 +
62 + @Override
63 + public int delete(@NonNull Uri uri, @Nullable String s, @Nullable String[] strings) {
64 + return 0;
65 + }
66 +
67 + @Override
68 + public int update(@NonNull Uri uri, @Nullable ContentValues contentValues, @Nullable String s, @Nullable String[] strings) {
69 + return 0;
70 + }
71 +}
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<font-family xmlns:android="http://schemas.android.com/apk/res/android"
3 + xmlns:app="http://schemas.android.com/apk/res-auto">
4 +
5 + <font
6 + android:font="@font/pf_square_sans_pro_regular"
7 + android:fontStyle="normal"
8 + android:fontWeight="400"
9 + app:font="@font/pf_square_sans_pro_regular"
10 + app:fontStyle="normal"
11 + app:fontWeight="400" />
12 +
13 + <font
14 + android:font="@font/pf_square_sans_pro_bold"
15 + android:fontStyle="normal"
16 + android:fontWeight="1000"
17 + app:font="@font/pf_square_sans_pro_bold"
18 + app:fontStyle="normal"
19 + app:fontWeight="1000" />
20 +
21 + <font
22 + android:font="@font/pf_square_sans_pro_medium"
23 + android:fontStyle="normal"
24 + android:fontWeight="700"
25 + app:font="@font/pf_square_sans_pro_medium"
26 + app:fontStyle="normal"
27 + app:fontWeight="700" />
28 +
29 + <font
30 + android:font="@font/pf_square_sans_pro_bold_italic"
31 + android:fontStyle="italic"
32 + android:fontWeight="1000"
33 + app:font="@font/pf_square_sans_pro_bold_italic"
34 + app:fontStyle="italic"
35 + app:fontWeight="1000" />
36 +
37 +</font-family>
...\ No newline at end of file ...\ No newline at end of file
...@@ -50,9 +50,10 @@ ...@@ -50,9 +50,10 @@
50 android:id="@+id/tv_active_coupons_title" 50 android:id="@+id/tv_active_coupons_title"
51 android:layout_width="wrap_content" 51 android:layout_width="wrap_content"
52 android:layout_height="wrap_content" 52 android:layout_height="wrap_content"
53 - android:maxLines="2" 53 + android:ellipsize="end"
54 + android:maxLines="1"
54 android:textColor="#3A5266" 55 android:textColor="#3A5266"
55 - android:textFontWeight="600" 56 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
56 android:textSize="16sp" 57 android:textSize="16sp"
57 tools:text="Εκπτωτικο κουπονι 10$ για αγορες στα ΙΚΕΑ" /> 58 tools:text="Εκπτωτικο κουπονι 10$ για αγορες στα ΙΚΕΑ" />
58 59
...@@ -61,8 +62,8 @@ ...@@ -61,8 +62,8 @@
61 android:layout_width="wrap_content" 62 android:layout_width="wrap_content"
62 android:layout_height="wrap_content" 63 android:layout_height="wrap_content"
63 android:textColor="#3A5266" 64 android:textColor="#3A5266"
64 - android:textSize="28sp" 65 + android:textSize="42sp"
65 - android:textStyle="bold" 66 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
66 tools:text="10$" /> 67 tools:text="10$" />
67 68
68 <TextView 69 <TextView
...@@ -70,7 +71,7 @@ ...@@ -70,7 +71,7 @@
70 android:layout_width="wrap_content" 71 android:layout_width="wrap_content"
71 android:layout_height="wrap_content" 72 android:layout_height="wrap_content"
72 android:textColor="#617181" 73 android:textColor="#617181"
73 - android:textFontWeight="600" 74 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
74 android:textSize="12sp" 75 android:textSize="12sp"
75 tools:text="@string/cos_active_coupon_date" /> 76 tools:text="@string/cos_active_coupon_date" />
76 </LinearLayout> 77 </LinearLayout>
...@@ -81,9 +82,9 @@ ...@@ -81,9 +82,9 @@
81 android:layout_height="wrap_content" 82 android:layout_height="wrap_content"
82 android:layout_marginStart="24dp" 83 android:layout_marginStart="24dp"
83 android:layout_marginEnd="32dp" 84 android:layout_marginEnd="32dp"
85 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
84 android:maxLines="4" 86 android:maxLines="4"
85 android:textColor="#617181" 87 android:textColor="#617181"
86 - android:textFontWeight="600"
87 android:textSize="12sp" 88 android:textSize="12sp"
88 app:layout_constraintBottom_toBottomOf="parent" 89 app:layout_constraintBottom_toBottomOf="parent"
89 app:layout_constraintEnd_toEndOf="parent" 90 app:layout_constraintEnd_toEndOf="parent"
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 android:text="@string/cos_active_all_coupons" 32 android:text="@string/cos_active_all_coupons"
33 android:textColor="@color/grey" 33 android:textColor="@color/grey"
34 android:textSize="17sp" 34 android:textSize="17sp"
35 - android:textStyle="bold" 35 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
36 app:layout_constraintBottom_toBottomOf="parent" 36 app:layout_constraintBottom_toBottomOf="parent"
37 app:layout_constraintEnd_toEndOf="parent" 37 app:layout_constraintEnd_toEndOf="parent"
38 app:layout_constraintStart_toStartOf="parent" 38 app:layout_constraintStart_toStartOf="parent"
......
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - xmlns:app="http://schemas.android.com/apk/res-auto"
4 - android:id="@+id/cl_bill_payment"
5 - android:layout_width="match_parent"
6 - android:layout_height="match_parent">
7 -
8 - <androidx.constraintlayout.widget.ConstraintLayout
9 - android:id="@+id/cl_bill_header"
10 - android:layout_width="match_parent"
11 - android:layout_height="80dp"
12 - android:background="@android:color/white"
13 - app:layout_constraintTop_toTopOf="parent">
14 -
15 - <ImageView
16 - android:id="@+id/iv_coupons_close"
17 - android:layout_width="21dp"
18 - android:layout_height="20dp"
19 - android:layout_marginStart="24dp"
20 - android:layout_marginTop="4dp"
21 - android:src="@drawable/ic_back"
22 - app:layout_constraintBottom_toBottomOf="parent"
23 - app:layout_constraintStart_toStartOf="parent"
24 - app:layout_constraintTop_toTopOf="parent" />
25 -
26 - <TextView
27 - android:id="@+id/textView3"
28 - android:layout_width="206dp"
29 - android:layout_height="32dp"
30 - android:gravity="center"
31 - android:text="@string/cos_active_all_rewards"
32 - android:textColor="@color/grey"
33 - android:textSize="17sp"
34 - android:textStyle="bold"
35 - app:layout_constraintBottom_toBottomOf="parent"
36 - app:layout_constraintEnd_toEndOf="parent"
37 - app:layout_constraintStart_toStartOf="parent"
38 - app:layout_constraintTop_toTopOf="parent" />
39 - </androidx.constraintlayout.widget.ConstraintLayout>
40 -
41 - <androidx.constraintlayout.widget.ConstraintLayout
42 - android:layout_width="match_parent"
43 - android:layout_height="match_parent"
44 - android:layout_below="@+id/cl_bill_header"
45 - android:layout_marginTop="1dp"
46 - android:background="@drawable/shape_cos_loyalty"
47 - android:orientation="vertical">
48 -
49 - <androidx.recyclerview.widget.RecyclerView
50 - android:id="@+id/rv_active_rewards"
51 - android:layout_width="match_parent"
52 - android:layout_height="0dp"
53 - android:paddingTop="48dp"
54 - app:layout_constraintBottom_toBottomOf="parent"
55 - app:layout_constraintEnd_toEndOf="parent"
56 - app:layout_constraintStart_toStartOf="parent"
57 - app:layout_constraintTop_toTopOf="parent" />
58 - </androidx.constraintlayout.widget.ConstraintLayout>
59 -
60 - <TextView
61 - android:id="@+id/tv_no_rewards"
62 - android:layout_width="wrap_content"
63 - android:layout_height="wrap_content"
64 - android:layout_centerInParent="true"
65 - android:text="@string/cos_no_active_rewards"
66 - android:textColor="@color/grey"
67 - android:textSize="18sp"
68 - android:textStyle="bold"
69 - android:visibility="gone" />
70 -</RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<RelativeLayout xmlns:app="http://schemas.android.com/apk/res-auto"
3 - xmlns:tools="http://schemas.android.com/tools"
4 - android:id="@+id/cl_bill_payment"
5 - android:layout_width="match_parent"
6 - android:layout_height="match_parent"
7 - xmlns:android="http://schemas.android.com/apk/res/android">
8 -
9 - <androidx.constraintlayout.widget.ConstraintLayout
10 - android:id="@+id/cl_bill_header"
11 - android:layout_width="match_parent"
12 - android:layout_height="80dp"
13 - app:layout_constraintTop_toTopOf="parent">
14 -
15 - <ImageView
16 - android:id="@+id/iv_bill_payment_close"
17 - android:layout_width="21dp"
18 - android:layout_height="20dp"
19 - android:layout_marginStart="24dp"
20 - android:layout_marginTop="4dp"
21 - android:src="@drawable/ic_close"
22 - app:layout_constraintStart_toStartOf="parent"
23 - app:layout_constraintTop_toTopOf="@+id/textView3" />
24 -
25 - <TextView
26 - android:id="@+id/textView3"
27 - android:layout_width="206dp"
28 - android:layout_height="32dp"
29 - android:gravity="center"
30 - android:text="Πληρωμή Λογαριασμού"
31 - android:textColor="@color/grey"
32 - android:textSize="17sp"
33 - android:textStyle="bold"
34 - app:layout_constraintBottom_toBottomOf="parent"
35 - app:layout_constraintEnd_toEndOf="parent"
36 - app:layout_constraintHorizontal_bias="0.356"
37 - app:layout_constraintStart_toEndOf="@+id/iv_bill_payment_close"
38 - app:layout_constraintTop_toTopOf="parent" />
39 - </androidx.constraintlayout.widget.ConstraintLayout>
40 -
41 - <androidx.constraintlayout.widget.ConstraintLayout
42 - android:layout_width="match_parent"
43 - android:layout_height="807dp"
44 - android:layout_below="@+id/cl_bill_header"
45 - android:layout_marginTop="1dp"
46 - android:background="@drawable/shape_cos_gradient4"
47 - android:orientation="vertical"
48 - android:paddingBottom="24dp"
49 - tools:layout_editor_absoluteX="-2dp">
50 -
51 -
52 - <ImageView
53 - android:id="@+id/imageView4"
54 - android:layout_width="310dp"
55 - android:layout_height="176dp"
56 - android:layout_marginTop="16dp"
57 - android:src="@drawable/payment_icon"
58 - app:layout_constraintEnd_toEndOf="parent"
59 - app:layout_constraintHorizontal_bias="0.495"
60 - app:layout_constraintStart_toStartOf="parent"
61 - app:layout_constraintTop_toTopOf="parent" />
62 -
63 - <View
64 - android:id="@+id/view"
65 - android:layout_width="328dp"
66 - android:layout_height="265dp"
67 - android:background="@drawable/banner_border"
68 - app:layout_constraintBottom_toBottomOf="parent"
69 - app:layout_constraintEnd_toEndOf="parent"
70 - app:layout_constraintHorizontal_bias="0.493"
71 - app:layout_constraintStart_toStartOf="parent"
72 - app:layout_constraintTop_toBottomOf="@+id/imageView4"
73 - app:layout_constraintVertical_bias="0.142" />
74 -
75 - <EditText
76 - android:id="@+id/editTextTextPersonName"
77 - android:layout_width="141dp"
78 - android:layout_height="52dp"
79 - android:ems="10"
80 - android:gravity="center_horizontal"
81 - android:inputType="textPersonName"
82 - android:text="0€"
83 - android:textSize="26sp"
84 - android:textColor="#2F4455"
85 - app:layout_constraintBottom_toBottomOf="@+id/view"
86 - app:layout_constraintEnd_toEndOf="@+id/view"
87 - app:layout_constraintHorizontal_bias="0.475"
88 - app:layout_constraintStart_toStartOf="@+id/view"
89 - app:layout_constraintTop_toTopOf="@+id/view"
90 - app:layout_constraintVertical_bias="0.15" />
91 -
92 - <EditText
93 - android:id="@+id/editTextTextPersonName2"
94 - android:layout_width="263dp"
95 - android:layout_height="54dp"
96 - android:ems="10"
97 - android:hint="Αριθμός Λογαριασμού"
98 - android:inputType="text"
99 - android:textSize="16sp"
100 - android:textStyle="bold"
101 - app:layout_constraintBottom_toBottomOf="@+id/view"
102 - app:layout_constraintEnd_toEndOf="@+id/view"
103 - app:layout_constraintHorizontal_bias="0.47"
104 - app:layout_constraintStart_toStartOf="@+id/view"
105 - app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName"
106 - app:layout_constraintVertical_bias="0.208" />
107 -
108 - <Button
109 - android:id="@+id/button_pay"
110 - android:layout_width="122dp"
111 - android:layout_height="44dp"
112 - android:layout_marginBottom="28dp"
113 - android:background="@drawable/round_border_green"
114 - android:text="Πληρωμή"
115 - android:textStyle="bold"
116 - android:textAllCaps="false"
117 - android:textColor="@color/white"
118 - app:layout_constraintBottom_toBottomOf="@+id/view"
119 - app:layout_constraintEnd_toEndOf="@+id/view"
120 - app:layout_constraintStart_toStartOf="@+id/view"
121 - app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName2"
122 - app:layout_constraintVertical_bias="1.0" />
123 - </androidx.constraintlayout.widget.ConstraintLayout>
124 -</RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 android:text="@string/cos_coupon_info_title" 27 android:text="@string/cos_coupon_info_title"
28 android:textColor="@color/grey" 28 android:textColor="@color/grey"
29 android:textSize="17sp" 29 android:textSize="17sp"
30 - android:textStyle="bold" 30 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
31 app:layout_constraintBottom_toBottomOf="parent" 31 app:layout_constraintBottom_toBottomOf="parent"
32 app:layout_constraintEnd_toEndOf="parent" 32 app:layout_constraintEnd_toEndOf="parent"
33 app:layout_constraintStart_toStartOf="parent" 33 app:layout_constraintStart_toStartOf="parent"
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
74 android:paddingHorizontal="32dp" 74 android:paddingHorizontal="32dp"
75 android:textColor="#415564" 75 android:textColor="#415564"
76 android:textSize="18sp" 76 android:textSize="18sp"
77 - android:textStyle="bold" 77 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
78 app:layout_constraintEnd_toEndOf="parent" 78 app:layout_constraintEnd_toEndOf="parent"
79 app:layout_constraintHorizontal_bias="0.509" 79 app:layout_constraintHorizontal_bias="0.509"
80 app:layout_constraintStart_toStartOf="parent" 80 app:layout_constraintStart_toStartOf="parent"
...@@ -90,6 +90,7 @@ ...@@ -90,6 +90,7 @@
90 android:paddingHorizontal="32dp" 90 android:paddingHorizontal="32dp"
91 android:textColor="#415564" 91 android:textColor="#415564"
92 android:textSize="16sp" 92 android:textSize="16sp"
93 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
93 app:layout_constraintEnd_toEndOf="parent" 94 app:layout_constraintEnd_toEndOf="parent"
94 app:layout_constraintStart_toStartOf="parent" 95 app:layout_constraintStart_toStartOf="parent"
95 app:layout_constraintTop_toBottomOf="@+id/textView13" 96 app:layout_constraintTop_toBottomOf="@+id/textView13"
...@@ -102,7 +103,7 @@ ...@@ -102,7 +103,7 @@
102 android:layout_marginTop="48dp" 103 android:layout_marginTop="48dp"
103 android:text="Κωδικός Κουπονιού" 104 android:text="Κωδικός Κουπονιού"
104 android:textColor="#415564" 105 android:textColor="#415564"
105 - android:textFontWeight="600" 106 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
106 android:textSize="16sp" 107 android:textSize="16sp"
107 app:layout_constraintEnd_toEndOf="parent" 108 app:layout_constraintEnd_toEndOf="parent"
108 app:layout_constraintHorizontal_bias="0.498" 109 app:layout_constraintHorizontal_bias="0.498"
...@@ -119,7 +120,7 @@ ...@@ -119,7 +120,7 @@
119 android:gravity="center" 120 android:gravity="center"
120 android:textColor="@color/grey" 121 android:textColor="@color/grey"
121 android:textSize="25dp" 122 android:textSize="25dp"
122 - android:textStyle="bold" 123 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
123 app:layout_constraintEnd_toEndOf="parent" 124 app:layout_constraintEnd_toEndOf="parent"
124 app:layout_constraintStart_toStartOf="parent" 125 app:layout_constraintStart_toStartOf="parent"
125 app:layout_constraintTop_toBottomOf="@+id/textView15" 126 app:layout_constraintTop_toBottomOf="@+id/textView15"
...@@ -152,6 +153,7 @@ ...@@ -152,6 +153,7 @@
152 android:layout_height="wrap_content" 153 android:layout_height="wrap_content"
153 android:layout_marginTop="40dp" 154 android:layout_marginTop="40dp"
154 android:textColor="#415564" 155 android:textColor="#415564"
156 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
155 app:layout_constraintEnd_toEndOf="parent" 157 app:layout_constraintEnd_toEndOf="parent"
156 app:layout_constraintStart_toStartOf="parent" 158 app:layout_constraintStart_toStartOf="parent"
157 app:layout_constraintTop_toBottomOf="@+id/view4" 159 app:layout_constraintTop_toBottomOf="@+id/view4"
...@@ -177,7 +179,7 @@ ...@@ -177,7 +179,7 @@
177 android:gravity="center" 179 android:gravity="center"
178 android:text="@string/cos_gift_it" 180 android:text="@string/cos_gift_it"
179 android:textColor="@color/white" 181 android:textColor="@color/white"
180 - android:textFontWeight="600" 182 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
181 android:textSize="17dp" /> 183 android:textSize="17dp" />
182 </LinearLayout> 184 </LinearLayout>
183 185
...@@ -201,7 +203,7 @@ ...@@ -201,7 +203,7 @@
201 android:gravity="center" 203 android:gravity="center"
202 android:text="@string/cos_shops" 204 android:text="@string/cos_shops"
203 android:textColor="@color/cos_green6" 205 android:textColor="@color/cos_green6"
204 - android:textFontWeight="600" 206 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
205 android:textSize="17dp" /> 207 android:textSize="17dp" />
206 </LinearLayout> 208 </LinearLayout>
207 209
...@@ -228,6 +230,7 @@ ...@@ -228,6 +230,7 @@
228 android:layout_width="wrap_content" 230 android:layout_width="wrap_content"
229 android:layout_height="wrap_content" 231 android:layout_height="wrap_content"
230 android:text="Όροι χρήσης" 232 android:text="Όροι χρήσης"
233 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
231 android:textColor="@color/grey" 234 android:textColor="@color/grey"
232 android:textSize="15sp" /> 235 android:textSize="15sp" />
233 236
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 android:text="@string/cos_coupon_gift" 27 android:text="@string/cos_coupon_gift"
28 android:textColor="@color/grey" 28 android:textColor="@color/grey"
29 android:textSize="17sp" 29 android:textSize="17sp"
30 - android:textStyle="bold" 30 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
31 app:layout_constraintBottom_toBottomOf="parent" 31 app:layout_constraintBottom_toBottomOf="parent"
32 app:layout_constraintEnd_toEndOf="parent" 32 app:layout_constraintEnd_toEndOf="parent"
33 app:layout_constraintStart_toStartOf="parent" 33 app:layout_constraintStart_toStartOf="parent"
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
74 android:paddingHorizontal="32dp" 74 android:paddingHorizontal="32dp"
75 android:textColor="#415564" 75 android:textColor="#415564"
76 android:textSize="18sp" 76 android:textSize="18sp"
77 - android:textStyle="bold" 77 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
78 app:layout_constraintEnd_toEndOf="parent" 78 app:layout_constraintEnd_toEndOf="parent"
79 app:layout_constraintHorizontal_bias="0.509" 79 app:layout_constraintHorizontal_bias="0.509"
80 app:layout_constraintStart_toStartOf="parent" 80 app:layout_constraintStart_toStartOf="parent"
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
91 android:text="@string/cos_coupon_share_gift_title" 91 android:text="@string/cos_coupon_share_gift_title"
92 android:textColor="#415564" 92 android:textColor="#415564"
93 android:textSize="16sp" 93 android:textSize="16sp"
94 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
94 app:layout_constraintEnd_toEndOf="parent" 95 app:layout_constraintEnd_toEndOf="parent"
95 app:layout_constraintStart_toStartOf="parent" 96 app:layout_constraintStart_toStartOf="parent"
96 app:layout_constraintTop_toBottomOf="@+id/textView13" /> 97 app:layout_constraintTop_toBottomOf="@+id/textView13" />
...@@ -112,6 +113,7 @@ ...@@ -112,6 +113,7 @@
112 android:layout_alignParentStart="true" 113 android:layout_alignParentStart="true"
113 android:layout_centerVertical="true" 114 android:layout_centerVertical="true"
114 android:text="@string/cos_coupon_share_sender" 115 android:text="@string/cos_coupon_share_sender"
116 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
115 android:textColor="@color/grey" 117 android:textColor="@color/grey"
116 android:textSize="16sp" /> 118 android:textSize="16sp" />
117 119
...@@ -153,6 +155,7 @@ ...@@ -153,6 +155,7 @@
153 android:background="@android:color/transparent" 155 android:background="@android:color/transparent"
154 android:hint="@string/cos_coupon_share_hint" 156 android:hint="@string/cos_coupon_share_hint"
155 android:inputType="phone" 157 android:inputType="phone"
158 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
156 android:textColor="@color/grey" 159 android:textColor="@color/grey"
157 android:textColorHint="@color/cos_grey8" 160 android:textColorHint="@color/cos_grey8"
158 android:textSize="16sp" /> 161 android:textSize="16sp" />
...@@ -189,7 +192,7 @@ ...@@ -189,7 +192,7 @@
189 android:gravity="center" 192 android:gravity="center"
190 android:text="@string/cos_coupon_share_button" 193 android:text="@string/cos_coupon_share_button"
191 android:textColor="@color/white" 194 android:textColor="@color/white"
192 - android:textFontWeight="600" 195 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
193 android:textSize="17dp" /> 196 android:textSize="17dp" />
194 </LinearLayout> 197 </LinearLayout>
195 </androidx.constraintlayout.widget.ConstraintLayout> 198 </androidx.constraintlayout.widget.ConstraintLayout>
......
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - xmlns:app="http://schemas.android.com/apk/res-auto"
4 - android:id="@+id/cl_bill_payment"
5 - android:layout_width="match_parent"
6 - android:layout_height="match_parent"
7 - android:background="@android:color/white">
8 -
9 - <androidx.constraintlayout.widget.ConstraintLayout
10 - android:id="@+id/cl_bill_header"
11 - android:layout_width="match_parent"
12 - android:layout_height="50dp"
13 - app:layout_constraintTop_toTopOf="parent">
14 -
15 - <ImageView
16 - android:id="@+id/iv_transactions_close"
17 - android:layout_width="21dp"
18 - android:layout_height="20dp"
19 - android:layout_marginStart="24dp"
20 - android:src="@drawable/ic_back"
21 - app:layout_constraintBottom_toBottomOf="parent"
22 - app:layout_constraintStart_toStartOf="parent"
23 - app:layout_constraintTop_toTopOf="parent" />
24 -
25 - <TextView
26 - android:id="@+id/textView3"
27 - android:layout_width="206dp"
28 - android:layout_height="32dp"
29 - android:gravity="center"
30 - android:text="Ιστορικό"
31 - android:textColor="@color/grey"
32 - android:textSize="17sp"
33 - android:textStyle="bold"
34 - app:layout_constraintBottom_toBottomOf="parent"
35 - app:layout_constraintEnd_toEndOf="parent"
36 - app:layout_constraintStart_toStartOf="parent"
37 - app:layout_constraintTop_toTopOf="parent" />
38 - </androidx.constraintlayout.widget.ConstraintLayout>
39 -
40 - <ScrollView
41 - android:layout_width="match_parent"
42 - android:layout_height="match_parent"
43 - android:layout_below="@+id/cl_bill_header"
44 - android:background="@color/grey4"
45 - android:fillViewport="true">
46 -
47 - <RelativeLayout
48 - android:layout_width="match_parent"
49 - android:layout_height="wrap_content"
50 - android:background="@android:color/white">
51 -
52 - <include
53 - android:id="@+id/cl_tab_analysis"
54 - layout="@layout/tab_analysis"
55 - android:layout_width="match_parent"
56 - android:layout_height="wrap_content"
57 - android:layout_marginHorizontal="48dp"
58 - android:layout_marginVertical="24dp" />
59 -
60 - <LinearLayout
61 - android:id="@+id/cl_loyalty_info_view_inner"
62 - android:layout_width="match_parent"
63 - android:layout_height="match_parent"
64 - android:layout_below="@+id/cl_tab_analysis"
65 - android:background="@drawable/shape_cos_loyalty"
66 - android:orientation="vertical"
67 - android:paddingBottom="24dp">
68 -
69 - <include
70 - layout="@layout/coupon_transaction"
71 - android:layout_width="match_parent"
72 - android:layout_height="wrap_content"
73 - android:layout_marginHorizontal="16dp"
74 - android:layout_marginTop="48dp"
75 - app:layout_constraintEnd_toEndOf="parent"
76 - app:layout_constraintStart_toStartOf="parent"
77 - app:layout_constraintTop_toTopOf="parent" />
78 -
79 - <include
80 - layout="@layout/coupon_transaction"
81 - android:layout_width="match_parent"
82 - android:layout_height="wrap_content"
83 - android:layout_marginHorizontal="16dp"
84 - android:layout_marginTop="24dp"
85 - app:layout_constraintEnd_toEndOf="parent"
86 - app:layout_constraintStart_toStartOf="parent"
87 - app:layout_constraintTop_toTopOf="parent" />
88 -
89 - <include
90 - layout="@layout/coupon_transaction"
91 - android:layout_width="match_parent"
92 - android:layout_height="wrap_content"
93 - android:layout_marginHorizontal="16dp"
94 - android:layout_marginTop="24dp"
95 - app:layout_constraintEnd_toEndOf="parent"
96 - app:layout_constraintStart_toStartOf="parent"
97 - app:layout_constraintTop_toTopOf="parent" />
98 -
99 - <include
100 - layout="@layout/coupon_transaction"
101 - android:layout_width="match_parent"
102 - android:layout_height="wrap_content"
103 - android:layout_marginHorizontal="16dp"
104 - android:layout_marginTop="24dp"
105 - app:layout_constraintEnd_toEndOf="parent"
106 - app:layout_constraintStart_toStartOf="parent"
107 - app:layout_constraintTop_toTopOf="parent" />
108 -
109 - <include
110 - layout="@layout/coupon_transaction"
111 - android:layout_width="match_parent"
112 - android:layout_height="wrap_content"
113 - android:layout_marginHorizontal="16dp"
114 - android:layout_marginTop="24dp"
115 - app:layout_constraintEnd_toEndOf="parent"
116 - app:layout_constraintStart_toStartOf="parent"
117 - app:layout_constraintTop_toTopOf="parent" />
118 -
119 - <include
120 - layout="@layout/coupon_transaction"
121 - android:layout_width="match_parent"
122 - android:layout_height="wrap_content"
123 - android:layout_marginHorizontal="16dp"
124 - android:layout_marginTop="24dp"
125 - app:layout_constraintEnd_toEndOf="parent"
126 - app:layout_constraintStart_toStartOf="parent"
127 - app:layout_constraintTop_toTopOf="parent" />
128 -
129 - </LinearLayout>
130 - </RelativeLayout>
131 - </ScrollView>
132 -
133 -</RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 android:text="@string/cos_coupon_info_title" 27 android:text="@string/cos_coupon_info_title"
28 android:textColor="@color/grey" 28 android:textColor="@color/grey"
29 android:textSize="17sp" 29 android:textSize="17sp"
30 - android:textStyle="bold" 30 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
31 app:layout_constraintBottom_toBottomOf="parent" 31 app:layout_constraintBottom_toBottomOf="parent"
32 app:layout_constraintEnd_toEndOf="parent" 32 app:layout_constraintEnd_toEndOf="parent"
33 app:layout_constraintStart_toStartOf="parent" 33 app:layout_constraintStart_toStartOf="parent"
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
74 android:paddingHorizontal="32dp" 74 android:paddingHorizontal="32dp"
75 android:textColor="#415564" 75 android:textColor="#415564"
76 android:textSize="18sp" 76 android:textSize="18sp"
77 - android:textStyle="bold" 77 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
78 app:layout_constraintEnd_toEndOf="parent" 78 app:layout_constraintEnd_toEndOf="parent"
79 app:layout_constraintHorizontal_bias="0.509" 79 app:layout_constraintHorizontal_bias="0.509"
80 app:layout_constraintStart_toStartOf="parent" 80 app:layout_constraintStart_toStartOf="parent"
...@@ -90,6 +90,7 @@ ...@@ -90,6 +90,7 @@
90 android:paddingHorizontal="32dp" 90 android:paddingHorizontal="32dp"
91 android:textColor="#415564" 91 android:textColor="#415564"
92 android:textSize="16sp" 92 android:textSize="16sp"
93 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
93 app:layout_constraintEnd_toEndOf="parent" 94 app:layout_constraintEnd_toEndOf="parent"
94 app:layout_constraintStart_toStartOf="parent" 95 app:layout_constraintStart_toStartOf="parent"
95 app:layout_constraintTop_toBottomOf="@+id/textView13" 96 app:layout_constraintTop_toBottomOf="@+id/textView13"
...@@ -115,7 +116,7 @@ ...@@ -115,7 +116,7 @@
115 android:text="@string/cos_redeem_coupon" 116 android:text="@string/cos_redeem_coupon"
116 android:textColor="@color/white" 117 android:textColor="@color/white"
117 android:textSize="17dp" 118 android:textSize="17dp"
118 - android:textStyle="bold" /> 119 + fontPath="fonts/pf_square_sans_pro_medium.ttf" />
119 </LinearLayout> 120 </LinearLayout>
120 121
121 <RelativeLayout 122 <RelativeLayout
...@@ -142,7 +143,7 @@ ...@@ -142,7 +143,7 @@
142 android:layout_height="wrap_content" 143 android:layout_height="wrap_content"
143 android:text="@string/cos_coupon_terms_title" 144 android:text="@string/cos_coupon_terms_title"
144 android:textColor="#415564" 145 android:textColor="#415564"
145 - android:textFontWeight="600" 146 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
146 android:textSize="15sp" /> 147 android:textSize="15sp" />
147 148
148 <ImageView 149 <ImageView
...@@ -162,6 +163,7 @@ ...@@ -162,6 +163,7 @@
162 android:layout_marginTop="16dp" 163 android:layout_marginTop="16dp"
163 android:textColor="@color/grey" 164 android:textColor="@color/grey"
164 android:visibility="gone" 165 android:visibility="gone"
166 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
165 tools:text="@string/cos_coupon_date" 167 tools:text="@string/cos_coupon_date"
166 tools:visibility="visible" /> 168 tools:visibility="visible" />
167 </RelativeLayout> 169 </RelativeLayout>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 android:gravity="center" 31 android:gravity="center"
32 android:textColor="@color/grey" 32 android:textColor="@color/grey"
33 android:textSize="17sp" 33 android:textSize="17sp"
34 - android:textStyle="bold" 34 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
35 android:text="@string/cos_gifts_title" 35 android:text="@string/cos_gifts_title"
36 app:layout_constraintBottom_toBottomOf="parent" 36 app:layout_constraintBottom_toBottomOf="parent"
37 app:layout_constraintEnd_toEndOf="parent" 37 app:layout_constraintEnd_toEndOf="parent"
......
1 -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 - xmlns:app="http://schemas.android.com/apk/res-auto"
3 - android:layout_width="match_parent"
4 - android:layout_height="match_parent"
5 - android:background="@color/grey4">
6 -
7 - <androidx.constraintlayout.widget.ConstraintLayout
8 - android:id="@+id/cl_loyalty_wallet_header"
9 - android:layout_width="match_parent"
10 - android:layout_height="50dp"
11 - android:background="@android:color/white">
12 -
13 - <ImageView
14 - android:id="@+id/iv_back"
15 - android:layout_width="20dp"
16 - android:layout_height="20dp"
17 - android:layout_marginStart="16dp"
18 - android:src="@drawable/ic_back"
19 - app:layout_constraintBottom_toBottomOf="parent"
20 - app:layout_constraintStart_toStartOf="parent"
21 - app:layout_constraintTop_toTopOf="parent" />
22 -
23 - <TextView
24 - android:layout_width="wrap_content"
25 - android:layout_height="wrap_content"
26 - android:text="@string/cos_analysis"
27 - android:textColor="@color/grey"
28 - android:textSize="17sp"
29 - android:textStyle="bold"
30 - app:layout_constraintBottom_toBottomOf="parent"
31 - app:layout_constraintEnd_toEndOf="parent"
32 - app:layout_constraintStart_toStartOf="parent"
33 - app:layout_constraintTop_toTopOf="parent" />
34 - </androidx.constraintlayout.widget.ConstraintLayout>
35 -
36 - <ScrollView
37 - android:layout_width="match_parent"
38 - android:layout_height="match_parent"
39 - android:layout_below="@+id/cl_loyalty_wallet_header"
40 - android:background="@color/grey4"
41 - android:fillViewport="true">
42 -
43 - <RelativeLayout
44 - android:layout_width="match_parent"
45 - android:layout_height="wrap_content"
46 - android:background="@android:color/white">
47 -
48 - <include
49 - android:id="@+id/cl_tab_analysis"
50 - layout="@layout/tab_analysis"
51 - android:layout_width="match_parent"
52 - android:layout_height="wrap_content"
53 - android:layout_marginHorizontal="48dp"
54 - android:layout_marginVertical="24dp" />
55 -
56 - <androidx.constraintlayout.widget.ConstraintLayout
57 - android:id="@+id/cl_loyalty_info_view_inner"
58 - android:layout_width="match_parent"
59 - android:layout_height="match_parent"
60 - android:layout_below="@+id/cl_tab_analysis"
61 - android:background="@drawable/shape_cos_loyalty"
62 - android:paddingBottom="24dp"
63 - app:layout_constraintBottom_toBottomOf="parent"
64 - app:layout_constraintEnd_toEndOf="parent"
65 - app:layout_constraintStart_toStartOf="parent"
66 - app:layout_constraintTop_toTopOf="parent">
67 -
68 - <include
69 - android:id="@+id/rl_analysis_row"
70 - layout="@layout/loyalty_analysis_container"
71 - android:layout_width="match_parent"
72 - android:layout_height="wrap_content"
73 - android:layout_marginTop="24dp"
74 - app:layout_constraintEnd_toEndOf="parent"
75 - app:layout_constraintStart_toStartOf="parent"
76 - app:layout_constraintTop_toTopOf="parent" />
77 - </androidx.constraintlayout.widget.ConstraintLayout>
78 - </RelativeLayout>
79 - </ScrollView>
80 -</RelativeLayout>
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
24 app:layout_constraintTop_toTopOf="parent" /> 24 app:layout_constraintTop_toTopOf="parent" />
25 25
26 <TextView 26 <TextView
27 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
27 android:layout_width="wrap_content" 28 android:layout_width="wrap_content"
28 android:layout_height="wrap_content" 29 android:layout_height="wrap_content"
29 android:text="@string/cos_analysis" 30 android:text="@string/cos_analysis"
30 android:textColor="@color/grey" 31 android:textColor="@color/grey"
31 android:textSize="17sp" 32 android:textSize="17sp"
32 - android:textStyle="bold"
33 app:layout_constraintBottom_toBottomOf="parent" 33 app:layout_constraintBottom_toBottomOf="parent"
34 app:layout_constraintEnd_toEndOf="parent" 34 app:layout_constraintEnd_toEndOf="parent"
35 app:layout_constraintStart_toStartOf="parent" 35 app:layout_constraintStart_toStartOf="parent"
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
82 82
83 <TextView 83 <TextView
84 android:id="@+id/tv_expired_title" 84 android:id="@+id/tv_expired_title"
85 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
85 android:layout_width="wrap_content" 86 android:layout_width="wrap_content"
86 android:layout_height="wrap_content" 87 android:layout_height="wrap_content"
87 android:layout_below="@+id/ll_expired_coupons_title" 88 android:layout_below="@+id/ll_expired_coupons_title"
...@@ -89,8 +90,7 @@ ...@@ -89,8 +90,7 @@
89 android:layout_marginTop="32dp" 90 android:layout_marginTop="32dp"
90 android:text="@string/cos_analysis2" 91 android:text="@string/cos_analysis2"
91 android:textColor="@color/cos_blue_dark" 92 android:textColor="@color/cos_blue_dark"
92 - android:textSize="16sp" 93 + android:textSize="16sp" />
93 - android:textStyle="bold" />
94 94
95 <androidx.recyclerview.widget.RecyclerView 95 <androidx.recyclerview.widget.RecyclerView
96 android:id="@+id/rv_expired_coupons" 96 android:id="@+id/rv_expired_coupons"
...@@ -112,13 +112,13 @@ ...@@ -112,13 +112,13 @@
112 112
113 <TextView 113 <TextView
114 android:id="@+id/tv_shared_title" 114 android:id="@+id/tv_shared_title"
115 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
115 android:layout_width="wrap_content" 116 android:layout_width="wrap_content"
116 android:layout_height="wrap_content" 117 android:layout_height="wrap_content"
117 android:layout_centerHorizontal="true" 118 android:layout_centerHorizontal="true"
118 android:text="@string/cos_analysis2" 119 android:text="@string/cos_analysis2"
119 android:textColor="@color/cos_blue_dark" 120 android:textColor="@color/cos_blue_dark"
120 - android:textSize="16sp" 121 + android:textSize="16sp" />
121 - android:textStyle="bold" />
122 122
123 <androidx.recyclerview.widget.RecyclerView 123 <androidx.recyclerview.widget.RecyclerView
124 android:id="@+id/rv_shared_coupons" 124 android:id="@+id/rv_shared_coupons"
......
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
22 app:layout_constraintTop_toTopOf="parent" /> 22 app:layout_constraintTop_toTopOf="parent" />
23 23
24 <TextView 24 <TextView
25 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
25 android:layout_width="wrap_content" 26 android:layout_width="wrap_content"
26 android:layout_height="wrap_content" 27 android:layout_height="wrap_content"
27 android:text="@string/cos_profile_title" 28 android:text="@string/cos_profile_title"
28 android:textColor="@color/grey" 29 android:textColor="@color/grey"
29 android:textSize="17sp" 30 android:textSize="17sp"
30 - android:textStyle="bold"
31 app:layout_constraintBottom_toBottomOf="parent" 31 app:layout_constraintBottom_toBottomOf="parent"
32 app:layout_constraintEnd_toEndOf="parent" 32 app:layout_constraintEnd_toEndOf="parent"
33 app:layout_constraintStart_toStartOf="parent" 33 app:layout_constraintStart_toStartOf="parent"
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
105 105
106 <TextView 106 <TextView
107 android:id="@+id/tv_profile_name" 107 android:id="@+id/tv_profile_name"
108 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
108 android:layout_width="wrap_content" 109 android:layout_width="wrap_content"
109 android:layout_height="wrap_content" 110 android:layout_height="wrap_content"
110 android:layout_marginVertical="6dp" 111 android:layout_marginVertical="6dp"
...@@ -126,10 +127,10 @@ ...@@ -126,10 +127,10 @@
126 127
127 <TextView 128 <TextView
128 android:id="@+id/tv_type" 129 android:id="@+id/tv_type"
130 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
129 android:layout_width="wrap_content" 131 android:layout_width="wrap_content"
130 android:layout_height="wrap_content" 132 android:layout_height="wrap_content"
131 android:textColor="@android:color/white" 133 android:textColor="@android:color/white"
132 - android:textFontWeight="600"
133 tools:text="@string/cos_profile_type" /> 134 tools:text="@string/cos_profile_type" />
134 </LinearLayout> 135 </LinearLayout>
135 136
...@@ -146,11 +147,11 @@ ...@@ -146,11 +147,11 @@
146 147
147 <TextView 148 <TextView
148 android:id="@+id/tv_questionnaire" 149 android:id="@+id/tv_questionnaire"
150 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
149 android:layout_width="wrap_content" 151 android:layout_width="wrap_content"
150 android:layout_height="wrap_content" 152 android:layout_height="wrap_content"
151 android:text="@string/cos_profile_preferences" 153 android:text="@string/cos_profile_preferences"
152 - android:textColor="@color/cos_green6" 154 + android:textColor="@color/cos_green6" />
153 - android:textFontWeight="600" />
154 </LinearLayout> 155 </LinearLayout>
155 </LinearLayout> 156 </LinearLayout>
156 157
...@@ -202,6 +203,7 @@ ...@@ -202,6 +203,7 @@
202 203
203 <TextView 204 <TextView
204 android:id="@+id/tv_deals_value_all" 205 android:id="@+id/tv_deals_value_all"
206 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
205 android:layout_width="0dp" 207 android:layout_width="0dp"
206 android:layout_height="wrap_content" 208 android:layout_height="wrap_content"
207 android:layout_marginEnd="16dp" 209 android:layout_marginEnd="16dp"
...@@ -227,11 +229,11 @@ ...@@ -227,11 +229,11 @@
227 229
228 <TextView 230 <TextView
229 android:id="@+id/tv_deals_value" 231 android:id="@+id/tv_deals_value"
232 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
230 android:layout_width="wrap_content" 233 android:layout_width="wrap_content"
231 android:layout_height="wrap_content" 234 android:layout_height="wrap_content"
232 android:textColor="@color/cos_grey" 235 android:textColor="@color/cos_grey"
233 android:textSize="12sp" 236 android:textSize="12sp"
234 - android:textStyle="bold"
235 app:layout_constraintEnd_toEndOf="@+id/iv_deals_logo" 237 app:layout_constraintEnd_toEndOf="@+id/iv_deals_logo"
236 app:layout_constraintStart_toStartOf="@+id/iv_deals_logo" 238 app:layout_constraintStart_toStartOf="@+id/iv_deals_logo"
237 app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50_cos" 239 app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50_cos"
...@@ -279,6 +281,7 @@ ...@@ -279,6 +281,7 @@
279 281
280 <TextView 282 <TextView
281 android:id="@+id/tv_gifts_value_all" 283 android:id="@+id/tv_gifts_value_all"
284 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
282 android:layout_width="0dp" 285 android:layout_width="0dp"
283 android:layout_height="wrap_content" 286 android:layout_height="wrap_content"
284 android:layout_marginEnd="16dp" 287 android:layout_marginEnd="16dp"
...@@ -304,11 +307,11 @@ ...@@ -304,11 +307,11 @@
304 307
305 <TextView 308 <TextView
306 android:id="@+id/tv_gifts_value" 309 android:id="@+id/tv_gifts_value"
310 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
307 android:layout_width="wrap_content" 311 android:layout_width="wrap_content"
308 android:layout_height="wrap_content" 312 android:layout_height="wrap_content"
309 android:textColor="@color/cos_grey" 313 android:textColor="@color/cos_grey"
310 android:textSize="12sp" 314 android:textSize="12sp"
311 - android:textStyle="bold"
312 app:layout_constraintEnd_toEndOf="@+id/iv_gifts_logo" 315 app:layout_constraintEnd_toEndOf="@+id/iv_gifts_logo"
313 app:layout_constraintStart_toStartOf="@+id/iv_gifts_logo" 316 app:layout_constraintStart_toStartOf="@+id/iv_gifts_logo"
314 app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50" 317 app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50"
...@@ -347,22 +350,22 @@ ...@@ -347,22 +350,22 @@
347 350
348 <TextView 351 <TextView
349 android:id="@+id/tv_active_gifts" 352 android:id="@+id/tv_active_gifts"
353 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
350 android:layout_width="wrap_content" 354 android:layout_width="wrap_content"
351 android:layout_height="wrap_content" 355 android:layout_height="wrap_content"
352 android:textColor="@color/blue_dark" 356 android:textColor="@color/blue_dark"
353 - android:textFontWeight="600"
354 android:textSize="18sp" 357 android:textSize="18sp"
355 tools:text="@string/cos_active_deals" /> 358 tools:text="@string/cos_active_deals" />
356 359
357 <TextView 360 <TextView
358 android:id="@+id/tv_active_deals_text" 361 android:id="@+id/tv_active_deals_text"
362 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
359 android:layout_width="wrap_content" 363 android:layout_width="wrap_content"
360 android:layout_height="wrap_content" 364 android:layout_height="wrap_content"
361 android:ellipsize="end" 365 android:ellipsize="end"
362 android:maxLines="2" 366 android:maxLines="2"
363 android:textColor="@color/blue_dark" 367 android:textColor="@color/blue_dark"
364 android:textSize="18sp" 368 android:textSize="18sp"
365 - android:textStyle="bold"
366 tools:text="961544809" /> 369 tools:text="961544809" />
367 370
368 <!-- <TextView--> 371 <!-- <TextView-->
...@@ -387,6 +390,7 @@ ...@@ -387,6 +390,7 @@
387 390
388 <TextView 391 <TextView
389 android:id="@+id/tv_active_coupons_header" 392 android:id="@+id/tv_active_coupons_header"
393 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
390 android:layout_width="wrap_content" 394 android:layout_width="wrap_content"
391 android:layout_height="wrap_content" 395 android:layout_height="wrap_content"
392 android:layout_gravity="start" 396 android:layout_gravity="start"
...@@ -395,8 +399,7 @@ ...@@ -395,8 +399,7 @@
395 android:layout_marginBottom="10dp" 399 android:layout_marginBottom="10dp"
396 android:text="@string/cos_mygifts" 400 android:text="@string/cos_mygifts"
397 android:textColor="@android:color/white" 401 android:textColor="@android:color/white"
398 - android:textSize="20sp" 402 + android:textSize="20sp" />
399 - android:textStyle="bold" />
400 403
401 <androidx.recyclerview.widget.RecyclerView 404 <androidx.recyclerview.widget.RecyclerView
402 android:id="@+id/rv_active_coupons" 405 android:id="@+id/rv_active_coupons"
...@@ -411,21 +414,23 @@ ...@@ -411,21 +414,23 @@
411 android:layout_height="wrap_content" 414 android:layout_height="wrap_content"
412 android:layout_marginHorizontal="32dp" 415 android:layout_marginHorizontal="32dp"
413 android:gravity="center" 416 android:gravity="center"
414 - android:visibility="gone" 417 + android:orientation="vertical"
415 - android:orientation="vertical"> 418 + android:visibility="gone">
416 419
417 <ImageView 420 <ImageView
418 - android:layout_width="64dp" 421 + android:layout_width="72dp"
419 - android:layout_height="64dp" 422 + android:layout_height="72dp"
420 android:src="@drawable/ic_empty_wallet" /> 423 android:src="@drawable/ic_empty_wallet" />
421 424
422 <TextView 425 <TextView
426 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
423 android:layout_width="wrap_content" 427 android:layout_width="wrap_content"
424 android:layout_height="wrap_content" 428 android:layout_height="wrap_content"
425 android:layout_marginTop="8dp" 429 android:layout_marginTop="8dp"
426 android:gravity="center" 430 android:gravity="center"
427 android:text="@string/cos_empty_wallet" 431 android:text="@string/cos_empty_wallet"
428 - android:textColor="@color/cos_white_tr" /> 432 + android:textColor="@color/cos_white_tr"
433 + android:textSize="16sp" />
429 </LinearLayout> 434 </LinearLayout>
430 </LinearLayout> 435 </LinearLayout>
431 </RelativeLayout> 436 </RelativeLayout>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 android:gravity="center" 30 android:gravity="center"
31 android:textColor="@color/grey" 31 android:textColor="@color/grey"
32 android:textSize="17sp" 32 android:textSize="17sp"
33 - android:textStyle="bold" 33 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
34 android:text="@string/cos_more_title" 34 android:text="@string/cos_more_title"
35 app:layout_constraintBottom_toBottomOf="parent" 35 app:layout_constraintBottom_toBottomOf="parent"
36 app:layout_constraintEnd_toEndOf="parent" 36 app:layout_constraintEnd_toEndOf="parent"
......
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - xmlns:app="http://schemas.android.com/apk/res-auto"
4 - android:id="@+id/cl_bill_payment"
5 - android:layout_width="match_parent"
6 - android:layout_height="match_parent">
7 -
8 - <androidx.constraintlayout.widget.ConstraintLayout
9 - android:id="@+id/cl_bill_header"
10 - android:layout_width="match_parent"
11 - android:layout_height="80dp"
12 - android:background="@android:color/white"
13 - app:layout_constraintTop_toTopOf="parent">
14 -
15 - <ImageView
16 - android:id="@+id/iv_coupons_close"
17 - android:layout_width="21dp"
18 - android:layout_height="20dp"
19 - android:layout_marginStart="24dp"
20 - android:layout_marginTop="4dp"
21 - android:src="@drawable/ic_back"
22 - app:layout_constraintBottom_toBottomOf="parent"
23 - app:layout_constraintStart_toStartOf="parent"
24 - app:layout_constraintTop_toTopOf="parent" />
25 -
26 - <TextView
27 - android:id="@+id/textView3"
28 - android:layout_width="206dp"
29 - android:layout_height="32dp"
30 - android:gravity="center"
31 - android:text="@string/cos_past_all_coupons"
32 - android:textColor="@color/grey"
33 - android:textSize="17sp"
34 - android:textStyle="bold"
35 - app:layout_constraintBottom_toBottomOf="parent"
36 - app:layout_constraintEnd_toEndOf="parent"
37 - app:layout_constraintStart_toStartOf="parent"
38 - app:layout_constraintTop_toTopOf="parent" />
39 -
40 - <ImageView
41 - android:id="@+id/iv_loyalty_wallet"
42 - android:layout_width="40dp"
43 - android:layout_height="40dp"
44 - android:layout_marginEnd="24dp"
45 - android:src="@drawable/ic_rewards_wallet"
46 - app:layout_constraintBottom_toBottomOf="parent"
47 - app:layout_constraintEnd_toEndOf="parent"
48 - app:layout_constraintTop_toTopOf="parent" />
49 - </androidx.constraintlayout.widget.ConstraintLayout>
50 -
51 - <androidx.constraintlayout.widget.ConstraintLayout
52 - android:layout_width="match_parent"
53 - android:layout_height="match_parent"
54 - android:layout_below="@+id/cl_bill_header"
55 - android:layout_marginTop="1dp"
56 - android:background="@drawable/shape_cos_loyalty"
57 - android:orientation="vertical">
58 -
59 - <androidx.recyclerview.widget.RecyclerView
60 - android:id="@+id/rv_active_coupons"
61 - android:layout_width="match_parent"
62 - android:layout_height="0dp"
63 - android:paddingTop="48dp"
64 - app:layout_constraintBottom_toBottomOf="parent"
65 - app:layout_constraintEnd_toEndOf="parent"
66 - app:layout_constraintStart_toStartOf="parent"
67 - app:layout_constraintTop_toTopOf="parent" />
68 - </androidx.constraintlayout.widget.ConstraintLayout>
69 -
70 - <TextView
71 - android:id="@+id/tv_no_coupons"
72 - android:layout_width="wrap_content"
73 - android:layout_height="wrap_content"
74 - android:layout_centerInParent="true"
75 - android:text="@string/cos_no_active_coupons"
76 - android:textColor="@color/grey"
77 - android:textSize="18sp"
78 - android:textStyle="bold"
79 - android:visibility="gone" />
80 -</RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 android:text="@string/cos_coupon_shops_title" 27 android:text="@string/cos_coupon_shops_title"
28 android:textColor="@color/grey" 28 android:textColor="@color/grey"
29 android:textSize="17sp" 29 android:textSize="17sp"
30 - android:textStyle="bold" 30 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
31 app:layout_constraintBottom_toBottomOf="parent" 31 app:layout_constraintBottom_toBottomOf="parent"
32 app:layout_constraintEnd_toEndOf="parent" 32 app:layout_constraintEnd_toEndOf="parent"
33 app:layout_constraintStart_toStartOf="parent" 33 app:layout_constraintStart_toStartOf="parent"
......
1 -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 - xmlns:app="http://schemas.android.com/apk/res-auto"
3 - android:layout_width="match_parent"
4 - android:layout_height="match_parent"
5 - android:background="@color/grey4">
6 -
7 - <androidx.constraintlayout.widget.ConstraintLayout
8 - android:id="@+id/cl_loyalty_wallet_header"
9 - android:layout_width="match_parent"
10 - android:layout_height="50dp"
11 - android:background="@android:color/white">
12 -
13 - <ImageView
14 - android:id="@+id/iv_back"
15 - android:layout_width="20dp"
16 - android:layout_height="20dp"
17 - android:layout_marginStart="16dp"
18 - android:src="@drawable/ic_back"
19 - app:layout_constraintBottom_toBottomOf="parent"
20 - app:layout_constraintStart_toStartOf="parent"
21 - app:layout_constraintTop_toTopOf="parent" />
22 -
23 - <TextView
24 - android:layout_width="wrap_content"
25 - android:layout_height="wrap_content"
26 - android:text="Steps for Good"
27 - android:textColor="@color/grey"
28 - android:textSize="17sp"
29 - android:textStyle="bold"
30 - app:layout_constraintBottom_toBottomOf="parent"
31 - app:layout_constraintEnd_toEndOf="parent"
32 - app:layout_constraintStart_toStartOf="parent"
33 - app:layout_constraintTop_toTopOf="parent" />
34 - </androidx.constraintlayout.widget.ConstraintLayout>
35 -
36 - <TextView
37 - android:id="@+id/tv_counter"
38 - android:layout_width="wrap_content"
39 - android:layout_height="wrap_content"
40 - android:layout_centerInParent="true"
41 - android:text="Counter"
42 - android:textSize="18sp" />
43 -
44 - <TextView
45 - android:id="@+id/tv_counter_value"
46 - android:layout_width="wrap_content"
47 - android:layout_height="wrap_content"
48 - android:layout_below="@+id/tv_counter"
49 - android:layout_centerInParent="true"
50 - android:textColor="@color/grey"
51 - android:textSize="17sp"
52 - android:textStyle="bold"
53 - android:text="0" />
54 -
55 -</RelativeLayout>
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
15 15
16 <TextView 16 <TextView
17 android:id="@+id/tv_sender_value" 17 android:id="@+id/tv_sender_value"
18 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
18 android:layout_width="wrap_content" 19 android:layout_width="wrap_content"
19 android:layout_height="wrap_content" 20 android:layout_height="wrap_content"
20 android:layout_alignParentStart="true" 21 android:layout_alignParentStart="true"
21 android:layout_marginStart="24dp" 22 android:layout_marginStart="24dp"
22 android:text="@string/cos_coupon_share_sender" 23 android:text="@string/cos_coupon_share_sender"
23 android:textColor="@color/grey" 24 android:textColor="@color/grey"
24 - android:textSize="16sp" 25 + android:textSize="16sp" />
25 - android:textStyle="bold" />
26 26
27 <ImageView 27 <ImageView
28 android:id="@+id/iv_sender_list_close" 28 android:id="@+id/iv_sender_list_close"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 android:layout_height="wrap_content" 11 android:layout_height="wrap_content"
12 android:textColor="@color/cos_blue_dark2" 12 android:textColor="@color/cos_blue_dark2"
13 android:textSize="13sp" 13 android:textSize="13sp"
14 - android:textStyle="bold" 14 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
15 tools:text="05/05/2022" /> 15 tools:text="05/05/2022" />
16 16
17 <LinearLayout 17 <LinearLayout
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 android:layout_weight="0.5" 30 android:layout_weight="0.5"
31 android:maxLines="2" 31 android:maxLines="2"
32 android:textColor="@color/cos_blue_dark2" 32 android:textColor="@color/cos_blue_dark2"
33 - android:textFontWeight="600" 33 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
34 android:textSize="16sp" 34 android:textSize="16sp"
35 tools:text="Box" /> 35 tools:text="Box" />
36 36
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 android:gravity="end" 42 android:gravity="end"
43 android:textColor="@color/cos_blue_dark2" 43 android:textColor="@color/cos_blue_dark2"
44 android:textSize="16sp" 44 android:textSize="16sp"
45 - android:textStyle="bold" 45 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
46 tools:text="4$" /> 46 tools:text="4$" />
47 </LinearLayout> 47 </LinearLayout>
48 48
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
52 android:layout_height="wrap_content" 52 android:layout_height="wrap_content"
53 android:layout_below="@+id/ll_expired_info_view" 53 android:layout_below="@+id/ll_expired_info_view"
54 android:text="@string/cos_expired_coupon_label" 54 android:text="@string/cos_expired_coupon_label"
55 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
55 android:textColor="@color/cos_light_grey2" 56 android:textColor="@color/cos_light_grey2"
56 android:textSize="16sp" /> 57 android:textSize="16sp" />
57 </RelativeLayout> 58 </RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
46 android:gravity="center" 46 android:gravity="center"
47 android:maxLines="4" 47 android:maxLines="4"
48 android:textColor="@color/grey" 48 android:textColor="@color/grey"
49 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
49 app:layout_constraintBottom_toBottomOf="parent" 50 app:layout_constraintBottom_toBottomOf="parent"
50 app:layout_constraintLeft_toRightOf="@+id/gl_vertical_60_percent" 51 app:layout_constraintLeft_toRightOf="@+id/gl_vertical_60_percent"
51 app:layout_constraintRight_toRightOf="parent" 52 app:layout_constraintRight_toRightOf="parent"
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
63 android:maxLines="4" 63 android:maxLines="4"
64 android:textColor="@color/blue_dark" 64 android:textColor="@color/blue_dark"
65 android:textSize="18sp" 65 android:textSize="18sp"
66 - android:textStyle="bold" 66 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
67 app:layout_constraintEnd_toStartOf="@+id/gl_vertical_80_percent_inner" 67 app:layout_constraintEnd_toStartOf="@+id/gl_vertical_80_percent_inner"
68 app:layout_constraintStart_toStartOf="parent" 68 app:layout_constraintStart_toStartOf="parent"
69 app:layout_constraintTop_toTopOf="parent" 69 app:layout_constraintTop_toTopOf="parent"
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
78 android:maxLines="4" 78 android:maxLines="4"
79 android:textColor="@color/blue_dark" 79 android:textColor="@color/blue_dark"
80 android:textSize="16sp" 80 android:textSize="16sp"
81 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
81 app:layout_constraintEnd_toStartOf="@+id/gl_vertical_80_percent_inner" 82 app:layout_constraintEnd_toStartOf="@+id/gl_vertical_80_percent_inner"
82 app:layout_constraintStart_toStartOf="parent" 83 app:layout_constraintStart_toStartOf="parent"
83 app:layout_constraintTop_toBottomOf="@+id/tv_campaign_title" 84 app:layout_constraintTop_toBottomOf="@+id/tv_campaign_title"
...@@ -92,7 +93,7 @@ ...@@ -92,7 +93,7 @@
92 android:maxLines="4" 93 android:maxLines="4"
93 android:textColor="@color/blue_dark" 94 android:textColor="@color/blue_dark"
94 android:textSize="16sp" 95 android:textSize="16sp"
95 - android:textStyle="bold" 96 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
96 app:layout_constraintBottom_toBottomOf="parent" 97 app:layout_constraintBottom_toBottomOf="parent"
97 app:layout_constraintEnd_toStartOf="@+id/gl_vertical_80_percent_inner" 98 app:layout_constraintEnd_toStartOf="@+id/gl_vertical_80_percent_inner"
98 app:layout_constraintStart_toStartOf="parent" 99 app:layout_constraintStart_toStartOf="parent"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 android:layout_centerVertical="true" 21 android:layout_centerVertical="true"
22 android:background="@android:color/transparent" 22 android:background="@android:color/transparent"
23 android:textColor="@color/grey" 23 android:textColor="@color/grey"
24 - android:textFontWeight="600" 24 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
25 android:textSize="16sp" 25 android:textSize="16sp"
26 tools:text="6987654322" /> 26 tools:text="6987654322" />
27 </RelativeLayout> 27 </RelativeLayout>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 android:layout_height="wrap_content" 11 android:layout_height="wrap_content"
12 android:textColor="@color/cos_blue_dark2" 12 android:textColor="@color/cos_blue_dark2"
13 android:textSize="13sp" 13 android:textSize="13sp"
14 - android:textStyle="bold" 14 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
15 tools:text="05/05/2022" /> 15 tools:text="05/05/2022" />
16 16
17 <LinearLayout 17 <LinearLayout
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 android:layout_weight="0.5" 30 android:layout_weight="0.5"
31 android:maxLines="2" 31 android:maxLines="2"
32 android:textColor="@color/cos_blue_dark2" 32 android:textColor="@color/cos_blue_dark2"
33 - android:textFontWeight="600" 33 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
34 android:textSize="16sp" 34 android:textSize="16sp"
35 tools:text="Box" /> 35 tools:text="Box" />
36 36
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 android:gravity="end" 42 android:gravity="end"
43 android:textColor="@color/cos_blue_dark2" 43 android:textColor="@color/cos_blue_dark2"
44 android:textSize="16sp" 44 android:textSize="16sp"
45 - android:textStyle="bold" 45 + fontPath="fonts/pf_square_sans_pro_bold.ttf"
46 tools:text="4$" /> 46 tools:text="4$" />
47 </LinearLayout> 47 </LinearLayout>
48 48
...@@ -53,12 +53,14 @@ ...@@ -53,12 +53,14 @@
53 android:layout_below="@+id/ll_expired_info_view" 53 android:layout_below="@+id/ll_expired_info_view"
54 android:textColor="@color/cos_light_grey2" 54 android:textColor="@color/cos_light_grey2"
55 android:textSize="16sp" 55 android:textSize="16sp"
56 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
56 tools:text="@string/cos_expired_coupon_label" /> 57 tools:text="@string/cos_expired_coupon_label" />
57 58
58 <TextView 59 <TextView
59 android:id="@+id/tv_shared_coupons_phone" 60 android:id="@+id/tv_shared_coupons_phone"
60 android:layout_width="wrap_content" 61 android:layout_width="wrap_content"
61 android:layout_height="wrap_content" 62 android:layout_height="wrap_content"
63 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
62 android:layout_below="@+id/tv_shared_coupons_label" 64 android:layout_below="@+id/tv_shared_coupons_label"
63 android:textColor="@color/cos_light_grey2" 65 android:textColor="@color/cos_light_grey2"
64 android:textSize="16sp" 66 android:textSize="16sp"
......
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
19 android:layout_height="wrap_content" 19 android:layout_height="wrap_content"
20 android:text="@string/cos_redeemed_coupons_tab" 20 android:text="@string/cos_redeemed_coupons_tab"
21 android:textColor="@color/cos_cyan4" 21 android:textColor="@color/cos_cyan4"
22 - android:textSize="14sp" 22 + android:textSize="14sp" />
23 - android:textStyle="bold" />
24 </LinearLayout> 23 </LinearLayout>
25 24
26 <LinearLayout 25 <LinearLayout
......
...@@ -115,6 +115,12 @@ ...@@ -115,6 +115,12 @@
115 <string name="cos_shared_coupon_sender">Έκπτωτικό κουπόνι από</string> 115 <string name="cos_shared_coupon_sender">Έκπτωτικό κουπόνι από</string>
116 <string name="cos_steps_for_good_notification_title">Steps for Good</string> 116 <string name="cos_steps_for_good_notification_title">Steps for Good</string>
117 <string name="cos_empty_wallet">Δεν έχεις κάποιον ενεργό κωδικό ή κουπόνι! Μπες τώρα στην ενότητα COSMOTE For YOU και βρες αποκλειστικές προσφορές!</string> 117 <string name="cos_empty_wallet">Δεν έχεις κάποιον ενεργό κωδικό ή κουπόνι! Μπες τώρα στην ενότητα COSMOTE For YOU και βρες αποκλειστικές προσφορές!</string>
118 + <string name="cos_wallet_text1">Μέχρι τώρα έχεις κερδίσει&#160;</string>
119 + <string name="cos_wallet_text2">&#160;με το DEALS for YOU!</string>
120 + <string name="cos_wallet_text3">Μέχρι τώρα έχεις κερδίσει&#160;</string>
121 + <string name="cos_wallet_text4">&#160;σε προσφορές από&#160;</string>
122 + <string name="cos_wallet_text5">&#160;κουπόνια!</string>
123 + <string name="cos_value2">%1$s</string>
118 124
119 <string-array name="coupons_array"> 125 <string-array name="coupons_array">
120 <item>Κουπόνια</item> 126 <item>Κουπόνια</item>
......