open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
111cc51b 1 parent 5548a79d

ui changes

Inline Side-by-side
Showing 20 changed files with 194 additions and 109 deletions
...@@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity { ...@@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity {
36 public void onWarplyReady() { 36 public void onWarplyReady() {
37 if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) { 37 if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) {
38 WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest() 38 WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest()
39 - .setGuid("7000000900"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons 39 + .setGuid("6012049139"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons
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-cosbeta69' 5 + PUBLISH_VERSION = '4.5.4-cosbeta70'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -26,66 +26,79 @@ ...@@ -26,66 +26,79 @@
26 <activity 26 <activity
27 android:name="ly.warp.sdk.activities.WarpViewActivity" 27 android:name="ly.warp.sdk.activities.WarpViewActivity"
28 android:exported="false" 28 android:exported="false"
29 + android:theme="@style/SDKAppTheme"
29 android:screenOrientation="portrait" /> 30 android:screenOrientation="portrait" />
30 31
31 <activity 32 <activity
32 android:name="ly.warp.sdk.activities.LoyaltyAnalysisActivity" 33 android:name="ly.warp.sdk.activities.LoyaltyAnalysisActivity"
33 android:exported="false" 34 android:exported="false"
35 + android:theme="@style/SDKAppTheme"
34 android:screenOrientation="portrait" /> 36 android:screenOrientation="portrait" />
35 37
36 <activity 38 <activity
37 android:name="ly.warp.sdk.activities.CouponInfoActivity" 39 android:name="ly.warp.sdk.activities.CouponInfoActivity"
38 android:exported="false" 40 android:exported="false"
41 + android:theme="@style/SDKAppTheme"
39 android:screenOrientation="portrait" /> 42 android:screenOrientation="portrait" />
40 43
41 <activity 44 <activity
42 android:name="ly.warp.sdk.activities.ActiveCouponsActivity" 45 android:name="ly.warp.sdk.activities.ActiveCouponsActivity"
43 android:exported="false" 46 android:exported="false"
47 + android:theme="@style/SDKAppTheme"
44 android:screenOrientation="portrait" /> 48 android:screenOrientation="portrait" />
45 49
46 <activity 50 <activity
47 android:name="ly.warp.sdk.activities.GiftsForYouActivity" 51 android:name="ly.warp.sdk.activities.GiftsForYouActivity"
48 android:exported="false" 52 android:exported="false"
53 + android:theme="@style/SDKAppTheme"
49 android:screenOrientation="portrait" /> 54 android:screenOrientation="portrait" />
50 55
51 <activity 56 <activity
52 android:name="ly.warp.sdk.activities.MoreForYouActivity" 57 android:name="ly.warp.sdk.activities.MoreForYouActivity"
53 android:exported="false" 58 android:exported="false"
59 + android:theme="@style/SDKAppTheme"
54 android:screenOrientation="portrait" /> 60 android:screenOrientation="portrait" />
55 61
56 <activity 62 <activity
57 android:name="ly.warp.sdk.activities.CouponsetInfoActivity" 63 android:name="ly.warp.sdk.activities.CouponsetInfoActivity"
58 android:exported="false" 64 android:exported="false"
65 + android:theme="@style/SDKAppTheme"
59 android:screenOrientation="portrait" /> 66 android:screenOrientation="portrait" />
60 67
61 <activity 68 <activity
62 android:name="ly.warp.sdk.activities.LoyaltyWallet" 69 android:name="ly.warp.sdk.activities.LoyaltyWallet"
63 android:exported="false" 70 android:exported="false"
71 + android:theme="@style/SDKAppTheme"
64 android:screenOrientation="portrait" /> 72 android:screenOrientation="portrait" />
65 73
66 <activity 74 <activity
67 android:name="ly.warp.sdk.activities.ActiveGiftsActivity" 75 android:name="ly.warp.sdk.activities.ActiveGiftsActivity"
68 android:exported="false" 76 android:exported="false"
77 + android:theme="@style/SDKAppTheme"
69 android:screenOrientation="portrait" /> 78 android:screenOrientation="portrait" />
70 79
71 <activity 80 <activity
72 android:name="ly.warp.sdk.activities.ShopsActivity" 81 android:name="ly.warp.sdk.activities.ShopsActivity"
73 android:exported="false" 82 android:exported="false"
83 + android:theme="@style/SDKAppTheme"
74 android:screenOrientation="portrait" /> 84 android:screenOrientation="portrait" />
75 85
76 <activity 86 <activity
77 android:name="ly.warp.sdk.activities.CouponShareActivity" 87 android:name="ly.warp.sdk.activities.CouponShareActivity"
78 android:exported="false" 88 android:exported="false"
89 + android:theme="@style/SDKAppTheme"
79 android:screenOrientation="portrait" /> 90 android:screenOrientation="portrait" />
80 91
81 <activity 92 <activity
82 android:name="ly.warp.sdk.activities.TelcoActivity" 93 android:name="ly.warp.sdk.activities.TelcoActivity"
83 android:exported="false" 94 android:exported="false"
95 + android:theme="@style/SDKAppTheme"
84 android:screenOrientation="portrait" /> 96 android:screenOrientation="portrait" />
85 97
86 <activity 98 <activity
87 android:name="ly.warp.sdk.activities.ContextualActivity" 99 android:name="ly.warp.sdk.activities.ContextualActivity"
88 android:exported="false" 100 android:exported="false"
101 + android:theme="@style/SDKAppTheme"
89 android:screenOrientation="portrait" /> 102 android:screenOrientation="portrait" />
90 103
91 <activity 104 <activity
......
...@@ -51,7 +51,7 @@ import ly.warp.sdk.utils.managers.WarplyEventBusManager; ...@@ -51,7 +51,7 @@ import ly.warp.sdk.utils.managers.WarplyEventBusManager;
51 import ly.warp.sdk.views.adapters.ActiveCouponAdapter; 51 import ly.warp.sdk.views.adapters.ActiveCouponAdapter;
52 52
53 53
54 -public class LoyaltyWallet extends Activity implements View.OnClickListener { 54 +public class LoyaltyWallet extends Activity implements View.OnClickListener, View.OnScrollChangeListener {
55 55
56 // =========================================================== 56 // ===========================================================
57 // Constants 57 // Constants
...@@ -66,14 +66,14 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener { ...@@ -66,14 +66,14 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
66 mTvUserBadge, mTvGiftsValue, mTvGiftsValueAll, mTvActiveCode, mTvActiveDate, 66 mTvUserBadge, mTvGiftsValue, mTvGiftsValueAll, mTvActiveCode, mTvActiveDate,
67 mTvActiveTitle, mTvActiveCouponsHeader; 67 mTvActiveTitle, mTvActiveCouponsHeader;
68 private ConstraintLayout mClDealsBanner, mClDealsView, 68 private ConstraintLayout mClDealsBanner, mClDealsView,
69 - mClGiftsBanner; 69 + mClGiftsBanner, mClToolbar;
70 private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet; 70 private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet;
71 FlowLayout mLlActiveCodesView; 71 FlowLayout mLlActiveCodesView;
72 private float couponDfyValue = 0.0f; 72 private float couponDfyValue = 0.0f;
73 private RecyclerView mRecyclerCoupons; 73 private RecyclerView mRecyclerCoupons;
74 private ActiveCouponAdapter mAdapterCoupons; 74 private ActiveCouponAdapter mAdapterCoupons;
75 private AlertDialog mAlertDialogNonTelco; 75 private AlertDialog mAlertDialogNonTelco;
76 - private ScrollView mScActiveCodes; 76 + private ScrollView mScActiveCodes, mSvLoyaltyWallet;
77 77
78 // =========================================================== 78 // ===========================================================
79 // Methods for/from SuperClass/Interfaces 79 // Methods for/from SuperClass/Interfaces
...@@ -105,6 +105,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener { ...@@ -105,6 +105,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
105 mLlEmptyWallet = findViewById(R.id.ll_empty_wallet); 105 mLlEmptyWallet = findViewById(R.id.ll_empty_wallet);
106 mLlActiveCodesView = findViewById(R.id.ll_active_deals_codes_view); 106 mLlActiveCodesView = findViewById(R.id.ll_active_deals_codes_view);
107 mScActiveCodes = findViewById(R.id.sv_active_deals_codes_view); 107 mScActiveCodes = findViewById(R.id.sv_active_deals_codes_view);
108 + mSvLoyaltyWallet = findViewById(R.id.sv_loyalty_wallet);
109 + mClToolbar = findViewById(R.id.cl_loyalty_wallet_header);
108 110
109 // ArrayList<ActiveDFYCouponModel> dlist = new ArrayList<>(); 111 // ArrayList<ActiveDFYCouponModel> dlist = new ArrayList<>();
110 // ActiveDFYCouponModel model = new ActiveDFYCouponModel(); 112 // ActiveDFYCouponModel model = new ActiveDFYCouponModel();
...@@ -214,6 +216,19 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener { ...@@ -214,6 +216,19 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
214 } 216 }
215 217
216 @Override 218 @Override
219 + public void onScrollChange(View view, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
220 + if (scrollY > oldScrollY) {
221 + mClToolbar.setElevation(14);
222 + }
223 + if (scrollY < oldScrollY) {
224 + mClToolbar.setElevation(14);
225 + }
226 + if (scrollY == 0) {
227 + mClToolbar.setElevation(0);
228 + }
229 + }
230 +
231 + @Override
217 protected void onActivityResult(int requestCode, int resultCode, Intent data) { 232 protected void onActivityResult(int requestCode, int resultCode, Intent data) {
218 if (requestCode == 1000) { 233 if (requestCode == 1000) {
219 if (resultCode == RESULT_OK) { 234 if (resultCode == RESULT_OK) {
...@@ -469,6 +484,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener { ...@@ -469,6 +484,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
469 mClDealsBanner.setOnClickListener(this); 484 mClDealsBanner.setOnClickListener(this);
470 mClGiftsBanner.setOnClickListener(this); 485 mClGiftsBanner.setOnClickListener(this);
471 mClDealsView.setOnClickListener(this); 486 mClDealsView.setOnClickListener(this);
487 + mSvLoyaltyWallet.setOnScrollChangeListener(this);
472 } 488 }
473 489
474 private void nonTelcoDialog() { 490 private void nonTelcoDialog() {
......

470 Bytes | W: | H:

412 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.01 KB | W: | H:

369 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
1 <shape xmlns:android="http://schemas.android.com/apk/res/android" 1 <shape xmlns:android="http://schemas.android.com/apk/res/android"
2 android:shape="rectangle"> 2 android:shape="rectangle">
3 <corners android:topLeftRadius="27dp" /> 3 <corners android:topLeftRadius="27dp" />
4 - <solid android:color="@color/white" /> 4 + <solid android:color="@android:color/white" />
5 </shape> 5 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
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="140dp" 6 android:layout_height="140dp"
7 - android:layout_marginBottom="16dp"
8 android:background="@drawable/ic_coupon_background"> 7 android:background="@drawable/ic_coupon_background">
9 8
10 <androidx.constraintlayout.widget.Guideline 9 <androidx.constraintlayout.widget.Guideline
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <androidx.constraintlayout.widget.ConstraintLayout 10 <androidx.constraintlayout.widget.ConstraintLayout
11 android:id="@+id/cl_bill_header" 11 android:id="@+id/cl_bill_header"
12 android:layout_width="match_parent" 12 android:layout_width="match_parent"
13 - android:layout_height="80dp" 13 + android:layout_height="50dp"
14 android:background="@android:color/white"> 14 android:background="@android:color/white">
15 15
16 <ImageView 16 <ImageView
...@@ -39,21 +39,29 @@ ...@@ -39,21 +39,29 @@
39 app:layout_constraintTop_toTopOf="parent" /> 39 app:layout_constraintTop_toTopOf="parent" />
40 </androidx.constraintlayout.widget.ConstraintLayout> 40 </androidx.constraintlayout.widget.ConstraintLayout>
41 41
42 +<!-- android:background="@drawable/shape_cos_loyalty"-->
42 <RelativeLayout 43 <RelativeLayout
43 android:layout_width="match_parent" 44 android:layout_width="match_parent"
44 android:layout_height="match_parent" 45 android:layout_height="match_parent"
45 - android:background="@drawable/shape_cos_loyalty" 46 + android:orientation="vertical"
46 - android:orientation="vertical"> 47 + android:background="@color/cos_grey5">
47 48
48 <androidx.recyclerview.widget.RecyclerView 49 <androidx.recyclerview.widget.RecyclerView
49 android:id="@+id/rv_active_coupons" 50 android:id="@+id/rv_active_coupons"
50 android:layout_width="match_parent" 51 android:layout_width="match_parent"
51 android:layout_height="wrap_content" 52 android:layout_height="wrap_content"
52 - android:layout_marginTop="4dp" 53 + android:layout_marginTop="0.5dp"
53 android:clipToPadding="false" 54 android:clipToPadding="false"
54 android:orientation="vertical" 55 android:orientation="vertical"
55 android:paddingTop="44dp" 56 android:paddingTop="44dp"
56 android:overScrollMode="never"/> 57 android:overScrollMode="never"/>
58 +
59 + <LinearLayout
60 + android:layout_width="match_parent"
61 + android:layout_height="wrap_content"
62 + android:background="@drawable/ic_line">
63 +
64 + </LinearLayout>
57 </RelativeLayout> 65 </RelativeLayout>
58 66
59 <TextView 67 <TextView
......
...@@ -44,27 +44,36 @@ ...@@ -44,27 +44,36 @@
44 android:layout_height="match_parent" 44 android:layout_height="match_parent"
45 android:background="@android:color/white"> 45 android:background="@android:color/white">
46 46
47 +<!-- android:background="@drawable/shape_cos_loyalty_white"-->
47 <androidx.constraintlayout.widget.ConstraintLayout 48 <androidx.constraintlayout.widget.ConstraintLayout
48 android:id="@+id/cl_loyalty_info_view_inner" 49 android:id="@+id/cl_loyalty_info_view_inner"
49 android:layout_width="match_parent" 50 android:layout_width="match_parent"
50 android:layout_height="match_parent" 51 android:layout_height="match_parent"
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"
55 app:layout_constraintTop_toTopOf="parent"> 55 app:layout_constraintTop_toTopOf="parent">
56 56
57 - <com.github.siyamed.shapeimageview.mask.PorterShapeImageView 57 + <ImageView
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:layout_marginTop="0.5dp"
62 android:scaleType="centerCrop" 62 android:scaleType="centerCrop"
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"
66 tools:src="@drawable/carousel_banner" /> 65 tools:src="@drawable/carousel_banner" />
67 66
67 + <LinearLayout
68 + android:layout_width="match_parent"
69 + android:layout_height="wrap_content"
70 + android:background="@drawable/ic_line"
71 + app:layout_constraintStart_toStartOf="parent"
72 + app:layout_constraintEnd_toEndOf="parent"
73 + app:layout_constraintTop_toTopOf="@+id/imageView6">
74 +
75 + </LinearLayout>
76 +
68 <TextView 77 <TextView
69 android:id="@+id/textView13" 78 android:id="@+id/textView13"
70 android:layout_width="match_parent" 79 android:layout_width="match_parent"
......
...@@ -45,27 +45,36 @@ ...@@ -45,27 +45,36 @@
45 android:layout_height="match_parent" 45 android:layout_height="match_parent"
46 android:background="@android:color/white"> 46 android:background="@android:color/white">
47 47
48 +<!-- android:background="@drawable/shape_cos_loyalty_white"-->
48 <androidx.constraintlayout.widget.ConstraintLayout 49 <androidx.constraintlayout.widget.ConstraintLayout
49 android:id="@+id/cl_loyalty_info_view_inner" 50 android:id="@+id/cl_loyalty_info_view_inner"
50 android:layout_width="match_parent" 51 android:layout_width="match_parent"
51 android:layout_height="match_parent" 52 android:layout_height="match_parent"
52 - android:background="@drawable/shape_cos_loyalty_white"
53 android:paddingBottom="48dp" 53 android:paddingBottom="48dp"
54 app:layout_constraintEnd_toEndOf="parent" 54 app:layout_constraintEnd_toEndOf="parent"
55 app:layout_constraintStart_toStartOf="parent" 55 app:layout_constraintStart_toStartOf="parent"
56 app:layout_constraintTop_toTopOf="parent"> 56 app:layout_constraintTop_toTopOf="parent">
57 57
58 - <com.github.siyamed.shapeimageview.mask.PorterShapeImageView 58 + <ImageView
59 android:id="@+id/imageView6" 59 android:id="@+id/imageView6"
60 android:layout_width="match_parent" 60 android:layout_width="match_parent"
61 android:layout_height="224dp" 61 android:layout_height="224dp"
62 - android:layout_marginTop="4dp" 62 + android:layout_marginTop="0.5dp"
63 android:scaleType="centerCrop" 63 android:scaleType="centerCrop"
64 app:layout_constraintStart_toStartOf="parent" 64 app:layout_constraintStart_toStartOf="parent"
65 app:layout_constraintTop_toTopOf="parent" 65 app:layout_constraintTop_toTopOf="parent"
66 - app:siShape="@drawable/shape_top_left_rounded"
67 tools:src="@drawable/carousel_banner" /> 66 tools:src="@drawable/carousel_banner" />
68 67
68 + <LinearLayout
69 + android:layout_width="match_parent"
70 + android:layout_height="wrap_content"
71 + android:background="@drawable/ic_line"
72 + app:layout_constraintStart_toStartOf="parent"
73 + app:layout_constraintEnd_toEndOf="parent"
74 + app:layout_constraintTop_toTopOf="@+id/imageView6">
75 +
76 + </LinearLayout>
77 +
69 <TextView 78 <TextView
70 android:id="@+id/textView13" 79 android:id="@+id/textView13"
71 fontPath="fonts/pf_square_sans_pro_medium.ttf" 80 fontPath="fonts/pf_square_sans_pro_medium.ttf"
......
...@@ -44,27 +44,36 @@ ...@@ -44,27 +44,36 @@
44 android:layout_height="match_parent" 44 android:layout_height="match_parent"
45 android:background="@android:color/white"> 45 android:background="@android:color/white">
46 46
47 +<!-- android:background="@drawable/shape_cos_loyalty_white"-->
47 <androidx.constraintlayout.widget.ConstraintLayout 48 <androidx.constraintlayout.widget.ConstraintLayout
48 android:id="@+id/cl_loyalty_info_view_inner" 49 android:id="@+id/cl_loyalty_info_view_inner"
49 android:layout_width="match_parent" 50 android:layout_width="match_parent"
50 android:layout_height="match_parent" 51 android:layout_height="match_parent"
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"
55 app:layout_constraintTop_toTopOf="parent"> 55 app:layout_constraintTop_toTopOf="parent">
56 56
57 - <com.github.siyamed.shapeimageview.mask.PorterShapeImageView 57 + <ImageView
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:layout_marginTop="0.5dp"
62 android:scaleType="centerCrop" 62 android:scaleType="centerCrop"
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"
66 tools:src="@drawable/carousel_banner" /> 65 tools:src="@drawable/carousel_banner" />
67 66
67 + <LinearLayout
68 + android:layout_width="match_parent"
69 + android:layout_height="wrap_content"
70 + android:background="@drawable/ic_line"
71 + app:layout_constraintStart_toStartOf="parent"
72 + app:layout_constraintEnd_toEndOf="parent"
73 + app:layout_constraintTop_toTopOf="@+id/imageView6">
74 +
75 + </LinearLayout>
76 +
68 <TextView 77 <TextView
69 android:id="@+id/textView13" 78 android:id="@+id/textView13"
70 android:layout_width="match_parent" 79 android:layout_width="match_parent"
......
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
22 app:layout_constraintTop_toTopOf="parent" /> 22 app:layout_constraintTop_toTopOf="parent" />
23 23
24 <TextView 24 <TextView
25 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
25 android:layout_width="wrap_content" 26 android:layout_width="wrap_content"
26 android:layout_height="wrap_content" 27 android:layout_height="wrap_content"
27 android:text="@string/cos_coupon_info_title" 28 android:text="@string/cos_coupon_info_title"
28 android:textColor="@color/grey" 29 android:textColor="@color/grey"
29 android:textSize="17sp" 30 android:textSize="17sp"
30 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
31 app:layout_constraintBottom_toBottomOf="parent" 31 app:layout_constraintBottom_toBottomOf="parent"
32 app:layout_constraintEnd_toEndOf="parent" 32 app:layout_constraintEnd_toEndOf="parent"
33 app:layout_constraintStart_toStartOf="parent" 33 app:layout_constraintStart_toStartOf="parent"
...@@ -45,28 +45,38 @@ ...@@ -45,28 +45,38 @@
45 android:layout_height="match_parent" 45 android:layout_height="match_parent"
46 android:background="@android:color/white"> 46 android:background="@android:color/white">
47 47
48 + <!-- android:background="@drawable/shape_cos_loyalty_white"-->
48 <androidx.constraintlayout.widget.ConstraintLayout 49 <androidx.constraintlayout.widget.ConstraintLayout
49 android:id="@+id/cl_loyalty_info_view_inner" 50 android:id="@+id/cl_loyalty_info_view_inner"
50 android:layout_width="match_parent" 51 android:layout_width="match_parent"
51 android:layout_height="match_parent" 52 android:layout_height="match_parent"
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">
56 56
57 - <com.github.siyamed.shapeimageview.mask.PorterShapeImageView 57 + <ImageView
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:layout_marginTop="0.5dp"
62 android:scaleType="centerCrop" 62 android:scaleType="centerCrop"
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"
66 tools:src="@drawable/carousel_banner" /> 65 tools:src="@drawable/carousel_banner" />
67 66
67 + <LinearLayout
68 + android:layout_width="match_parent"
69 + android:layout_height="wrap_content"
70 + android:background="@drawable/ic_line"
71 + app:layout_constraintEnd_toEndOf="parent"
72 + app:layout_constraintStart_toStartOf="parent"
73 + app:layout_constraintTop_toTopOf="@+id/imageView6">
74 +
75 + </LinearLayout>
76 +
68 <TextView 77 <TextView
69 android:id="@+id/textView13" 78 android:id="@+id/textView13"
79 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
70 android:layout_width="match_parent" 80 android:layout_width="match_parent"
71 android:layout_height="wrap_content" 81 android:layout_height="wrap_content"
72 android:layout_marginTop="32dp" 82 android:layout_marginTop="32dp"
...@@ -74,7 +84,6 @@ ...@@ -74,7 +84,6 @@
74 android:paddingHorizontal="32dp" 84 android:paddingHorizontal="32dp"
75 android:textColor="#415564" 85 android:textColor="#415564"
76 android:textSize="18sp" 86 android:textSize="18sp"
77 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
78 app:layout_constraintEnd_toEndOf="parent" 87 app:layout_constraintEnd_toEndOf="parent"
79 app:layout_constraintHorizontal_bias="0.509" 88 app:layout_constraintHorizontal_bias="0.509"
80 app:layout_constraintStart_toStartOf="parent" 89 app:layout_constraintStart_toStartOf="parent"
...@@ -83,6 +92,7 @@ ...@@ -83,6 +92,7 @@
83 92
84 <TextView 93 <TextView
85 android:id="@+id/textView14" 94 android:id="@+id/textView14"
95 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
86 android:layout_width="match_parent" 96 android:layout_width="match_parent"
87 android:layout_height="wrap_content" 97 android:layout_height="wrap_content"
88 android:layout_marginTop="16dp" 98 android:layout_marginTop="16dp"
...@@ -90,7 +100,6 @@ ...@@ -90,7 +100,6 @@
90 android:paddingHorizontal="32dp" 100 android:paddingHorizontal="32dp"
91 android:textColor="#415564" 101 android:textColor="#415564"
92 android:textSize="16sp" 102 android:textSize="16sp"
93 - fontPath="fonts/pf_square_sans_pro_regular.ttf"
94 app:layout_constraintEnd_toEndOf="parent" 103 app:layout_constraintEnd_toEndOf="parent"
95 app:layout_constraintStart_toStartOf="parent" 104 app:layout_constraintStart_toStartOf="parent"
96 app:layout_constraintTop_toBottomOf="@+id/textView13" 105 app:layout_constraintTop_toBottomOf="@+id/textView13"
...@@ -110,13 +119,13 @@ ...@@ -110,13 +119,13 @@
110 app:layout_constraintStart_toStartOf="parent"> 119 app:layout_constraintStart_toStartOf="parent">
111 120
112 <TextView 121 <TextView
122 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
113 android:layout_width="wrap_content" 123 android:layout_width="wrap_content"
114 android:layout_height="wrap_content" 124 android:layout_height="wrap_content"
115 android:gravity="center" 125 android:gravity="center"
116 android:text="@string/cos_redeem_coupon" 126 android:text="@string/cos_redeem_coupon"
117 android:textColor="@color/white" 127 android:textColor="@color/white"
118 - android:textSize="17dp" 128 + android:textSize="17dp" />
119 - fontPath="fonts/pf_square_sans_pro_medium.ttf" />
120 </LinearLayout> 129 </LinearLayout>
121 130
122 <RelativeLayout 131 <RelativeLayout
...@@ -139,11 +148,11 @@ ...@@ -139,11 +148,11 @@
139 148
140 <TextView 149 <TextView
141 android:id="@+id/tv_terms" 150 android:id="@+id/tv_terms"
151 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
142 android:layout_width="wrap_content" 152 android:layout_width="wrap_content"
143 android:layout_height="wrap_content" 153 android:layout_height="wrap_content"
144 android:text="@string/cos_coupon_terms_title" 154 android:text="@string/cos_coupon_terms_title"
145 android:textColor="#415564" 155 android:textColor="#415564"
146 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
147 android:textSize="15sp" /> 156 android:textSize="15sp" />
148 157
149 <ImageView 158 <ImageView
...@@ -157,13 +166,13 @@ ...@@ -157,13 +166,13 @@
157 166
158 <TextView 167 <TextView
159 android:id="@+id/tv_terms_value" 168 android:id="@+id/tv_terms_value"
169 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
160 android:layout_width="wrap_content" 170 android:layout_width="wrap_content"
161 android:layout_height="wrap_content" 171 android:layout_height="wrap_content"
162 android:layout_below="@+id/ll_terms_inner" 172 android:layout_below="@+id/ll_terms_inner"
163 android:layout_marginTop="16dp" 173 android:layout_marginTop="16dp"
164 android:textColor="@color/grey" 174 android:textColor="@color/grey"
165 android:visibility="gone" 175 android:visibility="gone"
166 - fontPath="fonts/pf_square_sans_pro_regular.ttf"
167 tools:text="@string/cos_coupon_date" 176 tools:text="@string/cos_coupon_date"
168 tools:visibility="visible" /> 177 tools:visibility="visible" />
169 </RelativeLayout> 178 </RelativeLayout>
......
...@@ -34,94 +34,93 @@ ...@@ -34,94 +34,93 @@
34 app:layout_constraintTop_toTopOf="parent" /> 34 app:layout_constraintTop_toTopOf="parent" />
35 </androidx.constraintlayout.widget.ConstraintLayout> 35 </androidx.constraintlayout.widget.ConstraintLayout>
36 36
37 - <LinearLayout 37 + <ScrollView
38 + android:id="@+id/sv_loyalty_wallet"
38 android:layout_width="match_parent" 39 android:layout_width="match_parent"
39 - android:layout_height="wrap_content" 40 + android:layout_height="match_parent"
40 android:layout_below="@+id/cl_loyalty_wallet_header" 41 android:layout_below="@+id/cl_loyalty_wallet_header"
41 - android:orientation="vertical"> 42 + android:fillViewport="true"
43 + android:overScrollMode="never">
42 44
43 <LinearLayout 45 <LinearLayout
44 - android:id="@+id/ll_first_view"
45 android:layout_width="match_parent" 46 android:layout_width="match_parent"
46 android:layout_height="wrap_content" 47 android:layout_height="wrap_content"
47 - android:background="@drawable/ic_background_circle" 48 + android:orientation="vertical">
48 - android:elevation="1dp"
49 - android:gravity="center_horizontal"
50 - android:orientation="vertical"
51 - android:paddingVertical="32dp">
52 -
53 - <de.hdodenhof.circleimageview.CircleImageView
54 - android:id="@+id/iv_profile_photo"
55 - android:layout_width="70dp"
56 - android:layout_height="70dp"
57 - android:src="@drawable/ic_default_photo"
58 - app:layout_constraintBottom_toBottomOf="parent"
59 - app:layout_constraintLeft_toLeftOf="parent"
60 - app:layout_constraintTop_toTopOf="parent" />
61 -
62 - <TextView
63 - android:id="@+id/tv_profile_name"
64 - fontPath="fonts/pf_square_sans_pro_regular.ttf"
65 - android:layout_width="wrap_content"
66 - android:layout_height="wrap_content"
67 - android:layout_marginVertical="6dp"
68 - android:maxLines="1"
69 - android:textColor="@color/grey"
70 - android:textSize="15sp"
71 - tools:text="Test Name" />
72 49
73 <LinearLayout 50 <LinearLayout
74 - android:id="@+id/ll_user_badge" 51 + android:id="@+id/ll_first_view"
75 - android:layout_width="wrap_content" 52 + android:layout_width="match_parent"
76 android:layout_height="wrap_content" 53 android:layout_height="wrap_content"
77 - android:background="@drawable/shape_cos_gradient6_shahow" 54 + android:background="@drawable/ic_background_circle"
78 - android:gravity="center" 55 + android:elevation="1dp"
79 - android:paddingHorizontal="10dp" 56 + android:gravity="center_horizontal"
80 - android:paddingVertical="3dp" 57 + android:orientation="vertical"
81 - android:visibility="gone" 58 + android:paddingVertical="32dp">
82 - tools:visibility="visible"> 59 +
60 + <de.hdodenhof.circleimageview.CircleImageView
61 + android:id="@+id/iv_profile_photo"
62 + android:layout_width="70dp"
63 + android:layout_height="70dp"
64 + android:src="@drawable/ic_default_photo"
65 + app:layout_constraintBottom_toBottomOf="parent"
66 + app:layout_constraintLeft_toLeftOf="parent"
67 + app:layout_constraintTop_toTopOf="parent" />
83 68
84 <TextView 69 <TextView
85 - android:id="@+id/tv_type" 70 + android:id="@+id/tv_profile_name"
86 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 71 + fontPath="fonts/pf_square_sans_pro_regular.ttf"
87 android:layout_width="wrap_content" 72 android:layout_width="wrap_content"
88 android:layout_height="wrap_content" 73 android:layout_height="wrap_content"
89 - android:textColor="@android:color/white" 74 + android:layout_marginVertical="6dp"
90 - tools:text="@string/cos_profile_type" /> 75 + android:maxLines="1"
91 - </LinearLayout> 76 + android:textColor="@color/grey"
77 + android:textSize="15sp"
78 + tools:text="Test Name" />
92 79
93 - <LinearLayout 80 + <LinearLayout
94 - android:id="@+id/ll_user_questionnaire" 81 + android:id="@+id/ll_user_badge"
95 - android:layout_width="wrap_content" 82 + android:layout_width="wrap_content"
96 - android:layout_height="wrap_content" 83 + android:layout_height="wrap_content"
97 - android:background="@drawable/shape_cos_grey5" 84 + android:background="@drawable/shape_cos_gradient6_shahow"
98 - android:gravity="center" 85 + android:gravity="center"
99 - android:paddingHorizontal="8dp" 86 + android:paddingHorizontal="10dp"
100 - android:paddingVertical="4dp" 87 + android:paddingVertical="3dp"
101 - android:visibility="gone" 88 + android:visibility="gone"
102 - tools:visibility="gone"> 89 + tools:visibility="visible">
103 90
104 - <TextView 91 + <TextView
105 - android:id="@+id/tv_questionnaire" 92 + android:id="@+id/tv_type"
106 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 93 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
94 + android:layout_width="wrap_content"
95 + android:layout_height="wrap_content"
96 + android:textColor="@android:color/white"
97 + tools:text="@string/cos_profile_type" />
98 + </LinearLayout>
99 +
100 + <LinearLayout
101 + android:id="@+id/ll_user_questionnaire"
107 android:layout_width="wrap_content" 102 android:layout_width="wrap_content"
108 android:layout_height="wrap_content" 103 android:layout_height="wrap_content"
109 - android:text="@string/cos_profile_preferences" 104 + android:background="@drawable/shape_cos_grey5"
110 - android:textColor="@color/cos_green6" /> 105 + android:gravity="center"
111 - </LinearLayout> 106 + android:paddingHorizontal="8dp"
112 - </LinearLayout> 107 + android:paddingVertical="4dp"
108 + android:visibility="gone"
109 + tools:visibility="gone">
113 110
114 - <ScrollView 111 + <TextView
115 - android:layout_width="match_parent" 112 + android:id="@+id/tv_questionnaire"
116 - android:layout_height="match_parent" 113 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
117 - android:layout_marginTop="-24dp" 114 + android:layout_width="wrap_content"
118 - android:fillViewport="true" 115 + android:layout_height="wrap_content"
119 - android:overScrollMode="never"> 116 + android:text="@string/cos_profile_preferences"
117 + android:textColor="@color/cos_green6" />
118 + </LinearLayout>
119 + </LinearLayout>
120 120
121 <RelativeLayout 121 <RelativeLayout
122 android:layout_width="match_parent" 122 android:layout_width="match_parent"
123 - android:layout_height="wrap_content" 123 + android:layout_height="wrap_content">
124 - android:layout_marginTop="24dp">
125 124
126 <LinearLayout 125 <LinearLayout
127 android:id="@+id/ll_second_view" 126 android:id="@+id/ll_second_view"
...@@ -391,7 +390,8 @@ ...@@ -391,7 +390,8 @@
391 android:layout_width="match_parent" 390 android:layout_width="match_parent"
392 android:layout_height="wrap_content" 391 android:layout_height="wrap_content"
393 android:layout_marginHorizontal="2dp" 392 android:layout_marginHorizontal="2dp"
394 - android:paddingBottom="40dp" /> 393 + android:paddingBottom="40dp"
394 + android:overScrollMode="never"/>
395 395
396 <LinearLayout 396 <LinearLayout
397 android:id="@+id/ll_empty_wallet" 397 android:id="@+id/ll_empty_wallet"
...@@ -420,6 +420,6 @@ ...@@ -420,6 +420,6 @@
420 </LinearLayout> 420 </LinearLayout>
421 </LinearLayout> 421 </LinearLayout>
422 </RelativeLayout> 422 </RelativeLayout>
423 - </ScrollView> 423 + </LinearLayout>
424 - </LinearLayout> 424 + </ScrollView>
425 </RelativeLayout> 425 </RelativeLayout>
......
...@@ -46,28 +46,34 @@ ...@@ -46,28 +46,34 @@
46 android:layout_height="match_parent" 46 android:layout_height="match_parent"
47 android:background="@android:color/white"> 47 android:background="@android:color/white">
48 48
49 +<!-- android:background="@drawable/shape_cos_loyalty_white"-->
49 <RelativeLayout 50 <RelativeLayout
50 android:id="@+id/cl_loyalty_info_view_inner" 51 android:id="@+id/cl_loyalty_info_view_inner"
51 android:layout_width="match_parent" 52 android:layout_width="match_parent"
52 android:layout_height="match_parent" 53 android:layout_height="match_parent"
53 - android:background="@drawable/shape_cos_loyalty_white"
54 android:paddingBottom="48dp" 54 android:paddingBottom="48dp"
55 app:layout_constraintBottom_toBottomOf="parent" 55 app:layout_constraintBottom_toBottomOf="parent"
56 app:layout_constraintEnd_toEndOf="parent" 56 app:layout_constraintEnd_toEndOf="parent"
57 app:layout_constraintStart_toStartOf="parent" 57 app:layout_constraintStart_toStartOf="parent"
58 app:layout_constraintTop_toTopOf="parent"> 58 app:layout_constraintTop_toTopOf="parent">
59 59
60 - <com.github.siyamed.shapeimageview.mask.PorterShapeImageView 60 + <ImageView
61 android:id="@+id/imageView6" 61 android:id="@+id/imageView6"
62 android:layout_width="match_parent" 62 android:layout_width="match_parent"
63 android:layout_height="224dp" 63 android:layout_height="224dp"
64 android:layout_centerHorizontal="true" 64 android:layout_centerHorizontal="true"
65 - android:layout_marginTop="4dp" 65 + android:layout_marginTop="0.5dp"
66 android:scaleType="centerCrop" 66 android:scaleType="centerCrop"
67 - app:siShape="@drawable/shape_top_left_rounded"
68 tools:src="@drawable/carousel_banner" /> 67 tools:src="@drawable/carousel_banner" />
69 68
70 <LinearLayout 69 <LinearLayout
70 + android:layout_width="match_parent"
71 + android:layout_height="wrap_content"
72 + android:background="@drawable/ic_line">
73 +
74 + </LinearLayout>
75 +
76 + <LinearLayout
71 android:id="@+id/ll_telco_gift_view" 77 android:id="@+id/ll_telco_gift_view"
72 android:layout_width="wrap_content" 78 android:layout_width="wrap_content"
73 android:layout_height="wrap_content" 79 android:layout_height="wrap_content"
......
...@@ -62,4 +62,6 @@ ...@@ -62,4 +62,6 @@
62 <color name="cos_blue5">#0D81B8</color> 62 <color name="cos_blue5">#0D81B8</color>
63 <color name="cos_grey9">#757575</color> 63 <color name="cos_grey9">#757575</color>
64 <color name="cos_grey10">#53626E</color> 64 <color name="cos_grey10">#53626E</color>
65 + <color name="cos_green11">#78BE6D</color>
66 + <color name="cos_skyblue3">#0FABD6</color>
65 </resources> 67 </resources>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 <string name="cos_profile_type">Traveller</string> 13 <string name="cos_profile_type">Traveller</string>
14 <string name="header_add">Προσθήκη</string> 14 <string name="header_add">Προσθήκη</string>
15 <string name="cos_profile_reward">My Loyalty\nWallet</string> 15 <string name="cos_profile_reward">My Loyalty\nWallet</string>
16 - <string name="cos_profile_title">Tα προνόμιά μου</string> 16 + <string name="cos_profile_title">Rewards</string>
17 <string name="cos_deals_title">Deals for You</string> 17 <string name="cos_deals_title">Deals for You</string>
18 <string name="cos_profile_more">Δες περισσότερα</string> 18 <string name="cos_profile_more">Δες περισσότερα</string>
19 <string name="cos_gifts_title">GIFTS for YOU</string> 19 <string name="cos_gifts_title">GIFTS for YOU</string>
......
...@@ -27,4 +27,9 @@ ...@@ -27,4 +27,9 @@
27 <item name="android:windowMinWidthMinor">90%</item> 27 <item name="android:windowMinWidthMinor">90%</item>
28 </style> 28 </style>
29 29
30 + <style name="SDKAppTheme" parent="Theme.AppCompat.Light">
31 + <item name="android:statusBarColor">@android:color/white</item>
32 + <item name="android:windowLightStatusBar">true</item>
33 + </style>
34 +
30 </resources> 35 </resources>
...\ No newline at end of file ...\ No newline at end of file
......