IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Thunes param changes

master
Preyea Regmi 5 years ago
parent
5659635366
commit
f5a8dd7119
6 changed files with 289 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 213
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/gateway/RecipientAddV2Gateway.java
  2. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2InteractorInterface.java
  3. 35
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java
  4. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2PresenterInterface.java
  5. 26
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientadd/RecipientAddV2Activity.java
  6. 34
      app/src/main/res/layout/activity_recipient_v2.xml

213
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/gateway/RecipientAddV2Gateway.java
View File

@ -48,4 +48,217 @@ public class RecipientAddV2Gateway extends PrivilegedGateway implements Recipien
return HttpClientV2.getInstance().addRecipientV2(auth,userId,jsonObject);
}
@Override
public String getMobilePrefixFromCountryCode(String localeCode) {
switch(localeCode.toLowerCase())
{
case "af" : return "+93";
case "al" : return "+355";
case "dz" : return "+213";
case "ad" : return "+376";
case "ao" : return "+244";
case "aq" : return "+672";
case "ar" : return "+54";
case "am" : return "+374";
case "aw" : return "+297";
case "au" : return "+61";
case "at" : return "+43";
case "az" : return "+994";
case "bh" : return "+973";
case "bd" : return "+880";
case "by" : return "+375";
case "be" : return "+32";
case "bz" : return "+501";
case "bj" : return "+229";
case "bt" : return "+975";
case "bo" : return "+591";
case "ba" : return "+387";
case "bw" : return "+267";
case "br" : return "+55";
case "bn" : return "+673";
case "bg" : return "+359";
case "bf" : return "+226";
case "mm" : return "+95";
case "bi" : return "+257";
case "kh" : return "+855";
case "cm" : return "+237";
case "ca" : return "+1";
case "cv" : return "+238";
case "cf" : return "+236";
case "td" : return "+235";
case "cl" : return "+56";
case "cn" : return "+86";
case "cx" : return "+61";
case "cc" : return "+61";
case "co" : return "+57";
case "km" : return "+269";
case "cg" : return "+242";
case "cd" : return "+243";
case "ck" : return "+682";
case "cr" : return "+506";
case "hr" : return "+385";
case "cu" : return "+53";
case "cy" : return "+357";
case "cz" : return "+420";
case "dk" : return "+45";
case "dj" : return "+253";
case "tl" : return "+670";
case "ec" : return "+593";
case "eg" : return "+20";
case "sv" : return "+503";
case "gq" : return "+240";
case "er" : return "+291";
case "ee" : return "+372";
case "et" : return "+251";
case "fk" : return "+500";
case "fo" : return "+298";
case "fj" : return "+679";
case "fi" : return "+358";
case "fr" : return "+33";
case "pf" : return "+689";
case "ga" : return "+241";
case "gm" : return "+220";
case "ge" : return "+995";
case "de" : return "+49";
case "gh" : return "+233";
case "gi" : return "+350";
case "gr" : return "+30";
case "gl" : return "+299";
case "gt" : return "+502";
case "gn" : return "+224";
case "gw" : return "+245";
case "gy" : return "+592";
case "ht" : return "+509";
case "hn" : return "+504";
case "hk" : return "+852";
case "hu" : return "+36";
case "in" : return "+91";
case "id" : return "+62";
case "ir" : return "+98";
case "iq" : return "+964";
case "ie" : return "+353";
case "im" : return "+44";
case "il" : return "+972";
case "it" : return "+39";
case "ci" : return "+225";
case "jp" : return "+81";
case "jo" : return "+962";
case "kz" : return "+7";
case "ke" : return "+254";
case "ki" : return "+686";
case "kw" : return "+965";
case "kg" : return "+996";
case "la" : return "+856";
case "lv" : return "+371";
case "lb" : return "+961";
case "ls" : return "+266";
case "lr" : return "+231";
case "ly" : return "+218";
case "li" : return "+423";
case "lt" : return "+370";
case "lu" : return "+352";
case "mo" : return "+853";
case "mk" : return "+389";
case "mg" : return "+261";
case "mw" : return "+265";
case "my" : return "+60";
case "mv" : return "+960";
case "ml" : return "+223";
case "mt" : return "+356";
case "mh" : return "+692";
case "mr" : return "+222";
case "mu" : return "+230";
case "yt" : return "+262";
case "mx" : return "+52";
case "fm" : return "+691";
case "md" : return "+373";
case "mc" : return "+377";
case "mn" : return "+976";
case "me" : return "+382";
case "ma" : return "+212";
case "mz" : return "+258";
case "na" : return "+264";
case "nr" : return "+674";
case "np" : return "+977";
case "nl" : return "+31";
case "nc" : return "+687";
case "nz" : return "+64";
case "ni" : return "+505";
case "ne" : return "+227";
case "ng" : return "+234";
case "nu" : return "+683";
case "kp" : return "+850";
case "no" : return "+47";
case "om" : return "+968";
case "pk" : return "+92";
case "pw" : return "+680";
case "pa" : return "+507";
case "pg" : return "+675";
case "py" : return "+595";
case "pe" : return "+51";
case "ph" : return "+63";
case "pn" : return "+870";
case "pl" : return "+48";
case "pt" : return "+351";
case "pr" : return "+1";
case "qa" : return "+974";
case "ro" : return "+40";
case "ru" : return "+7";
case "rw" : return "+250";
case "bl" : return "+590";
case "ws" : return "+685";
case "sm" : return "+378";
case "st" : return "+239";
case "sa" : return "+966";
case "sn" : return "+221";
case "rs" : return "+381";
case "sc" : return "+248";
case "sl" : return "+232";
case "sg" : return "+65";
case "sk" : return "+421";
case "si" : return "+386";
case "sb" : return "+677";
case "so" : return "+252";
case "za" : return "+27";
case "kr" : return "+82";
case "es" : return "+34";
case "lk" : return "+94";
case "sh" : return "+290";
case "pm" : return "+508";
case "sd" : return "+249";
case "sr" : return "+597";
case "sz" : return "+268";
case "se" : return "+46";
case "ch" : return "+41";
case "sy" : return "+963";
case "tw" : return "+886";
case "tj" : return "+992";
case "tz" : return "+255";
case "th" : return "+66";
case "tg" : return "+228";
case "tk" : return "+690";
case "to" : return "+676";
case "tn" : return "+216";
case "tr" : return "+90";
case "tm" : return "+993";
case "tv" : return "+688";
case "ae" : return "+971";
case "ug" : return "+256";
case "gb" : return "+44";
case "ua" : return "+380";
case "uy" : return "+598";
case "us" : return "+1";
case "uz" : return "+998";
case "vu" : return "+678";
case "va" : return "+39";
case "ve" : return "+58";
case "vn" : return "+84";
case "wf" : return "+681";
case "ye" : return "+967";
case "zm" : return "+260";
case "zw" : return "+263";
default : return "";
}
}
}

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2InteractorInterface.java
View File

@ -31,5 +31,7 @@ public interface RecipientAddV2InteractorInterface extends BaseInteractorInterfa
String city,
String idNumber,
String idType);
String getMobilePrefixFromCountryCode(String localeCode);
}
}

35
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java
View File

@ -51,10 +51,10 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
@Override
public void addRecipient(String firstName, String middleName, String lastName, CountryDetailModel selectedCountry,
ProvinceDetailModel selectedProvince, DistrictDetailModel selectedDistrict,
String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer, String selectedRecipientId, String city, String idNumber, ReceiverIdType idType) {
String address, RelationDetailModel selectedRelation,String mobileNoPrefix, String mobileNo, String email, TransferDetailModel selectedTransfer, String selectedRecipientId, String city, String idNumber, ReceiverIdType idType) {
if (validateData(firstName, middleName, lastName, selectedCountry, selectedProvince, selectedDistrict, address, selectedRelation, mobileNo, email, selectedTransfer, city, idNumber, idType)) {
if (validateData(firstName, middleName, lastName, selectedCountry, selectedProvince, selectedDistrict, address, selectedRelation, mobileNoPrefix,mobileNo, email, selectedTransfer, city, idNumber, idType)) {
this.compositeDisposable.add(this.gateway.addRecipientAndSendToServer(gateway.getAuth(),
gateway.getUserID(),
firstName, middleName, lastName,
@ -62,13 +62,13 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
(selectedProvince) == null ? "" : selectedProvince.getId(),
(selectedDistrict) == null ? "" : selectedDistrict.getId(),
address, selectedRelation.getId(),
mobileNo,
mobileNoPrefix+mobileNo,
email,
selectedTransfer.getId(),
selectedRecipientId,
city,
idNumber,
idType.getId()
(idNumber==null)?"":idNumber,
(idType==null)?null:idType.getId()
)
.doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
.doFinally(() -> view.showProgressBar(false, ""))
@ -82,7 +82,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
private boolean validateData(String firstName, String middleName, String lastName, CountryDetailModel selectedCountry,
ProvinceDetailModel selectedProvince, DistrictDetailModel selectedDistrict,
String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer, String city, String idNumber, ReceiverIdType idType) {
String address, RelationDetailModel selectedRelation,String mobileNoPrefix, String mobileNo, String email, TransferDetailModel selectedTransfer, String city, String idNumber, ReceiverIdType idType) {
boolean isValid = true;
if (!validateFirstName(firstName))
@ -101,10 +101,10 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
isValid = false;
if (!validateCity(city))
isValid = false;
if (!validateIdType(idType))
isValid = false;
if (!validateIdNumber(idNumber))
isValid = false;
// if (!validateIdType(idType))
// isValid = false;
// if (!validateIdNumber(idNumber))
// isValid = false;
return isValid;
}
@ -207,6 +207,11 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
);
}
@Override
public String getMobilePrefixFromCountryCode(String code) {
return this.gateway.getMobilePrefixFromCountryCode(code);
}
private boolean validateLocation(CountryDetailModel country, ProvinceDetailModel province, DistrictDetailModel district) {
if (country != null) {
@ -352,12 +357,16 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
ProvinceDetailModel selectedProvinceDetailModel = null;
DistrictDetailModel selectedDistrictDetailModel = null;
String prefixedRemovedMobileNumber= editableData.getMobileNumber();
if (selectedCountryDetailModel != null) {
selectedProvinceDetailModel = selectedCountryDetailModel.getSelectedProvinceFromList(editableData.getStateId());
if (selectedProvinceDetailModel != null) {
selectedDistrictDetailModel = selectedProvinceDetailModel.getSelectedDistrictFromList(editableData.getDistrictId());
}
prefixedRemovedMobileNumber=removePrefixFromSelectedMobileNumber(editableData.getMobileNumber(),selectedCountryDetailModel.getCode());
}
@ -367,7 +376,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
selectedDistrictDetailModel,
editableData.getAddress(),
selectedRelationDetailModel,
editableData.getMobileNumber(),
prefixedRemovedMobileNumber,
editableData.getEmail(),
selectedTransferDetailModel,
editableData.getCity(),
@ -402,4 +411,8 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
}
}
private String removePrefixFromSelectedMobileNumber(String mobileNumber, String code) {
return mobileNumber.replace(this.gateway.getMobilePrefixFromCountryCode(code),"");
}
}

4
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2PresenterInterface.java
View File

@ -15,10 +15,12 @@ public interface RecipientAddV2PresenterInterface extends BasePresenterInterface
void getAllData();
void addRecipient(String firstName, String middleName, String lastName, CountryDetailModel selectedCountry, ProvinceDetailModel selectedProvince, DistrictDetailModel selectedDistrict, String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer, String selectedRecipientId, String city, String idNumber, ReceiverIdType idType);
void addRecipient(String firstName, String middleName, String lastName, CountryDetailModel selectedCountry, ProvinceDetailModel selectedProvince, DistrictDetailModel selectedDistrict, String address, RelationDetailModel selectedRelation,String mobileNoPrefix, String mobileNo, String email, TransferDetailModel selectedTransfer, String selectedRecipientId, String city, String idNumber, ReceiverIdType idType);
void prepareRecipientForEdit(RecipientInfoModel recipientToBeEdited);
String getMobilePrefixFromCountryCode(String code);
interface RecipientAddV2ContractInterface extends BaseContractInterface
{

26
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientadd/RecipientAddV2Activity.java
View File

@ -4,6 +4,7 @@ import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.constraint.ConstraintLayout;
import android.support.constraint.Group;
import android.support.design.widget.TextInputLayout;
import android.support.transition.TransitionManager;
import android.view.View;
@ -11,6 +12,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
import com.gmeremit.online.gmeremittance_native.R;
import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
@ -121,6 +123,12 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
@BindView(R.id.mobileViewContainer)
ConstraintLayout mobileViewContainer;
@BindView(R.id.selectedCountryMobilePrefixGroup)
Group selectedCountryMobilePrefixGroup;
@BindView(R.id.selectedCountryMobilePrefix)
TextView selectedCountryMobilePrefix;
@BindView(R.id.btn_submit)
Button submitButton;
@ -142,7 +150,6 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
private List<ReceiverIdType> idTypeList;
private RecipientInfoModel recipientToBeEdited = null;
private String selectedRecipientId = "";
@ -286,6 +293,7 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
selectedDistrict,
ed_address.getText().toString(),
selectedRelation,
selectedCountryMobilePrefix.getText().toString(),
ed_mobile_no.getText().toString(),
ed_email.getText().toString(),
selectedTransferReason,
@ -432,10 +440,16 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
private void showFlagInMobileView(String code) {
int flagId= CountryFlagMapper.getFlagFromCountryCode(code);
int flagId = CountryFlagMapper.getFlagFromCountryCode(code);
String prefix = presenterInterface.getMobilePrefixFromCountryCode(code);
selectedCountryIcon.setImageResource(flagId);
selectedCountryMobilePrefix.setText(prefix);
if (selectedCountryMobilePrefixGroup.getVisibility() != View.VISIBLE) {
TransitionManager.beginDelayedTransition(mobileViewContainer);
selectedCountryIcon.setVisibility(View.VISIBLE);
selectedCountryMobilePrefixGroup.setVisibility(View.VISIBLE);
}
}
@ -444,20 +458,20 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
this.transferReasonList = data.getTransferReasons();
this.countryList = data.getCountry();
this.relationList = data.getRelations();
this.idTypeList=data.getReceiverIdType();
this.idTypeList = data.getReceiverIdType();
}
@Override
public void showDataForEditing(String firstName, String middleName, String lastName, CountryDetailModel selectedCountry, ProvinceDetailModel selectedProvince, DistrictDetailModel selectedDistrict, String address,
RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer,String city,String idNumber,ReceiverIdType idType) {
RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer, String city, String idNumber, ReceiverIdType idType) {
ed_firstname.setText(firstName);
ed_middlename.setText(middleName);
ed_lastname.setText(lastName);
this.selectedCountry = selectedCountry;
this.selectedProvince = selectedProvince;
this.selectedDistrict = selectedDistrict;
this.selectedIdType=idType;
this.selectedIdType = idType;
ed_id_number.setText(idNumber);
ed_address.setText(address);
this.selectedRelation = selectedRelation;

34
app/src/main/res/layout/activity_recipient_v2.xml
View File

@ -270,13 +270,26 @@
android:layout_width="@dimen/_30sdp"
android:layout_height="@dimen/_30sdp"
android:layout_marginStart="8dp"
android:layout_marginTop="10dp"
android:layout_marginTop="8dp"
android:src="@drawable/flag_default"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/selectedCountryMobilePrefix"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:visibility="gone"
android:textSize="@dimen/_12ssp"
app:txtfontName="@string/semibold"
app:layout_constraintBottom_toBottomOf="@+id/selectedCountryIcon"
app:layout_constraintStart_toEndOf="@+id/selectedCountryIcon"
app:layout_constraintTop_toTopOf="@+id/selectedCountryIcon"
app:layout_constraintEnd_toStartOf="@+id/mobileWrapper"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/mobileWrapper" />
tools:text="+977" />
<android.support.design.widget.TextInputLayout
android:id="@+id/mobileWrapper"
@ -287,8 +300,7 @@
app:errorEnabled="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/selectedCountryIcon"
app:layout_constraintStart_toEndOf="@+id/selectedCountryMobilePrefix"
app:layout_constraintTop_toTopOf="parent">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
@ -301,6 +313,13 @@
android:textSize="@dimen/_13ssp" />
</android.support.design.widget.TextInputLayout>
<android.support.constraint.Group
android:id="@+id/selectedCountryMobilePrefixGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="selectedCountryMobilePrefix,selectedCountryIcon" />
</android.support.constraint.ConstraintLayout>
<FrameLayout
@ -337,7 +356,6 @@
<ImageView
android:layout_marginRight="5dp"
android:layout_marginBottom="8dp"
android:layout_gravity="center_vertical|end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

Write Preview
Loading…
Cancel
Save