Browse Source

Minor updates

master
Preyea Regmi 4 years ago
parent
commit
e8e16d77eb
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 15
      app/build.gradle
  3. 8
      app/src/main/java/com/swifttech/remit/android/base/PrivilegedGateway.java
  4. 1
      app/src/main/java/com/swifttech/remit/android/base/PrivilegedGatewayInterface.java
  5. 3
      app/src/main/java/com/swifttech/remit/android/features/exrate/presenter/ExchangeRatePresenter.java
  6. 2
      app/src/main/java/com/swifttech/remit/android/features/homeV2/presenter/HomeV2Presenter.java
  7. 4
      app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/presenter/SendMoneyV2Presenter.java
  8. 97
      app/src/main/java/com/swifttech/remit/android/features/splash_screen/view/SplashScreen.java
  9. 23
      app/src/main/java/com/swifttech/remit/android/utils/https/GenericApiObserverResponse.java
  10. 20
      app/src/main/java/com/swifttech/remit/android/utils/https/GenericApiObserverResponseV2.java
  11. 4
      app/src/main/res/layout/activity_exchange_method_v2.xml
  12. 41
      app/src/main/res/layout/activity_splash_screen_key_0.xml
  13. 38
      app/src/main/res/layout/activity_splash_screen_key_1.xml
  14. 8
      app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml
  15. 2
      app/src/main/res/layout/fragment_kyc_customer_detail.xml
  16. 14
      app/src/main/res/values/strings.xml
  17. 1
      app/src/main/res/xml/network_security_config.xml
  18. 6
      rxbiometric/build.gradle

BIN
.idea/caches/build_file_checksums.ser

15
app/build.gradle

@ -21,8 +21,8 @@ android {
applicationId "com.gmeremit.online.gmeremittance_native" applicationId "com.gmeremit.online.gmeremittance_native"
minSdkVersion 18 minSdkVersion 18
targetSdkVersion 29 targetSdkVersion 29
versionCode 38
versionName "3.4.0"
versionCode 1
versionName "0.0.1"
multiDexEnabled true multiDexEnabled true
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
manifestPlaceholders = [fileProvider: "com.gmeremit.online.gmeremittance_native.fileprovider"] manifestPlaceholders = [fileProvider: "com.gmeremit.online.gmeremittance_native.fileprovider"]
@ -89,7 +89,16 @@ android {
minifyEnabled false minifyEnabled false
shrinkResources false shrinkResources false
} }
remit {
generic {
signingConfig signingConfigs.debug
buildConfigField 'String', 'BASE_URL', '"http://103.139.152.11:5555/api/"'
buildConfigField 'String', 'API_VERSION', '"v1"'
buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
debuggable true
minifyEnabled false
shrinkResources false
}
jme {
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
buildConfigField 'String', 'BASE_URL', '"http://203.223.132.110:9093/api/"' buildConfigField 'String', 'BASE_URL', '"http://203.223.132.110:9093/api/"'
buildConfigField 'String', 'API_VERSION', '"v1"' buildConfigField 'String', 'API_VERSION', '"v1"'

8
app/src/main/java/com/swifttech/remit/android/base/PrivilegedGateway.java

@ -67,9 +67,15 @@ public abstract class PrivilegedGateway extends BaseGateway implements Privilege
@Override @Override
public String getUserPreferredCurrency() { public String getUserPreferredCurrency() {
return "JPY";
return "MNT";
} }
@Override
public String getUserPreferredCountryId() {
return "142";
}
@Override @Override
public String getWalletNumber() { public String getWalletNumber() {

1
app/src/main/java/com/swifttech/remit/android/base/PrivilegedGatewayInterface.java

@ -40,6 +40,7 @@ public interface PrivilegedGatewayInterface extends BaseGatewayInterface {
String getUserNativeCountryCode(); String getUserNativeCountryCode();
String getUserPreferredCurrency(); String getUserPreferredCurrency();
String getUserPreferredCountryId();
String getLastKnownFcmId(); String getLastKnownFcmId();

3
app/src/main/java/com/swifttech/remit/android/features/exrate/presenter/ExchangeRatePresenter.java

@ -34,7 +34,6 @@ public class ExchangeRatePresenter extends BasePresenter implements ExchangeRate
private final ExchangeRatePresenterInterface.ExchangeRateContractInterfacee view; private final ExchangeRatePresenterInterface.ExchangeRateContractInterfacee view;
private final CompositeDisposable compositeDisposables; private final CompositeDisposable compositeDisposables;
private final String sendCountryDefault = "118";
private final ExchangeRateInteractorInterface.ExchangeRateGatewayInterface gateway; private final ExchangeRateInteractorInterface.ExchangeRateGatewayInterface gateway;
private List<CountryPaymentService> countryRelatedCurrencyList; private List<CountryPaymentService> countryRelatedCurrencyList;
@ -128,7 +127,7 @@ public class ExchangeRatePresenter extends BasePresenter implements ExchangeRate
String calculateFlag = calcByPayoutAmount ? Constants.CALC_BY_RECIPEINT : Constants.CALC_BY_SENDER; String calculateFlag = calcByPayoutAmount ? Constants.CALC_BY_RECIPEINT : Constants.CALC_BY_SENDER;
compositeDisposables.add( compositeDisposables.add(
this.gateway.sendDataForForexCalculation(gateway.getBasicAuth(view.getContext()), this.gateway.sendDataForForexCalculation(gateway.getBasicAuth(view.getContext()),
sendCountryDefault,
gateway.getUserPreferredCountryId(),
gateway.getUserPreferredCurrency(), selectedCountryPaymentService.getCurrency(), gateway.getUserPreferredCurrency(), selectedCountryPaymentService.getCurrency(),
Utils.removeCommaFromAmount(cAmount), Utils.removeCommaFromAmount(pAmount), selectedPaymentMode.getId(), calculateFlag, selectedCountryPaymentService.getCountry(), Utils.removeCommaFromAmount(cAmount), Utils.removeCommaFromAmount(pAmount), selectedPaymentMode.getId(), calculateFlag, selectedCountryPaymentService.getCountry(),
selectedCountryPaymentService.getCountryId() selectedCountryPaymentService.getCountryId()

2
app/src/main/java/com/swifttech/remit/android/features/homeV2/presenter/HomeV2Presenter.java

@ -256,7 +256,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
if (model.getOS().equalsIgnoreCase("ANDROID")) if (model.getOS().equalsIgnoreCase("ANDROID"))
androidAppUpdateModel = model; androidAppUpdateModel = model;
} }
checkIfUpdateIsRequired(androidAppUpdateModel);
// checkIfUpdateIsRequired(androidAppUpdateModel);
} }

4
app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/presenter/SendMoneyV2Presenter.java

@ -268,7 +268,7 @@ public class SendMoneyV2Presenter extends BaseViewModel implements SendMoneyV2Pr
sendMoneyAPIRequestBody.setpCurr(selectedSendingCurrency); sendMoneyAPIRequestBody.setpCurr(selectedSendingCurrency);
sendMoneyAPIRequestBody.setCollAmt(getAppliedCollectionAmountIfAvailable()); sendMoneyAPIRequestBody.setCollAmt(getAppliedCollectionAmountIfAvailable());
sendMoneyAPIRequestBody.setCollCurr("KRW");
sendMoneyAPIRequestBody.setCollCurr(gateway.getUserPreferredCurrency());
sendMoneyAPIRequestBody.setPayoutAmt(Utils.removeCommaFromAmount(selectedRecievingAmount)); sendMoneyAPIRequestBody.setPayoutAmt(Utils.removeCommaFromAmount(selectedRecievingAmount));
sendMoneyAPIRequestBody.setTransferAmt(selectedTransferAmount); sendMoneyAPIRequestBody.setTransferAmt(selectedTransferAmount);
sendMoneyAPIRequestBody.setServiceCharge(selectedTransferFee); sendMoneyAPIRequestBody.setServiceCharge(selectedTransferFee);
@ -357,7 +357,7 @@ public class SendMoneyV2Presenter extends BaseViewModel implements SendMoneyV2Pr
} }
String senderCountryId = gateway.getUserCountryId();
String senderCountryId = gateway.getUserPreferredCountryId();
String senderCurrency = gateway.getUserPreferredCurrency(); String senderCurrency = gateway.getUserPreferredCurrency();
String paymentMethodId = selectedRecipient.getPaymentMethod().getId(); String paymentMethodId = selectedRecipient.getPaymentMethod().getId();
String calculationPreference = shouldCaulatedByRecipient ? Constants.CALC_BY_RECIPEINT : Constants.CALC_BY_SENDER; String calculationPreference = shouldCaulatedByRecipient ? Constants.CALC_BY_RECIPEINT : Constants.CALC_BY_SENDER;

97
app/src/main/java/com/swifttech/remit/android/features/splash_screen/view/SplashScreen.java

@ -105,8 +105,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
@BindView(R.id.appVersionTxtView) @BindView(R.id.appVersionTxtView)
TextView appVersionTxtView; TextView appVersionTxtView;
@BindView(R.id.fab_chat)
View fab_chat;
//EXrate Related View //EXrate Related View
@BindView(R.id.paymentModeRV) @BindView(R.id.paymentModeRV)
@ -131,8 +129,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
@BindView(R.id.exchangeRateTxtView) @BindView(R.id.exchangeRateTxtView)
TextView exchangeRateTxtView; TextView exchangeRateTxtView;
@BindView(R.id.notificationCounterTxtView)
TextView notificationCounterTxtView;
@BindView(R.id.gmeExratePC) @BindView(R.id.gmeExratePC)
TextView gmeExratePC; TextView gmeExratePC;
@ -168,7 +165,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
private ReceiveAmountTextWatcher receiveMoneyTextWatcher; private ReceiveAmountTextWatcher receiveMoneyTextWatcher;
private GestureDetectorCompat gestureDetector; private GestureDetectorCompat gestureDetector;
private AmountChangeAndFocusOutDetector myViewGestureDetector; private AmountChangeAndFocusOutDetector myViewGestureDetector;
private ChannelIOEventListener channelIOEventListener;
@Override @Override
@ -201,8 +197,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
receiveMoneyTextWatcher = new ReceiveAmountTextWatcher(receiveAmountEdTxt); receiveMoneyTextWatcher = new ReceiveAmountTextWatcher(receiveAmountEdTxt);
myViewGestureDetector = new AmountChangeAndFocusOutDetector(); myViewGestureDetector = new AmountChangeAndFocusOutDetector();
gestureDetector = new GestureDetectorCompat(this, myViewGestureDetector); gestureDetector = new GestureDetectorCompat(this, myViewGestureDetector);
channelIOEventListener = new ChannelIOEventListener(this);
ChannelIO.setChannelPluginListener(channelIOEventListener);
} }
@ -237,9 +231,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
if (languageViewTransitionManager.isUserOnLanguageSelectionView()) if (languageViewTransitionManager.isUserOnLanguageSelectionView())
onBackPressed(); onBackPressed();
break; break;
case R.id.fab_chat:
promptToChat();
break;
case R.id.selectedLanguageText: case R.id.selectedLanguageText:
case R.id.selectedLanguageIcon: case R.id.selectedLanguageIcon:
if (!languageViewTransitionManager.isUserOnLanguageSelectionView()) if (!languageViewTransitionManager.isUserOnLanguageSelectionView())
@ -255,7 +247,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
btn_login.setOnClickListener(this); btn_login.setOnClickListener(this);
btn_new_user.setOnClickListener(this); btn_new_user.setOnClickListener(this);
iv_back.setOnClickListener(this); iv_back.setOnClickListener(this);
fab_chat.setOnClickListener(this);
selectedLanguageText.setOnClickListener(this); selectedLanguageText.setOnClickListener(this);
selectedLanguageIcon.setOnClickListener(this); selectedLanguageIcon.setOnClickListener(this);
countrySelectionSpinner.setOnClickListener(this); countrySelectionSpinner.setOnClickListener(this);
@ -270,7 +261,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
btn_login.setOnClickListener(null); btn_login.setOnClickListener(null);
btn_new_user.setOnClickListener(null); btn_new_user.setOnClickListener(null);
iv_back.setOnClickListener(null); iv_back.setOnClickListener(null);
fab_chat.setOnClickListener(null);
selectedLanguageText.setOnClickListener(null); selectedLanguageText.setOnClickListener(null);
selectedLanguageIcon.setOnClickListener(null); selectedLanguageIcon.setOnClickListener(null);
countrySelectionSpinner.setOnClickListener(null); countrySelectionSpinner.setOnClickListener(null);
@ -347,42 +337,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
selectedLanguageIcon.setImageResource(flagFromCountryCode); selectedLanguageIcon.setImageResource(flagFromCountryCode);
} }
private void promptToChat() {
if (channelIOEventListener != null && channelIOEventListener.isSessionAlive()) {
ChatUtils.ChatInitData initializer = ChatUtils.startChannelIoCredential(true);
showProgressBar(true, getString(R.string.loading_text));
ChannelIO.boot(initializer.getChannelPluginSettings(), channelIOEventListener);
} else {
try {
FragmentManager fragmentManager = getSupportFragmentManager();
if (fragmentManager == null)
return;
CustomAlertDialog customAlertDialog;
customAlertDialog = new CustomAlertDialog();
customAlertDialog.setMessage(getString(R.string.check_start_chat_text));
customAlertDialog.setAlertType(CustomAlertDialog.AlertType.ALERT);
customAlertDialog.setPositiveBtnString(getString(R.string.yes_text));
customAlertDialog.setNegativeBtnString(getString(R.string.no_text));
customAlertDialog.setActionListener(new CustomAlertDialog.CustomDialogActionListener() {
@Override
public void onCutomDialogActionPressed(CustomAlertDialog.AlertType alertType) {
ChatUtils.ChatInitData initializer = ChatUtils.startChannelIoCredential(true);
showProgressBar(true, getString(R.string.loading_text));
ChannelIO.boot(initializer.getChannelPluginSettings(), channelIOEventListener);
}
});
customAlertDialog.show(fragmentManager, "CustomerMes");
} catch (Exception e) {
}
}
}
@Override @Override
@ -787,7 +741,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
selectedLanguageText.getLocationOnScreen(languageTextLeftAndTopCoordinates); selectedLanguageText.getLocationOnScreen(languageTextLeftAndTopCoordinates);
btn_login.getLocationOnScreen(btnLoginLeftAndTopCoordinates); btn_login.getLocationOnScreen(btnLoginLeftAndTopCoordinates);
btn_new_user.getLocationOnScreen(btnRegisterLeftAndTopCoordinates); btn_new_user.getLocationOnScreen(btnRegisterLeftAndTopCoordinates);
fab_chat.getLocationOnScreen(btnFABLeftAndTopCoordinates);
Rect sendMoneyBoundRect = new Rect(sendMoneyLeftAndTopCoordinates[0], sendMoneyLeftAndTopCoordinates[1], Rect sendMoneyBoundRect = new Rect(sendMoneyLeftAndTopCoordinates[0], sendMoneyLeftAndTopCoordinates[1],
@ -818,9 +771,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
btnRegisterLeftAndTopCoordinates[0] + btn_new_user.getMeasuredWidth(), btnRegisterLeftAndTopCoordinates[0] + btn_new_user.getMeasuredWidth(),
btnRegisterLeftAndTopCoordinates[1] + btn_new_user.getMeasuredHeight()); btnRegisterLeftAndTopCoordinates[1] + btn_new_user.getMeasuredHeight());
Rect btn_fabRect = new Rect(btnFABLeftAndTopCoordinates[0], btnFABLeftAndTopCoordinates[1],
btnFABLeftAndTopCoordinates[0] + fab_chat.getMeasuredWidth(),
btnFABLeftAndTopCoordinates[1] + fab_chat.getMeasuredHeight());
return (receiveAmountEdTxt.hasFocus() || sendAmountEdTxt.hasFocus()) return (receiveAmountEdTxt.hasFocus() || sendAmountEdTxt.hasFocus())
@ -830,8 +781,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
&& !selectedLanguageTextRect.contains(posX, posY) && !selectedLanguageTextRect.contains(posX, posY)
&& !selectedLanguageIconRect.contains(posX, posY) && !selectedLanguageIconRect.contains(posX, posY)
&& !btn_loginRect.contains(posX, posY) && !btn_loginRect.contains(posX, posY)
&& !btn_new_userRect.contains(posX, posY)
&& !btn_fabRect.contains(posX, posY);
&& !btn_new_userRect.contains(posX, posY);
} }
@ -839,45 +789,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
class ChannelIOEventListener extends ChatUtils.ChannelIOListenerAdapter {
public ChannelIOEventListener(Context context) {
super(context);
}
@Override
public void onChangeBadge(int count) {
String countString;
if (count == 0)
countString = "";
else if (count > 99)
countString = "99+";
else
countString = count + "";
if (countString.length() > 0) {
notificationCounterTxtView.setText(countString);
notificationCounterTxtView.setVisibility(View.VISIBLE);
} else {
notificationCounterTxtView.setText(countString);
notificationCounterTxtView.setVisibility(View.INVISIBLE);
}
}
@Override
public void onCompletion(ChannelPluginCompletionStatus status, @Nullable Guest guest) {
super.onCompletion(status, guest);
showProgressBar(false, getString(R.string.loading_text));
String errorMessage = ChatUtils.errorMessage(status, SplashScreen.this);
if (errorMessage == null)
ChannelIO.open(SplashScreen.this);
else
showPopUpMessage(errorMessage, CustomAlertDialog.AlertType.FAILED, null);
}
}
} }

23
app/src/main/java/com/swifttech/remit/android/utils/https/GenericApiObserverResponse.java

@ -32,19 +32,24 @@ public abstract class GenericApiObserverResponse<T> extends DisposableObserver<T
public void onError(Throwable e) { public void onError(Throwable e) {
e.printStackTrace(); e.printStackTrace();
if (e instanceof HttpException) { if (e instanceof HttpException) {
if (((HttpException) e).code() == 401)
unauthorizedAccess(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code()));
else
// if (((HttpException) e).code() == 401)
// unauthorizedAccess(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code()));
// else
// onFailed(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code())); // onFailed(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code()));
{
HttpException exception= (HttpException) e;
String message=exception.code()+"\n"+((HttpException) e).response().raw().request().url().url().toString();
HttpException exception= (HttpException) e;
String message=exception.code()+" "+((HttpException) e).response().raw().request().url().url().toString();
onFailed(message); onFailed(message);
}
} else if (e instanceof SocketTimeoutException) { } else if (e instanceof SocketTimeoutException) {
onFailed(HTTPConstants.HTTP_RESPONSE_NO_INTERNET);
// onFailed(HTTPConstants.HTTP_RESPONSE_NO_INTERNET);
onFailed(e.getMessage());
} else if (e instanceof IOException) { } else if (e instanceof IOException) {
onConnectionNotEstablished(HTTPConstants.HTTP_RESPONSE_NO_INTERNET);
onFailed(e.getMessage());
// onConnectionNotEstablished(HTTPConstants.HTTP_RESPONSE_NO_INTERNET);
} else { } else {
onFailed(e.getMessage()); onFailed(e.getMessage());
} }

20
app/src/main/java/com/swifttech/remit/android/utils/https/GenericApiObserverResponseV2.java

@ -62,19 +62,19 @@ public abstract class GenericApiObserverResponseV2<T> extends DisposableObserver
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
if (e instanceof HttpException) { if (e instanceof HttpException) {
if (((HttpException) e).code() == 401)
unauthorizedAccess(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code()));
else
// if (((HttpException) e).code() == 401)
// unauthorizedAccess(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code()));
// else
// onFailed(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code())); // onFailed(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code()));
{
HttpException exception = (HttpException) e;
String message=exception.code()+"\n"+((HttpException) e).response().raw().request().url().url().toString();
onFailed(message);
}
HttpException exception= (HttpException) e;
String message=exception.code()+" "+((HttpException) e).response().raw().request().url().url().toString();
onFailed(message);
} else if (e instanceof SocketTimeoutException) { } else if (e instanceof SocketTimeoutException) {
onFailed(HTTPConstants.HTTP_RESPONSE_NO_INTERNET);
// onFailed(HTTPConstants.HTTP_RESPONSE_NO_INTERNET);
onFailed(e.getMessage());
} else if (e instanceof IOException) { } else if (e instanceof IOException) {
onConnectionNotEstablished(HTTPConstants.HTTP_RESPONSE_NO_INTERNET);
// onConnectionNotEstablished(HTTPConstants.HTTP_RESPONSE_NO_INTERNET);
onFailed(e.getMessage());
} else { } else {
onFailed(e.getMessage()); onFailed(e.getMessage());
} }

4
app/src/main/res/layout/activity_exchange_method_v2.xml

@ -107,7 +107,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView <ImageView
android:background="@drawable/flag_south_korea"
android:background="@drawable/flag_mongolia"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_width="@dimen/_34sdp" android:layout_width="@dimen/_34sdp"
android:layout_height="@dimen/_30sdp" /> android:layout_height="@dimen/_30sdp" />
@ -115,7 +115,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="KRW"
android:text="MNT"
android:paddingStart="@dimen/_4sdp" android:paddingStart="@dimen/_4sdp"
android:paddingEnd="@dimen/_4sdp" android:paddingEnd="@dimen/_4sdp"
android:paddingRight="@dimen/_4sdp" android:paddingRight="@dimen/_4sdp"

41
app/src/main/res/layout/activity_splash_screen_key_0.xml

@ -200,7 +200,7 @@
android:layout_width="@dimen/_34sdp" android:layout_width="@dimen/_34sdp"
android:layout_height="@dimen/_30sdp" android:layout_height="@dimen/_30sdp"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/flag_south_korea" />
android:background="@drawable/flag_mongolia" />
<com.swifttech.remit.android.common.customwidgets.GmeTextView <com.swifttech.remit.android.common.customwidgets.GmeTextView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -210,7 +210,7 @@
android:paddingLeft="@dimen/_4sdp" android:paddingLeft="@dimen/_4sdp"
android:paddingEnd="@dimen/_4sdp" android:paddingEnd="@dimen/_4sdp"
android:paddingRight="@dimen/_4sdp" android:paddingRight="@dimen/_4sdp"
android:text="KRW"
android:text="MNT"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/text_medium" android:textSize="@dimen/text_medium"
android:textStyle="bold" /> android:textStyle="bold" />
@ -442,45 +442,10 @@
android:textSize="@dimen/text_small" android:textSize="@dimen/text_small"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fab_chat"
app:layout_constraintTop_toBottomOf="@+id/btn_lgn"
tools:text=" 2.2.3 " /> tools:text=" 2.2.3 " />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_chat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/_13sdp"
android:scaleType="center"
android:src="@drawable/ic_chat_bubble"
app:backgroundTint="@android:color/white"
app:elevation="2dp"
app:tint="@null"
app:fabSize="normal"
app:layout_constraintEnd_toEndOf="@+id/btn_lgn"
app:layout_constraintHorizontal_bias="0.76"
app:layout_constraintStart_toStartOf="@+id/btn_lgn"
app:layout_constraintTop_toBottomOf="@+id/btn_lgn"
app:maxImageSize="32dp" />
<com.swifttech.remit.android.common.customwidgets.GmeTextView
android:id="@+id/notificationCounterTxtView"
android:layout_width="@dimen/_15sdp"
android:layout_height="@dimen/_15sdp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_gravity="center"
android:layout_marginStart="8dp"
android:background="@drawable/circular_white_bg"
android:gravity="center"
android:textColor="@color/colorPrimary"
android:textSize="@dimen/text_mircoscopic"
android:visibility="invisible"
app:layout_constraintBottom_toTopOf="@+id/fab_chat"
app:layout_constraintEnd_toEndOf="@+id/fab_chat"
app:layout_constraintStart_toEndOf="@+id/fab_chat"
app:layout_constraintTop_toTopOf="@+id/fab_chat"
app:layout_constraintVertical_bias="0.52"
tools:text="2" />
<ProgressBar <ProgressBar
android:id="@+id/progressBar" android:id="@+id/progressBar"

38
app/src/main/res/layout/activity_splash_screen_key_1.xml

@ -153,44 +153,8 @@
android:textSize="@dimen/text_small" android:textSize="@dimen/text_small"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fab_chat"
tools:text=" 2.2.3 " />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_chat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/_13sdp"
android:scaleType="center"
android:src="@drawable/ic_chat_bubble"
app:backgroundTint="@android:color/white"
app:elevation="2dp"
app:fabSize="normal"
app:layout_constraintEnd_toEndOf="@+id/btn_lgn"
app:layout_constraintHorizontal_bias="0.76"
app:layout_constraintStart_toStartOf="@+id/btn_lgn"
app:layout_constraintTop_toBottomOf="@+id/btn_lgn" app:layout_constraintTop_toBottomOf="@+id/btn_lgn"
app:maxImageSize="32dp" />
<com.swifttech.remit.android.common.customwidgets.GmeTextView
android:id="@+id/notificationCounterTxtView"
android:layout_width="@dimen/_15sdp"
android:layout_height="@dimen/_15sdp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_gravity="center"
android:layout_marginStart="8dp"
android:background="@drawable/circular_white_bg"
android:gravity="center"
android:textColor="@color/colorPrimary"
android:textSize="@dimen/text_mircoscopic"
android:visibility="invisible"
app:layout_constraintBottom_toTopOf="@+id/fab_chat"
app:layout_constraintEnd_toEndOf="@+id/fab_chat"
app:layout_constraintStart_toEndOf="@+id/fab_chat"
app:layout_constraintTop_toTopOf="@+id/fab_chat"
app:layout_constraintVertical_bias="0.52"
tools:text="2" />
tools:text=" 2.2.3 " />
<ProgressBar <ProgressBar
android:id="@+id/progressBar" android:id="@+id/progressBar"

8
app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml

@ -74,7 +74,7 @@
android:layout_width="@dimen/_34sdp" android:layout_width="@dimen/_34sdp"
android:layout_height="@dimen/_30sdp" android:layout_height="@dimen/_30sdp"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/flag_south_korea" />
android:background="@drawable/flag_mongolia" />
<com.swifttech.remit.android.common.customwidgets.GmeTextView <com.swifttech.remit.android.common.customwidgets.GmeTextView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -84,7 +84,7 @@
android:paddingLeft="@dimen/_3sdp" android:paddingLeft="@dimen/_3sdp"
android:paddingEnd="@dimen/_3sdp" android:paddingEnd="@dimen/_3sdp"
android:paddingRight="@dimen/_3sdp" android:paddingRight="@dimen/_3sdp"
android:text="KRW"
android:text="MNT"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/_12ssp" android:textSize="@dimen/_12ssp"
android:textStyle="bold" /> android:textStyle="bold" />
@ -208,7 +208,7 @@
android:layout_width="@dimen/_34sdp" android:layout_width="@dimen/_34sdp"
android:layout_height="@dimen/_30sdp" android:layout_height="@dimen/_30sdp"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/flag_south_korea" />
android:background="@drawable/flag_nepal" />
<com.swifttech.remit.android.common.customwidgets.GmeTextView <com.swifttech.remit.android.common.customwidgets.GmeTextView
android:id="@+id/recepientCurrencyTextView" android:id="@+id/recepientCurrencyTextView"
@ -219,7 +219,7 @@
android:paddingLeft="@dimen/_3sdp" android:paddingLeft="@dimen/_3sdp"
android:paddingEnd="@dimen/_2sdp" android:paddingEnd="@dimen/_2sdp"
android:paddingRight="@dimen/_3sdp" android:paddingRight="@dimen/_3sdp"
android:text="KRW"
android:text="NPR"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/_12ssp" android:textSize="@dimen/_12ssp"
android:textStyle="bold" /> android:textStyle="bold" />

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

@ -126,7 +126,7 @@
<com.swifttech.remit.android.common.view.MTextInputLayout <com.swifttech.remit.android.common.view.MTextInputLayout
android:id="@+id/addressWrapper" android:id="@+id/addressWrapper"
android:hint="@string/address_in_korea_text"
android:hint="Address In Mongolia"
style="@style/MTextInputLayoutForm" style="@style/MTextInputLayoutForm"
android:layout_marginEnd="@dimen/_35sdp" android:layout_marginEnd="@dimen/_35sdp"
app:errorEnabled="true"> app:errorEnabled="true">

14
app/src/main/res/values/strings.xml

@ -252,7 +252,7 @@
<string name="change_password_text">Change Password</string> <string name="change_password_text">Change Password</string>
<string name="about_me_description_text">We are licensed by Ministry of Strategy &amp; Finance to operate as the <string name="about_me_description_text">We are licensed by Ministry of Strategy &amp; Finance to operate as the
first Non-Bank Remittance Service providers in South Korea.
first Non-Bank Remittance Service providers in South Mongolia.
Meeting all compliance regulations set forward by the regulators was a tough Meeting all compliance regulations set forward by the regulators was a tough
journey but today we feel proud about what we have achieved and journey but today we feel proud about what we have achieved and
how robust our operations are as a result of the hard work completed earlier. how robust our operations are as a result of the hard work completed earlier.
@ -281,7 +281,7 @@
<string name="email_address_text">Email Address</string> <string name="email_address_text">Email Address</string>
<string name="gender_text">Gender</string> <string name="gender_text">Gender</string>
<string name="gender_placeholder_text">Select Gender</string> <string name="gender_placeholder_text">Select Gender</string>
<string name="address_in_korea_text">Address In Korea</string>
<string name="address_in_korea_text">Address In Mongolia</string>
<string name="province_text">Province</string> <string name="province_text">Province</string>
<string name="province_placeholder_text">Select Province</string> <string name="province_placeholder_text">Select Province</string>
<string name="occupation_text">Occupation</string> <string name="occupation_text">Occupation</string>
@ -323,7 +323,7 @@
<string name="done_text">Done</string> <string name="done_text">Done</string>
<string name="kyc_first_name_error">Please enter a valid fullname</string> <string name="kyc_first_name_error">Please enter a valid fullname</string>
<string name="kyc_mobile_invalid_number_error">Please enter a valid korean mobile number</string>
<string name="kyc_mobile_invalid_number_error">Please enter a valid Mongolia mobile number</string>
<string name="kyc_mobile_empty_error">Mobile number cannot be empty</string> <string name="kyc_mobile_empty_error">Mobile number cannot be empty</string>
<string name="kyc_gender_error">Please select gender</string> <string name="kyc_gender_error">Please select gender</string>
<string name="kyc_native_country_error">Please select native country</string> <string name="kyc_native_country_error">Please select native country</string>
@ -636,7 +636,7 @@
<string name="select_auto_debit_account_text">Select Your Auto-debit Account</string> <string name="select_auto_debit_account_text">Select Your Auto-debit Account</string>
<string name="domestic_available_balance_text">Available Balance</string> <string name="domestic_available_balance_text">Available Balance</string>
<string name="enter_send_amount_text">Enter Send Amount (KRW)</string> <string name="enter_send_amount_text">Enter Send Amount (KRW)</string>
<string name="select_korea_bank">Select Korea Bank</string>
<string name="select_korea_bank">Select Mongolia Bank</string>
<string name="enter_account_text">Enter Account Number</string> <string name="enter_account_text">Enter Account Number</string>
<string name="recipient_name_text">Recipient Name</string> <string name="recipient_name_text">Recipient Name</string>
<string name="mobile_optional_text">Mobile Number (optional)</string> <string name="mobile_optional_text">Mobile Number (optional)</string>
@ -681,7 +681,7 @@
<string name="transfer_canceled_text">Transfer Canceled</string> <string name="transfer_canceled_text">Transfer Canceled</string>
<string name="you_have_to_register_text">You have to register account at GME</string> <string name="you_have_to_register_text">You have to register account at GME</string>
<string name="transaction_will_be_processed_text">Transaction will be process soon</string> <string name="transaction_will_be_processed_text">Transaction will be process soon</string>
<string name="link_korean_bank_account">Link your Korean Bank Account to receive money from abroad.</string>
<string name="link_korean_bank_account">Link your Mongolia Bank Account to receive money from abroad.</string>
<string name="control_no_text">Control No.</string> <string name="control_no_text">Control No.</string>
<string name="sender_name_text">Sender Name</string> <string name="sender_name_text">Sender Name</string>
<string name="received_amount_text">Received Amount</string> <string name="received_amount_text">Received Amount</string>
@ -736,8 +736,8 @@
<string name="step2_sub_title_text">Register Auto Debit</string> <string name="step2_sub_title_text">Register Auto Debit</string>
<string name="step3_sub_title_text">Try to Penny Test</string> <string name="step3_sub_title_text">Try to Penny Test</string>
<string name="select_city_text">Select City</string> <string name="select_city_text">Select City</string>
<string name="korea_bank_infornation_text">Korean Bank Information</string>
<string name="korea_bank_placeholder_text">Korea Bank</string>
<string name="korea_bank_infornation_text">Mongolia Bank Information</string>
<string name="korea_bank_placeholder_text">Mongolia Bank</string>
<string name="passport_information_text">Passport Information</string> <string name="passport_information_text">Passport Information</string>
<string name="passport_number_text">Passport Number</string> <string name="passport_number_text">Passport Number</string>
<string name="passport_issue_date_text">Passport Issued Date</string> <string name="passport_issue_date_text">Passport Issued Date</string>

1
app/src/main/res/xml/network_security_config.xml

@ -3,5 +3,6 @@
<domain-config cleartextTrafficPermitted="true"> <domain-config cleartextTrafficPermitted="true">
<domain includeSubdomains="true">gmeuat.gmeremit.com</domain> <domain includeSubdomains="true">gmeuat.gmeremit.com</domain>
<domain includeSubdomains="true">203.223.132.110</domain> <domain includeSubdomains="true">203.223.132.110</domain>
<domain includeSubdomains="true">103.139.152.11</domain>
</domain-config> </domain-config>
</network-security-config> </network-security-config>

6
rxbiometric/build.gradle

@ -54,7 +54,11 @@ android {
minifyEnabled false minifyEnabled false
} }
remit{
jme{
debuggable true
minifyEnabled false
}
generic{
debuggable true debuggable true
minifyEnabled false minifyEnabled false
} }

Loading…
Cancel
Save