Merge remote-tracking branch 'origin/cosmote' into cosmote
Showing
5 changed files
with
196 additions
and
17 deletions
| 1 | package ly.warp.sdk.activities; | 1 | 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.os.Bundle; | 5 | import android.os.Bundle; |
| 5 | import android.view.View; | 6 | import android.view.View; |
| 7 | +import android.widget.Button; | ||
| 6 | import android.widget.ImageView; | 8 | import android.widget.ImageView; |
| 7 | 9 | ||
| 8 | import ly.warp.sdk.R; | 10 | import ly.warp.sdk.R; |
| ... | @@ -19,6 +21,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene | ... | @@ -19,6 +21,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene |
| 19 | // =========================================================== | 21 | // =========================================================== |
| 20 | 22 | ||
| 21 | private ImageView mIvBack; | 23 | private ImageView mIvBack; |
| 24 | + private Button mPayBtn; | ||
| 22 | 25 | ||
| 23 | // =========================================================== | 26 | // =========================================================== |
| 24 | // Methods for/from SuperClass/Interfaces | 27 | // Methods for/from SuperClass/Interfaces |
| ... | @@ -29,7 +32,8 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene | ... | @@ -29,7 +32,8 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene |
| 29 | super.onCreate(savedInstanceState); | 32 | super.onCreate(savedInstanceState); |
| 30 | setContentView(R.layout.activity_bill_payment); | 33 | setContentView(R.layout.activity_bill_payment); |
| 31 | 34 | ||
| 32 | -// mIvBack = findViewById(R.id.iv_back); | 35 | + mIvBack = findViewById(R.id.iv_bill_payment_close); |
| 36 | + mPayBtn = findViewById(R.id.button_pay); | ||
| 33 | 37 | ||
| 34 | initViews(); | 38 | initViews(); |
| 35 | } | 39 | } |
| ... | @@ -41,8 +45,11 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene | ... | @@ -41,8 +45,11 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene |
| 41 | 45 | ||
| 42 | @Override | 46 | @Override |
| 43 | public void onClick(View view) { | 47 | public void onClick(View view) { |
| 44 | - if (view.getId() == R.id.iv_back) { | 48 | + if (view.getId() == R.id.iv_bill_payment_close) { |
| 45 | - finish(); | 49 | + onBackPressed(); |
| 50 | + } else if (view.getId() == R.id.button_pay) { | ||
| 51 | + // open dialog | ||
| 52 | + showDialog(); | ||
| 46 | } | 53 | } |
| 47 | } | 54 | } |
| 48 | 55 | ||
| ... | @@ -51,9 +58,16 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene | ... | @@ -51,9 +58,16 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene |
| 51 | // =========================================================== | 58 | // =========================================================== |
| 52 | 59 | ||
| 53 | private void initViews() { | 60 | private void initViews() { |
| 54 | -// mIvBack.setOnClickListener(this); | 61 | + mIvBack.setOnClickListener(this); |
| 62 | + mPayBtn.setOnClickListener(this); | ||
| 55 | } | 63 | } |
| 56 | 64 | ||
| 65 | + private void showDialog() { | ||
| 66 | + Dialog dialog = new Dialog(this); | ||
| 67 | + dialog.setContentView(R.layout.payment_success_dialog); | ||
| 68 | + dialog.getWindow().setBackgroundDrawableResource(R.drawable.banner_border_white); | ||
| 69 | + dialog.show(); | ||
| 70 | + } | ||
| 57 | // =========================================================== | 71 | // =========================================================== |
| 58 | // Inner and Anonymous Classes | 72 | // Inner and Anonymous Classes |
| 59 | // =========================================================== | 73 | // =========================================================== | ... | ... |
| 1 | +<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | +<shape xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 3 | + <solid android:color="#91E5E6E7"/> | ||
| 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 | + <solid android:color="#FFFFFF"/> | ||
| 4 | + <stroke android:width="3dp" android:color="#FFFFFF" /> | ||
| 5 | + <corners android:radius="10dp"/> | ||
| 6 | + <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" /> | ||
| 7 | +</shape> | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | app:layout_constraintTop_toTopOf="parent"> | 13 | app:layout_constraintTop_toTopOf="parent"> |
| 14 | 14 | ||
| 15 | <ImageView | 15 | <ImageView |
| 16 | - android:id="@+id/imageView6" | 16 | + android:id="@+id/iv_bill_payment_close" |
| 17 | android:layout_width="21dp" | 17 | android:layout_width="21dp" |
| 18 | android:layout_height="20dp" | 18 | android:layout_height="20dp" |
| 19 | android:layout_marginStart="24dp" | 19 | android:layout_marginStart="24dp" |
| ... | @@ -31,7 +31,7 @@ | ... | @@ -31,7 +31,7 @@ |
| 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_constraintHorizontal_bias="0.348" | 33 | app:layout_constraintHorizontal_bias="0.348" |
| 34 | - app:layout_constraintStart_toEndOf="@+id/imageView6" | 34 | + app:layout_constraintStart_toEndOf="@+id/iv_bill_payment_close" |
| 35 | app:layout_constraintTop_toTopOf="parent" /> | 35 | app:layout_constraintTop_toTopOf="parent" /> |
| 36 | </androidx.constraintlayout.widget.ConstraintLayout> | 36 | </androidx.constraintlayout.widget.ConstraintLayout> |
| 37 | 37 | ||
| ... | @@ -71,12 +71,13 @@ | ... | @@ -71,12 +71,13 @@ |
| 71 | 71 | ||
| 72 | <EditText | 72 | <EditText |
| 73 | android:id="@+id/editTextTextPersonName" | 73 | android:id="@+id/editTextTextPersonName" |
| 74 | - android:layout_width="wrap_content" | 74 | + android:layout_width="141dp" |
| 75 | - android:layout_height="wrap_content" | 75 | + android:layout_height="52dp" |
| 76 | android:ems="10" | 76 | android:ems="10" |
| 77 | android:gravity="center_horizontal" | 77 | android:gravity="center_horizontal" |
| 78 | android:inputType="textPersonName" | 78 | android:inputType="textPersonName" |
| 79 | - android:text="Name" | 79 | + android:text="0€" |
| 80 | + android:textSize="25dp" | ||
| 80 | app:layout_constraintBottom_toBottomOf="@+id/view" | 81 | app:layout_constraintBottom_toBottomOf="@+id/view" |
| 81 | app:layout_constraintEnd_toEndOf="@+id/view" | 82 | app:layout_constraintEnd_toEndOf="@+id/view" |
| 82 | app:layout_constraintHorizontal_bias="0.475" | 83 | app:layout_constraintHorizontal_bias="0.475" |
| ... | @@ -86,22 +87,23 @@ | ... | @@ -86,22 +87,23 @@ |
| 86 | 87 | ||
| 87 | <EditText | 88 | <EditText |
| 88 | android:id="@+id/editTextTextPersonName2" | 89 | android:id="@+id/editTextTextPersonName2" |
| 89 | - android:layout_width="wrap_content" | 90 | + android:layout_width="263dp" |
| 90 | - android:layout_height="wrap_content" | 91 | + android:layout_height="54dp" |
| 91 | android:ems="10" | 92 | android:ems="10" |
| 93 | + android:hint="Αριθμός Λογαριασμού" | ||
| 92 | android:inputType="textPersonName" | 94 | android:inputType="textPersonName" |
| 93 | - android:text="Name" | 95 | + android:textSize="15dp" |
| 94 | app:layout_constraintBottom_toBottomOf="@+id/view" | 96 | app:layout_constraintBottom_toBottomOf="@+id/view" |
| 95 | app:layout_constraintEnd_toEndOf="@+id/view" | 97 | app:layout_constraintEnd_toEndOf="@+id/view" |
| 96 | - app:layout_constraintHorizontal_bias="0.482" | 98 | + app:layout_constraintHorizontal_bias="0.47" |
| 97 | app:layout_constraintStart_toStartOf="@+id/view" | 99 | app:layout_constraintStart_toStartOf="@+id/view" |
| 98 | app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName" | 100 | app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName" |
| 99 | - app:layout_constraintVertical_bias="0.277" /> | 101 | + app:layout_constraintVertical_bias="0.208" /> |
| 100 | 102 | ||
| 101 | <Button | 103 | <Button |
| 102 | - android:id="@+id/button2" | 104 | + android:id="@+id/button_pay" |
| 103 | - android:layout_width="wrap_content" | 105 | + android:layout_width="122dp" |
| 104 | - android:layout_height="wrap_content" | 106 | + android:layout_height="44dp" |
| 105 | android:layout_marginBottom="28dp" | 107 | android:layout_marginBottom="28dp" |
| 106 | android:background="@drawable/round_border_green" | 108 | android:background="@drawable/round_border_green" |
| 107 | android:text="Πληρωμή" | 109 | android:text="Πληρωμή" | ... | ... |
| 1 | +<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| 4 | + xmlns:tools="http://schemas.android.com/tools" | ||
| 5 | + android:layout_width="match_parent" | ||
| 6 | + android:layout_height="550dp" | ||
| 7 | + android:layout_gravity="center_horizontal"> | ||
| 8 | + | ||
| 9 | + <TextView | ||
| 10 | + android:id="@+id/textView5" | ||
| 11 | + android:layout_width="243dp" | ||
| 12 | + android:layout_height="55dp" | ||
| 13 | + android:layout_alignParentStart="true" | ||
| 14 | + android:layout_alignParentTop="true" | ||
| 15 | + android:layout_alignParentEnd="true" | ||
| 16 | + android:layout_marginStart="54dp" | ||
| 17 | + android:layout_marginTop="38dp" | ||
| 18 | + android:layout_marginEnd="63dp" | ||
| 19 | + android:gravity="center" | ||
| 20 | + android:text="Συγχαρητήρια!" | ||
| 21 | + android:textColor="#0072C9" | ||
| 22 | + android:textFontWeight="1000" | ||
| 23 | + android:textSize="25dp" | ||
| 24 | + app:layout_constraintTop_toTopOf="parent" | ||
| 25 | + app:layout_constraintVertical_bias="0.46" | ||
| 26 | + tools:layout_editor_absoluteX="87dp" /> | ||
| 27 | + | ||
| 28 | + <TextView | ||
| 29 | + android:id="@+id/textView6" | ||
| 30 | + android:layout_width="336dp" | ||
| 31 | + android:layout_height="42dp" | ||
| 32 | + android:layout_below="@+id/textView5" | ||
| 33 | + android:layout_alignStart="@+id/textView5" | ||
| 34 | + android:layout_alignEnd="@+id/textView5" | ||
| 35 | + android:layout_marginStart="-16dp" | ||
| 36 | + android:layout_marginTop="3dp" | ||
| 37 | + android:layout_marginEnd="-24dp" | ||
| 38 | + android:layout_marginBottom="24dp" | ||
| 39 | + android:gravity="center" | ||
| 40 | + android:text="Κέρδισες 1GB για 7 ημέρες!" | ||
| 41 | + android:textColor="#5B5B5B" | ||
| 42 | + android:textSize="18dp" /> | ||
| 43 | + | ||
| 44 | + <TextView | ||
| 45 | + android:id="@+id/textView7" | ||
| 46 | + android:layout_width="351dp" | ||
| 47 | + android:layout_height="58dp" | ||
| 48 | + android:layout_below="@+id/textView6" | ||
| 49 | + android:layout_alignStart="@+id/textView6" | ||
| 50 | + android:layout_alignEnd="@+id/textView6" | ||
| 51 | + android:layout_marginStart="-5dp" | ||
| 52 | + android:layout_marginTop="1dp" | ||
| 53 | + android:layout_marginEnd="-14dp" | ||
| 54 | + android:gravity="center" | ||
| 55 | + android:text="Για σένα που είσαι πολλά χρόνια μαζί μας έχουμε επιπλέον δώρα!" | ||
| 56 | + android:textColor="#858C96" | ||
| 57 | + android:textSize="15dp" | ||
| 58 | + tools:layout_editor_absoluteX="26dp" | ||
| 59 | + tools:layout_editor_absoluteY="177dp" /> | ||
| 60 | + | ||
| 61 | + <LinearLayout | ||
| 62 | + android:id="@+id/constraintLayout" | ||
| 63 | + android:layout_width="364dp" | ||
| 64 | + android:layout_height="56dp" | ||
| 65 | + android:layout_below="@+id/textView7" | ||
| 66 | + android:layout_alignStart="@+id/textView7" | ||
| 67 | + android:layout_alignEnd="@+id/textView7" | ||
| 68 | + android:layout_marginStart="-8dp" | ||
| 69 | + android:layout_marginTop="38dp" | ||
| 70 | + android:layout_marginEnd="-3dp" | ||
| 71 | + android:background="@drawable/banner_border_grey_bg" | ||
| 72 | + android:gravity="center_vertical"> | ||
| 73 | + | ||
| 74 | + <TextView | ||
| 75 | + android:id="@+id/textView8" | ||
| 76 | + android:layout_width="wrap_content" | ||
| 77 | + android:layout_height="wrap_content" | ||
| 78 | + android:layout_marginStart="16dp" | ||
| 79 | + android:text="Μy Lucky Day Draw" | ||
| 80 | + android:textFontWeight="800" | ||
| 81 | + android:textSize="17dp" | ||
| 82 | + app:layout_constraintBottom_toBottomOf="parent" | ||
| 83 | + app:layout_constraintStart_toStartOf="parent" | ||
| 84 | + app:layout_constraintTop_toTopOf="parent" /> | ||
| 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> | ||
| 98 | + | ||
| 99 | + <LinearLayout | ||
| 100 | + android:id="@+id/constraintLayout3" | ||
| 101 | + android:layout_width="wrap_content" | ||
| 102 | + android:layout_height="60dp" | ||
| 103 | + android:layout_below="@+id/constraintLayout" | ||
| 104 | + android:layout_alignStart="@+id/constraintLayout" | ||
| 105 | + android:layout_alignEnd="@+id/constraintLayout" | ||
| 106 | + android:layout_marginStart="1dp" | ||
| 107 | + android:layout_marginTop="33dp" | ||
| 108 | + android:layout_marginEnd="3dp" | ||
| 109 | + android:background="@drawable/banner_border_grey_bg" | ||
| 110 | + android:gravity="center_vertical" | ||
| 111 | + android:paddingHorizontal="5dp"> | ||
| 112 | + | ||
| 113 | + <TextView | ||
| 114 | + android:id="@+id/tv_cosmote_tv_pass" | ||
| 115 | + android:layout_width="match_parent" | ||
| 116 | + android:layout_height="wrap_content" | ||
| 117 | + android:layout_marginStart="16dp" | ||
| 118 | + android:text="Day Free COSMOTE TV pass στο κινητό" | ||
| 119 | + android:textSize="17dp" | ||
| 120 | + app:layout_constraintBottom_toBottomOf="parent" | ||
| 121 | + app:layout_constraintStart_toStartOf="parent" | ||
| 122 | + app:layout_constraintTop_toTopOf="parent" /> | ||
| 123 | + </LinearLayout> | ||
| 124 | + | ||
| 125 | + <LinearLayout | ||
| 126 | + android:id="@+id/constraintLayout4" | ||
| 127 | + android:layout_width="wrap_content" | ||
| 128 | + android:layout_height="59dp" | ||
| 129 | + android:layout_below="@+id/constraintLayout3" | ||
| 130 | + android:layout_alignStart="@+id/constraintLayout3" | ||
| 131 | + android:layout_alignEnd="@+id/constraintLayout3" | ||
| 132 | + android:layout_marginStart="2dp" | ||
| 133 | + android:layout_marginTop="29dp" | ||
| 134 | + android:layout_marginEnd="1dp" | ||
| 135 | + android:background="@drawable/banner_border_grey_bg" | ||
| 136 | + android:gravity="center_vertical" | ||
| 137 | + android:paddingHorizontal="5dp"> | ||
| 138 | + | ||
| 139 | + <TextView | ||
| 140 | + android:id="@+id/tv_ikea_coupon" | ||
| 141 | + android:layout_width="match_parent" | ||
| 142 | + android:layout_height="wrap_content" | ||
| 143 | + android:layout_marginStart="16dp" | ||
| 144 | + android:text="Day Free COSMOTE TV pass στο κινητό" | ||
| 145 | + android:textSize="17dp" | ||
| 146 | + app:layout_constraintBottom_toBottomOf="parent" | ||
| 147 | + app:layout_constraintStart_toStartOf="parent" | ||
| 148 | + app:layout_constraintTop_toTopOf="parent" /> | ||
| 149 | + </LinearLayout> | ||
| 150 | +</RelativeLayout> | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
-
Please register or login to post a comment