* #29924: ui adjustements
diff --git a/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java b/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java
index 360d2ca..0fffad6 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java
+++ b/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java
@@ -179,6 +179,7 @@
});
list.setOnItemLongClickListener(mItemLongClickListener);
+ list.setEmptyView(inflatedView.findViewById(R.id.empty_list_contact));
View header = inflater.inflate(R.layout.frag_contact_list_header, null);
list.addHeaderView(header, null, false);
TACGridView grid = (TACGridView) header.findViewById(R.id.favorites_grid);
diff --git a/src/com/savoirfairelinux/sflphone/fragments/HomeFragment.java b/src/com/savoirfairelinux/sflphone/fragments/HomeFragment.java
index 77282e5..888a92f 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/HomeFragment.java
+++ b/src/com/savoirfairelinux/sflphone/fragments/HomeFragment.java
@@ -44,6 +44,7 @@
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
+import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
@@ -58,6 +59,7 @@
private Callbacks mCallbacks = sDummyCallbacks;
Button access_calls;
TextView nb_calls, nb_confs;
+ ListView list_calls, list_confs;
/**
* A dummy implementation of the {@link Callbacks} interface that does nothing. Used only when this fragment is not attached to an activity.
@@ -106,10 +108,10 @@
try {
HashMap<String, SipCall> calls = (HashMap<String, SipCall>) mCallbacks.getService().getCallList();
HashMap<String, Conference> confs = (HashMap<String, Conference>) mCallbacks.getService().getConferenceList();
- Log.i(TAG, "Call size " + calls.size());
- nb_calls.setText(""+calls.size());
- nb_confs.setText(""+confs.size());
-
+
+ updateCallList(calls);
+ updateConferenceList(confs);
+
if(!calls.isEmpty() || !confs.isEmpty()){
access_calls.setVisibility(View.VISIBLE);
} else {
@@ -124,6 +126,15 @@
}
+ private void updateConferenceList(HashMap<String, Conference> confs) {
+ nb_confs.setText(""+confs.size());
+ }
+
+ private void updateCallList(HashMap<String, SipCall> calls) {
+ nb_calls.setText(""+calls.size());
+
+ }
+
@Override
public void onDetach() {
super.onDetach();
@@ -165,6 +176,9 @@
nb_calls = (TextView) inflatedView.findViewById(R.id.calls_counter);
nb_confs = (TextView) inflatedView.findViewById(R.id.confs_counter);
+ list_calls = (ListView) inflatedView.findViewById(R.id.calls_list);
+ list_confs = (ListView) inflatedView.findViewById(R.id.confs_list);
+
access_calls.setOnClickListener(new OnClickListener() {
@Override
diff --git a/src/com/savoirfairelinux/sflphone/views/ClearableEditText.java b/src/com/savoirfairelinux/sflphone/views/ClearableEditText.java
index ff1efdb..652a920 100644
--- a/src/com/savoirfairelinux/sflphone/views/ClearableEditText.java
+++ b/src/com/savoirfairelinux/sflphone/views/ClearableEditText.java
@@ -6,6 +6,7 @@
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
+import android.view.inputmethod.EditorInfo;
import android.widget.Button;
import android.widget.EditText;
import android.widget.RelativeLayout;
@@ -37,7 +38,8 @@
inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
inflater.inflate(R.layout.clearable_edit_text, this, true);
edit_text = (EditText) findViewById(R.id.clearable_edit);
-
+ edit_text.setSingleLine();
+ edit_text.setImeOptions(EditorInfo.IME_ACTION_DONE);
btn_clear = (Button) findViewById(R.id.clearable_button_clear);
btn_clear.setVisibility(RelativeLayout.INVISIBLE);
clearText();