From f2d3fa473459f9f1da549b2bce03401ffe8cbb94 Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Fri, 31 Aug 2018 10:55:34 +0900 Subject: [PATCH] Dialog fixes --- .../view/RecipientDistrictListingDialog.java | 2 +- .../view/RecipientProvinceListingDialog.java | 2 +- .../view/RecipientRelationListingDialog.java | 2 +- .../view/RecipientTransferListingDialog.java | 2 +- ...mountDetailExRateCountryListingDialog.java | 34 +++++++++---------- .../PayoutModeBankListingDialog.java | 1 + .../PayoutModeBranchListingDialog.java | 1 + 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientDistrictListingDialog.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientDistrictListingDialog.java index 13b0071f..43e9ab06 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientDistrictListingDialog.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientDistrictListingDialog.java @@ -61,7 +61,7 @@ public class RecipientDistrictListingDialog extends DialogFragment implements Vi districtRv.setAdapter(districtListingRvAdapter); LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(getActivity(), LineDividerItemDecoration.VERTICAL_LIST); districtRv.addItemDecoration(lineDividerItemDecoration); - noDistrictFoundView.setText("No District found."); + noDistrictFoundView.setText("No district found."); dialogTitle.setText("Select District"); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientProvinceListingDialog.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientProvinceListingDialog.java index 637774ed..945b77e7 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientProvinceListingDialog.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientProvinceListingDialog.java @@ -60,7 +60,7 @@ public class RecipientProvinceListingDialog extends DialogFragment implements Vi provinceRv.setAdapter(provinceListingRvAdapter); LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(getActivity(), LineDividerItemDecoration.VERTICAL_LIST); provinceRv.addItemDecoration(lineDividerItemDecoration); - noProvinceFoundView.setText("No Province found."); + noProvinceFoundView.setText("No province found."); dialogTitle.setText("Select District"); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientRelationListingDialog.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientRelationListingDialog.java index 328e2aeb..f182476e 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientRelationListingDialog.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientRelationListingDialog.java @@ -60,7 +60,7 @@ public class RecipientRelationListingDialog extends DialogFragment implements Vi relationRv.setAdapter(relationListingRvAdapter); LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(getActivity(), LineDividerItemDecoration.VERTICAL_LIST); relationRv.addItemDecoration(lineDividerItemDecoration); - noRelationFoundView.setText("No Relation found."); + noRelationFoundView.setText("No relation found."); dialogTitle.setText("Select Relation"); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientTransferListingDialog.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientTransferListingDialog.java index 5db3fa09..57f5f5d1 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientTransferListingDialog.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientTransferListingDialog.java @@ -59,7 +59,7 @@ public class RecipientTransferListingDialog extends DialogFragment implements Vi transferRv.setAdapter(transferListingRvAdapter); LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(getActivity(), LineDividerItemDecoration.VERTICAL_LIST); transferRv.addItemDecoration(lineDividerItemDecoration); - noTransferFoundView.setText("No Transfer Reason found."); + noTransferFoundView.setText("No transfer reason found."); dialogTitle.setText("Select Transfer Reason"); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailExRateCountryListingDialog.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailExRateCountryListingDialog.java index 826cf33d..19125377 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailExRateCountryListingDialog.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailExRateCountryListingDialog.java @@ -18,7 +18,6 @@ import android.widget.TextView; import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDecoration; -import com.gmeremit.online.gmeremittance_native.exchange_rate.model.datav2.CountryPaymentService; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.adapter.ExRateCurrencyListingAmountDetailRvAdapter; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.amountdetail.RecipientCurrencyModel; @@ -29,9 +28,9 @@ public class AmountDetailExRateCountryListingDialog extends DialogFragment imple private List data; private ExRateCurrencySelectionListener listener; - private RecyclerView countryListRv; + private RecyclerView currencyListRv; private View cancelButton; - private EditText noCountryFoundView; + private EditText noCurrencyFoundView; private EditText searchEditTextView; private ExRateCurrencyListingAmountDetailRvAdapter currencyListingAdapter; private Window window; @@ -42,8 +41,8 @@ public class AmountDetailExRateCountryListingDialog extends DialogFragment imple public Dialog onCreateDialog(Bundle savedInstanceState) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_country_listing, null); - countryListRv = view.findViewById(R.id.countryListRv); - noCountryFoundView = view.findViewById(R.id.noCountryFoundTextView); + currencyListRv = view.findViewById(R.id.countryListRv); + noCurrencyFoundView = view.findViewById(R.id.noCountryFoundTextView); cancelButton = view.findViewById(R.id.iv_cancel); dialogTitle = view.findViewById(R.id.dialog_title_txt); @@ -67,10 +66,11 @@ public class AmountDetailExRateCountryListingDialog extends DialogFragment imple searchEditTextView.addTextChangedListener(this); currencyListingAdapter = new ExRateCurrencyListingAmountDetailRvAdapter(this.listener); currencyListingAdapter.setData(this.data); - countryListRv.setAdapter(currencyListingAdapter); + currencyListRv.setAdapter(currencyListingAdapter); LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(getActivity(), LineDividerItemDecoration.VERTICAL_LIST); - countryListRv.addItemDecoration(lineDividerItemDecoration); + currencyListRv.addItemDecoration(lineDividerItemDecoration); dialogTitle.setText("Select Currency"); + noCurrencyFoundView.setText("No currency found."); } @@ -119,15 +119,15 @@ public class AmountDetailExRateCountryListingDialog extends DialogFragment imple searchEditTextView.removeTextChangedListener(this); } - private void showCountryNotFoundView(boolean action) { + private void showCurrencyNotFoundView(boolean action) { if (action) { - int rvHeight = countryListRv.getHeight(); - noCountryFoundView.setHeight(rvHeight); - countryListRv.setVisibility(View.INVISIBLE); - noCountryFoundView.setVisibility(View.VISIBLE); + int rvHeight = currencyListRv.getHeight(); + noCurrencyFoundView.setHeight(rvHeight); + currencyListRv.setVisibility(View.INVISIBLE); + noCurrencyFoundView.setVisibility(View.VISIBLE); } else { - noCountryFoundView.setVisibility(View.INVISIBLE); - countryListRv.setVisibility(View.VISIBLE); + noCurrencyFoundView.setVisibility(View.INVISIBLE); + currencyListRv.setVisibility(View.VISIBLE); } } @@ -153,14 +153,14 @@ public class AmountDetailExRateCountryListingDialog extends DialogFragment imple if (s.length() > 0) { List searchedData = new ArrayList<>(); for (RecipientCurrencyModel item : data) { - if (item.getCountryName().toLowerCase().contains(s.toLowerCase())) { + if (item.getCurrencyCode().toLowerCase().contains(s.toLowerCase())) { searchedData.add(item); } } if (searchedData.size() > 0) - showCountryNotFoundView(false); + showCurrencyNotFoundView(false); else - showCountryNotFoundView(true); + showCurrencyNotFoundView(true); currencyListingAdapter.setData(searchedData); } else diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeBankListingDialog.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeBankListingDialog.java index c488d71a..30159c11 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeBankListingDialog.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeBankListingDialog.java @@ -56,6 +56,7 @@ public class PayoutModeBankListingDialog extends DialogFragment implements View. private void initialize() { dialogTitle.setText("Select Bank"); + noCountryFoundView.setText("No bank found."); cancelButton.setOnClickListener(this); searchEditTextView.addTextChangedListener(this); payoutModeBankListingRvAdapter = new PayoutModeBankListingRvAdapter(this.listener); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeBranchListingDialog.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeBranchListingDialog.java index ea437206..80ec4f61 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeBranchListingDialog.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeBranchListingDialog.java @@ -57,6 +57,7 @@ public class PayoutModeBranchListingDialog extends DialogFragment implements Vie private void initialize() { dialogTitle.setText("Select Branch"); + noCountryFoundView.setText("No branch found."); cancelButton.setOnClickListener(this); searchEditTextView.addTextChangedListener(this); payoutModeBranchListingRvAdapter = new PayoutModeBranchListingRvAdapter(this.listener);