Browse Source

Before adding KJ notice

master
Preyea Regmi 5 years ago
parent
commit
b482a88de7
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 1
      app/build.gradle
  3. 11
      app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java
  4. 7
      app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/autodebitaccrenewdialog/AutoDebitRenewalPromptDialog.java
  5. 1
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java
  6. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java
  7. 9
      app/src/main/res/layout/dialog_auto_debit_renew_prompt.xml

BIN
.idea/caches/build_file_checksums.ser

1
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'

11
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 {

7
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;

1
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;

2
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();
}
});

9
app/src/main/res/layout/dialog_auto_debit_renew_prompt.xml

@ -17,7 +17,10 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/txt_dialog_title"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:gravity="center"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="20dp"
@ -29,7 +32,9 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/messageBodyTxtView"
android:layout_width="280dp"
android:layout_width="match_parent"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="24dp"

Loading…
Cancel
Save