Panagiotis Triantafyllou

uat changes 11_08_2022

...@@ -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-cosbeta45' 5 + PUBLISH_VERSION = '4.5.4-cosbeta46'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -84,6 +84,11 @@ ...@@ -84,6 +84,11 @@
84 android:screenOrientation="portrait" /> 84 android:screenOrientation="portrait" />
85 85
86 <activity 86 <activity
87 + android:name="ly.warp.sdk.activities.ContextualActivity"
88 + android:exported="false"
89 + android:screenOrientation="portrait" />
90 +
91 + <activity
87 android:name="ly.warp.sdk.dexter.PermissionsActivity" 92 android:name="ly.warp.sdk.dexter.PermissionsActivity"
88 android:exported="false" 93 android:exported="false"
89 android:launchMode="singleInstance" 94 android:launchMode="singleInstance"
......
...@@ -280,7 +280,9 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -280,7 +280,9 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
280 seasonalCLick.setImageUrl(dataItem.getSeasonalList().getImageUrl()); 280 seasonalCLick.setImageUrl(dataItem.getSeasonalList().getImageUrl());
281 EventBus.getDefault().post(new WarplyEventBusManager(seasonalCLick)); 281 EventBus.getDefault().post(new WarplyEventBusManager(seasonalCLick));
282 } else if (dataItem.getDataType() == 3) { 282 } else if (dataItem.getDataType() == 3) {
283 - 283 + Intent intent = new Intent(GiftsForYouActivity.this, ContextualActivity.class);
284 + intent.putExtra("ccms", dataItem.getCCMS());
285 + startActivity(intent);
284 } 286 }
285 }) 287 })
286 .doOnError(error -> { 288 .doOnError(error -> {
...@@ -412,7 +414,9 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -412,7 +414,9 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
412 seasonalCLick.setImageUrl(dataItem.getSeasonalList().getImageUrl()); 414 seasonalCLick.setImageUrl(dataItem.getSeasonalList().getImageUrl());
413 EventBus.getDefault().post(new WarplyEventBusManager(seasonalCLick)); 415 EventBus.getDefault().post(new WarplyEventBusManager(seasonalCLick));
414 } else if (dataItem.getDataType() == 3) { 416 } else if (dataItem.getDataType() == 3) {
415 - 417 + Intent intent = new Intent(GiftsForYouActivity.this, ContextualActivity.class);
418 + intent.putExtra("ccms", dataItem.getCCMS());
419 + startActivity(intent);
416 } 420 }
417 }) 421 })
418 .doOnError(error -> { 422 .doOnError(error -> {
......
...@@ -200,7 +200,9 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -200,7 +200,9 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
200 startActivity(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign()))); 200 startActivity(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())));
201 } 201 }
202 } else if (dataItem.getDataType() == 2) { 202 } else if (dataItem.getDataType() == 2) {
203 - 203 + Intent intent = new Intent(MoreForYouActivity.this, ContextualActivity.class);
204 + intent.putExtra("ccms", dataItem.getCCMS());
205 + startActivity(intent);
204 } 206 }
205 }) 207 })
206 .doOnError(error -> { 208 .doOnError(error -> {
...@@ -269,7 +271,9 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -269,7 +271,9 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
269 startActivity(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign()))); 271 startActivity(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())));
270 } 272 }
271 } else if (dataItem.getDataType() == 2) { 273 } else if (dataItem.getDataType() == 2) {
272 - 274 + Intent intent = new Intent(MoreForYouActivity.this, ContextualActivity.class);
275 + intent.putExtra("ccms", dataItem.getCCMS());
276 + startActivity(intent);
273 } 277 }
274 }) 278 })
275 .doOnError(error -> { 279 .doOnError(error -> {
......
1 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 + xmlns:app="http://schemas.android.com/apk/res-auto"
3 + xmlns:tools="http://schemas.android.com/tools"
4 + android:layout_width="match_parent"
5 + android:layout_height="match_parent"
6 + android:background="@android:color/white">
7 +
8 + <androidx.constraintlayout.widget.ConstraintLayout
9 + android:id="@+id/cl_loyalty_wallet_header"
10 + android:layout_width="match_parent"
11 + android:layout_height="50dp"
12 + android:background="@android:color/white">
13 +
14 + <ImageView
15 + android:id="@+id/iv_contextual_back"
16 + android:layout_width="20dp"
17 + android:layout_height="20dp"
18 + android:layout_marginStart="16dp"
19 + android:src="@drawable/ic_back"
20 + app:layout_constraintBottom_toBottomOf="parent"
21 + app:layout_constraintStart_toStartOf="parent"
22 + app:layout_constraintTop_toTopOf="parent" />
23 +
24 + <TextView
25 + android:layout_width="wrap_content"
26 + android:layout_height="wrap_content"
27 + android:textColor="@color/grey"
28 + android:textSize="17sp"
29 + android:textStyle="bold"
30 + app:layout_constraintBottom_toBottomOf="parent"
31 + app:layout_constraintEnd_toEndOf="parent"
32 + app:layout_constraintStart_toStartOf="parent"
33 + app:layout_constraintTop_toTopOf="parent" />
34 + </androidx.constraintlayout.widget.ConstraintLayout>
35 +
36 + <ScrollView
37 + android:layout_width="match_parent"
38 + android:layout_height="match_parent"
39 + android:fillViewport="true"
40 + android:layout_below="@+id/cl_loyalty_wallet_header">
41 +
42 + <androidx.constraintlayout.widget.ConstraintLayout
43 + android:layout_width="match_parent"
44 + android:layout_height="match_parent"
45 + android:background="@android:color/white">
46 +
47 + <androidx.constraintlayout.widget.ConstraintLayout
48 + android:id="@+id/cl_loyalty_info_view_inner"
49 + android:layout_width="match_parent"
50 + android:layout_height="match_parent"
51 + android:background="@drawable/shape_cos_loyalty_white"
52 + android:paddingBottom="48dp"
53 + app:layout_constraintEnd_toEndOf="parent"
54 + app:layout_constraintStart_toStartOf="parent"
55 + app:layout_constraintTop_toTopOf="parent">
56 +
57 + <com.github.siyamed.shapeimageview.mask.PorterShapeImageView
58 + android:id="@+id/imageView6"
59 + android:layout_width="match_parent"
60 + android:layout_height="224dp"
61 + android:layout_marginTop="4dp"
62 + android:scaleType="centerCrop"
63 + app:layout_constraintStart_toStartOf="parent"
64 + app:layout_constraintTop_toTopOf="parent"
65 + app:siShape="@drawable/shape_top_left_rounded"
66 + tools:src="@drawable/carousel_banner" />
67 +
68 + <TextView
69 + android:id="@+id/textView13"
70 + android:layout_width="match_parent"
71 + android:layout_height="wrap_content"
72 + android:layout_marginTop="32dp"
73 + android:gravity="center"
74 + android:paddingHorizontal="32dp"
75 + android:textColor="#415564"
76 + android:textSize="18sp"
77 + android:textStyle="bold"
78 + app:layout_constraintEnd_toEndOf="parent"
79 + app:layout_constraintHorizontal_bias="0.509"
80 + app:layout_constraintStart_toStartOf="parent"
81 + app:layout_constraintTop_toBottomOf="@+id/imageView6"
82 + tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" />
83 +
84 + <TextView
85 + android:id="@+id/textView14"
86 + android:layout_width="match_parent"
87 + android:layout_height="wrap_content"
88 + android:layout_marginTop="16dp"
89 + android:gravity="center"
90 + android:paddingHorizontal="32dp"
91 + android:textColor="#415564"
92 + android:textSize="16sp"
93 + tools:text="test test"
94 + app:layout_constraintEnd_toEndOf="parent"
95 + app:layout_constraintStart_toStartOf="parent"
96 + app:layout_constraintTop_toBottomOf="@+id/textView13" />
97 +
98 + <LinearLayout
99 + android:id="@+id/ll_activate_button"
100 + android:layout_width="wrap_content"
101 + android:layout_height="wrap_content"
102 + android:layout_marginHorizontal="32dp"
103 + android:background="@drawable/selector_button_green"
104 + android:gravity="center"
105 + android:orientation="horizontal"
106 + android:paddingHorizontal="16dp"
107 + android:paddingVertical="8dp"
108 + app:layout_constraintBottom_toBottomOf="parent"
109 + app:layout_constraintEnd_toEndOf="parent"
110 + app:layout_constraintStart_toStartOf="parent">
111 +
112 + <TextView
113 + android:layout_width="wrap_content"
114 + android:layout_height="wrap_content"
115 + android:gravity="center"
116 + android:text="@string/cos_dlg_positive_button"
117 + android:textColor="@color/white"
118 + android:textFontWeight="600"
119 + android:textSize="17dp" />
120 + </LinearLayout>
121 +
122 + </androidx.constraintlayout.widget.ConstraintLayout>
123 + </androidx.constraintlayout.widget.ConstraintLayout>
124 + </ScrollView>
125 +</RelativeLayout>