diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 1ebb6b4e..342bb5e5 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index ba61baee..fbf0915c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -155,6 +155,5 @@ dependencies { implementation project(path: ':SpinnerDatePickerLib-release') implementation 'com.intuit.sdp:sdp-android:1.0.6' implementation 'com.intuit.ssp:ssp-android:1.0.6' - implementation 'com.jakewharton.threetenabp:threetenabp:1.2.1' } 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 b956aea8..af99fc62 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 @@ -10,25 +10,15 @@ import android.support.multidex.MultiDex; import android.support.multidex.MultiDexApplication; import com.crashlytics.android.Crashlytics; -import com.jakewharton.threetenabp.AndroidThreeTen; import java.io.File; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Calendar; -import java.util.concurrent.TimeUnit; import io.fabric.sdk.android.Fabric; -import io.reactivex.Observable; -import io.reactivex.Observer; -import io.reactivex.Scheduler; -import io.reactivex.SingleObserver; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_PREFERRED_COUNTRY_CODE; -import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_PREFERRED_LOCALE; public class GmeApplication extends MultiDexApplication { @@ -48,7 +38,6 @@ public class GmeApplication extends MultiDexApplication { @Override public void onCreate() { super.onCreate(); - AndroidThreeTen.init(this); if (!BuildConfig.DEBUG) { Fabric.with(this, new Crashlytics()); } else { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/autodebitaccrenewdialog/AutoDebitRenewalPromptDialog.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/autodebitaccrenewdialog/AutoDebitRenewalPromptDialog.java index 9539193f..89ad27f7 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/autodebitaccrenewdialog/AutoDebitRenewalPromptDialog.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/autodebitaccrenewdialog/AutoDebitRenewalPromptDialog.java @@ -25,6 +25,7 @@ public class AutoDebitRenewalPromptDialog extends android.support.v4.app.DialogF private String positiveBtnString=null; private String negativeBtnString=null; private AutoDebitRenewalPromptListener listener; + private boolean shouldBeCancellable=true; @Override @@ -43,6 +44,7 @@ public class AutoDebitRenewalPromptDialog extends android.support.v4.app.DialogF if(titleString!=null) txt_dialog_title.setText(titleString); messageBodyTxtView.setText(bodyString); + builder.setCancelable(shouldBeCancellable); builder.setView(view); initialize(); Dialog dialog = builder.create(); @@ -62,6 +64,11 @@ public class AutoDebitRenewalPromptDialog extends android.support.v4.app.DialogF } + public void setCancellable(boolean action) + { + shouldBeCancellable=action; + } + public void setListener(AutoDebitRenewalPromptListener listener) { this.listener = listener; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java index 5303793b..e515da07 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java @@ -18,7 +18,6 @@ import com.gmeremit.online.gmeremittance_native.utils.https.SessionExpiredExcept import com.gmeremit.online.gmeremittance_native.utils.https.UserSessionObserverResponse; import com.gmeremit.online.gmeremittance_native.utils.security.SecurityUtils; import com.google.firebase.iid.FirebaseInstanceId; -import com.jakewharton.threetenabp.AndroidThreeTen; import java.util.Calendar; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java index 31115a4c..5d00bf71 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java @@ -460,6 +460,7 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. if (shouldShowAutoDebitNotice) { AutoDebitRenewalPromptDialog autoDebitRenewalPromptDialog = new AutoDebitRenewalPromptDialog(); autoDebitRenewalPromptDialog.setBodyMessage(autoDebitNoticeBody); + autoDebitRenewalPromptDialog.setCancellable(false); autoDebitRenewalPromptDialog.setTitleMessage(autoDebitNoticeTitle); autoDebitRenewalPromptDialog.setListener(new AutoDebitRenewalPromptDialog.AutoDebitRenewalPromptListener() { @Override @@ -471,6 +472,7 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. @Override public void onPositiveBtnPressed() { autoDebitRenewalPromptDialog.dismiss(); + ((HomeParentViewContractV2) getActivity()).getPresenter().donotPromptAutoDebitRenewalForThisSession(); ((HomeParentViewContractV2) getActivity()).showAutoDebitListingScreen(); } }); diff --git a/app/src/main/res/layout/dialog_auto_debit_renew_prompt.xml b/app/src/main/res/layout/dialog_auto_debit_renew_prompt.xml index 88bbdd8d..26fca055 100644 --- a/app/src/main/res/layout/dialog_auto_debit_renew_prompt.xml +++ b/app/src/main/res/layout/dialog_auto_debit_renew_prompt.xml @@ -17,7 +17,10 @@