Browse Source

Minor fixes

master
Preyea Regmi 4 years ago
parent
commit
94bca7dbbb
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 22
      app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/model/SendMoneyTransactionCompleteModel.java
  3. 3
      app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
  4. 1
      app/src/main/res/layout/activity_support_v2.xml

BIN
.idea/caches/build_file_checksums.ser

22
app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/model/SendMoneyTransactionCompleteModel.java

@ -258,17 +258,8 @@ public class SendMoneyTransactionCompleteModel {
}
public String getCollAmount() {
String formatted= collAmount;
Log.d("TransactionReceipt","Unformatted: "+formatted);
try {
formatted= Utils.formatCurrency(Utils.removeCommaFromAmount(collAmount.replaceAll("KRW", "")))+" KRW";
Log.d("TransactionReceipt","Formatted: "+formatted);
}
catch ( Exception e)
{
}
return formatted;
return collAmount;
}
public void setCollAmount(String collAmount) {
@ -284,17 +275,8 @@ public class SendMoneyTransactionCompleteModel {
}
public String getServiceCharge() {
String formatted= serviceCharge;
Log.d("TransactionReceipt","Unformatted: "+formatted);
try {
formatted= Utils.formatCurrency(Utils.removeCommaFromAmount(serviceCharge.replaceAll("KRW", "")))+" KRW";
Log.d("TransactionReceipt","Formatted: "+formatted);
}
catch ( Exception e)
{
}
return formatted;
return serviceCharge;
}
public void setServiceCharge(String serviceCharge) {

3
app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml

@ -577,6 +577,7 @@
<com.swifttech.remit.android.common.customwidgets.GmeButton
android:id="@+id/btn_submit"
style="@style/MButton"
android:enabled="true"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:layout_marginBottom="30dp"
@ -599,6 +600,7 @@
<com.swifttech.remit.android.common.customwidgets.GmeButton
android:id="@+id/btn_cancel"
style="@style/MButton"
android:enabled="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_5sdp"
@ -617,6 +619,7 @@
<com.swifttech.remit.android.common.customwidgets.GmeButton
android:id="@+id/btn_change"
style="@style/MButton"
android:enabled="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"

1
app/src/main/res/layout/activity_support_v2.xml

@ -84,6 +84,7 @@
<com.swifttech.remit.android.common.customwidgets.GmeButton
android:id="@+id/btn_submit"
style="@style/MButton"
android:enabled="true"
android:layout_gravity="center"
android:layout_marginTop="47dp"
android:background="@drawable/ic_rounded_background_red_coloured"

Loading…
Cancel
Save