Browse Source

Minor fixes ready for UAT

new_design
Preyea Regmi 4 years ago
parent
commit
83eec2c428
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 6
      app/src/main/java/com/swifttech/remit/android/features/changetxnpin/presenter/ChangePinV2Presenter.java
  3. 2
      app/src/main/java/com/swifttech/remit/android/features/home/view/HomeActivityV2.java
  4. 2
      app/src/main/java/com/swifttech/remit/android/features/login/presenter/LoginV2Presenter.java
  5. 2
      app/src/main/java/com/swifttech/remit/android/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2Presenter.java
  6. 1
      app/src/main/java/com/swifttech/remit/android/features/settings/gateway/LanguageSelectionGateway.java
  7. 2
      app/src/main/res/layout/gme_txn_pin_prompt_modal.xml
  8. 2
      app/src/main/res/values/colors.xml

BIN
.idea/caches/build_file_checksums.ser

6
app/src/main/java/com/swifttech/remit/android/features/changetxnpin/presenter/ChangePinV2Presenter.java

@ -107,7 +107,7 @@ public class ChangePinV2Presenter extends BaseViewModel implements ChangePinV2In
return true;
} else {
this.currentPin = null;
changePinLiveData.setCurrentPinInputLiveData(new FormInputStateDTO<>(false, "Pin must be of 5 digit"));
changePinLiveData.setCurrentPinInputLiveData(new FormInputStateDTO<>(false, "Pin must be of 6 digit"));
return false;
}
@ -121,7 +121,7 @@ public class ChangePinV2Presenter extends BaseViewModel implements ChangePinV2In
return true;
} else {
this.newPin = null;
changePinLiveData.setNewPinInputLiveData(new FormInputStateDTO<>(false, "Pin must be of 5 digit"));
changePinLiveData.setNewPinInputLiveData(new FormInputStateDTO<>(false, "Pin must be of 6 digit"));
return false;
}
@ -142,7 +142,7 @@ public class ChangePinV2Presenter extends BaseViewModel implements ChangePinV2In
} else {
this.confirmPin = null;
changePinLiveData.setConfirmPinInputLiveData(new FormInputStateDTO<>(false, "Pin must be of 5 digit"));
changePinLiveData.setConfirmPinInputLiveData(new FormInputStateDTO<>(false, "Pin must be of 6 digit"));
return false;
}

2
app/src/main/java/com/swifttech/remit/android/features/home/view/HomeActivityV2.java

@ -261,7 +261,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
}
private void showExitConfirmationDialog() {
final AlertDialog.Builder confimationAlertDialog = new AlertDialog.Builder(this);
final MaterialAlertDialogBuilder confimationAlertDialog = new MaterialAlertDialogBuilder(this);
confimationAlertDialog.setTitle(R.string.exit_confirmation_text);
confimationAlertDialog.setPositiveButton(getString(R.string.yes_text), new DialogInterface.OnClickListener() {
@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)

2
app/src/main/java/com/swifttech/remit/android/features/login/presenter/LoginV2Presenter.java

@ -73,7 +73,7 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI
bindView(viewBindings);
getLastLoginIfAvailable();
//TODO mock valid user
mockValidUserLogin();
// mockValidUserLogin();
return loginViewLiveData;
}

2
app/src/main/java/com/swifttech/remit/android/features/registerv2/existingcustomer/presenter/ExistingCustomerRegisterV2Presenter.java

@ -105,7 +105,7 @@ public class ExistingCustomerRegisterV2Presenter extends BaseViewModel implement
@Override
public ExistingCustomerRegistrationRequestLiveData getExsitingCustomerRegisterationRequestViewEvents(ExistingCustomerRegistrationRequestLiveData.ExistingCustomerRegistrationRequestViewBinding viewBinding) {
bindRequestView(viewBinding);
mockValidExistingID();
// mockValidExistingID();
return existingRegisterRequestViewLiveData;
}

1
app/src/main/java/com/swifttech/remit/android/features/settings/gateway/LanguageSelectionGateway.java

@ -23,7 +23,6 @@ public class LanguageSelectionGateway implements LanguageSelectionGatewayInterfa
models.add(new LanguageModel("KR", "ko", RemitApplication.getStringExtractor().getStringFromStringId(R.string.korean_language_text), "Korea"));
models.add(new LanguageModel("TH", "th", RemitApplication.getStringExtractor().getStringFromStringId(R.string.thailand_language_text), "Thailand"));
models.add(new LanguageModel("LK", "si", RemitApplication.getStringExtractor().getStringFromStringId(R.string.srilanka_lanugage_text), "Sri Lanka"));
models.add(new LanguageModel("MN", "mn", RemitApplication.getStringExtractor().getStringFromStringId(R.string.mongolia_language_text), "Mongolia"));
models.add(new LanguageModel("MM", "my", RemitApplication.getStringExtractor().getStringFromStringId(R.string.myanmar_language_text), "Myanmar"));
models.add(new LanguageModel("NP", "ne", RemitApplication.getStringExtractor().getStringFromStringId(R.string.nepali_language_text), "Nepali"));
models.add(new LanguageModel("ID", "in", RemitApplication.getStringExtractor().getStringFromStringId(R.string.indonesia_language_text), "Indonesia"));

2
app/src/main/res/layout/gme_txn_pin_prompt_modal.xml

@ -51,7 +51,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="@dimen/_10sdp"
android:inputType="number"
android:inputType="numberPassword"
android:textColor="@color/darkgray"
app:itemCount="6"
app:layout_constraintBottom_toTopOf="@+id/constraintLayout3"

2
app/src/main/res/values/colors.xml

@ -5,7 +5,7 @@
<!--<color name="colorPrimary">#da3832 </color>-->
<!--<color name="colorPrimary">#FF0000 </color>-->
<color name="colorPrimaryDark">#921111</color>
<color name="colorAccent">#E73636</color>
<color name="colorAccent">#A41313</color>
<color name="white">#ffffff</color>
<color name="gray">#E0E0E0</color>
<color name="gray1">#EEEEEE</color>

Loading…
Cancel
Save