ConfigurationWizard shows domain and name.

Items from the provider's list have 2 rows, first one with the domain and the other with the name.

Names from preseeded providers are fetched from the assets file, because we don't download provider.json until they select it.

1 files changed, 21 insertions, 4 deletions

diff --git a/src/se/leap/leapclient/ProviderListFragment.java b/src/se/leap/leapclient/ProviderListFragment.java
index ee3ee8ea..f4f5feb9 100644
--- a/src/se/leap/leapclient/ProviderListFragment.java
+++ b/src/se/leap/leapclient/ProviderListFragment.java
@@ -9,6 +9,8 @@ import android.view.View;
 import android.view.ViewGroup;

 import android.widget.ArrayAdapter;

 import android.widget.ListView;

+import android.content.Context;

+import android.widget.TwoLineListItem;

 

 /**

  * A list fragment representing a list of Providers. This fragment

@@ -74,10 +76,25 @@ public class ProviderListFragment extends ListFragment {
         super.onCreate(savedInstanceState);

         content_adapter = new ArrayAdapter<ProviderListContent.ProviderItem>(

                 getActivity(),

-                android.R.layout.simple_list_item_activated_1,

-                android.R.id.text1,

-                ProviderListContent.ITEMS);

-        setListAdapter(content_adapter);

+                android.R.layout.simple_list_item_activated_2,

+		ProviderListContent.ITEMS) {

+			@Override

+			public View getView(int position, View convertView, ViewGroup parent){

+				TwoLineListItem row;            

+				if (convertView == null) {

+					LayoutInflater inflater = (LayoutInflater)getActivity().getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);

+					row = (TwoLineListItem)inflater.inflate(android.R.layout.simple_list_item_2, null);                    

+				} else {

+					row = (TwoLineListItem)convertView;

+				}

+				ProviderListContent.ProviderItem data = ProviderListContent.ITEMS.get(position);

+				row.getText1().setText(data.domain);

+				row.getText2().setText(data.name);

+

+				return row;

+			}

+	};

+	setListAdapter(content_adapter);

     }

 

     @Override