open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
3bd3be7f 1 parent 1b469e4e

redesign changes

Inline Side-by-side
Showing 18 changed files with 258 additions and 53 deletions
...@@ -101,7 +101,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -101,7 +101,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
101 e.printStackTrace(); 101 e.printStackTrace();
102 } 102 }
103 simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy"); 103 simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy");
104 - mTvCouponDate.setText(String.format(getResources().getString(R.string.cos_coupon_date), simpleDateFormat.format(newDate != null ? newDate : ""))); 104 + mTvCouponDate.setText(String.format(getResources().getString(R.string.cos_mycoupon_date), simpleDateFormat.format(newDate != null ? newDate : "")));
105 105
106 if (!TextUtils.isEmpty(mCoupon.getImage())) { 106 if (!TextUtils.isEmpty(mCoupon.getImage())) {
107 Glide.with(this) 107 Glide.with(this)
...@@ -118,7 +118,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -118,7 +118,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
118 .into(mIvCouponPhoto); 118 .into(mIvCouponPhoto);
119 } 119 }
120 mIvBack.setOnClickListener(this); 120 mIvBack.setOnClickListener(this);
121 - mTvTerms.setPaintFlags(mTvTerms.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); 121 +// mTvTerms.setPaintFlags(mTvTerms.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
122 mLlGiftIt.setOnClickListener(this); 122 mLlGiftIt.setOnClickListener(this);
123 123
124 createBarcodeBitmap(mCoupon.getCoupon()); 124 createBarcodeBitmap(mCoupon.getCoupon());
......
...@@ -2,7 +2,6 @@ package ly.warp.sdk.activities; ...@@ -2,7 +2,6 @@ package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 import android.app.Dialog; 4 import android.app.Dialog;
5 -import android.graphics.Paint;
6 import android.os.Bundle; 5 import android.os.Bundle;
7 import android.text.Html; 6 import android.text.Html;
8 import android.text.TextUtils; 7 import android.text.TextUtils;
...@@ -35,12 +34,13 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -35,12 +34,13 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
35 // Fields 34 // Fields
36 // =========================================================== 35 // ===========================================================
37 36
38 - private ImageView mIvBack, mIvCouponsetPhoto; 37 + private ImageView mIvBack, mIvCouponsetPhoto, mIvTermsArrow;
39 - private TextView mTvTerms, mTvCouponsetTitle, mTvCouponsetSubtitle; 38 + private TextView mTvTerms, mTvCouponsetTitle, mTvCouponsetSubtitle, mTvTermsValue;
40 private Couponset mCouponset; 39 private Couponset mCouponset;
41 - private LinearLayout mLlRedeem; 40 + private LinearLayout mLlRedeem, mLlTerms;
42 private ProgressBar mPbLoading; 41 private ProgressBar mPbLoading;
43 private Coupon mCoupon; 42 private Coupon mCoupon;
43 + private boolean mIsTermsPressed = false;
44 44
45 // =========================================================== 45 // ===========================================================
46 // Methods for/from SuperClass/Interfaces 46 // Methods for/from SuperClass/Interfaces
...@@ -60,6 +60,9 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -60,6 +60,9 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
60 mIvCouponsetPhoto = findViewById(R.id.imageView6); 60 mIvCouponsetPhoto = findViewById(R.id.imageView6);
61 mLlRedeem = findViewById(R.id.ll_get_gift); 61 mLlRedeem = findViewById(R.id.ll_get_gift);
62 mPbLoading = findViewById(R.id.pb_loading); 62 mPbLoading = findViewById(R.id.pb_loading);
63 + mLlTerms = findViewById(R.id.ll_terms_inner);
64 + mTvTermsValue = findViewById(R.id.tv_terms_value);
65 + mIvTermsArrow = findViewById(R.id.iv_terms_arrow);
63 66
64 initViews(); 67 initViews();
65 } 68 }
...@@ -78,6 +81,18 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -78,6 +81,18 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
78 if (view.getId() == R.id.ll_get_gift) { 81 if (view.getId() == R.id.ll_get_gift) {
79 mPbLoading.setVisibility(View.VISIBLE); 82 mPbLoading.setVisibility(View.VISIBLE);
80 WarplyManager.redeemCoupon(new WarplyRedeemCouponRequest().setCouponsetUuid(mCouponset.getUuid()), mRedeemCouponCallback); 83 WarplyManager.redeemCoupon(new WarplyRedeemCouponRequest().setCouponsetUuid(mCouponset.getUuid()), mRedeemCouponCallback);
84 + return;
85 + }
86 + if (view.getId() == R.id.ll_terms_inner) {
87 + if (mIsTermsPressed) {
88 + mIsTermsPressed = false;
89 + mTvTermsValue.setVisibility(View.GONE);
90 + mIvTermsArrow.setImageDrawable(getDrawable(R.drawable.ic_down_dark));
91 + } else {
92 + mIsTermsPressed = true;
93 + mTvTermsValue.setVisibility(View.VISIBLE);
94 + mIvTermsArrow.setImageDrawable(getDrawable(R.drawable.ic_up_dark));
95 + }
81 } 96 }
82 } 97 }
83 98
...@@ -88,6 +103,8 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -88,6 +103,8 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
88 private void initViews() { 103 private void initViews() {
89 mTvCouponsetTitle.setText(mCouponset.getName()); 104 mTvCouponsetTitle.setText(mCouponset.getName());
90 mTvCouponsetSubtitle.setText(Html.fromHtml(mCouponset.getDescription())); 105 mTvCouponsetSubtitle.setText(Html.fromHtml(mCouponset.getDescription()));
106 + mLlTerms.setOnClickListener(this);
107 + mTvTermsValue.setText(Html.fromHtml(mCouponset.getTerms()));
91 108
92 if (!TextUtils.isEmpty(mCouponset.getImgPreview())) { 109 if (!TextUtils.isEmpty(mCouponset.getImgPreview())) {
93 Glide.with(this) 110 Glide.with(this)
...@@ -106,7 +123,7 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -106,7 +123,7 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
106 123
107 mIvBack.setOnClickListener(this); 124 mIvBack.setOnClickListener(this);
108 mLlRedeem.setOnClickListener(this); 125 mLlRedeem.setOnClickListener(this);
109 - mTvTerms.setPaintFlags(mTvTerms.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); 126 +// mTvTerms.setPaintFlags(mTvTerms.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
110 } 127 }
111 128
112 private final CallbackReceiver<JSONObject> mRedeemCouponCallback = new CallbackReceiver<JSONObject>() { 129 private final CallbackReceiver<JSONObject> mRedeemCouponCallback = new CallbackReceiver<JSONObject>() {
......
...@@ -143,10 +143,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener { ...@@ -143,10 +143,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
143 mIvBack.setOnClickListener(this); 143 mIvBack.setOnClickListener(this);
144 // mTvAnalysisButton.setOnClickListener(this); 144 // mTvAnalysisButton.setOnClickListener(this);
145 mLlQuestionnaire.setOnClickListener(this); 145 mLlQuestionnaire.setOnClickListener(this);
146 - mTvActiveCoupons.setText(String.format(getResources().getString(R.string.cos_active_coupons), String.valueOf(cpnlist))); 146 + mTvActiveCoupons.setText(String.format(getResources().getString(R.string.cos_active_coupons), String.valueOf(cpnlist.size())));
147 mClActiveCoupons.setOnClickListener(this); 147 mClActiveCoupons.setOnClickListener(this);
148 //TODO: change the parameter, for testing purposes only 148 //TODO: change the parameter, for testing purposes only
149 - mTvActiveRewards.setText(String.format(getResources().getString(R.string.cos_active_rewards), String.valueOf(cpnlist))); 149 + mTvActiveRewards.setText(String.format(getResources().getString(R.string.cos_active_rewards), String.valueOf(cpnlist.size())));
150 mClActiveRewards.setOnClickListener(this); 150 mClActiveRewards.setOnClickListener(this);
151 mLlAnalysisButton.setOnClickListener(this); 151 mLlAnalysisButton.setOnClickListener(this);
152 mLlPastCoupons.setOnClickListener(this); 152 mLlPastCoupons.setOnClickListener(this);
......
...@@ -4,12 +4,14 @@ import android.app.Activity; ...@@ -4,12 +4,14 @@ import android.app.Activity;
4 import android.os.Bundle; 4 import android.os.Bundle;
5 import android.view.View; 5 import android.view.View;
6 import android.widget.ImageView; 6 import android.widget.ImageView;
7 +import android.widget.LinearLayout;
7 import android.widget.TextView; 8 import android.widget.TextView;
8 9
9 import androidx.recyclerview.widget.LinearLayoutManager; 10 import androidx.recyclerview.widget.LinearLayoutManager;
10 import androidx.recyclerview.widget.RecyclerView; 11 import androidx.recyclerview.widget.RecyclerView;
11 12
12 import ly.warp.sdk.R; 13 import ly.warp.sdk.R;
14 +import ly.warp.sdk.utils.WarpUtils;
13 import ly.warp.sdk.utils.WarplyManagerHelper; 15 import ly.warp.sdk.utils.WarplyManagerHelper;
14 import ly.warp.sdk.views.adapters.ProfileCampaignAdapter; 16 import ly.warp.sdk.views.adapters.ProfileCampaignAdapter;
15 17
...@@ -24,10 +26,11 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -24,10 +26,11 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
24 // Fields 26 // Fields
25 // =========================================================== 27 // ===========================================================
26 28
27 - private ImageView mIvBack; 29 + private ImageView mIvBack, mIvPopupClose;
28 private RecyclerView mRecyclerMore; 30 private RecyclerView mRecyclerMore;
29 private TextView mTvTitle; 31 private TextView mTvTitle;
30 private ProfileCampaignAdapter mAdapterMore; 32 private ProfileCampaignAdapter mAdapterMore;
33 + private LinearLayout mLlMorePopup;
31 34
32 // =========================================================== 35 // ===========================================================
33 // Methods for/from SuperClass/Interfaces 36 // Methods for/from SuperClass/Interfaces
...@@ -40,6 +43,8 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -40,6 +43,8 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
40 43
41 mIvBack = findViewById(R.id.iv_list_close); 44 mIvBack = findViewById(R.id.iv_list_close);
42 mTvTitle = findViewById(R.id.textView3); 45 mTvTitle = findViewById(R.id.textView3);
46 + mIvPopupClose = findViewById(R.id.iv_popup_more_close);
47 + mLlMorePopup = findViewById(R.id.ll_more_popup);
43 48
44 mRecyclerMore = findViewById(R.id.rv_more); 49 mRecyclerMore = findViewById(R.id.rv_more);
45 50
...@@ -55,6 +60,11 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -55,6 +60,11 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
55 public void onClick(View view) { 60 public void onClick(View view) {
56 if (view.getId() == R.id.iv_list_close) { 61 if (view.getId() == R.id.iv_list_close) {
57 onBackPressed(); 62 onBackPressed();
63 + return;
64 + }
65 + if (view.getId() == R.id.iv_popup_more_close) {
66 + mLlMorePopup.setVisibility(View.GONE);
67 + WarpUtils.setMorePopup(this, false);
58 } 68 }
59 } 69 }
60 70
...@@ -65,6 +75,10 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -65,6 +75,10 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
65 private void initViews() { 75 private void initViews() {
66 mIvBack.setOnClickListener(this); 76 mIvBack.setOnClickListener(this);
67 mTvTitle.setText(getIntent().getStringExtra("title")); 77 mTvTitle.setText(getIntent().getStringExtra("title"));
78 + mIvPopupClose.setOnClickListener(this);
79 +
80 + if (WarpUtils.getMorePopup(this))
81 + mLlMorePopup.setVisibility(View.VISIBLE);
68 82
69 if (WarplyManagerHelper.getUniqueCampaignList().get("more_for_you") != null && WarplyManagerHelper.getUniqueCampaignList().get("more_for_you").size() > 0) { 83 if (WarplyManagerHelper.getUniqueCampaignList().get("more_for_you") != null && WarplyManagerHelper.getUniqueCampaignList().get("more_for_you").size() > 0) {
70 mRecyclerMore.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); 84 mRecyclerMore.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 + <solid android:color="@color/cos_light_grey"/>
4 + <corners android:radius="10dp"/>
5 + <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
6 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="rectangle">
4 + <gradient
5 + android:startColor="@color/cos_green9"
6 + android:endColor="@color/cos_skyblue"
7 + android:type="linear"/>
8 + <corners
9 + android:radius="12dp"/>
10 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <shape xmlns:android="http://schemas.android.com/apk/res/android" 2 <shape xmlns:android="http://schemas.android.com/apk/res/android"
3 android:shape="rectangle"> 3 android:shape="rectangle">
4 - <corners android:radius="7dp" /> 4 + <corners android:radius="12dp" />
5 5
6 <solid 6 <solid
7 android:width="2dp" 7 android:width="2dp"
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <shape xmlns:android="http://schemas.android.com/apk/res/android" 2 <shape xmlns:android="http://schemas.android.com/apk/res/android"
3 android:shape="rectangle"> 3 android:shape="rectangle">
4 - <corners android:radius="7dp" /> 4 + <corners android:radius="12dp" />
5 5
6 <solid 6 <solid
7 android:width="2dp" 7 android:width="2dp"
......
1 +<?xml version="1.0" encoding="utf-8"?><!--<shape xmlns:android="http://schemas.android.com/apk/res/android"-->
2 +<!-- android:shape="rectangle">-->
3 +<!-- <corners android:topLeftRadius="30dp" />-->
4 +
5 +<!-- <solid android:color="@color/grey_light" />-->
6 +
7 +<!--&lt;!&ndash; <stroke&ndash;&gt;-->
8 +<!--&lt;!&ndash; android:width="1dp"&ndash;&gt;-->
9 +<!--&lt;!&ndash; android:color="@color/cos_green" />&ndash;&gt;-->
10 +<!--</shape>-->
11 +
12 +
13 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
14 + <item>
15 + <shape android:shape="rectangle">
16 + <corners android:topLeftRadius="30dp" />
17 + <gradient
18 + android:angle="180"
19 + android:endColor="@color/cos_cyan2"
20 + android:startColor="@color/cos_green7" />
21 + </shape>
22 + </item>
23 +
24 + <item android:top="4dp">
25 + <shape xmlns:android="http://schemas.android.com/apk/res/android"
26 + android:shape="rectangle">
27 + <corners android:topLeftRadius="30dp" />
28 + <solid android:color="@android:color/white" />
29 +
30 + <!-- <stroke-->
31 + <!-- android:width="1dp"-->
32 + <!-- android:color="@color/cos_green" />-->
33 + </shape>
34 + </item>
35 +
36 +</layer-list>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <shape xmlns:android="http://schemas.android.com/apk/res/android"> 2 <shape xmlns:android="http://schemas.android.com/apk/res/android">
3 <stroke 3 <stroke
4 - android:width="1.5dp" 4 + android:width="1dp"
5 android:color="@color/cos_dark_blue" /> 5 android:color="@color/cos_dark_blue" />
6 6
7 <corners 7 <corners
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 android:id="@+id/cl_loyalty_info_view_inner" 48 android:id="@+id/cl_loyalty_info_view_inner"
49 android:layout_width="match_parent" 49 android:layout_width="match_parent"
50 android:layout_height="match_parent" 50 android:layout_height="match_parent"
51 - android:background="@drawable/shape_cos_coupon_info" 51 + android:background="@drawable/shape_cos_loyalty_white"
52 android:paddingBottom="48dp" 52 android:paddingBottom="48dp"
53 app:layout_constraintEnd_toEndOf="parent" 53 app:layout_constraintEnd_toEndOf="parent"
54 app:layout_constraintStart_toStartOf="parent" 54 app:layout_constraintStart_toStartOf="parent"
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
58 android:id="@+id/imageView6" 58 android:id="@+id/imageView6"
59 android:layout_width="match_parent" 59 android:layout_width="match_parent"
60 android:layout_height="224dp" 60 android:layout_height="224dp"
61 + android:layout_marginTop="4dp"
61 android:scaleType="centerCrop" 62 android:scaleType="centerCrop"
62 app:layout_constraintStart_toStartOf="parent" 63 app:layout_constraintStart_toStartOf="parent"
63 app:layout_constraintTop_toTopOf="parent" 64 app:layout_constraintTop_toTopOf="parent"
...@@ -69,6 +70,7 @@ ...@@ -69,6 +70,7 @@
69 android:layout_width="match_parent" 70 android:layout_width="match_parent"
70 android:layout_height="wrap_content" 71 android:layout_height="wrap_content"
71 android:layout_marginTop="32dp" 72 android:layout_marginTop="32dp"
73 + android:gravity="center"
72 android:paddingHorizontal="32dp" 74 android:paddingHorizontal="32dp"
73 android:textColor="#415564" 75 android:textColor="#415564"
74 android:textSize="18sp" 76 android:textSize="18sp"
...@@ -84,6 +86,7 @@ ...@@ -84,6 +86,7 @@
84 android:layout_width="match_parent" 86 android:layout_width="match_parent"
85 android:layout_height="wrap_content" 87 android:layout_height="wrap_content"
86 android:layout_marginTop="16dp" 88 android:layout_marginTop="16dp"
89 + android:gravity="center"
87 android:paddingHorizontal="32dp" 90 android:paddingHorizontal="32dp"
88 android:textColor="#415564" 91 android:textColor="#415564"
89 android:textSize="16sp" 92 android:textSize="16sp"
...@@ -112,9 +115,9 @@ ...@@ -112,9 +115,9 @@
112 android:layout_height="50dp" 115 android:layout_height="50dp"
113 android:layout_marginHorizontal="32dp" 116 android:layout_marginHorizontal="32dp"
114 android:layout_marginTop="12dp" 117 android:layout_marginTop="12dp"
115 - android:background="@drawable/banner_border_light_blue" 118 + android:background="@drawable/banner_border_light_grey"
116 android:gravity="center" 119 android:gravity="center"
117 - android:textColor="#415564" 120 + android:textColor="@color/grey"
118 android:textSize="25dp" 121 android:textSize="25dp"
119 android:textStyle="bold" 122 android:textStyle="bold"
120 app:layout_constraintEnd_toEndOf="parent" 123 app:layout_constraintEnd_toEndOf="parent"
...@@ -156,11 +159,11 @@ ...@@ -156,11 +159,11 @@
156 159
157 <LinearLayout 160 <LinearLayout
158 android:id="@+id/ll_gift_it" 161 android:id="@+id/ll_gift_it"
159 - android:layout_width="match_parent" 162 + android:layout_width="240dp"
160 android:layout_height="50dp" 163 android:layout_height="50dp"
161 android:layout_marginHorizontal="32dp" 164 android:layout_marginHorizontal="32dp"
162 android:layout_marginTop="64dp" 165 android:layout_marginTop="64dp"
163 - android:background="@drawable/button_border_grey" 166 + android:background="@drawable/selector_button_green"
164 android:gravity="center" 167 android:gravity="center"
165 android:orientation="horizontal" 168 android:orientation="horizontal"
166 app:layout_constraintEnd_toEndOf="parent" 169 app:layout_constraintEnd_toEndOf="parent"
...@@ -178,10 +181,10 @@ ...@@ -178,10 +181,10 @@
178 android:layout_width="wrap_content" 181 android:layout_width="wrap_content"
179 android:layout_height="wrap_content" 182 android:layout_height="wrap_content"
180 android:gravity="center" 183 android:gravity="center"
181 - android:text="Κάντο δώρο!" 184 + android:text="@string/cos_gift_it"
182 - android:textColor="@color/cos_green6" 185 + android:textColor="@color/white"
183 - android:textFontWeight="600" 186 + android:textSize="17dp"
184 - android:textSize="17dp" /> 187 + android:textStyle="bold" />
185 </LinearLayout> 188 </LinearLayout>
186 189
187 <!-- <LinearLayout--> 190 <!-- <LinearLayout-->
...@@ -208,18 +211,42 @@ ...@@ -208,18 +211,42 @@
208 <!-- android:textStyle="bold" />--> 211 <!-- android:textStyle="bold" />-->
209 <!-- </LinearLayout>--> 212 <!-- </LinearLayout>-->
210 213
211 - <TextView 214 + <RelativeLayout
212 - android:id="@+id/tv_terms" 215 + android:id="@+id/rl_terms"
213 android:layout_width="wrap_content" 216 android:layout_width="wrap_content"
214 android:layout_height="wrap_content" 217 android:layout_height="wrap_content"
215 android:layout_marginTop="32dp" 218 android:layout_marginTop="32dp"
216 - android:text="Όροι χρήσης" 219 + android:gravity="center"
217 - android:textColor="#415564"
218 - android:textFontWeight="600"
219 - android:textSize="15sp"
220 app:layout_constraintEnd_toEndOf="parent" 220 app:layout_constraintEnd_toEndOf="parent"
221 app:layout_constraintStart_toStartOf="parent" 221 app:layout_constraintStart_toStartOf="parent"
222 - app:layout_constraintTop_toBottomOf="@+id/ll_gift_it" /> 222 + app:layout_constraintTop_toBottomOf="@+id/ll_gift_it">
223 +
224 + <LinearLayout
225 + android:id="@+id/ll_terms_inner"
226 + android:layout_width="wrap_content"
227 + android:layout_height="wrap_content"
228 + android:layout_centerHorizontal="true"
229 + android:gravity="center"
230 + android:orientation="horizontal">
231 +
232 + <TextView
233 + android:id="@+id/tv_terms"
234 + android:layout_width="wrap_content"
235 + android:layout_height="wrap_content"
236 + android:text="Όροι χρήσης"
237 + android:textColor="#415564"
238 + android:textFontWeight="600"
239 + android:textSize="15sp" />
240 +
241 + <ImageView
242 + android:id="@+id/iv_terms_arrow"
243 + android:layout_width="14dp"
244 + android:layout_height="14dp"
245 + android:layout_marginStart="6dp"
246 + android:layout_marginTop="2dp"
247 + android:src="@drawable/ic_down_dark" />
248 + </LinearLayout>
249 + </RelativeLayout>
223 250
224 <ImageView 251 <ImageView
225 android:id="@+id/iv_barcode" 252 android:id="@+id/iv_barcode"
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 android:id="@+id/cl_loyalty_info_view_inner" 49 android:id="@+id/cl_loyalty_info_view_inner"
50 android:layout_width="match_parent" 50 android:layout_width="match_parent"
51 android:layout_height="match_parent" 51 android:layout_height="match_parent"
52 - android:background="@drawable/shape_cos_coupon_info" 52 + android:background="@drawable/shape_cos_loyalty_white"
53 app:layout_constraintEnd_toEndOf="parent" 53 app:layout_constraintEnd_toEndOf="parent"
54 app:layout_constraintStart_toStartOf="parent" 54 app:layout_constraintStart_toStartOf="parent"
55 app:layout_constraintTop_toTopOf="parent"> 55 app:layout_constraintTop_toTopOf="parent">
...@@ -58,17 +58,19 @@ ...@@ -58,17 +58,19 @@
58 android:id="@+id/imageView6" 58 android:id="@+id/imageView6"
59 android:layout_width="match_parent" 59 android:layout_width="match_parent"
60 android:layout_height="224dp" 60 android:layout_height="224dp"
61 + android:layout_marginTop="4dp"
61 android:scaleType="centerCrop" 62 android:scaleType="centerCrop"
62 - android:src="@drawable/carousel_banner"
63 app:layout_constraintStart_toStartOf="parent" 63 app:layout_constraintStart_toStartOf="parent"
64 app:layout_constraintTop_toTopOf="parent" 64 app:layout_constraintTop_toTopOf="parent"
65 - app:siShape="@drawable/shape_top_left_rounded" /> 65 + app:siShape="@drawable/shape_top_left_rounded"
66 + tools:src="@drawable/carousel_banner" />
66 67
67 <TextView 68 <TextView
68 android:id="@+id/textView13" 69 android:id="@+id/textView13"
69 android:layout_width="match_parent" 70 android:layout_width="match_parent"
70 android:layout_height="wrap_content" 71 android:layout_height="wrap_content"
71 android:layout_marginTop="32dp" 72 android:layout_marginTop="32dp"
73 + android:gravity="center"
72 android:paddingHorizontal="32dp" 74 android:paddingHorizontal="32dp"
73 android:textColor="#415564" 75 android:textColor="#415564"
74 android:textSize="18sp" 76 android:textSize="18sp"
...@@ -84,6 +86,7 @@ ...@@ -84,6 +86,7 @@
84 android:layout_width="match_parent" 86 android:layout_width="match_parent"
85 android:layout_height="wrap_content" 87 android:layout_height="wrap_content"
86 android:layout_marginTop="16dp" 88 android:layout_marginTop="16dp"
89 + android:gravity="center"
87 android:paddingHorizontal="32dp" 90 android:paddingHorizontal="32dp"
88 android:textColor="#415564" 91 android:textColor="#415564"
89 android:textSize="16sp" 92 android:textSize="16sp"
...@@ -94,14 +97,14 @@ ...@@ -94,14 +97,14 @@
94 97
95 <LinearLayout 98 <LinearLayout
96 android:id="@+id/ll_get_gift" 99 android:id="@+id/ll_get_gift"
97 - android:layout_width="match_parent" 100 + android:layout_width="240dp"
98 android:layout_height="50dp" 101 android:layout_height="50dp"
99 android:layout_marginHorizontal="32dp" 102 android:layout_marginHorizontal="32dp"
100 android:layout_marginBottom="32dp" 103 android:layout_marginBottom="32dp"
101 android:background="@drawable/selector_button_green" 104 android:background="@drawable/selector_button_green"
102 android:gravity="center" 105 android:gravity="center"
103 android:orientation="horizontal" 106 android:orientation="horizontal"
104 - app:layout_constraintBottom_toTopOf="@+id/tv_terms" 107 + app:layout_constraintBottom_toTopOf="@+id/rl_terms"
105 app:layout_constraintEnd_toEndOf="parent" 108 app:layout_constraintEnd_toEndOf="parent"
106 app:layout_constraintStart_toStartOf="parent"> 109 app:layout_constraintStart_toStartOf="parent">
107 110
...@@ -115,18 +118,53 @@ ...@@ -115,18 +118,53 @@
115 android:textStyle="bold" /> 118 android:textStyle="bold" />
116 </LinearLayout> 119 </LinearLayout>
117 120
118 - <TextView 121 + <RelativeLayout
119 - android:id="@+id/tv_terms" 122 + android:id="@+id/rl_terms"
120 android:layout_width="wrap_content" 123 android:layout_width="wrap_content"
121 android:layout_height="wrap_content" 124 android:layout_height="wrap_content"
122 - android:layout_marginBottom="32dp" 125 + android:layout_marginVertical="32dp"
123 - android:text="@string/cos_coupon_terms_title" 126 + android:gravity="center"
124 - android:textColor="#415564"
125 - android:textFontWeight="600"
126 - android:textSize="15sp"
127 app:layout_constraintBottom_toBottomOf="parent" 127 app:layout_constraintBottom_toBottomOf="parent"
128 app:layout_constraintEnd_toEndOf="parent" 128 app:layout_constraintEnd_toEndOf="parent"
129 - app:layout_constraintStart_toStartOf="parent" /> 129 + app:layout_constraintStart_toStartOf="parent">
130 +
131 + <LinearLayout
132 + android:id="@+id/ll_terms_inner"
133 + android:layout_width="wrap_content"
134 + android:layout_height="wrap_content"
135 + android:layout_centerHorizontal="true"
136 + android:gravity="center"
137 + android:orientation="horizontal">
138 +
139 + <TextView
140 + android:id="@+id/tv_terms"
141 + android:layout_width="wrap_content"
142 + android:layout_height="wrap_content"
143 + android:text="@string/cos_coupon_terms_title"
144 + android:textColor="#415564"
145 + android:textFontWeight="600"
146 + android:textSize="15sp" />
147 +
148 + <ImageView
149 + android:id="@+id/iv_terms_arrow"
150 + android:layout_width="14dp"
151 + android:layout_height="14dp"
152 + android:layout_marginStart="6dp"
153 + android:layout_marginTop="2dp"
154 + android:src="@drawable/ic_down_dark" />
155 + </LinearLayout>
156 +
157 + <TextView
158 + android:id="@+id/tv_terms_value"
159 + android:layout_width="wrap_content"
160 + android:layout_height="wrap_content"
161 + android:layout_below="@+id/ll_terms_inner"
162 + android:layout_marginTop="16dp"
163 + android:textColor="@color/grey"
164 + android:visibility="gone"
165 + tools:text="@string/cos_coupon_date"
166 + tools:visibility="visible" />
167 + </RelativeLayout>
130 168
131 <ProgressBar 169 <ProgressBar
132 android:id="@+id/pb_loading" 170 android:id="@+id/pb_loading"
......
...@@ -39,9 +39,9 @@ ...@@ -39,9 +39,9 @@
39 android:layout_width="match_parent" 39 android:layout_width="match_parent"
40 android:layout_height="90dp" 40 android:layout_height="90dp"
41 android:layout_below="@+id/cl_loyalty_wallet_header" 41 android:layout_below="@+id/cl_loyalty_wallet_header"
42 - android:layout_marginVertical="24dp" 42 + android:layout_marginBottom="24dp"
43 - android:paddingHorizontal="24dp" 43 + android:background="@android:color/white"
44 - android:background="@android:color/white"> 44 + android:paddingHorizontal="24dp">
45 45
46 <de.hdodenhof.circleimageview.CircleImageView 46 <de.hdodenhof.circleimageview.CircleImageView
47 android:id="@+id/iv_profile_photo" 47 android:id="@+id/iv_profile_photo"
...@@ -75,16 +75,19 @@ ...@@ -75,16 +75,19 @@
75 android:layout_width="wrap_content" 75 android:layout_width="wrap_content"
76 android:layout_height="wrap_content" 76 android:layout_height="wrap_content"
77 android:layout_marginStart="8dp" 77 android:layout_marginStart="8dp"
78 - android:background="@drawable/shape_cos_gradient" 78 + android:background="@drawable/shape_cos_gradient6"
79 android:gravity="center" 79 android:gravity="center"
80 - android:paddingHorizontal="4dp" 80 + android:paddingHorizontal="6dp"
81 - android:visibility="gone"> 81 + android:paddingVertical="2dp"
82 + android:visibility="gone"
83 + tools:visibility="visible">
82 84
83 <TextView 85 <TextView
84 android:id="@+id/tv_type" 86 android:id="@+id/tv_type"
85 android:layout_width="wrap_content" 87 android:layout_width="wrap_content"
86 android:layout_height="wrap_content" 88 android:layout_height="wrap_content"
87 android:textColor="@android:color/white" 89 android:textColor="@android:color/white"
90 + android:textFontWeight="600"
88 tools:text="@string/cos_profile_type" /> 91 tools:text="@string/cos_profile_type" />
89 </LinearLayout> 92 </LinearLayout>
90 93
...@@ -119,7 +122,7 @@ ...@@ -119,7 +122,7 @@
119 <RelativeLayout 122 <RelativeLayout
120 android:layout_width="match_parent" 123 android:layout_width="match_parent"
121 android:layout_height="wrap_content" 124 android:layout_height="wrap_content"
122 - android:background="@drawable/shape_cos_profile_gradient" 125 + android:background="@drawable/shape_cos_loyalty"
123 android:orientation="vertical" 126 android:orientation="vertical"
124 android:paddingBottom="24dp"> 127 android:paddingBottom="24dp">
125 128
...@@ -378,7 +381,8 @@ ...@@ -378,7 +381,8 @@
378 android:layout_marginBottom="32dp" 381 android:layout_marginBottom="32dp"
379 android:background="@drawable/selector_button_grey" 382 android:background="@drawable/selector_button_grey"
380 android:gravity="center" 383 android:gravity="center"
381 - android:orientation="horizontal"> 384 + android:orientation="horizontal"
385 + android:visibility="gone">
382 386
383 <TextView 387 <TextView
384 android:layout_width="wrap_content" 388 android:layout_width="wrap_content"
......
...@@ -41,13 +41,59 @@ ...@@ -41,13 +41,59 @@
41 android:layout_width="match_parent" 41 android:layout_width="match_parent"
42 android:layout_height="match_parent" 42 android:layout_height="match_parent"
43 android:layout_below="@+id/cl_more_header" 43 android:layout_below="@+id/cl_more_header"
44 - android:background="@drawable/shape_cos_profile_gradient" 44 + android:background="@drawable/shape_cos_loyalty"
45 android:orientation="vertical"> 45 android:orientation="vertical">
46 46
47 + <LinearLayout
48 + android:id="@+id/ll_more_popup"
49 + android:layout_width="match_parent"
50 + android:layout_height="wrap_content"
51 + android:layout_marginTop="24dp"
52 + android:background="@drawable/shape_cos_gradient5"
53 + android:orientation="vertical"
54 + android:paddingVertical="16dp"
55 + android:visibility="gone">
56 +
57 + <ImageView
58 + android:id="@+id/iv_popup_more_close"
59 + android:layout_width="20dp"
60 + android:layout_height="20dp"
61 + android:layout_marginStart="16dp"
62 + android:src="@drawable/ic_close_white" />
63 +
64 + <ImageView
65 + android:layout_width="wrap_content"
66 + android:layout_height="wrap_content"
67 + android:layout_gravity="center"
68 + android:scaleType="centerInside"
69 + android:src="@drawable/ic_gifts_for_you_white" />
70 +
71 + <TextView
72 + android:layout_width="wrap_content"
73 + android:layout_height="wrap_content"
74 + android:layout_gravity="center"
75 + android:layout_marginTop="24dp"
76 + android:layout_marginBottom="12dp"
77 + android:text="@string/cos_popup_more_title"
78 + android:textColor="@android:color/white"
79 + android:textSize="18sp"
80 + android:textStyle="bold" />
81 +
82 + <TextView
83 + android:layout_width="wrap_content"
84 + android:layout_height="wrap_content"
85 + android:layout_gravity="center"
86 + android:gravity="center"
87 + android:text="@string/cos_popup_more_subtitle"
88 + android:textColor="@android:color/white"
89 + android:textSize="16sp" />
90 + </LinearLayout>
91 +
47 <androidx.recyclerview.widget.RecyclerView 92 <androidx.recyclerview.widget.RecyclerView
48 android:id="@+id/rv_more" 93 android:id="@+id/rv_more"
49 android:layout_width="match_parent" 94 android:layout_width="match_parent"
50 android:layout_height="match_parent" 95 android:layout_height="match_parent"
96 + android:layout_below="@+id/ll_more_popup"
51 android:layout_marginHorizontal="16dp" 97 android:layout_marginHorizontal="16dp"
52 android:layout_marginTop="48dp" 98 android:layout_marginTop="48dp"
53 android:clipToPadding="false" 99 android:clipToPadding="false"
......
...@@ -43,4 +43,7 @@ ...@@ -43,4 +43,7 @@
43 <color name="cos_grey5">#385267</color> 43 <color name="cos_grey5">#385267</color>
44 <color name="cos_blue3">#03A1D6</color> 44 <color name="cos_blue3">#03A1D6</color>
45 <color name="cos_green8">#3AB588</color> 45 <color name="cos_green8">#3AB588</color>
46 + <color name="cos_light_grey">#F4F4F4</color>
47 + <color name="cos_green9">#86C15F</color>
48 + <color name="cos_skyblue">#13ACD4</color>
46 </resources> 49 </resources>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
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>
13 <string name="cos_profile_reward">My Loyalty\nWallet</string> 13 <string name="cos_profile_reward">My Loyalty\nWallet</string>
14 - <string name="cos_profile_title">My Loyalty Wallet</string> 14 + <string name="cos_profile_title">My loyalty wallet</string>
15 <string name="cos_deals_title">Deals for You</string> 15 <string name="cos_deals_title">Deals for You</string>
16 <string name="cos_profile_more">Δες περισσότερα</string> 16 <string name="cos_profile_more">Δες περισσότερα</string>
17 <string name="cos_gifts_title">GIFTS for YOU</string> 17 <string name="cos_gifts_title">GIFTS for YOU</string>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
54 <string name="cos_annual">12Μηνο</string> 54 <string name="cos_annual">12Μηνο</string>
55 <string name="cos_analysis2">Αναλυτικά</string> 55 <string name="cos_analysis2">Αναλυτικά</string>
56 <string name="euro">€</string> 56 <string name="euro">€</string>
57 - <string name="cos_profile_questionnaire">+ Ερωτηματολόγιο</string> 57 + <string name="cos_profile_questionnaire">Ερωτηματολόγιο</string>
58 <string name="cos_active_all_coupons">Ενεργά κουπόνια</string> 58 <string name="cos_active_all_coupons">Ενεργά κουπόνια</string>
59 <string name="cos_active_all_rewards">Όλα τα δώρα μου</string> 59 <string name="cos_active_all_rewards">Όλα τα δώρα μου</string>
60 <string name="cos_no_active_coupons">Δεν υπάρχουν κουπόνια</string> 60 <string name="cos_no_active_coupons">Δεν υπάρχουν κουπόνια</string>
...@@ -63,6 +63,10 @@ ...@@ -63,6 +63,10 @@
63 <string name="cos_coupon_expired_date">Εξαργυρώθηκε την %1$s</string> 63 <string name="cos_coupon_expired_date">Εξαργυρώθηκε την %1$s</string>
64 <string name="cos_popup_gifts_title">COSMOTE GIFTS FOR YOU</string> 64 <string name="cos_popup_gifts_title">COSMOTE GIFTS FOR YOU</string>
65 <string name="cos_popup_gifts_subtitle">Εδώ μπορείς να βρεις τα διαθέσιμα\nδώρα και προσφορές!</string> 65 <string name="cos_popup_gifts_subtitle">Εδώ μπορείς να βρεις τα διαθέσιμα\nδώρα και προσφορές!</string>
66 + <string name="cos_mycoupon_date">Το κουπόνι ισχύει έως %1$s</string>
67 + <string name="cos_gift_it">Κάντο δώρο!</string>
68 + <string name="cos_popup_more_title">COSMOTE MORE FOR YOU</string>
69 + <string name="cos_popup_more_subtitle">Εδώ μπορείς να βρεις διαγωνισμούς και\nνα σε επιβραβεύσουμε για τις αθλητικές σου\nδραστηριότητες!</string>
66 70
67 <string-array name="coupons_array"> 71 <string-array name="coupons_array">
68 <item>Κουπόνια</item> 72 <item>Κουπόνια</item>
......