From e66c60c868b9a2fe76927a21243b2d2306a6ea10 Mon Sep 17 00:00:00 2001
From: preyearegmi <preyearegmi@outlook.com>
Date: Fri, 31 Aug 2018 10:51:35 +0900
Subject: [PATCH] Dialog fixes

---
 .../ExchangeRateCurrencyListingDialog.java            |  4 ++--
 .../view/RecipientCountryListingDialog.java           |  4 ++--
 .../view/RecipientDistrictListingDialog.java          |  4 ++--
 .../view/RecipientProvinceListingDialog.java          |  4 ++--
 .../view/RecipientRelationListingDialog.java          |  4 ++--
 .../view/RecipientTransferListingDialog.java          |  4 ++--
 .../view/payoutmode/PayoutModeBankListingDialog.java  |  4 ++--
 .../payoutmode/PayoutModeBranchListingDialog.java     |  6 +++---
 .../res/drawable/ic_rounded_country_listing_gray.xml  |  2 --
 .../res/drawable/ic_rounded_grey_bg_with_inset.xml    | 11 +++++++++++
 app/src/main/res/values/styles.xml                    |  6 ------
 11 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_rounded_grey_bg_with_inset.xml

diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/exchangecountrylistingdialog/ExchangeRateCurrencyListingDialog.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/exchangecountrylistingdialog/ExchangeRateCurrencyListingDialog.java
index 48ccc945..a2cc8ddd 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/exchangecountrylistingdialog/ExchangeRateCurrencyListingDialog.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/exchangecountrylistingdialog/ExchangeRateCurrencyListingDialog.java
@@ -78,8 +78,8 @@ public class ExchangeRateCurrencyListingDialog extends DialogFragment implements
         super.onStart();
         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);
+            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+            window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset);
 
         }
     }
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
index 36cefb30..6fc65970 100644
--- 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
@@ -79,8 +79,8 @@ public class RecipientCountryListingDialog extends DialogFragment implements Vie
 
         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);
+            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+            window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset);
 
         }
     }
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 42eafec5..13b0071f 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
@@ -81,8 +81,8 @@ public class RecipientDistrictListingDialog extends DialogFragment implements Vi
         super.onStart();
         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);
+            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+            window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset);
 
         }
     }
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 dfb3f82f..637774ed 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
@@ -81,8 +81,8 @@ public class RecipientProvinceListingDialog extends DialogFragment implements Vi
         super.onStart();
         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);
+            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+            window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset);
 
         }
     }
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 7609cd46..328e2aeb 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
@@ -80,8 +80,8 @@ public class RecipientRelationListingDialog extends DialogFragment implements Vi
         super.onStart();
         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);
+            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+            window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset);
 
         }
     }
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 ca975334..5db3fa09 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
@@ -79,8 +79,8 @@ public class RecipientTransferListingDialog extends DialogFragment implements Vi
         super.onStart();
         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);
+            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+            window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset);
 
         }
     }
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 63683c27..c488d71a 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
@@ -82,8 +82,8 @@ public class PayoutModeBankListingDialog extends DialogFragment implements View.
 
         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);
+            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+            window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset);
 
         }
     }
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 c7d99816..ea437206 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
@@ -40,7 +40,7 @@ public class PayoutModeBranchListingDialog extends DialogFragment implements Vie
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(),R.style.FullScreenDialog);
+        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);
@@ -77,8 +77,8 @@ public class PayoutModeBranchListingDialog extends DialogFragment implements Vie
 
         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);
+            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+            window.setBackgroundDrawableResource(R.drawable.ic_rounded_grey_bg_with_inset);
 
         }
     }
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 145c8764..ff3a066d 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,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-
     <solid android:color="@color/gray"/>
     <corners android:radius="12dp"/>
-
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_rounded_grey_bg_with_inset.xml b/app/src/main/res/drawable/ic_rounded_grey_bg_with_inset.xml
new file mode 100644
index 00000000..f9b97d8c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_rounded_grey_bg_with_inset.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- drawable is a reference to your 'real' dialog background -->
+<!-- insetRight and insetLeft add the margins -->
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/ic_rounded_country_listing_gray"
+    android:insetRight="10dp"
+    android:insetTop="20dp"
+    android:insetBottom="20dp"
+    android:insetLeft="10dp">
+</inset>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 87490596..4aaaa65f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -31,12 +31,6 @@
         <item name="android:windowBackground">@drawable/ic_rounded_white</item>
     </style>
 
-    <style name="FullScreenDialog" parent="android:style/Theme.Dialog">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowNoTitle">false</item>
-        <item name="android:windowIsFloating">true</item>
 
-        <item name="android:layout_gravity">center</item>
-    </style>
 
 </resources>