diff --git a/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java index 9eeacba..d1086c3 100644 --- a/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java +++ b/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java @@ -43,7 +43,7 @@ public class ContactListActivity extends Activity implements ASyncContactLoad { ContactListActivity._accountMgr = AccountManager.get(getBaseContext()); Account[] myAccountList = ContactListActivity._accountMgr.getAccountsByType(getString(R.string.account_type)); - + // Init view objects = new ArrayList<>(); setContentView(R.layout.restore_activity_contactlist); @@ -54,19 +54,18 @@ public class ContactListActivity extends Activity implements ASyncContactLoad { android.R.color.holo_green_light, android.R.color.holo_orange_light, android.R.color.holo_red_light); - + adapter = new ContactListAdapter(getBaseContext(), android.R.layout.simple_spinner_item, objects, R.layout.contact_list_item, R.id.contactname, this); - + final Spinner sp = (Spinner) findViewById(R.id.contact_spinner); final LinearLayout contactInfos = (LinearLayout) findViewById(R.id.contactinfos_layout); final ProgressBar contactProgressBar = (ProgressBar) findViewById(R.id.contactlist_pgbar); final TextView contactPhoneList = (TextView) findViewById(R.id.contact_phonelist); - sp.setVisibility(View.INVISIBLE); contactInfos.setVisibility(View.INVISIBLE); sp.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @@ -139,22 +138,21 @@ public class ContactListActivity extends Activity implements ASyncContactLoad { if (element.name.equals(accountName)) { // Load "contacts" contactProgressBar.setVisibility(View.VISIBLE); - sp.setVisibility(View.INVISIBLE); - new ContactLoadTask(element, getBaseContext(), adapter, objects, _layout, contactProgressBar, sp).execute(); + new ContactLoadTask(element, getBaseContext(), adapter, objects, _layout, contactProgressBar, contactInfos).execute(); // Add refresh handler _layout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override public void onRefresh() { _layout.setRefreshing(true); - sp.setVisibility(View.INVISIBLE); + contactInfos.setVisibility(View.INVISIBLE); contactProgressBar.setVisibility(View.VISIBLE); (new Handler()).post(new Runnable() { @Override public void run() { objects.clear(); adapter.notifyDataSetChanged(); - new ContactLoadTask(element, getBaseContext(), adapter, objects, _layout, contactProgressBar, sp).execute(); + new ContactLoadTask(element, getBaseContext(), adapter, objects, _layout, contactProgressBar, contactInfos).execute(); } }); } diff --git a/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncContactLoad.java b/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncContactLoad.java index 8004c29..4e56db4 100644 --- a/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncContactLoad.java +++ b/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncContactLoad.java @@ -10,8 +10,8 @@ import android.os.AsyncTask; import android.provider.ContactsContract; import android.support.v4.widget.SwipeRefreshLayout; import android.view.View; +import android.widget.LinearLayout; import android.widget.ProgressBar; -import android.widget.Spinner; import org.json.JSONArray; import org.json.JSONException; @@ -32,11 +32,11 @@ public interface ASyncContactLoad { private final ArrayList _objects; private final SwipeRefreshLayout _layout; private final ProgressBar _pg; - private final Spinner _contactSpinner; + private final LinearLayout _contactLayout; public ContactLoadTask(Account account, Context context, ContactListAdapter adapter, ArrayList objects, SwipeRefreshLayout layout, - ProgressBar pg, Spinner sp) { + ProgressBar pg, LinearLayout sp) { if (ContactLoadTask._accountMgr == null) { ContactLoadTask._accountMgr = AccountManager.get(context); } @@ -47,7 +47,7 @@ public interface ASyncContactLoad { _objects = objects; _layout = layout; _pg = pg; - _contactSpinner = sp; + _contactLayout = sp; } @Override protected Boolean doInBackground(Void... params) { @@ -141,8 +141,8 @@ public interface ASyncContactLoad { _pg.setVisibility(View.INVISIBLE); } - if (_contactSpinner != null) { - _contactSpinner.setVisibility(View.VISIBLE); + if (_contactLayout != null) { + _contactLayout.setVisibility(View.VISIBLE); } } } diff --git a/src/main/res/layout/fragment_mainactivity_gotosettings.xml b/src/main/res/layout/fragment_mainactivity_gotosettings.xml index 87aa32f..259ffba 100644 --- a/src/main/res/layout/fragment_mainactivity_gotosettings.xml +++ b/src/main/res/layout/fragment_mainactivity_gotosettings.xml @@ -103,7 +103,7 @@ style="@style/StandardButton" android:text="@string/ma_button_sync_accounts_now" /> - + android:text="@string/choose_account" /> - + \ No newline at end of file diff --git a/src/main/res/layout/restore_activity_contactlist.xml b/src/main/res/layout/restore_activity_contactlist.xml index 861ff29..974f5e0 100644 --- a/src/main/res/layout/restore_activity_contactlist.xml +++ b/src/main/res/layout/restore_activity_contactlist.xml @@ -35,28 +35,27 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" > - - - - - + + + + - - + \ No newline at end of file diff --git a/src/main/res/values-en/strings.xml b/src/main/res/values-en/strings.xml index 4475c4c..7c9c8ed 100644 --- a/src/main/res/values-en/strings.xml +++ b/src/main/res/values-en/strings.xml @@ -164,5 +164,6 @@ Contributors and issue\'s reporters Choose account > Contact phones Max messages to send per sync + Contact list diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 7b437b4..6271907 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -149,4 +149,5 @@ Les contributeurs et rapporteurs de bugs Erreur #7: Encodage inconnu à la conversion Erreur #2: Echec de la création de la requête Nombre maximum de messages à envoyer par synchronisation + Liste des contacts diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 1580d3e..e02363b 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -193,4 +193,5 @@ Contributors and issue\'s reporters Contact informations > Contact phones Max messages to send per sync + Contact list