From bd00374b1ec2146286a96ea4a84580edc6a7c96d Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Wed, 13 Feb 2019 13:54:38 +0900 Subject: [PATCH] Reciepient listing redundant dialogs removed --- .../RecipientCountryListingRvAdapter.java | 70 ------ .../RecipientDistrictListingRvAdapter.java | 59 ----- .../RecipientProvinceListingRvAdapter.java | 60 ----- .../RecipientRelationListingRvAdapter.java | 59 ----- .../RecipientTransferListingRvAdapter.java | 59 ----- .../view/RecipientCountryListingDialog.java | 202 ----------------- .../view/RecipientDistrictListingDialog.java | 206 ------------------ .../view/RecipientProvinceListingDialog.java | 204 ----------------- .../view/RecipientRelationListingDialog.java | 202 ----------------- .../view/RecipientTransferListingDialog.java | 204 ----------------- .../recipientadd/RecipientAddV2Activity.java | 134 +----------- .../PayoutModeBankListingDialog.java | 4 - 12 files changed, 4 insertions(+), 1459 deletions(-) delete mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientCountryListingRvAdapter.java delete mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientDistrictListingRvAdapter.java delete mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientProvinceListingRvAdapter.java delete mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientRelationListingRvAdapter.java delete mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientTransferListingRvAdapter.java delete mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientCountryListingDialog.java delete mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientDistrictListingDialog.java delete mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientProvinceListingDialog.java delete mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientRelationListingDialog.java delete mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientTransferListingDialog.java diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientCountryListingRvAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientCountryListingRvAdapter.java deleted file mode 100644 index 7787e50f..00000000 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientCountryListingRvAdapter.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.gmeremit.online.gmeremittance_native.recipientV2.adapter; - -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.bumptech.glide.Glide; -import com.gmeremit.online.gmeremittance_native.R; -import com.gmeremit.online.gmeremittance_native.customwidgets.exchangecountrylistingdialog.CountryFlagMapper; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.CountryDetailModel; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientCountryListRvViewHolder; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientCountryListingDialog; - -import java.util.ArrayList; -import java.util.List; - -public class RecipientCountryListingRvAdapter extends RecyclerView.Adapter { - - private final RecipientCountryListingDialog.CountrySelectionListener listener; - private List data; - - public RecipientCountryListingRvAdapter(RecipientCountryListingDialog.CountrySelectionListener listener) { - this.data=new ArrayList<>(); - this.listener=listener; - } - - - @Override - public RecipientCountryListRvViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.countrylist_item_view, parent, false); - return new RecipientCountryListRvViewHolder(view); } - - @Override - public void onBindViewHolder(final RecipientCountryListRvViewHolder holder, int position) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if(listener!=null) - listener.onCountrySelected(data.get(holder.getAdapterPosition())); - } - }); - CountryDetailModel countryPaymentService= data.get(position); - - int flagId=CountryFlagMapper.getFlagFromCountryCode(countryPaymentService.getCode()); - if(flagId!=-1) - { - Glide.with(holder.getCountrFlagImageView().getContext()) - .load(flagId) - .into(holder.getCountrFlagImageView()); - } - - holder.setCountryName(countryPaymentService.getName()); - } - - @Override - public int getItemCount() { - return data.size(); - } - - public void setData(List data) { - if(data!=null) - { - this.data=data; - notifyDataSetChanged(); - } - } - - -} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientDistrictListingRvAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientDistrictListingRvAdapter.java deleted file mode 100644 index 301a6baf..00000000 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientDistrictListingRvAdapter.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.gmeremit.online.gmeremittance_native.recipientV2.adapter; - -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.gmeremit.online.gmeremittance_native.R; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.DistrictDetailModel; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientDistrictListingDialog; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientProvinceListRvViewHolder; - -import java.util.ArrayList; -import java.util.List; - -public class RecipientDistrictListingRvAdapter extends RecyclerView.Adapter { - - private final RecipientDistrictListingDialog.DistrictSelectionListener listener; - private List data; - - public RecipientDistrictListingRvAdapter(RecipientDistrictListingDialog.DistrictSelectionListener listener) { - this.data=new ArrayList<>(); - this.listener=listener; - } - - - @Override - public RecipientProvinceListRvViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.provincelist_item_view, parent, false); - return new RecipientProvinceListRvViewHolder(view); } - - @Override - public void onBindViewHolder(final RecipientProvinceListRvViewHolder holder, int position) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if(listener!=null) - listener.onDistrictSelected(data.get(holder.getAdapterPosition())); - } - }); - DistrictDetailModel province= data.get(position); - holder.setName(province.getText()); - } - - @Override - public int getItemCount() { - return data.size(); - } - - public void setData(List data) { - if(data!=null) - { - this.data=data; - notifyDataSetChanged(); - } - } - - -} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientProvinceListingRvAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientProvinceListingRvAdapter.java deleted file mode 100644 index ecfc71a7..00000000 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientProvinceListingRvAdapter.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gmeremit.online.gmeremittance_native.recipientV2.adapter; - -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.gmeremit.online.gmeremittance_native.R; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.ProvinceDetailModel; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientProvinceListRvViewHolder; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientProvinceListingDialog; - -import java.util.ArrayList; -import java.util.List; - -public class RecipientProvinceListingRvAdapter extends RecyclerView.Adapter { - - private final RecipientProvinceListingDialog.ProvinceSelectionListener listener; - private List data; - - public RecipientProvinceListingRvAdapter(RecipientProvinceListingDialog.ProvinceSelectionListener listener) { - this.data=new ArrayList<>(); - this.listener=listener; - } - - - @Override - public RecipientProvinceListRvViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.provincelist_item_view, parent, false); - return new RecipientProvinceListRvViewHolder(view); - } - - @Override - public void onBindViewHolder(final RecipientProvinceListRvViewHolder holder, int position) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if(listener!=null) - listener.onProvinceSelected(data.get(holder.getAdapterPosition())); - } - }); - ProvinceDetailModel province= data.get(position); - holder.setName(province.getText()); - } - - @Override - public int getItemCount() { - return data.size(); - } - - public void setData(List data) { - if(data!=null) - { - this.data=data; - notifyDataSetChanged(); - } - } - - -} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientRelationListingRvAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientRelationListingRvAdapter.java deleted file mode 100644 index ce79416b..00000000 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientRelationListingRvAdapter.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.gmeremit.online.gmeremittance_native.recipientV2.adapter; - -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.gmeremit.online.gmeremittance_native.R; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.RelationDetailModel; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientProvinceListRvViewHolder; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientRelationListingDialog; - -import java.util.ArrayList; -import java.util.List; - -public class RecipientRelationListingRvAdapter extends RecyclerView.Adapter { - - private final RecipientRelationListingDialog.RelationSelectionListener listener; - private List data; - - public RecipientRelationListingRvAdapter(RecipientRelationListingDialog.RelationSelectionListener listener) { - this.data=new ArrayList<>(); - this.listener=listener; - } - - - @Override - public RecipientProvinceListRvViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.provincelist_item_view, parent, false); - return new RecipientProvinceListRvViewHolder(view); } - - @Override - public void onBindViewHolder(final RecipientProvinceListRvViewHolder holder, int position) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if(listener!=null) - listener.onRelationSelected(data.get(holder.getAdapterPosition())); - } - }); - RelationDetailModel relationData= data.get(position); - holder.setName(relationData.getText()); - } - - @Override - public int getItemCount() { - return data.size(); - } - - public void setData(List data) { - if(data!=null) - { - this.data=data; - notifyDataSetChanged(); - } - } - - -} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientTransferListingRvAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientTransferListingRvAdapter.java deleted file mode 100644 index fa40790e..00000000 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientTransferListingRvAdapter.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.gmeremit.online.gmeremittance_native.recipientV2.adapter; - -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.gmeremit.online.gmeremittance_native.R; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.TransferDetailModel; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientProvinceListRvViewHolder; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientTransferListingDialog; - -import java.util.ArrayList; -import java.util.List; - -public class RecipientTransferListingRvAdapter extends RecyclerView.Adapter { - - private final RecipientTransferListingDialog.TransferReasonSelectionListener listener; - private List data; - - public RecipientTransferListingRvAdapter(RecipientTransferListingDialog.TransferReasonSelectionListener listener) { - this.data=new ArrayList<>(); - this.listener=listener; - } - - - @Override - public RecipientProvinceListRvViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.provincelist_item_view, parent, false); - return new RecipientProvinceListRvViewHolder(view); } - - @Override - public void onBindViewHolder(final RecipientProvinceListRvViewHolder holder, int position) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if(listener!=null) - listener.onTransferReasonSelected(data.get(holder.getAdapterPosition())); - } - }); - TransferDetailModel province= data.get(position); - holder.setName(province.getText()); - } - - @Override - public int getItemCount() { - return data.size(); - } - - public void setData(List data) { - if(data!=null) - { - this.data=data; - notifyDataSetChanged(); - } - } - - -} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientCountryListingDialog.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientCountryListingDialog.java deleted file mode 100644 index da7bb350..00000000 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientCountryListingDialog.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.gmeremit.online.gmeremittance_native.recipientV2.view; - -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.Context; -import android.content.DialogInterface; -import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.RecyclerView; -import android.text.Editable; -import android.text.TextWatcher; -import android.util.Log; -import android.view.View; -import android.view.ViewGroup; -import android.view.Window; -import android.view.WindowManager; -import android.view.inputmethod.InputMethodManager; -import android.widget.EditText; - -import com.gmeremit.online.gmeremittance_native.R; -import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDecoration; -import com.gmeremit.online.gmeremittance_native.recipientV2.adapter.RecipientCountryListingRvAdapter; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.CountryDetailModel; - -import java.util.ArrayList; -import java.util.List; - -public class RecipientCountryListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher { - - private List data; - private CountrySelectionListener listener; - private RecyclerView countryListRv; - private View cancelButton; - private EditText noCountryFoundView; - private EditText searchEditTextView; - private RecipientCountryListingRvAdapter countryListingRvAdapter; - private View searchViewContainer; - - - @Override - 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); - cancelButton = view.findViewById(R.id.iv_cancel); - searchEditTextView = view.findViewById(R.id.searchEditText); - searchViewContainer= view.findViewById(R.id.searchViewContainer); - - builder.setView(view); - - - initialize(); - return builder.create(); - - } - - private void initialize() { - searchEditTextView.setHint("Search Country"); - cancelButton.setOnClickListener(this); - searchEditTextView.addTextChangedListener(this); - countryListingRvAdapter = new RecipientCountryListingRvAdapter(this.listener); - countryListingRvAdapter.setData(this.data); - countryListRv.setAdapter(countryListingRvAdapter); - LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(getActivity(), LineDividerItemDecoration.VERTICAL_LIST); - countryListRv.addItemDecoration(lineDividerItemDecoration); - - searchViewContainer.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - searchEditTextView.requestFocus(); - showKeyBoard(searchEditTextView); - } - }); - - } - - public void setListener(CountrySelectionListener listener) { - this.listener = listener; - } - - public void setCountryData(List data) { - if (data != null) { - this.data = data; - } - } - - @Override - public void onStart() { - super.onStart(); - - Window window = getDialog().getWindow(); - if (window != null) { - window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); - window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset); - - } - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.iv_cancel: - cancelButton.setOnClickListener(null); - hideKeyboard(); - dismiss(); - break; - } - } - - @Override - public void onDismiss(DialogInterface dialog) { - super.onDismiss(dialog); - cancelButton.setOnClickListener(null); - searchEditTextView.removeTextChangedListener(this); - searchViewContainer.setOnClickListener(null); - - } - - private void showCountryNotFoundView(boolean action) { - if (action) { - if (countryListRv.getVisibility() == View.VISIBLE) { - countryListRv.setVisibility(View.GONE); - noCountryFoundView.setVisibility(View.VISIBLE); - } - } else { - if (countryListRv.getVisibility() != View.VISIBLE) { - noCountryFoundView.setVisibility(View.GONE); - countryListRv.setVisibility(View.VISIBLE); - } - } - } - - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - - } - - @Override - public void afterTextChanged(Editable s) { - if (countryListingRvAdapter != null) { - searchForCountry(s.toString()); - } - } - - private void searchForCountry(String s) { - if (this.data != null) { - if (s.length() > 0) { - List searchedData = new ArrayList<>(); - for (CountryDetailModel item : data) { - if (item.getName().toLowerCase().contains(s.toLowerCase())) { - searchedData.add(item); - } - } - if (searchedData.size() > 0) - showCountryNotFoundView(false); - else - showCountryNotFoundView(true); - countryListingRvAdapter.setData(searchedData); - - } else { - showCountryNotFoundView(false); - countryListingRvAdapter.setData(this.data); - } - } - } - - public void hideKeyboard() { - // Check if no view has focus: - try { - View view = getActivity().getCurrentFocus(); - - InputMethodManager inputManager = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE); - inputManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS); - } - catch(Exception ex) - { - - } - - } - - public void showKeyBoard(View view) { - try { - InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE); - imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT); - Log.d("GMEEXCEPTION", "Keyboard shown"); - } catch (NullPointerException e) { - Log.d("GMEEXCEPTION", "Null pointer while showing keyboard"); - } - } - - - public interface CountrySelectionListener { - void onCountrySelected(CountryDetailModel countryPaymentService); - } -} 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 deleted file mode 100644 index 1c7e1143..00000000 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientDistrictListingDialog.java +++ /dev/null @@ -1,206 +0,0 @@ -package com.gmeremit.online.gmeremittance_native.recipientV2.view; - -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.Context; -import android.content.DialogInterface; -import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.RecyclerView; -import android.text.Editable; -import android.text.TextWatcher; -import android.util.Log; -import android.view.View; -import android.view.ViewGroup; -import android.view.Window; -import android.view.inputmethod.InputMethodManager; -import android.widget.EditText; -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.recipientV2.adapter.RecipientDistrictListingRvAdapter; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.DistrictDetailModel; - -import java.util.ArrayList; -import java.util.List; - -public class RecipientDistrictListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher { - - private List data; - private DistrictSelectionListener listener; - private RecyclerView districtRv; - private View cancelButton; - private EditText noDistrictFoundView; - private EditText searchEditTextView; - private RecipientDistrictListingRvAdapter districtListingRvAdapter; - - private TextView dialogTitle; - private View searchViewContainer; - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_country_listing, null); - districtRv = view.findViewById(R.id.countryListRv); - noDistrictFoundView = view.findViewById(R.id.noCountryFoundTextView); - dialogTitle = view.findViewById(R.id.dialog_title_txt); - cancelButton = view.findViewById(R.id.iv_cancel); - searchEditTextView = view.findViewById(R.id.searchEditText); - searchViewContainer= view.findViewById(R.id.searchViewContainer); - - builder.setView(view); - initialize(); - - return builder.create(); - - } - - private void initialize() { - cancelButton.setOnClickListener(this); - searchEditTextView.addTextChangedListener(this); - districtListingRvAdapter = new RecipientDistrictListingRvAdapter(this.listener); - districtListingRvAdapter.setData(this.data); - districtRv.setAdapter(districtListingRvAdapter); - LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(getActivity(), LineDividerItemDecoration.VERTICAL_LIST); - districtRv.addItemDecoration(lineDividerItemDecoration); - noDistrictFoundView.setHint("No district found."); - dialogTitle.setText("Select District"); - searchEditTextView.setHint("Search District"); - - - searchViewContainer.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - searchEditTextView.requestFocus(); - showKeyBoard(searchEditTextView); - } - }); - - } - - public void setListener(DistrictSelectionListener listener) { - this.listener = listener; - } - - public void setDistrictData(List data) { - if (data != null&&data.size()>0) { - this.data = data; - } - } - - @Override - public void onStart() { - super.onStart(); - Window window = getDialog().getWindow(); - if (window != null) { - window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); - window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset); - - } - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.iv_cancel: - cancelButton.setOnClickListener(null); - hideKeyboard(); - dismiss(); - break; - } - } - - @Override - public void onDismiss(DialogInterface dialog) { - super.onDismiss(dialog); - cancelButton.setOnClickListener(null); - searchEditTextView.removeTextChangedListener(this); - searchViewContainer.setOnClickListener(null); - - } - - private void showDistrictNotFoundView(boolean action) { - if (action) { - if(districtRv.getVisibility()==View.VISIBLE) { - districtRv.setVisibility(View.GONE); - noDistrictFoundView.setVisibility(View.VISIBLE); - } - } else { - if(districtRv.getVisibility()!=View.VISIBLE) { - noDistrictFoundView.setVisibility(View.GONE); - districtRv.setVisibility(View.VISIBLE); - } - } - - } - - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - - } - - @Override - public void afterTextChanged(Editable s) { - if (districtListingRvAdapter != null) { - searchForDistrict(s.toString()); - } - } - - private void searchForDistrict(String s) { - if (this.data != null) { - if (s.length() > 0) { - List searchedData = new ArrayList<>(); - for (DistrictDetailModel item : data) { - if (item.getText().toLowerCase().contains(s.toLowerCase())) { - searchedData.add(item); - } - } - if (searchedData.size() > 0) - showDistrictNotFoundView(false); - else - showDistrictNotFoundView(true); - districtListingRvAdapter.setData(searchedData); - - } else { - districtListingRvAdapter.setData(this.data); - showDistrictNotFoundView(false); - } - } - } - - public void hideKeyboard() { - // Check if no view has focus: - try { - View view = getActivity().getCurrentFocus(); - - InputMethodManager inputManager = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE); - inputManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS); - } - catch(Exception ex) - { - - } - - } - - public void showKeyBoard(View view) { - try { - InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE); - imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT); - Log.d("GMEEXCEPTION", "Keyboard shown"); - } catch (NullPointerException e) { - Log.d("GMEEXCEPTION", "Null pointer while showing keyboard"); - } - } - - - public interface DistrictSelectionListener { - void onDistrictSelected(DistrictDetailModel countryPaymentService); - } -} 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 deleted file mode 100644 index f2158e35..00000000 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientProvinceListingDialog.java +++ /dev/null @@ -1,204 +0,0 @@ -package com.gmeremit.online.gmeremittance_native.recipientV2.view; - -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.Context; -import android.content.DialogInterface; -import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.RecyclerView; -import android.text.Editable; -import android.text.TextWatcher; -import android.util.Log; -import android.view.View; -import android.view.ViewGroup; -import android.view.Window; -import android.view.inputmethod.InputMethodManager; -import android.widget.EditText; -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.recipientV2.adapter.RecipientProvinceListingRvAdapter; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.ProvinceDetailModel; - -import java.util.ArrayList; -import java.util.List; - -public class RecipientProvinceListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher { - - private List data; - private ProvinceSelectionListener listener; - private RecyclerView provinceRv; - private View cancelButton; - private EditText noProvinceFoundView; - private EditText searchEditTextView; - private RecipientProvinceListingRvAdapter provinceListingRvAdapter; - private TextView dialogTitle; - private View searchViewContainer; - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_country_listing, null); - provinceRv = view.findViewById(R.id.countryListRv); - noProvinceFoundView = view.findViewById(R.id.noCountryFoundTextView); - cancelButton = view.findViewById(R.id.iv_cancel); - searchEditTextView = view.findViewById(R.id.searchEditText); - dialogTitle = view.findViewById(R.id.dialog_title_txt); - searchViewContainer= view.findViewById(R.id.searchViewContainer); - - builder.setView(view); - initialize(); - - return builder.create(); - - } - - private void initialize() { - cancelButton.setOnClickListener(this); - searchEditTextView.addTextChangedListener(this); - provinceListingRvAdapter = new RecipientProvinceListingRvAdapter(this.listener); - provinceListingRvAdapter.setData(this.data); - provinceRv.setAdapter(provinceListingRvAdapter); - LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(getActivity(), LineDividerItemDecoration.VERTICAL_LIST); - provinceRv.addItemDecoration(lineDividerItemDecoration); - noProvinceFoundView.setHint("No province found."); - dialogTitle.setText("Select Province"); - searchEditTextView.setHint("Search Province"); - - - searchViewContainer.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - searchEditTextView.requestFocus(); - showKeyBoard(searchEditTextView); - } - }); - - } - - public void setListener(ProvinceSelectionListener listener) { - this.listener = listener; - } - - public void setProvinceData(List data) { - if (data != null&&data.size()>0) { - this.data = data; - } - } - - @Override - public void onStart() { - super.onStart(); - Window window = getDialog().getWindow(); - if (window != null) { - window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); - window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset); - - } - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.iv_cancel: - cancelButton.setOnClickListener(null); - hideKeyboard(); - dismiss(); - break; - } - } - - @Override - public void onDismiss(DialogInterface dialog) { - super.onDismiss(dialog); - cancelButton.setOnClickListener(null); - searchEditTextView.removeTextChangedListener(this); - searchViewContainer.setOnClickListener(null); - - } - - private void showProvinceNotFoundView(boolean action) { - if (action) { - if(provinceRv.getVisibility()==View.VISIBLE) { - provinceRv.setVisibility(View.GONE); - noProvinceFoundView.setVisibility(View.VISIBLE); - } - } else { - if(provinceRv.getVisibility()!=View.VISIBLE) { - noProvinceFoundView.setVisibility(View.GONE); - provinceRv.setVisibility(View.VISIBLE); - } - } - } - - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - - } - - @Override - public void afterTextChanged(Editable s) { - if (provinceListingRvAdapter != null) { - searchForProvince(s.toString()); - } - } - - private void searchForProvince(String s) { - if (this.data != null) { - if (s.length() > 0) { - List searchedData = new ArrayList<>(); - for (ProvinceDetailModel item : data) { - if (item.getText().toLowerCase().contains(s.toLowerCase())) { - searchedData.add(item); - } - } - if (searchedData.size() > 0) - showProvinceNotFoundView(false); - else - showProvinceNotFoundView(true); - provinceListingRvAdapter.setData(searchedData); - - } else { - provinceListingRvAdapter.setData(this.data); - showProvinceNotFoundView(false); - } - } - } - - public void hideKeyboard() { - // Check if no view has focus: - try { - View view = getActivity().getCurrentFocus(); - - InputMethodManager inputManager = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE); - inputManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS); - } - catch(Exception ex) - { - - } - - } - - public void showKeyBoard(View view) { - try { - InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE); - imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT); - Log.d("GMEEXCEPTION", "Keyboard shown"); - } catch (NullPointerException e) { - Log.d("GMEEXCEPTION", "Null pointer while showing keyboard"); - } - } - - - public interface ProvinceSelectionListener { - void onProvinceSelected(ProvinceDetailModel countryPaymentService); - } -} 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 deleted file mode 100644 index a266fd24..00000000 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientRelationListingDialog.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.gmeremit.online.gmeremittance_native.recipientV2.view; - -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.Context; -import android.content.DialogInterface; -import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.RecyclerView; -import android.text.Editable; -import android.text.TextWatcher; -import android.util.Log; -import android.view.View; -import android.view.ViewGroup; -import android.view.Window; -import android.view.WindowManager; -import android.view.inputmethod.InputMethodManager; -import android.widget.EditText; -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.recipientV2.adapter.RecipientRelationListingRvAdapter; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.RelationDetailModel; - -import java.util.ArrayList; -import java.util.List; - -public class RecipientRelationListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher { - - private List data; - private RelationSelectionListener listener; - private RecyclerView relationRv; - private View cancelButton; - private EditText noRelationFoundView; - private EditText searchEditTextView; - private RecipientRelationListingRvAdapter relationListingRvAdapter; - private TextView dialogTitle; - private View searchViewContainer; - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_country_listing, null); - relationRv = view.findViewById(R.id.countryListRv); - noRelationFoundView = view.findViewById(R.id.noCountryFoundTextView); - cancelButton = view.findViewById(R.id.iv_cancel); - searchEditTextView = view.findViewById(R.id.searchEditText); - searchViewContainer= view.findViewById(R.id.searchViewContainer); - - dialogTitle = view.findViewById(R.id.dialog_title_txt); - builder.setView(view); - initialize(); - - return builder.create(); - - } - - private void initialize() { - cancelButton.setOnClickListener(this); - searchEditTextView.addTextChangedListener(this); - relationListingRvAdapter = new RecipientRelationListingRvAdapter(this.listener); - relationListingRvAdapter.setData(this.data); - relationRv.setAdapter(relationListingRvAdapter); - LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(getActivity(), LineDividerItemDecoration.VERTICAL_LIST); - relationRv.addItemDecoration(lineDividerItemDecoration); - noRelationFoundView.setHint("No relation found."); - dialogTitle.setText("Select Relation"); - searchEditTextView.setHint("Search Relation"); - - searchViewContainer.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - searchEditTextView.requestFocus(); - showKeyBoard(searchEditTextView); - } - }); - - } - - public void setListener(RelationSelectionListener listener) { - this.listener = listener; - } - - public void setTransferReasonData(List data) { - if (data != null && data.size() > 0) { - this.data = data; - } - } - - @Override - public void onStart() { - super.onStart(); - Window window = getDialog().getWindow(); - if (window != null) { - window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); - window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset); - - } - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.iv_cancel: - cancelButton.setOnClickListener(null); - hideKeyboard(); - dismiss(); - break; - } - } - - @Override - public void onDismiss(DialogInterface dialog) { - super.onDismiss(dialog); - cancelButton.setOnClickListener(null); - searchEditTextView.removeTextChangedListener(this); - searchViewContainer.setOnClickListener(null); - - } - - private void showRelationNotFoundView(boolean action) { - if (action) { - if (relationRv.getVisibility() == View.VISIBLE) { - relationRv.setVisibility(View.GONE); - noRelationFoundView.setVisibility(View.VISIBLE); - } - } else { - if (relationRv.getVisibility() != View.VISIBLE) { - noRelationFoundView.setVisibility(View.GONE); - relationRv.setVisibility(View.VISIBLE); - } - } - } - - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - - } - - @Override - public void afterTextChanged(Editable s) { - if (relationListingRvAdapter != null) { - searchForRelation(s.toString()); - } - } - - private void searchForRelation(String s) { - if (this.data != null) { - if (s.length() > 0) { - List searchedData = new ArrayList<>(); - for (RelationDetailModel item : data) { - if (item.getText().toLowerCase().contains(s.toLowerCase())) { - searchedData.add(item); - } - } - if (searchedData.size() > 0) - showRelationNotFoundView(false); - else - showRelationNotFoundView(true); - relationListingRvAdapter.setData(searchedData); - - } else { - showRelationNotFoundView(false); - relationListingRvAdapter.setData(this.data); - } - } - } - - public void hideKeyboard() { - // Check if no view has focus: - try { - View view = getActivity().getCurrentFocus(); - - InputMethodManager inputManager = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE); - inputManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS); - } catch (Exception ex) { - - } - - } - - public void showKeyBoard(View view) { - try { - InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE); - imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT); - Log.d("GMEEXCEPTION", "Keyboard shown"); - } catch (NullPointerException e) { - Log.d("GMEEXCEPTION", "Null pointer while showing keyboard"); - } - } - - - public interface RelationSelectionListener { - void onRelationSelected(RelationDetailModel relationDetailModel); - } -} 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 deleted file mode 100644 index ef6751c1..00000000 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientTransferListingDialog.java +++ /dev/null @@ -1,204 +0,0 @@ -package com.gmeremit.online.gmeremittance_native.recipientV2.view; - -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.Context; -import android.content.DialogInterface; -import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.RecyclerView; -import android.text.Editable; -import android.text.TextWatcher; -import android.util.Log; -import android.view.View; -import android.view.ViewGroup; -import android.view.Window; -import android.view.inputmethod.InputMethodManager; -import android.widget.EditText; -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.recipientV2.adapter.RecipientTransferListingRvAdapter; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.TransferDetailModel; - -import java.util.ArrayList; -import java.util.List; - -public class RecipientTransferListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher { - - private List data; - private TransferReasonSelectionListener listener; - private RecyclerView transferRv; - private View cancelButton; - private EditText noTransferFoundView; - private EditText searchEditTextView; - private RecipientTransferListingRvAdapter transferListingRvAdapter; - - private TextView dialogTitle; - private View searchViewContainer; - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_country_listing, null); - transferRv = view.findViewById(R.id.countryListRv); - noTransferFoundView = view.findViewById(R.id.noCountryFoundTextView); - cancelButton = view.findViewById(R.id.iv_cancel); - searchEditTextView = view.findViewById(R.id.searchEditText); - dialogTitle = view.findViewById(R.id.dialog_title_txt); - searchViewContainer= view.findViewById(R.id.searchViewContainer); - - builder.setView(view); - initialize(); - - return builder.create(); - } - - private void initialize() { - cancelButton.setOnClickListener(this); - searchEditTextView.addTextChangedListener(this); - transferListingRvAdapter = new RecipientTransferListingRvAdapter(this.listener); - transferListingRvAdapter.setData(this.data); - transferRv.setAdapter(transferListingRvAdapter); - LineDividerItemDecoration lineDividerItemDecoration = new LineDividerItemDecoration(getActivity(), LineDividerItemDecoration.VERTICAL_LIST); - transferRv.addItemDecoration(lineDividerItemDecoration); - noTransferFoundView.setHint("No transfer reason found."); - dialogTitle.setText("Select Transfer Reason"); - searchEditTextView.setHint("Search Transfer Reason"); - - - searchViewContainer.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - searchEditTextView.requestFocus(); - showKeyBoard(searchEditTextView); - } - }); - - } - - public void setListener(TransferReasonSelectionListener listener) { - this.listener = listener; - } - - public void setTransferReasonData(List data) { - if (data != null&&data.size()>0) { - this.data = data; - } - } - - @Override - public void onStart() { - super.onStart(); - Window window = getDialog().getWindow(); - if (window != null) { - window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); - window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset); - - } - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.iv_cancel: - cancelButton.setOnClickListener(null); - hideKeyboard(); - dismiss(); - break; - } - } - - @Override - public void onDismiss(DialogInterface dialog) { - super.onDismiss(dialog); - cancelButton.setOnClickListener(null); - searchEditTextView.removeTextChangedListener(this); - searchViewContainer.setOnClickListener(null); - - } - - private void showRecipientNotFoundView(boolean action) { - if (action) { - if(transferRv.getVisibility()==View.VISIBLE) { - transferRv.setVisibility(View.GONE); - noTransferFoundView.setVisibility(View.VISIBLE); - } - } else { - if(transferRv.getVisibility()!=View.VISIBLE) { - noTransferFoundView.setVisibility(View.GONE); - transferRv.setVisibility(View.VISIBLE); - } - } - } - - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - - } - - @Override - public void afterTextChanged(Editable s) { - if (transferListingRvAdapter != null) { - searchForCountry(s.toString()); - } - } - - private void searchForCountry(String s) { - if (this.data != null) { - if (s.length() > 0) { - List searchedData = new ArrayList<>(); - for (TransferDetailModel item : data) { - if (item.getText().toLowerCase().contains(s.toLowerCase())) { - searchedData.add(item); - } - } - if (searchedData.size() > 0) - showRecipientNotFoundView(false); - else - showRecipientNotFoundView(true); - transferListingRvAdapter.setData(searchedData); - - } else { - showRecipientNotFoundView(false); - transferListingRvAdapter.setData(this.data); - } - } - } - - public void hideKeyboard() { - // Check if no view has focus: - try { - View view = getActivity().getCurrentFocus(); - - InputMethodManager inputManager = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE); - inputManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS); - } - catch(Exception ex) - { - - } - - } - - public void showKeyBoard(View view) { - try { - InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE); - imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT); - Log.d("GMEEXCEPTION", "Keyboard shown"); - } catch (NullPointerException e) { - Log.d("GMEEXCEPTION", "Null pointer while showing keyboard"); - } - } - - - public interface TransferReasonSelectionListener { - void onTransferReasonSelected(TransferDetailModel countryPaymentService); - } -} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientadd/RecipientAddV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientadd/RecipientAddV2Activity.java index 7ed39c1c..4e1c4043 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientadd/RecipientAddV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientadd/RecipientAddV2Activity.java @@ -13,7 +13,6 @@ import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.base.BaseActivity; import com.gmeremit.online.gmeremittance_native.customwidgets.GenericTextListingDialog; import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView; -import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Occupation; import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.CountryDetailModel; import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.DistrictDetailModel; import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.ProvinceDetailModel; @@ -23,11 +22,6 @@ import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.T import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientlisting.RecipientInfoModel; import com.gmeremit.online.gmeremittance_native.recipientV2.presenter.recipientadd.RecipientAddV2Presenter; import com.gmeremit.online.gmeremittance_native.recipientV2.presenter.recipientadd.RecipientAddV2PresenterInterface; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientCountryListingDialog; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientDistrictListingDialog; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientProvinceListingDialog; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientRelationListingDialog; -import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientTransferListingDialog; import com.gmeremit.online.gmeremittance_native.utils.Constants; import java.util.List; @@ -35,7 +29,7 @@ import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; -public class RecipientAddV2Activity extends BaseActivity implements View.OnClickListener, RecipientCountryListingDialog.CountrySelectionListener, RecipientAddV2PresenterInterface.RecipientAddV2ContractInterface, RecipientProvinceListingDialog.ProvinceSelectionListener, RecipientDistrictListingDialog.DistrictSelectionListener, RecipientTransferListingDialog.TransferReasonSelectionListener, RecipientRelationListingDialog.RelationSelectionListener { +public class RecipientAddV2Activity extends BaseActivity implements View.OnClickListener, RecipientAddV2PresenterInterface.RecipientAddV2ContractInterface { @BindView(R.id.iv_back) @@ -112,7 +106,6 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick private RecipientAddV2PresenterInterface presenterInterface; - private RecipientCountryListingDialog recipientCountryListingDialog; private CountryDetailModel selectedCountry; private ProvinceDetailModel selectedProvince; private TransferDetailModel selectedTransferReason; @@ -122,10 +115,7 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick private List transferReasonList; private List countryList; private List relationList; - private RecipientProvinceListingDialog provinceListingDialog; - private RecipientDistrictListingDialog districtListingDialog; - private RecipientTransferListingDialog transferListingDialog; - private RecipientRelationListingDialog relationListingDialog; + private RecipientInfoModel recipientToBeEdited = null; @@ -268,15 +258,6 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick } } - private void showTransferListingInDialog() { - hideKeyBoard(); - if (transferListingDialog == null) - transferListingDialog = new RecipientTransferListingDialog(); - transferListingDialog.setListener(this); - transferListingDialog.setTransferReasonData(this.transferReasonList); - if (!transferListingDialog.isAdded()) - transferListingDialog.show(getSupportFragmentManager(), "RecipientCountryListingDialog"); - } private void showTransferListingInDialogV2() { hideKeyBoard(); @@ -294,15 +275,7 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick transferListingDialog.show(getSupportFragmentManager(), "TRANSFERDIALOG"); } - private void showRelationListingInDialog() { - hideKeyBoard(); - if (relationListingDialog == null) - relationListingDialog = new RecipientRelationListingDialog(); - relationListingDialog.setListener(this); - relationListingDialog.setTransferReasonData(this.relationList); - if (!relationListingDialog.isAdded()) - relationListingDialog.show(getSupportFragmentManager(), "RecipientCountryListingDialog"); - } + private void showRelationListingInDialogV2() { @@ -321,19 +294,7 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick relationListingDialog.show(getSupportFragmentManager(), "RelationListingDialog"); } - private void showDistrictListingInDialog() { - hideKeyBoard(); - if (districtListingDialog == null) - districtListingDialog = new RecipientDistrictListingDialog(); - districtListingDialog.setListener(this); - if (this.selectedProvince != null) { - districtListingDialog.setDistrictData(this.selectedProvince.getDistrict()); - if (!districtListingDialog.isAdded()) - districtListingDialog.show(getSupportFragmentManager(), "RecipientProvinceListingDialog"); - } else { - showToastMessage(getString(R.string.select_province_error)); - } - } + private void showDistrictListingInDialogV2() { @@ -358,19 +319,6 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick } - private void showProvinceListingInDialog() { - hideKeyBoard(); - if (provinceListingDialog == null) - provinceListingDialog = new RecipientProvinceListingDialog(); - provinceListingDialog.setListener(this); - if (this.selectedCountry != null) { - provinceListingDialog.setProvinceData(this.selectedCountry.getProvinces()); - if (!provinceListingDialog.isAdded()) - provinceListingDialog.show(getSupportFragmentManager(), "RecipientProvinceListingDialog"); - } else { - showToastMessage(getString(R.string.select_country_error)); - } - } private void showProvinceListingInDialogV2() { @@ -393,15 +341,6 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick provinceListingDialog.show(getSupportFragmentManager(), "ProvinceListingDialog"); } - private void showCountryListingInDialog() { - hideKeyBoard(); - if (recipientCountryListingDialog == null) - recipientCountryListingDialog = new RecipientCountryListingDialog(); - recipientCountryListingDialog.setListener(this); - recipientCountryListingDialog.setCountryData(this.countryList); - if (!recipientCountryListingDialog.isAdded()) - recipientCountryListingDialog.show(getSupportFragmentManager(), "RecipientCountryListingDialog"); - } private void showCountryListingInDialogV2() { @@ -434,31 +373,6 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick countryListingDialog.show(getSupportFragmentManager(), "CountryListingDialog"); } - @Override - public void onCountrySelected(CountryDetailModel countryPaymentService) { - this.selectedCountry = countryPaymentService; - this.ed_country.setText(countryPaymentService.getName()); - if (countryPaymentService.getIsProvienceReq().equalsIgnoreCase(Constants.TRUE_STRING)) { - ed_province.setText(""); - selectedProvince = null; - selectedDistrict = null; - provinceViewContainer.setVisibility(View.VISIBLE); - districtViewContainer.setVisibility(View.VISIBLE); - } else { - ed_province.setText(""); - ed_district.setText(""); - selectedProvince = null; - selectedDistrict = null; - provinceViewContainer.setVisibility(View.GONE); - districtViewContainer.setVisibility(View.GONE); - } - if (recipientCountryListingDialog != null) { - recipientCountryListingDialog.dismiss(); - recipientCountryListingDialog = null; - } - - } - @Override public void showRelatedData(RecipientRelatedModel data) { this.transferReasonList = data.getTransferReasons(); @@ -552,44 +466,4 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick public void setErrorOnLastName(String message) { lastnameWrapper.setError(message); } - - @Override - public void onProvinceSelected(ProvinceDetailModel provinceDetailModel) { - this.selectedProvince = provinceDetailModel; - this.ed_province.setText(this.selectedProvince.getText()); - if (provinceListingDialog != null) { - provinceListingDialog.dismiss(); - provinceListingDialog = null; - } - } - - @Override - public void onDistrictSelected(DistrictDetailModel districtDetailModel) { - this.selectedDistrict = districtDetailModel; - this.ed_district.setText(this.selectedDistrict.getText()); - if (districtListingDialog != null) { - districtListingDialog.dismiss(); - districtListingDialog = null; - } - } - - @Override - public void onTransferReasonSelected(TransferDetailModel transferDetailModel) { - this.selectedTransferReason = transferDetailModel; - this.ed_transfer.setText(this.selectedTransferReason.getText()); - if (transferListingDialog != null) { - transferListingDialog.dismiss(); - transferListingDialog = null; - } - } - - @Override - public void onRelationSelected(RelationDetailModel relationDetailModel) { - this.selectedRelation = relationDetailModel; - this.ed_relation.setText(this.selectedRelation.getText()); - if (relationListingDialog != null) { - relationListingDialog.dismiss(); - relationListingDialog = null; - } - } } 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 bcf23641..403cecff 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 @@ -1,7 +1,6 @@ package com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.payoutmode; import android.app.Dialog; -import android.app.DialogFragment; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; @@ -13,15 +12,12 @@ import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.view.Window; -import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; 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.recipientV2.adapter.RecipientCountryListingRvAdapter; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.CountryDetailModel; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.adapter.PayoutModeBankListingRvAdapter; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.BankList;