From a2b0b04483755b6818910e94d62969eb2f057a22 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 16 Jul 2020 17:04:09 +0200
Subject: [PATCH] Improved country picker dialog

---
 .../fragments/CountryPickerFragment.kt          | 14 +++++++++++---
 .../assistant_country_picker_fragment.xml       | 17 +++++++++++++++--
 app/src/main/res/values/strings.xml             |  1 +
 app/src/main/res/values/styles.xml              |  7 +++++++
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/CountryPickerFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/CountryPickerFragment.kt
index 488a9cba5..625be72fa 100644
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/CountryPickerFragment.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/fragments/CountryPickerFragment.kt
@@ -22,10 +22,9 @@ package org.linphone.activities.assistant.fragments
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import androidx.fragment.app.DialogFragment
+import org.linphone.R
 import org.linphone.activities.assistant.adapters.CountryPickerAdapter
 import org.linphone.core.DialPlan
 import org.linphone.databinding.AssistantCountryPickerFragmentBinding
@@ -34,6 +33,11 @@ class CountryPickerFragment(private val listener: CountryPickedListener) : Dialo
     private lateinit var binding: AssistantCountryPickerFragmentBinding
     private lateinit var adapter: CountryPickerAdapter
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, R.style.assistant_country_dialog_style)
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -62,6 +66,10 @@ class CountryPickerFragment(private val listener: CountryPickedListener) : Dialo
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { }
         })
 
+        binding.setCancelClickListener {
+            dismiss()
+        }
+
         return binding.root
     }
 
diff --git a/app/src/main/res/layout/assistant_country_picker_fragment.xml b/app/src/main/res/layout/assistant_country_picker_fragment.xml
index 97c277861..c2d54958e 100644
--- a/app/src/main/res/layout/assistant_country_picker_fragment.xml
+++ b/app/src/main/res/layout/assistant_country_picker_fragment.xml
@@ -3,6 +3,9 @@
 
     <data>
         <import type="android.view.View"/>
+        <variable
+            name="cancelClickListener"
+            type="android.view.View.OnClickListener"/>
     </data>
 
     <LinearLayout
@@ -35,7 +38,7 @@
                 android:layout_toLeftOf="@id/clear_field"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/assistant_choose_country">
+                android:hint="@string/assistant_choose_country_title">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/search_country"
@@ -65,11 +68,21 @@
         <ListView
             android:id="@+id/countryList"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
             android:cacheColorHint="@color/transparent_color"
             android:divider="@color/light_grey_color"
             android:dividerHeight="1dp" />
 
+        <TextView
+            android:onClick="@{cancelClickListener}"
+            style="@style/button_font"
+            android:padding="10dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/dialog_cancel"
+            android:gravity="right" />
+
     </LinearLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4d276b1e6..2fa2f8381 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,6 +32,7 @@
     <string name="select_your_country">Select your country</string>
     <string name="international_prefix">Prefix</string>
     <string name="assistant_choose_country">Choose a country</string>
+    <string name="assistant_choose_country_title">Country name or prefix</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
     <string name="email">Email</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4fc2f9f1a..972d76ef5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -66,6 +66,13 @@
         <item name="android:textSize">13sp</item>
     </style>
 
+    <style name="assistant_country_dialog_style" parent="Base.Theme.AppCompat.Dialog">
+        <item name="colorPrimary">@color/primary_color</item>
+        <item name="android:textColorPrimary">@color/light_primary_text_color</item>
+        <item name="android:windowMinWidthMajor">97%</item>
+        <item name="android:windowMinWidthMinor">97%</item>
+    </style>
+
     <!-- About related -->
 
     <style name="about_license_font" parent="@android:style/TextAppearance.Medium">