From 79bf5d1f3afda4de8674a1a9cac2438b7b66e496 Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Thu, 30 Aug 2018 18:56:13 +0900 Subject: [PATCH] Dialog fixes done --- .../PayoutModeBankListingDialog.java | 66 +++++++++++-------- .../PayoutModeBranchListingDialog.java | 2 +- .../ic_rounded_country_listing_gray.xml | 1 + .../res/layout/dialog_country_listing.xml | 5 +- app/src/main/res/values/styles.xml | 8 +++ 5 files changed, 50 insertions(+), 32 deletions(-) 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 8d2f7b87..cba94310 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 @@ -10,6 +10,7 @@ import android.support.v7.widget.RecyclerView; import android.text.Editable; import android.text.TextWatcher; import android.view.View; +import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; @@ -36,7 +37,7 @@ public class PayoutModeBankListingDialog extends DialogFragment implements View. private EditText searchEditTextView; private PayoutModeBankListingRvAdapter payoutModeBankListingRvAdapter; private Window window; - private boolean windowHieghtNotFixed=true; + private boolean windowHieghtNotFixed = true; private TextView dialogTitle; @Override @@ -48,19 +49,11 @@ public class PayoutModeBankListingDialog extends DialogFragment implements View. cancelButton = view.findViewById(R.id.iv_cancel); dialogTitle = view.findViewById(R.id.dialog_title_txt); searchEditTextView = view.findViewById(R.id.searchEditText); + initialize(); builder.setView(view); - Dialog dialog = builder.create(); - try { - this.window = dialog.getWindow(); - window.setBackgroundDrawableResource(R.drawable.ic_rounded_country_listing_gray); - - } catch (NullPointerException e) { - - } - initialize(); - return dialog; + return builder.create(); } private void initialize() { @@ -88,16 +81,31 @@ public class PayoutModeBankListingDialog extends DialogFragment implements View. @Override public void onStart() { super.onStart(); - if(windowHieghtNotFixed&&window!=null) - { + if (windowHieghtNotFixed && window != null) { WindowManager.LayoutParams lp = new WindowManager.LayoutParams(); - lp.copyFrom(window.getAttributes()); - lp.height = WindowManager.LayoutParams.MATCH_PARENT; - float multi = getActivity().getResources().getDisplayMetrics().density; - lp.verticalMargin=10*multi; - window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); - window.setAttributes(lp); - windowHieghtNotFixed=false; +// lp.copyFrom(window.getAttributes()); +// window.setBackgroundDrawableResource(R.drawable.ic_rounded_country_listing_gray); +// +// lp.height = WindowManager.LayoutParams.MATCH_PARENT; +// float multi = getActivity().getResources().getDisplayMetrics().density; +// lp.verticalMargin=10*multi; +// window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); +// window.setAttributes(lp); +// windowHieghtNotFixed=false; + } + + Window window = getDialog().getWindow(); + if (window != null) { + window.setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT); + window.setBackgroundDrawableResource(R.drawable.ic_rounded_country_listing_gray); + +// WindowManager.LayoutParams lp = new WindowManager.LayoutParams(); +// lp.copyFrom(window.getAttributes()); +// float multi = getActivity().getResources().getDisplayMetrics().density; +// lp.verticalMargin=10*multi; +// window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING); +// window.setAttributes(lp);lp + } } @@ -121,13 +129,15 @@ public class PayoutModeBankListingDialog extends DialogFragment implements View. private void showCountryNotFoundView(boolean action) { if (action) { - int rvHeight = countryListRv.getHeight(); - noCountryFoundView.setHeight(rvHeight); - countryListRv.setVisibility(View.INVISIBLE); - noCountryFoundView.setVisibility(View.VISIBLE); + if (countryListRv.getVisibility() == View.VISIBLE) { + countryListRv.setVisibility(View.GONE); + noCountryFoundView.setVisibility(View.VISIBLE); + } } else { - noCountryFoundView.setVisibility(View.INVISIBLE); - countryListRv.setVisibility(View.VISIBLE); + if (countryListRv.getVisibility() != View.VISIBLE) { + noCountryFoundView.setVisibility(View.GONE); + countryListRv.setVisibility(View.VISIBLE); + } } } @@ -175,9 +185,7 @@ public class PayoutModeBankListingDialog extends DialogFragment implements View. InputMethodManager inputManager = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE); inputManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS); - } - catch(Exception ex) - { + } catch (Exception ex) { } 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 eb572c69..ac211e42 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 @@ -41,7 +41,7 @@ public class PayoutModeBranchListingDialog extends DialogFragment implements Vie @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(),R.style.FullScreenDialog); View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_country_listing, null); countryListRv = view.findViewById(R.id.countryListRv); noCountryFoundView = view.findViewById(R.id.noCountryFoundTextView); diff --git a/app/src/main/res/drawable/ic_rounded_country_listing_gray.xml b/app/src/main/res/drawable/ic_rounded_country_listing_gray.xml index 30c4f180..145c8764 100644 --- a/app/src/main/res/drawable/ic_rounded_country_listing_gray.xml +++ b/app/src/main/res/drawable/ic_rounded_country_listing_gray.xml @@ -1,6 +1,7 @@ + diff --git a/app/src/main/res/layout/dialog_country_listing.xml b/app/src/main/res/layout/dialog_country_listing.xml index 15e30d37..d84f75a1 100644 --- a/app/src/main/res/layout/dialog_country_listing.xml +++ b/app/src/main/res/layout/dialog_country_listing.xml @@ -74,12 +74,13 @@ app:layoutManager="android.support.v7.widget.LinearLayoutManager" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="match_parent" /> @drawable/ic_rounded_white + +