Panagiotis Triantafyllou

Merge remote-tracking branch 'origin/cosmote' into cosmote

...@@ -2,10 +2,16 @@ package ly.warp.sdk.activities; ...@@ -2,10 +2,16 @@ 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.Typeface;
5 import android.os.Bundle; 6 import android.os.Bundle;
7 +import android.text.Spannable;
8 +import android.text.SpannableString;
9 +import android.text.SpannableStringBuilder;
10 +import android.text.style.StyleSpan;
6 import android.view.View; 11 import android.view.View;
7 import android.widget.Button; 12 import android.widget.Button;
8 import android.widget.ImageView; 13 import android.widget.ImageView;
14 +import android.widget.TextView;
9 15
10 import ly.warp.sdk.R; 16 import ly.warp.sdk.R;
11 17
...@@ -22,6 +28,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene ...@@ -22,6 +28,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene
22 28
23 private ImageView mIvBack; 29 private ImageView mIvBack;
24 private Button mPayBtn; 30 private Button mPayBtn;
31 + private TextView mTvLuckyDraw;
25 32
26 // =========================================================== 33 // ===========================================================
27 // Methods for/from SuperClass/Interfaces 34 // Methods for/from SuperClass/Interfaces
...@@ -69,6 +76,19 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene ...@@ -69,6 +76,19 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene
69 dialog.setContentView(R.layout.payment_success_dialog); 76 dialog.setContentView(R.layout.payment_success_dialog);
70 dialog.getWindow().setBackgroundDrawableResource(R.drawable.banner_border_white); 77 dialog.getWindow().setBackgroundDrawableResource(R.drawable.banner_border_white);
71 dialog.show(); 78 dialog.show();
79 +
80 + mTvLuckyDraw = dialog.findViewById(R.id.tv_lucky_draw);
81 +
82 + SpannableStringBuilder builder = new SpannableStringBuilder();
83 + String s1= "My Lucky Day Draw";
84 + String s2= " 10 συμμετοχές αντί για 1";
85 + SpannableString ss1= new SpannableString(s1);
86 + ss1.setSpan(new StyleSpan(Typeface.BOLD), 0, s1.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); // set size
87 + ss1.setSpan("#3A5266", 0, s1.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);// set color
88 +
89 + builder.append(ss1);
90 + builder.append(s2);
91 + mTvLuckyDraw.setText(builder, TextView.BufferType.SPANNABLE);
72 } 92 }
73 // =========================================================== 93 // ===========================================================
74 // Inner and Anonymous Classes 94 // Inner and Anonymous Classes
......
...@@ -28,9 +28,12 @@ ...@@ -28,9 +28,12 @@
28 android:layout_height="32dp" 28 android:layout_height="32dp"
29 android:gravity="center" 29 android:gravity="center"
30 android:text="Πληρωμή Λογαριασμού" 30 android:text="Πληρωμή Λογαριασμού"
31 + android:textColor="@color/grey"
32 + android:textSize="17sp"
33 + android:textStyle="bold"
31 app:layout_constraintBottom_toBottomOf="parent" 34 app:layout_constraintBottom_toBottomOf="parent"
32 app:layout_constraintEnd_toEndOf="parent" 35 app:layout_constraintEnd_toEndOf="parent"
33 - app:layout_constraintHorizontal_bias="0.348" 36 + app:layout_constraintHorizontal_bias="0.356"
34 app:layout_constraintStart_toEndOf="@+id/iv_bill_payment_close" 37 app:layout_constraintStart_toEndOf="@+id/iv_bill_payment_close"
35 app:layout_constraintTop_toTopOf="parent" /> 38 app:layout_constraintTop_toTopOf="parent" />
36 </androidx.constraintlayout.widget.ConstraintLayout> 39 </androidx.constraintlayout.widget.ConstraintLayout>
......
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
60 60
61 <LinearLayout 61 <LinearLayout
62 android:id="@+id/constraintLayout" 62 android:id="@+id/constraintLayout"
63 - android:layout_width="364dp" 63 + android:layout_width="wrap_content"
64 - android:layout_height="56dp" 64 + android:layout_height="54dp"
65 android:layout_below="@+id/textView7" 65 android:layout_below="@+id/textView7"
66 android:layout_alignStart="@+id/textView7" 66 android:layout_alignStart="@+id/textView7"
67 android:layout_alignEnd="@+id/textView7" 67 android:layout_alignEnd="@+id/textView7"
...@@ -72,28 +72,17 @@ ...@@ -72,28 +72,17 @@
72 android:gravity="center_vertical"> 72 android:gravity="center_vertical">
73 73
74 <TextView 74 <TextView
75 - android:id="@+id/textView8" 75 + android:id="@+id/tv_lucky_draw"
76 android:layout_width="wrap_content" 76 android:layout_width="wrap_content"
77 android:layout_height="wrap_content" 77 android:layout_height="wrap_content"
78 android:layout_marginStart="16dp" 78 android:layout_marginStart="16dp"
79 android:text="Μy Lucky Day Draw" 79 android:text="Μy Lucky Day Draw"
80 - android:textFontWeight="800"
81 android:textSize="17dp" 80 android:textSize="17dp"
81 + android:gravity="center"
82 app:layout_constraintBottom_toBottomOf="parent" 82 app:layout_constraintBottom_toBottomOf="parent"
83 app:layout_constraintStart_toStartOf="parent" 83 app:layout_constraintStart_toStartOf="parent"
84 app:layout_constraintTop_toTopOf="parent" /> 84 app:layout_constraintTop_toTopOf="parent" />
85 85
86 - <TextView
87 - android:id="@+id/textView9"
88 - android:layout_width="wrap_content"
89 - android:layout_height="wrap_content"
90 - android:text=" 10 συμμετοχές αντί για 1"
91 - android:textColor="#3A5266"
92 - app:layout_constraintBottom_toBottomOf="@+id/textView8"
93 - app:layout_constraintEnd_toEndOf="parent"
94 - app:layout_constraintHorizontal_bias="0.428"
95 - app:layout_constraintStart_toEndOf="@+id/textView8"
96 - app:layout_constraintTop_toTopOf="@+id/textView8" />
97 </LinearLayout> 86 </LinearLayout>
98 87
99 <LinearLayout 88 <LinearLayout
...@@ -117,6 +106,7 @@ ...@@ -117,6 +106,7 @@
117 android:layout_marginStart="16dp" 106 android:layout_marginStart="16dp"
118 android:text="Day Free COSMOTE TV pass στο κινητό" 107 android:text="Day Free COSMOTE TV pass στο κινητό"
119 android:textSize="17dp" 108 android:textSize="17dp"
109 + android:gravity="center"
120 app:layout_constraintBottom_toBottomOf="parent" 110 app:layout_constraintBottom_toBottomOf="parent"
121 app:layout_constraintStart_toStartOf="parent" 111 app:layout_constraintStart_toStartOf="parent"
122 app:layout_constraintTop_toTopOf="parent" /> 112 app:layout_constraintTop_toTopOf="parent" />
...@@ -143,6 +133,7 @@ ...@@ -143,6 +133,7 @@
143 android:layout_marginStart="16dp" 133 android:layout_marginStart="16dp"
144 android:text="Δωρεάν κουπόνι ΙΚΕΑ αξίας 10€" 134 android:text="Δωρεάν κουπόνι ΙΚΕΑ αξίας 10€"
145 android:textSize="17dp" 135 android:textSize="17dp"
136 + android:gravity="center"
146 app:layout_constraintBottom_toBottomOf="parent" 137 app:layout_constraintBottom_toBottomOf="parent"
147 app:layout_constraintStart_toStartOf="parent" 138 app:layout_constraintStart_toStartOf="parent"
148 app:layout_constraintTop_toTopOf="parent" /> 139 app:layout_constraintTop_toTopOf="parent" />
......