From e6287631aa1d064ec15ec57c9edcc9051061f4d8 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 29 Sep 2023 14:30:11 +0200
Subject: [PATCH] Added country to prefix picker popup list

---
 .../ThirdPartySipAccountLoginFragment.kt      |  2 +-
 .../viewmodel/AccountCreationViewModel.kt     |  4 +-
 .../settings/fragment/SettingsFragment.kt     |  4 +-
 .../layout/assistant_register_fragment.xml    | 63 ++++++++++++-------
 ...own_cell.xml => generic_dropdown_cell.xml} |  0
 5 files changed, 48 insertions(+), 25 deletions(-)
 rename app/src/main/res/layout/{assistant_transport_dropdown_cell.xml => generic_dropdown_cell.xml} (100%)

diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/ThirdPartySipAccountLoginFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/ThirdPartySipAccountLoginFragment.kt
index 06a5e5a36..5e867711b 100644
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/ThirdPartySipAccountLoginFragment.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/ThirdPartySipAccountLoginFragment.kt
@@ -84,7 +84,7 @@ class ThirdPartySipAccountLoginFragment : Fragment() {
             R.layout.drop_down_item,
             viewModel.availableTransports
         )
-        adapter.setDropDownViewResource(R.layout.assistant_transport_dropdown_cell)
+        adapter.setDropDownViewResource(R.layout.generic_dropdown_cell)
         binding.transport.adapter = adapter
         binding.transport.onItemSelectedListener = dropdownListener
         binding.transport.setSelection(viewModel.availableTransports.size - 1)
diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt
index 9848bb8e2..46add65b5 100644
--- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt
@@ -282,7 +282,9 @@ class AccountCreationViewModel @UiThread constructor() : ViewModel() {
             val dialPlans = Factory.instance().dialPlans.toList()
             for (dialPlan in dialPlans) {
                 dialPlansList.add(dialPlan)
-                dialPlansLabelList.add("${dialPlan.flag} +${dialPlan.countryCallingCode}")
+                dialPlansLabelList.add(
+                    "${dialPlan.flag} +${dialPlan.countryCallingCode} | ${dialPlan.country}"
+                )
             }
 
             accountCreator = core.createAccountCreator(core.accountCreatorUrl)
diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt
index 27713163c..662f5d9a0 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt
@@ -85,7 +85,7 @@ class SettingsFragment : GenericFragment() {
             R.layout.drop_down_item,
             viewModel.availableRingtonesNames
         )
-        ringtonesAdapter.setDropDownViewResource(R.layout.assistant_transport_dropdown_cell)
+        ringtonesAdapter.setDropDownViewResource(R.layout.generic_dropdown_cell)
         binding.deviceRingtoneSpinner.adapter = ringtonesAdapter
 
         viewModel.selectedRingtone.observe(viewLifecycleOwner) { ringtone ->
@@ -104,7 +104,7 @@ class SettingsFragment : GenericFragment() {
             R.layout.drop_down_item,
             viewModel.availableThemesNames
         )
-        themeAdapter.setDropDownViewResource(R.layout.assistant_transport_dropdown_cell)
+        themeAdapter.setDropDownViewResource(R.layout.generic_dropdown_cell)
         binding.themeSpinner.adapter = themeAdapter
 
         viewModel.theme.observe(viewLifecycleOwner) { theme ->
diff --git a/app/src/main/res/layout/assistant_register_fragment.xml b/app/src/main/res/layout/assistant_register_fragment.xml
index ad00a082a..f558dc020 100644
--- a/app/src/main/res/layout/assistant_register_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_fragment.xml
@@ -129,26 +129,15 @@
                     app:layout_constraintTop_toBottomOf="@id/username_error"
                     app:layout_constraintStart_toStartOf="@id/prefix"/>
 
-                <androidx.appcompat.widget.AppCompatEditText
-                    style="@style/default_text_style"
-                    android:id="@+id/phone_number"
-                    android:enabled="@{viewModel.pushNotificationsAvailable}"
+                <ImageView
+                    android:id="@+id/phone_number_background"
                     android:layout_width="0dp"
-                    android:layout_height="50dp"
-                    android:paddingStart="120dp"
-                    android:paddingEnd="20dp"
-                    android:text="@={viewModel.phoneNumber, default=`6 01 02 03 04 05`}"
-                    android:textSize="14sp"
-                    android:textColor="@color/gray_main2_600"
-                    android:background="@{viewModel.phoneNumberError.length() > 0 ? @drawable/shape_edit_text_error_background : @drawable/edit_text_background, default=@drawable/edit_text_background}"
-                    android:inputType="phone"
-                    android:drawableStart="@drawable/separator"
-                    android:drawablePadding="10dp"
-                    android:hint="@string/phone_number"
-                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
-                    app:layout_constraintTop_toBottomOf="@id/phone_number_label"
-                    app:layout_constraintStart_toStartOf="@id/username"
-                    app:layout_constraintEnd_toEndOf="@id/username"/>
+                    android:layout_height="0dp"
+                    android:src="@{viewModel.phoneNumberError.length() > 0 ? @drawable/shape_edit_text_error_background : @drawable/edit_text_background, default=@drawable/edit_text_background}"
+                    app:layout_constraintStart_toStartOf="@id/prefix"
+                    app:layout_constraintEnd_toEndOf="@id/phone_number"
+                    app:layout_constraintTop_toTopOf="@id/prefix"
+                    app:layout_constraintBottom_toBottomOf="@id/prefix" />
 
                 <androidx.appcompat.widget.AppCompatSpinner
                     style="@style/default_text_style"
@@ -157,6 +146,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
                     android:paddingStart="20dp"
+                    android:paddingEnd="25dp"
                     android:textSize="14sp"
                     android:textColor="@color/gray_main2_600"
                     android:gravity="center_vertical"
@@ -164,10 +154,40 @@
                     android:dropDownVerticalOffset="25dp"
                     android:spinnerMode="dropdown"
                     android:popupBackground="@drawable/shape_squircle_white_background"
+                    android:background="@color/transparent_color"
                     app:layout_constraintTop_toTopOf="@id/phone_number"
                     app:layout_constraintBottom_toBottomOf="@id/phone_number"
-                    app:layout_constraintStart_toStartOf="@id/username"
-                    bind:ignore="RtlSymmetry" />
+                    app:layout_constraintStart_toStartOf="@id/username" />
+
+                <ImageView
+                    android:id="@+id/prefix_caret"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/caret_down"
+                    app:layout_constraintTop_toTopOf="@id/prefix"
+                    app:layout_constraintBottom_toBottomOf="@id/prefix"
+                    app:layout_constraintEnd_toEndOf="@id/prefix"/>
+
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/phone_number"
+                    android:enabled="@{viewModel.pushNotificationsAvailable}"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="5dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.phoneNumber, default=`6 01 02 03 04 05`}"
+                    android:textSize="14sp"
+                    android:textColor="@color/gray_main2_600"
+                    android:inputType="phone"
+                    android:drawableStart="@drawable/separator"
+                    android:drawablePadding="10dp"
+                    android:hint="@string/phone_number"
+                    android:background="@color/transparent_color"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/phone_number_label"
+                    app:layout_constraintStart_toEndOf="@id/prefix_caret"
+                    app:layout_constraintEnd_toEndOf="@id/username"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/default_text_style_600"
@@ -183,6 +203,7 @@
                     app:layout_constraintEnd_toEndOf="@id/phone_number"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
                     android:id="@+id/password_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/assistant_transport_dropdown_cell.xml b/app/src/main/res/layout/generic_dropdown_cell.xml
similarity index 100%
rename from app/src/main/res/layout/assistant_transport_dropdown_cell.xml
rename to app/src/main/res/layout/generic_dropdown_cell.xml