Panagiotis Triantafyllou

coupon activity fixes

......@@ -30,7 +30,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_bill_payment);
setContentView(R.layout.activity_bill_payment);
mIvBack = findViewById(R.id.iv_bill_payment_close);
mPayBtn = findViewById(R.id.button_pay);
......@@ -47,9 +47,11 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene
public void onClick(View view) {
if (view.getId() == R.id.iv_bill_payment_close) {
onBackPressed();
} else if (view.getId() == R.id.button_pay) {
return;
}
if (view.getId() == R.id.button_pay) {
// open dialog
showDialog();
showDialog();
}
}
......
......@@ -2,10 +2,12 @@ package ly.warp.sdk.activities;
import android.app.Activity;
import android.app.Dialog;
import android.graphics.Paint;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import ly.warp.sdk.R;
......@@ -21,6 +23,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
// ===========================================================
private ImageView mIvBack;
private TextView mTvTerms;
// ===========================================================
// Methods for/from SuperClass/Interfaces
......@@ -32,6 +35,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
setContentView(R.layout.activity_coupon_info);
mIvBack = findViewById(R.id.iv_coupon_info_back);
mTvTerms = findViewById(R.id.tv_terms);
initViews();
}
......@@ -54,6 +58,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
private void initViews() {
mIvBack.setOnClickListener(this);
mTvTerms.setPaintFlags(mTvTerms.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
}
// ===========================================================
......
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white">
......@@ -42,8 +41,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
android:paddingTop="5dp">
android:background="@android:color/white">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_loyalty_info_view_inner"
......@@ -57,19 +55,24 @@
<ImageView
android:id="@+id/imageView6"
android:layout_width="444dp"
android:layout_width="match_parent"
android:layout_height="224dp"
android:scaleType="fitXY"
android:clipToOutline="true"
android:scaleType="centerCrop"
android:src="@drawable/carousel_banner"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView13"
android:layout_width="320dp"
android:layout_height="43dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:paddingHorizontal="32dp"
android:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!"
android:textColor="#415564"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.509"
app:layout_constraintStart_toStartOf="parent"
......@@ -77,10 +80,13 @@
<TextView
android:id="@+id/textView14"
android:layout_width="324dp"
android:layout_height="52dp"
android:layout_marginTop="32dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:paddingHorizontal="32dp"
android:text="Χρησιμοποίησε τον παρακάτω κωδικό και πάρε δωρεάν πακέτο πάνες Pampers αποκλειστικά στα Supermarket Σκλαβενίτης"
android:textColor="#415564"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView13" />
......@@ -89,8 +95,11 @@
android:id="@+id/textView15"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginTop="48dp"
android:text="Κωδικός Κουπονιού"
android:textColor="#415564"
android:textFontWeight="600"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
......@@ -98,16 +107,17 @@
<TextView
android:id="@+id/textView16"
android:layout_width="320dp"
android:layout_height="53dp"
android:layout_marginTop="20dp"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="12dp"
android:background="@drawable/banner_border_light_blue"
android:gravity="center"
android:text="1A2C378"
android:textFontWeight="1000"
android:textColor="#415564"
android:textSize="25dp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.483"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView15" />
......@@ -115,34 +125,23 @@
android:id="@+id/textView17"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="24dp"
android:text="Το κουπόνι ισχύει έως 05/12/2022"
android:textColor="#415564"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView16" />
<TextView
android:id="@+id/textView18"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="Όροι χρήσης"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_get_gift" />
<LinearLayout
android:id="@+id/ll_gift_it"
android:layout_width="318dp"
android:layout_height="52dp"
android:layout_marginTop="68dp"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="64dp"
android:background="@drawable/button_border_dark_blue"
android:clickable="true"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.494"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView17">
......@@ -151,7 +150,6 @@
android:layout_height="25dp"
android:layout_marginRight="15dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:src="@drawable/phone_white" />
<TextView
......@@ -160,16 +158,17 @@
android:gravity="center"
android:text="Κάντο δώρο!"
android:textColor="@color/white"
android:textSize="17dp" />
android:textSize="17dp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_get_gift"
android:layout_width="318dp"
android:layout_height="52dp"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="24dp"
android:background="@drawable/shape_cos_gradient2"
android:clickable="true"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
......@@ -183,9 +182,23 @@
android:gravity="center"
android:text="Πάρε το δώρο σου"
android:textColor="@color/white"
android:textSize="17dp" />
android:textSize="17dp"
android:textStyle="bold" />
</LinearLayout>
<TextView
android:id="@+id/tv_terms"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="Όροι χρήσης"
android:textColor="#415564"
android:textFontWeight="600"
android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_get_gift" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
......