Showing
4 changed files
with
23 additions
and
15 deletions
| ... | @@ -33,7 +33,7 @@ public class CouponTransactionActivity extends Activity implements View.OnClickL | ... | @@ -33,7 +33,7 @@ public class CouponTransactionActivity extends Activity implements View.OnClickL |
| 33 | super.onCreate(savedInstanceState); | 33 | super.onCreate(savedInstanceState); |
| 34 | setContentView(R.layout.activity_coupons_history); | 34 | setContentView(R.layout.activity_coupons_history); |
| 35 | 35 | ||
| 36 | -// mIvBack = findViewById(R.id.iv_coupon_info_back); | 36 | + mIvBack = findViewById(R.id.iv_transactions_close); |
| 37 | 37 | ||
| 38 | initViews(); | 38 | initViews(); |
| 39 | } | 39 | } |
| ... | @@ -45,9 +45,8 @@ public class CouponTransactionActivity extends Activity implements View.OnClickL | ... | @@ -45,9 +45,8 @@ public class CouponTransactionActivity extends Activity implements View.OnClickL |
| 45 | 45 | ||
| 46 | @Override | 46 | @Override |
| 47 | public void onClick(View view) { | 47 | public void onClick(View view) { |
| 48 | - if (view.getId() == R.id.iv_coupon_info_back) { | 48 | + if (view.getId() == R.id.iv_transactions_close) { |
| 49 | onBackPressed(); | 49 | onBackPressed(); |
| 50 | - return; | ||
| 51 | } | 50 | } |
| 52 | 51 | ||
| 53 | } | 52 | } |
| ... | @@ -57,7 +56,7 @@ public class CouponTransactionActivity extends Activity implements View.OnClickL | ... | @@ -57,7 +56,7 @@ public class CouponTransactionActivity extends Activity implements View.OnClickL |
| 57 | // =========================================================== | 56 | // =========================================================== |
| 58 | 57 | ||
| 59 | private void initViews() { | 58 | private void initViews() { |
| 60 | -// mIvBack.setOnClickListener(this); | 59 | + mIvBack.setOnClickListener(this); |
| 61 | 60 | ||
| 62 | } | 61 | } |
| 63 | 62 | ... | ... |
| 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="14dp"/> | ||
| 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 |
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | -<RelativeLayout xmlns:app="http://schemas.android.com/apk/res-auto" | 2 | +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| 3 | xmlns:tools="http://schemas.android.com/tools" | 4 | xmlns:tools="http://schemas.android.com/tools" |
| 4 | android:id="@+id/cl_bill_payment" | 5 | android:id="@+id/cl_bill_payment" |
| 5 | android:layout_width="match_parent" | 6 | android:layout_width="match_parent" |
| 6 | - android:layout_height="match_parent" | 7 | + android:layout_height="match_parent"> |
| 7 | - xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 8 | 8 | ||
| 9 | <androidx.constraintlayout.widget.ConstraintLayout | 9 | <androidx.constraintlayout.widget.ConstraintLayout |
| 10 | android:id="@+id/cl_bill_header" | 10 | android:id="@+id/cl_bill_header" |
| ... | @@ -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/iv_bill_payment_close" | 16 | + android:id="@+id/iv_transactions_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" |
| ... | @@ -34,7 +34,7 @@ | ... | @@ -34,7 +34,7 @@ |
| 34 | app:layout_constraintBottom_toBottomOf="parent" | 34 | app:layout_constraintBottom_toBottomOf="parent" |
| 35 | app:layout_constraintEnd_toEndOf="parent" | 35 | app:layout_constraintEnd_toEndOf="parent" |
| 36 | app:layout_constraintHorizontal_bias="0.348" | 36 | app:layout_constraintHorizontal_bias="0.348" |
| 37 | - app:layout_constraintStart_toEndOf="@+id/iv_bill_payment_close" | 37 | + app:layout_constraintStart_toEndOf="@+id/iv_transactions_close" |
| 38 | app:layout_constraintTop_toTopOf="parent" /> | 38 | app:layout_constraintTop_toTopOf="parent" /> |
| 39 | </androidx.constraintlayout.widget.ConstraintLayout> | 39 | </androidx.constraintlayout.widget.ConstraintLayout> |
| 40 | 40 | ||
| ... | @@ -51,9 +51,10 @@ | ... | @@ -51,9 +51,10 @@ |
| 51 | <include | 51 | <include |
| 52 | android:id="@+id/cl_tab_analysis" | 52 | android:id="@+id/cl_tab_analysis" |
| 53 | layout="@layout/tab_analysis_grey_bg" | 53 | layout="@layout/tab_analysis_grey_bg" |
| 54 | - android:layout_width="323dp" | 54 | + android:layout_width="match_parent" |
| 55 | android:layout_height="25dp" | 55 | android:layout_height="25dp" |
| 56 | android:layout_marginTop="40dp" | 56 | android:layout_marginTop="40dp" |
| 57 | + android:layout_marginHorizontal="24dp" | ||
| 57 | app:layout_constraintEnd_toEndOf="parent" | 58 | app:layout_constraintEnd_toEndOf="parent" |
| 58 | app:layout_constraintHorizontal_bias="0.511" | 59 | app:layout_constraintHorizontal_bias="0.511" |
| 59 | app:layout_constraintStart_toStartOf="parent" | 60 | app:layout_constraintStart_toStartOf="parent" |
| ... | @@ -62,8 +63,9 @@ | ... | @@ -62,8 +63,9 @@ |
| 62 | <include | 63 | <include |
| 63 | android:id="@+id/cl_transaction" | 64 | android:id="@+id/cl_transaction" |
| 64 | layout="@layout/coupon_transaction" | 65 | layout="@layout/coupon_transaction" |
| 65 | - android:layout_width="324dp" | 66 | + android:layout_width="match_parent" |
| 66 | - android:layout_height="117dp" | 67 | + android:layout_height="wrap_content" |
| 68 | + android:layout_marginHorizontal="16dp" | ||
| 67 | android:layout_marginTop="48dp" | 69 | android:layout_marginTop="48dp" |
| 68 | app:layout_constraintEnd_toEndOf="parent" | 70 | app:layout_constraintEnd_toEndOf="parent" |
| 69 | app:layout_constraintStart_toStartOf="parent" | 71 | app:layout_constraintStart_toStartOf="parent" | ... | ... |
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | xmlns:app="http://schemas.android.com/apk/res-auto" | 3 | xmlns:app="http://schemas.android.com/apk/res-auto" |
| 4 | - xmlns:tools="http://schemas.android.com/tools" | ||
| 5 | android:id="@+id/cl_transcation_item" | 4 | android:id="@+id/cl_transcation_item" |
| 6 | android:layout_width="match_parent" | 5 | android:layout_width="match_parent" |
| 7 | android:layout_height="match_parent" | 6 | android:layout_height="match_parent" |
| 8 | - android:paddingVertical="5dp" | 7 | + android:background="@drawable/banner_border_white3" |
| 9 | - android:background="@drawable/banner_border_white"> | 8 | + android:paddingVertical="5dp"> |
| 10 | 9 | ||
| 11 | <androidx.constraintlayout.widget.Guideline | 10 | <androidx.constraintlayout.widget.Guideline |
| 12 | android:id="@+id/gl_vertical_5_percent" | 11 | android:id="@+id/gl_vertical_5_percent" |
| ... | @@ -58,6 +57,7 @@ | ... | @@ -58,6 +57,7 @@ |
| 58 | android:layout_marginTop="12dp" | 57 | android:layout_marginTop="12dp" |
| 59 | android:text="26-11-2021" | 58 | android:text="26-11-2021" |
| 60 | android:textColor="#82355168" | 59 | android:textColor="#82355168" |
| 60 | + android:textSize="12dp" | ||
| 61 | app:layout_constraintEnd_toEndOf="parent" | 61 | app:layout_constraintEnd_toEndOf="parent" |
| 62 | app:layout_constraintHorizontal_bias="0.952" | 62 | app:layout_constraintHorizontal_bias="0.952" |
| 63 | app:layout_constraintStart_toStartOf="parent" | 63 | app:layout_constraintStart_toStartOf="parent" | ... | ... |
-
Please register or login to post a comment