diff --git a/.idea/ChatHistory_schema_v3.xml b/.idea/ChatHistory_schema_v3.xml
index 41ae4df..7b3ccdf 100644
--- a/.idea/ChatHistory_schema_v3.xml
+++ b/.idea/ChatHistory_schema_v3.xml
@@ -5,15 +5,27 @@
-
+
\ No newline at end of file
diff --git a/app/.gitignore b/app/.gitignore
index 42afabf..39bd49c 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,28 @@
-/build
\ No newline at end of file
+/build
+
+# Built files
+*.apk
+*.aab
+*.dex
+*.class
+
+# Gradle
+.gradle/
+build/
+*/build/
+
+# Android Studio
+*.iml
+.idea/
+local.properties
+
+# Keystore
+*.jks
+*.keystore
+
+# OS files
+.DS_Store
+Thumbs.db
+
+# Logs
+*.log
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 66c5082..77707cf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
applicationId "com.utsmm.kbz"
minSdk 24
targetSdk 33
- versionCode 3
- versionName "1.03"
+ versionCode 4
+ versionName "1.04"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index b1364d1..a478df0 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm
index 123ff7a..106ac62 100644
Binary files a/app/release/baselineProfiles/0/app-release.dm and b/app/release/baselineProfiles/0/app-release.dm differ
diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm
index 843ed04..ab2a508 100644
Binary files a/app/release/baselineProfiles/1/app-release.dm and b/app/release/baselineProfiles/1/app-release.dm differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 8ec6ce5..90fbf64 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
- "versionCode": 3,
- "versionName": "1.03",
+ "versionCode": 4,
+ "versionName": "1.04",
"outputFile": "app-release.apk"
}
],
diff --git a/app/src/main/java/com/utsmm/kbz/ui/adapters/MyBindingAdapter.java b/app/src/main/java/com/utsmm/kbz/ui/adapters/MyBindingAdapter.java
index b0e6ed1..0132cbe 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/adapters/MyBindingAdapter.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/adapters/MyBindingAdapter.java
@@ -143,7 +143,7 @@ public class MyBindingAdapter {
imgURL = R.drawable.logo_mpu;
break;
case "WALLET":
- imgURL = R.drawable.logo_wave;
+ imgURL = R.drawable.logo_kpay;
break;
default:
imgURL = R.drawable.logo_unk;
@@ -293,7 +293,7 @@ public class MyBindingAdapter {
@SuppressLint("SetTextI18n")
@BindingAdapter({"isTrace"})
public static void checkIsTraceOrInvoice(TextView textView, PayDetail payDetail) {
- if(payDetail.getTransactionType() == TransactionsType.MMQR.value || payDetail.getTransactionType() == TransactionsType.WAVEPAY_REFUND.value) {
+ if(payDetail.getTransactionType() == TransactionsType.MMQR.value || payDetail.getTransactionType() == TransactionsType.MMQR_REFUND.value) {
textView.setText("INV:"+payDetail.getInvoiceNo());
} else {
textView.setText("TRC:"+payDetail.getVoucherNo());
diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputAmountFragment.java b/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputAmountFragment.java
index f6473bc..67a7fa4 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputAmountFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputAmountFragment.java
@@ -12,6 +12,7 @@ import com.utsmyanmar.baselib.util.DataBindingConfig;
import com.utsmyanmar.baselib.util.TimeoutCallback;
import com.utsmyanmar.paylibs.utils.POSUtil;
import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation;
+import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsSettings;
import com.utsmyanmar.paylibs.utils.enums.InvalidAmount;
import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType;
import com.utsmm.kbz.BR;
@@ -173,7 +174,7 @@ public class InputAmountFragment extends DataBindingFragment implements DataBind
}
-
+
}
@@ -202,14 +203,27 @@ public class InputAmountFragment extends DataBindingFragment implements DataBind
public void onConfirm(){
if(isInputValid(Objects.requireNonNull(inputAmountViewModel.inputAmountView.getValue()))){
inputAmountViewModel.invalidAmountMsg.setValue("");
- /*
- * SMILE requested to add ".00" even they type non decimal amount...
- * 23/09/2024
- * */
- if(!inputAmountViewModel.inputAmountView.getValue().contains(".")) {
- sharedViewModel.amount.setValue(inputAmountViewModel.inputAmountView.getValue()+".00");
+
+ boolean decimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable();
+ String inputValue = inputAmountViewModel.inputAmountView.getValue();
+
+ if (decimalEnabled) {
+ // SMILE requested to add ".00" even they type non decimal amount...
+ // 23/09/2024
+ if (!inputValue.contains(".")) {
+ sharedViewModel.amount.setValue(inputValue + ".00");
+ } else {
+ sharedViewModel.amount.setValue(inputValue);
+ }
} else {
- sharedViewModel.amount.setValue(inputAmountViewModel.inputAmountView.getValue());
+ // If decimal is not enabled, only allow integer values.
+ if (inputValue.contains(".")) {
+ // Show error if decimals are entered when disabled
+ showSingleInfoDialog("Decimal values are not allowed.");
+ return;
+ } else {
+ sharedViewModel.amount.setValue(inputValue);
+ }
}
observeRouteId(false);
diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_ui/PrintReceiptFragment.java b/app/src/main/java/com/utsmm/kbz/ui/core_ui/PrintReceiptFragment.java
index b321e44..047fae7 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/core_ui/PrintReceiptFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_ui/PrintReceiptFragment.java
@@ -81,7 +81,7 @@ public class PrintReceiptFragment extends DataBindingFragment implements DataBin
PayDetail payDetail = sharedViewModel.payDetail.getValue();
- if(payDetail != null && !payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_APPROVED) && !payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_ACCEPT) && sharedViewModel.transactionsType.getValue() != TransactionsType.MMQR && sharedViewModel.transactionsType.getValue() != TransactionsType.WAVEPAY_REFUND && sharedViewModel.transactionsType.getValue() != TransactionsType.MMQR_INQUIRY_STATUS) {
+ if(payDetail != null && !payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_APPROVED) && !payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_ACCEPT) && sharedViewModel.transactionsType.getValue() != TransactionsType.MMQR && sharedViewModel.transactionsType.getValue() != TransactionsType.MMQR_REFUND && sharedViewModel.transactionsType.getValue() != TransactionsType.MMQR_INQUIRY_STATUS) {
navigateNextScreen();
}
diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_ui/ReceiptFragment.java b/app/src/main/java/com/utsmm/kbz/ui/core_ui/ReceiptFragment.java
index d907813..958b0cc 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/core_ui/ReceiptFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_ui/ReceiptFragment.java
@@ -96,7 +96,7 @@ public class ReceiptFragment extends DataBindingFragment {
}
SystemParamsOperation systemParamsOperation = SystemParamsOperation.getInstance();
// Load sample bank logo
- data.bankLogo = BitmapFactory.decodeResource(getResources(), R.drawable.weeny_pos_white_banner);
+ data.bankLogo = BitmapFactory.decodeResource(getResources(), R.drawable.logo_kbzbank);
// Set sample data
data.bankName = "YOUR BANK";
diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_ui/TransactionResultFragment.java b/app/src/main/java/com/utsmm/kbz/ui/core_ui/TransactionResultFragment.java
index e127a55..338a80b 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/core_ui/TransactionResultFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_ui/TransactionResultFragment.java
@@ -185,18 +185,18 @@ public class TransactionResultFragment extends DataBindingFragment implements Da
private boolean isNonWavepayTransaction(TransactionsType transactionType) {
return transactionType != TransactionsType.MMQR &&
transactionType != TransactionsType.MMQR_INQUIRY_STATUS &&
- transactionType != TransactionsType.WAVEPAY_REFUND;
+ transactionType != TransactionsType.MMQR_REFUND;
}
private boolean isWavePayNonSuccessTransaction(TransactionsType transactionType, PayDetail payDetail) {
return (transactionType == TransactionsType.MMQR && payDetail.getQrTransStatus() != 1) ||
(transactionType == TransactionsType.MMQR_INQUIRY_STATUS && payDetail.getQrTransStatus() != 1) ||
- (transactionType == TransactionsType.WAVEPAY_REFUND && payDetail.getQrTransStatus() != 1);
+ (transactionType == TransactionsType.MMQR_REFUND && payDetail.getQrTransStatus() != 1);
}
private boolean isWavePaySuccessTransaction(TransactionsType transactionType, PayDetail payDetail) {
- return (transactionType == TransactionsType.MMQR || transactionType == TransactionsType.WAVEPAY_REFUND) &&
+ return (transactionType == TransactionsType.MMQR || transactionType == TransactionsType.MMQR_REFUND) &&
payDetail.getQrTransStatus() == 1;
}
diff --git a/app/src/main/java/com/utsmm/kbz/ui/kpay/QRRefundFragment.java b/app/src/main/java/com/utsmm/kbz/ui/kpay/QRRefundFragment.java
index c36ea06..f0a9f8d 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/kpay/QRRefundFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/kpay/QRRefundFragment.java
@@ -28,8 +28,6 @@ import com.utsmm.kbz.util.DecimalDigitsInputFilter;
import com.utsmm.kbz.util.TransactionUtil;
import com.utsmm.kbz.util.ecr.CoreUtils;
-import java.util.Locale;
-
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.disposables.CompositeDisposable;
import io.reactivex.rxjava3.disposables.Disposable;
@@ -126,7 +124,7 @@ public class QRRefundFragment extends DataBindingFragment {
}
private void initData() {
- payDetail = TransactionUtil.getInstance().initWalletTransaction(TransactionsType.WAVEPAY_REFUND);
+ payDetail = TransactionUtil.getInstance().initWalletTransaction(TransactionsType.MMQR_REFUND);
payDetail.setInvoiceNo(SystemParamsOperation.getInstance().getIncrementInvoiceNum());
}
@@ -169,7 +167,7 @@ public class QRRefundFragment extends DataBindingFragment {
.subscribe(
response -> {
dismissLoadingDialog();
- handleRefundResponse(response, referenceNo, refundAmount);
+ handleRefundResponse(response, referenceNo);
},
throwable -> {
dismissLoadingDialog();
@@ -184,10 +182,12 @@ public class QRRefundFragment extends DataBindingFragment {
refundDisposable.add(refundDi);
}
- private void handleRefundResponse(KPayRefund.RefundResponse response, String referenceNo, String refundAmount) {
+ private void handleRefundResponse(KPayRefund.RefundResponse response, String referenceNo) {
if (response != null && response.getResponse() != null && "REFUND_SUCCESS".equalsIgnoreCase(response.getResponse().getRefundStatus())) {
LogUtil.d(TAG, "Refund successful!");
+ String refundAmount = response.getResponse().getRefundAmount();
+
String dateTime = SystemDateTime.getTodayDateFormat() + " " + SystemDateTime.getTodayTimeFormat();
payDetail.setAmount(refundAmount == null ? 0 : POSUtil.getInstance().convertAmount(refundAmount));
payDetail.setOriginalTransDate(dateTime);
diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/DetailReportFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/DetailReportFragment.java
index 5379887..c9af596 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/management/DetailReportFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/management/DetailReportFragment.java
@@ -152,7 +152,7 @@ public class DetailReportFragment extends DataBindingFragment {
if(sharedViewModel.hostType.getValue() == HostType.MPU) {
- if(payDetail.getAccountType().equals("MPU") && payDetail.getTransactionType() != TransactionsType.WAVEPAY_REFUND.value && payDetail.getTransactionType() != TransactionsType.MMQR.value && payDetail.getTransactionType() != TransactionsType.REVERSAL.value && payDetail.getTransactionType() != TransactionsType.SETTLEMENT.value && POSUtil.getInstance().getYesterdayDate().compareTo(POSUtil.getInstance().getDateByString(payDetail.transDate)) < 1) {
+ if(payDetail.getAccountType().equals("MPU") && payDetail.getTransactionType() != TransactionsType.MMQR_REFUND.value && payDetail.getTransactionType() != TransactionsType.MMQR.value && payDetail.getTransactionType() != TransactionsType.REVERSAL.value && payDetail.getTransactionType() != TransactionsType.SETTLEMENT.value && POSUtil.getInstance().getYesterdayDate().compareTo(POSUtil.getInstance().getDateByString(payDetail.transDate)) < 1) {
boolean isNeedMinusSign = payDetail.getTransactionType() == TransactionsType.VOID.value || payDetail.getTransactionType() == TransactionsType.REFUND.value;
lists.add(payDetail);
count++;
@@ -164,8 +164,8 @@ public class DetailReportFragment extends DataBindingFragment {
}
} else if(sharedViewModel.hostType.getValue() == HostType.QR) {
- if( (payDetail.getTransactionType() == TransactionsType.MMQR.value || payDetail.getTransactionType() == TransactionsType.WAVEPAY_REFUND.value ) && payDetail.getQrTransStatus() == 1 && POSUtil.getInstance().getYesterdayDate().compareTo(POSUtil.getInstance().getDateByString(payDetail.transDate)) < 1 ) {
- boolean isNeedMinusSign = payDetail.getTransactionType() == TransactionsType.WAVEPAY_REFUND.value;
+ if( (payDetail.getTransactionType() == TransactionsType.MMQR.value || payDetail.getTransactionType() == TransactionsType.MMQR_REFUND.value ) && payDetail.getQrTransStatus() == 1 && POSUtil.getInstance().getYesterdayDate().compareTo(POSUtil.getInstance().getDateByString(payDetail.transDate)) < 1 ) {
+ boolean isNeedMinusSign = payDetail.getTransactionType() == TransactionsType.MMQR_REFUND.value;
lists.add(payDetail);
count++;
if(isNeedMinusSign) {
@@ -176,7 +176,7 @@ public class DetailReportFragment extends DataBindingFragment {
}
} if(sharedViewModel.hostType.getValue() == HostType.VISA_MASTER) {
- if(!payDetail.getAccountType().equals("MPU") && payDetail.getTransactionType() != TransactionsType.WAVEPAY_REFUND.value && payDetail.getTransactionType() != TransactionsType.MMQR.value && payDetail.getTransactionType() != TransactionsType.REVERSAL.value && payDetail.getTransactionType() != TransactionsType.SETTLEMENT.value && POSUtil.getInstance().getYesterdayDate().compareTo(POSUtil.getInstance().getDateByString(payDetail.transDate)) < 1) {
+ if(!payDetail.getAccountType().equals("MPU") && payDetail.getTransactionType() != TransactionsType.MMQR_REFUND.value && payDetail.getTransactionType() != TransactionsType.MMQR.value && payDetail.getTransactionType() != TransactionsType.REVERSAL.value && payDetail.getTransactionType() != TransactionsType.SETTLEMENT.value && POSUtil.getInstance().getYesterdayDate().compareTo(POSUtil.getInstance().getDateByString(payDetail.transDate)) < 1) {
boolean isNeedMinusSign = payDetail.getTransactionType() == TransactionsType.VOID.value || payDetail.getTransactionType() == TransactionsType.REFUND.value;
lists.add(payDetail);
count++;
diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java
index 49deecc..4a86eca 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java
@@ -94,7 +94,7 @@ public class ManagementFunctionFragment extends DataBindingFragment {
} else if(payDetail.getTransactionType() == TransactionsType.MMQR.value && payDetail.getQrTransStatus() != 1) {
navigateToNotFoundScreen();
return;
- } else if(payDetail.getTransactionType() == TransactionsType.WAVEPAY_REFUND.value && payDetail.getQrTransStatus() != 1) {
+ } else if(payDetail.getTransactionType() == TransactionsType.MMQR_REFUND.value && payDetail.getQrTransStatus() != 1) {
navigateToNotFoundScreen();
return;
}
diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/ReprintAnyTransactionFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/ReprintAnyTransactionFragment.java
index 3dcec3c..db03233 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/management/ReprintAnyTransactionFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/management/ReprintAnyTransactionFragment.java
@@ -313,18 +313,18 @@ public class ReprintAnyTransactionFragment extends DataBindingFragment {
// April 2, 2024 client requested to add QR host at host selection type
if(sharedViewModel.hostType.getValue() == HostType.MPU) {
- if(pay.getAccountType().equals("MPU") && pay.getTransactionType() != TransactionsType.MMQR.value && pay.getTransactionType() != TransactionsType.WAVEPAY_REFUND.value) {
+ if(pay.getAccountType().equals("MPU") && pay.getTransactionType() != TransactionsType.MMQR.value && pay.getTransactionType() != TransactionsType.MMQR_REFUND.value) {
filteredLists.add(pay);
}
} else if(sharedViewModel.hostType.getValue() == HostType.QR) {
- if(pay.getTransactionType() == TransactionsType.MMQR.value || pay.getTransactionType() == TransactionsType.WAVEPAY_REFUND.value) {
+ if(pay.getTransactionType() == TransactionsType.MMQR.value || pay.getTransactionType() == TransactionsType.MMQR_REFUND.value) {
if(pay.getQrTransStatus() == 1) {
filteredLists.add(pay);
}
}
} else if(sharedViewModel.hostType.getValue() == HostType.VISA_MASTER) {
- if(!pay.getAccountType().equals("MPU") && pay.getTransactionType() != TransactionsType.MMQR.value && pay.getTransactionType() != TransactionsType.WAVEPAY_REFUND.value) {
+ if(!pay.getAccountType().equals("MPU") && pay.getTransactionType() != TransactionsType.MMQR.value && pay.getTransactionType() != TransactionsType.MMQR_REFUND.value) {
filteredLists.add(pay);
}
}
diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/SelectRefundFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/SelectRefundFragment.java
index 0f6ada8..be38454 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/management/SelectRefundFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/management/SelectRefundFragment.java
@@ -57,7 +57,7 @@ public class SelectRefundFragment extends DataBindingFragment {
}
public void onQRRefund() {
- sharedViewModel.transactionsType.postValue(TransactionsType.WAVEPAY_REFUND);
+ sharedViewModel.transactionsType.postValue(TransactionsType.MMQR_REFUND);
routeId = R.id.action_selectRefundFragment_to_QRRefundFragment;
safeNavigateToRouteId();
}
diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/TransactionSummaryFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/TransactionSummaryFragment.java
index e55cfd3..dd7a480 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/management/TransactionSummaryFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/management/TransactionSummaryFragment.java
@@ -265,7 +265,7 @@ public class TransactionSummaryFragment extends DataBindingFragment {
if (sharedViewModel.hostType.getValue() == HostType.QR) {
if (pay.getTransactionType() == TransactionsType.MMQR.value && pay.getQrTransStatus() == 1) {
wave.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.WAVEPAY_REFUND.value && pay.getQrTransStatus() == 1) {
+ } else if (pay.getTransactionType() == TransactionsType.MMQR_REFUND.value && pay.getQrTransStatus() == 1) {
waveRefund.inc(pay.amount);
}
} else if (sharedViewModel.hostType.getValue() == HostType.MPU) {
diff --git a/app/src/main/java/com/utsmm/kbz/ui/sign_on/SignOnFragment.java b/app/src/main/java/com/utsmm/kbz/ui/sign_on/SignOnFragment.java
index 7cc7b09..74ab960 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/sign_on/SignOnFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/sign_on/SignOnFragment.java
@@ -13,6 +13,7 @@ import com.utsmm.kbz.BR;
import com.utsmm.kbz.R;
import com.utsmm.kbz.config.Constants;
import com.utsmm.kbz.util.enums.ResponseStatus;
+import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation;
/*
* This file is not using in this project cuz IPEK is used instead of TMK.
@@ -54,11 +55,8 @@ public class SignOnFragment extends DataBindingFragment {
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
-
signOnViewModel.startSignOnProcess();
-
-
observeData();
}
diff --git a/app/src/main/res/drawable-nodpi/ic_swipe_card.png b/app/src/main/res/drawable-nodpi/ic_swipe_card.png
deleted file mode 100644
index 11d01fa..0000000
Binary files a/app/src/main/res/drawable-nodpi/ic_swipe_card.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_insert_card.png b/app/src/main/res/drawable/ic_insert_card.png
new file mode 100644
index 0000000..eb46b49
Binary files /dev/null and b/app/src/main/res/drawable/ic_insert_card.png differ
diff --git a/app/src/main/res/drawable/ic_swipe_card.png b/app/src/main/res/drawable/ic_swipe_card.png
new file mode 100644
index 0000000..b32478e
Binary files /dev/null and b/app/src/main/res/drawable/ic_swipe_card.png differ
diff --git a/app/src/main/res/drawable/ic_tap_card.png b/app/src/main/res/drawable/ic_tap_card.png
new file mode 100644
index 0000000..6afdba6
Binary files /dev/null and b/app/src/main/res/drawable/ic_tap_card.png differ
diff --git a/app/src/main/res/drawable/logo_amex.png b/app/src/main/res/drawable/logo_amex.png
new file mode 100644
index 0000000..c0d2d30
Binary files /dev/null and b/app/src/main/res/drawable/logo_amex.png differ
diff --git a/app/src/main/res/drawable/logo_discover.png b/app/src/main/res/drawable/logo_discover.png
new file mode 100644
index 0000000..83c882d
Binary files /dev/null and b/app/src/main/res/drawable/logo_discover.png differ
diff --git a/app/src/main/res/drawable/logo_mir.png b/app/src/main/res/drawable/logo_mir.png
new file mode 100644
index 0000000..a12974b
Binary files /dev/null and b/app/src/main/res/drawable/logo_mir.png differ
diff --git a/app/src/main/res/drawable/pin_dot_dim.xml b/app/src/main/res/drawable/pin_dot_dim.xml
new file mode 100644
index 0000000..cbef80d
--- /dev/null
+++ b/app/src/main/res/drawable/pin_dot_dim.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/primary_card_bg.xml b/app/src/main/res/drawable/primary_card_bg.xml
new file mode 100644
index 0000000..a6fa30b
--- /dev/null
+++ b/app/src/main/res/drawable/primary_card_bg.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ripple_effect.xml b/app/src/main/res/drawable/ripple_effect.xml
new file mode 100644
index 0000000..2ceb5fa
--- /dev/null
+++ b/app/src/main/res/drawable/ripple_effect.xml
@@ -0,0 +1,10 @@
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/visa_logo.png b/app/src/main/res/drawable/visa_logo.png
new file mode 100644
index 0000000..13723a0
Binary files /dev/null and b/app/src/main/res/drawable/visa_logo.png differ
diff --git a/app/src/main/res/layout/fragment_amount_screen.xml b/app/src/main/res/layout/fragment_amount_screen.xml
index eba0741..9498ff3 100644
--- a/app/src/main/res/layout/fragment_amount_screen.xml
+++ b/app/src/main/res/layout/fragment_amount_screen.xml
@@ -55,6 +55,7 @@
android:layout_marginEnd="16dp"
app:cardCornerRadius="12dp"
app:cardElevation="4dp"
+ android:layout_margin="4dp"
android:background="@color/colorPrimary">
-
+
-
-
+
+ android:weightSum="3">
-
+
+
-
-
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:gravity="center"
+ android:padding="8dp">
-
+
+
+ android:text="Tap"
+ android:textColor="#202124"
+ android:textSize="13sp"
+ android:fontFamily="@font/rubik_medium"
+ android:textStyle="bold"
+ android:layout_marginTop="4dp" />
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:gravity="center"
+ android:padding="8dp">
-
+
+
+ android:text="Chip"
+ android:textColor="#202124"
+ android:textSize="13sp"
+ android:fontFamily="@font/rubik_medium"
+ android:textStyle="bold"
+ android:layout_marginTop="4dp" />
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:gravity="center"
+ android:padding="8dp">
-
+
+
+ android:text="Swipe"
+ android:textColor="#202124"
+ android:textSize="13sp"
+ android:fontFamily="@font/rubik_medium"
+ android:textStyle="bold"
+ android:layout_marginTop="4dp" />
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ app:layout_constraintEnd_toEndOf="parent"
+ android:backgroundTint="#fff">
-
diff --git a/app/src/main/res/layout/fragment_pin_pad_base.xml b/app/src/main/res/layout/fragment_pin_pad_base.xml
index d9e2ff3..dfe4467 100644
--- a/app/src/main/res/layout/fragment_pin_pad_base.xml
+++ b/app/src/main/res/layout/fragment_pin_pad_base.xml
@@ -51,18 +51,18 @@
android:fontFamily="@font/rubik_medium"
android:textAlignment="center"
android:gravity="center" />
-
+
@@ -89,6 +89,52 @@
android:padding="20dp">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+