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

Exchange Recepient UI clickable and notice icon added

new_design
Santosh Bhandary 4 years ago
parent
0ae97d3109
commit
eda981bd7b
9 changed files with 83 additions and 56 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. 4
      app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryListRvViewHolder.java
  2. 4
      app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryListingRvAdapter.java
  3. 10
      app/src/main/java/com/swifttech/remit/android/features/exrate/view/ExchangeRateActivity.java
  4. 2
      app/src/main/java/com/swifttech/remit/android/features/home/view/HomeFragmentV2.java
  5. 12
      app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java
  6. 90
      app/src/main/java/com/swifttech/remit/android/features/splashscreen/view/SplashScreen.java
  7. 14
      app/src/main/res/drawable/icv_notice.xml
  8. 2
      app/src/main/res/layout/activity_splash_screen_key_0.xml
  9. 1
      app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml

4
app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryListRvViewHolder.java
View File

@ -16,7 +16,7 @@ public class CountryListRvViewHolder extends RecyclerView.ViewHolder {
TextView countryNameTxtView;
@BindView(R.id.countryFlagImageView)
ImageView countryImageView;
ImageView countryFlagImageView;
public CountryListRvViewHolder(View itemView) {
@ -27,7 +27,7 @@ public class CountryListRvViewHolder extends RecyclerView.ViewHolder {
public void setFlagImage(int resId)
{
if(resId!=-1)
countryImageView.setBackgroundResource(resId);
countryFlagImageView.setBackgroundResource(resId);
}
public void setCountryName(String name)

4
app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryListingRvAdapter.java
View File

@ -41,9 +41,9 @@ public class CountryListingRvAdapter extends RecyclerView.Adapter<CountryListRvV
int flagId=CountryFlagMapper.getFlagFromCountryCode(countryPaymentService.getCountryCode());
if(flagId!=-1)
{
Glide.with(holder.countryImageView.getContext())
Glide.with(holder.countryFlagImageView.getContext())
.load(flagId)
.into(holder.countryImageView);
.into(holder.countryFlagImageView);
}
holder.setCountryName(countryPaymentService.getCountry()+" ("+countryPaymentService.getCurrency()+")");

10
app/src/main/java/com/swifttech/remit/android/features/exrate/view/ExchangeRateActivity.java
View File

@ -62,6 +62,9 @@ public class ExchangeRateActivity extends BaseActivity implements ExchangeRatePr
@BindView(R.id.recepientCurrencyTextView)
TextView recepientCurrencyTextView;
@BindView(R.id.countrySelectionSpinnerArrow)
ImageView countrySelectionSpinnerArrow;
@BindView(R.id.transferFeeTxtView)
TextView transferFeeTxtView;
@ -264,6 +267,8 @@ public class ExchangeRateActivity extends BaseActivity implements ExchangeRatePr
receiveAmountEdTxt.setOnEditorActionListener(this);
sendAmountEdTxt.setOnEditorActionListener(this);
countrySelectionSpinner.setOnClickListener(this);
recepientCurrencyTextView.setOnClickListener(this);
countrySelectionSpinnerArrow.setOnClickListener(this);
iv_back.setOnClickListener(this);
}
@ -275,6 +280,8 @@ public class ExchangeRateActivity extends BaseActivity implements ExchangeRatePr
receiveAmountEdTxt.setOnEditorActionListener(null);
sendAmountEdTxt.setOnEditorActionListener(null);
countrySelectionSpinner.setOnClickListener(null);
recepientCurrencyTextView.setOnClickListener(null);
countrySelectionSpinnerArrow.setOnClickListener(null);
iv_back.setOnClickListener(null);
}
@ -303,6 +310,9 @@ public class ExchangeRateActivity extends BaseActivity implements ExchangeRatePr
switch (v.getId())
{
case R.id.countrySelectionSpinner:
case R.id.recepientCurrencyTextView:
case R.id.countrySelectionSpinnerArrow:
showCountryListinDialog();
break;

2
app/src/main/java/com/swifttech/remit/android/features/home/view/HomeFragmentV2.java
View File

@ -166,7 +166,7 @@ public class HomeFragmentV2 extends BaseFragment implements
// menuList.add(new MenuItem("Redeem Cash Pickup", R.drawable.ic_menu_trackloc, 4));
menuList.add(new MenuItem(getString(R.string.transaction_report_text), R.drawable.icv_menu_transaction_report, 5));
menuList.add(new MenuItem(getString(R.string.gme_wallet_statement_text), R.drawable.icv_menu_wallet_statement, 6));
menuList.add(new MenuItem(getString(R.string.notice_text), R.drawable.icv_menu_wallet_statement, 7));
menuList.add(new MenuItem(getString(R.string.notice_text), R.drawable.icv_notice, 7));
return menuList;
}

12
app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java
View File

@ -28,6 +28,7 @@ import com.swifttech.remit.android.R;
import com.swifttech.remit.android.base.BaseFragment;
import com.swifttech.remit.android.common.customwidgets.CurrencyFormatterTextWatcher;
import com.swifttech.remit.android.common.customwidgets.CustomAlertDialog;
import com.swifttech.remit.android.common.customwidgets.GmeTextView;
import com.swifttech.remit.android.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper;
import com.swifttech.remit.android.features.sendmoney.model.amountdetail.AmountDetailRelatedDataModel;
import com.swifttech.remit.android.features.sendmoney.model.amountdetail.RecipientCurrencyModel;
@ -57,7 +58,10 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
TextView exchangeRateTxtView;
@BindView(R.id.recepientCurrencyTextView)
TextView recepientCurrencyTextView;
GmeTextView recepientCurrencyTextView;
@BindView(R.id.countrySelectionSpinnerArrow)
ImageView countrySelectionSpinnerArrow;
@BindView(R.id.countrySelectionSpinner)
@ -128,6 +132,8 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
recieveMoneyEditText.setOnEditorActionListener(this);
sendMoneyEditText.setOnEditorActionListener(this);
countrySelectionSpinner.setOnClickListener(this);
recepientCurrencyTextView.setOnClickListener(this);
countrySelectionSpinnerArrow.setOnClickListener(this);
}
@Override
@ -137,6 +143,8 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
recieveMoneyEditText.setOnEditorActionListener(null);
sendMoneyEditText.setOnEditorActionListener(null);
countrySelectionSpinner.setOnClickListener(null);
recepientCurrencyTextView.setOnClickListener(null);
countrySelectionSpinnerArrow.setOnClickListener(null);
}
@ -249,6 +257,8 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
}
break;
case R.id.countrySelectionSpinner:
case R.id.recepientCurrencyTextView:
case R.id.countrySelectionSpinnerArrow:
if (!amountDetailRelatedData.getAvailableCurrencyData().isEmpty())
showCurrencyListingDialog();
break;

90
app/src/main/java/com/swifttech/remit/android/features/splashscreen/view/SplashScreen.java
View File

@ -5,23 +5,6 @@ import android.content.Intent;
import android.graphics.Paint;
import android.graphics.Rect;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.ConstraintSet;
import androidx.transition.ArcMotion;
import androidx.transition.ChangeBounds;
import androidx.transition.Transition;
import androidx.transition.TransitionListenerAdapter;
import androidx.transition.TransitionManager;
import androidx.core.content.ContextCompat;
import androidx.core.view.GestureDetectorCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.ViewPropertyAnimatorListenerAdapter;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.os.Handler;
import android.text.Editable;
import android.view.GestureDetector;
@ -38,10 +21,27 @@ import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.ConstraintSet;
import androidx.core.content.ContextCompat;
import androidx.core.view.GestureDetectorCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.ViewPropertyAnimatorListenerAdapter;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import androidx.transition.ArcMotion;
import androidx.transition.ChangeBounds;
import androidx.transition.Transition;
import androidx.transition.TransitionListenerAdapter;
import androidx.transition.TransitionManager;
import com.swifttech.remit.android.R;
import com.swifttech.remit.android.base.BaseActivity;
import com.swifttech.remit.android.common.customwidgets.CurrencyFormatterTextWatcher;
import com.swifttech.remit.android.common.customwidgets.GmeEditText;
import com.swifttech.remit.android.common.customwidgets.GmeTextView;
import com.swifttech.remit.android.common.customwidgets.exchangecountrylistingdialog.CountryFlagMapper;
import com.swifttech.remit.android.common.customwidgets.exchangecountrylistingdialog.ExchangeRateCurrencyListingDialog;
import com.swifttech.remit.android.features.exrate.gateway.ExchangeRateGateway;
@ -52,8 +52,6 @@ import com.swifttech.remit.android.features.exrate.presenter.ExchangeRatePresent
import com.swifttech.remit.android.features.exrate.view.SelectedRedBorderDecoration;
import com.swifttech.remit.android.features.home.view.HomeActivityV2;
import com.swifttech.remit.android.features.login.view.LoginV2Activity;
import com.swifttech.remit.android.features.otpverification.view.OTPVerificationActivity;
import com.swifttech.remit.android.features.register.view.RegisterV2Activity;
import com.swifttech.remit.android.features.registerv2.existingcustomer.view.ExistingCustomerRegisterV2Activity;
import com.swifttech.remit.android.features.registerv2.newcustomer.view.NewRegisterV2Activity;
import com.swifttech.remit.android.features.settings.gateway.LanguageSelectionGateway;
@ -118,8 +116,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
@BindView(R.id.recepientFlagImageView)
ImageView receivingCountryFlagImageView;
@BindView(R.id.recepientCurrencyTextView)
TextView receivingCurrencyCodeTxtView;
@BindView(R.id.transferFeeTxtView)
TextView transferFeeTxtView;
@ -128,13 +124,18 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
TextView exchangeRateTxtView;
@BindView(R.id.gmeExratePC)
TextView gmeExratePC;
@BindView(R.id.countrySelectionSpinner)
View countrySelectionSpinner;
@BindView(R.id.recepientCurrencyTextView)
GmeTextView recepientCurrencyTextView;
@BindView(R.id.countrySelectionSpinnerArrow)
ImageView countrySelectionSpinnerArrow;
@BindView(R.id.receiveMoneyViewContainer)
View receiveMoneyViewContainer;
@ -151,8 +152,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
View existing_user_register_txt;
LanguageViewTransitionManager languageViewTransitionManager;
LanguageSelectionRVAdapter languageSelectionRVAdapter;
@ -186,15 +185,15 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
private void performDefaultAction(Bundle savedInstanceState) {
languageViewTransitionManager.underlineTitleText(true);
splashPresenter.checkCurrentSelectedLanguage();
exRatePresenter.getExrateRelatedData();
languageViewTransitionManager.underlineTitleText(true);
splashPresenter.checkCurrentSelectedLanguage();
exRatePresenter.getExrateRelatedData();
}
private void init() {
progressBar.getIndeterminateDrawable().setColorFilter(ContextCompat.getColor(this, android.R.color.white), android.graphics.PorterDuff.Mode.MULTIPLY);
splashPresenter = new SplashScreenPresenter(this,new SplashScreenGateway(), new LanguageSelectionGateway());
exRatePresenter=new ExchangeRatePresenter(this,new ExchangeRateGateway());
splashPresenter = new SplashScreenPresenter(this, new SplashScreenGateway(), new LanguageSelectionGateway());
exRatePresenter = new ExchangeRatePresenter(this, new ExchangeRateGateway());
languageViewTransitionManager = new LanguageViewTransitionManager(this);
initLanguageRV();
@ -214,7 +213,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
}
private void initPayoutModeRV() {
SelectedRedBorderDecoration selectedRedBorderDecoration = new SelectedRedBorderDecoration(this,false);
SelectedRedBorderDecoration selectedRedBorderDecoration = new SelectedRedBorderDecoration(this, false);
paymentModeRV.addItemDecoration(selectedRedBorderDecoration);
paymentModeRV.setLayoutManager(new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL));
payoutModeSelectionRVAdapter = new PayoutModeSelectionRVAdapter(this);
@ -225,6 +224,8 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
public void onClick(View view) {
switch (view.getId()) {
case R.id.countrySelectionSpinner:
case R.id.recepientCurrencyTextView:
case R.id.countrySelectionSpinnerArrow:
showCountryListinDialog();
break;
case R.id.btn_rgstr:
@ -239,7 +240,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
onBackPressed();
break;
case R.id.existing_user_register_txt:
Intent intent=new Intent(this,ExistingCustomerRegisterV2Activity.class);
Intent intent = new Intent(this, ExistingCustomerRegisterV2Activity.class);
startActivity(intent);
break;
@ -262,13 +263,14 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
selectedLanguageText.setOnClickListener(this);
selectedLanguageIcon.setOnClickListener(this);
countrySelectionSpinner.setOnClickListener(this);
recepientCurrencyTextView.setOnClickListener(this);
countrySelectionSpinnerArrow.setOnClickListener(this);
receiveAmountEdTxt.setOnEditorActionListener(this);
sendAmountEdTxt.setOnEditorActionListener(this);
existing_user_register_txt.setOnClickListener(this);
selectLangBg.setOnClickListener(this);
}
@Override
@ -280,6 +282,8 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
selectedLanguageText.setOnClickListener(null);
selectedLanguageIcon.setOnClickListener(null);
countrySelectionSpinner.setOnClickListener(null);
recepientCurrencyTextView.setOnClickListener(null);
countrySelectionSpinnerArrow.setOnClickListener(null);
receiveAmountEdTxt.setOnEditorActionListener(null);
sendAmountEdTxt.setOnEditorActionListener(null);
existing_user_register_txt.setOnClickListener(null);
@ -316,9 +320,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
super.onNewIntent(intent);
try {
performDefaultAction(null);
}
catch(Exception e)
{
} catch (Exception e) {
restartApp();
}
}
@ -356,7 +358,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
}
@Override
public void showAppVersion(String appVersion) {
appVersionTxtView.setText(appVersion);
@ -380,7 +381,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
countryListingDialog.show(getSupportFragmentManager(), "GenericTextListingDialog");
}
private void startSendAmountListener(boolean action) {
private void startSendAmountListener(boolean action) {
if (action) {
sendAmountEdTxt.addTextChangedListener(sendMoneyTextWatcher);
} else {
@ -419,7 +420,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
@Override
public void showSelectedPayoutCurrency(CountryPaymentService selectedPayoutCountryCurrency) {
receivingCurrencyCodeTxtView.setText(selectedPayoutCountryCurrency.getCurrency());
recepientCurrencyTextView.setText(selectedPayoutCountryCurrency.getCurrency());
receivingCountryFlagImageView.setBackgroundResource(CountryFlagMapper.getFlagFromCountryCode(selectedPayoutCountryCurrency.getCountryCode()));
receivingCountryFlagImageView.setBackgroundResource(CountryFlagMapper.getFlagFromCountryCode(selectedPayoutCountryCurrency.getCountryCode()));
@ -427,7 +428,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
@Override
public void showTransferChargeAndExrate(String chargeAmount, String exRate,String formattedExRate, boolean playAnimation) {
public void showTransferChargeAndExrate(String chargeAmount, String exRate, String formattedExRate, boolean playAnimation) {
if (playAnimation) {
transferFeeTxtView.setVisibility(View.INVISIBLE);
exchangeRateTxtView.setVisibility(View.INVISIBLE);
@ -447,7 +448,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
gmeExratePC.setText(formattedExRate);
transferFeeTxtView.animate().alpha(1f).setDuration(500).withLayer().withStartAction(
()-> exchangeRateTxtView.animate().alpha(1f).setDuration(500).withLayer().start()
() -> exchangeRateTxtView.animate().alpha(1f).setDuration(500).withLayer().start()
).start();
gmeExratePC.animate().alpha(1f).setDuration(500).withLayer().start();
@ -648,7 +649,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
isExrateViewVisible = true;
isAnimationOnProgress = false;
userNavigatedToLanguageView = false;
new Handler().postDelayed(()-> exRatePresenter.onExRateViewLoadedSuccessfully(),150);
new Handler().postDelayed(() -> exRatePresenter.onExRateViewLoadedSuccessfully(), 150);
}
});
@ -791,8 +792,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
btnRegisterLeftAndTopCoordinates[1] + btn_new_user.getMeasuredHeight());
return (receiveAmountEdTxt.hasFocus() || sendAmountEdTxt.hasFocus())
&& !sendMoneyBoundRect.contains(posX, posY)
&& !receiveMoneyBoundRect.contains(posX, posY)
@ -807,7 +806,4 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
}
}

14
app/src/main/res/drawable/icv_notice.xml
View File

@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:pathData="M24,24m-23,0a23,23 0,1 1,46 0a23,23 0,1 1,-46 0"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#8C96A0"/>
<path
android:pathData="M30.9792,34.4282H11.7852V10H30.9792V34.4282ZM13.5317,32.6835H29.2362V11.7447H13.5317V32.6835ZM16.1479,20.4685H26.6164V22.2133H16.1479V20.4685ZM16.1479,23.958H26.6164V25.7027H16.1479V23.958ZM16.1479,27.4492H26.6164V29.194H16.1479V27.4492ZM16.1479,16.965H21.3822V18.7098H16.1479V16.965ZM36.2134,37.9178H17.8927V36.173H34.4687V15.2342H32.7712V13.4895H36.2134V37.9178Z"
android:fillColor="#8C96A0"/>
</vector>

2
app/src/main/res/layout/activity_splash_screen_key_0.xml
View File

@ -147,7 +147,6 @@
android:layout_marginBottom="@dimen/_4sdp"
android:orientation="horizontal"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/gmeTextView12" />
@ -389,7 +388,6 @@
<ImageView
android:id="@+id/countrySelectionSpinnerArrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/icv_dropdown"

1
app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml
View File

@ -253,7 +253,6 @@
<ImageView
android:id="@+id/countrySelectionSpinnerArrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/icv_dropdown"

Write Preview
Loading…
Cancel
Save