open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
1c4e20b8 1 parent bb158ef7

minor fixes

Inline Side-by-side
Showing 16 changed files with 146 additions and 126 deletions
...@@ -35,7 +35,7 @@ PushIcon=ic_notify ...@@ -35,7 +35,7 @@ PushIcon=ic_notify
35 SendPackages=false 35 SendPackages=false
36 36
37 # The app language 37 # The app language
38 -#Language=el 38 +Language=el
39 39
40 # The merchant id for some requests 40 # The merchant id for some requests
41 MerchantId=20113 41 MerchantId=20113
......
...@@ -76,7 +76,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene ...@@ -76,7 +76,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene
76 } 76 }
77 77
78 private void showDialog() { 78 private void showDialog() {
79 - Dialog dialog = new Dialog(this); 79 + Dialog dialog = new Dialog(this, R.style.PopUpDialog);
80 dialog.setContentView(R.layout.payment_success_dialog); 80 dialog.setContentView(R.layout.payment_success_dialog);
81 dialog.getWindow().setBackgroundDrawableResource(R.drawable.banner_border_white); 81 dialog.getWindow().setBackgroundDrawableResource(R.drawable.banner_border_white);
82 dialog.show(); 82 dialog.show();
......
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.app.Dialog;
5 import android.content.Intent; 4 import android.content.Intent;
6 import android.graphics.Paint; 5 import android.graphics.Paint;
7 import android.os.Bundle; 6 import android.os.Bundle;
7 +import android.text.TextUtils;
8 import android.view.View; 8 import android.view.View;
9 -import android.widget.Button;
10 import android.widget.ImageView; 9 import android.widget.ImageView;
11 import android.widget.LinearLayout; 10 import android.widget.LinearLayout;
12 import android.widget.TextView; 11 import android.widget.TextView;
13 12
13 +import com.bumptech.glide.Glide;
14 +import com.bumptech.glide.load.engine.DiskCacheStrategy;
15 +
16 +import java.text.ParseException;
17 +import java.text.SimpleDateFormat;
18 +import java.util.Date;
19 +
14 import ly.warp.sdk.R; 20 import ly.warp.sdk.R;
21 +import ly.warp.sdk.io.models.Coupon;
15 22
16 23
17 public class CouponInfoActivity extends Activity implements View.OnClickListener { 24 public class CouponInfoActivity extends Activity implements View.OnClickListener {
...@@ -24,9 +31,10 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -24,9 +31,10 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
24 // Fields 31 // Fields
25 // =========================================================== 32 // ===========================================================
26 33
27 - private ImageView mIvBack; 34 + private ImageView mIvBack, mIvCoupoPhoto;
28 - private TextView mTvTerms, mTvCouponCode; 35 + private TextView mTvTerms, mTvCouponCode, mTvCouponTitle, mTvCouponSubtitle, mTvCouponDate;
29 private LinearLayout mLlGiftIt; 36 private LinearLayout mLlGiftIt;
37 + private Coupon mCoupon;
30 38
31 // =========================================================== 39 // ===========================================================
32 // Methods for/from SuperClass/Interfaces 40 // Methods for/from SuperClass/Interfaces
...@@ -37,10 +45,16 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -37,10 +45,16 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
37 super.onCreate(savedInstanceState); 45 super.onCreate(savedInstanceState);
38 setContentView(R.layout.activity_coupon_info); 46 setContentView(R.layout.activity_coupon_info);
39 47
48 + mCoupon = (Coupon) getIntent().getSerializableExtra("coupon");
49 +
40 mIvBack = findViewById(R.id.iv_coupon_info_back); 50 mIvBack = findViewById(R.id.iv_coupon_info_back);
41 mTvTerms = findViewById(R.id.tv_terms); 51 mTvTerms = findViewById(R.id.tv_terms);
42 mLlGiftIt = findViewById(R.id.ll_gift_it); 52 mLlGiftIt = findViewById(R.id.ll_gift_it);
43 mTvCouponCode = findViewById(R.id.textView16); 53 mTvCouponCode = findViewById(R.id.textView16);
54 + mTvCouponTitle = findViewById(R.id.textView13);
55 + mTvCouponSubtitle = findViewById(R.id.textView14);
56 + mTvCouponDate = findViewById(R.id.textView17);
57 + mIvCoupoPhoto = findViewById(R.id.imageView6);
44 58
45 initViews(); 59 initViews();
46 } 60 }
...@@ -69,6 +83,33 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -69,6 +83,33 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
69 // =========================================================== 83 // ===========================================================
70 84
71 private void initViews() { 85 private void initViews() {
86 + mTvCouponCode.setText(mCoupon.getCoupon());
87 + mTvCouponTitle.setText(mCoupon.getName());
88 + mTvCouponSubtitle.setText(mCoupon.getDescription());
89 + String strCurrentDate = mCoupon.getCreated();
90 + SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy");
91 + Date newDate = new Date();
92 + try {
93 + newDate = format.parse(strCurrentDate);
94 + } catch (ParseException e) {
95 + e.printStackTrace();
96 + }
97 + mTvCouponDate.setText(String.format(getResources().getString(R.string.cos_coupon_date),
98 + format.format(newDate)));
99 + if (!TextUtils.isEmpty(mCoupon.getImage())) {
100 + Glide.with(this)
101 +// .setDefaultRequestOptions(
102 +// RequestOptions
103 +// .placeholderOf(R.drawable.ic_default_contact_photo)
104 +// .error(R.drawable.ic_default_contact_photo))
105 + .load(mCoupon.getImage())
106 + .diskCacheStrategy(DiskCacheStrategy.DATA)
107 + .into(mIvCoupoPhoto);
108 + } else {
109 + Glide.with(this)
110 + .load(R.drawable.ic_cosmote_logo_horizontal_grey)
111 + .into(mIvCoupoPhoto);
112 + }
72 mIvBack.setOnClickListener(this); 113 mIvBack.setOnClickListener(this);
73 mTvTerms.setPaintFlags(mTvTerms.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); 114 mTvTerms.setPaintFlags(mTvTerms.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
74 mLlGiftIt.setOnClickListener(this); 115 mLlGiftIt.setOnClickListener(this);
......
...@@ -13,12 +13,10 @@ import android.widget.TextView; ...@@ -13,12 +13,10 @@ import android.widget.TextView;
13 import androidx.recyclerview.widget.LinearLayoutManager; 13 import androidx.recyclerview.widget.LinearLayoutManager;
14 import androidx.recyclerview.widget.RecyclerView; 14 import androidx.recyclerview.widget.RecyclerView;
15 15
16 -import org.json.JSONException; 16 +import java.io.Serializable;
17 17
18 import ly.warp.sdk.R; 18 import ly.warp.sdk.R;
19 import ly.warp.sdk.fragments.BaseFragment; 19 import ly.warp.sdk.fragments.BaseFragment;
20 -import ly.warp.sdk.io.models.Coupon;
21 -import ly.warp.sdk.io.models.CouponList;
22 import ly.warp.sdk.views.adapters.HomeCouponAdapter; 20 import ly.warp.sdk.views.adapters.HomeCouponAdapter;
23 21
24 22
...@@ -96,26 +94,16 @@ public class LoyaltyActivity extends Activity implements View.OnClickListener, ...@@ -96,26 +94,16 @@ public class LoyaltyActivity extends Activity implements View.OnClickListener,
96 mTvUsername.setText(String.format(getResources().getString(R.string.cos_profile_loyalty_name), 94 mTvUsername.setText(String.format(getResources().getString(R.string.cos_profile_loyalty_name),
97 BaseFragment.getConsumer().getFirstName(), BaseFragment.getConsumer().getLastName())); 95 BaseFragment.getConsumer().getFirstName(), BaseFragment.getConsumer().getLastName()));
98 96
99 -
100 - /********* TEST COUPONS DATA **********/
101 - CouponList clist = new CouponList();
102 - try {
103 - clist.add(new Coupon("{\"barcode\": \"a724e911a71a42408b6ba50ae6c08dbb\", \"coupon\": \"123456789\", \"name\": \"\\u039a\\u03ac\\u03bd\\u03b5 strike\", \"description\": \"\\u03ba\\u03b1\\u03b9 \\u03ba\\u03ad\\u03c1\\u03b4\\u03b9\\u03c3\\u03b5!\", \"image\": \"https://warply.s3.amazonaws.com/artworks/034fba10ceac4e0f9338bd8e60086292/index.html\"}"));
104 - clist.add(new Coupon("{\"barcode\": \"a724e911a71a42408b6ba50ae6c08dbb\", \"coupon\": \"12345678910\", \"name\": \"\\u039a\\u03ac\\u03bd\\u03b5 strike\", \"description\": \"\\u03ba\\u03b1\\u03b9 \\u03ba\\u03ad\\u03c1\\u03b4\\u03b9\\u03c3\\u03b5!\", \"image\": \"https://warply.s3.amazonaws.com/artworks/034fba10ceac4e0f9338bd8e60086292/index.html\"}"));
105 - } catch (JSONException e) {
106 - e.printStackTrace();
107 - }
108 - /********* TEST COUPONS DATA **********/
109 -
110 mIvBack.setOnClickListener(this); 97 mIvBack.setOnClickListener(this);
111 mTvAnalysisButton.setOnClickListener(this); 98 mTvAnalysisButton.setOnClickListener(this);
112 99
113 mRecyclerCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)); 100 mRecyclerCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
114 - mAdapterCoupons = new HomeCouponAdapter(this, clist); 101 + mAdapterCoupons = new HomeCouponAdapter(this, BaseFragment.getCouponList());
115 mRecyclerCoupons.setAdapter(mAdapterCoupons); 102 mRecyclerCoupons.setAdapter(mAdapterCoupons);
116 mAdapterCoupons.getPositionClicks() 103 mAdapterCoupons.getPositionClicks()
117 .doOnNext(coupon -> { 104 .doOnNext(coupon -> {
118 Intent intent = new Intent(this, CouponInfoActivity.class); 105 Intent intent = new Intent(this, CouponInfoActivity.class);
106 + intent.putExtra("coupon", (Serializable) coupon);
119 startActivity(intent); 107 startActivity(intent);
120 }) 108 })
121 .doOnError(error -> { 109 .doOnError(error -> {
...@@ -123,7 +111,7 @@ public class LoyaltyActivity extends Activity implements View.OnClickListener, ...@@ -123,7 +111,7 @@ public class LoyaltyActivity extends Activity implements View.OnClickListener,
123 .subscribe(); 111 .subscribe();
124 112
125 mRecyclerBurntCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)); 113 mRecyclerBurntCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
126 - mAdapterBurntCoupons = new HomeCouponAdapter(this, clist, true); 114 + mAdapterBurntCoupons = new HomeCouponAdapter(this, BaseFragment.getCouponList(), true);
127 mRecyclerBurntCoupons.setAdapter(mAdapterBurntCoupons); 115 mRecyclerBurntCoupons.setAdapter(mAdapterBurntCoupons);
128 116
129 ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, 117 ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,
......
...@@ -17,6 +17,8 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -17,6 +17,8 @@ import androidx.recyclerview.widget.RecyclerView;
17 17
18 import org.json.JSONException; 18 import org.json.JSONException;
19 19
20 +import java.io.Serializable;
21 +
20 import ly.warp.sdk.R; 22 import ly.warp.sdk.R;
21 import ly.warp.sdk.activities.BillPaymentActivity; 23 import ly.warp.sdk.activities.BillPaymentActivity;
22 import ly.warp.sdk.activities.CouponInfoActivity; 24 import ly.warp.sdk.activities.CouponInfoActivity;
...@@ -104,25 +106,15 @@ public class HomeFragment extends BaseFragment implements View.OnClickListener { ...@@ -104,25 +106,15 @@ public class HomeFragment extends BaseFragment implements View.OnClickListener {
104 }) 106 })
105 .subscribe(); 107 .subscribe();
106 108
107 -
108 - /********* TEST COUPONS DATA **********/
109 - CouponList clist = new CouponList();
110 - try {
111 - clist.add(new Coupon("{\"barcode\": \"a724e911a71a42408b6ba50ae6c08dbb\", \"coupon\": \"123456789\", \"name\": \"\\u039a\\u03ac\\u03bd\\u03b5 strike\", \"description\": \"\\u03ba\\u03b1\\u03b9 \\u03ba\\u03ad\\u03c1\\u03b4\\u03b9\\u03c3\\u03b5!\", \"image\": \"https://warply.s3.amazonaws.com/artworks/034fba10ceac4e0f9338bd8e60086292/index.html\"}"));
112 - clist.add(new Coupon("{\"barcode\": \"a724e911a71a42408b6ba50ae6c08dbb\", \"coupon\": \"12345678910\", \"name\": \"\\u039a\\u03ac\\u03bd\\u03b5 strike\", \"description\": \"\\u03ba\\u03b1\\u03b9 \\u03ba\\u03ad\\u03c1\\u03b4\\u03b9\\u03c3\\u03b5!\", \"image\": \"https://warply.s3.amazonaws.com/artworks/034fba10ceac4e0f9338bd8e60086292/index.html\"}"));
113 - } catch (JSONException e) {
114 - e.printStackTrace();
115 - }
116 - /********* TEST COUPONS DATA **********/
117 -
118 mRecyclerCoupons = view.findViewById(R.id.rv_home_coupons); 109 mRecyclerCoupons = view.findViewById(R.id.rv_home_coupons);
119 mRecyclerCoupons.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false)); 110 mRecyclerCoupons.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
120 - mAdapterCoupons = new HomeCouponAdapter(getContext(), clist); 111 + mAdapterCoupons = new HomeCouponAdapter(getContext(), BaseFragment.getCouponList());
121 mRecyclerCoupons.setAdapter(mAdapterCoupons); 112 mRecyclerCoupons.setAdapter(mAdapterCoupons);
122 mAdapterCoupons.getPositionClicks() 113 mAdapterCoupons.getPositionClicks()
123 .doOnNext(coupon -> { 114 .doOnNext(coupon -> {
124 Intent intent = new Intent(getContext(), CouponInfoActivity.class); 115 Intent intent = new Intent(getContext(), CouponInfoActivity.class);
125 - getContext().startActivity(intent); 116 + intent.putExtra("coupon", (Serializable) coupon);
117 + startActivity(intent);
126 }) 118 })
127 .doOnError(error -> { 119 .doOnError(error -> {
128 }) 120 })
...@@ -138,7 +130,7 @@ public class HomeFragment extends BaseFragment implements View.OnClickListener { ...@@ -138,7 +130,7 @@ public class HomeFragment extends BaseFragment implements View.OnClickListener {
138 public void onClick(View view) { 130 public void onClick(View view) {
139 if (view.getId() == R.id.ll_bill_payment) { 131 if (view.getId() == R.id.ll_bill_payment) {
140 Intent intent = new Intent(getContext(), BillPaymentActivity.class); 132 Intent intent = new Intent(getContext(), BillPaymentActivity.class);
141 - getContext().startActivity(intent); 133 + startActivity(intent);
142 } 134 }
143 } 135 }
144 136
......
...@@ -158,7 +158,7 @@ public class LoyaltyFragment extends BaseFragment implements View.OnClickListene ...@@ -158,7 +158,7 @@ public class LoyaltyFragment extends BaseFragment implements View.OnClickListene
158 public void onClick(View view) { 158 public void onClick(View view) {
159 if (view.getId() == R.id.cl_rewards_wallet) { 159 if (view.getId() == R.id.cl_rewards_wallet) {
160 Intent intent = new Intent(getContext(), LoyaltyActivity.class); 160 Intent intent = new Intent(getContext(), LoyaltyActivity.class);
161 - getContext().startActivity(intent); 161 + startActivity(intent);
162 } 162 }
163 } 163 }
164 164
......
...@@ -12,6 +12,8 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -12,6 +12,8 @@ import androidx.recyclerview.widget.RecyclerView;
12 12
13 import com.bumptech.glide.Glide; 13 import com.bumptech.glide.Glide;
14 import com.bumptech.glide.load.engine.DiskCacheStrategy; 14 import com.bumptech.glide.load.engine.DiskCacheStrategy;
15 +import com.bumptech.glide.load.resource.bitmap.CenterCrop;
16 +import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
15 17
16 import io.reactivex.Observable; 18 import io.reactivex.Observable;
17 import io.reactivex.subjects.PublishSubject; 19 import io.reactivex.subjects.PublishSubject;
...@@ -37,8 +39,8 @@ public class HomeCampaignAdapter extends RecyclerView.Adapter<HomeCampaignAdapte ...@@ -37,8 +39,8 @@ public class HomeCampaignAdapter extends RecyclerView.Adapter<HomeCampaignAdapte
37 39
38 public HomeCampaignViewHolder(View view) { 40 public HomeCampaignViewHolder(View view) {
39 super(view); 41 super(view);
40 - ivCampaignTitle = view.findViewById(R.id.iv_campaign_logo); 42 + ivCampaignTitle = view.findViewById(R.id.imageView);
41 - tvCampaignTitle = view.findViewById(R.id.tv_campaign_title); 43 + tvCampaignTitle = view.findViewById(R.id.textView);
42 } 44 }
43 } 45 }
44 46
...@@ -72,30 +74,26 @@ public class HomeCampaignAdapter extends RecyclerView.Adapter<HomeCampaignAdapte ...@@ -72,30 +74,26 @@ public class HomeCampaignAdapter extends RecyclerView.Adapter<HomeCampaignAdapte
72 public void onBindViewHolder(final HomeCampaignViewHolder holder, int position) { 74 public void onBindViewHolder(final HomeCampaignViewHolder holder, int position) {
73 Campaign campaignItem = mCampaigns.get(position); 75 Campaign campaignItem = mCampaigns.get(position);
74 76
75 -// if (campaignItem != null) { 77 + if (campaignItem != null) {
76 -// if (!TextUtils.isEmpty(campaignItem.getLogoUrl())) { 78 + if (!TextUtils.isEmpty(campaignItem.getLogoUrl())) {
77 -// Glide.with(mContext) 79 + Glide.with(mContext)
78 -//// .setDefaultRequestOptions( 80 + .load(campaignItem.getLogoUrl())
79 -//// RequestOptions 81 + .transform(new CenterCrop(), new RoundedCorners(10))
80 -//// .placeholderOf(R.drawable.ic_default_contact_photo) 82 + .diskCacheStrategy(DiskCacheStrategy.DATA)
81 -//// .error(R.drawable.ic_default_contact_photo)) 83 + .into(holder.ivCampaignTitle);
82 -// .load(campaignItem.getLogoUrl()) 84 + } else {
83 -// .diskCacheStrategy(DiskCacheStrategy.DATA) 85 + Glide.with(mContext)
84 -// .into(holder.ivCampaignTitle); 86 + .load(R.drawable.ic_cosmote_logo_horizontal_grey)
85 -// } else { 87 + .into(holder.ivCampaignTitle);
86 -// Glide.with(mContext) 88 + }
87 -// .load(R.drawable.ic_cosmote_logo_horizontal_grey) 89 +
88 -// .into(holder.ivCampaignTitle); 90 + holder.tvCampaignTitle.setText(campaignItem.getTitle());
89 -// } 91 +
90 -// 92 + holder.itemView.setOnClickListener(v -> onClickSubject.onNext(campaignItem));
91 -// holder.tvCampaignTitle.setText(campaignItem.getTitle()); 93 + }
92 -//
93 -// holder.itemView.setOnClickListener(v -> onClickSubject.onNext(campaignItem));
94 -// }
95 } 94 }
96 95
97 public Observable<Campaign> getPositionClicks() { 96 public Observable<Campaign> getPositionClicks() {
98 return onClickSubject.cache(); 97 return onClickSubject.cache();
99 } 98 }
100 -
101 } 99 }
......
...@@ -46,7 +46,7 @@ public class HomeCouponAdapter extends RecyclerView.Adapter<HomeCouponAdapter.Ho ...@@ -46,7 +46,7 @@ public class HomeCouponAdapter extends RecyclerView.Adapter<HomeCouponAdapter.Ho
46 public HomeCouponViewHolder(View view) { 46 public HomeCouponViewHolder(View view) {
47 super(view); 47 super(view);
48 ivCouponBackground = view.findViewById(R.id.imageView2); 48 ivCouponBackground = view.findViewById(R.id.imageView2);
49 -// tvCouponTitle = view.findViewById(R.id.tv_coupon_subtitle); 49 + tvCouponTitle = view.findViewById(R.id.tv_coupon_subtitle);
50 } 50 }
51 } 51 }
52 52
...@@ -100,7 +100,7 @@ public class HomeCouponAdapter extends RecyclerView.Adapter<HomeCouponAdapter.Ho ...@@ -100,7 +100,7 @@ public class HomeCouponAdapter extends RecyclerView.Adapter<HomeCouponAdapter.Ho
100 // .into(holder.ivCouponTitle); 100 // .into(holder.ivCouponTitle);
101 // } 101 // }
102 102
103 -// holder.tvCouponTitle.setText(couponItem.getName()); 103 + holder.tvCouponTitle.setText(couponItem.getName());
104 104
105 if (isBurnt) 105 if (isBurnt)
106 holder.ivCouponBackground.setColorFilter(ContextCompat.getColor(mContext, R.color.grey_light2), android.graphics.PorterDuff.Mode.MULTIPLY); 106 holder.ivCouponBackground.setColorFilter(ContextCompat.getColor(mContext, R.color.grey_light2), android.graphics.PorterDuff.Mode.MULTIPLY);
......
...@@ -12,6 +12,8 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -12,6 +12,8 @@ import androidx.recyclerview.widget.RecyclerView;
12 12
13 import com.bumptech.glide.Glide; 13 import com.bumptech.glide.Glide;
14 import com.bumptech.glide.load.engine.DiskCacheStrategy; 14 import com.bumptech.glide.load.engine.DiskCacheStrategy;
15 +import com.bumptech.glide.load.resource.bitmap.CenterCrop;
16 +import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
15 17
16 import io.reactivex.Observable; 18 import io.reactivex.Observable;
17 import io.reactivex.subjects.PublishSubject; 19 import io.reactivex.subjects.PublishSubject;
...@@ -75,11 +77,8 @@ public class ProfileCampaignAdapter extends RecyclerView.Adapter<ProfileCampaign ...@@ -75,11 +77,8 @@ public class ProfileCampaignAdapter extends RecyclerView.Adapter<ProfileCampaign
75 if (campaignItem != null) { 77 if (campaignItem != null) {
76 if (!TextUtils.isEmpty(campaignItem.getLogoUrl())) { 78 if (!TextUtils.isEmpty(campaignItem.getLogoUrl())) {
77 Glide.with(mContext) 79 Glide.with(mContext)
78 -// .setDefaultRequestOptions(
79 -// RequestOptions
80 -// .placeholderOf(R.drawable.ic_default_contact_photo)
81 -// .error(R.drawable.ic_default_contact_photo))
82 .load(campaignItem.getLogoUrl()) 80 .load(campaignItem.getLogoUrl())
81 + .transform(new CenterCrop(), new RoundedCorners(4))
83 .diskCacheStrategy(DiskCacheStrategy.DATA) 82 .diskCacheStrategy(DiskCacheStrategy.DATA)
84 .into(holder.ivCampaignTitle); 83 .into(holder.ivCampaignTitle);
85 } else { 84 } else {
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
80 android:gravity="center_horizontal" 80 android:gravity="center_horizontal"
81 android:inputType="textPersonName" 81 android:inputType="textPersonName"
82 android:text="0€" 82 android:text="0€"
83 - android:textSize="25dp" 83 + android:textSize="26sp"
84 android:textColor="#2F4455" 84 android:textColor="#2F4455"
85 app:layout_constraintBottom_toBottomOf="@+id/view" 85 app:layout_constraintBottom_toBottomOf="@+id/view"
86 app:layout_constraintEnd_toEndOf="@+id/view" 86 app:layout_constraintEnd_toEndOf="@+id/view"
...@@ -95,8 +95,9 @@ ...@@ -95,8 +95,9 @@
95 android:layout_height="54dp" 95 android:layout_height="54dp"
96 android:ems="10" 96 android:ems="10"
97 android:hint="Αριθμός Λογαριασμού" 97 android:hint="Αριθμός Λογαριασμού"
98 - android:inputType="textPersonName" 98 + android:inputType="text"
99 - android:textSize="15dp" 99 + android:textSize="16sp"
100 + android:textStyle="bold"
100 app:layout_constraintBottom_toBottomOf="@+id/view" 101 app:layout_constraintBottom_toBottomOf="@+id/view"
101 app:layout_constraintEnd_toEndOf="@+id/view" 102 app:layout_constraintEnd_toEndOf="@+id/view"
102 app:layout_constraintHorizontal_bias="0.47" 103 app:layout_constraintHorizontal_bias="0.47"
...@@ -111,6 +112,7 @@ ...@@ -111,6 +112,7 @@
111 android:layout_marginBottom="28dp" 112 android:layout_marginBottom="28dp"
112 android:background="@drawable/round_border_green" 113 android:background="@drawable/round_border_green"
113 android:text="Πληρωμή" 114 android:text="Πληρωμή"
115 + android:textStyle="bold"
114 android:textAllCaps="false" 116 android:textAllCaps="false"
115 android:textColor="@color/white" 117 android:textColor="@color/white"
116 app:layout_constraintBottom_toBottomOf="@+id/view" 118 app:layout_constraintBottom_toBottomOf="@+id/view"
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 xmlns:app="http://schemas.android.com/apk/res-auto" 2 xmlns:app="http://schemas.android.com/apk/res-auto"
3 android:layout_width="match_parent" 3 android:layout_width="match_parent"
4 android:layout_height="match_parent" 4 android:layout_height="match_parent"
5 + xmlns:tools="http://schemas.android.com/tools"
5 android:background="@android:color/white"> 6 android:background="@android:color/white">
6 7
7 <androidx.constraintlayout.widget.ConstraintLayout 8 <androidx.constraintlayout.widget.ConstraintLayout
...@@ -69,7 +70,7 @@ ...@@ -69,7 +70,7 @@
69 android:layout_height="wrap_content" 70 android:layout_height="wrap_content"
70 android:layout_marginTop="32dp" 71 android:layout_marginTop="32dp"
71 android:paddingHorizontal="32dp" 72 android:paddingHorizontal="32dp"
72 - android:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" 73 + tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!"
73 android:textColor="#415564" 74 android:textColor="#415564"
74 android:textSize="18sp" 75 android:textSize="18sp"
75 android:textStyle="bold" 76 android:textStyle="bold"
...@@ -84,7 +85,7 @@ ...@@ -84,7 +85,7 @@
84 android:layout_height="wrap_content" 85 android:layout_height="wrap_content"
85 android:layout_marginTop="16dp" 86 android:layout_marginTop="16dp"
86 android:paddingHorizontal="32dp" 87 android:paddingHorizontal="32dp"
87 - android:text="Χρησιμοποίησε τον παρακάτω κωδικό και πάρε δωρεάν πακέτο πάνες Pampers αποκλειστικά στα Supermarket Σκλαβενίτης" 88 + tools:text="Χρησιμοποίησε τον παρακάτω κωδικό και πάρε δωρεάν πακέτο πάνες Pampers αποκλειστικά στα Supermarket Σκλαβενίτης"
88 android:textColor="#415564" 89 android:textColor="#415564"
89 android:textSize="16sp" 90 android:textSize="16sp"
90 app:layout_constraintEnd_toEndOf="parent" 91 app:layout_constraintEnd_toEndOf="parent"
...@@ -113,7 +114,7 @@ ...@@ -113,7 +114,7 @@
113 android:layout_marginTop="12dp" 114 android:layout_marginTop="12dp"
114 android:background="@drawable/banner_border_light_blue" 115 android:background="@drawable/banner_border_light_blue"
115 android:gravity="center" 116 android:gravity="center"
116 - android:text="1A2C378" 117 + tools:text="1A2C378"
117 android:textColor="#415564" 118 android:textColor="#415564"
118 android:textSize="25dp" 119 android:textSize="25dp"
119 android:textStyle="bold" 120 android:textStyle="bold"
...@@ -126,7 +127,7 @@ ...@@ -126,7 +127,7 @@
126 android:layout_width="wrap_content" 127 android:layout_width="wrap_content"
127 android:layout_height="wrap_content" 128 android:layout_height="wrap_content"
128 android:layout_marginTop="24dp" 129 android:layout_marginTop="24dp"
129 - android:text="Το κουπόνι ισχύει έως 05/12/2022" 130 + tools:text="@string/cos_coupon_date"
130 android:textColor="#415564" 131 android:textColor="#415564"
131 app:layout_constraintEnd_toEndOf="parent" 132 app:layout_constraintEnd_toEndOf="parent"
132 app:layout_constraintStart_toStartOf="parent" 133 app:layout_constraintStart_toStartOf="parent"
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
19 android:id="@+id/imageView" 19 android:id="@+id/imageView"
20 android:layout_width="wrap_content" 20 android:layout_width="wrap_content"
21 android:layout_height="wrap_content" 21 android:layout_height="wrap_content"
22 - android:src="@drawable/carousel_banner" 22 + tools:src="@drawable/carousel_banner"
23 - android:scaleType="fitXY" 23 + android:scaleType="centerCrop"
24 tools:layout_editor_absoluteY="-44dp" /> 24 tools:layout_editor_absoluteY="-44dp" />
25 </LinearLayout> 25 </LinearLayout>
26 26
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 android:textSize="15sp" 33 android:textSize="15sp"
34 android:textStyle="bold" 34 android:textStyle="bold"
35 android:textColor="@color/grey" 35 android:textColor="@color/grey"
36 - android:text="Χρόνια πολλά με υγεία! Σου κάνουμε δώρο 5GB για τη γιορτή σου!" 36 + tools:text="Χρόνια πολλά με υγεία! Σου κάνουμε δώρο 5GB για τη γιορτή σου!"
37 app:layout_constraintTop_toBottomOf="@+id/ll_carousel_icon" 37 app:layout_constraintTop_toBottomOf="@+id/ll_carousel_icon"
38 app:layout_constraintBottom_toBottomOf="parent" /> 38 app:layout_constraintBottom_toBottomOf="parent" />
39 </androidx.constraintlayout.widget.ConstraintLayout> 39 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 xmlns:app="http://schemas.android.com/apk/res-auto" 3 xmlns:app="http://schemas.android.com/apk/res-auto"
4 android:layout_width="@dimen/width_full" 4 android:layout_width="@dimen/width_full"
5 android:layout_height="wrap_content" 5 android:layout_height="wrap_content"
6 + xmlns:tools="http://schemas.android.com/tools"
6 android:layout_marginStart="10dp"> 7 android:layout_marginStart="10dp">
7 8
8 <androidx.constraintlayout.widget.Guideline 9 <androidx.constraintlayout.widget.Guideline
...@@ -72,7 +73,7 @@ ...@@ -72,7 +73,7 @@
72 android:layout_marginBottom="24dp" 73 android:layout_marginBottom="24dp"
73 android:maxLines="2" 74 android:maxLines="2"
74 android:layout_marginTop="8dp" 75 android:layout_marginTop="8dp"
75 - android:text="10€ έκπτωση στα ψώνια σου στα supermarket Σκλαβενίτης!" 76 + tools:text="10€ έκπτωση στα ψώνια σου στα supermarket Σκλαβενίτης!"
76 android:textColor="@color/grey" 77 android:textColor="@color/grey"
77 android:textFontWeight="600" 78 android:textFontWeight="600"
78 android:textSize="16sp" 79 android:textSize="16sp"
......
...@@ -3,58 +3,55 @@ ...@@ -3,58 +3,55 @@
3 xmlns:app="http://schemas.android.com/apk/res-auto" 3 xmlns:app="http://schemas.android.com/apk/res-auto"
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 - android:layout_height="550dp" 6 + android:layout_height="wrap_content"
7 - android:layout_gravity="center_horizontal"> 7 + android:layout_gravity="center_horizontal"
8 + android:paddingHorizontal="16dp"
9 + android:paddingVertical="56dp">
8 10
9 <TextView 11 <TextView
10 android:id="@+id/textView5" 12 android:id="@+id/textView5"
11 - android:layout_width="243dp" 13 + android:layout_width="match_parent"
12 android:layout_height="55dp" 14 android:layout_height="55dp"
13 android:layout_alignParentStart="true" 15 android:layout_alignParentStart="true"
14 android:layout_alignParentTop="true" 16 android:layout_alignParentTop="true"
15 android:layout_alignParentEnd="true" 17 android:layout_alignParentEnd="true"
16 - android:layout_marginStart="54dp" 18 + android:layout_marginHorizontal="48dp"
17 - android:layout_marginTop="38dp"
18 - android:layout_marginEnd="63dp"
19 android:gravity="center" 19 android:gravity="center"
20 android:text="Συγχαρητήρια!" 20 android:text="Συγχαρητήρια!"
21 android:textColor="#0072C9" 21 android:textColor="#0072C9"
22 - android:textFontWeight="1000" 22 + android:textSize="25sp"
23 - android:textSize="25dp" 23 + android:textStyle="bold"
24 - app:layout_constraintTop_toTopOf="parent" 24 + app:layout_constraintTop_toTopOf="parent" />
25 - app:layout_constraintVertical_bias="0.46"
26 - tools:layout_editor_absoluteX="87dp" />
27 25
28 <TextView 26 <TextView
29 android:id="@+id/textView6" 27 android:id="@+id/textView6"
30 - android:layout_width="336dp" 28 + android:layout_width="match_parent"
31 android:layout_height="42dp" 29 android:layout_height="42dp"
32 android:layout_below="@+id/textView5" 30 android:layout_below="@+id/textView5"
33 - android:layout_alignStart="@+id/textView5" 31 + android:layout_alignParentStart="true"
34 - android:layout_alignEnd="@+id/textView5" 32 + android:layout_alignParentEnd="true"
35 - android:layout_marginStart="-16dp" 33 + android:layout_marginHorizontal="48dp"
36 - android:layout_marginTop="3dp" 34 + android:layout_marginTop="4dp"
37 - android:layout_marginEnd="-24dp"
38 android:layout_marginBottom="24dp" 35 android:layout_marginBottom="24dp"
39 android:gravity="center" 36 android:gravity="center"
40 android:text="Κέρδισες 1GB για 7 ημέρες!" 37 android:text="Κέρδισες 1GB για 7 ημέρες!"
41 android:textColor="#5B5B5B" 38 android:textColor="#5B5B5B"
42 - android:textSize="18dp" /> 39 + android:textFontWeight="500"
40 + android:textSize="18sp" />
43 41
44 <TextView 42 <TextView
45 android:id="@+id/textView7" 43 android:id="@+id/textView7"
46 - android:layout_width="351dp" 44 + android:layout_width="match_parent"
47 android:layout_height="58dp" 45 android:layout_height="58dp"
48 android:layout_below="@+id/textView6" 46 android:layout_below="@+id/textView6"
49 - android:layout_alignStart="@+id/textView6" 47 + android:layout_alignParentStart="true"
50 - android:layout_alignEnd="@+id/textView6" 48 + android:layout_alignParentEnd="true"
51 - android:layout_marginStart="-5dp" 49 + android:layout_marginHorizontal="48dp"
52 - android:layout_marginTop="1dp" 50 + android:layout_marginTop="4dp"
53 - android:layout_marginEnd="-14dp"
54 android:gravity="center" 51 android:gravity="center"
55 android:text="Για σένα που είσαι πολλά χρόνια μαζί μας έχουμε επιπλέον δώρα!" 52 android:text="Για σένα που είσαι πολλά χρόνια μαζί μας έχουμε επιπλέον δώρα!"
56 android:textColor="#858C96" 53 android:textColor="#858C96"
57 - android:textSize="15dp" 54 + android:textSize="16sp"
58 tools:layout_editor_absoluteX="26dp" 55 tools:layout_editor_absoluteX="26dp"
59 tools:layout_editor_absoluteY="177dp" /> 56 tools:layout_editor_absoluteY="177dp" />
60 57
...@@ -63,21 +60,20 @@ ...@@ -63,21 +60,20 @@
63 android:layout_width="wrap_content" 60 android:layout_width="wrap_content"
64 android:layout_height="54dp" 61 android:layout_height="54dp"
65 android:layout_below="@+id/textView7" 62 android:layout_below="@+id/textView7"
66 - android:layout_alignStart="@+id/textView7" 63 + android:layout_alignParentStart="true"
67 - android:layout_alignEnd="@+id/textView7" 64 + android:layout_alignParentEnd="true"
68 - android:layout_marginStart="-8dp" 65 + android:layout_marginTop="40dp"
69 - android:layout_marginTop="38dp"
70 - android:layout_marginEnd="-3dp"
71 android:background="@drawable/banner_border_grey_bg" 66 android:background="@drawable/banner_border_grey_bg"
72 - android:gravity="center_vertical"> 67 + android:gravity="center_vertical"
68 + android:paddingHorizontal="16dp">
73 69
74 <TextView 70 <TextView
75 android:id="@+id/tv_lucky_draw" 71 android:id="@+id/tv_lucky_draw"
76 android:layout_width="wrap_content" 72 android:layout_width="wrap_content"
77 android:layout_height="wrap_content" 73 android:layout_height="wrap_content"
78 - android:layout_marginStart="16dp"
79 android:gravity="center" 74 android:gravity="center"
80 android:text="Μy Lucky Day Draw" 75 android:text="Μy Lucky Day Draw"
76 + android:textColor="#3A5266"
81 android:textSize="17dp" 77 android:textSize="17dp"
82 app:layout_constraintBottom_toBottomOf="parent" 78 app:layout_constraintBottom_toBottomOf="parent"
83 app:layout_constraintStart_toStartOf="parent" 79 app:layout_constraintStart_toStartOf="parent"
...@@ -90,23 +86,21 @@ ...@@ -90,23 +86,21 @@
90 android:layout_width="wrap_content" 86 android:layout_width="wrap_content"
91 android:layout_height="60dp" 87 android:layout_height="60dp"
92 android:layout_below="@+id/constraintLayout" 88 android:layout_below="@+id/constraintLayout"
93 - android:layout_alignStart="@+id/constraintLayout" 89 + android:layout_alignParentStart="true"
94 - android:layout_alignEnd="@+id/constraintLayout" 90 + android:layout_alignParentEnd="true"
95 - android:layout_marginStart="1dp" 91 + android:layout_marginTop="32dp"
96 - android:layout_marginTop="33dp"
97 - android:layout_marginEnd="3dp"
98 android:background="@drawable/banner_border_grey_bg" 92 android:background="@drawable/banner_border_grey_bg"
99 android:gravity="center_vertical" 93 android:gravity="center_vertical"
100 - android:paddingHorizontal="5dp"> 94 + android:paddingHorizontal="16dp">
101 95
102 <TextView 96 <TextView
103 android:id="@+id/tv_cosmote_tv_pass" 97 android:id="@+id/tv_cosmote_tv_pass"
104 android:layout_width="match_parent" 98 android:layout_width="match_parent"
105 android:layout_height="wrap_content" 99 android:layout_height="wrap_content"
106 - android:layout_marginStart="16dp" 100 + android:gravity="center"
107 android:text="Day Free COSMOTE TV pass στο κινητό" 101 android:text="Day Free COSMOTE TV pass στο κινητό"
102 + android:textColor="#3A5266"
108 android:textSize="17dp" 103 android:textSize="17dp"
109 - android:gravity="center"
110 app:layout_constraintBottom_toBottomOf="parent" 104 app:layout_constraintBottom_toBottomOf="parent"
111 app:layout_constraintStart_toStartOf="parent" 105 app:layout_constraintStart_toStartOf="parent"
112 app:layout_constraintTop_toTopOf="parent" /> 106 app:layout_constraintTop_toTopOf="parent" />
...@@ -117,23 +111,21 @@ ...@@ -117,23 +111,21 @@
117 android:layout_width="wrap_content" 111 android:layout_width="wrap_content"
118 android:layout_height="59dp" 112 android:layout_height="59dp"
119 android:layout_below="@+id/constraintLayout3" 113 android:layout_below="@+id/constraintLayout3"
120 - android:layout_alignStart="@+id/constraintLayout3" 114 + android:layout_alignParentStart="true"
121 - android:layout_alignEnd="@+id/constraintLayout3" 115 + android:layout_alignParentEnd="true"
122 - android:layout_marginStart="2dp" 116 + android:layout_marginTop="32dp"
123 - android:layout_marginTop="29dp"
124 - android:layout_marginEnd="1dp"
125 android:background="@drawable/banner_border_grey_bg" 117 android:background="@drawable/banner_border_grey_bg"
126 android:gravity="center_vertical" 118 android:gravity="center_vertical"
127 - android:paddingHorizontal="5dp"> 119 + android:paddingHorizontal="16dp">
128 120
129 <TextView 121 <TextView
130 android:id="@+id/tv_ikea_coupon" 122 android:id="@+id/tv_ikea_coupon"
131 android:layout_width="match_parent" 123 android:layout_width="match_parent"
132 android:layout_height="wrap_content" 124 android:layout_height="wrap_content"
133 - android:layout_marginStart="16dp" 125 + android:gravity="center"
134 android:text="Δωρεάν κουπόνι ΙΚΕΑ αξίας 10€" 126 android:text="Δωρεάν κουπόνι ΙΚΕΑ αξίας 10€"
127 + android:textColor="#3A5266"
135 android:textSize="17dp" 128 android:textSize="17dp"
136 - android:gravity="center"
137 app:layout_constraintBottom_toBottomOf="parent" 129 app:layout_constraintBottom_toBottomOf="parent"
138 app:layout_constraintStart_toStartOf="parent" 130 app:layout_constraintStart_toStartOf="parent"
139 app:layout_constraintTop_toTopOf="parent" /> 131 app:layout_constraintTop_toTopOf="parent" />
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <string name="rate_dialog_negative">No, Thanks</string> 6 <string name="rate_dialog_negative">No, Thanks</string>
7 7
8 <string name="cos_profile_tab">Profile</string> 8 <string name="cos_profile_tab">Profile</string>
9 - <string name="welcome_user">Γεία σου %1$s !</string> 9 + <string name="welcome_user">Γεια σου %1$s !</string>
10 <string name="cos_profile_name">%1$s</string> 10 <string name="cos_profile_name">%1$s</string>
11 <string name="cos_profile_type">Traveller</string> 11 <string name="cos_profile_type">Traveller</string>
12 <string name="header_add">Προσθήκη</string> 12 <string name="header_add">Προσθήκη</string>
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
25 <string name="cos_gifts_loyalty_title">Τα δώρα μου</string> 25 <string name="cos_gifts_loyalty_title">Τα δώρα μου</string>
26 <string name="cos_coupons_loyalty_title">Ενεργά κουπόνια</string> 26 <string name="cos_coupons_loyalty_title">Ενεργά κουπόνια</string>
27 <string name="cos_coupon_info_title">Εκπτωτικό κουπόνι</string> 27 <string name="cos_coupon_info_title">Εκπτωτικό κουπόνι</string>
28 + <string name="cos_coupon_date">Το κουπόνι ισχύει έως %1$s</string>
28 29
29 <string-array name="coupons_array"> 30 <string-array name="coupons_array">
30 <item>Κουπόνια</item> 31 <item>Κουπόνια</item>
......
...@@ -32,4 +32,9 @@ ...@@ -32,4 +32,9 @@
32 <item name="android:background">@drawable/selector_spinner_arrow</item> 32 <item name="android:background">@drawable/selector_spinner_arrow</item>
33 </style> 33 </style>
34 34
35 + <style name="PopUpDialog" parent="Base.Theme.AppCompat.Dialog">
36 + <item name="android:windowMinWidthMajor">90%</item>
37 + <item name="android:windowMinWidthMinor">90%</item>
38 + </style>
39 +
35 </resources> 40 </resources>
...\ No newline at end of file ...\ No newline at end of file
......