open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
7f82f324 1 parent 46c74ba4

new keys

Inline Side-by-side
Showing 16 changed files with 75 additions and 99 deletions
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 # The app uuid the warply sdk need to connect to the engage server 3 # The app uuid the warply sdk need to connect to the engage server
4 # dev f83dfde1145e4c2da69793abb2f579af 4 # dev f83dfde1145e4c2da69793abb2f579af
5 # prod 0086a2088301440792091b9f814c2267 5 # prod 0086a2088301440792091b9f814c2267
6 -Uuid=0086a2088301440792091b9f814c2267 6 +Uuid=f83dfde1145e4c2da69793abb2f579af
7 7
8 # If we need to see logs in Logcat 8 # If we need to see logs in Logcat
9 Debug=true 9 Debug=true
...@@ -11,7 +11,7 @@ Debug=true ...@@ -11,7 +11,7 @@ Debug=true
11 # Production or Development environment of the engage server 11 # Production or Development environment of the engage server
12 # Production: https://engage.warp.ly 12 # Production: https://engage.warp.ly
13 # Development: https://engage-stage.warp.ly 13 # Development: https://engage-stage.warp.ly
14 -BaseURL=https://engage.warp.ly 14 +BaseURL=https://engage-stage.warp.ly
15 15
16 # For Verify Ticket request 16 # For Verify Ticket request
17 VerifyURL=/partners/cosmote/verify 17 VerifyURL=/partners/cosmote/verify
......
...@@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity { ...@@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity {
36 public void onWarplyReady() { 36 public void onWarplyReady() {
37 if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) { 37 if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) {
38 WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest() 38 WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest()
39 - .setGuid("6006552990"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons, prod 6006552990 39 + .setGuid("7000000831"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons, prod 6006552990
40 mLoginReceiver); 40 mLoginReceiver);
41 } else { 41 } else {
42 startNextActivity(); 42 startNextActivity();
......
...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library' ...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
2 2
3 ext { 3 ext {
4 PUBLISH_GROUP_ID = 'ly.warp' 4 PUBLISH_GROUP_ID = 'ly.warp'
5 - PUBLISH_VERSION = '4.5.4-cosbeta88' 5 + PUBLISH_VERSION = '4.5.4-cosbeta89'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -15,13 +15,13 @@ import java.io.Serializable; ...@@ -15,13 +15,13 @@ import java.io.Serializable;
15 import java.text.ParseException; 15 import java.text.ParseException;
16 import java.text.SimpleDateFormat; 16 import java.text.SimpleDateFormat;
17 import java.util.Collections; 17 import java.util.Collections;
18 -import java.util.Comparator;
19 import java.util.Date; 18 import java.util.Date;
20 19
21 import io.github.inflationx.viewpump.ViewPumpContextWrapper; 20 import io.github.inflationx.viewpump.ViewPumpContextWrapper;
22 import ly.warp.sdk.R; 21 import ly.warp.sdk.R;
23 import ly.warp.sdk.io.models.Coupon; 22 import ly.warp.sdk.io.models.Coupon;
24 import ly.warp.sdk.io.models.CouponList; 23 import ly.warp.sdk.io.models.CouponList;
24 +import ly.warp.sdk.utils.WarplyManagerHelper;
25 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager; 25 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
26 import ly.warp.sdk.views.adapters.ActiveCouponAdapter; 26 import ly.warp.sdk.views.adapters.ActiveCouponAdapter;
27 27
...@@ -51,10 +51,43 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe ...@@ -51,10 +51,43 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe
51 super.onCreate(savedInstanceState); 51 super.onCreate(savedInstanceState);
52 setContentView(R.layout.activity_active_coupons); 52 setContentView(R.layout.activity_active_coupons);
53 53
54 - if (getIntent().getExtras() != null && getIntent().getSerializableExtra("couponlist") != null) { 54 + mIvBack = findViewById(R.id.iv_coupons_close);
55 - mCouponList = new CouponList(getIntent().getSerializableExtra("couponlist").toString(), true); 55 + mTvEmptyCoupons = findViewById(R.id.tv_no_coupons);
56 + mRecyclerCoupons = findViewById(R.id.rv_active_coupons);
57 +
58 + initViews();
59 + }
60 +
61 + @Override
62 + public void onResume() {
63 + super.onResume();
64 + WarplyAnalyticsManager.logTrackersEvent("screen", "ActiveCouponsScreen");
65 + filterItems();
66 + }
67 +
68 + @Override
69 + public void onClick(View view) {
70 + if (view.getId() == R.id.iv_coupons_close) {
71 + onBackPressed();
72 + }
73 + }
74 +
75 + @Override
76 + protected void attachBaseContext(Context newBase) {
77 + super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
78 + }
79 +
80 + // ===========================================================
81 + // Methods
82 + // ===========================================================
83 +
84 + private void initViews() {
85 + mIvBack.setOnClickListener(this);
86 + }
87 +
88 + private void filterItems() {
56 CouponList cpnlist = new CouponList(); 89 CouponList cpnlist = new CouponList();
57 - for (Coupon cpn : mCouponList) { 90 + for (Coupon cpn : WarplyManagerHelper.getCouponList()) {
58 if (cpn.getStatus() == 1) { 91 if (cpn.getStatus() == 1) {
59 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm"); 92 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
60 Date newDate = new Date(); 93 Date newDate = new Date();
...@@ -67,18 +100,11 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe ...@@ -67,18 +100,11 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe
67 cpnlist.add(cpn); 100 cpnlist.add(cpn);
68 } 101 }
69 } 102 }
70 -
71 Collections.sort(cpnlist, (coupon1, coupon2) -> coupon1.getExpirationDate().compareTo(coupon2.getExpirationDate())); 103 Collections.sort(cpnlist, (coupon1, coupon2) -> coupon1.getExpirationDate().compareTo(coupon2.getExpirationDate()));
72 -
73 mCouponList.clear(); 104 mCouponList.clear();
74 mCouponList.addAll(cpnlist); 105 mCouponList.addAll(cpnlist);
75 - }
76 -
77 - mIvBack = findViewById(R.id.iv_coupons_close);
78 - mTvEmptyCoupons = findViewById(R.id.tv_no_coupons);
79 106
80 - if (mCouponList != null) { 107 + if (mCouponList != null && mCouponList.size() > 0) {
81 - mRecyclerCoupons = findViewById(R.id.rv_active_coupons);
82 mRecyclerCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); 108 mRecyclerCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
83 mAdapterCoupons = new ActiveCouponAdapter(this, mCouponList); 109 mAdapterCoupons = new ActiveCouponAdapter(this, mCouponList);
84 mRecyclerCoupons.setAdapter(mAdapterCoupons); 110 mRecyclerCoupons.setAdapter(mAdapterCoupons);
...@@ -95,34 +121,6 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe ...@@ -95,34 +121,6 @@ public class ActiveCouponsActivity extends Activity implements View.OnClickListe
95 } else { 121 } else {
96 mTvEmptyCoupons.setVisibility(View.VISIBLE); 122 mTvEmptyCoupons.setVisibility(View.VISIBLE);
97 } 123 }
98 -
99 - initViews();
100 - }
101 -
102 - @Override
103 - public void onResume() {
104 - super.onResume();
105 - WarplyAnalyticsManager.logTrackersEvent("screen", "ActiveCouponsScreen");
106 - }
107 -
108 - @Override
109 - public void onClick(View view) {
110 - if (view.getId() == R.id.iv_coupons_close) {
111 - onBackPressed();
112 - }
113 - }
114 -
115 - @Override
116 - protected void attachBaseContext(Context newBase) {
117 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
118 - }
119 -
120 - // ===========================================================
121 - // Methods
122 - // ===========================================================
123 -
124 - private void initViews() {
125 - mIvBack.setOnClickListener(this);
126 } 124 }
127 125
128 // =========================================================== 126 // ===========================================================
......
...@@ -95,14 +95,9 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -95,14 +95,9 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
95 super.onResume(); 95 super.onResume();
96 WarplyAnalyticsManager.logTrackersEvent("screen", "CouponShareScreen"); 96 WarplyAnalyticsManager.logTrackersEvent("screen", "CouponShareScreen");
97 97
98 - new Thread(() -> {
99 - if (!Thread.currentThread().isInterrupted()) {
100 WarplyManager.getConsumer(new WarplyConsumerRequest() 98 WarplyManager.getConsumer(new WarplyConsumerRequest()
101 , mConsumerCallback); 99 , mConsumerCallback);
102 } 100 }
103 - Thread.currentThread().interrupt();
104 - }).start();
105 - }
106 101
107 @Override 102 @Override
108 public void onClick(View view) { 103 public void onClick(View view) {
......
...@@ -2,6 +2,7 @@ package ly.warp.sdk.activities; ...@@ -2,6 +2,7 @@ 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.Context;
5 +import android.content.Intent;
5 import android.os.Bundle; 6 import android.os.Bundle;
6 import android.text.Html; 7 import android.text.Html;
7 import android.text.TextUtils; 8 import android.text.TextUtils;
...@@ -241,6 +242,7 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -241,6 +242,7 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
241 .setPositiveButton(R.string.cos_dlg_positive_button2, (dialogPositive, whichPositive) -> { 242 .setPositiveButton(R.string.cos_dlg_positive_button2, (dialogPositive, whichPositive) -> {
242 dialogPositive.dismiss(); 243 dialogPositive.dismiss();
243 if (success) { 244 if (success) {
245 +// setResult(RESULT_OK, new Intent());
244 onBackPressed(); 246 onBackPressed();
245 } 247 }
246 }) 248 })
......
...@@ -114,44 +114,6 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -114,44 +114,6 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
114 mSvLoyaltyWallet = findViewById(R.id.sv_loyalty_wallet); 114 mSvLoyaltyWallet = findViewById(R.id.sv_loyalty_wallet);
115 mClToolbar = findViewById(R.id.cl_loyalty_wallet_header); 115 mClToolbar = findViewById(R.id.cl_loyalty_wallet_header);
116 116
117 -// ArrayList<ActiveDFYCouponModel> dlist = new ArrayList<>();
118 -// ActiveDFYCouponModel model = new ActiveDFYCouponModel();
119 -// model.setCode("123456789");
120 -// model.setValue("10");
121 -// model.setDate("2022-09-14 20:20");
122 -// dlist.add(model);
123 -// model = new ActiveDFYCouponModel();
124 -// model.setCode("123456780");
125 -// model.setValue("10");
126 -// model.setDate("2022-09-14 20:20");
127 -// dlist.add(model);
128 -// model = new ActiveDFYCouponModel();
129 -// model.setCode("123456781");
130 -// model.setValue("10");
131 -// model.setDate("2022-09-14 20:20");
132 -// dlist.add(model);
133 -// model = new ActiveDFYCouponModel();
134 -// model.setCode("123456782");
135 -// model.setValue("10");
136 -// model.setDate("2022-09-14 20:20");
137 -// dlist.add(model);
138 -// model = new ActiveDFYCouponModel();
139 -// model.setCode("123456783");
140 -// model.setValue("10");
141 -// model.setDate("2022-09-14 20:20");
142 -// dlist.add(model);
143 -// model = new ActiveDFYCouponModel();
144 -// model.setCode("123456784");
145 -// model.setValue("10");
146 -// model.setDate("2022-09-14 20:20");
147 -// dlist.add(model);
148 -// model = new ActiveDFYCouponModel();
149 -// model.setCode("123456785");
150 -// model.setValue("10");
151 -// model.setDate("2022-09-14 20:20");
152 -// dlist.add(model);
153 -// WarplyManagerHelper.setActiveDFYCoupons(dlist);
154 -
155 if (WarplyManagerHelper.getActiveDFYCoupons() != null) { 117 if (WarplyManagerHelper.getActiveDFYCoupons() != null) {
156 Collections.sort(WarplyManagerHelper.getActiveDFYCoupons(), new Comparator<ActiveDFYCouponModel>() { 118 Collections.sort(WarplyManagerHelper.getActiveDFYCoupons(), new Comparator<ActiveDFYCouponModel>() {
157 public int compare(ActiveDFYCouponModel o1, ActiveDFYCouponModel o2) { 119 public int compare(ActiveDFYCouponModel o1, ActiveDFYCouponModel o2) {
......
1 package ly.warp.sdk.io.request; 1 package ly.warp.sdk.io.request;
2 2
3 +import android.text.TextUtils;
3 import android.util.Base64; 4 import android.util.Base64;
4 5
5 import org.json.JSONArray; 6 import org.json.JSONArray;
...@@ -171,7 +172,7 @@ public class WarplyGetCouponsetsRequest { ...@@ -171,7 +172,7 @@ public class WarplyGetCouponsetsRequest {
171 bodyJsonObject.putOpt(KEY_ACTION, KEY_ACTION_VALUE); 172 bodyJsonObject.putOpt(KEY_ACTION, KEY_ACTION_VALUE);
172 bodyJsonObject.putOpt(KEY_ACTIVE, mActive); 173 bodyJsonObject.putOpt(KEY_ACTIVE, mActive);
173 bodyJsonObject.putOpt(KEY_VISIBLE, mVisible); 174 bodyJsonObject.putOpt(KEY_VISIBLE, mVisible);
174 - bodyJsonObject.putOpt(KEY_LANGUAGE, mLanguage); 175 + bodyJsonObject.putOpt(KEY_LANGUAGE, TextUtils.isEmpty(mLanguage) ? "el" : mLanguage);
175 if (mUuids != null && mUuids.size() > 0) 176 if (mUuids != null && mUuids.size() > 0)
176 bodyJsonObject.putOpt(KEY_UUIDS, new JSONArray(mUuids)); 177 bodyJsonObject.putOpt(KEY_UUIDS, new JSONArray(mUuids));
177 } catch (JSONException e) { 178 } catch (JSONException e) {
......
...@@ -74,7 +74,7 @@ public class WarplyJsonArrayRequest extends JsonRequest<JSONObject> { ...@@ -74,7 +74,7 @@ public class WarplyJsonArrayRequest extends JsonRequest<JSONObject> {
74 headers.put(WarpConstants.HEADER_LOYALTY_BUNDLE_ID, "android:" + context.getPackageName()); 74 headers.put(WarpConstants.HEADER_LOYALTY_BUNDLE_ID, "android:" + context.getPackageName());
75 headers.put(WarpConstants.HEADER_DATE, timeStamp); 75 headers.put(WarpConstants.HEADER_DATE, timeStamp);
76 headers.put(WarpConstants.HEADER_UNIQUE_DEVICE_ID, new WarplyDeviceInfoCollector(context).getUniqueDeviceId()); 76 headers.put(WarpConstants.HEADER_UNIQUE_DEVICE_ID, new WarplyDeviceInfoCollector(context).getUniqueDeviceId());
77 - headers.put(WarpConstants.HEADER_ADVERTISING_ID, new WarplyDeviceInfoCollector(context).getAdvertisementId()); 77 +// headers.put(WarpConstants.HEADER_ADVERTISING_ID, new WarplyDeviceInfoCollector(context).getAdvertisementId());
78 headers.put(WarpConstants.HEADER_CHANNEL, "mobile"); 78 headers.put(WarpConstants.HEADER_CHANNEL, "mobile");
79 if (WarpUtils.isRegisteredWarply(context)) { 79 if (WarpUtils.isRegisteredWarply(context)) {
80 String apiKey = WarpUtils.getApiKey(context); 80 String apiKey = WarpUtils.getApiKey(context);
......
...@@ -58,7 +58,7 @@ public class WarplyJsonObjectRequest extends JsonObjectRequest { ...@@ -58,7 +58,7 @@ public class WarplyJsonObjectRequest extends JsonObjectRequest {
58 headers.put(WarpConstants.HEADER_LOYALTY_BUNDLE_ID, "android:" + context.getPackageName()); 58 headers.put(WarpConstants.HEADER_LOYALTY_BUNDLE_ID, "android:" + context.getPackageName());
59 headers.put(WarpConstants.HEADER_DATE, timeStamp); 59 headers.put(WarpConstants.HEADER_DATE, timeStamp);
60 headers.put(WarpConstants.HEADER_UNIQUE_DEVICE_ID, new WarplyDeviceInfoCollector(context).getUniqueDeviceId()); 60 headers.put(WarpConstants.HEADER_UNIQUE_DEVICE_ID, new WarplyDeviceInfoCollector(context).getUniqueDeviceId());
61 - headers.put(WarpConstants.HEADER_ADVERTISING_ID, new WarplyDeviceInfoCollector(context).getAdvertisementId()); 61 +// headers.put(WarpConstants.HEADER_ADVERTISING_ID, new WarplyDeviceInfoCollector(context).getAdvertisementId());
62 headers.put(WarpConstants.HEADER_CHANNEL, "mobile"); 62 headers.put(WarpConstants.HEADER_CHANNEL, "mobile");
63 if (WarpUtils.isRegisteredWarply(context)) { 63 if (WarpUtils.isRegisteredWarply(context)) {
64 String apiKey = WarpUtils.getApiKey(context); 64 String apiKey = WarpUtils.getApiKey(context);
......
1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:width="428dp"
3 + android:height="106dp"
4 + android:viewportWidth="428"
5 + android:viewportHeight="106">
6 + <group>
7 + <clip-path
8 + android:pathData="M0,0h428v106h-428z"/>
9 + <path
10 + android:pathData="M0,98v-98h428v77.99L39,77.99a48.15,48.15 0,0 0,-39 20.01Z"
11 + android:fillColor="#fff"/>
12 + </group>
13 +</vector>
...@@ -5,20 +5,22 @@ ...@@ -5,20 +5,22 @@
5 android:id="@+id/cl_bill_payment" 5 android:id="@+id/cl_bill_payment"
6 android:layout_width="match_parent" 6 android:layout_width="match_parent"
7 android:layout_height="match_parent" 7 android:layout_height="match_parent"
8 - android:background="@android:color/white" 8 + android:background="@color/cos_grey5"
9 android:orientation="vertical"> 9 android:orientation="vertical">
10 10
11 <androidx.constraintlayout.widget.ConstraintLayout 11 <androidx.constraintlayout.widget.ConstraintLayout
12 android:id="@+id/cl_bill_header" 12 android:id="@+id/cl_bill_header"
13 android:layout_width="match_parent" 13 android:layout_width="match_parent"
14 - android:layout_height="48dp" 14 + android:layout_height="64dp"
15 - android:background="@android:color/white"> 15 + android:translationZ="10dp"
16 + android:background="@drawable/ic_background_transparent_shadow">
16 17
17 <ImageView 18 <ImageView
18 android:id="@+id/iv_list_close" 19 android:id="@+id/iv_list_close"
19 android:layout_width="48dp" 20 android:layout_width="48dp"
20 android:layout_height="48dp" 21 android:layout_height="48dp"
21 android:layout_marginStart="16dp" 22 android:layout_marginStart="16dp"
23 + android:layout_marginBottom="16dp"
22 android:scaleType="centerInside" 24 android:scaleType="centerInside"
23 android:src="@drawable/ic_back" 25 android:src="@drawable/ic_back"
24 app:layout_constraintBottom_toBottomOf="parent" 26 app:layout_constraintBottom_toBottomOf="parent"
...@@ -32,6 +34,7 @@ ...@@ -32,6 +34,7 @@
32 android:gravity="center" 34 android:gravity="center"
33 android:textColor="@color/grey" 35 android:textColor="@color/grey"
34 android:textSize="17sp" 36 android:textSize="17sp"
37 + android:layout_marginBottom="16dp"
35 fontPath="fonts/pf_square_sans_pro_bold.ttf" 38 fontPath="fonts/pf_square_sans_pro_bold.ttf"
36 android:text="@string/cos_gifts_title" 39 android:text="@string/cos_gifts_title"
37 app:layout_constraintBottom_toBottomOf="parent" 40 app:layout_constraintBottom_toBottomOf="parent"
...@@ -43,7 +46,7 @@ ...@@ -43,7 +46,7 @@
43 <LinearLayout 46 <LinearLayout
44 android:layout_width="match_parent" 47 android:layout_width="match_parent"
45 android:layout_height="match_parent" 48 android:layout_height="match_parent"
46 - android:background="@drawable/shape_cos_loyalty_no_border" 49 + android:layout_marginTop="-18dp"
47 android:orientation="vertical"> 50 android:orientation="vertical">
48 51
49 <LinearLayout 52 <LinearLayout
...@@ -97,7 +100,6 @@ ...@@ -97,7 +100,6 @@
97 android:id="@+id/rv_merged_gifts" 100 android:id="@+id/rv_merged_gifts"
98 android:layout_width="match_parent" 101 android:layout_width="match_parent"
99 android:layout_height="wrap_content" 102 android:layout_height="wrap_content"
100 - android:layout_marginTop="4dp"
101 android:clipToPadding="false" 103 android:clipToPadding="false"
102 android:orientation="vertical" 104 android:orientation="vertical"
103 android:overScrollMode="never" 105 android:overScrollMode="never"
......
...@@ -4,21 +4,23 @@ ...@@ -4,21 +4,23 @@
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="match_parent" 6 android:layout_height="match_parent"
7 - android:background="@android:color/white" 7 + android:background="@color/cos_grey5"
8 android:fillViewport="true" 8 android:fillViewport="true"
9 android:orientation="vertical"> 9 android:orientation="vertical">
10 10
11 <androidx.constraintlayout.widget.ConstraintLayout 11 <androidx.constraintlayout.widget.ConstraintLayout
12 android:id="@+id/cl_more_header" 12 android:id="@+id/cl_more_header"
13 android:layout_width="match_parent" 13 android:layout_width="match_parent"
14 - android:layout_height="48dp" 14 + android:layout_height="64dp"
15 - app:layout_constraintTop_toTopOf="parent"> 15 + android:translationZ="10dp"
16 + android:background="@drawable/ic_background_transparent_shadow">
16 17
17 <ImageView 18 <ImageView
18 android:id="@+id/iv_list_close" 19 android:id="@+id/iv_list_close"
19 android:layout_width="48dp" 20 android:layout_width="48dp"
20 android:layout_height="48dp" 21 android:layout_height="48dp"
21 android:layout_marginStart="16dp" 22 android:layout_marginStart="16dp"
23 + android:layout_marginBottom="16dp"
22 android:scaleType="centerInside" 24 android:scaleType="centerInside"
23 android:src="@drawable/ic_back" 25 android:src="@drawable/ic_back"
24 app:layout_constraintBottom_toBottomOf="parent" 26 app:layout_constraintBottom_toBottomOf="parent"
...@@ -30,6 +32,7 @@ ...@@ -30,6 +32,7 @@
30 fontPath="fonts/pf_square_sans_pro_bold.ttf" 32 fontPath="fonts/pf_square_sans_pro_bold.ttf"
31 android:layout_width="wrap_content" 33 android:layout_width="wrap_content"
32 android:layout_height="wrap_content" 34 android:layout_height="wrap_content"
35 + android:layout_marginBottom="16dp"
33 android:gravity="center" 36 android:gravity="center"
34 android:text="@string/cos_more_title" 37 android:text="@string/cos_more_title"
35 android:textColor="@color/grey" 38 android:textColor="@color/grey"
...@@ -43,7 +46,7 @@ ...@@ -43,7 +46,7 @@
43 <LinearLayout 46 <LinearLayout
44 android:layout_width="match_parent" 47 android:layout_width="match_parent"
45 android:layout_height="match_parent" 48 android:layout_height="match_parent"
46 - android:background="@drawable/shape_cos_loyalty_no_border" 49 + android:layout_marginTop="-18dp"
47 android:orientation="vertical"> 50 android:orientation="vertical">
48 51
49 <ScrollView 52 <ScrollView
......