diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 7b197c13..6d785f4e 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.aar b/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.aar
index 73cfeec2..bd73fd2e 100644
Binary files a/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.aar and b/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.aar differ
diff --git a/app/build.gradle b/app/build.gradle
index 911d7694..feb4018d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -154,7 +154,7 @@ dependencies {
implementation 'com.android.support:percent:28.0.0'
implementation 'com.android.support:cardview-v7:28.0.0'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
- implementation project(':SpinnerDatePickerLib-release')
implementation project(':securitykeypad')
+ implementation project(':SpinnerDatePickerLib-release')
}
apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java
index f404f139..8f801e00 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java
@@ -151,7 +151,10 @@ public class GmeApplication extends MultiDexApplication {
{
Resources resources;
-
+ public void updateResources(Resources resources)
+ {
+ this.resources=resources;
+ }
private StringExtractor(Resources resources) {
this.resources=resources;
}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java
index 1620e0e7..5adb48d1 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java
@@ -140,6 +140,7 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter
}
Resources resources = context.getResources();
resources.updateConfiguration(config, context.getResources().getDisplayMetrics());
+ GmeApplication.getStringExtractor().updateResources(resources);
}
return new ContextWrapper(context);
}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java
index f04e98e8..00785567 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java
@@ -322,6 +322,8 @@ public class KYCView2Fragment extends BaseFragment implements View.OnClickListen
.spinnerTheme(R.style.NumberPickerStyle)
.showTitle(true)
.showDaySpinner(true)
+ .setPositiveButtonText(getString(R.string.ok_text))
+ .setNegativeButtonText(getString(R.string.cancel_text))
.dialogTheme(R.style.DatePickerTheme);
if (ed.getId() == R.id.ed_issueDate) {
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java
index 3cfb5ed1..7c5eb1d2 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java
@@ -222,6 +222,8 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen
.showDaySpinner(true)
.dialogTheme(R.style.DatePickerTheme)
.setTitle(getString(R.string.select_dob_text))
+ .setPositiveButtonText(getString(R.string.ok_text))
+ .setNegativeButtonText(getString(R.string.cancel_text))
.setCurrentDateAsMaxDate()
.defaultDate(1990, 1, 1)
.callback(new com.tsongkha.spinnerdatepicker.DatePickerDialog.OnDateSetListener() {
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resetpassV2/view/ResetPassV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resetpassV2/view/ResetPassV2Activity.java
index 5506ea36..602ea8d9 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resetpassV2/view/ResetPassV2Activity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resetpassV2/view/ResetPassV2Activity.java
@@ -135,7 +135,9 @@ public class ResetPassV2Activity extends BaseActivity implements View.OnClickLis
.showTitle(true)
.showDaySpinner(true)
.dialogTheme(R.style.DatePickerTheme)
- .setTitle("Select dob")
+ .setTitle(getString(R.string.select_dob_text))
+ .setPositiveButtonText(getString(R.string.ok_text))
+ .setNegativeButtonText(getString(R.string.cancel_text))
.setCurrentDateAsMaxDate()
.defaultDate(1990, 1, 1)
.callback(new com.tsongkha.spinnerdatepicker.DatePickerDialog.OnDateSetListener() {
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java
index 189c8307..e0731307 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java
@@ -210,6 +210,8 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
.setTitle(getString(R.string.filter_by_date_text))
.setFromTitle(getString(R.string.from_text)+" :")
.setToTitle(getString(R.string.to_text)+" :")
+ .setPositiveButtonText(getString(R.string.ok_text))
+ .setNegativeButtonText(getString(R.string.cancel_text))
.callback(new DateRangePickerDialog.OnRangeDateSetListener() {
private String startDate="";
private String endDate="";
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatementV2/view/WalletStatementV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatementV2/view/WalletStatementV2Activity.java
index 9ec56b04..e49caef3 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatementV2/view/WalletStatementV2Activity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatementV2/view/WalletStatementV2Activity.java
@@ -117,6 +117,8 @@ public class WalletStatementV2Activity extends BaseActivity implements WalletSta
.setTitle(getString(R.string.filter_by_date_text))
.setFromTitle(getString(R.string.from_text)+" :")
.setToTitle(getString(R.string.to_text)+" :")
+ .setPositiveButtonText(getString(R.string.ok_text))
+ .setNegativeButtonText(getString(R.string.cancel_text))
.callback(new DateRangePickerDialog.OnRangeDateSetListener() {
private String startDate="";
private String endDate="";
diff --git a/app/src/main/res/layout/acitivity_recipient_listing_v2.xml b/app/src/main/res/layout/acitivity_recipient_listing_v2.xml
index 2a9e442e..167449c9 100644
--- a/app/src/main/res/layout/acitivity_recipient_listing_v2.xml
+++ b/app/src/main/res/layout/acitivity_recipient_listing_v2.xml
@@ -47,13 +47,15 @@
android:padding="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="center"
android:background="@null"
+ android:enabled="false"
android:gravity="center"
- android:inputType="textMultiLine"
android:hint="@string/edit_delete_hint_android_text"
android:imeActionLabel="Done"
- android:textSize="14sp"
- />
+ android:inputType="textMultiLine"
+ android:textSize="14sp"/>
+
Earn reward points and get\nsurprise gifts
Language
No Languages Available
+ Ok
+